rg=0 fix

[squirrelmail.git] / functions / mailbox_display.php

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 0ef018fc0e6105749f25d8aa219d75decf1bfb50..fa5c3b6ad24c07581ee8d72e71d893819b67fe37 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -12,10 +12,10 @@
  * $Id$
  */
 
-require_once('../functions/strings.php');
-require_once('../functions/html.php');
-require_once('../class/html.class.php');
-require_once('../functions/imap_mailbox.php');
+require_once(SM_PATH . 'functions/strings.php');
+require_once(SM_PATH . 'functions/html.php');
+require_once(SM_PATH . 'class/html.class.php');
+require_once(SM_PATH . 'functions/imap_mailbox.php');
 
 /* Default value for page_selector_max. */
 define('PG_SEL_MAX', 10);
@@ -380,8 +380,8 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs,
 
      switch ($mode) {
        case 'thread':
-           session_unregister('msort');
-            session_unregister('msgs');
+           sqsession_unregister('msort');
+            sqsession_unregister('msgs');
             $msgs = getThreadMessages($imapConnection, $start_msg, $show_num, 
                                      $num_msgs);
            if ($msgs === false) {
@@ -390,13 +390,13 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs,
                  '</center></small></b>';
                $thread_sort_messages = 0;
               $msort = $msgs = array();
-               session_register('msort');
-               session_register('msgs');           
+               sqsession_register($msort, 'msort');
+               sqsession_register($msgs, 'msgs');          
             } else {
               $msort= $msgs;
               $sort = 6;
-               session_register('msort');
-               session_register('msgs');
+               sqsession_register($msort, 'msort');
+               sqsession_register($msgs, 'msgs');
             }
         
         break;
@@ -410,25 +410,25 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs,
             $sort = $server_sort_order;
             $allow_server_sort = FALSE;
            $msort = $msgs = array();
-            session_register('msort');
-            session_register('msgs');      
+            sqsession_register($msort, 'msort');
+            sqsession_register($msgs, 'msgs');     
             $id = array();
          } else {
             $sort = 6;
            $msort = $msgs;         
-            session_register('msort');
-            session_register('msgs');      
+            sqsession_register($msort, 'msort');
+            sqsession_register($msgs, 'msgs');     
          }
         break;
        default:
          if (!$use_cache) {
-            session_unregister('msgs');         
-            session_unregister('msort');        
+            sqsession_unregister('msgs');       
+            sqsession_unregister('msort');      
            $msgs= getSelfSortMessages($imapConnection, $start_msg, $show_num, 
                               $num_msgs, $sort, $mbxresponse); 
             $msort = calc_msort($msgs, $sort);
-           session_register('msort');
-            session_register('msgs');
+           sqsession_register($msort, 'msort');
+            sqsession_register($msgs, 'msgs');
          } /* !use cache */
         break;
      } // switch
@@ -762,12 +762,6 @@ function mail_message_listing_beginning ($imapConnection,
     echo '</td></tr>'
     .  html_tag( 'tr' )
     . html_tag( 'td' ,'' , '', $color[0], '' );
-    if ($GLOBALS['alt_index_colors']){
-        $cellspacing =  '0';
-    } else {
-        $cellspacing = '1';
-    }
-    echo html_tag( 'table' ,'' , '', $color[0], 'border="0" width="100%" cellpadding="2"  cellspacing="'. $cellspacing .'"' );
 
     /* if using server sort we highjack the
     * the $sort var and use $server_sort_order
@@ -1206,7 +1200,8 @@ function processSubject($subject) {
     return $subject;
   }
   
-  if (function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
+  if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
+      function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
       return $languages[$squirrelmail_language]['XTRA_CODE']('strimwidth', $subject, $trim_val);
   }