QC. Some code cleanup to avoid line overflow on mail list.

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

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index db1591374872379aac3c613701b491a3d460f211..3631ac5405fb7ea26ad86dc3e178c7721d7b2f98 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -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,17 +532,17 @@ function mail_message_listing_beginning
         }
     }
     echo '         </SELECT></TT>&nbsp;'.
-         "<INPUT TYPE=SUBMIT NAME=\"moveButton\" VALUE=\"" . _("Move") . '">&nbsp;'.
-        "<INPUT TYPE=SUBMIT NAME=\"attache\" VALUE=\"". _("Forward") . "\">&nbsp;\n"."</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>\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');

diff --git a/functions/page_header.php b/functions/page_header.php
index 1673fac147b0d37a9949eb915e0eaf4e94d6cc39..67bd6314164a6f13bfa7cf08237ee92f0f684978 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -13,7 +13,7 @@
 
 require_once('../functions/strings.php');
 
-// Always set up the language before calling these functions
+/* Always set up the language before calling these functions */
 function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE ) {
 
     global $theme_css, $custom_css, $base_uri;
@@ -23,14 +23,14 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE
 
     if ( !isset( $custom_css ) || $custom_css == 'none' ) {
         if ($theme_css != '') {
-            echo "<LINK REL=\"stylesheet\" TYPE=\"text/css\" HREF=\"$theme_css\">\n";
+            echo "<LINK REL=\"stylesheet\" TYPE=\"text/css\" HREF=\"$theme_css\">";
         }
     } else {
         echo '<LINK REL="stylesheet" TYPE="text/css" HREF="' .
-             $base_uri . "themes/css/$custom_css\">\n";
+             $base_uri . 'themes/css/$custom_css">';
     }
     
-    echo "<title>$title</title>$xtra</head>\n\n";
+    echo "\n<title>$title</title>$xtra</head>\n\n";
 }
 
 function displayInternalLink($path, $text, $target='') {
@@ -124,9 +124,9 @@ function displayPageHeader($color, $mailbox, $xtra='') {
         echo '&nbsp;';
     }
     echo  "      </TD>\n"
-        . "      <TD ALIGN=right><b>\n";
+        . '      <TD ALIGN=right><b>';
     displayInternalLink ('src/signout.php', _("Sign Out"), $frame_top);
-    echo "      </b></TD>\n"
+    echo "</b></TD>\n"
         . "   </TR>\n"
         . "   <TR BGCOLOR=\"$color[4]\">\n"
         . "      <TD ALIGN=left>\n";
@@ -152,10 +152,10 @@ function displayPageHeader($color, $mailbox, $xtra='') {
 
     do_hook("menuline");
 
-    echo "      </TD><TD ALIGN=right>\n";
+    echo "      </TD>\n      <TD ALIGN=\"right\">";
     echo ($hide_sm_attributions ? '&nbsp;' :
-            "<A HREF=\"http://www.squirrelmail.org/\" TARGET=\"_blank\">SquirrelMail</A>\n");
-    echo "      </TD>\n".
+            '<A HREF="http://www.squirrelmail.org/" TARGET="_blank">SquirrelMail</A>');
+    echo "</TD>\n".
         "   </TR>\n".
         "</TABLE>\n\n";
 }