- Aur-dev - lists.archlinux.org

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

19 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

[aur-dev] [PATCH 00/13] Status Update
by canyonknight 18 Sep '12

18 Sep '12

Hello all, I've been doing quite a bit of testing lately and have collected a few patches. Note that the PDO patch isn't present because it is too large for the mailing list. The following things still need to be fixed: - Account registration needs to be modified to work with URL rewriting - When a user is logged out they get the "adopt package" button on orphan package pages - "View PKGBUILD" and "Download tarball" appear to be broken by rewriting - Move delete and merge to "Package Actions" so that the actions bar is deprecated (maybe?) - Fix undefined notice when a logged out user navigates to a package page - The "Latest Comments" link appends "?comments=all" to URL on every click Anything else? canyonknight (13): Migrate all DB code to use PDO Adjust user directions after registering to reflect new login page logout.php: Fix PHP undefined variable notice Add the new package icon back to the front page Use the "new" icon from archweb for the recent updates table Remove unused image "titlelogo.png" pkg_comment_form.php: Fix PHP undefined variable notice for package "ID" Fix account search page results routing to /account/ Use URL rewriting for user info page Use URL rewriting for user editing page Use URL rewriting for user account update page Overhaul ability to edit own account header.php: Update account editing link INSTALL | 2 +- UPGRADING | 2 + web/html/account.php | 34 +--- web/html/images/new.gif | Bin 116 -> 0 bytes web/html/images/new.png | Bin 0 -> 378 bytes web/html/images/titlelogo.png | Bin 4502 -> 0 bytes web/html/index.php | 21 ++- web/html/logout.php | 2 +- web/html/voters.php | 2 +- web/lib/acctfuncs.inc.php | 245 +++++++++++++------------ 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 | 304 +++++++++++++++++--------------- web/lib/routing.inc.php | 17 ++ web/lib/stats.inc.php | 4 +- web/lib/translator.inc.php | 6 +- web/template/account_edit_form.php | 2 +- web/template/account_search_results.php | 8 +- web/template/header.php | 5 +- web/template/pkg_comment_form.php | 2 +- web/template/pkg_comments.php | 2 +- web/template/search_accounts_form.php | 2 +- web/template/stats/updates_table.php | 3 + 25 files changed, 414 insertions(+), 436 deletions(-) delete mode 100644 web/html/images/new.gif create mode 100644 web/html/images/new.png delete mode 100644 web/html/images/titlelogo.png -- 1.7.12

3 14

[aur-dev] [PATCH] Added IDE related files to gitignore, added headlines
by mario＠xenji.com 18 Sep '12

18 Sep '12

From: "Mario (xenji) Mueller" <mario(a)xenji.com> Signed-off-by: Mario (xenji) Mueller <mario(a)xenji.com> --- .gitignore | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.gitignore b/.gitignore index 11e9b7e..155bf10 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,29 @@ +# Common Files .htaccess robots.txt *.swp + +## Local Config web/lib/config.inc web/lib/config.inc.php + +## Mac Files *.DS_Store + +## Demo Data web/html/xml/*.xml dummy-data.sql* + +## Translations web/locale/*/ po/*.mo po/*.po~ + +# IDE Data Files +## PHPStorm +.idea/ +*.iml + +## Eclipse +.settings/ +.project \ No newline at end of file -- 1.7.12

3 2

[aur-dev] [PATCH] Added IDE related files to gitignore, added headlines
by mario＠xenji.com 17 Sep '12

17 Sep '12

* Added phpstorm and eclipse-pdt related files to gitignore * Added headlines for each line I could identify

1 0