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

[aur-dev] [PATCH] Turn on package notification by default for new packages
by Callan Barrett 10 Oct '08

10 Oct '08

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

2 3

[aur-dev] [PATCH] Setup translation for addvote.php
by Callan Barrett 10 Oct '08

10 Oct '08

Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/addvote.php | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/web/html/addvote.php b/web/html/addvote.php index 8e4df79..449bbb0 100644 --- a/web/html/addvote.php +++ b/web/html/addvote.php @@ -2,7 +2,7 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang'); -include("pkgfuncs_po.inc"); +include("tu_po.inc"); include("aur.inc"); set_lang(); check_sid(); @@ -25,23 +25,23 @@ if ($atype == "Trusted User" OR $atype == "Developer") { $check = mysql_num_rows(db_query($qcheck, $dbh)); if ($check == 0) { - $error.= "<div style='color: red; font-weight: bold'>Username does not exist.</div>"; + $error.= "<div style='color: red; font-weight: bold'>" . __("Username does not exist.") . "</div>"; } else { $qcheck = "SELECT * FROM TU_VoteInfo WHERE User = '" . mysql_real_escape_string($_POST['user']) . "'"; $qcheck.= " AND End > UNIX_TIMESTAMP()"; $check = mysql_num_rows(db_query($qcheck, $dbh)); if ($check != 0) { - $error.= "<div style='color: red; font-weight: bold'>" . htmlentities($_POST['user']) . " already has proposal running for them.</div>"; + $error.= "<div style='color: red; font-weight: bold'>" . __("%s already has proposal running for them.", htmlentities($_POST['user'])) . "</div>"; } } } if (!empty($_POST['length'])) { if (!is_numeric($_POST['length'])) { - $error.= "<div style='color: red; font-weight: bold'>Length must be a number.</div>"; + $error.= "<div style='color: red; font-weight: bold'>" . __("Length must be a number.") . "</div>"; } else if ($_POST['length'] < 1) { - $error.= "<div style='color: red; font-weight: bold'>Length must be at least 1.</div>"; + $error.= "<div style='color: red; font-weight: bold'>" . __("Length must be at least 1.") . "</div>"; } else { $len = (60*60*24)*$_POST['length']; } @@ -50,7 +50,7 @@ if ($atype == "Trusted User" OR $atype == "Developer") { } if (empty($_POST['agenda'])) { - $error.= "<div style='color: red; font-weight: bold'>Proposal cannot be empty.</div>"; + $error.= "<div style='color: red; font-weight: bold'>" . __("Proposal cannot be empty.") . "</div>"; } } @@ -62,21 +62,21 @@ if ($atype == "Trusted User" OR $atype == "Developer") { $q.= ", " . uid_from_sid($_COOKIE["AURSID"]) . ")"; db_query($q, $dbh); - print "<p>New proposal submitted.</p>\n"; + print "<p>" . __("New proposal submitted.") . "</p>\n"; } else { ?> -<p>Submit a proposal to vote on.</p> +<p><?php print __("Submit a proposal to vote on.") ?></p> <?php if (!empty($error)) { print $error . "<br />"; } ?> <form action='addvote.php' method='post'> -<b>Applicant/TU:</b> +<b><?php print __("Applicant/TU:") ?></b> <input type='text' name='user' value='<?php if (!empty($_POST['user'])) { print htmlentities($_POST['user'], ENT_QUOTES); } ?>'> -(empty if not applicable) +<?php print __("(empty if not applicable)") ?> <br /> -<b>Length in days:</b> +<b><?php print __("Length in days:") ?></b> <input type='text' name='length' value='<?php if (!empty($_POST['length'])) { print htmlentities($_POST['length'], ENT_QUOTES); } ?>'> -(defaults to 7 if empty) +<?php print __("(defaults to 7 if empty)") ?> <br /> -<b>Proposal:</b><br /> +<b><?php print __("Proposal:") ?></b><br /> <textarea name='agenda' rows='10' cols='50'><?php if (!empty($_POST['agenda'])) { print htmlentities($_POST['agenda']); } ?></textarea><br /> <input type='hidden' name='addVote' value='1'> <input type='submit' class='button' value='Submit'> @@ -84,9 +84,9 @@ if ($atype == "Trusted User" OR $atype == "Developer") { <br /> <?php } - print "<a href='tu.php'>Back</a>"; + print "<a href='tu.php'>" . __("Back") . "</a>"; } else { - print "You are not allowed to access this area.\n"; + print __("You are not allowed to access this area."); } html_footer(AUR_VERSION); -- 1.6.0.2

2 1

[aur-dev] [PATCH] Add comment and submitted to notification emails for comments
by Callan Barrett 09 Oct '08

09 Oct '08

Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/pkgedit.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/html/pkgedit.php b/web/html/pkgedit.php index 610113a..974f14b 100644 --- a/web/html/pkgedit.php +++ b/web/html/pkgedit.php @@ -91,7 +91,7 @@ if ($_REQUEST["add_Comment"]) { #TODO: native language emails for users, based on their prefs # Simply making these strings translatable won't work, users would be # getting emails in the language that the user who posted the comment was in - $body = "A comment has been added to ".$row['Name'].", you may view it at:\nhttp://aur.archlinux.org/packages.php?ID=".$_REQUEST["ID"]."\n\n\n---\nYou received this e-mail because you chose to recieve notifications of new comments on this package, if you no longer wish to recieve notifications about this package, please go the the above package page and click the UnNotify button."; + $body = "A comment has been added to ".$row['Name']." by " . username_from_sid($_COOKIE["AURSID"]) . ", you may view it at:\nhttp://aur.archlinux.org/packages.php?ID=".$_REQUEST["ID"]."\n\n\"" . $_POST['comment'] . "\"\n\n---\nYou received this e-mail because you chose to receive notifications of new comments on this package, if you no longer wish to recieve notifications about this package, please go the the above package page and click the UnNotify button."; $body = wordwrap($body, 70); $bcc = implode(', ', $bcc); $headers = "Bcc: $bcc\nReply-to: nobody@archlinux.org\nFrom:aur-notify@archlinux.org\nX-Mailer: PHP\nX-MimeOLE: Produced By AUR\n"; -- 1.6.0.2

2 4

[aur-dev] [PATCH] Sanitize input of package functions in pkg_funcs.inc
by Callan Barrett 09 Oct '08

09 Oct '08

Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/lib/pkgfuncs.inc | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index 06171fa..27b623a 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -1086,6 +1086,12 @@ function pkg_delete ($atype, $ids) { return __("You did not select any packages to delete."); } + foreach ($ids as $pid) { + if (!is_numeric($pid)) { + return __("You did not select any packages to delete."); + } + } + # Delete the packages in $ids array (but only if they are Unsupported) # $dbh = db_connect(); @@ -1175,6 +1181,16 @@ function pkg_adopt ($atype, $ids, $action = True) { return __("You did not select any packages to disown."); } } + + foreach ($ids as $pid) { + if (!is_numeric($pid)) { + if ($action) { + return __("You did not select any packages to adopt."); + } else { + return __("You did not select any packages to disown."); + } + } + } $dbh = db_connect(); @@ -1242,6 +1258,16 @@ function pkg_vote ($atype, $ids, $action = True) { return __("Your votes have been removed from the selected packages."); } } + + foreach ($ids as $pid) { + if (!is_numeric($ids)) { + if ($action) { + return __("You did not select any packages to vote for."); + } else { + return __("Your votes have been removed from the selected packages."); + } + } + } $dbh = db_connect(); $my_votes = pkgvotes_from_sid($_COOKIE["AURSID"]); @@ -1320,6 +1346,12 @@ function pkg_notify ($atype, $ids) { return __("Couldn't add to notification list."); } + foreach ($ids as $pid) { + if (!is_numeric($ids)) { + return __("Couldn't add to notification list."); + } + } + $dbh = db_connect(); $uid = uid_from_sid($_COOKIE["AURSID"]); -- 1.6.0.2

2 1

[aur-dev] [PATCH] Setup translation files for tu.php
by Callan Barrett 07 Oct '08

07 Oct '08

Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/tu.php | 2 +- web/lang/tu_po.inc | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) create mode 100644 web/lang/tu_po.inc diff --git a/web/html/tu.php b/web/html/tu.php index e2e44b7..67ac3f2 100644 --- a/web/html/tu.php +++ b/web/html/tu.php @@ -2,7 +2,7 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang'); -include("pkgfuncs_po.inc"); +include("tu_po.inc"); include("aur.inc"); set_lang(); check_sid(); diff --git a/web/lang/tu_po.inc b/web/lang/tu_po.inc new file mode 100644 index 0000000..00f603a --- /dev/null +++ b/web/lang/tu_po.inc @@ -0,0 +1,4 @@ +<?php + +include_once("translator.inc"); +global $_t; -- 1.6.0.2

1 1

[aur-dev] [PATCH] English translation for tu.php
by Callan Barrett 07 Oct '08

07 Oct '08

Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/tu.php | 2 +- web/lang/en/tu_po.inc | 34 ++++++++++++++++++++++++++++++++++ web/lang/tu_po.inc | 6 ++++++ 3 files changed, 41 insertions(+), 1 deletions(-) create mode 100644 web/lang/en/tu_po.inc create mode 100644 web/lang/tu_po.inc diff --git a/web/html/tu.php b/web/html/tu.php index 09808d4..32f764b 100644 --- a/web/html/tu.php +++ b/web/html/tu.php @@ -2,7 +2,7 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang'); -include("pkgfuncs_po.inc"); +include("tu_po.inc"); include("aur.inc"); set_lang(); check_sid(); diff --git a/web/lang/en/tu_po.inc b/web/lang/en/tu_po.inc new file mode 100644 index 0000000..9fe789d --- /dev/null +++ b/web/lang/en/tu_po.inc @@ -0,0 +1,34 @@ +<?php + +include_once("translator.inc"); +global $_t; + +$_t["en"]["Vote ID not valid."] = "Vote ID not valid."; + +$_t["en"]["Abstain"] = "Abstain"; + +$_t["en"]["No"] = "No"; + +$_t["en"]["You are not allowed to access this area."] = "You are not allowed to access this area."; + +$_t["en"]["Voting is closed for this proposal."] = "Voting is closed for this proposal."; + +$_t["en"]["Back"] = "Back"; + +$_t["en"]["Next"] = "Next"; + +$_t["en"]["Add"] = "Add"; + +$_t["en"]["All Votes"] = "All Votes"; + +$_t["en"]["You've already voted for this proposal."] = "You've already voted for this proposal."; + +$_t["en"]["Could not retrieve proposal details."] = "Could not retrieve proposal details."; + +$_t["en"]["Current Votes"] = "Current Votes"; + +$_t["en"]["Yes"] = "Yes"; + +$_t["en"]["You cannot vote in an proposal about you."] = "You cannot vote in an proposal about you."; + +$_t["en"]["You've already voted in this proposal."] = "You've already voted in this proposal."; diff --git a/web/lang/tu_po.inc b/web/lang/tu_po.inc new file mode 100644 index 0000000..5b1735a --- /dev/null +++ b/web/lang/tu_po.inc @@ -0,0 +1,6 @@ +<?php + +include_once("translator.inc"); +global $_t; + +include_once("en/tu_po.inc"); -- 1.6.0.2

2 3

[aur-dev] fwd: AUR PKGBUILD files and web searches
by Simo Leone 06 Oct '08

06 Oct '08

I'm forwarding this to aur-dev, as it's come up before and I want to gather current opinions on it. A couple thoughts that come to my mind are that spam harvesters won't honor robots.txt anyway, and in the past people sort of agreed that by uploading a pkgbuild, you probably should have noticed the fact that it's google searchable before you did it, and taken countermeasures yourself. Opinions? -S ----- Forwarded message from Tom Wizetek <mailadmin(a)wizetek.com> ----- To: simo(a)archlinux.org Subject: AUR PKGBUILD files and web searches Date: Sat, 4 Oct 2008 02:56:53 -0400 From: Tom Wizetek <mailadmin(a)wizetek.com> Hello. I must admit that I'm a bit concerned about how certain information contained in PKGBUILD files hosted on archlinux.org is returned by web searches. Specifically, I mean email addresses. For example, a simple search for my name: http://www.google.ca/search?q=tom+wizetek produces: Contributor: Tom Wizetek <tom(a)wizetek.com> pkgname=tleds linking to http://aur.archlinux.org/packages/tleds/tleds/PKGBUILD This could be easily used for email address harvesting. Any chance you can add to the site's robots.txt (seems like the file exists but is empty) the appropriate entries to prevent web bots from listing the contents of PKGBUILDs? Thanks for hearing me out. -- Tom Wizetek (MajorTom) ----- End forwarded message -----

5 4

[aur-dev] [PATCH] Show developer-TUs their total community packages.
by Loui 06 Oct '08

06 Oct '08

2 1

[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