- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] Move logout link from main menu to login bar
by Callan Barrett 06 Oct '08

06 Oct '08

Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/template/header.php | 1 - web/template/login_form.php | 3 +++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/web/template/header.php b/web/template/header.php index 88fd6f6..f60acb4 100644 --- a/web/template/header.php +++ b/web/template/header.php @@ -46,7 +46,6 @@ <?php if (isset($_COOKIE["AURSID"])) { ?> - <li><a href="/logout.php"><?php print __("Logout"); ?></a></li> <li><a href="/pkgsubmit.php"><?php print __("Submit"); ?></a></li> <li><a href="/packages.php?SeB=m&K=<?php print username_from_sid($_COOKIE["AURSID"]); ?>"><?php print __("My Packages"); ?></a></li> <?php diff --git a/web/template/login_form.php b/web/template/login_form.php index 4bfc579..727afd0 100644 --- a/web/template/login_form.php +++ b/web/template/login_form.php @@ -2,6 +2,9 @@ <?php if (isset($_COOKIE["AURSID"])) { print __("Logged-in as: %h%s%h", array("<b>", username_from_sid($_COOKIE["AURSID"]), "</b>")); +?> +<br /><a href="/logout.php"><?php print __("Logout"); ?></a> +<?php } else { if ($login_error) { -- 1.6.0.2

2 1

[aur-dev] [PATCH] Major rearrangement of tu.php, strings setup for translation
by Callan Barrett 06 Oct '08

06 Oct '08

All the strings are set up to be translated now, HTML of tu.php has been moved to templates and the worst of it rewritten (there's no longer a massive function in it) Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/tu.php | 444 +++++++------------------------------------ web/template/tu_details.php | 62 ++++++ web/template/tu_list.php | 68 +++++++ 3 files changed, 203 insertions(+), 371 deletions(-) create mode 100644 web/template/tu_details.php create mode 100644 web/template/tu_list.php diff --git a/web/html/tu.php b/web/html/tu.php index 524e14d..09808d4 100644 --- a/web/html/tu.php +++ b/web/html/tu.php @@ -8,44 +8,30 @@ set_lang(); check_sid(); html_header(); -# get login privileges -# +# Default votes per page +$pp = 5; + +$atype = ""; if (isset($_COOKIE["AURSID"])) { - # Only logged in users can do stuff - # $atype = account_from_sid($_COOKIE["AURSID"]); -} else { - $atype = ""; } if ($atype == "Trusted User" OR $atype == "Developer") { - # Show the TU interface - # - - # Temp value for results per page $pp = 5; - if (isset($_REQUEST['id'])) { - # Show application details - # depending on action and time frame will show either - # sponsor button, comments and vote buttons - # - - if (intval($_REQUEST['id'])) { + if (isset($_GET['id'])) { + if (is_numeric($_GET['id'])) { $q = "SELECT * FROM TU_VoteInfo "; - $q.= "WHERE ID = " . $_REQUEST['id']; + $q.= "WHERE ID = " . $_GET['id']; $dbh = db_connect(); $results = db_query($q, $dbh); $row = mysql_fetch_assoc($results); if (empty($row)) { - print "Could not retrieve proposal details.\n"; + print __("Could not retrieve proposal details."); } else { - # Print out application details, thanks again AUR - # - $isrunning = $row['End'] > time() ? 1 : 0; $qvoted = "SELECT * FROM TU_Votes WHERE "; @@ -53,30 +39,27 @@ if ($atype == "Trusted User" OR $atype == "Developer") { $qvoted.= "UserID = " . uid_from_sid($_COOKIE["AURSID"]); $hasvoted = mysql_num_rows(db_query($qvoted, $dbh)); - # Can this person vote? - # - $canvote = 1; // we assume they can - $errorvote = ""; // error message to give + $canvote = 1; + $errorvote = ""; if ($isrunning == 0) { $canvote = 0; - $errorvote = "Voting is closed for this proposal."; + $errorvote = __("Voting is closed for this proposal."); } else if ($row['User'] == username_from_sid($_COOKIE["AURSID"])) { $canvote = 0; - $errorvote = "You cannot vote in an proposal regarding you."; + $errorvote = __("You cannot vote in an proposal about you."); } else if ($hasvoted != 0) { $canvote = 0; - $errorvote = "You've already voted in this proposal."; + $errorvote = __("You've already voted in this proposal."); } - # have to put this here so results are correct immediately after voting if ($canvote == 1) { if (isset($_POST['doVote'])) { if (isset($_POST['voteYes'])) { - $myvote = "Yes"; + $myvote = __("Yes"); } else if (isset($_POST['voteNo'])) { - $myvote = "No"; + $myvote = __("No"); } else if (isset($_POST['voteAbstain'])) { - $myvote = "Abstain"; + $myvote = __("Abstain"); } $qvote = "UPDATE TU_VoteInfo SET " . $myvote . " = " . ($row[$myvote] + 1) . " WHERE ID = " . $row['ID']; @@ -87,7 +70,7 @@ if ($atype == "Trusted User" OR $atype == "Developer") { # Can't vote anymore # $canvote = 0; - $errorvote = "You've already voted for this proposal."; + $errorvote = __("You've already voted for this proposal."); # Update if they voted $hasvoted = mysql_num_rows(db_query($qvoted, $dbh)); @@ -95,357 +78,76 @@ if ($atype == "Trusted User" OR $atype == "Developer") { $row = mysql_fetch_assoc($results); } } - - # I think I understand why MVC is good for this stuff.. - echo "<div class=\"pgbox\">\n"; - echo " <div class=\"pgboxtitle\"><span class=\"f3\">Proposal Details</span></div>\n"; - echo " <div class=\"pgboxbody\">\n"; - - if ($isrunning == 1) { - print "<div style='text-align: center; font-weight: bold; color: red'>This vote is still running.</div>"; - print "<br />"; - } - - print "User: <b>"; - - if (!empty($row['User'])) { - print "<a href='packages.php?K=" . $row['User'] . "&SeB=m'>" . $row['User'] . "</a>"; - } else { - print "N/A"; - } - - print "</b><br />\n"; - - print "Submitted: <b>" . gmdate("r", $row['Submitted']) . "</b> by "; - print "<b>" . username_from_id($row['SubmitterID']) . "</b><br />\n"; - - if ($isrunning == 0) { - print "Ended: "; - } else { - print "Ends: "; - } - print "<b>" . gmdate("r", $row['End']) . "</b><br />\n"; - - print "<br />\n"; - - $row['Agenda'] = htmlentities($row['Agenda']); - # str_replace seems better than <pre> because it still maintains word wrapping - print str_replace("\n", "<br />\n", $row['Agenda']); - - print "<br />\n"; - print "<br />\n"; - - print "<center>\n"; - print "<table cellspacing='3' class='boxSoft' style='width: 50%'>\n"; - print "</tr>\n"; - print "<tr>\n"; - print " <td class='boxSoft'>\n"; - print "<table width='100%' cellspacing='0' cellpadding='2'>\n"; - - print "<tr>\n"; - print " <th style='border-bottom: #666 1px solid; vertical-align:"; - print " bottom'><span class='f2'>"; - print "Yes"; - print "</span></th>\n"; - print " <th style='border-bottom: #666 1px solid; vertical-align:"; - print " bottom'><span class='f2'>"; - print "No"; - print "</span></th>\n"; - print " <th style='border-bottom: #666 1px solid; vertical-align:"; - print " bottom'><span class='f2'>"; - print "Abstain"; - print "</span></th>\n"; - print " <th style='border-bottom: #666 1px solid; vertical-align:"; - print " bottom'><span class='f2'>"; - print "Total"; - print "</span></th>\n"; - print " <th style='border-bottom: #666 1px solid; vertical-align:"; - print " bottom'><span class='f2'>"; - print "Voted?"; - print "</span></th>\n"; - print "</tr>\n"; - - $c = "data1"; - - print "<tr>\n"; - print " <td class='".$c."'><span class='f5'><span class='blue'>"; - print $row['Yes']; - print "</span></span></td>\n"; - print " <td class='".$c."'><span class='f5'><span class='blue'>"; - print $row['No']; - print "</span></span></td>\n"; - print " <td class='".$c."'><span class='f5'><span class='blue'>"; - print $row['Abstain']; - print "</span></span></td>\n"; - print " <td class='".$c."'><span class='f5'><span class='blue'>"; - print ($row['Yes'] + $row['No'] + $row['Abstain']); - print "</span></span></td>\n"; - print " <td class='".$c."'><span class='f5'><span class='blue'>"; - - if ($hasvoted == 0) { - print "<span style='color: red; font-weight: bold'>No</span>"; - } else { - print "<span style='color: green; font-weight: bold'>Yes</span>"; - } - - print "</span></span></td>\n"; - print "</tr>\n"; - - print "</table>\n"; - print "</table>\n"; - - echo "</div></div>\n"; - - # Actions, vote buttons - # - print "<br />\n"; - print "<div class='pgbox'>\n"; - print "<div class='pgboxtitle'><span class='f3'>Vote Actions</span></div>\n"; - print "<div class='pgboxbody'>\n"; - - if ($canvote == 1) { - print "<center><form action='tu.php?id=" . $row['ID'] . "' method='post'>\n"; - print "<input type='submit' class='button' name='voteYes' value='Yes'>\n"; - print "<input type='submit' class='button' name='voteNo' value='No'>\n"; - print "<input type='submit' class='button' name='voteAbstain' value='Abstain'>\n"; - print "<input type='hidden' name='doVote' value='1'>\n"; - print "</form></center>\n"; - } else { - print "<center>$errorvote</center>"; - } - - print "</div></div>\n"; - print "<br /><center><a href='tu.php'>Back</a></center>\n"; - + include("tu_details.php"); } - } else { - print "Vote ID not valid.\n"; + print __("Vote ID not valid."); } } else { - # page listing applications being discussed, voted on and all those finished - # - - # I guess there should be a function since I use this a few times - function gen_results($offset, $limit, $sort, $by, $type="normal") { - - $dbh = db_connect(); - - if (!empty($offset) AND is_numeric($offset)) { - if ($offset >= 1) { - $off = $offset; - } else { - $off = 0; - } - } else { - $off = 0; - } - - $q = "SELECT * FROM TU_VoteInfo"; - - if ($type == "new") { - $q.= " WHERE End > " . time(); - $application = "Current Votes"; - } else { - $application = "All Votes"; - } - - $order = ($by == 'down') ? 'DESC' : 'ASC'; - - # not much to sort, I'm unsure how to sort by username - # when we only store the userid, someone come up with a nifty - # way to do this - # - switch ($sort) { - case 'sub': - $q.= " ORDER BY Submitted $order"; - break; - default: - $q.= " ORDER BY Submitted $order"; - break; - } - - if ($limit != 0) { - $q.= " LIMIT " . $off . ", ". $limit; - } - - $result = db_query($q, $dbh); - - if ($by == "down") { - $by_next = "up"; - } else { - $by_next = "down"; - } - - print "<center>\n"; - print "<table cellspacing='3' class='boxSoft'>\n"; - print "<tr>\n"; - print " <td class='boxSoftTitle' align='right'>\n"; - print " <span class='f3'>$application</span>\n"; - print " </td>\n"; - print "</tr>\n"; - print "<tr>\n"; - print " <td class='boxSoft'>\n"; - print "<table width='100%' cellspacing='0' cellpadding='2'>\n"; - - print "<tr>\n"; - print " <th style='border-bottom: #666 1px solid; vertical-align:"; - print " bottom'><span class='f2'>"; - print "Proposal"; - print "</span></th>\n"; - print " <th style='border-bottom: #666 1px solid; vertical-align:"; - print " bottom'><span class='f2'>"; - print "<a href='?off=$off&sort=sub&by=$by_next'>Start</a>"; - print "</span></th>\n"; - print " <th style='border-bottom: #666 1px solid; vertical-align:"; - print " bottom'><span class='f2'>"; - print "End"; - print "</span></th>\n"; - print " <th style='border-bottom: #666 1px solid; vertical-align:"; - print " bottom'><span class='f2'>"; - print "User"; - print "</span></th>\n"; - print " <th style='border-bottom: #666 1px solid; vertical-align:"; - print " bottom'><span class='f2'>"; - print "Yes"; - print "</span></th>\n"; - print " <th style='border-bottom: #666 1px solid; vertical-align:"; - print " bottom'><span class='f2'>"; - print "No"; - print "</span></th>\n"; -# I'm not sure if abstains are necessary inthis view, it's just extra clutter -# print " <th style='border-bottom: #666 1px solid; vertical-align:"; -# print " bottom'><span class='f2'>"; -# print "Abstain"; -# print "</span></th>\n"; - print " <th style='border-bottom: #666 1px solid; vertical-align:"; - print " bottom'><span class='f2'>"; - print "Voted?"; - print "</span></th>\n"; - print "</tr>\n"; - - if (mysql_num_rows($result) == 0) { - print "<tr><td align='center' colspan='0'>No results found.</td></tr>\n"; - } else { - for ($i = 0; $row = mysql_fetch_assoc($result); $i++) { - # Thankyou AUR - - # alright, I'm going to just have a "new" table and the - # "old" table can just have every vote, works just as well - # and probably saves on doing some crap - # - - (($i % 2) == 0) ? $c = "data1" : $c = "data2"; - print "<tr>\n"; - print " <td class='".$c."'><span class='f4'><span class='blue'>"; - - $prev_Len = 100; - - if (strlen($row["Agenda"]) >= $prev_Len) { - $row["Agenda"] = htmlentities(substr($row["Agenda"], 0, $prev_Len)) . "... -"; - } else { - $row["Agenda"] = htmlentities($row["Agenda"]) . " -"; - } - - print $row["Agenda"]; - print " <a href='/tu.php?id=" . $row['ID'] . "'>[More]</a>"; - print "</span></span></td>\n"; - print " <td class='".$c."'><span class='f5'><span class='blue'>"; - # why does the AUR use gmdate with formatting that includes the offset - # to GMT?! - print gmdate("j M y", $row["Submitted"]); - print "</span></span></td>\n"; - print " <td class='".$c."'><span class='f5'><span class='blue'>"; - print gmdate("j M y", $row["End"]); - print "</span></span></td>\n"; - print " <td class='".$c."'><span class='f6'><span class='blue'>"; - - if (!empty($row['User'])) { - print "<a href='packages.php?K=" . $row['User'] . "&SeB=m'>"; - print $row['User'] . "</a>"; - } else { - print "N/A"; - } - - print "</span></span></td>\n"; - print " <td class='".$c."'><span class='f5'><span class='blue'>"; - print $row['Yes']; - print "</span></span></td>\n"; - print " <td class='".$c."'><span class='f5'><span class='blue'>"; - print $row['No']; - print "</span></span></td>\n"; - print " <td class='".$c."'><span class='f5'><span class='blue'>"; - # See above - # print $row['Abstain']; - # print "</span></span></td>\n"; - # print " <td class='".$c."'><span class='f5'><span class='blue'>"; - - $qvoted = "SELECT * FROM TU_Votes WHERE "; - $qvoted.= "VoteID = " . $row['ID'] . " AND "; - $qvoted.= "UserID = " . uid_from_sid($_COOKIE["AURSID"]); - $hasvoted = mysql_num_rows(db_query($qvoted, $dbh)); - - if ($hasvoted == 0) { - print "<span style='color: red; font-weight: bold'>No</span>"; - } else { - print "<span style='color: green; font-weight: bold'>Yes</span>"; - } - - print "</span></span></td>\n"; - print "</tr>\n"; - } - } + $dbh = db_connect(); - print "</table>\n"; - print "</table>\n"; - - if ($type == "old" AND $limit != 0) { - $qnext = "SELECT ID FROM TU_VoteInfo"; - $nextresult = db_query($qnext, $dbh); + $offset = $_GET['off']; + $limit = $pp; + $by = $_GET['by']; - print "<table style='width: 90%'>\n"; - - if (mysql_num_rows($result)) { - $sort = htmlentities($sort, ENT_QUOTES); - $by = htmlentities($by, ENT_QUOTES); - - print "<tr>\n"; - print "<td align='left'>\n"; - if ($off != 0) { - $back = (($off - $limit) <= 0) ? 0 : $off - $limit; - print "<a href='tu.php?off=$back&sort=" . $sort . "&by=" . $by . "'>Back</a>"; - } - print "</td>\n"; - - print "<td align='right'>\n"; - if (($off + $limit) < mysql_num_rows($nextresult)) { - $forw = $off + $limit; - print "<a href='tu.php?off=$forw&sort=" . $sort . "&by=" . $by . "'>Next</a>"; - } - print "</td>\n"; - print "</tr>\n"; - } - print "</table>\n"; + if (!empty($offset) AND is_numeric($offset)) { + if ($offset >= 1) { + $off = $offset; + } else { + $off = 0; + } + } else { + $off = 0; } - print "</center>\n"; - } + $order = ($by == 'down') ? 'DESC' : 'ASC'; + $lim = ($limit > 0) ? " LIMIT " . $off . ", " . $limit : ""; + $by_next = ($by == "down") ? "up" : "down"; + + $prev_Len = 100; - # stop notices, ythanku Xilon - if (empty($_REQUEST['sort'])) { $_REQUEST['sort'] = ""; } - if (empty($_REQUEST['by'])) { $_REQUEST['by'] = ""; } - if (empty($_REQUEST['off'])) { $_REQUEST['off'] = ""; } + $q = "SELECT * FROM TU_VoteInfo WHERE End > " . time() . " ORDER BY Submitted " . $order; + $result = db_query($q, $dbh); + + $type = __("Current Votes"); + include("tu_list.php"); +?> + +<center> + <a href='addvote.php'><?php print __("Add") ?></a> +</center><br /> - gen_results(0, 0, $_REQUEST['sort'], $_REQUEST['by'], "new"); - print "<center><a href='addvote.php'>Add</a></center><br />"; - gen_results($_REQUEST['off'], $pp, $_REQUEST['sort'], $_REQUEST['by'], "old"); +<?php + $q = "SELECT * FROM TU_VoteInfo ORDER BY Submitted " . $order . $lim; + $result = db_query($q, $dbh); + + $type = __("All Votes"); + include("tu_list.php"); + $qnext = "SELECT ID FROM TU_VoteInfo"; + $nextresult = db_query($qnext, $dbh); +?> +<table style='width: 90%'> + <?php if (mysql_num_rows($result)) { $by = htmlentities($by, ENT_QUOTES); ?> + <tr> + <td align='left'> + <?php if ($off != 0) { $back = (($off - $limit) <= 0) ? 0 : $off - $limit; ?> + <a href='tu.php?off=<?php print $back ?>&by=<?php print $by ?>'><?php print __("Back") ?></a> + <?php } ?> + </td> + <td align='right'> + <?php if (($off + $limit) < mysql_num_rows($nextresult)) { $forw = $off + $limit; ?> + <a href='tu.php?off=<?php print $forw ?>&by=<?php print $by ?>'><?php print __("Next") ?></a> + <?php } ?> + </td> + </tr> + <?php } ?> +</table> +<?php } } else { - print "You are not allowed to access this area.\n"; + print __("You are not allowed to access this area."); } html_footer(AUR_VERSION); - -?> diff --git a/web/template/tu_details.php b/web/template/tu_details.php new file mode 100644 index 0000000..50a940e --- /dev/null +++ b/web/template/tu_details.php @@ -0,0 +1,62 @@ +<div class="pgbox"> +<div class="pgboxtitle"><span class="f3"><?php print __("Proposal Details") ?></span></div> +<div class="pgboxbody"> +<?php if ($isrunning == 1) { ?> +<div style='text-align: center; font-weight: bold; color: red'><?php print __("This vote is still running.") ?></div> +<br /> +<?php } ?> +User: <b> +<?php if (!empty($row['User'])) { ?> +<a href='packages.php?K=<?php print $row['User'] ?>&SeB=m'><?php print $row['User'] ?></a> +<?php } else { ?> +N/A +<?php } ?> +</b><br /> +<?php print __("Submitted: %s by %s", "<b>" . gmdate("r", $row['Submitted']) . "</b>", "<b>" . username_from_id($row['SubmitterID']) . "</b>") ?><br /> +<?php print __("End: ") ?><b><?php print gmdate("r", $row['End']) ?></b><br /><br /> +<?php print str_replace("\n", "<br />\n", htmlentities($row['Agenda'])) ?><br /><br /> +<center> +<table cellspacing='3' class='boxSoft' style='width: 50%'> +</tr> +<tr> +<td class='boxSoft'> +<table width='100%' cellspacing='0' cellpadding='2'> +<tr> +<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Yes") ?></span></th> +<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("No") ?></span></th> +<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Abstain") ?></span></th> +<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Total") ?></span></th> +<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Voted?") ?></span></th> +</tr> +<tr> +<td class='data1'><span class='f5'><span class='blue'><?php print $row['Yes'] ?></span></span></td> +<td class='data1'><span class='f5'><span class='blue'><?php print $row['No'] ?></span></span></td> +<td class='data1'><span class='f5'><span class='blue'><?php print $row['Abstain'] ?></span></span></td> +<td class='data1'><span class='f5'><span class='blue'><?php print ($row['Yes'] + $row['No'] + $row['Abstain']) ?></span></span></td> +<td class='data1'><span class='f5'><span class='blue'> +<?php if ($hasvoted == 0) { ?> +<span style='color: red; font-weight: bold'><?php print __("No") ?></span> +<?php } else { ?> +<span style='color: green; font-weight: bold'><?php print __("Yes") ?></span> +<?php } ?> +</span></span></td> +</tr> +</table> +</table> +</div></div> +<br /> +<div class='pgbox'> +<div class='pgboxtitle'><span class='f3'><?php print __("Vote Actions") ?></span></div> +<div class='pgboxbody'> +<?php if ($canvote == 1) { ?> +<center><form action='tu.php?id=<?php print $row['ID'] ?>' method='post'> +<input type='submit' class='button' name='voteYes' value='<?php print __("Yes") ?>'> +<input type='submit' class='button' name='voteNo' value='<?php print __("No") ?>'> +<input type='submit' class='button' name='voteAbstain' value='<?php print __("Abstain") ?>'> +<input type='hidden' name='doVote' value='1'> +</form></center> +<?php } else { ?> +<center><?php print $errorvote ?></center> +<?php } ?> +</div></div> +<br /><center><a href='tu.php'><?php print __("Back") ?></a></center> diff --git a/web/template/tu_list.php b/web/template/tu_list.php new file mode 100644 index 0000000..bec2985 --- /dev/null +++ b/web/template/tu_list.php @@ -0,0 +1,68 @@ +<center> +<table cellspacing='3' class='boxSoft'> + <tr> + <td class='boxSoftTitle' align='right'> + <span class='f3'><?php print $type ?></span> + </td> + </tr> + <tr> + <td class='boxSoft'> + <table width='100%' cellspacing='0' cellpadding='2'> + <tr> + <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Proposal") ?></span></th> + <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'> + <a href='?off=<?php print $off ?>&by=<?php print $by_next ?>'><?php print __("Start") ?></a> + </span></th> + <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("End") ?></span></th> + <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("User") ?></span></th> + <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Yes") ?></span></th> + <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("No") ?></span></th> + <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Voted?") ?></span></th> + </tr> + <?php if (mysql_num_rows($result) == 0) { ?> + <tr><td align='center' colspan='0'><?php print __("No results found.") ?></td></tr> + <?php } else { for ($i = 0; $row = mysql_fetch_assoc($result); $i++) { (($i % 2) == 0) ? $c = "data1" : $c = "data2"; ?> + <tr> + <td class='<?php print $c ?>'><span class='f4'><span class='blue'> + <?php + if (strlen($row["Agenda"]) >= $prev_Len) { + $row["Agenda"] = htmlentities(substr($row["Agenda"], 0, $prev_Len)) . "... - "; + } else { + $row["Agenda"] = htmlentities($row["Agenda"]) . " - "; + } + ?> + <?php print $row["Agenda"] ?><a href='/tu.php?id=<?php print $row['ID'] ?>'>[<?php print __("More") ?>]</a></span></span> + </td> + <td class='<?php print $c ?>'><span class='f5'><span class='blue'><?php print gmdate("j M y", $row["Submitted"]) ?></span></span></td> + <td class='<?php print $c ?>'><span class='f5'><span class='blue'><?php print gmdate("j M y", $row["End"]) ?></span></span></td> + <td class='<?php print $c ?>'><span class='f6'><span class='blue'> + <?php + if (!empty($row['User'])) { + print "<a href='packages.php?K=" . $row['User'] . "&SeB=m'>" . $row['User'] . "</a>"; + } else { + print "N/A"; + } + ?> + </span></span></td> + <td class='<?php print $c ?>'><span class='f5'><span class='blue'><?php print $row['Yes'] ?></span></span></td> + <td class='<?php print $c ?>'><span class='f5'><span class='blue'><?php print $row['No'] ?></span></span></td> + <td class='<?php print $c ?>'> + <?php + $q = "SELECT * FROM TU_Votes WHERE VoteID = " . $row['ID'] . " AND UserID = " . uid_from_sid($_COOKIE["AURSID"]); + $hasvoted = mysql_num_rows(db_query($q, $dbh)); + ?> + <span class='f5'><span class='blue'> + <?php if ($hasvoted == 0) { ?> + <span style='color: red; font-weight: bold'><?php print __("No") ?></span> + <?php } else { ?> + <span style='color: green; font-weight: bold'><?php print __("Yes") ?></span> + <?php } ?> + </span></span> + </td> + </tr> + <?php } } ?> + </table> + </td> + </tr> +</table> +</center> -- 1.6.0.2

2 2

[aur-dev] [PATCH] Remove "success" pages after package actions
by Callan Barrett 04 Oct '08

04 Oct '08

Now displays a success message header and the previous page (if possible) Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/packages.php | 49 +++++++++++++++++++++---------------------------- web/lib/pkgfuncs.inc | 4 ++-- 2 files changed, 23 insertions(+), 30 deletions(-) diff --git a/web/html/packages.php b/web/html/packages.php index 3e56a49..95d5354 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -32,42 +32,35 @@ if (isset($_POST['IDs'])) { } } -html_header($title); - -# Determine what action to do +$msg = ""; if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { - print "<p>"; - print pkg_flag($atype, $ids, True); - print "</p>"; + $msg = pkg_flag($atype, $ids, True); } elseif ($_POST['action'] == "do_UnFlag" || isset($_POST['do_UnFlag'])) { - print "<p>"; - print pkg_flag($atype, $ids, False); - print "</p>"; + $msg = pkg_flag($atype, $ids, False); } elseif ($_POST['action'] == "do_Adopt" || isset($_POST['do_Adopt'])) { - print "<p>"; - print pkg_adopt($atype, $ids, True); - print "</p>"; + $msg = pkg_adopt($atype, $ids, True); } elseif ($_POST['action'] == "do_Disown" || isset($_POST['do_Disown'])) { - print "<p>"; - print pkg_adopt($atype, $ids, False); - print "</p>"; + $msg = pkg_adopt($atype, $ids, False); } elseif ($_POST['action'] == "do_Vote" || isset($_POST['do_Vote'])) { - print "<p>"; - print pkg_vote($atype, $ids, True); - print "</p>"; + $msg = pkg_vote($atype, $ids, True); } elseif ($_POST['action'] == "do_UnVote" || isset($_POST['do_UnVote'])) { - print "<p>"; - print pkg_vote($atype, $ids, False); - print "</p>"; + $msg = pkg_vote($atype, $ids, False); } elseif ($_POST['action'] == "do_Delete" || isset($_POST['do_Delete'])) { - print "<p>"; - print pkg_delete($atype, $ids); - print "</p>"; + $msg = pkg_delete($atype, $ids); + unset($_GET['ID']); } elseif ($_POST['action'] == "do_Notify" || isset($_POST['do_Notify'])) { - print "<p>"; - print pkg_notify($atype, $ids); - print "</p>"; -} elseif (isset($_GET["ID"])) { + $msg = pkg_notify($atype, $ids); +} + +html_header($title); + +if (!empty($msg)): +?> +<div style="text-align: center"><span class="green"><?php print $msg ?></span></div><br /> +<?php +endif; + +if (isset($_GET["ID"])) { if (!is_numeric($_GET["ID"])) { print __("Error trying to retrieve package details.") . "<br />"; } else { diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index b793360..30c17ff 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -476,7 +476,7 @@ function package_details($id=0, $SID="") { echo "<div class=\"pgbox\">\n"; echo " <div class=\"pgboxtitle\"><span class=\"f3\">".__("Actions")."</span></div>\n"; echo " <div class=\"pgboxbody\">\n"; - echo " <form action='/packages.php' method='post'>\n"; + echo " <form action='/packages.php?ID=" . $row['ID'] . "' method='post'>\n"; echo " <input type='hidden' name='IDs[".$row["ID"]."]' value='1'>\n"; echo " <input type='hidden' name='ID' value='".$row["ID"]."'>\n"; # Voting Button @@ -769,7 +769,7 @@ function pkg_search_page($SID="") { $result = db_query($q, $dbh); $total = mysql_result(db_query('SELECT FOUND_ROWS() AS Total', $dbh), 0); - print "<form action='/packages.php' method='post'>\n"; + print "<form action='/packages.php?" . $_SERVER['QUERY_STRING'] . "' method='post'>\n"; print "<center>\n"; print "<table cellspacing='3' class='boxSoft'>\n"; print "<tr>\n"; -- 1.6.0.2

1 0

[aur-dev] [PATCH] Bug fix, couldn't unnotify packages due to new behavior
by Callan Barrett 04 Oct '08

04 Oct '08

Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/lib/pkgfuncs.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index 27b623a..9648905 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -1347,7 +1347,7 @@ function pkg_notify ($atype, $ids) { } foreach ($ids as $pid) { - if (!is_numeric($ids)) { + if (!is_numeric($pid)) { return __("Couldn't add to notification list."); } } -- 1.6.0.2

1 3

[aur-dev] [PATCH] Package functions use normal array of IDs
by Callan Barrett 04 Oct '08

04 Oct '08

packages.php now converts array of IDs to a normal array and all package functions have been changed to use the new array format Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/packages.php | 10 ++++++---- web/lib/pkgfuncs.inc | 26 +++++++++++--------------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/web/html/packages.php b/web/html/packages.php index 9c611d8..3e56a49 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -25,10 +25,12 @@ if (isset($_COOKIE["AURSID"])) { } # 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(); +$ids = array(); +if (isset($_POST['IDs'])) { + foreach ($_POST['IDs'] as $id => $i) { + $ids[] = $id; + } +} html_header($title); diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index 9941103..06171fa 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -989,8 +989,7 @@ function pkg_search_page($SID="") { * 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 array $ids Array of package IDs to flag/unflag * @param boolean $action True flags out-of-date, false un-flags. Flags by * default * @@ -1013,7 +1012,7 @@ function pkg_flag ($atype, $ids, $action = True) { } } - foreach ($ids as $pid => $v) { + foreach ($ids as $pid) { if (!is_numeric($pid)) { if ($action) { return __("You did not select any packages to flag."); @@ -1026,7 +1025,7 @@ function pkg_flag ($atype, $ids, $action = True) { $dbh = db_connect(); $first = 1; - foreach ($ids as $pid => $v) { + foreach ($ids as $pid) { if ($first) { $first = 0; $flag = $pid; @@ -1074,8 +1073,7 @@ 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 + * @param array $ids Array of package IDs to delete * * @return string Translated error or success message */ @@ -1095,7 +1093,7 @@ function pkg_delete ($atype, $ids) { # Delete the packages in $ids array # $first = 1; - foreach ($ids as $pid => $v) { + foreach ($ids as $pid) { if ($first) { $first = 0; $delete = $pid; @@ -1156,8 +1154,7 @@ function pkg_delete ($atype, $ids) { * 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 array $ids Array of package IDs to adopt/disown * @param boolean $action Adopts if true, disowns if false. Adopts by default * * @return string Translated error or success message @@ -1182,7 +1179,7 @@ function pkg_adopt ($atype, $ids, $action = True) { $dbh = db_connect(); $first = 1; - foreach ($ids as $pid => $v) { + foreach ($ids as $pid) { if ($first) { $first = 0; $disown = $pid; @@ -1224,8 +1221,7 @@ 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 array $ids Array of package IDs to vote/un-vote * @param boolean $action Votes if true, un-votes if false. Votes by default * * @return string Translated error or success message @@ -1252,7 +1248,7 @@ function pkg_vote ($atype, $ids, $action = True) { $uid = uid_from_sid($_COOKIE["AURSID"]); $first = 1; - foreach ($ids as $pid => $v) { + foreach ($ids as $pid) { if ($action) { $check = !isset($my_votes[$pid]); } else { @@ -1311,7 +1307,7 @@ 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 + * @param array $ids Array of package IDs to toggle * * @return string Translated error or success message */ @@ -1331,7 +1327,7 @@ function pkg_notify ($atype, $ids) { # it's sent requires this $list = array(); - foreach ($ids as $pid => $v) { + foreach ($ids as $pid) { $q = "SELECT Name FROM Packages WHERE ID = " . $pid; $pkgname = mysql_result(db_query($q, $dbh), 0); -- 1.6.0.2

1 0

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

03 Oct '08

Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/packages.php | 147 ++----------------------------------------------- web/lib/pkgfuncs.inc | 74 ++++++++++++++++++++++++- 2 files changed, 79 insertions(+), 142 deletions(-) diff --git a/web/html/packages.php b/web/html/packages.php index 4cfe9c4..dbaa98f 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -37,152 +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 "<br />\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 "<p>\n"; - print __("The selected packages have been flagged out-of-date."); - print "</p>\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 "<p>\n"; - print __("You did not select any packages to flag."); - print "</p>\n"; - } - } - + print "<p>"; + print pkg_flag($atype, $ids, True); + print "</p>"; } elseif ($_POST['action'] == "do_UnFlag" || isset($_POST['do_UnFlag'])) { - if (!$atype) { - print __("You must be logged in before you can unflag packages."); - print "<br />\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 "<p>\n"; - print __("The selected packages have been unflagged."); - print "</p>\n"; - } else { - print "<p>\n"; - print __("You did not select any packages to unflag."); - print "</p>\n"; - } - - - } - -} elseif ($_POST['action'] == "do_Disown" || isset($_POST['do_Disown'])) { - if (!$atype) { - print __("You must be logged in before you can disown packages."); - print "<br />\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 "<p>\n"; - print __("The selected packages have been disowned."); - print "</p>\n"; - } else { - print "<p>\n"; - print __("You did not select any packages to disown."); - print "</p>\n"; - } - - - } - - + print "<p>"; + print pkg_flag($atype, $ids, False); + print "</p>"; } elseif ($_POST['action'] == "do_Delete" || isset($_POST['do_Delete'])) { 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.5.5.3

1 2

[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 "<br />\n"; - } else { - if (!empty($ids)) { - print "<p>\n"; - print __("The selected packages have been flagged out-of-date."); - print "</p>\n"; - } else { - print "<p>\n"; - print __("You did not select any packages to flag."); - print "</p>\n"; - } - } -} elseif ($_POST['action'] == "do_UnFlag" || isset($_POST['do_UnFlag'])) { - if (!$atype) { - print __("You must be logged in before you can unflag packages."); - print "<br />\n"; - } else { - if (!empty($ids)) { - print "<p>\n"; - print __("The selected packages have been unflagged."); - print "</p>\n"; - } else { - print "<p>\n"; - print __("You did not select any packages to unflag."); - print "</p>\n"; - } - } -} elseif ($_POST['action'] == "do_Disown" || isset($_POST['do_Disown'])) { - if (!$atype) { - print __("You must be logged in before you can disown packages."); - print "<br />\n"; - } else { - if (!empty($ids)) { - print "<p>\n"; - print __("The selected packages have been disowned."); - print "</p>\n"; - } else { - print "<p>\n"; - print __("You did not select any packages to disown."); - print "</p>\n"; - } - } -} elseif ($_POST['action'] == "do_Delete" || isset($_POST['do_Delete'])) { - if (!$atype) { - print __("You must be logged in before you can disown packages."); - print "<br />\n"; - } else { - if (!empty($ids)) { - if (!empty($ids_to_delete)) { - print "<p>\n"; - print __("The selected packages have been deleted."); - print "</p>\n"; - } else { - print "<p>\n"; - print __("None of the selected packages could be deleted."); - print "</p>\n"; - } - } else { - print "<p>\n"; - print __("You did not select any packages to delete."); - print "</p>\n"; - } - } -} elseif ($_POST['action'] == "do_Adopt" || isset($_POST['do_Adopt'])) { - if (!$atype) { - print __("You must be logged in before you can adopt packages."); - print "<br />\n"; - } else { - if (!empty($ids)) { - print "<p>\n"; - print __("The selected packages have been adopted."); - print "</p>\n"; - } else { - print "<p>\n"; - print __("You did not select any packages to adopt."); - print "</p>\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 "<br />\n"; - } else { - if (!empty($ids)) { - print "<p>\n"; - print __("Your votes have been cast for the selected packages."); - print "</p>\n"; - - } else { - print "<p>\n"; - print __("You did not select any packages to vote for."); - print "</p>\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 "<br />\n"; - } else { - if (!empty($ids)) { - print "<p>\n"; - print __("Your votes have been removed from the selected packages."); - print "</p>\n"; - } else { - print "<p>\n"; - print __("You did not select any packages to un-vote for."); - print "</p>\n"; - } - } -} elseif (isset($_GET["ID"])) { +# Output +if (isset($_GET["ID"])) { if (!intval($_GET["ID"])) { print __("Error trying to retrieve package details.")."<br />\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 "<br />\n"; - } else { - if (!empty($ids)) { - foreach ($ids as $pid => $v) { - if (!$notifypackages) { - print '<p>'; - print __("You have been added to the comment notification list for %s.", - array("<b>" . $pkgname . "</b>")); - print '<br /></p>'; - } else { - print '<p>'; - print __("You have been removed from the comment notification list for %s.", - array("<b>" . $pkgname . "</b>")); - print '<br /></p>'; - } - } - } else { - print '<p>'; - print __("Couldn't add to notification list."); - print '<br /></p>'; - } - } } 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 "<br />\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 "<p>\n"; - print __("The selected packages have been flagged out-of-date."); - print "</p>\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 "<br />\n"; + } else { + if (!empty($ids)) { + print "<p>\n"; + print __("The selected packages have been flagged out-of-date."); + print "</p>\n"; } else { print "<p>\n"; print __("You did not select any packages to flag."); print "</p>\n"; } } - } elseif ($_POST['action'] == "do_UnFlag" || isset($_POST['do_UnFlag'])) { if (!$atype) { print __("You must be logged in before you can unflag packages."); print "<br />\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 "<p>\n"; print __("The selected packages have been unflagged."); print "</p>\n"; @@ -132,44 +343,14 @@ if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { print "<p>\n"; print __("You did not select any packages to unflag."); print "</p>\n"; - } - - + } } - } elseif ($_POST['action'] == "do_Disown" || isset($_POST['do_Disown'])) { if (!$atype) { print __("You must be logged in before you can disown packages."); print "<br />\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 "<p>\n"; print __("The selected packages have been disowned."); print "</p>\n"; @@ -178,136 +359,34 @@ if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { print __("You did not select any packages to disown."); print "</p>\n"; } - - } - - } elseif ($_POST['action'] == "do_Delete" || isset($_POST['do_Delete'])) { if (!$atype) { print __("You must be logged in before you can disown packages."); print "<br />\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 "<p>\n"; - print __("The selected packages have been deleted."); - print "</p>\n"; - } + print "<p>\n"; + print __("The selected packages have been deleted."); + print "</p>\n"; } else { print "<p>\n"; print __("None of the selected packages could be deleted."); print "</p>\n"; - } # end if (!empty($ids_to_delete)) + } } else { print "<p>\n"; print __("You did not select any packages to delete."); print "</p>\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 "<br />\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 "<p>\n"; print __("The selected packages have been adopted."); print "</p>\n"; @@ -317,54 +396,12 @@ if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { print "</p>\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 "<br />\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 "<p>\n"; print __("Your votes have been cast for the selected packages."); print "</p>\n"; @@ -375,99 +412,40 @@ if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { print "</p>\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 "<br />\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 "<p>\n"; print __("Your votes have been removed from the selected packages."); print "</p>\n"; - } else { print "<p>\n"; print __("You did not select any packages to un-vote for."); print "</p>\n"; } } - - } elseif (isset($_GET["ID"])) { - if (!intval($_GET["ID"])) { print __("Error trying to retrieve package details.")."<br />\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 "<br />\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 '<p>'; print __("You have been added to the comment notification list for %s.", array("<b>" . $pkgname . "</b>")); print '<br /></p>'; } else { - $q = "DELETE FROM CommentNotify WHERE PkgID = ".$pid; - $q.= " AND UserID = ".$uid; - db_query($q, $dbh); print '<p>'; print __("You have been removed from the comment notification list for %s.", array("<b>" . $pkgname . "</b>")); @@ -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