October 2008 - Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] Turn on package notification by default for new packages
by Callan Barrett 18 Jun '09

18 Jun '09

Version using package functions Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/pkgsubmit.php | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 78d6e50..450e9b6 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -328,6 +328,7 @@ if ($_COOKIE["AURSID"]): header('Location: packages.php?ID=' . $pdata['ID']); } else { + $uid = uid_from_sid($_COOKIE["AURSID"]); # This is a brand new package $q = sprintf("INSERT INTO Packages (Name, License, Version, CategoryID, Description, URL, LocationID, SubmittedTS, SubmitterUID, MaintainerUID, FSPath, URLPath) VALUES ('%s', '%s', '%s-%s', %d, '%s', '%s', 2, UNIX_TIMESTAMP(), %d, %d, '%s', '%s')", @@ -338,8 +339,8 @@ if ($_COOKIE["AURSID"]): mysql_real_escape_string($_REQUEST['category']), mysql_real_escape_string($new_pkgbuild['pkgdesc']), mysql_real_escape_string($new_pkgbuild['url']), - uid_from_sid($_COOKIE["AURSID"]), - uid_from_sid($_COOKIE["AURSID"]), + $uid, + $uid, mysql_real_escape_string(INCOMING_DIR . $pkg_name . "/" . $pkg_name . ".tar.gz"), mysql_real_escape_string(URL_DIR . $pkg_name . "/" . $pkg_name . ".tar.gz")); @@ -370,6 +371,8 @@ if ($_COOKIE["AURSID"]): $q .= $packageID . ", '" . mysql_real_escape_string($src) . "')"; db_query($q, $dbh); } + + pkg_notify(account_from_sid($_COOKIE["AURSID"]), array($packageID)); header('Location: packages.php?ID=' . $packageID); -- 1.6.0.2

2 1

[aur-dev] [PATCH] Clean up packages.php and document new package functions
by Callan Barrett 23 Nov '08

23 Nov '08

Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/packages.php | 65 +++++++++++++++++++------------------------------ web/lib/pkgfuncs.inc | 48 ++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 40 deletions(-) diff --git a/web/html/packages.php b/web/html/packages.php index f06aaa1..9c611d8 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -8,38 +8,31 @@ include("search_po.inc"); # use some form of this for i18n support set_lang(); # this sets up the visitor's language check_sid(); # see if they're still logged in -# set the title to something useful depending on -# what "page" we're on -# +# Set the title to the current query if required if (isset($_GET['ID'])) { - $id = pkgname_from_id($_GET['ID']); - if (!empty($id)) { - $title = $id; - } -} else if (!empty($_GET['K'])) { - $title = "Search: " . $_GET['K']; + if (pkgname_from_id($_GET['ID'])) { $title = $id; } +} else if (!empty($_GET['K'])) { + $title = __("Search Criteria") . ": " . $_GET['K']; } else { $title = __("Packages"); } -html_header($title); - -# get login privileges -# +# Retrieve account type if (isset($_COOKIE["AURSID"])) { - # Only logged in users can do stuff - # $atype = account_from_sid($_COOKIE["AURSID"]); } else { $atype = ""; } -# grab the list of Package IDs to be operated on +# Grab the list of Package IDs to be operated on # +# TODO: Convert this to a normal array of IDs to operate on and convert the +# functions to use this format isset($_POST["IDs"]) ? $ids = $_POST["IDs"] : $ids = array(); -# determine what button the visitor clicked -# +html_header($title); + +# Determine what action to do if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { print ""; print pkg_flag($atype, $ids, True); @@ -48,18 +41,14 @@ if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { print ""; print pkg_flag($atype, $ids, False); print ""; -} elseif ($_POST['action'] == "do_Disown" || isset($_POST['do_Disown'])) { - print ""; - print pkg_adopt($atype, $ids, False); - print ""; -} elseif ($_POST['action'] == "do_Delete" || isset($_POST['do_Delete'])) { - print ""; - print pkg_delete($atype, $ids, False); - print ""; } elseif ($_POST['action'] == "do_Adopt" || isset($_POST['do_Adopt'])) { print ""; print pkg_adopt($atype, $ids, True); print ""; +} elseif ($_POST['action'] == "do_Disown" || isset($_POST['do_Disown'])) { + print ""; + print pkg_adopt($atype, $ids, False); + print ""; } elseif ($_POST['action'] == "do_Vote" || isset($_POST['do_Vote'])) { print ""; print pkg_vote($atype, $ids, True); @@ -68,26 +57,22 @@ if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { print ""; print pkg_vote($atype, $ids, False); print ""; -} elseif (isset($_GET["ID"])) { - - if (!intval($_GET["ID"])) { - print __("Error trying to retrieve package details.")." \n"; - - } else { - package_details($_GET["ID"], $_COOKIE["AURSID"]); - } - +} elseif ($_POST['action'] == "do_Delete" || isset($_POST['do_Delete'])) { + print ""; + print pkg_delete($atype, $ids); + print ""; } elseif ($_POST['action'] == "do_Notify" || isset($_POST['do_Notify'])) { print ""; print pkg_notify($atype, $ids); print ""; +} elseif (isset($_GET["ID"])) { + if (!is_numeric($_GET["ID"])) { + print __("Error trying to retrieve package details.") . " "; + } else { + package_details($_GET["ID"], $_COOKIE["AURSID"]); + } } else { - # just do a search - # pkg_search_page($_COOKIE["AURSID"]); - } html_footer(AUR_VERSION); - -?> diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index 5c179fa..9941103 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -985,6 +985,17 @@ function pkg_search_page($SID="") { return; } +/** + * Flag and un-flag packages out-of-date + * + * @param string $atype Account type, output of account_from_sid + * @param array $ids Array of package IDs to flag/unflag, formatted as + * $package_id => $useless_crap + * @param boolean $action True flags out-of-date, false un-flags. Flags by + * default + * + * @return string Translated success or error messages + */ function pkg_flag ($atype, $ids, $action = True) { if (!$atype) { if ($action) { @@ -1059,6 +1070,15 @@ function pkg_flag ($atype, $ids, $action = True) { } } +/** + * Delete packages + * + * @param string $atype Account type, output of account_from_sid + * @param array $ids Array of package IDs to delete, formatted as + * $package_id => $useless_crap + * + * @return string Translated error or success message + */ function pkg_delete ($atype, $ids) { if (!$atype) { return __("You must be logged in before you can disown packages."); @@ -1132,6 +1152,16 @@ function pkg_delete ($atype, $ids) { return __("The selected packages have been deleted."); } +/** + * Adopt or disown packages + * + * @param string $atype Account type, output of account_from_sid + * @param array $ids Array of package IDs to adopt/disown, formatted as + * $package_id => $whatever + * @param boolean $action Adopts if true, disowns if false. Adopts by default + * + * @return string Translated error or success message + */ function pkg_adopt ($atype, $ids, $action = True) { if (!$atype) { if ($action) { @@ -1190,6 +1220,16 @@ function pkg_adopt ($atype, $ids, $action = True) { } } +/** + * Vote and un-vote for packages + * + * @param string $atype Account type, output of account_from_sid + * @param array $ids Array of package IDs to vote/un-vote, formatted as + * $package_id => $useless + * @param boolean $action Votes if true, un-votes if false. Votes by default + * + * @return string Translated error or success message + */ function pkg_vote ($atype, $ids, $action = True) { if (!$atype) { if ($action) { @@ -1267,6 +1307,14 @@ function pkg_vote ($atype, $ids, $action = True) { } } +/** + * Toggle notification of packages + * + * @param string $atype Account type, output of account_from_sid + * @param array $ids Array of package IDs to toggle, formatted as $package_id => $crap + * + * @return string Translated error or success message + */ function pkg_notify ($atype, $ids) { if (!$atype) { return __("You must be logged in before you can get notifications on comments."); -- 1.6.0.2

2 1

[aur-dev] [PATCH] Revert "Use system rm in rm_rf function."
by Dan McGee 04 Nov '08

04 Nov '08

This reverts commit 5c3f01909301f641f57b2ffe8b59609de6be2256. Falling back to a system function is really dumb when all we need to do is fix the ordering of things in this function. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- Guys, I sent the last patches based off of the master branch- looks like I have no idea how your development works, sorry about that. Anyway here is the series based off of the testing branch. It still will need some testing. -Dan web/lib/aur.inc | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/web/lib/aur.inc b/web/lib/aur.inc index a126bb9..ade5b82 100644 --- a/web/lib/aur.inc +++ b/web/lib/aur.inc @@ -374,10 +374,19 @@ function can_submit_pkg($name="", $sid="") { # recursive delete directory # function rm_rf($dirname="") { - if ($dirname != "") { - exec('rm -rf ' . escapeshellcmd($dirname)); + $d = dir($dirname); + while ($f = $d->read()) { + if ($f != "." && $f != "..") { + if (is_dir($dirname."/".$f)) { + rm_rf($dirname."/".$f); + } + if (is_file($dirname."/".$f) || is_link($dirname."/".$f)) { + unlink($dirname."/".$f); + } + } } - + $d->close(); + rmdir($dirname); return; } -- 1.6.0.3

3 6

[aur-dev] [PATCH] Convert package notification to a function
by Callan Barrett 31 Oct '08

31 Oct '08

Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/packages.php | 46 ++--------------------------------------- web/lib/pkgfuncs.inc | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 43 deletions(-) diff --git a/web/html/packages.php b/web/html/packages.php index 91b0e6e..f06aaa1 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -78,49 +78,9 @@ if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { } } elseif ($_POST['action'] == "do_Notify" || isset($_POST['do_Notify'])) { - # I realize that the implementation here seems a bit convoluted, but we want to - # ensure that everything happens as it should, even if someone called this page - # without having clicked a button somewhere (naughty naughty). This also leaves - # room to someday expand and allow to add oneself to multiple lists at once. -SL - if (!$atype) { - print __("You must be logged in before you can get notifications on comments."); - print " \n"; - } else { - if (!empty($ids)) { - $dbh = db_connect(); - $uid = uid_from_sid($_COOKIE["AURSID"]); - # There currently shouldn't be multiple requests here, but the format in which - # it's sent requires this - while (list($pid, $v) = each($ids)) { - $q = "SELECT Name FROM Packages WHERE ID = " . $pid; - $pkgname = mysql_result(db_query($q, $dbh), 0); - - $q = "SELECT * FROM CommentNotify WHERE UserID = ".$uid; - $q.= " AND PkgID = ".$pid; - - if (!mysql_num_rows(db_query($q, $dbh))) { - $q = "INSERT INTO CommentNotify (PkgID, UserID) VALUES (".$pid.', '.$uid.')'; - db_query($q, $dbh); - print ''; - print __("You have been added to the comment notification list for %s.", - array("" . $pkgname . "")); - print ' '; - } else { - $q = "DELETE FROM CommentNotify WHERE PkgID = ".$pid; - $q.= " AND UserID = ".$uid; - db_query($q, $dbh); - print ''; - print __("You have been removed from the comment notification list for %s.", - array("" . $pkgname . "")); - print ' '; - } - } - } else { - print ''; - print __("Couldn't add to notification list."); - print ' '; - } - } + print ""; + print pkg_notify($atype, $ids); + print ""; } else { # just do a search # diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index 6d8b1a7..5c179fa 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -1266,3 +1266,56 @@ function pkg_vote ($atype, $ids, $action = True) { return __("Your votes have been removed from the selected packages."); } } + +function pkg_notify ($atype, $ids) { + if (!$atype) { + return __("You must be logged in before you can get notifications on comments."); + } + + if (empty($ids)) { + return __("Couldn't add to notification list."); + } + + $dbh = db_connect(); + $uid = uid_from_sid($_COOKIE["AURSID"]); + + # There currently shouldn't be multiple requests here, but the format in which + # it's sent requires this + $list = array(); + + foreach ($ids as $pid => $v) { + $q = "SELECT Name FROM Packages WHERE ID = " . $pid; + $pkgname = mysql_result(db_query($q, $dbh), 0); + + $q = "SELECT * FROM CommentNotify WHERE UserID = ".$uid; + $q.= " AND PkgID = ".$pid; + + if (!mysql_num_rows(db_query($q, $dbh))) { + $action = True; + + $q = "INSERT INTO CommentNotify (PkgID, UserID) VALUES (".$pid.', '.$uid.')'; + db_query($q, $dbh); + + $list[] = $pkgname; + } else { + $action = False; + + $q = "DELETE FROM CommentNotify WHERE PkgID = ".$pid; + $q.= " AND UserID = ".$uid; + db_query($q, $dbh); + + $list[] = $pkgname; + } + } + + $msg = "" . array_shift($list) . ""; + foreach ($list as $i) { + $msg .= ", " . $i . ""; + } + + if ($action) { + print __("You have been added to the comment notification list for %s.", $msg); + } else { + print __("You have been removed from the comment notification list for %s.", $msg); + } +} -- 1.6.0.2

2 2

[aur-dev] [PATCH] Convert package voting to a function
by Callan Barrett 30 Oct '08

30 Oct '08

Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/packages.php | 112 +++---------------------------------------------- web/lib/pkgfuncs.inc | 77 +++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 106 deletions(-) diff --git a/web/html/packages.php b/web/html/packages.php index 5935ebd..91b0e6e 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -61,113 +61,13 @@ if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { print pkg_adopt($atype, $ids, True); print ""; } elseif ($_POST['action'] == "do_Vote" || isset($_POST['do_Vote'])) { - if (!$atype) { - print __("You must be logged in before you can vote for packages."); - print " \n"; - - } else { - # vote on the packages in $ids array. - # - if (!empty($ids)) { - $dbh = db_connect(); - $my_votes = pkgvotes_from_sid($_COOKIE["AURSID"]); - $uid = uid_from_sid($_COOKIE["AURSID"]); - # $vote_ids will contain the string of Package.IDs that - # the visitor hasn't voted for already - # - $first = 1; - while (list($pid, $v) = each($ids)) { - if (!isset($my_votes[$pid])) { - # cast a vote for this package - # - if ($first) { - $first = 0; - $vote_ids = $pid; - $vote_clauses = "(".$uid.", ".$pid.")"; - } else { - $vote_ids .= ", ".$pid; - $vote_clauses .= ", (".$uid.", ".$pid.")"; - } - } - } - # only vote for packages the user hasn't already voted for - # - $q = "UPDATE Packages SET NumVotes = NumVotes + 1 "; - $q.= "WHERE ID IN (".$vote_ids.")"; - db_query($q, $dbh); - - $q = "INSERT INTO PackageVotes (UsersID, PackageID) VALUES "; - $q.= $vote_clauses; - db_query($q, $dbh); - - # Update the LastVoted field for this user - # - $q = "UPDATE Users SET LastVoted = UNIX_TIMESTAMP() "; - $q.= "WHERE ID = ".$uid; - db_query($q, $dbh); - - print "\n"; - print __("Your votes have been cast for the selected packages."); - print "\n"; - - } else { - print "\n"; - print __("You did not select any packages to vote for."); - print "\n"; - } - } - - + print ""; + print pkg_vote($atype, $ids, True); + print ""; } elseif ($_POST['action'] == "do_UnVote" || isset($_POST['do_UnVote'])) { - if (!$atype) { - print __("You must be logged in before you can un-vote for packages."); - print " \n"; - - } else { - # un-vote on the packages in $ids array. - # - if (!empty($ids)) { - $dbh = db_connect(); - $my_votes = pkgvotes_from_sid($_COOKIE["AURSID"]); - $uid = uid_from_sid($_COOKIE["AURSID"]); - # $unvote_ids will contain the string of Package.IDs that - # the visitor has voted for and wants to unvote. - # - $first = 1; - while (list($pid, $v) = each($ids)) { - if (isset($my_votes[$pid])) { - # cast a un-vote for this package - # - if ($first) { - $first = 0; - $unvote_ids = $pid; - } else { - $unvote_ids .= ", ".$pid; - } - } - } - # only un-vote for packages the user has already voted for - # - $q = "UPDATE Packages SET NumVotes = NumVotes - 1 "; - $q.= "WHERE ID IN (".$unvote_ids.")"; - db_query($q, $dbh); - - $q = "DELETE FROM PackageVotes WHERE UsersID = ".$uid." "; - $q.= "AND PackageID IN (".$unvote_ids.")"; - db_query($q, $dbh); - - print "\n"; - print __("Your votes have been removed from the selected packages."); - print "\n"; - - } else { - print "\n"; - print __("You did not select any packages to un-vote for."); - print "\n"; - } - } - - + print ""; + print pkg_vote($atype, $ids, False); + print ""; } elseif (isset($_GET["ID"])) { if (!intval($_GET["ID"])) { diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index 346e59e..6d8b1a7 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -1189,3 +1189,80 @@ function pkg_adopt ($atype, $ids, $action = True) { return __("The selected packages have been disowned."); } } + +function pkg_vote ($atype, $ids, $action = True) { + if (!$atype) { + if ($action) { + return __("You must be logged in before you can vote for packages."); + } else { + return __("You must be logged in before you can un-vote for packages."); + } + } + + if (empty($ids)) { + if ($action) { + return __("You did not select any packages to vote for."); + } else { + return __("Your votes have been removed from the selected packages."); + } + } + + $dbh = db_connect(); + $my_votes = pkgvotes_from_sid($_COOKIE["AURSID"]); + $uid = uid_from_sid($_COOKIE["AURSID"]); + + $first = 1; + foreach ($ids as $pid => $v) { + if ($action) { + $check = !isset($my_votes[$pid]); + } else { + $check = isset($my_votes[$pid]); + } + + if ($check) { + if ($first) { + $first = 0; + $vote_ids = $pid; + if ($action) { + $vote_clauses = "(".$uid.", ".$pid.")"; + } + } else { + $vote_ids .= ", ".$pid; + if ($action) { + $vote_clauses .= ", (".$uid.", ".$pid.")"; + } + } + } + } + + # only vote for packages the user hasn't already voted for + # + $op = $action ? "+" : "-"; + $q = "UPDATE Packages SET NumVotes = NumVotes " . $op . " 1 "; + $q.= "WHERE ID IN (" . $vote_ids . ")"; + + db_query($q, $dbh); + + if ($action) { + $q = "INSERT INTO PackageVotes (UsersID, PackageID) VALUES "; + $q.= $vote_clauses; + } else { + $q = "DELETE FROM PackageVotes WHERE UsersID = " . $uid . " "; + $q.= "AND PackageID IN (" . $vote_ids . ")"; + } + + db_query($q, $dbh); + + if ($action) { + $q = "UPDATE Users SET LastVoted = UNIX_TIMESTAMP() "; + $q.= "WHERE ID = " . $uid; + + db_query($q, $dbh); + } + + if ($action) { + return __("Your votes have been cast for the selected packages."); + } else { + return __("Your votes have been removed from the selected packages."); + } +} -- 1.6.0.2

2 1

[aur-dev] [PATCH] Convert package adoption/disowning to a function
by Callan Barrett 28 Oct '08

28 Oct '08

Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/packages.php | 100 +++---------------------------------------------- web/lib/pkgfuncs.inc | 58 ++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 94 deletions(-) diff --git a/web/html/packages.php b/web/html/packages.php index bc3ed18..5935ebd 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -49,105 +49,17 @@ if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { print pkg_flag($atype, $ids, False); print ""; } elseif ($_POST['action'] == "do_Disown" || isset($_POST['do_Disown'])) { - if (!$atype) { - print __("You must be logged in before you can disown packages."); - print " \n"; - - } else { - # Disown the packages in $ids array - # - if (!empty($ids)) { - $dbh = db_connect(); - - # Disown the packages in $ids array - # - $first = 1; - while (list($pid, $v) = each($ids)) { - if ($first) { - $first = 0; - $disown = $pid; - } else { - $disown .= ", ".$pid; - } - } - - $field = "MaintainerUID"; - $q = "UPDATE Packages "; - $q.= "SET ".$field." = 0 "; - $q.= "WHERE ID IN (" . $disown . ") "; - # If a user is a TU or dev they can disown any package - if ($atype == "User") { - $q.= "AND ".$field." = ".uid_from_sid($_COOKIE["AURSID"]); - } - db_query($q, $dbh); - - print "\n"; - print __("The selected packages have been disowned."); - print "\n"; - } else { - print "\n"; - print __("You did not select any packages to disown."); - print "\n"; - } - - - } - - + print ""; + print pkg_adopt($atype, $ids, False); + print ""; } elseif ($_POST['action'] == "do_Delete" || isset($_POST['do_Delete'])) { print ""; print pkg_delete($atype, $ids, False); print ""; } elseif ($_POST['action'] == "do_Adopt" || isset($_POST['do_Adopt'])) { - if (!$atype) { - print __("You must be logged in before you can adopt packages."); - print " \n"; - - } else { - # Adopt the packages in $ids array - # - if (!empty($ids)) { - $dbh = db_connect(); - - # Adopt the packages in $ids array - # - $first = 1; - while (list($pid, $v) = each($ids)) { - if ($first) { - $first = 0; - $adopt = $pid; - } else { - $adopt .= ", ".$pid; - } - } - - $field = "MaintainerUID"; - # NOTE: Only "orphaned" packages can be adopted at a particular - # user class (TU/Dev or User). - # - $q = "UPDATE Packages "; - $q.= "SET ".$field." = ".uid_from_sid($_COOKIE["AURSID"])." "; - $q.= "WHERE ID IN (" . $adopt . ") "; - if ($atype == "User") - { - # Regular users may only adopt orphan packages from unsupported - # FIXME: We assume that LocationID for unsupported is "2" - $q.= "AND ".$field." = 0"; - $q.= " AND LocationID = 2"; - } - db_query($q, $dbh); - - print "\n"; - print __("The selected packages have been adopted."); - print "\n"; - } else { - print "\n"; - print __("You did not select any packages to adopt."); - print "\n"; - } - } - - + print ""; + print pkg_adopt($atype, $ids, True); + print ""; } elseif ($_POST['action'] == "do_Vote" || isset($_POST['do_Vote'])) { if (!$atype) { print __("You must be logged in before you can vote for packages."); diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index c7e31f6..346e59e 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -1131,3 +1131,61 @@ function pkg_delete ($atype, $ids) { return __("The selected packages have been deleted."); } + +function pkg_adopt ($atype, $ids, $action = True) { + if (!$atype) { + if ($action) { + return __("You must be logged in before you can adopt packages."); + } else { + return __("You must be logged in before you can disown packages."); + } + } + + if (empty($ids)) { + if ($action) { + return __("You did not select any packages to adopt."); + } else { + return __("You did not select any packages to disown."); + } + } + + $dbh = db_connect(); + + $first = 1; + foreach ($ids as $pid => $v) { + if ($first) { + $first = 0; + $disown = $pid; + } else { + $disown .= ", ".$pid; + } + } + + $field = "MaintainerUID"; + $q = "UPDATE Packages "; + + if ($action) { + $user = uid_from_sid($_COOKIE["AURSID"]); + } else { + $user = 0; + } + + $q.= "SET ".$field." = " . $user . " "; + $q.= "WHERE ID IN (" . $disown . ") "; + + if ($action && $atype = "User") { + # Regular users may only adopt orphan packages from unsupported + $q.= "AND ".$field." = 0"; + $q.= " AND LocationID = 2"; + } else if ($atype = "User") { + $q.= "AND ".$field." = ".uid_from_sid($_COOKIE["AURSID"]); + } + + db_query($q, $dbh); + + if ($action) { + return __("The selected packages have been adopted."); + } else { + return __("The selected packages have been disowned."); + } +} -- 1.6.0.2

2 1

[aur-dev] [PATCH] Convert package deletion to a function
by Callan Barrett 28 Oct '08

28 Oct '08

Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/packages.php | 90 ++---------------------------------------------- web/lib/pkgfuncs.inc | 73 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 86 deletions(-) diff --git a/web/html/packages.php b/web/html/packages.php index dbaa98f..b59b20b 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -22,7 +22,7 @@ if (isset($_GET['ID'])) { $title = __("Packages"); } -html_header($title); # print out the HTML header +html_header($title); # get login privileges # @@ -49,91 +49,9 @@ if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { print pkg_flag($atype, $ids, False); print ""; } elseif ($_POST['action'] == "do_Delete" || isset($_POST['do_Delete'])) { - if (!$atype) { - print __("You must be logged in before you can disown packages."); - print " \n"; - } else { - # Delete the packages in $ids array (but only if they are Unsupported) - # - if (!empty($ids)) { - $dbh = db_connect(); - - # Delete the packages in $ids array - # - $first = 1; - while (list($pid, $v) = each($ids)) { - if ($first) { - $first = 0; - $delete = $pid; - } else { - $delete .= ", ".$pid; - } - } - - $field = "MaintainerUID"; - - # Only grab Unsupported packages that "we" own or are not owned at all - # - $ids_to_delete = array(); - $q = "SELECT Packages.ID FROM Packages, PackageLocations "; - $q.= "WHERE Packages.ID IN (" . $delete . ") "; - $q.= "AND Packages.LocationID = PackageLocations.ID "; - $q.= "AND PackageLocations.Location = 'unsupported' "; - # If they're a TU or dev, can always delete, otherwise check ownership - # - if ($atype == "Trusted User" || $atype == "Developer") { - $result = db_query($q, $dbh); - } - if ($result != Null && mysql_num_rows($result) > 0) { - while ($row = mysql_fetch_assoc($result)) { - $ids_to_delete[] = $row['ID']; - } - } - if (!empty($ids_to_delete)) { - # These are the packages that are safe to delete - # - foreach ($ids_to_delete as $id) { - # delete from PackageVotes - $q = "DELETE FROM PackageVotes WHERE PackageID = " . $id; - $result = db_query($q, $dbh); - - # delete from PackageDepends - $q = "DELETE FROM PackageDepends WHERE PackageID = " . $id; - $result = db_query($q, $dbh); - - # delete from PackageSources - $q = "DELETE FROM PackageSources WHERE PackageID = " . $id; - $result = db_query($q, $dbh); - - # delete from PackageComments - $q = "DELETE FROM PackageComments WHERE PackageID = " . $id; - $result = db_query($q, $dbh); - - # delete from Packages - $q = "DELETE FROM Packages WHERE ID = " . $id; - $result = db_query($q, $dbh); - - # delete from CommentNotify - $q = "DELETE FROM CommentNotify WHERE PkgID = " . $id; - $result = db_query($q, $dbh); - - # Print the success message - print "\n"; - print __("The selected packages have been deleted."); - print "\n"; - } - } else { - print "\n"; - print __("None of the selected packages could be deleted."); - print "\n"; - } # end if (!empty($ids_to_delete)) - } else { - print "\n"; - print __("You did not select any packages to delete."); - print "\n"; - } # end if (!empty($ids)) - } # end if (!atype) - + print ""; + print pkg_delete($atype, $ids, False); + print ""; } elseif ($_POST['action'] == "do_Adopt" || isset($_POST['do_Adopt'])) { if (!$atype) { print __("You must be logged in before you can adopt packages."); diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index 0f3defc..c7e31f6 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -1058,3 +1058,76 @@ function pkg_flag ($atype, $ids, $action = True) { return __("The selected packages have been unflagged."); } } + +function pkg_delete ($atype, $ids) { + if (!$atype) { + return __("You must be logged in before you can disown packages."); + } + + if (empty($ids)) { + return __("You did not select any packages to delete."); + } + + # Delete the packages in $ids array (but only if they are Unsupported) + # + $dbh = db_connect(); + + # Delete the packages in $ids array + # + $first = 1; + foreach ($ids as $pid => $v) { + if ($first) { + $first = 0; + $delete = $pid; + } else { + $delete .= ", ".$pid; + } + } + + $field = "MaintainerUID"; + + # Only grab Unsupported packages that "we" own or are not owned at all + $ids_to_delete = array(); + $q = "SELECT Packages.ID FROM Packages, PackageLocations "; + $q.= "WHERE Packages.ID IN (" . $delete . ") "; + $q.= "AND Packages.LocationID = PackageLocations.ID "; + $q.= "AND PackageLocations.Location = 'unsupported' "; + + # If they're a TU or dev, can delete + if ($atype == "Trusted User" || $atype == "Developer") { + $result = db_query($q, $dbh); + } + + if ($result != Null && mysql_num_rows($result) > 0) { + while ($row = mysql_fetch_assoc($result)) { + $ids_to_delete[] = $row['ID']; + } + } + + if (empty($ids_to_delete)) { + return __("None of the selected packages could be deleted."); + } + + # These are the packages that are safe to delete + foreach ($ids_to_delete as $id) { + $q = "DELETE FROM PackageVotes WHERE PackageID = " . $id; + $result = db_query($q, $dbh); + + $q = "DELETE FROM PackageDepends WHERE PackageID = " . $id; + $result = db_query($q, $dbh); + + $q = "DELETE FROM PackageSources WHERE PackageID = " . $id; + $result = db_query($q, $dbh); + + $q = "DELETE FROM PackageComments WHERE PackageID = " . $id; + $result = db_query($q, $dbh); + + $q = "DELETE FROM Packages WHERE ID = " . $id; + $result = db_query($q, $dbh); + + $q = "DELETE FROM CommentNotify WHERE PkgID = " . $id; + $result = db_query($q, $dbh); + } + + return __("The selected packages have been deleted."); +} -- 1.5.5.3

2 3

[aur-dev] [PATCH] Add new chmod_group function
by Dan McGee 24 Oct '08

24 Oct '08

From: Dan McGee <dan(a)archlinux.org> This will chmod a given directory and all its contents to the correct group-writeable permissions. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- web/lib/aur.inc | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/web/lib/aur.inc b/web/lib/aur.inc index b243cc4..c2cde52 100644 --- a/web/lib/aur.inc +++ b/web/lib/aur.inc @@ -392,6 +392,33 @@ function rm_rf($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="") -- 1.6.0.3

1 1

[aur-dev] [PATCH] rm_rf: pull fullpath into a local variable
by Dan McGee 24 Oct '08

24 Oct '08

From: Dan McGee <dan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> --- web/lib/aur.inc | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/web/lib/aur.inc b/web/lib/aur.inc index 81ffde2..b243cc4 100644 --- a/web/lib/aur.inc +++ b/web/lib/aur.inc @@ -378,11 +378,12 @@ function rm_rf($dirname="") { $d = dir($dirname); while ($f = $d->read()) { if ($f != "." && $f != "..") { - if (is_dir($dirname."/".$f)) { - rm_rf($dirname."/".$f); + $fullpath = $dirname."/".$f; + if (is_dir($fullpath)) { + rm_rf($fullpath); } - if (is_file($dirname."/".$f) || is_link($dirname."/".$f)) { - unlink($dirname."/".$f); + if (is_file($fullpath) || is_link($fullpath)) { + unlink($fullpath); } } } -- 1.6.0.3

1 0

[aur-dev] [PATCH] Convert package flagging to a function
by Callan Barrett 15 Oct '08

15 Oct '08

Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/packages.php | 101 +++---------------------------------------------- web/lib/pkgfuncs.inc | 74 +++++++++++++++++++++++++++++++++++- 2 files changed, 79 insertions(+), 96 deletions(-) diff --git a/web/html/packages.php b/web/html/packages.php index 4cfe9c4..317583f 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -37,106 +37,17 @@ if (isset($_COOKIE["AURSID"])) { # grab the list of Package IDs to be operated on # isset($_POST["IDs"]) ? $ids = $_POST["IDs"] : $ids = array(); -#isset($_REQUEST["All_IDs"]) ? -# $all_ids = explode(":", $_REQUEST["All_IDs"]) : -# $all_ids = array(); - # determine what button the visitor clicked # if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { - if (!$atype) { - print __("You must be logged in before you can flag packages."); - print " \n"; - - } else { - - if (!empty($ids)) { - $dbh = db_connect(); - - # Flag the packages in $ids array - # - $first = 1; - while (list($pid, $v) = each($ids)) { - if ($first) { - $first = 0; - $flag = $pid; - } else { - $flag .= ", ".$pid; - } - } - $q = "UPDATE Packages SET OutOfDate = 1 "; - $q.= "WHERE ID IN (" . $flag . ")"; - db_query($q, $dbh); - - print "\n"; - print __("The selected packages have been flagged out-of-date."); - print "\n"; - - # notification by tardo. - $f_name = username_from_sid($_COOKIE['AURSID']); - $f_email = email_from_sid($_COOKIE['AURSID']); - $f_uid = uid_from_sid($_COOKIE['AURSID']); - $q = "SELECT Packages.Name, Users.Email, Packages.ID "; - $q.= "FROM Packages, Users "; - $q.= "WHERE Packages.ID IN (" . $flag .") "; - $q.= "AND Users.ID = Packages.MaintainerUID "; - $q.= "AND Users.ID != " . $f_uid; - $result = db_query($q, $dbh); - if (mysql_num_rows($result)) { - while ($row = mysql_fetch_assoc($result)) { - # construct email - $body = "Your package " . $row['Name'] . " has been flagged out of date by " . $f_name . ". You may view your package at:\nhttp://aur.archlinux.org/packages.php?do_Details=1&ID=" . $row['ID']; - $body = wordwrap($body, 70); - $headers = "To: ".$row['Email']."\nReply-to: nobody@archlinux.org\nFrom:aur-notify@archlinux.org\nX-Mailer: PHP\nX-MimeOLE: Produced By AUR\n"; - @mail(' ', "AUR Out-of-date Notification for ".$row['Name'], $body, $headers); - } - } - - } else { - print "\n"; - print __("You did not select any packages to flag."); - print "\n"; - } - } - + print ""; + print pkg_flag($atype, $ids, True); + print ""; } elseif ($_POST['action'] == "do_UnFlag" || isset($_POST['do_UnFlag'])) { - if (!$atype) { - print __("You must be logged in before you can unflag packages."); - print " \n"; - - } else { - - if (!empty($ids)) { - $dbh = db_connect(); - - # Un-Flag the packages in $ids array - # - $first = 1; - while (list($pid, $v) = each($ids)) { - if ($first) { - $first = 0; - $unflag = $pid; - } else { - $unflag .= ", ".$pid; - } - } - $q = "UPDATE Packages SET OutOfDate = 0 "; - $q.= "WHERE ID IN (" . $unflag . ")"; - db_query($q, $dbh); - - print "\n"; - print __("The selected packages have been unflagged."); - print "\n"; - } else { - print "\n"; - print __("You did not select any packages to unflag."); - print "\n"; - } - - - } - + print ""; + print pkg_flag($atype, $ids, False); + print ""; } elseif ($_POST['action'] == "do_Disown" || isset($_POST['do_Disown'])) { if (!$atype) { print __("You must be logged in before you can disown packages."); diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index 5ba56da..0f3defc 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -985,4 +985,76 @@ function pkg_search_page($SID="") { return; } -?> +function pkg_flag ($atype, $ids, $action = True) { + if (!$atype) { + if ($action) { + return __("You must be logged in before you can flag packages."); + } else { + return __("You must be logged in before you can unflag packages."); + } + } + + if (empty($ids)) { + if ($action) { + return __("You did not select any packages to flag."); + } else { + return __("You did not select any packages to unflag."); + } + } + + foreach ($ids as $pid => $v) { + if (!is_numeric($pid)) { + if ($action) { + return __("You did not select any packages to flag."); + } else { + return __("You did not select any packages to unflag."); + } + } + } + + $dbh = db_connect(); + + $first = 1; + foreach ($ids as $pid => $v) { + if ($first) { + $first = 0; + $flag = $pid; + } else { + $flag .= ", " . $pid; + } + } + + $ood = $action ? 1 : 0; + $q = "UPDATE Packages SET OutOfDate = " . $ood; + $q.= " WHERE ID IN (" . $flag . ")"; + + db_query($q, $dbh); + + if ($action) { + # Notify of flagging by email + $f_name = username_from_sid($_COOKIE['AURSID']); + $f_email = email_from_sid($_COOKIE['AURSID']); + $f_uid = uid_from_sid($_COOKIE['AURSID']); + $q = "SELECT Packages.Name, Users.Email, Packages.ID "; + $q.= "FROM Packages, Users "; + $q.= "WHERE Packages.ID IN (" . $flag .") "; + $q.= "AND Users.ID = Packages.MaintainerUID "; + $q.= "AND Users.ID != " . $f_uid; + $result = db_query($q, $dbh); + if (mysql_num_rows($result)) { + while ($row = mysql_fetch_assoc($result)) { + # construct email + $body = "Your package " . $row['Name'] . " has been flagged out of date by " . $f_name . ". You may view your package at:\nhttp://aur.archlinux.org/packages.php?ID=" . $row['ID']; + $body = wordwrap($body, 70); + $headers = "To: ".$row['Email']."\nReply-to: nobody@archlinux.org\nFrom:aur-notify@archlinux.org\nX-Mailer: PHP\nX-MimeOLE: Produced By AUR\n"; + @mail(' ', "AUR Out-of-date Notification for ".$row['Name'], $body, $headers); + } + } + } + + if ($action) { + return __("The selected packages have been flagged out-of-date."); + } else { + return __("The selected packages have been unflagged."); + } +} -- 1.6.0.2

2 2