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

[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] 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

[aur-dev] [PATCH] acctfuncs.inc.php: Allow translation of missing strings
by canyonknight 20 Jan '14

20 Jan '14

Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- web/lib/acctfuncs.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index fe748a2..52eb551 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -425,7 +425,7 @@ function try_login() { $userID = valid_user($_REQUEST['user']); if ( user_suspended($userID) ) { - $login_error = "Account Suspended."; + $login_error = __('Account suspended'); } elseif ( $userID && isset($_REQUEST['passwd']) && valid_passwd($userID, $_REQUEST['passwd']) ) { @@ -490,7 +490,7 @@ function try_login() { } else { - $login_error = "Error trying to generate session id."; + $login_error = __('An error occurred trying to generate a user session.'); } } elseif (passwd_is_empty($userID)) { $login_error = __('Your password has been reset. ' . -- 1.8.5.3

2 1

[aur-dev] Split package support
by Lukas Fleischer 18 Jan '14

18 Jan '14

Hi, I changed my mind again and I think the next release should be 3.0.0, bringing full meta data and split package support. This is my idea of how split packages should be displayed: * One page per built package. Comments, votes and maintainer information are shared among packages that belong to the same PKGBUILD, though. The delete and merge functions will also operate on package bases, not on built packages. * A new pkgbase field on the package details page that is clickable and starts a package search on all packages belonging to the same base. The AUR already tags packages with properties of the corresponding binary packages (think of dependencies) and people want (need?) this, so this seems like the right thing to do. What do you think of that? Any objections? Regards, Lukas

2 4

[aur-dev] [PATCH/RFC 0/6] Promote the use of .AURINFO
by Lukas Fleischer 17 Jan '14

17 Jan '14

Check [1] for a related discussion on aur-general. What this patch series basically does is: * Tell people to use `mkaurball` (which adds .AURINFO after building) instead of `makepkg --source`. * Show a deprecation warning when people use `makepkg --source` anyway. * Add a few changes in order to make the parser work with the slightly updated .AURINFO format used by mkaurball. Comments welcome. [1] https://mailman.archlinux.org/pipermail/aur-general/2014-January/026720.html Lukas Fleischer (6): Rename "depend" field to "depends" in .AURINFO Strip whitespace from .AURINFO lines Detect split packages from .AURINFO Promote the use of mkaurball Add a warning for packages without .AURINFO pkgsubmit.php: Improve visibility of errors web/html/pkgsubmit.php | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) -- 1.8.5.3

2 8

[aur-dev] AUR 2.3.1 released
by Lukas Fleischer 13 Jan '14

13 Jan '14

Changes since 2.3.0: * Small fixes to the TU area. * Reject empty e-mail address on the password reset form. * Fixes to the typeahead plugin (fixes FS#34461, FS#34471). * Fix split package error handling (fixes FS#37496). You can check the Git log [1] for a complete list of commits. [1] https://projects.archlinux.org/aur.git/log/?id=v2.3.1

1 0

[aur-dev] [PATCH] Fix split package error handling
by Lukas Fleischer 11 Jan '14

11 Jan '14

Do not remove parentheses from the pkgname to make sure the split package detection works properly. Also, fix a regression introduced in 4bb6e88 (pkgsubmit.php: Simplify package name validation, 2013-03-05) that resulted in the split package error message never showing up. Fixes FS#37496. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/pkgsubmit.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index d2fe512..a2ec6dd 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -180,10 +180,12 @@ if ($uid): } if (!empty($lparts)) { - # this is a variable/value pair, strip out - # array parens and any quoting, except in pkgdesc - # for pkgdesc, only remove start/end pairs of " or ' - if ($lparts[0]=="pkgdesc") { + # this is a variable/value pair, strip + # out array parens and any quoting, + # except in pkgdesc for pkgname or + # pkgdesc, only remove start/end pairs + # of " or ' + if ($lparts[0] == "pkgname" || $lparts[0] == "pkgdesc") { if ($lparts[1]{0} == '"' && $lparts[1]{strlen($lparts[1])-1} == '"') { $pkgbuild[$lparts[0]] = substr($lparts[1], 1, -1); @@ -286,8 +288,7 @@ if ($uid): $pkg_name = $new_pkgbuild['pkgname']; if ($pkg_name[0] == '(') { $error = __("Error - The AUR does not support split packages!"); - } - if (!preg_match("/^[a-z0-9][a-z0-9\.+_-]*$/", $pkg_name)) { + } elseif (!preg_match("/^[a-z0-9][a-z0-9\.+_-]*$/", $pkg_name)) { $error = __("Invalid name: only lowercase letters are allowed."); } } -- 1.8.5.2

1 0

[aur-dev] No recipient addresses found in message header
by Pierre Schmitz 11 Jan '14

11 Jan '14

Hi, I see a couple of these errors in our log. I assume we try to send a mail without any or an empty recipient. > postfix/sendmail[3523]: fatal: php-aur(992): No recipient addresses found in message header -- Pierre Schmitz, https://pierre-schmitz.com

2 2