From a3d50d7a0dd7de6f0a04ca5d23af32f0acb49ded Mon Sep 17 00:00:00 2001 From: Callan Barrett Date: Mon, 5 May 2008 01:33:54 +0800 Subject: [PATCH] Remove AUR voting page Removes voting page for Trusted Users, it's not getting any use --- support/schema/aur-schema.sql | 23 -- web/html/addvote.php | 95 --------- web/html/tu.php | 452 ----------------------------------------- web/template/header.php | 6 - 4 files changed, 0 insertions(+), 576 deletions(-) delete mode 100644 web/html/addvote.php delete mode 100644 web/html/tu.php diff --git a/support/schema/aur-schema.sql b/support/schema/aur-schema.sql index 2a2a1a7..f32091c 100644 --- a/support/schema/aur-schema.sql +++ b/support/schema/aur-schema.sql @@ -206,26 +206,3 @@ CREATE TABLE CommentNotify ( FOREIGN KEY (PkgID) REFERENCES Packages(ID) ON DELETE CASCADE, FOREIGN KEY (UserID) REFERENCES Users(ID) ON DELETE CASCADE ); - --- Vote information --- -CREATE TABLE IF NOT EXISTS TU_VoteInfo ( - ID int(10) unsigned NOT NULL auto_increment, - Agenda text collate latin1_general_ci NOT NULL, - User char(32) collate latin1_general_ci NOT NULL, - Submitted bigint(20) unsigned NOT NULL, - End bigint(20) unsigned NOT NULL, - SubmitterID int(10) unsigned NOT NULL, - Yes tinyint(3) unsigned NOT NULL default '0', - No tinyint(3) unsigned NOT NULL default '0', - Abstain tinyint(3) unsigned NOT NULL default '0', - PRIMARY KEY (ID) -); - --- Individual vote records --- -CREATE TABLE IF NOT EXISTS TU_Votes ( - VoteID int(10) unsigned NOT NULL, - UserID int(10) unsigned NOT NULL -); - diff --git a/web/html/addvote.php b/web/html/addvote.php deleted file mode 100644 index ef1c6c3..0000000 --- a/web/html/addvote.php +++ /dev/null @@ -1,95 +0,0 @@ -Username does not exist."; - } 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.= "
" . htmlentities($_POST['user']) . " already has proposal running for them.
"; - } - } - } - - if (!empty($_POST['length'])) { - if (!is_numeric($_POST['length'])) { - $error.= "
Length must be a number.
"; - } else if ($_POST['length'] < 1) { - $error.= "
Length must be at least 1.
"; - } else { - $len = (60*60*24)*$_POST['length']; - } - } else { - $len = 60*60*24*7; - } - - if (empty($_POST['agenda'])) { - $error.= "
Proposal cannot be empty.
"; - } - } - - if (!empty($_POST['addVote']) && empty($error)) { - $q = "INSERT INTO TU_VoteInfo (Agenda, User, Submitted, End, SubmitterID) VALUES "; - $q.= "('" . mysql_real_escape_string($_POST['agenda']) . "', "; - $q.= "'" . mysql_real_escape_string($_POST['user']) . "', "; - $q.= "UNIX_TIMESTAMP(), UNIX_TIMESTAMP() + " . mysql_real_escape_string($len); - $q.= ", " . uid_from_sid($_COOKIE["AURSID"]) . ")"; - - db_query($q, $dbh); - print "

New proposal submitted.

\n"; - } else { -?> -

Submit a proposal to vote on.

-"; } ?> -
-Applicant/TU: -'> -(empty if not applicable) -
-Length in days: -'> -(defaults to 7 if empty) -
-Proposal:
-
- - -
-
-Back"; -} else { - print "You are not allowed to access this area.\n"; -} - -html_footer(AUR_VERSION); -# vim: ts=2 sw=2 noet ft=php - -?> diff --git a/web/html/tu.php b/web/html/tu.php deleted file mode 100644 index 7ddec1a..0000000 --- a/web/html/tu.php +++ /dev/null @@ -1,452 +0,0 @@ - time() ? 1 : 0; - - $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)); - - # Can this person vote? - # - $canvote = 1; // we assume they can - $errorvote = ""; // error message to give - if ($isrunning == 0) { - $canvote = 0; - $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."; - } else if ($hasvoted != 0) { - $canvote = 0; - $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"; - } else if (isset($_POST['voteNo'])) { - $myvote = "No"; - } else if (isset($_POST['voteAbstain'])) { - $myvote = "Abstain"; - } - - $qvote = "UPDATE TU_VoteInfo SET " . $myvote . " = " . ($row[$myvote] + 1) . " WHERE ID = " . $row['ID']; - db_query($qvote, $dbh); - $qvote = "INSERT INTO TU_Votes (VoteID, UserID) VALUES (" . $row['ID'] . ", " . uid_from_sid($_COOKIE["AURSID"]) . ")"; - db_query($qvote, $dbh); - - # Can't vote anymore - # - $canvote = 0; - $errorvote = "You've already voted for this proposal."; - # Update if they voted - $hasvoted = mysql_num_rows(db_query($qvoted, $dbh)); - - $results = db_query($q, $dbh); - $row = mysql_fetch_assoc($results); - } - } - - # I think I understand why MVC is good for this stuff.. - echo "
\n"; - echo "
Proposal Details
\n"; - echo "
\n"; - - if ($isrunning == 1) { - print "
This vote is still running.
"; - print "
"; - } - - print "User: "; - - if (!empty($row['User'])) { - print "" . $row['User'] . ""; - } else { - print "N/A"; - } - - print "
\n"; - - print "Submitted: " . gmdate("r", $row['Submitted']) . " by "; - print "" . username_from_id($row['SubmitterID']) . "
\n"; - - if ($isrunning == 0) { - print "Ended: "; - } else { - print "Ends: "; - } - print "" . gmdate("r", $row['End']) . "
\n"; - - print "
\n"; - - $row['Agenda'] = htmlentities($row['Agenda']); - # str_replace seems better than 
 because it still maintains word wrapping
-				print str_replace("\n", "
\n", $row['Agenda']);
-
-				print "
\n";
-				print "
\n";
-				
-				print "
\n";
-				print "\n";
-				print "\n";
-				print "\n";
-				print "  
\n";
-				print "\n";
-
-				print "\n";
-				print "  \n";
-				print "  \n";
-				print "  \n";
-				print "  \n";
-				print "  \n";
-				print "\n";
-
-				$c = "data1";
-
-				print "\n";
-				print "  \n";
-				print "  \n";
-				print "  \n";
-				print "  \n";
-				print "  \n";
-				print "\n";
-
-				print "
";
-				print "Yes";
-				print "";
-				print "No";
-				print "";
-				print "Abstain";
-				print "";
-				print "Total";
-				print "";
-				print "Voted?";
-				print "
";
-				print $row['Yes'];
-				print "";
-				print $row['No'];
-				print "";
-				print $row['Abstain'];
-				print "";
-				print ($row['Yes'] + $row['No'] + $row['Abstain']);
-				print "";
-
-				if ($hasvoted == 0) {
-					print "No";
-				} else {
-					print "Yes";
-				}
-
-				print "
\n";
-				print "
\n";
-
-				echo "
\n"; - - # Actions, vote buttons - # - print "
\n"; - print "
\n"; - print "
Vote Actions
\n"; - print "
\n"; - - if ($canvote == 1) { - print "
\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - print "
\n"; - } else { - print "
$errorvote
"; - } - - print "
\n"; - print "
Back
\n"; - - } - - } else { - print "Vote ID not valid.\n"; - } - - } 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 "
\n"; - print "\n"; - print "\n"; - print " \n"; - print "\n"; - print "\n"; - print "
\n"; - print " $application\n"; - print "
\n"; - print "\n"; - - print "\n"; - print " \n"; - print " \n"; - print " \n"; - print " \n"; - print " \n"; - print " \n"; -# I'm not sure if abstains are necessary inthis view, it's just extra clutter -# print " \n"; - print " \n"; - print "\n"; - - if (mysql_num_rows($result) == 0) { - print "\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 "\n"; - print " \n"; - print " \n"; - print " \n"; - print " \n"; - print " \n"; - print " \n"; - print " \n"; - # print " \n"; - print "\n"; - } - } - - print "
"; - print "Proposal"; - print ""; - print "Start"; - print ""; - print "End"; - print ""; - print "User"; - print ""; - print "Yes"; - print ""; - print "No"; - print ""; -# print "Abstain"; -# print ""; - print "Voted?"; - print "
No results found.
"; - - $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 " [More]"; - print ""; - # why does the AUR use gmdate with formatting that includes the offset - # to GMT?! - print gmdate("j M y", $row["Submitted"]); - print ""; - print gmdate("j M y", $row["End"]); - print ""; - - if (!empty($row['User'])) { - print ""; - print $row['User'] . ""; - } else { - print "N/A"; - } - - print ""; - print $row['Yes']; - print ""; - print $row['No']; - print ""; - # See above - # print $row['Abstain']; - # print ""; - - $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 "No"; - } else { - print "Yes"; - } - - print "
\n"; - print "
\n"; - - if ($type == "old" AND $limit != 0) { - $qnext = "SELECT ID FROM TU_VoteInfo"; - $nextresult = db_query($qnext, $dbh); - - print "\n"; - - if (mysql_num_rows($result)) { - $sort = htmlentities($sort, ENT_QUOTES); - $by = htmlentities($by, ENT_QUOTES); - - print "\n"; - print "\n"; - - print "\n"; - print "\n"; - } - print "
\n"; - if ($off != 0) { - $back = (($off - $limit) <= 0) ? 0 : $off - $limit; - print "Back"; - } - print "\n"; - if (($off + $limit) < mysql_num_rows($nextresult)) { - $forw = $off + $limit; - print "Next"; - } - print "
\n"; - } - - print "
\n"; - } - - # stop notices, ythanku Xilon - if (empty($_REQUEST['sort'])) { $_REQUEST['sort'] = ""; } - if (empty($_REQUEST['by'])) { $_REQUEST['by'] = ""; } - if (empty($_REQUEST['off'])) { $_REQUEST['off'] = ""; } - - gen_results(0, 0, $_REQUEST['sort'], $_REQUEST['by'], "new"); - print "
Add

"; - gen_results($_REQUEST['off'], $pp, $_REQUEST['sort'], $_REQUEST['by'], "old"); - - } -} else { - print "You are not allowed to access this area.\n"; -} - -html_footer(AUR_VERSION); -# vim: ts=2 sw=2 - -?> diff --git a/web/template/header.php b/web/template/header.php index 88fd6f6..721fa99 100644 --- a/web/template/header.php +++ b/web/template/header.php @@ -50,12 +50,6 @@ if (isset($_COOKIE["AURSID"])) {
  • ">
    • -
    • -
  • -- 1.5.3.8