October 2012 - Aur-dev - lists.archlinux.org

[aur-dev] [PATCH 1/6] pkg_details.php: Add missing XHTML close tags
by canyonknight 20 Oct '12

20 Oct '12

Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- web/template/pkg_details.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index b286664..74f9257 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -117,6 +117,7 @@ if ($SID && ($uid == $row["MaintainerUID"] || <a href="<?= get_uri('/packages/'); ?>?C=<?= $row['CategoryID'] ?>"><?= $row['Category'] ?></a> <?php endif; ?> </td> + </tr> <tr> <th><?= __('License') . ': ' ?></th> <td><?= htmlspecialchars($license) ?></td> @@ -138,6 +139,7 @@ if ($row["SubmitterUID"]): <?php else: ?> <td>None</td> <?php endif; ?> + </tr> <tr> <th><?= __('Maintainer') .': ' ?></th> <?php @@ -160,9 +162,9 @@ if ($row["MaintainerUID"]): <th><?= __('Votes') . ': ' ?></th> <?php if ($atype == "Developer" || $atype == "Trusted User"): ?> <?php if ($USE_VIRTUAL_URLS): ?> - <td><a href="<?= get_pkg_uri($row['Name']); ?>voters/"><?= $votes ?></a> + <td><a href="<?= get_pkg_uri($row['Name']); ?>voters/"><?= $votes ?></a></td> <?php else: ?> - <td><a href="<?= get_uri('/voters/'); ?>?ID=<?= $pkgid ?>"><?= $votes ?></a> + <td><a href="<?= get_uri('/voters/'); ?>?ID=<?= $pkgid ?>"><?= $votes ?></a></td> <?php endif; ?> <?php else: ?> <td><?= $votes ?></td> -- 1.7.12.3

2 6

[aur-dev] [PATCH] Display a 404 page if a virtual path doesn't exist
by Lukas Fleischer 20 Oct '12

20 Oct '12

Give user feedback instead of bailing out with an empty HTTP response body. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/404.php | 14 ++++++++++++++ web/html/index.php | 4 ++++ 2 files changed, 18 insertions(+) create mode 100644 web/html/404.php diff --git a/web/html/404.php b/web/html/404.php new file mode 100644 index 0000000..caaaf90 --- /dev/null +++ b/web/html/404.php @@ -0,0 +1,14 @@ +<?php + +set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); + +html_header( __("Page Not Found") ); +?> + +<div id="error-page" class="box 404"> + <h2>404 - Page Not Found</h2> + <p>Sorry, the page you've requested does not exist.</p> +</div> + +<?php +html_footer(AUR_VERSION); diff --git a/web/html/index.php b/web/html/index.php index 6ee23bc..422c0e5 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -102,5 +102,9 @@ if (isset($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { header("Content-Type: image/png"); include "./$path"; break; + default: + header("HTTP/1.0 404 Not Found"); + include "./404.php"; + break; } } -- 1.7.12.3

2 2

[aur-dev] [PATCH] aurjson.class.php: Limit number of RPC results
by canyonknight 18 Oct '12

18 Oct '12

With no limit to the number of results, memory_limit set to 32M can easily be exceeded for searches that have a large number of results. This results in an HTTP error 500 for those queries. Limit results to 5000 packages to avoid exceeding memory_limit. Introduce new JSON error code for when the result limit is hit. Fixes FS#31849 Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- It doesn't have to be 5000. That's just a safe arbitrary number I came up with during testing. web/lib/aurjson.class.php | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index fbdc711..5701697 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -149,6 +149,10 @@ class AurJSON { } } + if ($resultcount === 5000) { + return $this->json_error('Too many package results.'); + } + return $this->json_results($type, $resultcount, $search_data); } else { @@ -198,7 +202,8 @@ class AurJSON { $keyword_string = $this->dbh->quote("%" . addcslashes($keyword_string, '%_') . "%"); $where_condition = "(Name LIKE {$keyword_string} OR "; - $where_condition.= "Description LIKE {$keyword_string})"; + $where_condition.= "Description LIKE {$keyword_string}) "; + $where_condition.= "LIMIT 5000"; return $this->process_query('search', $where_condition); } @@ -238,17 +243,19 @@ class AurJSON { $where_condition = ""; if ($ids) { $ids_value = implode(',', $args['ids']); - $where_condition .= "ID IN ({$ids_value})"; + $where_condition .= "ID IN ({$ids_value}) "; } if ($ids && $names) { - $where_condition .= " OR "; + $where_condition .= "OR "; } if ($names) { // individual names were quoted in parse_multiinfo_args() $names_value = implode(',', $args['names']); - $where_condition .= "Name IN ({$names_value})"; + $where_condition .= "Name IN ({$names_value}) "; } + $where_condition .= "LIMIT 5000"; + return $this->process_query('multiinfo', $where_condition); } @@ -260,7 +267,8 @@ class AurJSON { private function msearch($maintainer) { $maintainer = $this->dbh->quote($maintainer); - $where_condition = "Users.Username = {$maintainer}"; + $where_condition = "Users.Username = {$maintainer} "; + $where_condition .= "LIMIT 5000"; return $this->process_query('msearch', $where_condition); } -- 1.7.12.3

2 1

[aur-dev] [PATCH] Sync CSS with archweb
by Lukas Fleischer 18 Oct '12

18 Oct '12

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/css/archweb.css | 50 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/web/html/css/archweb.css b/web/html/css/archweb.css index cafae77..905a3ec 100644 --- a/web/html/css/archweb.css +++ b/web/html/css/archweb.css @@ -273,7 +273,7 @@ table.pretty2 { } /* additional styles for JS sorting */ - table.pretty2 th.header { + table.pretty2 th.tablesorter-header { padding-right: 20px; background-image: url(nosort.gif); background-repeat: no-repeat; @@ -281,11 +281,11 @@ table.pretty2 { cursor: pointer; } - table.pretty2 th.headerSortDown { + table.pretty2 th.tablesorter-headerSortDown { background-image: url(desc.gif); } - table.pretty2 th.headerSortUp { + table.pretty2 th.tablesorter-headerSortUp { background-image: url(asc.gif); } @@ -486,6 +486,31 @@ h3 span.arrow { border: 1px solid #09c; } + .pkgsearch-typeahead { + position: absolute; + top: 100%; + left: 0; + z-index: 1000; + display: none; + float: left; + padding: 0.15em 0.1em; + margin: 0; + min-width: 10em; + font-size: 0.812em; + text-align: left; + list-style: none; + background-color: #f6f9fc; + border: 1px solid #09c; + } + + .pkgsearch-typeahead li a { + color: #000; + } + + .pkgsearch-typeahead li.active a { + color: #07b; + } + /* home: recent pkg updates */ #pkg-updates h3 { margin: 0 0 0.3em; @@ -617,7 +642,7 @@ table.results { } /* additional styles for JS sorting */ - table.results th.header { + table.results th.tablesorter-header { padding-right: 20px; background-image: url(nosort.gif); background-repeat: no-repeat; @@ -625,12 +650,12 @@ table.results { cursor: pointer; } - table.results th.headerSortDown { + table.results th.tablesorter-headerSortDown { background-color: #e4eeff; background-image: url(desc.gif); } - table.results th.headerSortUp { + table.results th.tablesorter-headerSortUp { background-color: #e4eeff; background-image: url(asc.gif); } @@ -797,7 +822,10 @@ form#flag-pkg-form input[type=text] { #pkgdetails #metadata .virtual-dep, #pkgdetails #metadata .testing-dep, +#pkgdetails #metadata .staging-dep, #pkgdetails #metadata .opt-dep, +#pkgdetails #metadata .make-dep, +#pkgdetails #metadata .check-dep, #pkgdetails #metadata .dep-desc { font-style: italic; } @@ -811,12 +839,12 @@ form#flag-pkg-form input[type=text] { padding-top: 1em; } - #pkgdetails #pkgfiles li.d { - color: #666; - } +#pkgfilelist li.d { + color: #666; +} - #pkgdetails #pkgfiles li.f { - } +#pkgfilelist li.f { +} /* mirror stuff */ table td.country { -- 1.7.12.3

2 1

[aur-dev] [PATCH 1/2] pkg_search_results.php: Move version to a separate column
by Lukas Fleischer 14 Oct '12

14 Oct '12

Synchronize the column layout with archweb. This also allows for easily highlighting the version number for out-of-date packages. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/template/pkg_search_results.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index 0053607..ea7f61a 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -37,6 +37,7 @@ if (!$result): ?> <?php endif; ?> <th><a href="?<?= mkurl('SB=c&SO=' . $SO_next) ?>"><?= __("Category") ?></a></th> <th><a href="?<?= mkurl('SB=n&SO=' . $SO_next) ?>"><?= __("Name") ?></a></th> + <th><?= __("Version") ?></th> <th><a href="?<?= mkurl('SB=v&SO=' . $SO_next) ?>"><?= __("Votes") ?></a></th> <?php if ($SID): ?> <th><a href="?<?= mkurl('SB=w&SO=' . $SO_next) ?>"><?= __("Voted") ?></a></th> @@ -54,7 +55,8 @@ if (!$result): ?> <td><input type="checkbox" name="IDs[<?= $row["ID"] ?>]" value="1" /></td> <?php endif; ?> <td><?= htmlspecialchars($row["Category"]) ?></td> - <td><a href="<?= htmlspecialchars(get_pkg_uri($row["Name"]), ENT_QUOTES); ?>"><?= htmlspecialchars($row["Name"]) . ' ' . htmlspecialchars($row["Version"]) ?></a></td> + <td><a href="<?= htmlspecialchars(get_pkg_uri($row["Name"]), ENT_QUOTES); ?>"><?= htmlspecialchars($row["Name"]) ?></a></td> + <td><?= htmlspecialchars($row["Version"]) ?></td> <td><?= $row["NumVotes"] ?></td> <?php if ($SID): ?> <td> -- 1.7.12.2

1 1

[aur-dev] Deletion request
by Stefan Mark 11 Oct '12

11 Oct '12

emacs-nogconf I was asked if its needed anymore. Since its not, i just orphaned it and ask for deletion. thanks

2 2

[aur-dev] [PATCH] pkg_comments.php: Move delete button to same line as poster info
by canyonknight 10 Oct '12

10 Oct '12

The delete button is currently on a separate line. Change some logic to allow for the button to be on the same line as poster info. Reported-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- web/template/pkg_comments.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/template/pkg_comments.php b/web/template/pkg_comments.php index 997b9ca..2ed6420 100644 --- a/web/template/pkg_comments.php +++ b/web/template/pkg_comments.php @@ -22,9 +22,11 @@ $pkgname = $row['Name']; <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> <input type="image" src="/images/x.png" alt="<?= __('Delete comment') ?>" name="submit" value="1" /> </fieldset> + <?= __('Comment by %s', $row['UserName']) ?> </form> - <?php endif; ?> + <?php else: ?> <?= __('Comment by %s', $row['UserName']) ?> + <?php endif; ?> </h4> <p class="timestamp"><?= gmdate('Y-m-d H:i', $row['CommentTS']) ?></p> <div class="article-content"> -- 1.7.12.2

1 0

[aur-dev] [PATCH] pkg_comment_form.php: Remove redundant label for the comment box
by canyonknight 10 Oct '12

10 Oct '12

Comment box already uses <h2> tag. Additional label is not needed. Reported-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- web/template/pkg_comment_form.php | 1 - 1 file changed, 1 deletion(-) diff --git a/web/template/pkg_comment_form.php b/web/template/pkg_comment_form.php index 9315b0a..a0e7f68 100644 --- a/web/template/pkg_comment_form.php +++ b/web/template/pkg_comment_form.php @@ -12,7 +12,6 @@ if (isset($_REQUEST['comment']) && check_token()) { <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> </div> <p> - <label for="id_comment"><?= __("Comment") . ':' ?></label> <textarea id="id_comment" name="comment" cols="80" rows="10"></textarea> </p> <p> -- 1.7.12.2

2 2

[aur-dev] [PATCH] pkgsubmit.php: Fix package version not updating
by canyonknight 09 Oct '12

09 Oct '12

Parameters were not correct for a package update operation. Fix regression of 763cbf8373e3373254ad18f5b69fd16efdc6fd5c Fixes FS#31868 Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- web/html/pkgsubmit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 09e95ca..efd90e1 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -381,7 +381,7 @@ if ($uid): } # Update package data - update_pkgdetails($packageID, $new_pkgbuild['pkgname'], $new_pkgbuild['license'], $pkg_version, "", $new_pkgbuild['pkgdesc'], $new_pkgbuild['url'], "", $uid, $dbh); + update_pkgdetails($new_pkgbuild['pkgname'], $new_pkgbuild['license'], $pkg_version, $new_pkgbuild['pkgdesc'], $new_pkgbuild['url'], $uid, $packageID, $dbh); } else { # This is a brand new package new_pkgdetails($new_pkgbuild['pkgname'], $new_pkgbuild['license'], $pkg_version, $category_id, $new_pkgbuild['pkgdesc'], $new_pkgbuild['url'], $uid, $dbh); -- 1.7.12.2

1 0

[aur-dev] [PATCH] pkgfuncs.inc.php: Fix blacklisting functionality
by canyonknight 09 Oct '12

09 Oct '12

An array that contains whether the package is blacklisted is being improperly used for a comparison. Use fetchColumn() to avoid the array completely and compare a value directly. Regression with e171f6f34eeacf35cf7142b4788d43e7d0978546 Fixes FS#31867 Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- web/lib/pkgfuncs.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 0072856..baa9aa1 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -428,7 +428,7 @@ function pkgname_is_blacklisted($name, $dbh=NULL) { $result = $dbh->query($q); if (!$result) return false; - return ($result->fetch(PDO::FETCH_NUM) > 0); + return ($result->fetchColumn() > 0); } /** -- 1.7.12.2

1 0