4 files changed, 10 insertions, 16 deletions

@@ -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();
 
 ?>
@@ -63,9 +63,9 @@ function generateError($error)
 function echoLogData()
 {
         if (!isLoggedIn()) {
-                return('Login');
+                return('in');
         } else {
-                return('Logout');
+                return('out');
         }
 }
 
@@ -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']));
@@ -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))
 {