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

[aur-dev] [PATCH] Set up redirects for all actions
by Callan Barrett 03 Oct '08

03 Oct '08

No more useless "congratulations you've done this" pages Shit is SO cash! Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- TODO | 2 - web/html/packages.php | 192 +++++++++++++------------------------------------ 2 files changed, 49 insertions(+), 145 deletions(-) diff --git a/TODO b/TODO index d71efb8..fb64960 100644 --- a/TODO +++ b/TODO @@ -11,8 +11,6 @@ Todo List deciphering of those insane variables * Rename those insane variables (the url variables on the search page), probably make them more verbose and actually relate to what they are -* Set up redirects for useless pages (like the "you've done action to X" - package pages), FS#10674, FS#3542 * Add support for the license field in tupkg scripts, FS#8138 * Add confirmation for TUs deleting packages, FS#6515 * Ownership of packages should turn notify on (adopt, create, etc.), FS#10480 diff --git a/web/html/packages.php b/web/html/packages.php index 453f095..62f822b 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -62,6 +62,12 @@ if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { @mail(' ', "AUR Out-of-date Notification for ".$row['Name'], $body, $headers); } } + + if ($_POST['action'] == "do_Flag") { + header("Location: packages.php"); + } else { + header("Location: packages.php?ID=" . $_POST['ID']); + } } } elseif ($_POST['action'] == "do_UnFlag" || isset($_POST['do_UnFlag'])) { if ($atype && !empty($ids)) { @@ -81,6 +87,12 @@ if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { $q = "UPDATE Packages SET OutOfDate = 0 "; $q.= "WHERE ID IN (" . $unflag . ")"; db_query($q, $dbh); + + if ($_POST['action'] == "do_UnFlag") { + header("Location: packages.php"); + } else { + header("Location: packages.php?ID=" . $_POST['ID']); + } } } elseif ($_POST['action'] == "do_Disown" || isset($_POST['do_Disown'])) { if ($atype && !empty($ids)) { @@ -107,6 +119,12 @@ if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { $q.= "AND ".$field." = ".uid_from_sid($_COOKIE["AURSID"]); } db_query($q, $dbh); + + if ($_POST['action'] == "do_Disown") { + header("Location: packages.php"); + } else { + header("Location: packages.php?ID=" . $_POST['ID']); + } } } elseif ($_POST['action'] == "do_Delete" || isset($_POST['do_Delete'])) { if ($atype && !empty($ids)) { @@ -169,6 +187,8 @@ if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { $q = "DELETE FROM CommentNotify WHERE PkgID = " . $id; $result = db_query($q, $dbh); } + + header("Location: packages.php"); } } elseif ($_POST['action'] == "do_Adopt" || isset($_POST['do_Adopt'])) { if ($atype && !empty($ids)) { @@ -200,6 +220,12 @@ if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { $q.= " AND LocationID = 2"; } db_query($q, $dbh); + + if ($_POST['action'] == "do_Adopt") { + header("Location: packages.php"); + } else { + header("Location: packages.php?ID=" . $_POST['ID']); + } } } elseif ($_POST['action'] == "do_Vote" || isset($_POST['do_Vote'])) { if ($atype && !empty($ids)) { @@ -239,9 +265,15 @@ if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { $q = "UPDATE Users SET LastVoted = UNIX_TIMESTAMP() "; $q.= "WHERE ID = ".$uid; db_query($q, $dbh); + + if ($_POST['action'] == "do_Vote") { + header("Location: packages.php"); + } else { + header("Location: packages.php?ID=" . $_POST['ID']); + } } } elseif ($_POST['action'] == "do_UnVote" || isset($_POST['do_UnVote'])) { - if (!$atype && !empty($ids)) { + if ($atype && !empty($ids)) { $dbh = db_connect(); $my_votes = pkgvotes_from_sid($_COOKIE["AURSID"]); $uid = uid_from_sid($_COOKIE["AURSID"]); @@ -270,6 +302,12 @@ if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { $q = "DELETE FROM PackageVotes WHERE UsersID = ".$uid." "; $q.= "AND PackageID IN (".$unvote_ids.")"; db_query($q, $dbh); + + if ($_POST['action'] == "do_UnVote") { + header("Location: packages.php"); + } else { + header("Location: packages.php?ID=" . $_POST['ID']); + } } } elseif ($_POST['action'] == "do_Notify" || isset($_POST['do_Notify'])) { if ($atype && !empty($ids)) { @@ -294,6 +332,14 @@ if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { db_query($q, $dbh); } } + + # I'm /pretty/ sure this is necessary because I can't just reference + # the first element of the array. + if ($_POST['action'] == "do_Notify") { + header("Location: packages.php"); + } else { + header("Location: packages.php?ID=" . $_POST['ID']); + } } } @@ -314,156 +360,16 @@ if (isset($_GET['ID'])) { html_header($title); # determine what button the visitor clicked -# Output - get rid of this soon -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)) { - print "\n"; - print __("The selected packages have been flagged out-of-date."); - print "\n"; - } else { - print "\n"; - print __("You did not select any packages to flag."); - print "\n"; - } - } -} 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)) { - 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"; - } - } -} 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 { - if (!empty($ids)) { - 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"; - } - } -} 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 { - if (!empty($ids)) { - if (!empty($ids_to_delete)) { - 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"; - } - } else { - print "\n"; - print __("You did not select any packages to delete."); - print "\n"; - } - } -} 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 { - if (!empty($ids)) { - 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"; - } - } -} 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 { - if (!empty($ids)) { - 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"; - } - } -} 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 { - if (!empty($ids)) { - 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"; - } - } -} elseif (isset($_GET["ID"])) { +# Output +if (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_Notify" || isset($_POST['do_Notify'])) { - if (!$atype) { - print __("You must be logged in before you can get notifications on comments."); - print " \n"; - } else { - if (!empty($ids)) { - foreach ($ids as $pid => $v) { - if (!$notifypackages) { - print ''; - print __("You have been added to the comment notification list for %s.", - array("" . $pkgname . "")); - print ' '; - } else { - 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 ' '; - } - } } else { # Just do a search. pkg_search_page($_COOKIE["AURSID"]); - } html_footer(AUR_VERSION); - -?> -- 1.5.5.3

2 3

[aur-dev] [PATCH] Separate logic from html in packages.php
by Callan Barrett 03 Oct '08

03 Oct '08

No output mixed with logic now and we're free to play with the headers Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/packages.php | 621 ++++++++++++++++++++++++------------------------- 1 files changed, 299 insertions(+), 322 deletions(-) diff --git a/web/html/packages.php b/web/html/packages.php index 4cfe9c4..453f095 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -8,22 +8,6 @@ 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 -# -if (isset($_GET['ID'])) { - $id = pkgname_from_id($_GET['ID']); - if (!empty($id)) { - $title = $id; - } -} else if (!empty($_GET['K'])) { - $title = "Search: " . $_GET['K']; -} else { - $title = __("Packages"); -} - -html_header($title); # print out the HTML header - # get login privileges # if (isset($_COOKIE["AURSID"])) { @@ -37,94 +21,321 @@ 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 -# +# Determine what button the visitor clicked. +# Logic, no output. +# if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { - if (!$atype) { - print __("You must be logged in before you can flag packages."); - print " \n"; + if ($atype && !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); + + # Notification of flagging. + $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); + } + } + } +} elseif ($_POST['action'] == "do_UnFlag" || isset($_POST['do_UnFlag'])) { + if ($atype && !empty($ids)) { + $dbh = db_connect(); - } else { + # 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); + } +} elseif ($_POST['action'] == "do_Disown" || isset($_POST['do_Disown'])) { + if ($atype && !empty($ids)) { + $dbh = db_connect(); - 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; + } + } - # Flag the packages in $ids array - # - $first = 1; - while (list($pid, $v) = each($ids)) { + $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); + } +} elseif ($_POST['action'] == "do_Delete" || isset($_POST['do_Delete'])) { + if ($atype && !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']; + } + } + + 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); + } + } +} elseif ($_POST['action'] == "do_Adopt" || isset($_POST['do_Adopt'])) { + if ($atype && !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); + } +} elseif ($_POST['action'] == "do_Vote" || isset($_POST['do_Vote'])) { + if ($atype && !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; - $flag = $pid; + $vote_ids = $pid; + $vote_clauses = "(".$uid.", ".$pid.")"; } else { - $flag .= ", ".$pid; + $vote_ids .= ", ".$pid; + $vote_clauses .= ", (".$uid.", ".$pid.")"; } } - $q = "UPDATE Packages SET OutOfDate = 1 "; - $q.= "WHERE ID IN (" . $flag . ")"; - db_query($q, $dbh); + } + # 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); - 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); + $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); + } +} elseif ($_POST['action'] == "do_UnVote" || isset($_POST['do_UnVote'])) { + if (!$atype && !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); + } +} elseif ($_POST['action'] == "do_Notify" || isset($_POST['do_Notify'])) { + if ($atype && !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 + 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; + $notifypackages = mysql_num_rows(db_query($q, $dbh)); + if (!$notifypackages) { + $q = "INSERT INTO CommentNotify (PkgID, UserID) VALUES (".$pid.', '.$uid.')'; + db_query($q, $dbh); + } else { + $q = "DELETE FROM CommentNotify WHERE PkgID = ".$pid; + $q.= " AND UserID = ".$uid; + db_query($q, $dbh); + } + } + } +} + +# set the title to something useful depending on +# what "page" we're on +# +if (isset($_GET['ID'])) { + $id = pkgname_from_id($_GET['ID']); + if (!empty($id)) { + $title = $id; + } +} else if (!empty($_GET['K'])) { + $title = "Search: " . $_GET['K']; +} else { + $title = __("Packages"); +} + +html_header($title); + +# determine what button the visitor clicked +# Output - get rid of this soon +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)) { + print "\n"; + print __("The selected packages have been flagged out-of-date."); + print "\n"; } else { print "\n"; print __("You did not select any packages to flag."); print "\n"; } } - } 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"; @@ -132,44 +343,14 @@ if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { print "\n"; print __("You did not select any packages to unflag."); print "\n"; - } - - + } } - } 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"; @@ -178,136 +359,34 @@ if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { print __("You did not select any packages to disown."); print "\n"; } - - } - - } 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"; - } + 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) - + } + } } 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"; @@ -317,54 +396,12 @@ if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { print "\n"; } } - - } 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"; @@ -375,99 +412,40 @@ if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { print "\n"; } } - - } 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"; } } - - } 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_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); + foreach ($ids as $pid => $v) { + if (!$notifypackages) { 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 . "")); @@ -481,8 +459,7 @@ if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { } } } else { - # just do a search - # + # Just do a search. pkg_search_page($_COOKIE["AURSID"]); } -- 1.5.5.3

1 2

[aur-dev] [PATCH] Update documentation.
by Loui 29 Sep '08

29 Sep '08

Also moving web/README.txt to web/README.

2 1

[aur-dev] [PATCH] Take formatting out of version number in web/lib/version.inc
by Loui 29 Sep '08

29 Sep '08

2 1

[aur-dev] [PATCH] Fix FS#11420
by Callan Barrett 28 Sep '08

28 Sep '08

Sort required by list in package details page. Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/lib/pkgfuncs.inc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index 484e5a6..5ba56da 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -128,6 +128,7 @@ function package_required($pkgid=0) { $q.= "WHERE PackageDepends.PackageID = Packages.ID "; $q.= "AND PackageDepends.DepPkgID = "; $q.= mysql_real_escape_string($pkgid); + $q.= " ORDER BY Name"; $result = db_query($q, $dbh); if (!$result) {return array();} while ($row = mysql_fetch_row($result)) { -- 1.5.5.3

2 3

[aur-dev] [PATCH] Devs in AUR couldnt see their packages in Community
by Hugo Doria 23 Sep '08

23 Sep '08

I created a small patch to fix FS#11561 [1]. Since i'm starting to look at aur code, It would be good to do some tests before commit this patch. -- Hugo [1] http://bugs.archlinux.org/task/11561

3 7

[aur-dev] [PATCH] Use system rm in rm_rf function.
by Loui 22 Sep '08

22 Sep '08

2 3

[aur-dev] Update your tags.
by Loui 19 Sep '08

19 Sep '08

Just a notice to people following AUR development. In the last release of AUR I had tagged the release but then that was retagged. To get the current (proper) tag issue these commands: $ git tag -d 1.5.2 $ git fetch origin 1.5.2 To confirm that you're up to date: $ git rev-parse 1.5.2 Should display: 62b2bacf543ee7d620534fe89e860be0b00cb38e Cheers, and happy hacking.

1 0

[aur-dev] [PATCH] Fix whitespace and indenting in pkgsubmit.
by Loui 14 Sep '08

14 Sep '08

Pushing this to testing.

1 0