September 2012 - Aur-dev - lists.archlinux.org

[aur-dev] [PATCH 2/2] Sync account editing page with archweb
by Lukas Fleischer 21 Sep '12

21 Sep '12

Synchronize the layout of the account editing page with the profiles page from archweb. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/template/account_edit_form.php | 181 ++++++++++++++++--------------------- 1 file changed, 76 insertions(+), 105 deletions(-) diff --git a/web/template/account_edit_form.php b/web/template/account_edit_form.php index b1cb749..477edca 100644 --- a/web/template/account_edit_form.php +++ b/web/template/account_edit_form.php @@ -1,7 +1,7 @@ <?php if ($A == "UpdateAccount"): ?> -<form action="<?php echo get_user_uri($U) . 'update/'; ?>" method="post"> +<form id="edit-profile-form" action="<?php echo get_user_uri($U) . 'update/'; ?>" method="post"> <?php else: ?> -<form action="<?php echo get_uri('/register/'); ?>" method="post"> +<form id="edit-profile-form" action="<?php echo get_uri('/register/'); ?>" method="post"> <?php endif; ?> <fieldset> <input type="hidden" name="Action" value="<?php echo $A ?>" /> @@ -10,106 +10,84 @@ <input type="hidden" name="token" value="<?php print htmlspecialchars($_COOKIE['AURSID']) ?>" /> <?php endif; ?> </fieldset> - <table> - <tr> - <td colspan="2"> </td> - </tr> - - <tr> - <td align="left"><?php echo __("Username") ?>:</td> - <td align="left"><input type="text" size="30" maxlength="64" name="U" value="<?php echo htmlspecialchars($U,ENT_QUOTES) ?>" /> (<?php echo __("required") ?>)</td> - </tr> + <fieldset> + <p> + <label for="id_username"><?php echo __("Username") ?>:</label> + <input type="text" size="30" maxlength="64" name="U" id="id_username" value="<?php echo htmlspecialchars($U,ENT_QUOTES) ?>" /> (<?php echo __("required") ?>) + </p> <?php # Only TUs or Devs can promote/demote/suspend a user if ($UTYPE == "Trusted User" || $UTYPE == "Developer"): ?> - <tr> - <td align="left"><?php echo __("Account Type") ?>:</td> - <td align="left"> - <select name=T> - <?php if ($T == "User"): ?> - <option value="1" selected><?php echo __("Normal user") ?> - <?php else: ?> - <option value="1"><?php echo __("Normal user") ?> - <?php endif; ?> - <?php if ($T == "Trusted User"): ?> - <option value="2" selected><?php echo __("Trusted user") ?> - <?php else: ?> - <option value="2"><?php echo __("Trusted user") ?> - <?php endif; ?> - <?php - # Only developers can make another account a developer - if ($UTYPE == "Developer"): - ?> - <option value="3" - <?php $T == "Developer" ? print " selected>" : print ">"; - print __("Developer")."\n"; ?> - <?php endif; ?> - </select> - </td> - </tr> - - <tr> - <td align="left"><?php echo __("Account Suspended") ?>:</td> + <p> + <label for="id_type"><?php echo __("Account Type") ?>:</label> + <select name="T" id="id_type"> + <?php if ($T == "User"): ?> + <option value="1" selected><?php echo __("Normal user") ?> + <?php else: ?> + <option value="1"><?php echo __("Normal user") ?> + <?php endif; ?> + <?php if ($T == "Trusted User"): ?> + <option value="2" selected><?php echo __("Trusted user") ?> + <?php else: ?> + <option value="2"><?php echo __("Trusted user") ?> + <?php endif; ?> + <?php + # Only developers can make another account a developer + if ($UTYPE == "Developer"): + ?> + <option value="3" + <?php $T == "Developer" ? print " selected>" : print ">"; + print __("Developer")."\n"; ?> + <?php endif; ?> + </select> + </p> + <p> + <label for="id_suspended"><?php echo __("Account Suspended") ?>:</label> <?php if ($S): ?> - <td align="left"><input type="checkbox" name="S" checked="checked" /> + <input type="checkbox" name="S" id="id_suspended" checked="checked" /> <?php else: ?> - <td align="left"><input type="checkbox" name="S" /> + <input type="checkbox" name="S" id="id_suspended" /> <?php endif; ?> - </tr> + </p> <?php endif; ?> - <tr> - <td align="left"><?php echo __("Email Address") ?>:</td> - <td align="left"><input type="text" size="30" maxlength="64" name="E" value="<?php echo htmlspecialchars($E,ENT_QUOTES) ?>" /> (<?php echo __("required") ?>)</td> - </tr> + <p> + <label for="id_email"><?php echo __("Email Address") ?>:</label> + <input type="text" size="30" maxlength="64" name="E" id="id_email" value="<?php echo htmlspecialchars($E,ENT_QUOTES) ?>" /> (<?php echo __("required") ?>) + </p> - <tr> - <td align="left"><?php echo __("Password") ?>:</td> - <td align="left"> - <input type="password" size="30" maxlength="32" name="P" value="<?php echo $P ?>" /> - <?php if ($A != "UpdateAccount"): - print " (".__("required").")"; - endif; ?> - </td> - </tr> + <p> + <label for="id_passwd1"><?php echo __("Password") ?>:</label> + <input type="password" size="30" maxlength="32" name="P" id="id_passwd1" value="<?php echo $P ?>" /> + <?php if ($A != "UpdateAccount"): print " (".__("required").")"; endif; ?> + </p> - <tr> - <td align="left"><?php echo __("Re-type password") ?>:</td> - <td align="left"> - <input type="password" size="30" maxlength="32" name="C" value="<?php echo $C ?>" /> - <?php if ($A != "UpdateAccount"): - print " (".__("required").")"; - endif; ?> - </td> - </tr> + <p> + <label for="id_passwd2"><?php echo __("Re-type password") ?>:</label> + <input type="password" size="30" maxlength="32" name="C" id="id_passwd2" value="<?php echo $C ?>" /> + <?php if ($A != "UpdateAccount"): print " (".__("required").")"; endif; ?> + </p> - <tr> - <td align="left"><?php echo __("Real Name") ?>:</td> - <td align="left"> - <input type="text" size="30" maxlength="32" name="R" value="<?php echo htmlspecialchars($R,ENT_QUOTES) ?>" /> - </td> - </tr> + <p> + <label for="id_realname"><?php echo __("Real Name") ?>:</label> + <input type="text" size="30" maxlength="32" name="R" id="id_realname" value="<?php echo htmlspecialchars($R,ENT_QUOTES) ?>" /> + </p> - <tr> - <td align="left"><?php echo __("IRC Nick") ?>:</td> - <td align="left"> - <input type="text" size="30" maxlength="32" name="I" value="<?php echo htmlspecialchars($I,ENT_QUOTES) ?>" /> - </td> - </tr> + <p> + <label for="id_irc"><?php echo __("IRC Nick") ?>:</label> + <input type="text" size="30" maxlength="32" name="I" id="id_irc" value="<?php echo htmlspecialchars($I,ENT_QUOTES) ?>" /> + </p> - <tr> - <td align="left"><?php echo __("PGP Key Fingerprint") ?>:</td> -<td align="left"> - <input type="text" size="30" maxlength="50" name="K" value="<?php echo html_format_pgp_fingerprint($K) ?>" /> - </td> - </tr> + <p> + <label for="id_pgp"><?php echo __("PGP Key Fingerprint") ?>:</label> + <input type="text" size="30" maxlength="50" name="K" id="id_pgp" value="<?php echo html_format_pgp_fingerprint($K) ?>" /> + </p> - <tr> - <td align="left"><?php echo __("Language") ?>:</td> - <td align="left"> - <select name=L> + <p> + <label for="id_language"><?php echo __("Language") ?>:</label> + <select name="L" id="id_language"> <?php reset($SUPPORTED_LANGS); while (list($code, $lang) = each($SUPPORTED_LANGS)) { @@ -120,24 +98,17 @@ } } ?> - </select> - </td> - </tr> - - <tr> - <td colspan="2"> </td> - </tr> - <tr> - <td> </td> - <td align="left"> - <?php if ($A == "UpdateAccount"): ?> - <input type="submit" class="button" value="<?php echo __("Update") ?>" />   - <?php else: ?> - <input type="submit" class="button" value="<?php echo __("Create") ?>" />   - <?php endif; ?> - <input type="reset" class="button" value="<?php echo __("Reset") ?>" /> - </td> - </tr> + </select> + </p> - </table> + <p> + <label></label> + <?php if ($A == "UpdateAccount"): ?> + <input type="submit" class="button" value="<?php echo __("Update") ?>" />   + <?php else: ?> + <input type="submit" class="button" value="<?php echo __("Create") ?>" />   + <?php endif; ?> + <input type="reset" class="button" value="<?php echo __("Reset") ?>" /> + </p> + </fieldset> </form> -- 1.7.12

1 0

[aur-dev] [PATCH] rss.php: Update links to reflect URL changes
by canyonknight 21 Sep '12

21 Sep '12

Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- web/html/rss.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/html/rss.php b/web/html/rss.php index 6f057bf..84d2205 100644 --- a/web/html/rss.php +++ b/web/html/rss.php @@ -28,7 +28,7 @@ $rss->encoding = "UTF-8"; $rss->title = "AUR Newest Packages"; $rss->description = "The latest and greatest packages in the AUR"; $rss->link = "${protocol}://{$host}"; -$rss->syndicationURL = "{$protocol}://{$host}/rss.php"; +$rss->syndicationURL = "{$protocol}://{$host}" . get_uri('/rss/'); $image = new FeedImage(); $image->title = "AUR"; $image->url = "{$protocol}://{$host}/images/AUR-logo-80.png"; @@ -42,7 +42,7 @@ $packages = latest_pkgs(20); while (list($indx, $row) = each($packages)) { $item = new FeedItem(); $item->title = $row["Name"]; - $item->link = "{$protocol}://{$host}/packages.php?ID={$row["ID"]}"; + $item->link = "{$protocol}://{$host}" . get_pkg_uri($row["Name"]); $item->description = $row["Description"]; $item->date = intval($row["SubmittedTS"]); $item->source = "{$protocol}://{$host}"; -- 1.7.12.1

1 0

[aur-dev] [PATCH 1/2] Remove unused canManagePackage() function
by canyonknight 20 Sep '12

20 Sep '12

Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- web/lib/pkgfuncs.inc.php | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index b2daf0e..f0e64d2 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -40,28 +40,6 @@ function canDeleteCommentArray($comment, $atype="", $uid=0) { return FALSE; } -# see if this Users.ID can manage the package -# -function canManagePackage($uid=0,$AURMUID=0, $MUID=0, $SUID=0, $managed=0) { - if (!$uid) {return 0;} - - # The uid of the TU/Dev that manages the package - # - if ($uid == $AURMUID) {return 1;} - - # If the package isn't maintained by a TU/Dev, is this the user-maintainer? - # - if ($uid == $MUID && !$managed) {return 1;} - - # If the package isn't maintained by a TU/Dev, is this the user-submitter? - # - if ($uid == $SUID && !$managed) {return 1;} - - # otherwise, no right to manage this package - # - return 0; -} - # Check if the current user can submit blacklisted packages. # function canSubmitBlacklisted($atype = "") { -- 1.7.12

1 1

[aur-dev] [PATCH] Remove unused chmod_group() function
by canyonknight 20 Sep '12

20 Sep '12

Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- web/lib/aur.inc.php | 28 ---------------------------- 1 file changed, 28 deletions(-) Discovered when I was documenting functions. diff --git a/web/lib/aur.inc.php b/web/lib/aur.inc.php index d26bdf2..a23cd3e 100644 --- a/web/lib/aur.inc.php +++ b/web/lib/aur.inc.php @@ -302,34 +302,6 @@ function rm_tree($dirname) { return; } -# Recursive chmod to set group write permissions -# -function chmod_group($path) { - if (!is_dir($path)) - return chmod($path, 0664); - - $d = dir($path); - while ($f = $d->read()) { - if ($f != '.' && $f != '..') { - $fullpath = $path.'/'.$f; - if (is_link($fullpath)) - continue; - elseif (!is_dir($fullpath)) { - if (!chmod($fullpath, 0664)) - return FALSE; - } - elseif(!chmod_group($fullpath)) - return FALSE; - } - } - $d->close(); - - if(chmod($path, 0775)) - return TRUE; - else - return FALSE; -} - # obtain the uid given a Users.Username # function uid_from_username($username="", $dbh=NULL) { -- 1.7.12

1 0

[aur-dev] [PATCH 1/2] Removed unused mysql_num_rows result, changed while-loop check from lazy-one to default one
by mario＠xenji.com 19 Sep '12

19 Sep '12

From: "Mario (xenji) Mueller" <mario(a)xenji.com> Signed-off-by: Mario (xenji) Mueller <mario(a)xenji.com> --- web/lib/acctfuncs.inc.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index d58c759..6f7c98a 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -327,9 +327,8 @@ function search_results_page($UTYPE,$O=0,$SB="",$U="",$T="", } $result = db_query($q, $dbh); - $num_rows = mysql_num_rows($result); - while ($row = mysql_fetch_assoc($result)) { + while (($row = mysql_fetch_assoc($result)) != false) { $userinfo[] = $row; } -- 1.7.12

4 9

[aur-dev] [PATCH 1/2] Wrap long lines in the "Recent Updates" sidebar
by Lukas Fleischer 19 Sep '12

19 Sep '12

* Sync the sidebar layout with archweb, use the "pkg-name" class to wrap long package names. * Move the "New!" logo to a separate column to make sure it isn't wrapped to a new line on its own. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/css/aur.css | 4 ++++ web/template/stats/updates_table.php | 10 +++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/web/html/css/aur.css b/web/html/css/aur.css index 741446e..de661fc 100644 --- a/web/html/css/aur.css +++ b/web/html/css/aur.css @@ -2,3 +2,7 @@ #lang_sub { float: right; } + +#pkg-updates td.pkg-new { + padding: 0 .5em; +} diff --git a/web/template/stats/updates_table.php b/web/template/stats/updates_table.php index e7ceec7..2220d6a 100644 --- a/web/template/stats/updates_table.php +++ b/web/template/stats/updates_table.php @@ -3,10 +3,13 @@ <a href="<?php echo get_uri('/rss/') ?>" title="Arch Package Updates RSS Feed" class="rss-icon"><img src="/images/feed-icon-14x14.png" alt="RSS Feed" /></a> <table> - <?php foreach ($newest_packages->getIterator() as $row): ?> + <tbody> + <?php foreach ($newest_packages->getIterator() as $row): ?> <tr> - <td> + <td class="pkg-name"> <a href="<?php echo get_pkg_uri($row["Name"]); ?>"><?php print htmlspecialchars($row["Name"]) . ' ' . htmlspecialchars($row["Version"]); ?></a> + </td> + <td class="pkg-new"> <?php if ($row["ModifiedTS"] === $row["SubmittedTS"]): ?> <img src="images/new.png" alt="New!" /> <?php endif; ?> @@ -15,5 +18,6 @@ <span><?php print gmdate("Y-m-d H:i", intval($row["ModifiedTS"])); ?></span> </td> </tr> - <?php endforeach; ?> + <?php endforeach; ?> + </tbody> </table> -- 1.7.12

1 1

[aur-dev] [PATCH] Fix category selection
by Lukas Fleischer 18 Sep '12

18 Sep '12

Add a package ID parameter to pkg_change_category() instead of relying on the "ID" or "N" GET parameters. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/packages.php | 2 +- web/lib/pkgfuncs.inc.php | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/web/html/packages.php b/web/html/packages.php index 44f7671..3478ab9 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -89,7 +89,7 @@ if (check_token()) { } elseif (current_action("do_DeleteComment")) { $output = pkg_delete_comment($atype); } elseif (current_action("do_ChangeCategory")) { - $output = pkg_change_category($atype); + $output = pkg_change_category($pkgid, $atype); } } diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 593ccde..b42df4c 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -1206,7 +1206,7 @@ function pkg_delete_comment($atype, $dbh=NULL) { * @param string $atype Account type, output of account_from_sid * @return string Translated error or success message */ -function pkg_change_category($atype, $dbh=NULL) { +function pkg_change_category($pid, $atype, $dbh=NULL) { if (!$atype) { return __("You must be logged in before you can edit package information."); } @@ -1226,14 +1226,6 @@ function pkg_change_category($atype, $dbh=NULL) { return __("Invalid category ID."); } - if (isset($_GET["ID"])) { - $pid = $_GET["ID"]; - } elseif (isset($_GET["N"])) { - $pid = pkgid_from_name($_GET["N"]); - } else { - return __("Missing package ID."); - } - # Verify package ownership $q = "SELECT Packages.MaintainerUID "; $q.= "FROM Packages "; -- 1.7.12

1 0

[aur-dev] [PATCH 1/2] Fix package notification
by Lukas Fleischer 18 Sep '12

18 Sep '12

One cannot check if the PDOStatement object returned by query() evaluates to true in order to check for a non-empty record set. Modify the SQL query to count the number of records instead of retrieving the records themselves and fixing the check. Regression introduced in e171f6f34eeacf35cf7142b4788d43e7d0978546. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/pkgfuncs.inc.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 0b3a6cb..593ccde 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -1134,12 +1134,12 @@ function pkg_notify ($atype, $ids, $action=true, $dbh=NULL) { if ($action) { - $q = "SELECT * FROM CommentNotify WHERE UserID = $uid"; - $q .= " AND PkgID = $pid"; + $q = "SELECT COUNT(*) FROM CommentNotify WHERE "; + $q .= "UserID = $uid AND PkgID = $pid"; # Notification already added. Don't add again. $result = $dbh->query($q); - if (!$result) { + if ($result->fetchColumn() == 0) { $q = "INSERT INTO CommentNotify (PkgID, UserID) VALUES ($pid, $uid)"; $dbh->exec($q); } @@ -1147,8 +1147,8 @@ function pkg_notify ($atype, $ids, $action=true, $dbh=NULL) { $output .= $pkgname; } else { - $q = "DELETE FROM CommentNotify WHERE PkgID = $pid"; - $q .= " AND UserID = $uid"; + $q = "DELETE FROM CommentNotify WHERE PkgID = $pid "; + $q .= "AND UserID = $uid"; $dbh->exec($q); $output .= $pkgname; -- 1.7.12

1 1

[aur-dev] [PATCH] pkg_details.php: Hide "Adopt" button from logged out users
by Lukas Fleischer 18 Sep '12

18 Sep '12

Reported-by: canyonknight <canyonknight(a)gmail.com> Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/template/pkg_details.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index 7176e10..a4cd347 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -56,6 +56,7 @@ $sources = package_sources($row["ID"]); <?php endif; ?> <?php endif; ?> </ul> + <?php if ($uid): ?> <form action="<?php echo htmlspecialchars(get_pkg_uri($row['Name']), ENT_QUOTES); ?>" method="post"> <div> <input type="hidden" name="IDs[<?php echo $row['ID'] ?>]" value="1" /> @@ -71,6 +72,7 @@ $sources = package_sources($row["ID"]); <?php endif; ?> </p> </form> + <?php endif; ?> </div> </div> -- 1.7.12

1 0

[aur-dev] [PATCH 1/4] index.php: Fix undefined variable notice
by Lukas Fleischer 18 Sep '12

18 Sep '12

Spotted when browsing the package details page while being logged out. Reported-by: canyonknight <canyonknight(a)gmail.com> Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/index.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/html/index.php b/web/html/index.php index 70698a4..2d80a94 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -42,7 +42,10 @@ if (isset($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { break; } - $_POST['token'] = $_COOKIE['AURSID']; + if (isset($_COOKIE['AURSID'])) { + $_POST['token'] = $_COOKIE['AURSID']; + } + $_POST['IDs'] = array(pkgid_from_name($tokens[2]) => '1'); } } -- 1.7.12

1 3