Netscape compatibility

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1769 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 5eb01722a1b956c5df52ce400b374f1e7946146e..7aa739e61f21818420b16f78ceddb0285d94065a 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -143,7 +143,7 @@
                   echo "+\n";
                   $stuff = true;
                }
                   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;
                   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,
     */
    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);
       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. */
         }
 
         /* Return the resulting string. */

+        if( $lMore . $mMore . $rMore == '' ) {
+            $lMore = '&nbsp;';
+        }

         return ($lMore . $mMore . $rMore);
     }
 
         return ($lMore . $mMore . $rMore);
     }
 

diff --git a/src/options.php b/src/options.php
index 447e8aa0ff9cc0e47439c356878cb5b2242190f0..cfec51a9b59e0ac714d52cca2fe8e9008921b221 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -214,6 +214,9 @@
     /* Now, print out each option page section. */
     /********************************************/
     $first_optpage = false;
     /* 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;
     foreach ($optionpages as $next_optpage) {
         if ($first_optpage == false) {
             $first_optpage = $next_optpage;


@@ -227,6 +230,10 @@
         print_optionpages_row($first_optpage);
     }
 
         print_optionpages_row($first_optpage);
     }
 

+    echo '</table>' .
+                '</td></tr>' .
+             "</table>\n";
+

     do_hook('options_link_and_description');
 
 ?>
     do_hook('options_link_and_description');
 
 ?>


@@ -264,11 +271,8 @@
      */
     function print_optionpages_row($leftopt, $rightopt = false) {
         global $color;
      */
     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>'.
                          "<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>";
         }
         } else {
             echo         "<td valign=top bgcolor=\"$color[4]\" width=\"50%\">&nbsp;</td>";
         }

-        
+

         echo          '</tr>' .
                       '<tr>' .
                          "<td valign=top bgcolor=\"$color[0]\">" .
         echo          '</tr>' .
                       '<tr>' .
                          "<td valign=top bgcolor=\"$color[0]\">" .


@@ -295,10 +299,7 @@
             echo "<td valign=top bgcolor=\"$color[4]\">&nbsp;</td>";
         }
         
             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 9a83adec48ab7f192bf82e60d42fccbc040588eb..f10ed956de67b09b25700d9ab5073d336b4e0735 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -50,7 +50,7 @@
        $startMessage = 1;
 
     /* compensate for the UW vulnerability. */
        $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';
     }
                                       substr($mailbox, 0, 1) == '/')) {
        $mailbox = 'INBOX';
     }


@@ -113,7 +113,8 @@
         $numMessages = sqimap_get_num_messages ($imapConnection, $mailbox);
 
         showMessagesForMailbox($imapConnection, $mailbox, $numMessages, 
         $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');
 
         if (session_is_registered('msgs') && isset($msgs)) {
             session_register('msgs');