- Aur-dev - lists.archlinux.org

[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

[aur-dev] [PATCH] Sort last TU votes by vote and by user name
by Lukas Fleischer 01 Feb '14

01 Feb '14

Instead of using a random secondary order, sort by the ID of the last vote first, then by user name. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/acctfuncs.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index b4081b5..aee56e2 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -1007,7 +1007,7 @@ function last_votes_list() { $q .= "TU_VoteInfo, Users WHERE TU_VoteInfo.ID = TU_Votes.VoteID AND "; $q .= "TU_VoteInfo.End < UNIX_TIMESTAMP() AND "; $q .= "Users.ID = TU_Votes.UserID AND Users.AccountTypeID = 2 "; - $q .= "GROUP BY UserID ORDER BY LastVote DESC"; + $q .= "GROUP BY UserID ORDER BY LastVote DESC, UserName ASC"; $result = $dbh->query($q); $details = array(); -- 1.8.5.3

1 0

[aur-dev] Using git as a backend for the AUR
by Sebastian Wilzbach 28 Jan '14

28 Jan '14

Hi, I somehow found this old discussion about using git as a backend to the AUR [1]. There has never been a consent on how this integration should work. In my eyes we should move forward and get this bug [2] resolved. So I would like to help this project, relive the old discussion and bring it to a acceptable conclusion. (at least in theory) 1. Does anyone remember what the last common stance was? 2. Is there anybody out there who is also interested in a solution? [1] https://www.mail-archive.com/aur-dev@archlinux.org/msg02139.html [2] https://bugs.archlinux.org/task/23010 Best wishes, Sebastian

2 1

[aur-dev] [PATCH] Further optimize voters.php to only need the package name
by canyonknight 22 Jan '14

22 Jan '14

* Extends changes in 81d4cc13dcae2f159ed937d4ce41e1df7d3c82b0 * Modify getvotes() to use the package name rather than package ID * Rename getvotes() to votes_for_pkgname() for clarity with new changes * Modify routing framework and links to now use package names for voters.php Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- web/html/index.php | 2 +- web/html/voters.php | 4 ++-- web/lib/pkgfuncs.inc.php | 11 ++++++----- web/template/pkg_details.php | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/web/html/index.php b/web/html/index.php index ccc94d2..542d594 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -56,7 +56,7 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { include('pkgmerge.php'); return; case "voters": - $_GET['ID'] = pkgid_from_name($tokens[2]); + $_GET['N'] = $tokens[2]; include('voters.php'); return; default: diff --git a/web/html/voters.php b/web/html/voters.php index 42fe2b5..9a0bdd3 100644 --- a/web/html/voters.php +++ b/web/html/voters.php @@ -4,8 +4,8 @@ include_once('aur.inc.php'); include_once('pkgfuncs.inc.php'); $SID = $_COOKIE['AURSID']; -$pkgname = pkgname_from_id(intval($_GET['ID']); -$votes = getvotes($pkgid); +$pkgname = htmlspecialchars($_GET['N']); +$votes = votes_for_pkgname($pkgname); $atype = account_from_sid($SID); html_header(__("Voters")); diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index a4deee6..870f55a 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -1075,16 +1075,17 @@ function pkg_vote ($atype, $ids, $action=true) { /** * Get all usernames and IDs that voted for a specific package * - * @param string $pkgid The package ID to get all votes for + * @param string $pkgname The name of the package to retrieve votes for * * @return array User IDs and usernames that voted for a specific package */ -function getvotes($pkgid) { +function votes_for_pkgname($pkgname) { $dbh = DB::connect(); - $q = "SELECT UsersID,Username FROM PackageVotes "; - $q.= "LEFT JOIN Users on (UsersID = ID) "; - $q.= "WHERE PackageID = ". $dbh->quote($pkgid) . " "; + $q = "SELECT UsersID,Username,Name FROM PackageVotes "; + $q.= "LEFT JOIN Users on (UsersID = Users.ID) "; + $q.= "LEFT JOIN Packages on (PackageID = Packages.ID) "; + $q.= "WHERE Name = ". $dbh->quote($pkgname) . " "; $q.= "ORDER BY Username"; $result = $dbh->query($q); diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index bc20a22..bd08282 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -194,7 +194,7 @@ if ($row["MaintainerUID"]): <?php if ($USE_VIRTUAL_URLS): ?> <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> + <td><a href="<?= get_uri('/voters/'); ?>?N=<?= htmlspecialchars($row['Name'], ENT_QUOTES) ?>"><?= $votes ?></a></td> <?php endif; ?> <?php else: ?> <td><?= $votes ?></td> -- 1.8.5.3

2 1

[aur-dev] [PATCH] voters.php: Remove extra call to pkgname_from_id()
by canyonknight 20 Jan '14

20 Jan '14

No need to store package ID and call pkgname_from_id() twice when the end goal is the package name. Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- web/html/voters.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/web/html/voters.php b/web/html/voters.php index 9cedeef..42fe2b5 100644 --- a/web/html/voters.php +++ b/web/html/voters.php @@ -4,8 +4,7 @@ include_once('aur.inc.php'); include_once('pkgfuncs.inc.php'); $SID = $_COOKIE['AURSID']; - -$pkgid = intval($_GET['ID']); +$pkgname = pkgname_from_id(intval($_GET['ID']); $votes = getvotes($pkgid); $atype = account_from_sid($SID); @@ -15,7 +14,7 @@ if ($atype == 'Trusted User' || $atype== 'Developer'): ?> <div class="box"> - <h2>Votes for <a href="<?= get_pkg_uri(pkgname_from_id($pkgid)); ?>"><?= pkgname_from_id($pkgid) ?></a></h2> + <h2>Votes for <a href="<?= get_pkg_uri($pkgname); ?>"><?= $pkgname ?></a></h2> <div class="boxbody"> <ul> <?php while (list($indx, $row) = each($votes)): ?> -- 1.8.5.3

2 1