From 973b420608ee303ad9d68b068121a46a8cffee42 Mon Sep 17 00:00:00 2001
From: Starla Insigna <hatkirby@fourisland.com>
Date: Tue, 9 Dec 2008 21:27:04 -0500
Subject: Fixed long-time poll glitch

After you voted on the POTW, the resulting page used to be very strange and hideous. This has finally, after being like this since the beginning of
the third layout, been fixed.
---
 pages/poll.php          | 17 +++++++++++-
 pages/polloftheweek.php | 71 +++++++++++++++++++------------------------------
 2 files changed, 43 insertions(+), 45 deletions(-)

(limited to 'pages')

diff --git a/pages/poll.php b/pages/poll.php
index 67f51a8..d871a7d 100755
--- a/pages/poll.php
+++ b/pages/poll.php
@@ -24,7 +24,22 @@ require('headerproc.php');
 
 $pageCategory = 'poll';
 
-if (!isset($_GET['id']))
+if (isset($_GET['submit']))
+{
+	$setip = "INSERT INTO didpollalready SET ip = \"" . $_SERVER['REMOTE_ADDR'] . "\"";
+	$setip2 = mysql_query($setip);
+	$getpoll = "SELECT * FROM polloftheweek ORDER BY id DESC LIMIT 0,1";
+	$getpoll2 = mysql_query($getpoll);
+	$getpoll3 = mysql_fetch_array($getpoll2);
+	$setpoll = "UPDATE polloftheweek SET clicks" . $_POST['options'] . " = " . ($getpoll3['clicks' . $_POST['options']]+1) . " WHERE id = " . $getpoll3['id'];
+	$setpoll2 = mysql_query($setpoll);
+
+	$template = new FITemplate('msg');
+
+	$template->add('MSG','<H2>' . $getpoll3['question'] . '</H2><P>Thank you for voting on the Poll of the Week!<BR><A HREF="poll.php?id=' . $getpoll3['id'] . '">Click here to visit the page for this poll.');
+
+	$template->display();
+} else if (!isset($_GET['id']))
 {
 	$template = new FITemplate('pollIndex');
 
diff --git a/pages/polloftheweek.php b/pages/polloftheweek.php
index 930f346..0410151 100755
--- a/pages/polloftheweek.php
+++ b/pages/polloftheweek.php
@@ -22,52 +22,35 @@ if (!defined('S_INCLUDE_FILE')) {define('S_INCLUDE_FILE',1);}
 
 require('headerproc.php');
 
-if (!isset($_GET['potw']))
+if (!isset($forceDisplay))
 {
-	if (!isset($forceDisplay))
-	{
-		$getpoll = "SELECT * FROM polloftheweek ORDER BY id DESC LIMIT 0,1";
-	} else {
-		$getpoll = "SELECT * FROM polloftheweek WHERE id = " . $forceDisplay;
-	}
-	$getpoll2 = mysql_query($getpoll);
-	$getpoll3 = mysql_fetch_array($getpoll2);
-
-	$template->add('QUESTION', $getpoll3['question']);
-	$template->add('OPTION1', $getpoll3['option1']);
-	$template->add('OPTION2', $getpoll3['option2']);
-	$template->add('OPTION3', $getpoll3['option3']);
-	$template->add('OPTION4', $getpoll3['option4']);
-
-	$getip = "SELECT * FROM didpollalready WHERE ip = \"" . $_SERVER['REMOTE_ADDR'] . "\"";
-	$getip2 = mysql_query($getip);
-	$getip3 = mysql_fetch_array($getip2);
+	$getpoll = "SELECT * FROM polloftheweek ORDER BY id DESC LIMIT 0,1";
+} else {
+	$getpoll = "SELECT * FROM polloftheweek WHERE id = " . $forceDisplay;
+}
+$getpoll2 = mysql_query($getpoll);
+$getpoll3 = mysql_fetch_array($getpoll2);
+
+$template->add('QUESTION', $getpoll3['question']);
+$template->add('OPTION1', $getpoll3['option1']);
+$template->add('OPTION2', $getpoll3['option2']);
+$template->add('OPTION3', $getpoll3['option3']);
+$template->add('OPTION4', $getpoll3['option4']);
+
+$getip = "SELECT * FROM didpollalready WHERE ip = \"" . $_SERVER['REMOTE_ADDR'] . "\"";
+$getip2 = mysql_query($getip);
+$getip3 = mysql_fetch_array($getip2);
 
-	if (($getip3['ip'] != $_SERVER['REMOTE_ADDR']) && (!isset($forceDisplay)))
-	{
-		$template->adds_block('FORM',array('exi'=>1));
-	} else {
-		$template->adds_block('DISPLAY',array('exi'=>1));
-
-		$template->add('PERCENT1', getpercent($getpoll3,'1'));
-		$template->add('PERCENT2', getpercent($getpoll3,'2'));
-		$template->add('PERCENT3', getpercent($getpoll3,'3'));
-		$template->add('PERCENT4', getpercent($getpoll3,'4'));
-	}
-} else {
-	$setip = "INSERT INTO didpollalready SET ip = \"" . $_SERVER['REMOTE_ADDR'] . "\"";
-	$setip2 = mysql_query($setip);
-	$getpoll = "SELECT * FROM polloftheweek ORDER BY id DESC LIMIT 0,1";
-	$getpoll2 = mysql_query($getpoll);
-	$getpoll3 = mysql_fetch_array($getpoll2);
-	$setpoll = "UPDATE polloftheweek SET clicks" . $_POST['options'] . " = " . ($getpoll3['clicks' . $_POST['options']]+1) . " WHERE id = " . $getpoll3['id'];
-	$setpoll2 = mysql_query($setpoll);
-
-	$template = new FITemplate('msg');
-
-	$template->add('MSG','<H2>' . $getpoll3['question'] . '</H2><P>Thank you for voting on the Poll of the Week!<BR><A HREF="poll.php?id=' . $getpoll3['id'] . '">Click here to visit the page for this poll.');
-
-	$template->display();
+if (($getip3['ip'] != $_SERVER['REMOTE_ADDR']) && (!isset($forceDisplay)))
+{
+	$template->adds_block('FORM',array('exi'=>1));
+} else {
+	$template->adds_block('DISPLAY',array('exi'=>1));
+
+	$template->add('PERCENT1', getpercent($getpoll3,'1'));
+	$template->add('PERCENT2', getpercent($getpoll3,'2'));
+	$template->add('PERCENT3', getpercent($getpoll3,'3'));
+	$template->add('PERCENT4', getpercent($getpoll3,'4'));
 }
 
 ?>
-- 
cgit 1.4.1