Undoing button 'enhancements'

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

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 617754b980320cedecc63ae3e1f66ffd242ddc42..51723f54d592e3880e3ec6fe83613cf039380035 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -451,26 +451,23 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs,
   $msg_cnt_str = get_msgcnt_str($start_msg, $end_msg, $num_msgs);
 
   do_hook('mailbox_index_before');
-  echo '<table border="0" width="100%" cellpadding="0" cellspacing="0">';
-  echo '<tr><td>';
 
   mail_message_listing_beginning($imapConnection, $mailbox, $sort, 
                                   $msg_cnt_str, $paginator_str, $start_msg);
-  echo '</td></tr>';
-  echo '<tr><td HEIGHT="3" BGCOLOR="'.$color[4].'"></td></tr>';  
-  echo '<tr><td>';
-  echo '    <table width="100%" cellpadding="1" cellspacing="0" align="center"'.' border="0" bgcolor="'.$color[9].'">';
-  echo '     <tr><td>';
-  echo '       <table width="100%" cellpadding="1" cellspacing="0" align="center" border="0" bgcolor="'.$color[4].'">';
-  echo '<tr><td>';
+
+  
+  echo '<table bgcolor="' . $color[0] . '" border="0" width="100%" cellpadding="1" cellspacing="0"><tr><td>';
   printHeader($mailbox, $srt, $color, !$thread_sort_messages);
 
   displayMessageArray($imapConnection, $num_msgs, $start_msg, 
                      $msort, $mailbox, $sort, $color, $show_num,0,0);
-  echo '</td></tr></table></td></tr></table>';
 
   mail_message_listing_end($num_msgs, $paginator_str, $msg_cnt_str, $color); 
   echo '</td></tr></table>';
+                     
+  /**
+   * TODO: Switch to using $_SESSION[] whenever we ditch the 4.0.x series.
+   */
 }
 
 function calc_msort($msgs, $sort) {
@@ -656,6 +653,7 @@ function displayMessageArray($imapConnection, $num_msgs, $start_msg,
       next($msort);
     } while ($i && $i < $endVar);
   }
+  echo '</table>';
 }
 
 /*
@@ -700,8 +698,9 @@ function mail_message_listing_beginning ($imapConnection,
    * This is the beginning of the message list table.
    * It wraps around all messages
    */
+
     echo "<FORM name=\"messageList\" method=post action=\"$moveURL\">\n"
-        . html_tag( 'table' ,
+        . html_tag( 'table' ,'' , '', '', 'border="0" width="100%" cellpadding="1"  cellspacing="0"' ) .
             html_tag( 'tr',
                 html_tag( 'td' ,
                     html_tag( 'table' ,
@@ -709,18 +708,12 @@ function mail_message_listing_beginning ($imapConnection,
                             html_tag( 'td', $paginator, 'left' ) .
                             html_tag( 'td', $msg_cnt_str, 'right' ) 
                         )
-                    , '', $color[4], 'border="0" width="100%" cellpadding="1"  cellspacing="0"' ) 
+                    , '', $color[4], 'border="0" width="100%" cellpadding="2"  cellspacing="0"' ) 
                 , 'left', '', '' )
             , '', $color[0] )
-           , '', '', 'border="0" width="100%" cellpadding="1"  cellspacing="0"' );
-        echo '<tr><td HEIGHT="3" BGCOLOR="'.$color[4].'"></td></tr>';
-        echo '<tr><td>';
-           
-        echo html_tag( 'tr' ) . "\n"
-        . html_tag( 'td' ,'' , 'left', '', '' )
-         . html_tag( 'table' ,'' , '', $color[9], 'border="0" width="100%" cellpadding="1"  cellspacing="0"' )
-         . '<tr><td>'
-           . html_tag( 'table' ,'' , '', $color[0], 'border="0" width="100%" cellpadding="1"  cellspacing="0"' )
+        . html_tag( 'tr' ) . "\n"
+        . html_tag( 'td' ,'' , 'left', $color[0], '' )
+        . html_tag( 'table' ,'' , '', $color[0], 'border="0" width="100%" cellpadding="0"  cellspacing="0"' )
             . html_tag( 'tr',
                getSmallStringCell(_("Move Selected To"), 'left') .
                getSmallStringCell(_("Transform Selected Messages"), 'right')
@@ -771,11 +764,15 @@ function mail_message_listing_beginning ($imapConnection,
                  , '', '', '' );
   }
 
-    echo "</TABLE></td></tr></table></td></tr>\n";
+  echo "</TABLE>\n";
 
-    do_hook('mailbox_form_before');
+    echo "</table>\n";
 
+    do_hook('mailbox_form_before');
 
+    echo '</td></tr>'
+    .  html_tag( 'tr' )
+    . html_tag( 'td' ,'' , '', $color[0], '' );
 
     /* if using server sort we highjack the
     * the $sort var and use $server_sort_order
@@ -789,8 +786,6 @@ function mail_message_listing_beginning ($imapConnection,
 
 function mail_message_listing_end($num_msgs, $paginator_str, $msg_cnt_str, $color) {
   if ($num_msgs) {
-    echo '<tr><td HEIGHT="3" BGCOLOR="'.$color[4].'" COLSPAN="1">';  
-    echo '</td></tr><tr><td>';
     echo html_tag( 'table',
             html_tag( 'tr',
                 html_tag( 'td',
@@ -799,11 +794,11 @@ function mail_message_listing_end($num_msgs, $paginator_str, $msg_cnt_str, $colo
                             html_tag( 'td', $paginator_str ) .
                             html_tag( 'td', $msg_cnt_str, 'right' )
                         )
-                    , '', $color[4], 'width="100%" border="0" cellpadding="1" cellspacing="0"' )
+                    , '', $color[4], 'width="100%" cellpadding="1" cellspacing="1"' )
                 )
-            )
-        , '', $color[9], 'width="100%" border="0" cellpadding="1"  cellspacing="0"' );
-    echo '</td></tr>';
+            , '', $color[4] )
+        , '', $color[9], 'width="100%" cellpadding="1"  cellspacing="1"' );
+
   }
   /* End of message-list table */
   
@@ -814,57 +809,49 @@ function mail_message_listing_end($num_msgs, $paginator_str, $msg_cnt_str, $colo
 
 function printHeader($mailbox, $sort, $color, $showsort=true) {
   global $index_order;
-    $cols = 0;
-    $line = '';
-    $line .= html_tag( 'tr' ,'' , 'center', $color[5] );
+    echo html_tag( 'table' ,'' , '', $color[4], 'border="0" width="100%" cellpadding="1" cellspacing="0"' );
+    echo html_tag( 'tr' ,'' , 'center', $color[5] );
     for ($i=1; $i <= count($index_order); $i++) {
         switch ($index_order[$i]) {
         case 1: /* checkbox */
-//         ++$cols;        
         case 5: /* flags */
-            $line .= html_tag( 'td' ,'&nbsp;' , '', '', 'width="1%"' );
-           ++$cols;        
+            echo html_tag( 'td' ,'&nbsp;' , '', '', 'width="1%"' );
             break;
         case 2: /* from */
             if (handleAsSent($mailbox)) {
-                $line .=  html_tag( 'td' ,'' , 'left', '', 'width="25%"' )
+                echo html_tag( 'td' ,'' , 'left', '', 'width="25%"' )
                 . '<b>' . _("To") . '</b>';
             } else {
-                $line .=  html_tag( 'td' ,'' , 'left', '', 'width="25%"' )
+                echo html_tag( 'td' ,'' , 'left', '', 'width="25%"' )
                 . '<b>' . _("From") . '</b>';
             }
             if ($showsort) {
-                $line .= ShowSortButton($sort, $mailbox, 2, 3);
+                ShowSortButton($sort, $mailbox, 2, 3);
             }
-            $line .=  "</td>\n";
-           ++$cols;        
+            echo "</td>\n";
             break;
         case 3: /* date */
-            $line .=  html_tag( 'td' ,'' , 'left', '', 'width="5%" nowrap' )
+            echo html_tag( 'td' ,'' , 'left', '', 'width="5%" nowrap' )
             . '<b>' . _("Date") . '</b>';
             if ($showsort) {
-                $line .= ShowSortButton($sort, $mailbox, 0, 1);
+                ShowSortButton($sort, $mailbox, 0, 1);
             }
-            $line .=  "</td>\n";
-           ++$cols;        
+            echo "</td>\n";
             break;
         case 4: /* subject */
-            $line .= html_tag( 'td' ,'' , 'left', '', '' )
+            echo html_tag( 'td' ,'' , 'left', '', '' )
             . '<b>' . _("Subject") . '</b>';
             if ($showsort) {
-                $line .= ShowSortButton($sort, $mailbox, 4, 5);
+                ShowSortButton($sort, $mailbox, 4, 5);
             }
-            $line .=  "</td>\n";
-           ++$cols;        
+            echo "</td>\n";
             break;
         case 6: /* size */
-            $line .=  html_tag( 'td', '<b>' . _("Size") . '</b>', 'center', '', 'width="5%"' );
-           ++$cols;        
+            echo html_tag( 'td', '<b>' . _("Size") . '</b>', 'center', '', 'width="5%"' );
             break;
         }
     }
-    $line .= "</tr>\n";
-    echo $line;
+    echo "</tr>\n";
 }
 
 
@@ -892,7 +879,7 @@ function ShowSortButton($sort, $mailbox, $Up, $Down ) {
   }
   
   /* Now that we have everything figured out, show the actual button. */
-  return ' <a href="' . $source_url .'?newsort=' . $which
+  echo ' <a href="' . $source_url .'?newsort=' . $which
     . '&amp;startMessage=1&amp;mailbox=' . urlencode($mailbox)
     . '"><IMG SRC="../images/' . $img
     . '" BORDER=0 WIDTH=12 HEIGHT=10 ALT="sort"></a>';
@@ -1255,18 +1242,7 @@ function getMbxList($imapConnection) {
 }
 
 function getButton($type, $name, $value) {
-global $color;
-$style = ' STYLE="background:'.$color[4].';font-size:80%;font-weight:bold;'.
-                  'color:'.$color[8].';margin:0.05em;border:0.2em outset '.
-                 $color[9].';"';
-$javascript = " onmouseover=\"this.style.color='$color[4]'".
-                           ";this.style.borderStyle='inset'" .
-                           ";this.style.background='$color[3]';\";" .
-             " onmouseout=\"this.style.color='$color[8]'".
-                           ";this.style.borderStyle='outset'" . 
-                           ";this.style.background='$color[4]';\";";
-
-return '<INPUT TYPE="'.$type.'" NAME="'.$name.'" VALUE="'.$value . '"'.$style.$javascript.'>';
+return '<INPUT TYPE="'.$type.'" NAME="'.$name.'" VALUE="'.$value . '">';
 }
 
 function getSmallStringCell($string, $align) {