- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH 1/2] Optimize database request in the add_package_comment function
by Nicolas Cornu 28 Jul '12

28 Jul '12

--- web/lib/pkgfuncs.inc.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 0610617..969da11 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -215,11 +215,10 @@ function add_package_comment($pkgid, $uid, $comment, $dbh=NULL) { db_query($q, $dbh); # Send email notifications - $q = 'SELECT CommentNotify.*, Users.Email '; - $q.= 'FROM CommentNotify, Users '; - $q.= 'WHERE Users.ID = CommentNotify.UserID '; - $q.= 'AND CommentNotify.UserID != ' . $uid . ' '; - $q.= 'AND CommentNotify.PkgID = ' . intval($pkgid); + $q = 'SELECT u.Email FROM Users u '; + $q.= 'INNER JOIN CommentNotify cn ON u.ID=cn.UserID'; + $q.= 'AND cn.UserID != ' . $uid . ' '; + $q.= 'AND cn.PkgID = ' . intval($pkgid); $result = db_query($q, $dbh); $bcc = array(); @@ -228,7 +227,7 @@ function add_package_comment($pkgid, $uid, $comment, $dbh=NULL) { array_push($bcc, $row['Email']); } - $q = 'SELECT Packages.* '; + $q = 'SELECT Packages.Name '; $q.= 'FROM Packages '; $q.= 'WHERE Packages.ID = ' . intval($pkgid); $result = db_query($q, $dbh); -- 1.7.11.3

3 5

[aur-dev] [PATCH] Notify users when a package is updated.
by Nicolas Cornu 27 Jul '12

27 Jul '12

Responding to FS #30109 --- web/html/pkgsubmit.php | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 84688b4..f7bc430 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -397,6 +397,39 @@ if ($uid): pkg_notify(account_from_sid($_COOKIE["AURSID"], $dbh), array($packageID), true, $dbh); } + # If it was a previously created package notify users of this update. + if($pdata) { + $uid = uid_from_sid($uid, $dbh); + + # Send email notifications + $q = 'SELECT CommentNotify.*, Users.Email '; + $q.= 'FROM CommentNotify, Users '; + $q.= 'WHERE Users.ID = CommentNotify.UserID '; + $q.= 'AND CommentNotify.UserID != ' . $uid . ' '; + $q.= 'AND CommentNotify.PkgID = ' . intval($packageID); + $result = db_query($q, $dbh); + $bcc = array(); + + if (mysql_num_rows($result)) { + while ($row = mysql_fetch_assoc($result)) { + array_push($bcc, $row['Email']); + } + + # TODO: native language emails for users, based on their prefs + # Simply making these strings translatable won't work, users would be + # getting emails in the language that the user who posted the comment was in + $body = + 'from ' . $AUR_LOCATION . '/' . get_pkg_uri($pkg_name) . "\n" + . username_from_sid($_COOKIE['AURSID'], $dbh) . " update the package to the version: " + . $pkg_version + . "\n\n---\nIf you no longer wish to receive notifications about this package, please go the the above package page and click the UnNotify button."; + $body = wordwrap($body, 70); + $bcc = implode(', ', $bcc); + $headers = "Bcc: $bcc\nReply-to: nobody(a)archlinux.org\nFrom: aur-notify(a)archlinux.org\nX-Mailer: AUR\n"; + @mail('undisclosed-recipients: ;', "AUR Update for " . $pkg_name, $body, $headers); + } + } + # Entire package creation process is atomic end_atomic_commit($dbh); -- 1.7.11.3

2 3

[aur-dev] (no subject)
by Nicolas Cornu 27 Jul '12

27 Jul '12

>From e4ca99407a3efbade5e09a43b4d333ae4daa1e5b Mon Sep 17 00:00:00 2001 From: Nicolas Cornu <nicolac76(a)yahoo.fr> Date: Fri, 27 Jul 2012 22:08:55 +0200 Subject: [PATCH] Notify users when a package is updated. It's a patch to send notify when someone update a package. --- web/html/pkgsubmit.php | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 84688b4..f7bc430 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -397,6 +397,39 @@ if ($uid): pkg_notify(account_from_sid($_COOKIE["AURSID"], $dbh), array($packageID), true, $dbh); } + # If it was a previously created package notify users of this update. + if($pdata) { + $uid = uid_from_sid($uid, $dbh); + + # Send email notifications + $q = 'SELECT CommentNotify.*, Users.Email '; + $q.= 'FROM CommentNotify, Users '; + $q.= 'WHERE Users.ID = CommentNotify.UserID '; + $q.= 'AND CommentNotify.UserID != ' . $uid . ' '; + $q.= 'AND CommentNotify.PkgID = ' . intval($packageID); + $result = db_query($q, $dbh); + $bcc = array(); + + if (mysql_num_rows($result)) { + while ($row = mysql_fetch_assoc($result)) { + array_push($bcc, $row['Email']); + } + + # TODO: native language emails for users, based on their prefs + # Simply making these strings translatable won't work, users would be + # getting emails in the language that the user who posted the comment was in + $body = + 'from ' . $AUR_LOCATION . '/' . get_pkg_uri($pkg_name) . "\n" + . username_from_sid($_COOKIE['AURSID'], $dbh) . " update the package to the version: " + . $pkg_version + . "\n\n---\nIf you no longer wish to receive notifications about this package, please go the the above package page and click the UnNotify button."; + $body = wordwrap($body, 70); + $bcc = implode(', ', $bcc); + $headers = "Bcc: $bcc\nReply-to: nobody(a)archlinux.org\nFrom: aur-notify(a)archlinux.org\nX-Mailer: AUR\n"; + @mail('undisclosed-recipients: ;', "AUR Update for " . $pkg_name, $body, $headers); + } + } + # Entire package creation process is atomic end_atomic_commit($dbh); -- 1.7.11.3

1 0

[aur-dev] [PATCH 0/6] [RFC] Virtual path feature
by Lukas Fleischer 18 Jul '12

18 Jul '12

This implements nicer looking URLs, such as "/packages/" instead of "/packages.php", "/packages/$pkgname/" instead of "/packages.php?ID=$id" etc. Note that these patches are not ready to be merged yet but I'd like to get some comments. We'd probably also have to add rewrite rules to our AUR setup on sigurd or add legacy rules to the routing back end to ensure old URLs still work. Lukas Fleischer (6): Add routing front/back ends Use absolute URIs for style sheets and images Use virtual path feature for links Use virtual paths for package details Redirect to the home page after successful login web/html/pkgsubmit.php: Remove stray "</div>" web/html/addvote.php | 2 +- web/html/home.php | 123 ++++++++++++++++++++++++ web/html/index.php | 160 ++++++++------------------------ web/html/login.php | 4 +- web/html/logout.php | 2 +- web/html/passreset.php | 6 +- web/html/pkgsubmit.php | 6 +- web/html/tu.php | 8 +- web/html/voters.php | 4 +- web/lib/acctfuncs.inc.php | 6 +- web/lib/config.inc.php.proto | 4 + web/lib/pkgfuncs.inc.php | 7 +- web/lib/routing.inc.php | 57 ++++++++++++ web/template/account_details.php | 2 +- web/template/account_edit_form.php | 2 +- web/template/account_search_results.php | 8 +- web/template/actions_form.php | 2 +- web/template/header.php | 26 +++--- web/template/pkg_comments.php | 8 +- web/template/pkg_details.php | 14 +-- web/template/pkg_search_form.php | 2 +- web/template/pkg_search_results.php | 10 +- web/template/search_accounts_form.php | 2 +- web/template/stats/updates_table.php | 2 +- web/template/stats/user_table.php | 4 +- web/template/tu_details.php | 4 +- web/template/tu_list.php | 4 +- 27 files changed, 291 insertions(+), 188 deletions(-) create mode 100644 web/html/home.php create mode 100644 web/lib/routing.inc.php -- 1.7.11.2

3 11

[aur-dev] [PATCH] Use virtual paths for voters page
by Lukas Fleischer 18 Jul '12

18 Jul '12

Link to "/packages/$pkgname/voters/" instead of using "/voters/" and a get parameter to request a specific package by ID. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/index.php | 6 ++++++ web/lib/routing.inc.php | 1 - web/template/pkg_details.php | 10 ++++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/web/html/index.php b/web/html/index.php index 3539c5a..df0d133 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -13,6 +13,12 @@ if (isset($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { $_GET['N'] = $tokens[2]; if (isset($tokens[3])) { + if ($tokens[3] == 'voters') { + $_GET['ID'] = pkgid_from_name($tokens[2]); + include('voters.php'); + return; + } + /* TODO: Remove support for legacy URIs and move these * actions to separate modules. */ switch ($tokens[3]) { diff --git a/web/lib/routing.inc.php b/web/lib/routing.inc.php index 5cffe81..4ca1150 100644 --- a/web/lib/routing.inc.php +++ b/web/lib/routing.inc.php @@ -14,7 +14,6 @@ $ROUTES = array( '/rss' => 'rss.php', '/submit' => 'pkgsubmit.php', '/tu' => 'tu.php', - '/voters' => 'voters.php', '/addvote' => 'addvote.php', ); diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index 774d670..67cb5d1 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -143,10 +143,12 @@ if ($row["MaintainerUID"]): </tr> <tr> <th><?php echo __('Votes') . ': ' ?></th> -<?php -if ($atype == "Developer" || $atype == "Trusted User"): -?> - <td><a href="<?php echo get_uri('/voters/'); ?>?ID=<?php echo$pkgid ?>"><?php echo $votes ?></a> +<?php if ($atype == "Developer" || $atype == "Trusted User"): ?> +<?php if ($USE_VIRTUAL_URLS): ?> + <td><a href="<?php echo get_pkg_uri($row['Name']); ?>voters/"><?php echo $votes ?></a> +<?php else: ?> + <td><a href="<?php echo get_uri('/voters/'); ?>?ID=<?php echo $pkgid ?>"><?php echo $votes ?></a> +<?php endif; ?> <?php else: ?> <td><?php echo $votes ?></td> <?php endif; ?> -- 1.7.11.2

1 0

[aur-dev] [PATCH 1/2] voters.php: Use "<ul></ul>" for the list of voters
by Lukas Fleischer 18 Jul '12

18 Jul '12

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/voters.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/web/html/voters.php b/web/html/voters.php index c7c59a2..0ec77ec 100644 --- a/web/html/voters.php +++ b/web/html/voters.php @@ -17,11 +17,11 @@ if ($atype == 'Trusted User' || $atype== 'Developer'): <div class="box"> <h2>Votes for <a href="<?php echo get_pkg_uri(pkgname_from_id($pkgid)); ?>"><?php echo pkgname_from_id($pkgid) ?></a></h2> <div class="boxbody"> - -<?php - while (list($indx, $row) = each($votes)): ?> - <a href="<?php echo get_uri('/account/'); ?>?Action=AccountInfo&ID=<?php echo $row['UsersID'] ?>"><?php echo htmlspecialchars($row['Username']) ?></a><br /> - <?php endwhile; ?> + <ul> + <?php while (list($indx, $row) = each($votes)): ?> + <li><a href="<?php echo get_uri('/account/'); ?>?Action=AccountInfo&ID=<?php echo $row['UsersID'] ?>"><?php echo htmlspecialchars($row['Username']) ?></a></li> + <?php endwhile; ?> + </ul> </div> </div> -- 1.7.11.2

1 1

[aur-dev] [PATCH 1/5] routing.inc.php: Add missing "/account" route
by Lukas Fleischer 18 Jul '12

18 Jul '12

Minor oversight when adding the routing back end in commit eb22bcc7548d1b1025a3832aa4555792729d11b0. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/routing.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/web/lib/routing.inc.php b/web/lib/routing.inc.php index bbcb9e2..5cffe81 100644 --- a/web/lib/routing.inc.php +++ b/web/lib/routing.inc.php @@ -5,6 +5,7 @@ $ROUTES = array( '/index.php' => 'home.php', '/packages' => 'packages.php', '/register' => 'account.php', + '/account' => 'account.php', '/accounts' => 'account.php', '/login' => 'login.php', '/logout' => 'logout.php', -- 1.7.11.2

1 4

[aur-dev] [PATCH 1/2] aur.inc.php: Include routing backend
by Lukas Fleischer 17 Jul '12

17 Jul '12

This needs to be available on every page since it is needed for get_uri() and get_pkg_uri() and "web/html/index.php" isn't executed if the virtual path feature is disabled. Reported-by: canyonknight <canyonknight(a)gmail.com> Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/index.php | 2 -- web/lib/aur.inc.php | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/web/html/index.php b/web/html/index.php index 0af3f2d..1561168 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -1,8 +1,6 @@ <?php set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); -include_once("config.inc.php"); -include_once("routing.inc.php"); include_once("aur.inc.php"); include_once("pkgfuncs.inc.php"); diff --git a/web/lib/aur.inc.php b/web/lib/aur.inc.php index 1a6164e..6dcbb34 100644 --- a/web/lib/aur.inc.php +++ b/web/lib/aur.inc.php @@ -11,6 +11,7 @@ include_once('translator.inc.php'); set_lang(); include_once("config.inc.php"); +include_once("routing.inc.php"); include_once("version.inc.php"); include_once("acctfuncs.inc.php"); include_once("cachefuncs.inc.php"); -- 1.7.11.2

1 1

[aur-dev] [PATCH 1/7] Add virtual path support for package actions
by Lukas Fleischer 17 Jul '12

17 Jul '12

This allows for using following URLs: * /package/$pkg_name/flag: Flag a package out-of-date * /package/$pkg_name/unflag: Unflag a package * /package/$pkg_name/notify: Enable comment notifications * /package/$pkg_name/unnotify: Disable comment notifications * /package/$pkg_name/vote: Vote for the package * /package/$pkg_name/unvote: Remove vote Note that this code is very hackish and should be refactored once we drop support for legacy URLs. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/index.php | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/web/html/index.php b/web/html/index.php index de38178..0af3f2d 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -3,14 +3,44 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); include_once("config.inc.php"); include_once("routing.inc.php"); +include_once("aur.inc.php"); +include_once("pkgfuncs.inc.php"); $path = rtrim($_SERVER['PATH_INFO'], '/'); $tokens = explode('/', $path); -if (isset($tokens[1]) &&'/' . $tokens[1] == get_pkg_route()) { +if (isset($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { if (isset($tokens[2])) { unset($_GET['ID']); $_GET['N'] = $tokens[2]; + + if (isset($tokens[3])) { + /* TODO: Remove support for legacy URIs and move these + * actions to separate modules. */ + switch ($tokens[3]) { + case "vote": + $_POST['do_Vote'] = __('Vote'); + break; + case "unvote": + $_POST['do_UnVote'] = __('UnVote'); + break; + case "notify": + $_POST['do_Notify'] = __('Notify'); + break; + case "unnotify": + $_POST['do_UnNotify'] = __('UnNotify'); + break; + case "flag": + $_POST['do_Flag'] = __('Flag'); + break; + case "unflag": + $_POST['do_UnFlag'] = __('UnFlag'); + break; + } + + $_POST['token'] = $_COOKIE['AURSID']; + $_POST['IDs'] = array(pkgid_from_name($tokens[2]) => '1'); + } } include get_route('/' . $tokens[1]); -- 1.7.11.2

1 6

[aur-dev] [PATCH 1/2] pkg_details.php: Fix link to voters if ID is unset
by Lukas Fleischer 17 Jul '12

17 Jul '12

When a package is requested by name, the "ID" request parameter might be unset. Use the "ID" field of the query result instead. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/template/pkg_details.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index b4b52d5..6e19b3b 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -2,7 +2,7 @@ $atype = account_from_sid($SID); $uid = uid_from_sid($SID); -$pkgid = intval($_REQUEST['ID']); +$pkgid = intval($row['ID']); $catarr = pkgCategories(); -- 1.7.11.2

1 1