Organized blog module

Previously, welcome.php was always loaded if no module was specified. Because of this, the index page blog section was there, while the rest of the blog
code (plus archive code) was in blog.php. Now, the all of the blog is in blog.php and all of the archive is in archive.php.

6 files changed, 164 insertions, 166 deletions

@@ -7,9 +7,11 @@ RewriteEngine On
 RewriteCond %{HTTP_HOST} ^www.fourisland.com [NC]
 RewriteRule ^(.*)$ http://fourisland.com/$1 [R=301,NC,L]
 
-RewriteRule ^blog/$ /index.php?area=blog [QSA,L]
-RewriteRule ^blog/author/(.+).php /index.php?area=blog&author=$1 [QSA,L]
-RewriteRule ^blog/tag/(.+).php /index.php?area=blog&tag=$1 [QSA,L]
+RewriteRule ^blog/$ /index.php?area=archive [QSA,L]
+RewriteRule ^blog/author/(.+).php /index.php?area=archive&author=$1 [QSA,L]
+RewriteRule ^blog/tag/(.+).php /index.php?area=archive&tag=$1 [QSA,L]
+
+RewriteRule ^$ /index.php?area=blog [QSA,L]
 RewriteRule ^blog/(.+)/ /index.php?area=blog&post=$1 [QSA,L]
 
 RewriteRule ^wiki/$ /wiki/Main_Page [QSA]
@@ -399,15 +399,20 @@ function getRewriteURL()
         } else {
                 if ($_GET['area'] == 'blog')
                 {
+                        if (isset($_GET['post']))
+                        {
+                                return '/blog/' . $_GET['post'] . '/';
+                        } else {
+                                return '/';
+                        }
+                } else if ($_GET['area'] == 'archive')
+                {
                         if (isset($_GET['author']))
                         {
                                 return '/blog/author/' . $_GET['author'] . '.php';
                         } else if (isset($_GET['tag']))
                         {
                                 return '/blog/tag/' . $_GET['tag'] . '.php';
-                        } else if (isset($_GET['post']))
-                        {
-                                return '/blog/' . $_GET['post'] . '/';
                         } else {
                                 return '/blog/';
                         }
@@ -34,7 +34,7 @@ if (strpos($_SERVER['REQUEST_URI'],'index.php'))
 

 ob_start();

 

-$pageName = isset($_GET['area']) ? $_GET['area'] : 'welcome';

+$pageName = basename($_GET['area']);

 

 if (file_exists('pages/' . $pageName . '.php'))

 {

@@ -0,0 +1,99 @@
+<?php
+/*
+       444444444  
+      4::::::::4  
+     4:::::::::4  
+    4::::44::::4  
+   4::::4 4::::4   Four Island
+  4::::4  4::::4  
+ 4::::4   4::::4   Written and maintained by Starla Insigna
+4::::444444::::444
+4::::::::::::::::4  header.inc
+4444444444:::::444
+          4::::4   Please do not use, reproduce or steal the
+          4::::4   contents of this file without explicit
+          4::::4   permission from Hatkirby.
+        44::::::44
+        4::::::::4
+        4444444444
+*/
+
+if (!defined('S_INCLUDE_FILE')) {define('S_INCLUDE_FILE',1);}
+
+require('headerproc.php');
+
+$template = new FITemplate('archive');
+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);
+        $getbio3 = mysql_fetch_array($getbio2);
+        if ($getbio3['username'] == $_GET['author'])
+        {
+                $template->adds_block('BIO', array(     'TEXT' => $getbio3['text'],
+                                                        'USERNAME' => $getbio3['username'],
+                                                        'DATE' => date('F jS Y \a\\t g:i:s a',strtotime($getbio3['lastUpdated']))));
+        }
+} 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);
+$i=0;
+while ($getposts3[$i] = mysql_fetch_array($getposts2))
+{
+        if ((!isset($lastmonth)) || ($lastmonth != date('m-Y',strtotime($getposts3[$i]['pubDate']))))
+        {
+                if (!isset($curID))
+                {
+                        $curID = 0;
+                } else {
+                        $curID++;
+                }
+                $template->add_ref($curID, 'MONTH', array('TITLE' => date('F Y',strtotime($getposts3[$i]['pubDate']))));
+                $lastmonth = date('m-Y',strtotime($getposts3[$i]['pubDate']));
+        }
+
+        $page_id = 'updates-' . $getposts3[$i]['id'];
+        $getcomments = "SELECT * FROM comments WHERE page_id = \"" . $page_id . "\" ORDER BY posttime";
+        $getcomments2 = mysql_query($getcomments);
+        $total_post=0;
+        while ($getcomments3[$total_post] = mysql_fetch_array($getcomments2))
+        {
+                $total_post++;
+        }
+        if ($total_post >= 2)
+        {
+                $plural = 's';
+        }
+        if ($total_post == 0)
+        {
+                $comText = 'No Comments';
+        } elseif ($total_post == 1)
+        {
+                $comText = '1 Comment';
+        } else {
+                $comText = $total_post . ' Comments';
+        }
+
+        $template->adds_ref_sub($curID, 'SMALL',array(  'DATE' => date('m-d-Y',strtotime($getposts3[$i]['pubDate'])),
+                                                        'CODED' => $getposts3[$i]['slug'],
+                                                        'TITLE' => htmlentities($getposts3[$i]['title'])));
+        $i++;
+}
+if ($i==0)
+{
+        generateError('404');
+}
+$template->display();
+
+?>
@@ -25,14 +25,18 @@ require('headerproc.php');
 $pageCategory = 'blog';
 $pageAID = 'archive';
 
+$hatNav = array(        array(  'title' => 'Archive',
+                                'url' => 'http://fourisland.com/blog/',
+                                'icon' => '16-file-archive'));
+
+$template = new FITemplate('post');
+$template->adds_block('INTERNAL',array('exi'=>1));
+$template->add('IFXAMP', $xhtml ? '&amp;' : '&');
+$template->add('IFXLT', $xhtml ? '&lt;' : '<');
+$template->add('IFXGT', $xhtml ? '&gt;' : '>');
+
 if (isset($_GET['post']))
 {
-        $template = new FITemplate('post');
-        $template->adds_block('INTERNAL',array('exi'=>1));
-        $template->add('IFXAMP', $xhtml ? '&amp;' : '&');
-        $template->add('IFXLT', $xhtml ? '&lt;' : '<');
-        $template->add('IFXGT', $xhtml ? '&gt;' : '>');
-
         $getpost = "SELECT * FROM updates WHERE slug = \"" . urldecode($_GET['post']) . "\"";
         $getpost2 = mysql_query($getpost);
         $getpost3 = mysql_fetch_array($getpost2);
@@ -122,48 +126,21 @@ if (isset($_GET['post']))
                 generateError('404');
         }
 } else {
-        $template = new FITemplate('archive');
-        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);
-                $getbio3 = mysql_fetch_array($getbio2);
-                if ($getbio3['username'] == $_GET['author'])
-                {
-                        $template->adds_block('BIO', array(     'TEXT' => $getbio3['text'],
-                                                                'USERNAME' => $getbio3['username'],
-                                                                'DATE' => date('F jS Y \a\\t g:i:s a',strtotime($getbio3['lastUpdated']))));
-                }
-        } 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);
-        $i=0;
-        while ($getposts3[$i] = mysql_fetch_array($getposts2))
+        $curID = 0;
+
+        $gettrack = "SELECT * FROM tracking WHERE ip = \"" . $_SERVER['REMOTE_ADDR'] . "\"";
+        $gettrack2 = mysql_query($gettrack);
+        $gettrack3 = mysql_fetch_array($gettrack2);
+
+        $trackArr = explode(',',$gettrack3['rating']);
+
+        $getpost = "SELECT * FROM updates ORDER BY id DESC LIMIT 0,4";
+        $getpost2 = mysql_query($getpost);
+        while ($getpost3 = mysql_fetch_array($getpost2))
         {
-                if ((!isset($lastmonth)) || ($lastmonth != date('m-Y',strtotime($getposts3[$i]['pubDate']))))
-                {
-                        if (!isset($curID))
-                        {
-                                $curID = 0;
-                        } else {
-                                $curID++;
-                        }
-                        $template->add_ref($curID, 'MONTH', array('TITLE' => date('F Y',strtotime($getposts3[$i]['pubDate']))));
-                        $lastmonth = date('m-Y',strtotime($getposts3[$i]['pubDate']));
-                }
+                updatePop($getpost3['id'],'home_views');
 
-                $page_id = 'updates-' . $getposts3[$i]['id'];
+                $page_id = 'updates-' . $getpost3['id'];
                 $getcomments = "SELECT * FROM comments WHERE page_id = \"" . $page_id . "\" ORDER BY posttime";
                 $getcomments2 = mysql_query($getcomments);
                 $total_post=0;
@@ -185,15 +162,35 @@ if (isset($_GET['post']))
                         $comText = $total_post . ' Comments';
                 }
 
-                $template->adds_ref_sub($curID, 'SMALL',array(  'DATE' => date('m-d-Y',strtotime($getposts3[$i]['pubDate'])),
-                                                                'CODED' => $getposts3[$i]['slug'],
-                                                                'TITLE' => htmlentities($getposts3[$i]['title'])));
-                $i++;
-        }
-        if ($i==0)
-        {
-                generateError('404');
+                $template->add_ref($curID, 'POST', array(       'ID' => $getpost3['id'],
+                                                                'YEARID' => ((date('Y',strtotime($getpost3['pubDate']))-2006) % 4),
+                                                                'DATE' => date('F jS Y \a\\t g:i:s a',strtotime($getpost3['pubDate'])),
+                                                                'MONTH' => date('M',strtotime($getpost3['pubDate'])),
+                                                                'DAY' => date('d',strtotime($getpost3['pubDate'])),
+                                                                'CODED' => $getpost3['slug'],
+                                                                'TITLE' => htmlentities(stripslashes($getpost3['title'])),
+                                                                'AUTHOR' => $getpost3['author'],
+                                                                'PLURALCOMMENT' => (isset($plural) ? $plural : ''),
+                                                                'COMMENTS' => $comText,
+                                                                'RATING' => $getpost3['rating'],
+                                                                'TEXT' => parseText(stripslashes($getpost3['text']))));
+
+                $tags = getTags($getpost3['id']);
+                foreach ($tags as $tag)
+                {
+                        $template->adds_ref_sub($curID, 'TAGS', array('TAG' => $tag));
+                }
+
+                if (($gettrack3['ip'] != $_SERVER['REMOTE_ADDR']) || (array_search($getpost3['id'],$trackArr) === FALSE))
+                {
+                        $template->adds_ref_sub($curID, 'CANVOTE', array('exi'=>1));
+                } else {
+                        $template->adds_ref_sub($curID, 'NOVOTE', array('exi'=>1));
+                }
+
+                $curID++;
         }
+
         $template->display();
 }
 
@@ -1,105 +0,0 @@
-<?php
-/*
-       444444444  
-      4::::::::4  
-     4:::::::::4  
-    4::::44::::4  
-   4::::4 4::::4   Four Island
-  4::::4  4::::4  
- 4::::4   4::::4   Written and maintained by Starla Insigna
-4::::444444::::444
-4::::::::::::::::4  pages/welcome.php
-4444444444:::::444
-          4::::4   Please do not use, reproduce or steal the
-          4::::4   contents of this file without explicit
-          4::::4   permission from Hatkirby.
-        44::::::44
-        4::::::::4
-        4444444444
-*/
-
-if (!defined('S_INCLUDE_FILE')) {define('S_INCLUDE_FILE',1);}
-
-require('headerproc.php');
-
-$pageCategory = 'blog';
-
-$hatNav = array(        array(  'title' => 'Archive',
-                                'url' => 'http://fourisland.com/blog/',
-                                'icon' => '16-file-archive'));
-
-
-$template = new FITemplate('post');
-$template->adds_block('EXTERNAL',array('exi'=>1));
-$template->add('IFXAMP', $xhtml ? '&amp;' : '&');
-$template->add('IFXLT', $xhtml ? '&lt;' : '<');
-$template->add('IFXGT', $xhtml ? '&gt;' : '>');
-
-$curID = 0;
-
-$gettrack = "SELECT * FROM tracking WHERE ip = \"" . $_SERVER['REMOTE_ADDR'] . "\"";
-$gettrack2 = mysql_query($gettrack);
-$gettrack3 = mysql_fetch_array($gettrack2);
-
-$trackArr = explode(',',$gettrack3['rating']);
-
-$getpost = "SELECT * FROM updates ORDER BY id DESC LIMIT 0,4";
-$getpost2 = mysql_query($getpost);
-while ($getpost3 = mysql_fetch_array($getpost2))
-{
-        updatePop($getpost3['id'],'home_views');
-
-        $page_id = 'updates-' . $getpost3['id'];
-        $getcomments = "SELECT * FROM comments WHERE page_id = \"" . $page_id . "\" ORDER BY posttime";
-        $getcomments2 = mysql_query($getcomments);
-        $total_post=0;
-        while ($getcomments3[$total_post] = mysql_fetch_array($getcomments2))
-        {
-                $total_post++;
-        }
-        if ($total_post >= 2)
-        {
-                $plural = 's';
-        }
-        if ($total_post == 0)
-        {
-                $comText = 'No Comments';
-        } elseif ($total_post == 1)
-        {
-                $comText = '1 Comment';
-        } else {
-                $comText = $total_post . ' Comments';
-        }
-
-        $template->add_ref($curID, 'POST', array(       'ID' => $getpost3['id'],
-                                                        'YEARID' => ((date('Y',strtotime($getpost3['pubDate']))-2006) % 4),
-                                                        'DATE' => date('F jS Y \a\\t g:i:s a',strtotime($getpost3['pubDate'])),
-                                                        'MONTH' => date('M',strtotime($getpost3['pubDate'])),
-                                                        'DAY' => date('d',strtotime($getpost3['pubDate'])),
-                                                        'CODED' => $getpost3['slug'],
-                                                        'TITLE' => htmlentities(stripslashes($getpost3['title'])),
-                                                        'AUTHOR' => $getpost3['author'],
-                                                        'PLURALCOMMENT' => (isset($plural) ? $plural : ''),
-                                                        'COMMENTS' => $comText,
-                                                        'RATING' => $getpost3['rating'],
-                                                        'TEXT' => parseText(stripslashes($getpost3['text']))));
-
-        $tags = getTags($getpost3['id']);
-        foreach ($tags as $tag)
-        {
-                $template->adds_ref_sub($curID, 'TAGS', array('TAG' => $tag));
-        }
-
-        if (($gettrack3['ip'] != $_SERVER['REMOTE_ADDR']) || (array_search($getpost3['id'],$trackArr) === FALSE))
-        {
-                $template->adds_ref_sub($curID, 'CANVOTE', array('exi'=>1));
-        } else {
-                $template->adds_ref_sub($curID, 'NOVOTE', array('exi'=>1));
-        }
-
-        $curID++;
-}
-
-$template->display();
-
-?>