- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] Make account registration work with recent account editing changes
by canyonknight 16 Sep '12

16 Sep '12

The account editing form requires two different form action URLs due to the fact that the same template is shared for both account registration and account editing. Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- This patch assumes all previous patches. This should complete those changes and all account related URLs should be a lot saner now. web/template/account_edit_form.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/template/account_edit_form.php b/web/template/account_edit_form.php index 9b5b1d8..b1cb749 100644 --- a/web/template/account_edit_form.php +++ b/web/template/account_edit_form.php @@ -1,4 +1,8 @@ +<?php if ($A == "UpdateAccount"): ?> <form action="<?php echo get_user_uri($U) . 'update/'; ?>" method="post"> +<?php else: ?> +<form action="<?php echo get_uri('/register/'); ?>" method="post"> +<?php endif; ?> <fieldset> <input type="hidden" name="Action" value="<?php echo $A ?>" /> <?php if ($UID): ?> -- 1.7.12

1 0

[aur-dev] cherokee AUR PKGBUILD Patch
by Pierre B. 04 Sep '12

04 Sep '12

Hi --all, I have seen that Cherokee Web server was dropped from Community. I try to setup from AUR and : yaourt -S cherokee => don't compile There is this error : make[3]: *** [libplugin_streaming_la-handler_streaming.lo] Error 1 make[3]: Leaving directory `/tmp/yaourt-tmp-root/aur-cherokee/src/cherokee-1.2.101/cherokee' make[2]: *** [all] Error 2 make[2]: Leaving directory `/tmp/yaourt-tmp-root/aur-cherokee/src/cherokee-1.2.101/cherokee' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/tmp/yaourt-tmp-root/aur-cherokee/src/cherokee-1.2.101' make: *** [all] Error 2 This bug can be corrected by applying this patch from the SVN of cherokee. Here the http link : https://bugs.mageia.org/show_bug.cgi?id=6145 I have made a PKGBUILD patch who correct the problem. In attachement, the two files to add in the cherokee.tar.gz archive. Bye --all. -- Pierre B. http://www.pi3rrot.net

2 1

[aur-dev] python-whoosh should be renamed to python2-whoosh
by rns 02 Sep '12

02 Sep '12

According to https://wiki.archlinux.org/index.php/Python_Package_Guidelines, python-whoosh (https://aur.archlinux.org/packages.php?ID=27425) should be renamed to python2-whoosh. What I have done is like this: I downloaded the PKGBUILD of python-whoosh, and uploaded it under the name of python2-whoosh. And I realize maybe I've messed something up, because the discussion and votes python-whoosh got won't migrate to python2-whoosh in this way. Sorry for this. As my notetaking app "mikidown" (http://aur.archlinux.org/packages.php?ID=57432) now depends on "python3-whoosh"! Can someone help me rename the current "python-whoosh" to "python2-whoosh"? Thxs.

3 2

[aur-dev] [PATCH 0/8] Assorted working branch changes
by canyonknight 23 Aug '12

23 Aug '12

Most of these patches are minor changes and fix some lingering bug reports. The final patch is a really big change that I've been testing for a while now, it brings PDO to the AUR code. It is a large change so I'd love to have more eyes look over it and maybe some people test out corner cases and parts of the web interface that I may have failed at testing. This patch series is based against Lukas' "wip" branch [1]. Those changes and my changes in entirety can be had from my "working" branch [2]. [1] http://git.cryptocrack.de/aur.git/log/?h=wip [2] https://github.com/canyonknight/aur/tree/working canyonknight (8): pkgsubmit.php: Make page friendlier for logged out users pkg_details.php: Fix broken HTML for package page with no dependencies Update docs to require Archive_Tar version greater than 1.3.7 Print error message when maximum DB character length is exceeded Allow only Trusted Users, Developers, and Maintainers to unflag packages Fix broken RSS feed link on front page Fix broken package search on front page Migrate all DB code to use PDO INSTALL | 4 +- UPGRADING | 4 + web/html/home.php | 2 +- web/html/pkgsubmit.php | 43 +++-- web/lib/acctfuncs.inc.php | 229 ++++++++++++------------ web/lib/aur.inc.php | 154 ++++++---------- web/lib/aurjson.class.php | 26 ++- web/lib/cachefuncs.inc.php | 4 +- web/lib/config.inc.php.proto | 3 +- web/lib/pkgfuncs.inc.php | 306 +++++++++++++++++--------------- web/lib/stats.inc.php | 4 +- web/lib/translator.inc.php | 6 +- web/template/account_search_results.php | 2 +- web/template/actions_form.php | 3 +- web/template/pkg_details.php | 5 +- web/template/stats/updates_table.php | 2 +- 16 files changed, 400 insertions(+), 397 deletions(-) -- 1.7.11.4

2 9

[aur-dev] Introduction and proposal
by Mario Mueller 02 Aug '12

02 Aug '12

Hey folks, my name is Mario Mueller, I'm a web developer from Duesseldorf, Germany. I'm rather new to the Arch Linux community, but I must admit, that I love the distribution already and I want to help the Arch Linux community. I contacted Lukas (cryptocrack) and offered my help by supporting the AUR development with heart and hands. He told me that you guys and gals are willing to relaunch the AUR based on Django - so I started to do so. You can take a look at my proposal at https://bitbucket.org/xenji/aur-django/. I've used the actual PHP code from the AUR git repo as a start. The HTML comes from the archweb repository. I kindly request your feedback on the existing code and requests for the upcoming changes. The test data from the generator script gives a good start for the development, but a dump from the live database, without the Users table, would help me to understand the size of the data. In addition, I kindly ask you for telling me a rough number of visitors / page impression to evaluate the caching mechanism needed for a fast service. Best regards, xenji

5 10

[aur-dev] [PATCH] Move notification logic to separate function
by Nicolas Cornu 28 Jul '12

28 Jul '12

Move notification logic to separate function And optimize database requests in notification --- web/lib/pkgfuncs.inc.php | 58 ++++++++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 0610617..5420c8f 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -200,24 +200,14 @@ function package_comments($pkgid, $dbh=NULL) { return $comments; } -# Add a comment to a package page and send out appropriate notifications -# TODO: Move notification logic to separate function where it belongs -function add_package_comment($pkgid, $uid, $comment, $dbh=NULL) { +function send_notifications($pkgid, $uid, $subject, $body, $dbh=NULL, $pkg_name="") { if(!$dbh) { $dbh = db_connect(); } - $q = 'INSERT INTO PackageComments '; - $q.= '(PackageID, UsersID, Comments, CommentTS) VALUES ('; - $q.= intval($pkgid) . ', ' . $uid . ', '; - $q.= "'" . db_escape_string($comment) . "', "; - $q.= 'UNIX_TIMESTAMP())'; - db_query($q, $dbh); - # Send email notifications - $q = 'SELECT CommentNotify.*, Users.Email '; - $q.= 'FROM CommentNotify, Users '; - $q.= 'WHERE Users.ID = CommentNotify.UserID '; + $q = 'SELECT Users.Email FROM Users '; + $q.= 'INNER JOIN CommentNotify ON Users.ID=CommentNotify.UserID'; $q.= 'AND CommentNotify.UserID != ' . $uid . ' '; $q.= 'AND CommentNotify.PkgID = ' . intval($pkgid); $result = db_query($q, $dbh); @@ -228,25 +218,45 @@ function add_package_comment($pkgid, $uid, $comment, $dbh=NULL) { array_push($bcc, $row['Email']); } - $q = 'SELECT Packages.* '; - $q.= 'FROM Packages '; - $q.= 'WHERE Packages.ID = ' . intval($pkgid); - $result = db_query($q, $dbh); - $row = mysql_fetch_assoc($result); + if($pkg_name == "") { + $q = 'SELECT Packages.Name '; + $q.= 'FROM Packages '; + $q.= 'WHERE Packages.ID = ' . intval($pkgid); + $result = db_query($q, $dbh); + $row = mysql_fetch_assoc($result); + $pkg_name = $row['Name']; + } # 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($row['Name']) . "\n" - . username_from_sid($_COOKIE['AURSID'], $dbh) . " wrote:\n\n" - . $comment - . "\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 = 'from ' . $AUR_LOCATION . '/' . get_pkg_uri($pkg_name) . "\n" . $body; + $body.= "\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 Comment for " . $row['Name'], $body, $headers); + @mail('undisclosed-recipients: ;', $subject . " for " . $pkg_name, $body, $headers); + } +} + +# Add a comment to a package page and send out appropriate notifications +function add_package_comment($pkgid, $uid, $comment, $dbh=NULL) { + if(!$dbh) { + $dbh = db_connect(); } + + $q = 'INSERT INTO PackageComments '; + $q.= '(PackageID, UsersID, Comments, CommentTS) VALUES ('; + $q.= intval($pkgid) . ', ' . $uid . ', '; + $q.= "'" . db_escape_string($comment) . "', "; + $q.= 'UNIX_TIMESTAMP())'; + db_query($q, $dbh); + + # Send notifications + $subject = "AUR Comment"; + $body = username_from_sid($_COOKIE['AURSID'], $dbh) . " wrote:\n\n"; + $body.= $comment; + send_notifications($pkgid, $uid, $subject, $body, $dbh); } # grab package sources -- 1.7.11.3

1 0

[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