From dce71eebff258965dcf4d24f88a8e7db32c90812 Mon Sep 17 00:00:00 2001
From: Starla Insigna <starla4444@gmail.com>
Date: Wed, 22 Sep 2010 22:59:09 -0400
Subject: Removed POTW from sidebar

---
 includes/layout.php             |  2 --
 pages/poll.php                  | 22 +---------------------
 theme/layouts/4.5/layout.tpl    |  6 ------
 theme/layouts/6.2/layout.tpl    |  6 ------
 theme/layouts/7/layout.tpl      |  6 ------
 theme/layouts/subtle/layout.tpl |  6 ------
 theme/pollIndex.tpl             | 14 --------------
 7 files changed, 1 insertion(+), 61 deletions(-)

diff --git a/includes/layout.php b/includes/layout.php
index 24d8a30..9e94b69 100755
--- a/includes/layout.php
+++ b/includes/layout.php
@@ -51,8 +51,6 @@ if (isset($hatNav) && is_array($hatNav))
 	}
 }
 
-$template->add('POTW', getPollOfTheWeek());
-
 $gethits = "SELECT * FROM config WHERE name = \"hits\"";
 $gethits2 = mysql_query($gethits);
 $gethits3 = mysql_fetch_array($gethits2);
diff --git a/pages/poll.php b/pages/poll.php
index e228712..c7cc909 100755
--- a/pages/poll.php
+++ b/pages/poll.php
@@ -28,14 +28,7 @@ if (!isset($_GET['id']))
 {
 	$template = new FITemplate('pollIndex');
 
-	if (isset($_GET['start']))
-	{
-		$start = $_GET['start'] * 10;
-	} else {
-		$start = 0;
-	}
-
-	$getpolls = "SELECT * FROM polloftheweek ORDER BY id DESC LIMIT " . $start . ",10";
+	$getpolls = "SELECT * FROM polloftheweek ORDER BY id DESC";
 	$getpolls2 = mysql_query($getpolls);
 	$i=0;
 	while ($getpolls3[$i] = mysql_fetch_array($getpolls2))
@@ -59,18 +52,6 @@ if (!isset($_GET['id']))
 		$i++;
 	}
 
-	if ($i==0)
-	{
-		generateError('404');
-		exit;
-	}
-
-	$start /= 10;
-	if ($start > 0)
-	{
-		$template->adds_block('PREVIOUS', array('ID' => ($start-1)));
-	}
-
 	$cntpolls = "SELECT COUNT(*) FROM polloftheweek";
 	$cntpolls2 = mysql_query($cntpolls);
 	$cntpolls3 = mysql_fetch_array($cntpolls2);
@@ -79,7 +60,6 @@ if (!isset($_GET['id']))
 		$template->adds_block('NEXT', array('ID' => ($start+1)));
 	}
 
-	$template->add('POTW', getPollOfTheWeek());
 	$template->display();
 } else {
 	$template = new FITemplate('poll');
diff --git a/theme/layouts/4.5/layout.tpl b/theme/layouts/4.5/layout.tpl
index ada39b9..27abd83 100755
--- a/theme/layouts/4.5/layout.tpl
+++ b/theme/layouts/4.5/layout.tpl
@@ -98,12 +98,6 @@ AudioPlayer.setup("http://fourisland.com/theme/js/audio-player/player.swf", {
 
 					<!--EXTRASIDEBAR-->
 					
-					<div class="module rounded sidebar">
-                                        	<h3>Poll of the Week</h3>
-
-                                        	<!--POTW-->
-	                                </div>
-
 					<P />
 
 					<DIV class="sidebar module rounded">
diff --git a/theme/layouts/6.2/layout.tpl b/theme/layouts/6.2/layout.tpl
index 6f91eab..6ba1d1e 100755
--- a/theme/layouts/6.2/layout.tpl
+++ b/theme/layouts/6.2/layout.tpl
@@ -138,12 +138,6 @@ AudioPlayer.setup("http://fourisland.com/theme/js/audio-player/player.swf", {
 		                        <!--END CREATE_HATNAV-->
 
 					<!--EXTRASIDEBAR-->
-					
-					<div class="module rounded sidebar">
-                                        	<h3>Poll of the Week</h3>
-
-                                        	<!--POTW-->
-	                                </div>
 
 					<P />
 
diff --git a/theme/layouts/7/layout.tpl b/theme/layouts/7/layout.tpl
index 25489d7..2cacae5 100755
--- a/theme/layouts/7/layout.tpl
+++ b/theme/layouts/7/layout.tpl
@@ -65,12 +65,6 @@ AudioPlayer.setup("http://fourisland.com/theme/js/audio-player/player.swf", {
 
 				<!--EXTRASIDEBAR-->
 				
-				<div class="module rounded sidebar">
-					<h3>Poll of the Week</h3>
-					
-					<!--POTW-->
-				</div>
-
 				<div class="module rounded sidebar">
 					<h3>Affiliates</h3>
 
diff --git a/theme/layouts/subtle/layout.tpl b/theme/layouts/subtle/layout.tpl
index acfe682..ac57aa7 100755
--- a/theme/layouts/subtle/layout.tpl
+++ b/theme/layouts/subtle/layout.tpl
@@ -117,12 +117,6 @@ AudioPlayer.setup("http://fourisland.com/theme/js/audio-player/player.swf", {
 
 			<div id="sidebar">
 				<!--EXTRASIDEBAR-->
-				
-				<div class="module rounded sidebar">
-					<h3>Poll of the Week</h3>
-					
-					<!--POTW-->
-				</div>
 
 				<div class="module rounded sidebar">
 					<h3>Affiliates</h3>
diff --git a/theme/pollIndex.tpl b/theme/pollIndex.tpl
index 35e7fe2..d3788db 100755
--- a/theme/pollIndex.tpl
+++ b/theme/pollIndex.tpl
@@ -1,9 +1,5 @@
 <h2 class="light-at-night">Poll of the Week</h2>
 
-<div class="module rounded sidebar center">
-	<!--POTW-->
-</div>
-
 <p class="light-at-night">Welcome to the Poll of the Week! Feel free to vote on these! You can review old ones and also comment on them if you're logged in using the links below!</p>
 
 <table class="webmail">
@@ -12,13 +8,3 @@
 	<tr<!--POLL.EVEN-->><td><a href="/poll/<!--POLL.ID-->.php"><!--POLL.QUESTION--></a></td><td class="nobr"><!--POLL.WEEK--></td></tr>
 	<!--END POLL-->
 </table>
-
-<p>
-	<!--BEGIN PREVIOUS-->
-	<a href="/poll/?start=<!--PREVIOUS.ID-->" style="float: left">Previous</a>
-	<!--END PREVIOUS-->
-
-	<!--BEGIN NEXT-->
-	<a href="/poll/?start=<!--NEXT.ID-->" style="float: right">Next</a>
-	<!--END NEXT-->
-</p>
-- 
cgit 1.4.1