From 74db7a24d9c2230b104979f4e4981c57ff73de71 Mon Sep 17 00:00:00 2001
From: Starla Insigna <starla4444@gmail.com>
Date: Sat, 11 Dec 2010 14:05:05 -0500
Subject: Made Four Island 2 a little more sane

I spent the last few hours sanitizing the database and fixing huge bugs in the code. Among the changes made were:
- "Theoretically related posts" have been removed due to the lack of FULLTEXT index support in InnoDB tables
- Removed tons of stripslashes() calls that were used to remove slashes from records before I realized (while doing all of this work) that magic_quotes_gpc was on for some reason. I mean, like, come on!
- Replaced all non-library uses of htmlentities() with htmlspecialchars(), which basically does the same thing except it doesn't mangle Unicode.
- Completely eradicated polls.
Note that this does mean that all database backups prior to December 11th 2010 are now incompatible with Four Island.
---
 rss.php | 34 +++-------------------------------
 1 file changed, 3 insertions(+), 31 deletions(-)

(limited to 'rss.php')

diff --git a/rss.php b/rss.php
index 2a72d8a..fddd631 100755
--- a/rss.php
+++ b/rss.php
@@ -59,9 +59,6 @@ if (isset($_GET['mode']))
 		case 'quotes':
 ?> Quotes<?php
 			break;
-		case 'poll':
-?> Polls<?php
-			break;
 		case 'comments':
 ?> Comments<?php
 			break;
@@ -95,9 +92,6 @@ if (isset($_GET['mode']))
 		case 'quotes':
 ?>An archive of all Four Island quotes<?php
 			break;
-		case 'poll':
-?>An archive of all of the Four Island POTWs<?php
-			break;
 		case 'comments':
 ?>An archive of all of the comments people have left on Four Island<?php
 			break;
@@ -149,18 +143,6 @@ if (!isset($_GET['mode']) || ($_GET['mode'] == 'quotes'))
 	}
 }
 
-if ($_GET['mode'] == 'poll')
-{
-	$getpolls = "SELECT * FROM polloftheweek";
-	$getpolls2 = mysql_query($getpolls);
-	while (($items[$i] = mysql_fetch_array($getpolls2)) && ($i < ($si+10)))
-	{
-		$items[$i]['sortDate'] = strtotime($items[$i]['week']);
-		$items[$i]['itemType'] = 'poll';
-		$i++;
-	}
-}
-
 if (!isset($_GET['mode']) || ($_GET['mode'] == 'comments'))
 {
 	$getcomments = "SELECT * FROM comments ORDER BY id DESC LIMIT 0,10";
@@ -204,14 +186,6 @@ if (!isset($_GET['mode']) || ($_GET['mode'] == 'comments'))
 				$items[$i]['title'] = '"' . $getpost3['title'] . '"';
 				$items[$i]['url'] = 'blog/' . $getpost3['slug'] . '/';
 				break;
-			case 'polloftheweek':
-				$getpoll = "SELECT * FROM polloftheweek WHERE id = " . $comID;
-				$getpoll2 = mysql_query($getpoll);
-				$getpoll3 = mysql_fetch_array($getpoll2);
-
-				$items[$i]['title'] = '"' . $getpoll3['question'] . '"';
-				$items[$i]['url'] = 'poll/' . $getpoll3['id'] . '.php';
-				break;
 			case 'quote':
 				$getquote = "SELECT * FROM rash_quotes WHERE id = " . $comID;
 				$getquote2 = mysql_query($getquote);
@@ -253,7 +227,7 @@ foreach ($items as $key => $value)
 
 			<link>http://fourisland.com/blog/<?php echo($value['slug']); ?>/</link>
 
-			<description><?php echo(stripslashes(htmlentities(parseText($value['text'])))); ?></description>
+			<description><?php echo(htmlspecialchars(parseText($value['text']))); ?></description>
 
 			<pubDate><?php echo(date('D, d M Y H:i:s O',$value['sortDate'])); ?></pubDate>
 		</item>
@@ -266,14 +240,12 @@ foreach ($items as $key => $value)
 
 			<link>http://fourisland.com/quotes/<?php echo(urlencode($value['id'])); ?>.php</link>
 
-			<description><?php echo(htmlentities(nl2br($value['quote']))); ?></description>
+			<description><?php echo(htmlspecialchars(nl2br($value['quote']))); ?></description>
 
 			<pubDate><?php echo(date('D, d M Y H:i:s O',$value['sortDate'])); ?></pubDate>
 		</item>
 <?php
 			break;
-		case 'poll':
-			break;
 		case 'comment':
 ?>
 		<item>
@@ -281,7 +253,7 @@ foreach ($items as $key => $value)
 
 			<link>http://fourisland.com/<?php echo($value['url']); ?>#comment-<?php echo($value['id']); ?></link>
 
-			<description><?php echo(stripslashes(htmlentities(parseText($value['comment'])))); ?></description>
+			<description><?php echo(htmlspecialchars(parseText($value['comment']))); ?></description>
 
 			<pubDate><?php echo(date('D, d M Y H:i:s O',$value['sortDate'])); ?></pubDate>
 		</item>
-- 
cgit 1.4.1