From dfec863ee306edcf23b897453bc19262002343d0 Mon Sep 17 00:00:00 2001
From: philippe_mingo <philippe_mingo@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Fri, 16 Nov 2001 22:03:04 +0000
Subject: [PATCH] Netscape compatibility

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1769 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 functions/mailbox_display.php |  7 +++++--
 src/options.php               | 21 +++++++++++----------
 src/right_main.php            |  5 +++--
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 5eb01722..7aa739e6 100644
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -143,7 +143,7 @@
                   echo "+\n";
                   $stuff = true;
                }
-	       if ($default_use_priority) {
+               if ($default_use_priority) {
                   if (ereg('(1|2)',substr($msg['PRIORITY'],0,1))) {
                      echo "<font color=$color[1]>!</font>\n";
                      $stuff = true;
@@ -467,7 +467,7 @@
     */
    function mail_message_listing_beginning
         ($imapConnection, $moveURL, $mailbox = '', $sort = -1,
-         $msg_cnt_str = '', $paginator = '', $start_msg = 1) {
+         $msg_cnt_str = '', $paginator = '&nbsp;', $start_msg = 1) {
       global $color, $index_order, $auto_expunge, $move_to_trash;
       global $checkall, $sent_folder, $draft_folder;
       $urlMailbox = urlencode($mailbox);
@@ -725,6 +725,9 @@
         }
 
         /* Return the resulting string. */
+        if( $lMore . $mMore . $rMore == '' ) {
+            $lMore = '&nbsp;';
+        }
         return ($lMore . $mMore . $rMore);
     }
 
diff --git a/src/options.php b/src/options.php
index 447e8aa0..cfec51a9 100644
--- a/src/options.php
+++ b/src/options.php
@@ -214,6 +214,9 @@
     /* Now, print out each option page section. */
     /********************************************/
     $first_optpage = false;
+    echo "<table bgcolor=\"$color[4]\" width=\"100%\" cellpadding=0 cellspacing=5 border=0>" .
+                '<tr><td valign="top">' .
+                   '<table width="100%" cellpadding="3" cellspacing="0" border="0">';
     foreach ($optionpages as $next_optpage) {
         if ($first_optpage == false) {
             $first_optpage = $next_optpage;
@@ -227,6 +230,10 @@
         print_optionpages_row($first_optpage);
     }
 
+    echo '</table>' .
+                '</td></tr>' .
+             "</table>\n";
+
     do_hook('options_link_and_description');
 
 ?>
@@ -264,11 +271,8 @@
      */
     function print_optionpages_row($leftopt, $rightopt = false) {
         global $color;
-        
-        echo "<table bgcolor=\"$color[4]\" width=\"100%\" cellpadding=0 cellspacing=5 border=0>" .
-                '<tr><td valign="top">' .
-                   '<table width="100%" cellpadding="3" cellspacing="0" border="0">' .
-                      '<tr>' .
+
+        echo '<tr>' .
                          "<td valign=top bgcolor=\"$color[9]\" width=\"50%\">" .
                             '<a href="' . $leftopt['url'] . '">' . $leftopt['name'] . '</a>'.
                          '</td>'.
@@ -280,7 +284,7 @@
         } else {
             echo         "<td valign=top bgcolor=\"$color[4]\" width=\"50%\">&nbsp;</td>";
         }
-        
+
         echo          '</tr>' .
                       '<tr>' .
                          "<td valign=top bgcolor=\"$color[0]\">" .
@@ -295,10 +299,7 @@
             echo "<td valign=top bgcolor=\"$color[4]\">&nbsp;</td>";
         }
         
-        echo          '</tr>' .
-                   '</table>' .
-                '</td></tr>' .
-             "</table>\n";
+        echo          "</tr>\n";
     }
 
 ?>
diff --git a/src/right_main.php b/src/right_main.php
index 9a83adec..f10ed956 100644
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -50,7 +50,7 @@
        $startMessage = 1;
 
     /* compensate for the UW vulnerability. */
-    if ($imap_server_type == 'uw' && (strstr($mailbox, '../') !== false ||
+    if ($imap_server_type == 'uw' && (strstr($mailbox, '../') ||
                                       substr($mailbox, 0, 1) == '/')) {
        $mailbox = 'INBOX';
     }
@@ -113,7 +113,8 @@
         $numMessages = sqimap_get_num_messages ($imapConnection, $mailbox);
 
         showMessagesForMailbox($imapConnection, $mailbox, $numMessages, 
-   	   $startMessage, $sort, $color, $show_num, $use_mailbox_cache);
+                               $startMessage, $sort, $color, $show_num,
+                               $use_mailbox_cache);
 
         if (session_is_registered('msgs') && isset($msgs)) {
             session_register('msgs');
-- 
2.25.1