Cleaned up generated HTML-code.
authorgustavf <gustavf@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Thu, 25 May 2000 13:29:38 +0000 (13:29 +0000)
committergustavf <gustavf@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Thu, 25 May 2000 13:29:38 +0000 (13:29 +0000)
git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@510 7612ce4b-ef26-0410-bec9-ea0150e637f0

functions/page_header.php
src/compose.php

index 587f1ab..92e4183 100644 (file)
 
       printf('<BODY TEXT="%s" BGCOLOR="%s" LINK="%s" VLINK="%s" ALINK="%s">',
              $color[8], $color[4], $color[7], $color[7], $color[7]);
+      echo "\n\n";
 
       /** Here is the header and wrapping table **/
       $shortBoxName = readShortMailboxName($mailbox, ".");
       $shortBoxName = stripslashes($shortBoxName);
-      echo "<TABLE BGCOLOR=\"$color[4]\" BORDER=0 COLS=2 WIDTH=100% CELLSPACING=0 CELLPADDING=2>";
-      echo "   <TR BGCOLOR=\"$color[9]\" WIDTH=100%>";
-      echo "      <TD ALIGN=left WIDTH=30%>";
-      echo "         <A HREF=\"signout.php\" TARGET=_top><B>" . _("Sign Out") . "</B></A>";
-      echo "      </TD><TD ALIGN=right WIDTH=70%>";
-      echo "         <div align=right>" . _("Current Folder: ") . "<B>$shortBoxName&nbsp;</div></B>";
-      echo "      </TD>";
-      echo "   </TR></TABLE>\n";
-      echo "<TABLE BGCOLOR=\"$color[4]\" BORDER=0 COLS=2 WIDTH=100% CELLSPACING=0 CELLPADDING=2><TR>";
-      echo "      <TD ALIGN=left WIDTH=70%>";
+      echo "<TABLE BGCOLOR=\"$color[4]\" BORDER=0 WIDTH=\"100%\" CELLSPACING=0 CELLPADDING=2>\n";
+      echo "   <TR BGCOLOR=\"$color[9]\">\n";
+      echo "      <TD ALIGN=left WIDTH=\"30%\">\n";
+      echo "         <A HREF=\"signout.php\" TARGET=\"_top\"><B>" . _("Sign Out") . "</B></A>\n";
+      echo "      </TD><TD ALIGN=right WIDTH=\"70%\">\n";
+      echo "         <div align=right>" . _("Current Folder: ") . "<B>$shortBoxName&nbsp;</B></div>\n";
+      echo "      </TD>\n";
+      echo "   </TR>\n";
+      echo "</TABLE>\n\n";
+      echo "<TABLE BGCOLOR=\"$color[4]\" BORDER=0 WIDTH=\"100%\" CELLSPACING=0 CELLPADDING=2>\n";
+      echo "   <TR>\n";
+      echo "      <TD ALIGN=left WIDTH=\"70%\">\n";
       $urlMailbox = $mailbox;
-      echo "         <A HREF=\"compose.php?mailbox=$urlMailbox\">" . _("Compose") . "</A>&nbsp;&nbsp;";
-      echo "         <A HREF=\"addressbook.php\">" . _("Addresses") . "</A>&nbsp;&nbsp;";
-      echo "         <A HREF=\"folders.php\">" . _("Folders") . "</A>&nbsp;&nbsp;";
-      echo "         <A HREF=\"options.php\">" . _("Options") . "</A>&nbsp;&nbsp;";
-      echo "      </TD><TD ALIGN=right WIDTH=30%>";
-      echo "         <A HREF=\"http://squirrelmail.sourceforge.net/index.php3?from=1\" TARGET=_top>SquirrelMail</A>";
-      echo "      </TD>";
-      echo "</TABLE>";
+      echo "         <A HREF=\"compose.php?mailbox=$urlMailbox\">" . _("Compose") . "</A>&nbsp;&nbsp;\n";
+      echo "         <A HREF=\"addressbook.php\">" . _("Addresses") . "</A>&nbsp;&nbsp;\n";
+      echo "         <A HREF=\"folders.php\">" . _("Folders") . "</A>&nbsp;&nbsp;\n";
+      echo "         <A HREF=\"options.php\">" . _("Options") . "</A>&nbsp;&nbsp;\n";
+      echo "      </TD><TD ALIGN=right WIDTH=\"30%\">\n";
+      echo "         <A HREF=\"http://squirrelmail.sourceforge.net/index.php3?from=1\" TARGET=\"_top\">SquirrelMail</A>\n";
+      echo "      </TD>\n";
+      echo "   </TR>\n";
+      echo "</TABLE>\n\n";
   }
 ?>
index 8a1a200..85cd024 100644 (file)
          echo "<input type=hidden name=reply_id value=$reply_id>\n";
       }                 
                echo "<input type=hidden name=mailbox value=$mailbox>\n";
-      echo "<TABLE COLS=2 WIDTH=50 ALIGN=center CELLSPACING=0 BORDER=0>\n";
+      echo "<TABLE WIDTH=50 ALIGN=center CELLSPACING=0 BORDER=0>\n";
       echo "   <TR>\n";
       echo "      <TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
       echo _("To:");
-      echo "      </TD><TD colspan=2 WIDTH=% BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
+      echo "      </TD><TD colspan=2 WIDTH=\"100%\" BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
       if ($send_to)
-         echo "         <INPUT TYPE=TEXT NAME=send_to VALUE=\"$send_to\" SIZE=60><BR>";
+         echo "         <INPUT TYPE=TEXT NAME=\"send_to\" VALUE=\"$send_to\" SIZE=60><BR>\n";
       else
-         echo "         <INPUT TYPE=TEXT NAME=send_to SIZE=60><BR>";
+         echo "         <INPUT TYPE=TEXT NAME=\"send_to\" SIZE=60><BR>\n";
       echo "      </TD>\n";
       echo "   </TR>\n";
       echo "   <TR>\n";
       echo "      <TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
       echo _("CC:");
-      echo "      </TD><TD WIDTH=% colspan=2 BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
+      echo "      </TD><TD colspan=2 BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
       if ($send_to_cc)
-         echo "         <INPUT TYPE=TEXT NAME=send_to_cc SIZE=60 VALUE=\"$send_to_cc\"><BR>";
+         echo "         <INPUT TYPE=TEXT NAME=\"send_to_cc\" SIZE=60 VALUE=\"$send_to_cc\"><BR>\n";
       else
-         echo "         <INPUT TYPE=TEXT NAME=send_to_cc SIZE=60><BR>";
+         echo "         <INPUT TYPE=TEXT NAME=\"send_to_cc\" SIZE=60><BR>\n";
       echo "      </TD>\n";
       echo "   </TR>\n";
       echo "   <TR>\n";
       echo "      <TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
       echo _("BCC:");
-      echo "      </TD><TD WIDTH=% BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
+      echo "      </TD><TD BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
       if ($send_to_bcc)
-         echo "         <INPUT TYPE=TEXT NAME=send_to_bcc VALUE=\"$send_to_bcc\" SIZE=55><BR>";
+         echo "         <INPUT TYPE=TEXT NAME=\"send_to_bcc\" VALUE=\"$send_to_bcc\" SIZE=55><BR>\n";
       else
-         echo "         <INPUT TYPE=TEXT NAME=send_to_bcc SIZE=55><BR>";
+         echo "         <INPUT TYPE=TEXT NAME=\"send_to_bcc\" SIZE=55><BR>";
       echo "      </TD>\n";
-      echo "<TD width=1% BGCOLOR=\"$color[4]\" ALIGN=Right>";
+      echo "<TD width=\"1%\" BGCOLOR=\"$color[4]\" ALIGN=Right>";
       
       if ($use_javascript_addr_book) {
          echo "<SCRIPT LANGUAGE=JavaScript><!--\n document.write(\"";
          echo "<input type=button value=\\\""._("Addresses")."\\\" onclick='javascript:open_abook();'>\");";
          echo "// --></SCRIPT><NOSCRIPT>\n";
-         echo "<input type=submit name=html_addr_search value=\""._("Addresses")."\">";
+         echo "<input type=submit name=\"html_addr_search\" value=\""._("Addresses")."\">";
          echo "</NOSCRIPT>\n";
       } else {  
-         echo "<input type=submit name=html_addr_search value=\""._("Addresses")."\">";
+         echo "<input type=submit name=\"html_addr_search\" value=\""._("Addresses")."\">";
       }   
       
       echo "</TD></TR>\n";
       echo "   <TR>\n";
       echo "      <TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
       echo _("Subject:");
-      echo "      </TD><TD WIDTH=% BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
+      echo "      </TD><TD BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
       if ($reply_subj) {
          $reply_subj = str_replace("\"", "'", $reply_subj);
          $reply_subj = stripslashes($reply_subj);
       echo "   <tr>\n";
       echo "     <TD WIDTH=50 BGCOLOR=\"$color[0]\" VALIGN=TOP ALIGN=RIGHT>\n";
       echo "      <SMALL><BR></SMALL>"._("Attach:");
-      echo "      </td><td width=% colspan=2 ALIGN=left BGCOLOR=\"$color[0]\">\n";
+      echo "      </td><td colspan=2 ALIGN=left BGCOLOR=\"$color[0]\">\n";
       //      echo "      <INPUT TYPE=\"hidden\" name=\"MAX_FILE_SIZE\"\n";
       //      echo "      value=\"10000\">\n";
       echo "      <INPUT NAME=\"attachfile\" TYPE=\"file\">\n";
       echo "      &nbsp;&nbsp;<input type=\"submit\" name=\"attach\"\n";
       echo "      value=\"" . _("Add") ."\">\n";
       echo "     </td>\n";
-      echo "     </font>\n";
       echo "   </tr>\n";
       if (isset($attachments) && count($attachments)>0) {
          echo "</tr><tr><td width=50 bgcolor=\"$color[0]\" align=right>\n";
          echo "&nbsp;";
-         echo "</td><td width=% align=left colspan=2 bgcolor=\"$color[0]\">";
+         echo "</td><td align=left colspan=2 bgcolor=\"$color[0]\">";
          while (list($localname, $remotename) = each($attachments)) {
             echo "<input type=\"checkbox\" name=\"delete[]\" value=\"$localname\">\n";
             echo "$remotename <input type=\"hidden\" name=\"attachments[$localname]\" value=\"$remotename\"><br>\n";