Added Fouripedia compatibility

Made many strutural changes to Four Island allowing for the reinclusion of Fouripedia.

18 files changed, 123 insertions, 82 deletions

@@ -20,27 +20,18 @@
 
 require('headerproc.php');
 
-header('Content-type: application/xhtml+xml');
-
 include('../security/config.php');
 include('includes/db.php');
-include('includes/template.php');
-include('includes/session.php');
-include('includes/parsers.php');
-include('includes/xmlrpc/xmlrpc.inc');
-include('includes/specialdates.php');
-include('includes/functions.php');
+include('includes/common.php');
 
 if (!isAdmin())
 {
         ob_start();
         generateError('404');
-        $doc = ob_get_contents();
+        $content = ob_get_contents();
         ob_end_clean();
 
-        include('includes/header.php');
-        echo($doc);
-        include('includes/footer.php');
+        include('includes/layout.php');
 
         exit;
 }
@@ -72,7 +72,7 @@ while ($getcomments3[$i] = mysql_fetch_array($getcomments2))
                                                                 'USERNAME' => (($website != '') ? '<a href="' . $website . '">' . $username . '</a>' : $username),
                                                                 'DATE' => date("F jS Y \a\\t g:i:s a",strtotime($getcomments3[$i]['posttime'])),
                                                                 'ID' => $getcomments3[$i]['id'],
-                                                                'TEXT' => parseText($getcomments3[$i]['comment'])));
+                                                                'TEXT' => parseText(stripslashes($getcomments3[$i]['comment']))));
 
                 if (isLoggedIn())
                 {
@@ -0,0 +1,61 @@
+<?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  includes/common.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');
+
+include('includes/template.php');

+include('includes/session.php');

+include('includes/maintenance.php');

+include('includes/parsers.php');

+include('includes/xmlrpc/xmlrpc.inc');

+include('includes/specialdates.php');

+include('includes/functions.php');

+include('includes/hits.php');

+include('includes/updatePending.php');
+
+if (isset($_GET['layout']))

+{

+        if (!file_exists('theme/layouts/' . basename($_GET['layout'])))

+        {

+                $_GET['layout'] = '7';

+        }

+

+        setcookie('layout', $_GET['layout'], time()+60*60*24*30, '/', '.fourisland.com');
+
+        unset($_GET['layout']);

+
+        header('Location: ' . getRewriteURL());
+        exit;

+}
+
+if (preg_match('|MSIE ([0-9].[0-9]{1,2})|', $_SERVER['HTTP_USER_AGENT'], $matched))

+{

+        $usingIE = true;

+} else {
+        if (getLayout() == '7')
+        {

+                header('Content-type: application/xhtml+xml');
+                $xhtml = true;
+        }

+}
+
+?>
@@ -390,7 +390,12 @@ function getRewriteURL()
 {
         if (!isset($_GET['area']))
         {
-                return '/';
+                if (strpos($_SERVER['PHP_SELF'], 'wiki') !== false)
+                {
+                        return $_SERVER['PHP_SELF'];
+                } else {
+                        return '/';
+                }
         } else {
                 if ($_GET['area'] == 'blog')
                 {
@@ -28,19 +28,17 @@ $template->add('CATEGORY',(isset($pageCategory)) ? $pageCategory : 'none');
 $template->add('AID',(isset($pageAID)) ? $pageAID : 'none');

 $template->add('EXTRATITLE',isset($title) ? ($title . ' - ') : '');

 $template->add(strtoupper($pageCategory) . 'ACTIVE', ' class="active"');

+$template->add('EXTRASIDEBAR', isset($extraSidebar) ? $extraSidebar : '');

 

-if (($pageCategory != 'fourm') && ($pageCategory != 'wiki'))

-{

-        $template->add('REDIRPAGE',rawurlencode($_SERVER['REQUEST_URI']));

-        $template->add('LOGDATA',echoLogData());

-        $template->add('LOWERLOGDATA','log' . strtolower(echoLogData()));

-        $template->add('SID',getSessionID());

-        $template->adds_block('MEMBERS',array('exi' => 1));

+$template->add('REDIRPAGE',rawurlencode($_SERVER['REQUEST_URI']));

+$template->add('LOGDATA',echoLogData());

+$template->add('LOWERLOGDATA','log' . strtolower(echoLogData()));

+$template->add('SID',getSessionID());

+$template->adds_block('MEMBERS',array('exi' => 1));

 

-        if (isAdmin())

-        {

-                $template->adds_block('ADMIN',array('exi' => 1));

-        }

+if (isAdmin())

+{

+        $template->adds_block('ADMIN',array('exi' => 1));

 }

 

 if (isset($hatNav) && is_array($hatNav))

@@ -274,11 +272,11 @@ foreach ($counts as $tag => $count)
 if (!isset($noRightbar))

 {

         $template->adds_block('RIGHTBAR', array('exi'=>1));

-}
-
+}

+

 $template->add('ME', getRewriteURL());

 

-$template->add('CONTENT', stripslashes($content));

+$template->add('CONTENT', $content);

 

 $template->display();

 

@@ -22,7 +22,7 @@ if (!defined('S_INCLUDE_FILE')) {define('S_INCLUDE_FILE',1);}
 
 require('headerproc.php');
 
-session_start();
+@session_start();
 
 function getSessionID()
 {
@@ -24,41 +24,7 @@ header('X-Pingback: http://fourisland.com/xmlrpc.php');
 

 include('../security/config.php');

 include('includes/db.php');

-include('includes/template.php');

-include('includes/session.php');

-include('includes/maintenance.php');

-include('includes/parsers.php');

-include('includes/xmlrpc/xmlrpc.inc');

-include('includes/specialdates.php');

-include('includes/functions.php');

-include('includes/hits.php');

-include('includes/updatePending.php');
-
-if (isset($_GET['layout']))

-{

-        if (!file_exists('theme/layouts/' . basename($_GET['layout'])))

-        {

-                $_GET['layout'] = '7';

-        }

-

-        setcookie('layout', $_GET['layout'], time()+60*60*24*30, '/', '.fourisland.com');
-
-        unset($_GET['layout']);

-
-        header('Location: ' . getRewriteURL());
-        exit;

-}
-
-if (preg_match('|MSIE ([0-9].[0-9]{1,2})|', $_SERVER['HTTP_USER_AGENT'], $matched))

-{

-        $usingIE = true;

-} else {
-        if (getLayout() == '7')
-        {

-                header('Content-type: application/xhtml+xml');
-                $xhtml = true;
-        }

-}
+include('includes/common.php');
 
 if (strpos($_SERVER['REQUEST_URI'],'index.php'))
 {
@@ -67,10 +67,10 @@ if (isset($_GET['post']))
                                                         'MONTH' => date('M',strtotime($getpost3['pubDate'])),
                                                         'DAY' => date('d',strtotime($getpost3['pubDate'])),
                                                         'CODED' => $getpost3['slug'],
-                                                        'TITLE' => htmlentities($getpost3['title']),
+                                                        'TITLE' => htmlentities(stripslashes($getpost3['title'])),
                                                         'AUTHOR' => $getpost3['author'],
                                                         'RATING' => $getpost3['rating'],
-                                                        'TEXT' => parseText($getpost3['text'])));
+                                                        'TEXT' => parseText(stripslashes($getpost3['text']))));
 
                 $tags = getTags($getpost3['id']);
                 foreach ($tags as $tag)
@@ -53,7 +53,7 @@ if (!isset($_GET['id']))
                         $question .= '....';
                 }
                 $template->adds_block('POLL', array(    'ID' => $getpolls3[$i]['id'],
-                                                        'QUESTION' => htmlentities($question),
+                                                        'QUESTION' => htmlentities(stripslashes($question)),
                                                         'WEEK' => date('F jS Y', strtotime($getpolls3[$i]['week'])),
                                                         'EVEN' => (($i % 2 == 1) ? ' class="even"' : '')));
                 $i++;
@@ -90,17 +90,17 @@ if (!isset($_GET['id']))
 
         if ($getpoll3['id'] == $_GET['id'])
         {
-                $template->add('QUESTION', htmlentities($getpoll3['question']));
+                $template->add('QUESTION', htmlentities(stripslashes($getpoll3['question'])));
 
                 if ($getpoll3['text'] != '')
                 {
-                        $template->adds_block('COMPLETE', array(        'RSS' => parseText($getpoll3['text']),
+                        $template->adds_block('COMPLETE', array(        'RSS' => parseText(stripslashes($getpoll3['text'])),
                                                                         'AUTHOR' => $getrss3['author'],
                                                                         'DATE' => date("F jS Y \a\\t g:i:s a",strtotime($getpoll3['week'])),
-                                                                        'OPTION1' => $getpoll3['option1'],
-                                                                        'OPTION2' => $getpoll3['option2'],
-                                                                        'OPTION3' => $getpoll3['option3'],
-                                                                        'OPTION4' => $getpoll3['option4'],
+                                                                        'OPTION1' => stripslashes($getpoll3['option1']),
+                                                                        'OPTION2' => stripslashes($getpoll3['option2']),
+                                                                        'OPTION3' => stripslashes($getpoll3['option3']),
+                                                                        'OPTION4' => stripslashes($getpoll3['option4']),
                                                                         'CLICKS1' => $getpoll3['clicks1'],
                                                                         'CLICKS2' => $getpoll3['clicks2'],
                                                                         'CLICKS3' => $getpoll3['clicks3'],
@@ -70,7 +70,7 @@ if (isset($_GET['id']) && !(is_numeric($_GET['id'])))
         $template = new FITemplate('quotes/add');
         if (isset($_GET['submit']))
         {
-                $template->adds_block('SUBMITTED',array('QUOTE' => str_replace("\n","<br />",htmlentities($_POST['rash_quote']))));
+                $template->adds_block('SUBMITTED',array('QUOTE' => str_replace("\n","<br />",htmlentities(stripslashes($_POST['rash_quote'])))));
                 if (!isLoggedIn())
                 {
                         $insquote = "INSERT INTO rash_queue (quote) VALUES(\"" . mysql_real_escape_string(htmlspecialchars($_POST['rash_quote'])) . "\")";
@@ -77,12 +77,12 @@ while ($getpost3 = mysql_fetch_array($getpost2))
                                                         'MONTH' => date('M',strtotime($getpost3['pubDate'])),
                                                         'DAY' => date('d',strtotime($getpost3['pubDate'])),
                                                         'CODED' => $getpost3['slug'],
-                                                        'TITLE' => htmlentities($getpost3['title']),
+                                                        'TITLE' => htmlentities(stripslashes($getpost3['title'])),
                                                         'AUTHOR' => $getpost3['author'],
                                                         'PLURALCOMMENT' => (isset($plural) ? $plural : ''),
                                                         'COMMENTS' => $comText,
                                                         'RATING' => $getpost3['rating'],
-                                                        'TEXT' => parseText($getpost3['text'])));
+                                                        'TEXT' => parseText(stripslashes($getpost3['text']))));
 
         $tags = getTags($getpost3['id']);
         foreach ($tags as $tag)
@@ -229,7 +229,7 @@ div.post-date-4 {
 span.post-vote {
  float: right;
  position: relative;
- top: -2em;
+ top: -.5em;
  right: 1em;
 }
 
@@ -56,6 +56,4 @@ span.quote-update-result {
         float: right;
         text-transform: uppercase;
         font-size: 70%;
-        position: relative;
-        top: -1.2em;
 }
@@ -37,6 +37,7 @@
                                         <LI id="bannernav-home"><A HREF="/" REL="home"><B><SPAN>Home</SPAN></B></A></LI>
                                         <LI id="bannernav-projects"><A HREF="http://projects.fourisland.com"><B><SPAN>Projects</SPAN></B></A></LI>
                                         <LI id="bannernav-fourm"><A HREF="/fourm/"><B><SPAN>Fourm</SPAN></B></A></LI>
+                                        <LI id="bannernav-wiki"><A HREF="/wiki/"><B><SPAN>Wiki</SPAN></B></A></LI>
                                         <LI id="bannernav-poll"><A HREF="/poll/"><B><SPAN>Poll</SPAN></B></A></LI>
                                         <LI id="bannernav-quotes"><A HREF="/quotes/"><B><SPAN>Quotes</SPAN></B></A></LI>
                                         <LI id="bannernav-<!--LOWERLOGDATA-->"><A HREF="http://fourisland.com/fourm/ucp.php?mode=log<!--LOGDATA-->&amp;redirect=<!--REDIRPAGE-->&amp;sid=<!--SID-->"><B><SPAN>Log<!--LOGDATA--></SPAN></B></A></LI>
@@ -87,6 +88,8 @@
 
                                         <P />
                                         <!--END CREATE_HATNAV-->
+
+                                        <!--EXTRASIDEBAR-->
                                         
                                         <div class="module rounded sidebar">
                                                 <h3>Poll of the Week</h3>
@@ -51,6 +51,14 @@
                                                         </A>
                                                 </LI>
 
+
+                                                <LI<!--WIKIACTIVE-->>
+                                                        <A HREF="http://fourisland.com/wiki/">
+                                                                <IMG SRC="/theme/images/icons/report.png" ALT="Wiki">
+                                                                <SPAN>Wiki</SPAN>
+                                                        </A>
+                                                </LI>
+
                                                 <LI<!--POLLACTIVE-->>
                                                         <A HREF="http://fourisland.com/poll/">
                                                                 <IMG SRC="/theme/images/icons/overlays.png" ALT="Polls">
@@ -121,6 +129,8 @@
 
                                         <P />
                                         <!--END CREATE_HATNAV-->
+
+                                        <!--EXTRASIDEBAR-->
                                         
                                         <div class="module rounded sidebar">
                                                 <h3>Poll of the Week</h3>
@@ -18,5 +18,5 @@ div#fi-navbar ul li.active img {
 }
 
 .light-at-night, .light-at-night-l6p2 {
- color: #555555;
+ color: #536482 !important;
 }
@@ -27,8 +27,8 @@ include('layouts/6.2/style.css');
 if (((date('G') >= 20) || (date('G') <= 6)) || isset($_GET['night']) && !isset($_GET['day']))
 {
         include('layouts/6.2/night.css');
+} else {
+        include('layouts/6.2/holiday.php');
 }
 
-include('layouts/6.2/holiday.php');
-
 ?>
@@ -55,6 +55,8 @@
                                 <!--BEGIN CREATE_HATNAV-->
                                 </ul>
                                 <!--END CREATE_HATNAV-->
+
+                                <!--EXTRASIDEBAR-->
                                 
                                 <div class="module rounded sidebar">
                                         <h3>Poll of the Week</h3>
@@ -136,6 +138,13 @@
                                                 </a>
                                         </li>
 
+                                        <li<!--WIKIACTIVE-->>
+                                                <a href="http://fourisland.com/wiki/">
+                                                        <img src="/theme/images/icons/report.png" alt="Wiki" />
+                                                        <span>Wiki</span>
+                                                </a>
+                                        </li>
+
                                         <li<!--POLLACTIVE-->>
                                                 <a href="http://fourisland.com/poll/">
                                                         <img src="/theme/images/icons/overlays.png" alt="Polls" />