- Aur-dev - lists.archlinux.org

[aur-dev][PATCH] Fix notifications emails going to the right people
by Eli Schwartz 30 Aug '18

30 Aug '18

The notify script expects to see the userid followed by additional arguments like the pkgbase id, however, these were getting sent swapped around (presumably due to the similarity with the db connection which expects them in the other order when processing SQL statements). As a result, some random userid with the same id as the pkgbase, got sent a notification regarding some package with the same id as the real user's id. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- aurweb/git/serve.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/aurweb/git/serve.py b/aurweb/git/serve.py index 93ff34c..2882780 100755 --- a/aurweb/git/serve.py +++ b/aurweb/git/serve.py @@ -107,7 +107,7 @@ def pkgbase_adopt(pkgbase, user, privileged): [pkgbase_id, userid]) conn.commit() - subprocess.Popen((notify_cmd, 'adopt', str(pkgbase_id), str(userid))) + subprocess.Popen((notify_cmd, 'adopt', str(userid), str(pkgbase_id))) conn.close() @@ -165,8 +165,8 @@ def pkgbase_set_comaintainers(pkgbase, userlist, user, privileged): cur = conn.execute("INSERT INTO PackageComaintainers " + "(PackageBaseID, UsersID, Priority) " + "VALUES (?, ?, ?)", [pkgbase_id, userid, i]) - subprocess.Popen((notify_cmd, 'comaintainer-add', str(pkgbase_id), - str(userid))) + subprocess.Popen((notify_cmd, 'comaintainer-add', str(userid), + str(pkgbase_id))) else: cur = conn.execute("UPDATE PackageComaintainers " + "SET Priority = ? " + @@ -179,7 +179,7 @@ def pkgbase_set_comaintainers(pkgbase, userlist, user, privileged): "WHERE PackageBaseID = ? AND UsersID = ?", [pkgbase_id, userid]) subprocess.Popen((notify_cmd, 'comaintainer-remove', - str(pkgbase_id), str(userid))) + str(userid), str(pkgbase_id))) conn.commit() conn.close() @@ -266,7 +266,7 @@ def pkgbase_disown(pkgbase, user, privileged): if userid == 0: raise aurweb.exceptions.InvalidUserException(user) - subprocess.Popen((notify_cmd, 'disown', str(pkgbase_id), str(userid))) + subprocess.Popen((notify_cmd, 'disown', str(userid), str(pkgbase_id))) conn.close() -- 2.18.0

2 3

[PATCH 1/2] t2500: use unique identifiers
by Lukas Fleischer 12 Aug '18

12 Aug '18

Use disjoint sets of IDs for users, package bases, package comments and package requests to ensure the notification script expects the parameters in the same order we pass them. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- test/t2500-notify.sh | 75 +++++++++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 36 deletions(-) diff --git a/test/t2500-notify.sh b/test/t2500-notify.sh index b2bad1c..3f5a09c 100755 --- a/test/t2500-notify.sh +++ b/test/t2500-notify.sh @@ -6,18 +6,19 @@ test_description='notify tests' test_expect_success 'Test out-of-date notifications.' ' cat <<-EOD | sqlite3 aur.db && - INSERT INTO PackageBases (ID, Name, MaintainerUID, SubmittedTS, ModifiedTS, FlaggerComment) VALUES (1, "foobar", 1, 0, 0, "This is a test OOD comment."); - INSERT INTO PackageBases (ID, Name, MaintainerUID, SubmittedTS, ModifiedTS, FlaggerComment) VALUES (2, "foobar2", 2, 0, 0, ""); - INSERT INTO PackageBases (ID, Name, MaintainerUID, SubmittedTS, ModifiedTS, FlaggerComment) VALUES (3, "foobar3", NULL, 0, 0, ""); - INSERT INTO PackageBases (ID, Name, MaintainerUID, SubmittedTS, ModifiedTS, FlaggerComment) VALUES (4, "foobar4", 1, 0, 0, ""); - INSERT INTO PackageComaintainers (PackageBaseID, UsersID, Priority) VALUES (1, 2, 1); - INSERT INTO PackageComaintainers (PackageBaseID, UsersID, Priority) VALUES (1, 4, 2); - INSERT INTO PackageComaintainers (PackageBaseID, UsersID, Priority) VALUES (2, 3, 1); - INSERT INTO PackageComaintainers (PackageBaseID, UsersID, Priority) VALUES (2, 5, 2); - INSERT INTO PackageComaintainers (PackageBaseID, UsersID, Priority) VALUES (3, 4, 1); + /* Use package base IDs which can be distinguished from user IDs. */ + INSERT INTO PackageBases (ID, Name, MaintainerUID, SubmittedTS, ModifiedTS, FlaggerComment) VALUES (1001, "foobar", 1, 0, 0, "This is a test OOD comment."); + INSERT INTO PackageBases (ID, Name, MaintainerUID, SubmittedTS, ModifiedTS, FlaggerComment) VALUES (1002, "foobar2", 2, 0, 0, ""); + INSERT INTO PackageBases (ID, Name, MaintainerUID, SubmittedTS, ModifiedTS, FlaggerComment) VALUES (1003, "foobar3", NULL, 0, 0, ""); + INSERT INTO PackageBases (ID, Name, MaintainerUID, SubmittedTS, ModifiedTS, FlaggerComment) VALUES (1004, "foobar4", 1, 0, 0, ""); + INSERT INTO PackageComaintainers (PackageBaseID, UsersID, Priority) VALUES (1001, 2, 1); + INSERT INTO PackageComaintainers (PackageBaseID, UsersID, Priority) VALUES (1001, 4, 2); + INSERT INTO PackageComaintainers (PackageBaseID, UsersID, Priority) VALUES (1002, 3, 1); + INSERT INTO PackageComaintainers (PackageBaseID, UsersID, Priority) VALUES (1002, 5, 2); + INSERT INTO PackageComaintainers (PackageBaseID, UsersID, Priority) VALUES (1003, 4, 1); EOD >sendmail.out && - "$NOTIFY" flag 1 1 && + "$NOTIFY" flag 1 1001 && cat <<-EOD >expected && Subject: AUR Out-of-date Notification for foobar To: tu@localhost @@ -81,12 +82,13 @@ test_expect_success 'Test subject and body of welcome notifications.' ' test_expect_success 'Test subject and body of comment notifications.' ' cat <<-EOD | sqlite3 aur.db && - INSERT INTO PackageComments (ID, PackageBaseID, UsersID, Comments, RenderedComment) VALUES (1, 1, 1, "This is a test comment.", "This is a test comment."); - INSERT INTO PackageNotifications (PackageBaseID, UserID) VALUES (1, 2); + /* Use package comments IDs which can be distinguished from other IDs. */ + INSERT INTO PackageComments (ID, PackageBaseID, UsersID, Comments, RenderedComment) VALUES (2001, 1001, 1, "This is a test comment.", "This is a test comment."); + INSERT INTO PackageNotifications (PackageBaseID, UserID) VALUES (1001, 2); UPDATE Users SET CommentNotify = 1 WHERE ID = 2; EOD >sendmail.out && - "$NOTIFY" comment 1 1 1 && + "$NOTIFY" comment 1 1001 2001 && grep ^Subject: sendmail.out >actual && cat <<-EOD >expected && Subject: AUR Comment for foobar @@ -113,7 +115,7 @@ test_expect_success 'Test subject and body of update notifications.' ' UPDATE Users SET UpdateNotify = 1 WHERE ID = 2; EOD >sendmail.out && - "$NOTIFY" update 1 1 && + "$NOTIFY" update 1 1001 && grep ^Subject: sendmail.out >actual && cat <<-EOD >expected && Subject: AUR Package Update: foobar @@ -135,7 +137,7 @@ test_expect_success 'Test subject and body of update notifications.' ' test_expect_success 'Test subject and body of out-of-date notifications.' ' >sendmail.out && - "$NOTIFY" flag 1 1 && + "$NOTIFY" flag 1 1001 && grep ^Subject: sendmail.out >actual && cat <<-EOD >expected && Subject: AUR Out-of-date Notification for foobar @@ -156,7 +158,7 @@ test_expect_success 'Test subject and body of out-of-date notifications.' ' test_expect_success 'Test subject and body of adopt notifications.' ' >sendmail.out && - "$NOTIFY" adopt 1 1 && + "$NOTIFY" adopt 1 1001 && grep ^Subject: sendmail.out >actual && cat <<-EOD >expected && Subject: AUR Ownership Notification for foobar @@ -175,7 +177,7 @@ test_expect_success 'Test subject and body of adopt notifications.' ' test_expect_success 'Test subject and body of co-maintainer addition notifications.' ' >sendmail.out && - "$NOTIFY" comaintainer-add 1 1 && + "$NOTIFY" comaintainer-add 1 1001 && grep ^Subject: sendmail.out >actual && cat <<-EOD >expected && Subject: AUR Co-Maintainer Notification for foobar @@ -193,7 +195,7 @@ test_expect_success 'Test subject and body of co-maintainer addition notificatio test_expect_success 'Test subject and body of co-maintainer removal notifications.' ' >sendmail.out && - "$NOTIFY" comaintainer-remove 1 1 && + "$NOTIFY" comaintainer-remove 1 1001 && grep ^Subject: sendmail.out >actual && cat <<-EOD >expected && Subject: AUR Co-Maintainer Notification for foobar @@ -211,7 +213,7 @@ test_expect_success 'Test subject and body of co-maintainer removal notification test_expect_success 'Test subject and body of delete notifications.' ' >sendmail.out && - "$NOTIFY" delete 1 1 && + "$NOTIFY" delete 1 1001 && grep ^Subject: sendmail.out >actual && cat <<-EOD >expected && Subject: AUR Package deleted: foobar @@ -232,7 +234,7 @@ test_expect_success 'Test subject and body of delete notifications.' ' test_expect_success 'Test subject and body of merge notifications.' ' >sendmail.out && - "$NOTIFY" delete 1 1 2 && + "$NOTIFY" delete 1 1001 1002 && grep ^Subject: sendmail.out >actual && cat <<-EOD >expected && Subject: AUR Package deleted: foobar @@ -255,13 +257,14 @@ test_expect_success 'Test subject and body of merge notifications.' ' test_expect_success 'Test subject and body of request open notifications.' ' cat <<-EOD | sqlite3 aur.db && - INSERT INTO PackageRequests (ID, PackageBaseID, PackageBaseName, UsersID, ReqTypeID, Comments, ClosureComment) VALUES (1, 1, "foobar", 1, 1, "This is a request test comment.", ""); + /* Use package request IDs which can be distinguished from other IDs. */ + INSERT INTO PackageRequests (ID, PackageBaseID, PackageBaseName, UsersID, ReqTypeID, Comments, ClosureComment) VALUES (3001, 1001, "foobar", 1, 1, "This is a request test comment.", ""); EOD >sendmail.out && - "$NOTIFY" request-open 1 1 orphan 1 && + "$NOTIFY" request-open 1 3001 orphan 1001 && grep ^Subject: sendmail.out >actual && cat <<-EOD >expected && - Subject: [PRQ#1] Orphan Request for foobar + Subject: [PRQ#3001] Orphan Request for foobar EOD test_cmp actual expected && sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual && @@ -279,10 +282,10 @@ test_expect_success 'Test subject and body of request open notifications.' ' test_expect_success 'Test subject and body of request open notifications for merge requests.' ' >sendmail.out && - "$NOTIFY" request-open 1 1 merge 1 foobar2 && + "$NOTIFY" request-open 1 3001 merge 1001 foobar2 && grep ^Subject: sendmail.out >actual && cat <<-EOD >expected && - Subject: [PRQ#1] Merge Request for foobar + Subject: [PRQ#3001] Merge Request for foobar EOD test_cmp actual expected && sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual && @@ -301,16 +304,16 @@ test_expect_success 'Test subject and body of request open notifications for mer test_expect_success 'Test subject and body of request close notifications.' ' >sendmail.out && - "$NOTIFY" request-close 1 1 accepted && + "$NOTIFY" request-close 1 3001 accepted && grep ^Subject: sendmail.out >actual && cat <<-EOD >expected && - Subject: [PRQ#1] Deletion Request for foobar Accepted + Subject: [PRQ#3001] Deletion Request for foobar Accepted EOD test_cmp actual expected && sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual && echo >>actual && cat <<-EOD >expected && - Request #1 has been accepted by user [1]. + Request #3001 has been accepted by user [1]. [1] https://aur.archlinux.org/account/user/ EOD @@ -319,36 +322,36 @@ test_expect_success 'Test subject and body of request close notifications.' ' test_expect_success 'Test subject and body of request close notifications (auto-accept).' ' >sendmail.out && - "$NOTIFY" request-close 0 1 accepted && + "$NOTIFY" request-close 0 3001 accepted && grep ^Subject: sendmail.out >actual && cat <<-EOD >expected && - Subject: [PRQ#1] Deletion Request for foobar Accepted + Subject: [PRQ#3001] Deletion Request for foobar Accepted EOD test_cmp actual expected && sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual && echo >>actual && cat <<-EOD >expected && - Request #1 has been accepted automatically by the Arch User Repository - package request system. + Request #3001 has been accepted automatically by the Arch User + Repository package request system. EOD test_cmp actual expected ' test_expect_success 'Test subject and body of request close notifications with closure comment.' ' cat <<-EOD | sqlite3 aur.db && - UPDATE PackageRequests SET ClosureComment = "This is a test closure comment." WHERE ID = 1; + UPDATE PackageRequests SET ClosureComment = "This is a test closure comment." WHERE ID = 3001; EOD >sendmail.out && - "$NOTIFY" request-close 1 1 accepted && + "$NOTIFY" request-close 1 3001 accepted && grep ^Subject: sendmail.out >actual && cat <<-EOD >expected && - Subject: [PRQ#1] Deletion Request for foobar Accepted + Subject: [PRQ#3001] Deletion Request for foobar Accepted EOD test_cmp actual expected && sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual && echo >>actual && cat <<-EOD >expected && - Request #1 has been accepted by user [1]: + Request #3001 has been accepted by user [1]: This is a test closure comment. -- 2.18.0

1 1

[PATCH] Initialize locale directory for tests
by Lukas Fleischer 12 Aug '18

12 Aug '18

Since commit a7865ef (Make the locale directory configurable, 2018-07-22), we need to specify the locale directory in the configuration file. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- test/setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/test/setup.sh b/test/setup.sh index 535e819..5c761f2 100644 --- a/test/setup.sh +++ b/test/setup.sh @@ -31,6 +31,7 @@ aur_request_ml = aur-requests(a)archlinux.org enable-maintenance = 0 maintenance-exceptions = 127.0.0.1 commit_uri = https://aur.archlinux.org/cgit/aur.git/log/?h=%s&id=%s +localedir = $TOPLEVEL/web/locale/ [notifications] notify-cmd = $NOTIFY -- 2.18.0

1 0

[PATCH] Add page for seeing all of a user's comments
by Johannes Löthberg 06 Aug '18

06 Aug '18

Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- web/html/account.php | 69 +++++++++++++++++++++++++++++- web/html/css/aurweb.css | 17 ++++++++ web/html/index.php | 2 + web/html/pkgbase.php | 7 ++- web/lib/acctfuncs.inc.php | 41 ++++++++++++++++++ web/lib/credentials.inc.php | 2 + web/template/account_edit_form.php | 1 + 7 files changed, 136 insertions(+), 3 deletions(-) diff --git a/web/html/account.php b/web/html/account.php index c30a89a..955aa4d 100644 --- a/web/html/account.php +++ b/web/html/account.php @@ -8,7 +8,7 @@ include_once('acctfuncs.inc.php'); # access Account specific functions $action = in_request("Action"); $need_userinfo = array( - "DisplayAccount", "DeleteAccount", "AccountInfo", "UpdateAccount" + "DisplayAccount", "DeleteAccount", "AccountInfo", "UpdateAccount", "ListComments" ); if (in_array($action, $need_userinfo)) { @@ -54,6 +54,8 @@ if ($action == "UpdateAccount") { if ($action == "AccountInfo") { html_header(__('Account') . ' ' . $row['Username']); +} elseif ($action == "ListComments") { + html_header(__('Comments for') . ' ' . $row['Username']); } else { html_header(__('Accounts')); } @@ -61,7 +63,11 @@ if ($action == "AccountInfo") { # Main page processing here # echo "<div class=\"box\">\n"; -echo " <h2>".__("Accounts")."</h2>\n"; +if ($action == "ListComments") { + echo " <h2>".__("Comments for").' '.$row['Username']."</h2>\n"; +} else { + echo " <h2>".__("Accounts")."</h2>\n"; +} if (isset($_COOKIE["AURSID"])) { if ($action == "SearchAccounts") { @@ -166,6 +172,65 @@ if (isset($_COOKIE["AURSID"])) { $row["Username"]); } + } elseif ($action == "ListComments") { + if (has_credential(CRED_ACCOUNT_LIST_COMMENTS)) { + # display the comment list if they're a TU/dev + # + + /* Sanitize paging variables. */ + if (isset($_GET["O"])) { + $_GET["O"] = max(intval($_GET["O"]), 0); + } else { + $_GET["O"] = 0; + } + + if (isset($_GET["PP"])) { + $_GET["PP"] = bound(intval($_GET["PP"]), 5, 250); + } else { + $_GET["PP"] = 10; + } + + $total = account_comments_count($row["ID"]); + + /* Calculate the results to use. */ + $first = $_GET['O'] + 1; + + /* Calculation of pagination links. */ + $per_page = ($_GET['PP'] > 0) ? $_GET['PP'] : 50; + $current = ceil($first / $per_page); + $pages = ceil($total / $per_page); + $templ_pages = array(); + + if ($current > 1) { + $templ_pages['« ' . __('First')] = 0; + $templ_pages['&lsaquo; ' . __('Previous')] = ($current - 2) * $per_page; + } + + if ($current - 5 > 1) + $templ_pages["..."] = false; + + for ($i = max($current - 5, 1); $i <= min($pages, $current + 5); $i++) { + $templ_pages[$i] = ($i - 1) * $per_page; + } + + if ($current + 5 < $pages) + $templ_pages["... "] = false; + + if ($current < $pages) { + $templ_pages[__('Next') . ' &rsaquo;'] = $current * $per_page; + $templ_pages[__('Last') . ' »'] = ($pages - 1) * $per_page; + } + + $username = $row["Username"]; + $userid = $row["ID"]; + $comments = account_comments($row["ID"], $_GET["PP"], $_GET["O"]); + + include('account_comments.php'); + + } else { + print __("You are not allowed to access this area."); + } + } else { if (has_credential(CRED_ACCOUNT_SEARCH)) { # display the search page if they're a TU/dev diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css index f5e1037..ce54a28 100644 --- a/web/html/css/aurweb.css +++ b/web/html/css/aurweb.css @@ -148,3 +148,20 @@ label.confirmation, color: red; font-weight: bold; } + +.commentlist-nav .page { + margin: 0 .25em; +} + +#commentlist-results .commentlist-nav { + float: right; + margin-top: -2.2em; +} + +.commentlist-nav .prev { + margin-right: 1em; +} + +.commentlist-nav .next { + margin-right: 1em; +} diff --git a/web/html/index.php b/web/html/index.php index 2c53cdd..b2cd840 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -142,6 +142,8 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { $_REQUEST['Action'] = "UpdateAccount"; } elseif ($tokens[3] == 'delete') { $_REQUEST['Action'] = "DeleteAccount"; + } elseif ($tokens[3] == 'comments') { + $_REQUEST['Action'] = "ListComments"; } else { header("HTTP/1.0 404 Not Found"); include "./404.php"; diff --git a/web/html/pkgbase.php b/web/html/pkgbase.php index cf9a6c6..8a0c363 100644 --- a/web/html/pkgbase.php +++ b/web/html/pkgbase.php @@ -43,6 +43,7 @@ if (isset($_POST['IDs'])) { /* Perform package base actions. */ $via = isset($_POST['via']) ? $_POST['via'] : NULL; +$return_to = isset($_POST['return_to']) ? $_POST['return_to'] : NULL; $ret = false; $output = ""; $fragment = ""; @@ -133,7 +134,11 @@ if (check_token()) { /* Redirect back to package request page on success. */ header('Location: ' . get_pkgreq_route()); exit(); - } if (isset($base_id)) { + } elseif ((current_action("do_DeleteComment") || + current_action("do_UndeleteComment")) && $return_to) { + header('Location: ' . $return_to); + exit(); + } elseif (isset($base_id)) { /* Redirect back to package base page on success. */ header('Location: ' . get_pkgbase_uri($pkgbase_name) . $fragment); exit(); diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index df57375..9536139 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -1403,3 +1403,44 @@ function accept_terms($uid, $termrev) { $dbh->exec($q); } } + +function account_comments($uid, $limit, $offset=0) { + $dbh = DB::connect(); + $q = "SELECT PackageComments.ID, Comments, "; + $q.= "PackageBaseId, CommentTS, DelTS, EditedTS, B.UserName AS EditUserName, "; + $q.= "C.UserName as DelUserName, RenderedComment, "; + $q.= "PB.ID as PackageBaseID, PB.Name as PackageBaseName "; + $q.= "FROM PackageComments "; + $q.= "LEFT JOIN PackageBases PB ON PackageComments.PackageBaseID = PB.ID "; + $q.= "LEFT JOIN Users A ON PackageComments.UsersID = A.ID "; + $q.= "LEFT JOIN Users B ON PackageComments.EditedUsersID = B.ID "; + $q.= "LEFT JOIN Users C ON PackageComments.DelUsersID = C.ID "; + $q.= "WHERE A.ID = " . $dbh->quote($uid) . " "; + $q.= "ORDER BY CommentTS DESC"; + + if ($limit > 0) { + $q.=" LIMIT " . $limit; + } + + if ($offset > 0) { + $q.=" OFFSET " . $offset; + } + + $result = $dbh->query($q); + if (!$result) { + return null; + } + + return $result->fetchAll(); +} + +function account_comments_count($uid) { + $dbh = DB::connect(); + $q = "SELECT COUNT(*) "; + $q.= "FROM PackageComments "; + $q.= "LEFT JOIN Users A ON PackageComments.UsersID = A.ID "; + $q.= "WHERE A.ID = " . $dbh->quote($uid); + + $result = $dbh->query($q); + return $result->fetch(PDO::FETCH_NUM)[0]; +} diff --git a/web/lib/credentials.inc.php b/web/lib/credentials.inc.php index d8698a8..5d90cfc 100644 --- a/web/lib/credentials.inc.php +++ b/web/lib/credentials.inc.php @@ -5,6 +5,7 @@ define("CRED_ACCOUNT_EDIT", 2); define("CRED_ACCOUNT_EDIT_DEV", 3); define("CRED_ACCOUNT_LAST_LOGIN", 4); define("CRED_ACCOUNT_SEARCH", 5); +define("CRED_ACCOUNT_LIST_COMMENTS", 28); define("CRED_COMMENT_DELETE", 6); define("CRED_COMMENT_UNDELETE", 27); define("CRED_COMMENT_VIEW_DELETED", 22); @@ -59,6 +60,7 @@ function has_credential($credential, $approved_users=array()) { case CRED_ACCOUNT_EDIT: case CRED_ACCOUNT_LAST_LOGIN: case CRED_ACCOUNT_SEARCH: + case CRED_ACCOUNT_LIST_COMMENTS: case CRED_COMMENT_DELETE: case CRED_COMMENT_UNDELETE: case CRED_COMMENT_VIEW_DELETED: diff --git a/web/template/account_edit_form.php b/web/template/account_edit_form.php index 6eff81b..38d5274 100644 --- a/web/template/account_edit_form.php +++ b/web/template/account_edit_form.php @@ -2,6 +2,7 @@ <p> <?= __('Click %shere%s if you want to permanently delete this account.', '<a href="' . get_user_uri($N) . 'delete/' . '">', '</a>') ?> <?= __('Click %shere%s for user details.', '<a href="' . get_user_uri($N) . '">', '</a>') ?> + <?= __('Click %shere%s to list the comments made by this account.', '<a href="' . get_user_uri($N) . 'comments/' . '">', '</a>') ?> </p> <form id="edit-profile-form" action="<?= get_user_uri($N) . 'update/'; ?>" method="post"> -- 2.18.0

2 11

[PATCH] Make the locale directory configurable
by Lukas Fleischer 22 Jul '18

22 Jul '18

Add a new configuration option to specify the locale directory to use. This allows the Python scripts to find the translations, even when not being run from the source code checkout. At the same time, multiple parallel aurweb setups can still use different sets of translations. Fixes FS#59278. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- aurweb/l10n.py | 5 ++++- conf/config.defaults | 1 + web/lib/translator.inc.php | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/aurweb/l10n.py b/aurweb/l10n.py index 66e0f1c..a7c0103 100644 --- a/aurweb/l10n.py +++ b/aurweb/l10n.py @@ -1,8 +1,11 @@ import gettext +import aurweb.config + class Translator: def __init__(self): + self._localedir = aurweb.config.get('options', 'localedir') self._translator = {} def translate(self, s, lang): @@ -10,7 +13,7 @@ class Translator: return s if lang not in self._translator: self._translator[lang] = gettext.translation("aurweb", - "../../web/locale", + self._localedir, languages=[lang]) self._translator[lang].install() return _(s) diff --git a/conf/config.defaults b/conf/config.defaults index be37f43..c8bc3a7 100644 --- a/conf/config.defaults +++ b/conf/config.defaults @@ -35,6 +35,7 @@ snapshot_uri = /cgit/aur.git/snapshot/%s.tar.gz enable-maintenance = 1 maintenance-exceptions = 127.0.0.1 render-comment-cmd = /usr/local/bin/aurweb-rendercomment +localedir = /srv/http/aurweb/aur.git/web/locale/ # memcache or apc cache = none memcache_servers = 127.0.0.1:11211 diff --git a/web/lib/translator.inc.php b/web/lib/translator.inc.php index cd944c5..334d0e7 100644 --- a/web/lib/translator.inc.php +++ b/web/lib/translator.inc.php @@ -130,7 +130,8 @@ function set_lang() { setcookie("AURLANG", $LANG, $cookie_time, "/"); } - $streamer = new FileReader('../locale/' . $LANG . + $localedir = config_get('options', 'localedir'); + $streamer = new FileReader($localedir . '/' . $LANG . '/LC_MESSAGES/aurweb.mo'); $l10n = new gettext_reader($streamer, true); -- 2.18.0

1 0

[aur-dev][PATCH] Fix regression in translating anything at all.
by Eli Schwartz 08 Jul '18

08 Jul '18

In commit 840ee20f7b9327fd5e3445af2652b299fdd0ff7f the translations file was renamed but we never actually switched to using the renamed translations. As a result, every single push to the AUR contains the following traceback: remote: Traceback (most recent call last): remote: File "/usr/bin/aurweb-notify", line 11, in <module> remote: load_entry_point('aurweb==4.7.0', 'console_scripts', 'aurweb-notify')() remote: File "/usr/lib/python3.6/site-packages/aurweb-4.7.0-py3.6.egg/aurweb/scripts/notify.py", line 541, in main remote: File "/usr/lib/python3.6/site-packages/aurweb-4.7.0-py3.6.egg/aurweb/scripts/notify.py", line 69, in send remote: File "/usr/lib/python3.6/site-packages/aurweb-4.7.0-py3.6.egg/aurweb/scripts/notify.py", line 56, in get_body_fmt remote: File "/usr/lib/python3.6/site-packages/aurweb-4.7.0-py3.6.egg/aurweb/scripts/notify.py", line 192, in get_body remote: File "/usr/lib/python3.6/site-packages/aurweb-4.7.0-py3.6.egg/aurweb/l10n.py", line 14, in translate remote: File "/usr/lib/python3.6/gettext.py", line 514, in translation remote: raise OSError(ENOENT, 'No translation file found for domain', domain) remote: FileNotFoundError: [Errno 2] No translation file found for domain: 'aur' Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- aurweb/l10n.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aurweb/l10n.py b/aurweb/l10n.py index e58e3fe..66e0f1c 100644 --- a/aurweb/l10n.py +++ b/aurweb/l10n.py @@ -9,7 +9,7 @@ class Translator: if lang == 'en': return s if lang not in self._translator: - self._translator[lang] = gettext.translation("aur", + self._translator[lang] = gettext.translation("aurweb", "../../web/locale", languages=[lang]) self._translator[lang].install() -- 2.18.0

2 3

[PATCH] Rename translation resources from aur to aurweb
by Lukas Fleischer 08 Jul '18

08 Jul '18

* Rename the aur project to aurweb on Transifex. * Rename aur.pot to aurweb.pot. * Update documentation and Makefile. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- .tx/config | 5 ++--- doc/i18n.txt | 8 ++++---- po/Makefile | 16 ++++++++-------- po/{aur.pot => aurweb.pot} | 0 4 files changed, 14 insertions(+), 15 deletions(-) rename po/{aur.pot => aurweb.pot} (100%) diff --git a/.tx/config b/.tx/config index f6f728d..e986f81 100644 --- a/.tx/config +++ b/.tx/config @@ -1,8 +1,7 @@ [main] host = https://www.transifex.com -[aur.aurpot] +[aurweb.aurwebpot] file_filter = po/<lang>.po -source_file = po/aur.pot +source_file = po/aurweb.pot source_lang = en - diff --git a/doc/i18n.txt b/doc/i18n.txt index a1c21fe..8216c08 100644 --- a/doc/i18n.txt +++ b/doc/i18n.txt @@ -5,7 +5,7 @@ This document describes how to create and maintain aurweb translations. Creating an aurweb translation requires a Transifex (http://www.transifex.com/) account. You will need to register with a translation team on the aurweb -project page (http://www.transifex.com/projects/p/aur/) +project page (http://www.transifex.com/projects/p/aurweb/) Creating a New Translation @@ -26,11 +26,11 @@ $ git clone git://git.archlinux.org/aurweb.git aurweb-git 2. Go into the "po/" directory in the aurweb source and run msginit(1) to create a initial translation file from our translation catalog: -$ cd aur-git +$ cd aurweb-git $ git checkout master $ git pull $ cd po -$ msginit -l <locale> -o <locale>.po -i aur.pot +$ msginit -l <locale> -o <locale>.po -i aurweb.pot 3. Use some editor or a translation helper like poedit to add translations: @@ -58,4 +58,4 @@ $ poedit po/<locale>.po 3. Push the updated translation file back to Transifex. Using transifex-client, this works as follows: -$ tx push -r aur.aurpot -t -l <locale> +$ tx push -r aurweb.aurwebpot -t -l <locale> diff --git a/po/Makefile b/po/Makefile index 78073f8..57fa9f7 100644 --- a/po/Makefile +++ b/po/Makefile @@ -44,9 +44,9 @@ all: ${MOFILES} %.mo: %.po msgfmt --check -o $@ $< -%.po-update: %.po aur.pot +%.po-update: %.po aurweb.pot lang=`echo $@ | sed -e 's/\.po-update$$//'`; \ - msgmerge -U --no-location --lang="$$lang" $< aur.pot + msgmerge -U --no-location --lang="$$lang" $< aurweb.pot POTFILES-php: find ../web -type f -name '*.php' -printf '%P\n' | sort >POTFILES-php @@ -55,19 +55,19 @@ POTFILES-py: find ../aurweb -type f -name '*.py' -printf '%P\n' | sort >POTFILES-py update-pot: POTFILES-php POTFILES-py - pkgname=AUR; \ + pkgname=AURWEB; \ pkgver=`sed -n 's/.*"AURWEB_VERSION", "$.*$".*/\1/p' ../web/lib/version.inc.php`; \ - xgettext --default-domain=aur -L php --keyword=__ --keyword=_n:1,2 \ + xgettext --default-domain=aurweb -L php --keyword=__ --keyword=_n:1,2 \ --add-location=file --add-comments=TRANSLATORS: \ --package-name="$$pkgname" --package-version="$$pkgver" \ --msgid-bugs-address='${MSGID_BUGS_ADDRESS}' \ - --directory ../web --files-from POTFILES-php -o aur.pot; \ - xgettext --default-domain=aur -L python --join-existing \ + --directory ../web --files-from POTFILES-php -o aurweb.pot; \ + xgettext --default-domain=aurweb -L python --join-existing \ --keyword=translate \ --add-location=file --add-comments=TRANSLATORS: \ --package-name="$$pkgname" --package-version="$$pkgver" \ --msgid-bugs-address='${MSGID_BUGS_ADDRESS}' \ - --directory ../aurweb --files-from POTFILES-py -o aur.pot + --directory ../aurweb --files-from POTFILES-py -o aurweb.pot update-po: ${MAKE} ${UPDATEPOFILES} @@ -77,7 +77,7 @@ clean: install: all for l in ${LOCALES}; do mkdir -p ${DESTDIR}${PREFIX}/$$l/LC_MESSAGES/; done - for l in ${LOCALES}; do cp $$l.mo ${DESTDIR}${PREFIX}/$$l/LC_MESSAGES/aur.mo; done + for l in ${LOCALES}; do cp $$l.mo ${DESTDIR}${PREFIX}/$$l/LC_MESSAGES/aurweb.mo; done uninstall: for l in ${LOCALES}; do rm -rf ${DESTDIR}${PREFIX}/$$l/LC_MESSAGES/; done diff --git a/po/aur.pot b/po/aurweb.pot similarity index 100% rename from po/aur.pot rename to po/aurweb.pot -- 2.18.0

2 1

aurweb 4.7.0 released
by Lukas Fleischer 07 Jul '18

07 Jul '18

Dear aurweb contributors and users, We are pleased to announce that aurweb 4.7.0 has been released! New features are the possibility to search by depends as well as an API rate limit in the RPC interface. Moreover, co-maintainers can now remove themselves from the co-maintainer list. This release also includes several fixes and improvements to the comment and notification features, as well as other bug fixes. For a comprehensive list of changes, please consult the Git log [2]. As usual, bugs should be reported to the aurweb bug tracker [3]. [1] https://aur.archlinux.org/ [2] https://projects.archlinux.org/aurweb.git/log/?id=v4.7.0 [3] https://bugs.archlinux.org/index.php?project=2

1 0

[PATCH] Sync CSS with archweb
by Lukas Fleischer 07 Jul '18

07 Jul '18

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/css/archweb.css | 43 ++++++---------------------------------- 1 file changed, 6 insertions(+), 37 deletions(-) diff --git a/web/html/css/archweb.css b/web/html/css/archweb.css index d8c66aa..209561f 100644 --- a/web/html/css/archweb.css +++ b/web/html/css/archweb.css @@ -608,17 +608,6 @@ div.widget { margin-bottom: 1.5em; } -/* home: other stuff */ -#konami { - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; - text-align: center; - opacity: 0.6; -} - /* feeds page */ #rss-feeds .rss { padding-right: 20px; @@ -983,8 +972,13 @@ table td.country { width: auto; } -/* dev: dashboard: dashboard and stats area */ +/* tables rows: highlight on mouse-vover */ +#article-list tr:hover, +#clocks-table tr:hover, #dev-dashboard tr:hover, +#dev-todo-lists tr:hover, +#dev-todo-pkglist tr:hover, +#pkglist-results tr:hover, #stats-area tr:hover { background: #ffd; } @@ -1036,7 +1030,6 @@ ul.admin-actions { .todo-table .complete, .signoff-yes, #key-status .signed-yes, -#releng-result .success-yes, #release-list .available-yes { color: green; } @@ -1044,7 +1037,6 @@ ul.admin-actions { .todo-table .incomplete, .signoff-no, #key-status .signed-no, -#releng-result .success-no, #release-list .available-no { color: red; } @@ -1095,25 +1087,6 @@ ul.signoff-list { color: gray; } -/* iso testing feedback form */ -#releng-feedback label { - width: auto; - display: inline; - font-weight: normal; -} - -#releng-feedback ul { - padding-left: 1em; -} - -#releng-feedback li { - list-style: none; -} - -#releng-feedback ul+.helptext { - position: relative; top: -0.9em; -} - /* highlight current website in the navbar */ #archnavbar.anb-home ul li#anb-home a, #archnavbar.anb-packages ul li#anb-packages a, @@ -1126,10 +1099,6 @@ ul.signoff-list { margin: 0.5em 0.33em; } - .visualize-buttons button.active { - depressed: true; - } - .visualize-chart { position: relative; height: 500px; -- 2.18.0

1 0

[PATCH 1/1] This patch implements FS#54906. Ability to query by pkgver via RPC or web request (url)
by nodivbyzero 11 Jun '18

11 Jun '18

--- web/lib/aurjson.class.php | 5 +++++ web/lib/pkgfuncs.inc.php | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index c51e9c2..30ce63f 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -486,6 +486,11 @@ class AurJSON { if ($search_by === 'name') { $where_condition = "(Packages.Name LIKE $keyword_string)"; + if (isset($http_data['pkgver'])) { + $pkgver = $http_data['pkgver']; + $pkgver_string = $this->dbh->quote($pkgver . "%"); + $where_condition .= " AND (Packages.Version LIKE $pkgver_string)"; + } } else if ($search_by === 'name-desc') { $where_condition = "(Packages.Name LIKE $keyword_string OR "; $where_condition .= "Description LIKE $keyword_string)"; diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index ad25474..660e3f5 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -727,6 +727,10 @@ function pkg_search_page($params, $show_headers=true, $SID="") { /* Search by name. */ $K = "%" . addcslashes($params['K'], '%_') . "%"; $q_where .= "AND (Packages.Name LIKE " . $dbh->quote($K) . ") "; + if (isset($params["pkgver"])) { + $pkgver = $params["pkgver"]; + $q_where .= "AND (Packages.Version LIKE " . $dbh->quote($pkgver . "%") . ") "; + } } elseif (isset($params["SeB"]) && $params["SeB"] == "b") { /* Search by package base name. */ -- 2.17.0

3 3