Added more of Jon Tai's fixes.

[squirrelmail.git] / functions / mailbox_display.php

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 4231897a0bfb2a2d7aeeedac91b5a45fd6d112d7..3631ac5405fb7ea26ad86dc3e178c7721d7b2f98 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -353,7 +353,7 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs, $start_msg
             $msort = array_cleave ($msgs, 'FROM-SORT');
         } elseif (($sort == 4) || ($sort == 5)) {
             $msort = array_cleave ($msgs, 'SUBJECT-SORT');
-        } else // ($sort == 6) {
+        } else { // ($sort == 6) 
             $msort = $msgs;
         }
 
@@ -517,7 +517,7 @@ function mail_message_listing_beginning
        . "      </TD>\n"
        . "   </TR>\n"
        . "   <TR>\n"
-       . "      <TD ALIGN=LEFT VALIGN=MIDDLE NOWRAP>\n"
+       . "      <TD ALIGN=\"LEFT\" VALIGN=\"MIDDLE\" NOWRAP>\n"
        . '         <SMALL>&nbsp;<TT><SELECT NAME="targetMailbox">';
 
     $boxes = sqimap_mailbox_list($imapConnection);
@@ -532,16 +532,17 @@ function mail_message_listing_beginning
         }
     }
     echo '         </SELECT></TT>&nbsp;'.
-         "<INPUT TYPE=SUBMIT NAME=\"moveButton\" VALUE=\"" . _("Move") . "\"></SMALL>\n".
+         '<INPUT TYPE="SUBMIT" NAME="moveButton" VALUE="' . _("Move") . '">&nbsp;'.
+        '<INPUT TYPE="SUBMIT" NAME="attache" VALUE="' . _("Forward") . "\">&nbsp;\n"."</SMALL>\n".
          "      </TD>\n".
-         "      <TD ALIGN=RIGHT NOWRAP>&nbsp;&nbsp;&nbsp;\n";
+         "      <TD ALIGN=\"RIGHT\" NOWRAP>";
     if (!$auto_expunge) {
-        echo '         <INPUT TYPE=SUBMIT NAME="expungeButton" VALUE="'. _("Expunge") .'">&nbsp;'. _("mailbox") ."&nbsp;\n";
+        echo '<INPUT TYPE=SUBMIT NAME="expungeButton" VALUE="' . _("Expunge") . '">&nbsp;' . _("mailbox") . '&nbsp;';
     }
-    echo "         <INPUT TYPE=SUBMIT NAME=\"markRead\" VALUE=\"". _("Read")."\">\n".
-         "         <INPUT TYPE=SUBMIT NAME=\"markUnread\" VALUE=\"". _("Unread")."\">\n".
-         "         <INPUT TYPE=SUBMIT VALUE=\"". _("Delete") . "\">&nbsp;\n".
-         "      </TD>\n".
+    echo '<INPUT TYPE="SUBMIT" NAME="markRead" VALUE="' . _("Read") . '">' .
+         '<INPUT TYPE="SUBMIT" NAME="markUnread" VALUE="' . _("Unread") . '">' .
+        '<INPUT TYPE="SUBMIT" VALUE="' . _("Delete") . '">&nbsp;' .
+         "</TD>\n".
          "   </TR>\n".
          "</TABLE>\n";
     do_hook('mailbox_form_before');
@@ -642,7 +643,7 @@ function get_selectall_link($start_msg, $sort) {
             $result .= "<a href=\"$PHP_SELF&amp;mailbox=" . urlencode($mailbox)
                     . "&amp;startMessage=$start_msg&amp;sort=$sort&amp;checkall=";
         }
-               else {
+        else {
             $result .= "<a href=\"$PHP_SELF?mailbox=" . urlencode($mailbox)
                     . "&amp;startMessage=$start_msg&amp;sort=$sort&amp;checkall=";
         }