February 2014 - Aur-dev - lists.archlinux.org

[aur-dev] Feature Request
by John D Jones III 13 Feb '14

13 Feb '14

Not sure if this is the right way to do this, but, I guess I'll find out. I would like it if there was a way to display maintainer info in a search query. So, say I search vim and want to see all the maintainers who have a PKGBUILD in AUR with vim in it's name/description and perhaps, a list of all maintainers, their last submission date, number of packages, Number of Out of Date packages, IRC nick etc. I would imagine it'd be relatively simple, an SQL query and leverage the current search result page to display the fields. Thoughts? -- Thanks, John D Jones III UNIX Zealot; Perl Lover unixgeek1972(a)gmail.com jnbek1972(a)gmail.com http://zoelife4u.org/

1 0

[aur-dev] [PATCH] passreset.php: Make error messages translatable
by Lukas Fleischer 10 Feb '14

10 Feb '14

This fixes a regression introduced in commit 48b7407 (passreset.php: Refactor HTML, 2014-01-08). Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/passreset.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/html/passreset.php b/web/html/passreset.php index e926161..6fade6b 100644 --- a/web/html/passreset.php +++ b/web/html/passreset.php @@ -62,9 +62,9 @@ html_header(__("Password Reset")); <h2><?= __("Password Reset"); ?></h2> <?php if ($step == 'confirm'): ?> - <p>Check your e-mail for the confirmation link.</p> + <p><?= __('Check your e-mail for the confirmation link.') ?></p> <?php elseif ($step == 'complete'): ?> - <p>Your password has been reset successfully.</p> + <p><?= __('Your password has been reset successfully.') ?></p> <?php elseif (isset($_GET['resetkey'])): ?> <?php if ($error): ?> <ul class="errorlist"><li><?= $error ?></li></ul> -- 1.8.5.4

1 0

[aur-dev] [PATCH 1/3] Highlight the AUR link in the navigation bar
by Lukas Fleischer 10 Feb '14

10 Feb '14

Fixes FS#38498. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/css/aur.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/html/css/aur.css b/web/html/css/aur.css index b78ce3e..bed39e8 100644 --- a/web/html/css/aur.css +++ b/web/html/css/aur.css @@ -1,4 +1,8 @@ /* AUR-specific customizations to "archweb.css". */ +#archnavbar.anb-aur ul li#anb-aur a { + color: white !important; +} + #lang_sub { float: right; } -- 1.8.5.4

1 2

[aur-dev] [PATCH 1/3] Remove LastVoted column
by Lukas Fleischer 09 Feb '14

09 Feb '14

This has been introduced by commit aae43d9 (started working on package comments, 2005-03-05) but it seems to be of no practical use. Remove the field to save some space. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- schema/aur-schema.sql | 1 - web/lib/acctfuncs.inc.php | 3 --- web/lib/pkgfuncs.inc.php | 6 ------ web/template/account_details.php | 6 ------ web/template/account_search_results.php | 2 -- web/template/search_accounts_form.php | 1 - 6 files changed, 19 deletions(-) diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql index c01701c..86f7563 100644 --- a/schema/aur-schema.sql +++ b/schema/aur-schema.sql @@ -32,7 +32,6 @@ CREATE TABLE Users ( LangPreference VARCHAR(5) NOT NULL DEFAULT 'en', IRCNick VARCHAR(32) NOT NULL DEFAULT '', PGPKey VARCHAR(40) NULL DEFAULT NULL, - LastVoted BIGINT UNSIGNED NOT NULL DEFAULT 0, LastLogin BIGINT UNSIGNED NOT NULL DEFAULT 0, LastLoginIPAddress INTEGER UNSIGNED NOT NULL DEFAULT 0, InactivityTS BIGINT UNSIGNED NOT NULL DEFAULT 0, diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index f705574..0207bbd 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -373,9 +373,6 @@ function search_results_page($UTYPE,$O=0,$SB="",$U="",$T="", case 'i': $q.= "ORDER BY IRCNick, AccountTypeID "; break; - case 'v': - $q.= "ORDER BY LastVoted, Username "; - break; default: $q.= "ORDER BY Username, AccountTypeID "; break; diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 59cc975..5800a26 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -1072,12 +1072,6 @@ function pkg_vote ($atype, $ids, $action=true) { $dbh->exec($q); if ($action) { - $q = "UPDATE Users SET LastVoted = UNIX_TIMESTAMP() "; - $q.= "WHERE ID = $uid"; - $dbh->exec($q); - } - - if ($action) { return array(true, __("Your votes have been cast for the selected packages.")); } else { return array(true, __("Your votes have been removed from the selected packages.")); diff --git a/web/template/account_details.php b/web/template/account_details.php index 680a52e..5ba01d9 100644 --- a/web/template/account_details.php +++ b/web/template/account_details.php @@ -44,12 +44,6 @@ </td> </tr> <tr> - <th><?= __("Last Voted") . ":" ?></th> - <td> - <?= $row["LastVoted"] ? date("Y-m-d", $row["LastVoted"]) : __("Never"); ?> - </td> - </tr> - <tr> <th>Links:</th> <td><ul> <li><a href="<?= get_uri('/packages/'); ?>?K=<?= $row['Username'] ?>&SeB=m"><?= __("View this user's packages") ?></a></li> diff --git a/web/template/account_search_results.php b/web/template/account_search_results.php index ae7c112..bd4ee29 100644 --- a/web/template/account_search_results.php +++ b/web/template/account_search_results.php @@ -13,7 +13,6 @@ else: <th><?= __("Real Name") ?></th> <th><?= __("IRC Nick") ?></th> <th><?= __("PGP Key Fingerprint") ?></th> - <th><?= __("Last Voted") ?></th> <th><?= __("Edit Account") ?></th> </tr> </thead> @@ -42,7 +41,6 @@ else: <td><?php $row["RealName"] ? print htmlspecialchars($row["RealName"],ENT_QUOTES) : print " " ?></td> <td><?php $row["IRCNick"] ? print htmlspecialchars($row["IRCNick"],ENT_QUOTES) : print " " ?></td> <td><?php $row["PGPKey"] ? print html_format_pgp_fingerprint($row["PGPKey"]) : print " " ?></td> - <td><?php $row["LastVoted"] ? print date("Y-m-d", $row["LastVoted"]) : print __("Never") ?></td> <td> <?php if ($UTYPE == "Trusted User" && $row["AccountType"] == "Developer"): diff --git a/web/template/search_accounts_form.php b/web/template/search_accounts_form.php index 202b1aa..d7f54be 100644 --- a/web/template/search_accounts_form.php +++ b/web/template/search_accounts_form.php @@ -57,7 +57,6 @@ <option value="t"><?= __("Account Type"); ?></option> <option value="r"><?= __("Real Name"); ?></option> <option value="i"><?= __("IRC Nick"); ?></option> - <option value="v"><?= __("Last vote"); ?></option> </select> </td> </tr> -- 1.8.5.4

1 2

[aur-dev] [PATCH 1/8] Style fixes: Capitalization of "true" and "false"
by Lukas Fleischer 07 Feb '14

07 Feb '14

Use "true" instead of "TRUE" and "false" instead of "FALSE" or "False". Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/packages.php | 6 +++--- web/lib/Archive/Tar.php | 2 +- web/lib/gettext.php | 4 ++-- web/lib/pkgfuncs.inc.php | 18 +++++++++--------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/web/html/packages.php b/web/html/packages.php index a9f6263..f5ecf94 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -64,11 +64,11 @@ if (check_token()) { } elseif (current_action("do_Adopt")) { list($ret, $output) = pkg_adopt($atype, $ids, true); } elseif (current_action("do_Disown")) { - list($ret, $output) = pkg_adopt($atype, $ids, False); + list($ret, $output) = pkg_adopt($atype, $ids, false); } elseif (current_action("do_Vote")) { list($ret, $output) = pkg_vote($atype, $ids, true); } elseif (current_action("do_UnVote")) { - list($ret, $output) = pkg_vote($atype, $ids, False); + list($ret, $output) = pkg_vote($atype, $ids, false); } elseif (current_action("do_Delete")) { if (isset($_POST['confirm_Delete'])) { if (!isset($_POST['merge_Into']) || empty($_POST['merge_Into'])) { @@ -92,7 +92,7 @@ if (check_token()) { } elseif (current_action("do_Notify")) { list($ret, $output) = pkg_notify($atype, $ids); } elseif (current_action("do_UnNotify")) { - list($ret, $output) = pkg_notify($atype, $ids, False); + list($ret, $output) = pkg_notify($atype, $ids, false); } elseif (current_action("do_DeleteComment")) { list($ret, $output) = pkg_delete_comment($atype); } elseif (current_action("do_ChangeCategory")) { diff --git a/web/lib/Archive/Tar.php b/web/lib/Archive/Tar.php index 9249a06..32a2ccc 100644 --- a/web/lib/Archive/Tar.php +++ b/web/lib/Archive/Tar.php @@ -1566,7 +1566,7 @@ class Archive_Tar extends PEAR while (strlen($v_binary_data = $this->_readBlock()) != 0) { - $v_extract_file = FALSE; + $v_extract_file = false; $v_extraction_stopped = 0; if (!$this->_readHeader($v_binary_data, $v_header)) diff --git a/web/lib/gettext.php b/web/lib/gettext.php index 5064047..4ccd75d 100644 --- a/web/lib/gettext.php +++ b/web/lib/gettext.php @@ -410,7 +410,7 @@ class gettext_reader { function pgettext($context, $msgid) { $key = $context . chr(4) . $msgid; $ret = $this->translate($key); - if (strpos($ret, "\004") !== FALSE) { + if (strpos($ret, "\004") !== false) { return $msgid; } else { return $ret; @@ -420,7 +420,7 @@ class gettext_reader { function npgettext($context, $singular, $plural, $number) { $key = $context . chr(4) . $singular; $ret = $this->ngettext($key, $plural, $number); - if (strpos($ret, "\004") !== FALSE) { + if (strpos($ret, "\004") !== false) { return $singular; } else { return $ret; diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 72daaf4..72c64f6 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -20,7 +20,7 @@ function canDeleteComment($comment_id=0, $atype="", $uid=0) { } if ($atype == "Trusted User" || $atype == "Developer") { # A TU/Dev can delete any comment - return TRUE; + return true; } $dbh = DB::connect(); $q = "SELECT COUNT(ID) AS CNT "; @@ -31,10 +31,10 @@ function canDeleteComment($comment_id=0, $atype="", $uid=0) { if ($result != NULL) { $row = $result->fetch(PDO::FETCH_ASSOC); if ($row['CNT'] > 0) { - return TRUE; + return true; } } - return FALSE; + return false; } /** @@ -55,12 +55,12 @@ function canDeleteCommentArray($comment, $atype="", $uid=0) { return false; } elseif ($atype == "Trusted User" || $atype == "Developer") { # A TU/Dev can delete any comment - return TRUE; + return true; } else if ($comment['UsersID'] == $uid) { # User's own comment - return TRUE; + return true; } - return FALSE; + return false; } /** @@ -76,10 +76,10 @@ function canDeleteCommentArray($comment, $atype="", $uid=0) { function canSubmitBlacklisted($atype = "") { if ($atype == "Trusted User" || $atype == "Developer") { # Only TUs/Devs can submit blacklisted packages. - return TRUE; + return true; } else { - return FALSE; + return false; } } @@ -1194,7 +1194,7 @@ function pkg_notify ($atype, $ids, $action=true) { } if ($first) - $first = False; + $first = false; else $output .= ", "; -- 1.8.5.3

2 9

[aur-dev] [PATCH] Do not allow unauthenticated users to delete comments
by Lukas Fleischer 06 Feb '14

06 Feb '14

Since commit fb7bde3 (Add support for anonymous comments, 2014-02-04), we support comments with no specific author. Add a check to canDeleteComment() and canDeleteCommentArray() to ensure an unauthenticated user cannot delete such comments. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/pkgfuncs.inc.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 80165c9..72daaf4 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -14,6 +14,10 @@ include_once("config.inc.php"); * @return bool True if the user can delete the comment, otherwise false */ function canDeleteComment($comment_id=0, $atype="", $uid=0) { + if (!$uid) { + /* Unauthenticated users cannot delete anything. */ + return false; + } if ($atype == "Trusted User" || $atype == "Developer") { # A TU/Dev can delete any comment return TRUE; @@ -46,7 +50,10 @@ function canDeleteComment($comment_id=0, $atype="", $uid=0) { * @return bool True if the user can delete the comment, otherwise false */ function canDeleteCommentArray($comment, $atype="", $uid=0) { - if ($atype == "Trusted User" || $atype == "Developer") { + if (!$uid) { + /* Unauthenticated users cannot delete anything. */ + return false; + } elseif ($atype == "Trusted User" || $atype == "Developer") { # A TU/Dev can delete any comment return TRUE; } else if ($comment['UsersID'] == $uid) { -- 1.8.5.3

1 0

[aur-dev] [PATCH] Add support for anonymous comments
by Lukas Fleischer 05 Feb '14

05 Feb '14

This allows for removing users without also removing the corresponding comments. Instead, all comments from deleted users will be displayed as "Anonymous comment". Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- UPGRADING | 17 +++++++++++++++++ support/schema/aur-schema.sql | 4 ++-- web/lib/pkgfuncs.inc.php | 10 +++++----- web/template/pkg_comments.php | 10 +++++++++- 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/UPGRADING b/UPGRADING index 9a0f44d..9736ef0 100644 --- a/UPGRADING +++ b/UPGRADING @@ -1,6 +1,23 @@ Upgrading ========= +From 2.3.1 to 3.0.0 +------------------- + +1. Drop the user ID foreign key from the "PackageComments" table: + +`ALTER TABLE PackageComments DROP FOREIGN KEY PackageComments_ibfk_1;` should +work in most cases. Otherwise, check the output of `SHOW CREATE TABLE +PackageComments;` and use the foreign key name shown there. + +2. Add support for anonymous comments: + +---- +ALTER TABLE PackageComments + MODIFY UsersID INTEGER UNSIGNED NULL DEFAULT NULL, + ADD FOREIGN KEY (UsersID) REFERENCES Users(ID) ON DELETE SET NULL; +---- + From 2.2.0 to 2.3.0 ------------------- diff --git a/support/schema/aur-schema.sql b/support/schema/aur-schema.sql index 25e828e..c01701c 100644 --- a/support/schema/aur-schema.sql +++ b/support/schema/aur-schema.sql @@ -161,14 +161,14 @@ CREATE UNIQUE INDEX VoteUsersIDPackageID ON PackageVotes (UsersID, PackageID); CREATE TABLE PackageComments ( ID BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, PackageID INTEGER UNSIGNED NOT NULL, - UsersID INTEGER UNSIGNED NOT NULL, + UsersID INTEGER UNSIGNED NULL DEFAULT NULL, Comments TEXT NOT NULL DEFAULT '', CommentTS BIGINT UNSIGNED NOT NULL DEFAULT 0, DelUsersID INTEGER UNSIGNED NULL DEFAULT NULL, PRIMARY KEY (ID), INDEX (UsersID), INDEX (PackageID), - FOREIGN KEY (UsersID) REFERENCES Users(ID) ON DELETE CASCADE, + FOREIGN KEY (UsersID) REFERENCES Users(ID) ON SET NULL, FOREIGN KEY (DelUsersID) REFERENCES Users(ID) ON DELETE CASCADE, FOREIGN KEY (PackageID) REFERENCES Packages(ID) ON DELETE CASCADE ) ENGINE = InnoDB; diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index c1a64f7..80165c9 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -208,11 +208,11 @@ function package_comments($pkgid) { if ($pkgid > 0) { $dbh = DB::connect(); $q = "SELECT PackageComments.ID, UserName, UsersID, Comments, CommentTS "; - $q.= "FROM PackageComments, Users "; - $q.= "WHERE PackageComments.UsersID = Users.ID"; - $q.= " AND PackageID = " . $pkgid; - $q.= " AND DelUsersID IS NULL"; # only display non-deleted comments - $q.= " ORDER BY CommentTS DESC"; + $q.= "FROM PackageComments LEFT JOIN Users "; + $q.= "ON PackageComments.UsersID = Users.ID "; + $q.= "WHERE PackageID = " . $pkgid . " "; + $q.= "AND DelUsersID IS NULL "; # only display non-deleted comments + $q.= "ORDER BY CommentTS DESC"; if (!isset($_GET['comments'])) { $q.= " LIMIT 10"; diff --git a/web/template/pkg_comments.php b/web/template/pkg_comments.php index 2ed6420..88e739e 100644 --- a/web/template/pkg_comments.php +++ b/web/template/pkg_comments.php @@ -10,7 +10,7 @@ $pkgname = $row['Name']; </h3> <?php while (list($indx, $row) = each($comments)): ?> - <?php if ($SID): + <?php if ($row['UserName'] && $SID): $row['UserName'] = "<a href=\"" . get_user_uri($row['UserName']) . "\">{$row['UserName']}</a>"; endif; ?> <h4> @@ -22,10 +22,18 @@ $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> + <?php if ($row['UserName']): ?> <?= __('Comment by %s', $row['UserName']) ?> + <?php else: ?> + <?= __('Anonymous comment') ?> + <?php endif; ?> </form> <?php else: ?> + <?php if ($row['UserName']): ?> <?= __('Comment by %s', $row['UserName']) ?> + <?php else: ?> + <?= __('Anonymous comment') ?> + <?php endif; ?> <?php endif; ?> </h4> <p class="timestamp"><?= gmdate('Y-m-d H:i', $row['CommentTS']) ?></p> -- 1.8.5.3

4 3

[aur-dev] [RFC/PATCH] Hide intermediate voting results
by Lukas Fleischer 03 Feb '14

03 Feb '14

In order to make votes as neutral as possible, current yes/no votes should not be shown until the voting period is over. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/template/tu_details.php | 4 ++++ web/template/tu_list.php | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/web/template/tu_details.php b/web/template/tu_details.php index 5fe66c0..fca1815 100644 --- a/web/template/tu_details.php +++ b/web/template/tu_details.php @@ -62,17 +62,21 @@ if ($yes > $active_tus / 2) { <table> <tr> + <?php if (!$isrunning): ?> <th><?= __("Yes") ?></th> <th><?= __("No") ?></th> <th><?= __("Abstain") ?></th> + <?php endif; ?> <th><?= __("Total") ?></th> <th><?= __('Voted') ?></th> <th><?= __('Participation') ?></th> </tr> <tr> + <?php if (!$isrunning): ?> <td><?= $yes ?></td> <td><?= $no ?></td> <td><?= $abstain ?></td> + <?php endif; ?> <td><?= $total ?></td> <td> <?php if ($hasvoted == 0): ?> diff --git a/web/template/tu_list.php b/web/template/tu_list.php index 6ad9f90..b3e1073 100644 --- a/web/template/tu_list.php +++ b/web/template/tu_list.php @@ -17,8 +17,10 @@ <th><a href="?off=<?= $off ?>&by=<?= $by_next ?>"><?= __("Start") ?></a></th> <th><?= __("End") ?></th> <th><?= __("User") ?></th> + <?php if ($type != __("Current Votes")): ?> <th><?= __("Yes") ?></th> <th><?= __("No") ?></th> + <?php endif; ?> <th><?= __('Voted') ?></th> </tr> </thead> @@ -46,8 +48,10 @@ endif; ?> </td> + <?php if ($type != __("Current Votes")): ?> <td><?= $row['Yes'] ?></td> <td><?= $row['No'] ?></td> + <?php endif; ?> <td> <?php if (tu_voted($row['ID'], uid_from_sid($_COOKIE["AURSID"]))): ?> <span style="color: green; font-weight: bold"><?= __("Yes") ?></span> -- 1.8.5.3

1 0

[aur-dev] [PATCH] tu_details.php: Fix unknown result check
by Lukas Fleischer 03 Feb '14

03 Feb '14

Quorum is a decimal field, so checking "!$quorum" does not work. Use the number of active TUs instead which is how we already check whether participation information is available in other places. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/template/tu_details.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/tu_details.php b/web/template/tu_details.php index c546eb7..5fe66c0 100644 --- a/web/template/tu_details.php +++ b/web/template/tu_details.php @@ -46,7 +46,7 @@ if ($yes > $active_tus / 2) { <?php if ($isrunning == 0): ?> <br /> <?= __("Result") ?>: - <?php if (!$quorum): ?> + <?php if ($active_tus == 0): ?> <span><?= __("unknown") ?></span> <?php elseif ($vote_accepted): ?> <span style="color: green; font-weight: bold"><?= __("Accepted") ?></span> -- 1.8.5.3

1 0

[aur-dev] [PATCH] account_details.php: Add link to edit a user's account
by canyonknight 01 Feb '14

01 Feb '14

This improves the ability to edit a user's account directly through UI features rather than manually appending 'edit' to the URL or searching for the account and selecting edit. Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- web/template/account_details.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/template/account_details.php b/web/template/account_details.php index 02ed32b..1f10bc1 100644 --- a/web/template/account_details.php +++ b/web/template/account_details.php @@ -53,6 +53,10 @@ <th>Links:</th> <td> <a href="<?= get_uri('/packages/'); ?>?K=<?= $row['Username'] ?>&SeB=m"><?= __("View this user's packages") ?></a> + <?php if (can_edit_account($atype, $row, uid_from_sid($_COOKIE['AURSID']))): ?> + <br /> + <a href="<?= get_user_uri($row['Username']); ?>edit"><?= __("Edit this user's account") ?></a> + <?php endif; ?> </td> </tr> </table> -- 1.8.5.3

2 5