From 284226706885e3b40769dea5853a95e2b32efda8 Mon Sep 17 00:00:00 2001
From: Starla Insigna <hatkirby@fourisland.com>
Date: Sat, 22 Nov 2008 18:01:52 -0500
Subject: Created the 6th layout

---
 includes/footer.php        |  9 +++++++--
 includes/functions.php     |  4 ++--
 includes/header.php        | 11 -----------
 includes/updatePending.php |  2 +-
 4 files changed, 10 insertions(+), 16 deletions(-)

(limited to 'includes')

diff --git a/includes/footer.php b/includes/footer.php
index 09be74f..8cb0f2d 100755
--- a/includes/footer.php
+++ b/includes/footer.php
@@ -111,7 +111,8 @@ if (!isset($noRightbar))
 			$getpost2 = mysql_query($getpost);
 			$getpost3 = mysql_fetch_array($getpost2);
 
-			$template->adds_block('COMMENTS', array(	'AREA' => 'blog',
+			$template->adds_block('COMMENTS', array(	'ID' => $getcomments3[$i]['id'],
+									'AREA' => 'blog',
 									'CODED' => $getpost3['slug'],
 									'ENDING' => '/',
 									'TITLE' => stripslashes($getpost3['title']),
@@ -121,7 +122,8 @@ if (!isset($noRightbar))
 		{
 			$num = substr($getcomments3[$i]['page_id'],strpos($getcomments3[$i]['page_id'],'-')+1);
 
-			$template->adds_block('COMMENTS', array(	'AREA' => 'quotes',
+			$template->adds_block('COMMENTS', array(	'ID' => $getcomments3[$i]['id'],
+									'AREA' => 'quotes',
 									'CODED' => $num,
 									'ENDING' => '.php',
  									'TITLE' => 'Quote #' . $num,
@@ -208,6 +210,9 @@ if (!isset($noRightbar))
 	}
 }
 
+$template->add('REDIRPAGE',rawurlencode($_SERVER['REQUEST_URI']));
+$template->add('LOGDATA',echoLogData());
+
 $template->display();
 
 ?>
diff --git a/includes/functions.php b/includes/functions.php
index c377c29..e7b7537 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -63,9 +63,9 @@ function generateError($error)
 function echoLogData()
 {
 	if (!isLoggedIn()) {
-		return('Login');
+		return('in');
 	} else {
-		return('Logout');
+		return('out');
 	}
 }
 
diff --git a/includes/header.php b/includes/header.php
index 3bedbd7..e9f31f6 100755
--- a/includes/header.php
+++ b/includes/header.php
@@ -45,17 +45,6 @@ $headerTemp->add('HEADTAGS',isset($headtags) ? $headtags : '');
 $headerTemp->add('EXTRATITLE',isset($title) ? ($title . ' - ') : '');
 $headerTemp->add('PAGEID',(isset($pageID)) ? $pageID : 'none');
 
-if (!isset($noMembers))
-{
-	$headerTemp->add('LOWERLOGDATA',strtolower(echoLogData()));
-	$headerTemp->add('REDIRPAGE',rawurlencode($_SERVER['REQUEST_URI']));
-	$headerTemp->add('LOGDATA',echoLogData());
-	if (getUserlevel() < 3)
-	{
-		$headerTemp->adds_block('PANEL',array('exi'=>1));
-	}
-}
-
 if (isset($_POST['message']))
 {
 	$headerTemp->adds_block('MESSAGE',array('MSG' => $_POST['message']));
diff --git a/includes/updatePending.php b/includes/updatePending.php
index a96a2b6..08c46e8 100755
--- a/includes/updatePending.php
+++ b/includes/updatePending.php
@@ -22,7 +22,7 @@ if (!defined('S_INCLUDE_FILE')) {define('S_INCLUDE_FILE',1);}
 
 require('headerproc.php');
 
-//$disablePendingQueue = 1; // Use this when Four Island goes down
+$disablePendingQueue = 1; // Use this when Four Island goes down
 
 if (!isset($disablePendingQueue))
 {
-- 
cgit 1.4.1