Pārlūkot izejas kodu

Netscape compatibility

philippe_mingo 23 gadi atpakaļ
vecāks
revīzija
4262819c8a
3 mainītis faili ar 19 papildinājumiem un 14 dzēšanām
  1. 5 2
      functions/mailbox_display.php
  2. 11 10
      src/options.php
  3. 3 2
      src/right_main.php

+ 5 - 2
functions/mailbox_display.php

@@ -143,7 +143,7 @@
                   echo "+\n";
                   echo "+\n";
                   $stuff = true;
                   $stuff = true;
                }
                }
-	       if ($default_use_priority) {
+               if ($default_use_priority) {
                   if (ereg('(1|2)',substr($msg['PRIORITY'],0,1))) {
                   if (ereg('(1|2)',substr($msg['PRIORITY'],0,1))) {
                      echo "<font color=$color[1]>!</font>\n";
                      echo "<font color=$color[1]>!</font>\n";
                      $stuff = true;
                      $stuff = true;
@@ -467,7 +467,7 @@
     */
     */
    function mail_message_listing_beginning
    function mail_message_listing_beginning
         ($imapConnection, $moveURL, $mailbox = '', $sort = -1,
         ($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 $color, $index_order, $auto_expunge, $move_to_trash;
       global $checkall, $sent_folder, $draft_folder;
       global $checkall, $sent_folder, $draft_folder;
       $urlMailbox = urlencode($mailbox);
       $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);
     }
     }
 
 

+ 11 - 10
src/options.php

@@ -214,6 +214,9 @@
     /* Now, print out each option page section. */
     /* Now, print out each option page section. */
     /********************************************/
     /********************************************/
     $first_optpage = false;
     $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) {
     foreach ($optionpages as $next_optpage) {
         if ($first_optpage == false) {
         if ($first_optpage == false) {
             $first_optpage = $next_optpage;
             $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) {
     function print_optionpages_row($leftopt, $rightopt = false) {
         global $color;
         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%\">" .
                          "<td valign=top bgcolor=\"$color[9]\" width=\"50%\">" .
                             '<a href="' . $leftopt['url'] . '">' . $leftopt['name'] . '</a>'.
                             '<a href="' . $leftopt['url'] . '">' . $leftopt['name'] . '</a>'.
                          '</td>'.
                          '</td>'.
@@ -280,7 +284,7 @@
         } else {
         } else {
             echo         "<td valign=top bgcolor=\"$color[4]\" width=\"50%\">&nbsp;</td>";
             echo         "<td valign=top bgcolor=\"$color[4]\" width=\"50%\">&nbsp;</td>";
         }
         }
-        
+
         echo          '</tr>' .
         echo          '</tr>' .
                       '<tr>' .
                       '<tr>' .
                          "<td valign=top bgcolor=\"$color[0]\">" .
                          "<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";
     }
     }
 
 
 ?>
 ?>

+ 3 - 2
src/right_main.php

@@ -50,7 +50,7 @@
        $startMessage = 1;
        $startMessage = 1;
 
 
     /* compensate for the UW vulnerability. */
     /* compensate for the UW vulnerability. */
-    if ($imap_server_type == 'uw' && (strstr($mailbox, '../') !== false ||
+    if ($imap_server_type == 'uw' && (strstr($mailbox, '../') ||
                                       substr($mailbox, 0, 1) == '/')) {
                                       substr($mailbox, 0, 1) == '/')) {
        $mailbox = 'INBOX';
        $mailbox = 'INBOX';
     }
     }
@@ -113,7 +113,8 @@
         $numMessages = sqimap_get_num_messages ($imapConnection, $mailbox);
         $numMessages = sqimap_get_num_messages ($imapConnection, $mailbox);
 
 
         showMessagesForMailbox($imapConnection, $mailbox, $numMessages, 
         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)) {
         if (session_is_registered('msgs') && isset($msgs)) {
             session_register('msgs');
             session_register('msgs');