4 files changed, 59 insertions, 56 deletions

@@ -106,27 +106,7 @@ if (isset($_GET['post']))
                 $page_id = 'updates-' . $getpost3['id'];
                 include('includes/comments.php');
 
-                $getrelated = "SELECT *, MATCH (title, text) AGAINST (\"" . addslashes($getpost3['title']) . "\") AS score FROM updates WHERE MATCH (title, text) AGAINST (\"" . addslashes($getpost3['title']) . "\") AND id <> " . $getpost3['id'] . " LIMIT 0,5";
-                $getrelated2 = mysql_query($getrelated);
-                $i=0;
-                while ($getrelated3[$i] = mysql_fetch_array($getrelated2))
-                {
-                        if ($i==0)
-                        {
-                                $template = new FITemplate('related');
-                        }
-
-                        $template->adds_block('POST', array(    'TITLE' => $getrelated3[$i]['title'],
-                                                                'CODED' => $getrelated3[$i]['slug'],
-                                                                'AUTHOR' => $getrelated3[$i]['author'],
-                                                                'DATE' => date('F d<\S\U\P>S</\S\U\P> Y',strtotime($getrelated3[$i]['pubDate']))));
-                        $i++;
-                }
-
-                if ($i > 0)
-                {
-                        $template->display();
-                }
+                displayRelated($getpost3['title'], $getpost3['id']);
         } else {
                 generateError('404');
         }
@@ -135,6 +115,7 @@ if (isset($_GET['post']))
         if (isset($_GET['author']))
         {
                 $title = 'Author: ' . $_GET['author'] . ' - Blog Archive';
+                $template->add('HEADER', 'Posts by ' . $_GET['author']);
                 $getposts = "SELECT * FROM updates AS u WHERE author = \"" . $_GET['author'] . "\" ORDER BY id DESC";
                 $getbio = "SELECT * FROM bio WHERE username = \"" . $_GET['author'] . "\"";
                 $getbio2 = mysql_query($getbio);
@@ -148,9 +129,11 @@ if (isset($_GET['post']))
         } elseif (isset($_GET['tag']))
         {
                 $title = 'Tag: ' . $_GET['tag'] . ' - Blog Archive';
+                $template->add('HEADER', 'Posts tagged with ' . $_GET['tag']);
                 $getposts = "SELECT * FROM updates AS u, tags AS t WHERE u.id = t.post_id AND t.post_type = \"published\" AND t.tag = \"" . $_GET['tag'] . "\" ORDER BY u.id DESC";
         } else {
                 $title = 'Blog Archive';
+                $template->add('HEADER', 'Blog Archive');
                 $getposts = "SELECT * FROM updates AS u ORDER BY id DESC";
         }
         $getposts2 = mysql_query($getposts);
@@ -166,10 +149,6 @@ if (isset($_GET['post']))
                                 $curID++;
                         }
                         $template->add_ref($curID, 'MONTH', array('TITLE' => date('F Y',strtotime($getposts3[$i]['pubDate']))));
-                        if ($curID == 0)
-                        {
-                                $template->adds_ref_sub($curID, 'BIGEND',array('exi'=>1));
-                        }
                         $lastmonth = date('m-Y',strtotime($getposts3[$i]['pubDate']));
                 }
 
@@ -195,23 +174,9 @@ if (isset($_GET['post']))
                         $comText = $total_post . ' Comments';
                 }
 
-                if ($curID == 0)
-                {
-                        $template->adds_ref_sub($curID, 'BIG',array(    'DATE' => date('m-d-Y',strtotime($getposts3[$i]['pubDate'])),
-                                                                        'CODED' => $getposts3[$i]['slug'],
-                                                                        'TITLE' => $getposts3[$i]['title'],
-                                                                        'ID' => $getposts3[$i]['id'],
-                                                                        'YEARID' => ((date('Y',strtotime($getposts3[$i]['pubDate']))-2006) % 4),
-                                                                        'MONTH' => date('M',strtotime($getposts3[$i]['pubDate'])),
-                                                                        'DAY' => date('d',strtotime($getposts3[$i]['pubDate'])),
-                                                                        'AUTHOR' => $getposts3[$i]['author'],
-                                                                        'PLURALCOMMENT' => (isset($plural) ? $plural : ''),
-                                                                        'COMMENTS' => $comText));
-                } else {
-                        $template->adds_ref_sub($curID, 'SMALL',array(  'DATE' => date('m-d-Y',strtotime($getposts3[$i]['pubDate'])),
-                                                                        'CODED' => $getposts3[$i]['slug'],
-                                                                        'TITLE' => $getposts3[$i]['title']));
-                }
+                $template->adds_ref_sub($curID, 'SMALL',array(  'DATE' => date('m-d-Y',strtotime($getposts3[$i]['pubDate'])),
+                                                                'CODED' => $getposts3[$i]['slug'],
+                                                                'TITLE' => $getposts3[$i]['title']));
                 $i++;
         }
         if ($i==0)
@@ -22,7 +22,7 @@ if (!defined('S_INCLUDE_FILE')) {define('S_INCLUDE_FILE',1);}
 
 require('headerproc.php');
 
-$noMembers=1;
+$pageCategory = 'log';
 
 if (!isset($_GET['submit']))
 {
@@ -26,12 +26,12 @@ $pageCategory = 'poll';
 
 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'];

+        $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');
@@ -43,17 +43,57 @@ if (isset($_GET['submit']))
 {
         $template = new FITemplate('pollIndex');
 
-        $getpolls = "SELECT * FROM polloftheweek ORDER BY id DESC";
+        if (isset($_GET['start']))
+        {
+                $start = $_GET['start'] * 10;
+        } else {
+                $start = 0;
+        }
+
+        $getpolls = "SELECT * FROM polloftheweek ORDER BY id DESC LIMIT " . $start . ",10";
         $getpolls2 = mysql_query($getpolls);
         $i=0;
         while ($getpolls3[$i] = mysql_fetch_array($getpolls2))
         {
+                $question = strip_tags($getpolls3[$i]['question']);
+                if (strlen($question) > 50)
+                {
+                        $question = substr($question, 0, 50);
+                        while (substr($question, strlen($question)-1) != ' ')
+                        {
+                                $question = substr($question, 0, strlen($question)-1);
+                        }
+
+                        $question = substr($question, 0, strlen($question)-1);
+                        $question .= '....';
+                }
                 $template->adds_block('POLL', array(    'ID' => $getpolls3[$i]['id'],
-                                                        'QUESTION' => $getpolls3[$i]['question'],
-                                                        'WEEK' => date('F jS Y', strtotime($getpolls3[$i]['week']))));
+                                                        'QUESTION' => $question,
+                                                        'WEEK' => date('F jS Y', strtotime($getpolls3[$i]['week'])),
+                                                        'EVEN' => (($i % 2 == 1) ? ' CLASS="even"' : '')));
                 $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);
+        if ($start < floor($cntpolls3['COUNT(*)'] / 10))
+        {
+                $template->adds_block('NEXT', array('ID' => ($start+1)));
+        }
+
         include('pages/polloftheweek.php');
 
         $template->display();
@@ -95,6 +135,8 @@ if (isset($_GET['submit']))
 
         $page_id = 'polloftheweek-' . $getpoll3['id'];
         include('includes/comments.php');
+
+        displayRelated($getpoll3['question']);
 }
 
 ?>
@@ -25,10 +25,6 @@ require('headerproc.php');
 include('includes/functions_quotes.php');
 
 $pageCategory = 'quotes';
-$headtags = '<LINK REL="stylesheet" HREF="/theme/css/quotes.css" />';
-
-$template = new FITemplate('quotes/header');
-$template->display();
 
 if (isset($_GET['id']))
 {