- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH 1/2] pkg_search_results.php: Move version to a separate column
by Lukas Fleischer 14 Oct '12

14 Oct '12

Synchronize the column layout with archweb. This also allows for easily highlighting the version number for out-of-date packages. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/template/pkg_search_results.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index 0053607..ea7f61a 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -37,6 +37,7 @@ if (!$result): ?> <?php endif; ?> <th><a href="?<?= mkurl('SB=c&SO=' . $SO_next) ?>"><?= __("Category") ?></a></th> <th><a href="?<?= mkurl('SB=n&SO=' . $SO_next) ?>"><?= __("Name") ?></a></th> + <th><?= __("Version") ?></th> <th><a href="?<?= mkurl('SB=v&SO=' . $SO_next) ?>"><?= __("Votes") ?></a></th> <?php if ($SID): ?> <th><a href="?<?= mkurl('SB=w&SO=' . $SO_next) ?>"><?= __("Voted") ?></a></th> @@ -54,7 +55,8 @@ if (!$result): ?> <td><input type="checkbox" name="IDs[<?= $row["ID"] ?>]" value="1" /></td> <?php endif; ?> <td><?= htmlspecialchars($row["Category"]) ?></td> - <td><a href="<?= htmlspecialchars(get_pkg_uri($row["Name"]), ENT_QUOTES); ?>"><?= htmlspecialchars($row["Name"]) . ' ' . htmlspecialchars($row["Version"]) ?></a></td> + <td><a href="<?= htmlspecialchars(get_pkg_uri($row["Name"]), ENT_QUOTES); ?>"><?= htmlspecialchars($row["Name"]) ?></a></td> + <td><?= htmlspecialchars($row["Version"]) ?></td> <td><?= $row["NumVotes"] ?></td> <?php if ($SID): ?> <td> -- 1.7.12.2

1 1

[aur-dev] Deletion request
by Stefan Mark 11 Oct '12

11 Oct '12

emacs-nogconf I was asked if its needed anymore. Since its not, i just orphaned it and ask for deletion. thanks

2 2

[aur-dev] [PATCH] pkg_comments.php: Move delete button to same line as poster info
by canyonknight 10 Oct '12

10 Oct '12

The delete button is currently on a separate line. Change some logic to allow for the button to be on the same line as poster info. Reported-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- web/template/pkg_comments.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/template/pkg_comments.php b/web/template/pkg_comments.php index 997b9ca..2ed6420 100644 --- a/web/template/pkg_comments.php +++ b/web/template/pkg_comments.php @@ -22,9 +22,11 @@ $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> + <?= __('Comment by %s', $row['UserName']) ?> </form> - <?php endif; ?> + <?php else: ?> <?= __('Comment by %s', $row['UserName']) ?> + <?php endif; ?> </h4> <p class="timestamp"><?= gmdate('Y-m-d H:i', $row['CommentTS']) ?></p> <div class="article-content"> -- 1.7.12.2

1 0

[aur-dev] [PATCH] pkg_comment_form.php: Remove redundant label for the comment box
by canyonknight 10 Oct '12

10 Oct '12

Comment box already uses <h2> tag. Additional label is not needed. Reported-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- web/template/pkg_comment_form.php | 1 - 1 file changed, 1 deletion(-) diff --git a/web/template/pkg_comment_form.php b/web/template/pkg_comment_form.php index 9315b0a..a0e7f68 100644 --- a/web/template/pkg_comment_form.php +++ b/web/template/pkg_comment_form.php @@ -12,7 +12,6 @@ if (isset($_REQUEST['comment']) && check_token()) { <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> </div> <p> - <label for="id_comment"><?= __("Comment") . ':' ?></label> <textarea id="id_comment" name="comment" cols="80" rows="10"></textarea> </p> <p> -- 1.7.12.2

2 2

[aur-dev] [PATCH] pkgsubmit.php: Fix package version not updating
by canyonknight 09 Oct '12

09 Oct '12

Parameters were not correct for a package update operation. Fix regression of 763cbf8373e3373254ad18f5b69fd16efdc6fd5c Fixes FS#31868 Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- web/html/pkgsubmit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 09e95ca..efd90e1 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -381,7 +381,7 @@ if ($uid): } # Update package data - update_pkgdetails($packageID, $new_pkgbuild['pkgname'], $new_pkgbuild['license'], $pkg_version, "", $new_pkgbuild['pkgdesc'], $new_pkgbuild['url'], "", $uid, $dbh); + update_pkgdetails($new_pkgbuild['pkgname'], $new_pkgbuild['license'], $pkg_version, $new_pkgbuild['pkgdesc'], $new_pkgbuild['url'], $uid, $packageID, $dbh); } else { # This is a brand new package new_pkgdetails($new_pkgbuild['pkgname'], $new_pkgbuild['license'], $pkg_version, $category_id, $new_pkgbuild['pkgdesc'], $new_pkgbuild['url'], $uid, $dbh); -- 1.7.12.2

1 0

[aur-dev] [PATCH] pkgfuncs.inc.php: Fix blacklisting functionality
by canyonknight 09 Oct '12

09 Oct '12

An array that contains whether the package is blacklisted is being improperly used for a comparison. Use fetchColumn() to avoid the array completely and compare a value directly. Regression with e171f6f34eeacf35cf7142b4788d43e7d0978546 Fixes FS#31867 Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- web/lib/pkgfuncs.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 0072856..baa9aa1 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -428,7 +428,7 @@ function pkgname_is_blacklisted($name, $dbh=NULL) { $result = $dbh->query($q); if (!$result) return false; - return ($result->fetch(PDO::FETCH_NUM) > 0); + return ($result->fetchColumn() > 0); } /** -- 1.7.12.2

1 0

[aur-dev] [PATCH] Remove character limit on password length
by canyonknight 09 Oct '12

09 Oct '12

As all new passwords are hashed and therefore stored in the database at the same length, this limitation is no longer needed. Fixes FS#31855 Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- web/html/login.php | 2 +- web/html/passreset.php | 4 ++-- web/lib/config.inc.php.proto | 1 - web/template/account_edit_form.php | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/web/html/login.php b/web/html/login.php index ed323f8..d5bb1e7 100644 --- a/web/html/login.php +++ b/web/html/login.php @@ -32,7 +32,7 @@ html_header('AUR ' . __("Login")); </p> <p> <label for="id_password"><?= __('Password') . ':'; ?></label> - <input id="id_password" type="password" name="passwd" size="30" maxlength="<?= PASSWD_MAX_LEN; ?>" /> + <input id="id_password" type="password" name="passwd" size="30" /> </p> <p> <input type="checkbox" name="remember_me" id="id_remember_me" /> diff --git a/web/html/passreset.php b/web/html/passreset.php index 13697b9..42dfc86 100644 --- a/web/html/passreset.php +++ b/web/html/passreset.php @@ -86,11 +86,11 @@ html_header(__("Password Reset")); </tr> <tr> <td><?= __("Enter your new password:"); ?></td> - <td><input type="password" name="password" size="30" maxlength="32" /></td> + <td><input type="password" name="password" size="30" /></td> </tr> <tr> <td><?= __("Confirm your new password:"); ?></td> - <td><input type="password" name="confirm" size="30" maxlength="32" /></td> + <td><input type="password" name="confirm" size="30" /></td> </tr> </table> <br /> diff --git a/web/lib/config.inc.php.proto b/web/lib/config.inc.php.proto index 3c7df19..f132445 100644 --- a/web/lib/config.inc.php.proto +++ b/web/lib/config.inc.php.proto @@ -15,7 +15,6 @@ define( "URL_DIR", "/packages/" ); define( "USERNAME_MIN_LEN", 3 ); define( "USERNAME_MAX_LEN", 16 ); define( "PASSWD_MIN_LEN", 4 ); -define( "PASSWD_MAX_LEN", 128 ); # Default language for displayed messages in the web interface. define("DEFAULT_LANG", "en"); diff --git a/web/template/account_edit_form.php b/web/template/account_edit_form.php index 20f552a..308913d 100644 --- a/web/template/account_edit_form.php +++ b/web/template/account_edit_form.php @@ -60,13 +60,13 @@ <p> <label for="id_passwd1"><?= __("Password") ?>:</label> - <input type="password" size="30" maxlength="32" name="P" id="id_passwd1" value="<?= $P ?>" /> + <input type="password" size="30" name="P" id="id_passwd1" value="<?= $P ?>" /> <?php if ($A != "UpdateAccount"): print " (".__("required").")"; endif; ?> </p> <p> <label for="id_passwd2"><?= __("Re-type password") ?>:</label> - <input type="password" size="30" maxlength="32" name="C" id="id_passwd2" value="<?= $C ?>" /> + <input type="password" size="30" name="C" id="id_passwd2" value="<?= $C ?>" /> <?php if ($A != "UpdateAccount"): print " (".__("required").")"; endif; ?> </p> -- 1.7.12.2

1 0

[aur-dev] [PATCH] Change logo link for consistency with Archweb
by canyonknight 09 Oct '12

09 Oct '12

Fixes FS#27669 Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- web/template/header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/header.php b/web/template/header.php index 3179a53..c78f1e3 100644 --- a/web/template/header.php +++ b/web/template/header.php @@ -13,7 +13,7 @@ </head> <body> <div id="archnavbar" class="anb-aur"> - <div id="archnavbarlogo"><h1><a href="/" title="Return to the main page">Arch Linux</a></h1></div> + <div id="archnavbarlogo"><h1><a href="http://www.archlinux.org" title="Return to the main page">Arch Linux</a></h1></div> <div id="archnavbarmenu"> <ul id="archnavbarlist"> <li id="anb-home"><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li> -- 1.7.12.2

1 0

[aur-dev] [PATCH] tu.php: Fix page showing a user hasn't voted when they have
by canyonknight 09 Oct '12

09 Oct '12

An ended vote details page will report a user hasn't voted even when they have. This is a result of faulty logic that only checks if a user has voted if the vote is still running. Regression with commit c15441762c6f6ab4438eaf2854c0ee3146a98b30 Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- web/html/tu.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/web/html/tu.php b/web/html/tu.php index 5e85e78..e2f7712 100644 --- a/web/html/tu.php +++ b/web/html/tu.php @@ -42,10 +42,13 @@ if ($atype == "Trusted User" || $atype == "Developer") { } else if ($row['User'] == username_from_sid($_COOKIE["AURSID"])) { $canvote = 0; $errorvote = __("You cannot vote in an proposal about you."); - } else if (tu_voted($row['ID'], uid_from_sid($_COOKIE["AURSID"]))) { + } + if (tu_voted($row['ID'], uid_from_sid($_COOKIE["AURSID"]))) { $canvote = 0; $hasvoted = 1; - $errorvote = __("You've already voted for this proposal."); + if ($isrunning) { + $errorvote = __("You've already voted for this proposal."); + } } if ($canvote == 1) { -- 1.7.12.2

1 0

[aur-dev] [PATCH] Refactor TU voters list
by Lukas Fleischer 08 Oct '12

08 Oct '12

* Change voters_list() to return an array of voters instead of generating HTML code in the library call. * Change the template to generate HTML code for the list of voters instead of displaying the library's return value. * Use HTML lists. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/acctfuncs.inc.php | 6 +++--- web/template/tu_details.php | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index bce00f8..3fd23ae 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -969,14 +969,14 @@ function vote_details($voteid, $dbh=NULL) { * @param string $voteid The ID of the Trusted User proposal * @param \PDO $dbh An already established database connection * - * @return array All users (and HTML links) who voted for a specific proposal + * @return array All users who voted for a specific proposal */ function voter_list($voteid, $dbh=NULL) { if (!$dbh) { $dbh = db_connect(); } - $whovoted = ''; + $whovoted = array(); $q = "SELECT tv.UserID,U.Username "; $q.= "FROM TU_Votes tv, Users U "; @@ -987,7 +987,7 @@ function voter_list($voteid, $dbh=NULL) { $result = $dbh->query($q); if ($result) { while ($row = $result->fetch(PDO::FETCH_ASSOC)) { - $whovoted.= '<a href="' . get_user_uri($row['Username']) . '">'.$row['Username'].'</a> '; + $whovoted[] = $row['Username']; } } return $whovoted; diff --git a/web/template/tu_details.php b/web/template/tu_details.php index b53797f..89a7667 100644 --- a/web/template/tu_details.php +++ b/web/template/tu_details.php @@ -54,7 +54,11 @@ <?php if (!$isrunning): ?> <div class="box"> <h2><?= __("Voters"); ?></h2> - <?= $whovoted; ?> + <ul> + <?php foreach($whovoted => $voter): ?> + <li><a href="<?= get_user_uri($voter) ?>"><?= htmlspecialchars($voter) ?></a></li> + <?php endforeach; ?> + </ul> </div> <?php endif; ?> -- 1.7.12.2

1 1