From a74103ddb7785467df4aff77fbb9a59a8b294bb8 Mon Sep 17 00:00:00 2001
From: kink <kink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Wed, 6 Apr 2005 21:30:36 +0000
Subject: [PATCH] some html-fixes

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@9218 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 functions/folder_manip.php                         | 4 ++--
 plugins/listcommands/functions.php                 | 4 ++--
 plugins/message_details/message_details_bottom.php | 2 +-
 plugins/message_details/message_details_main.php   | 9 ++++++---
 plugins/message_details/message_details_top.php    | 9 ++++-----
 src/help.php                                       | 8 ++++----
 src/printer_friendly_top.php                       | 6 ++----
 src/signout.php                                    | 8 ++++----
 src/view_header.php                                | 8 ++++----
 9 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/functions/folder_manip.php b/functions/folder_manip.php
index 68ffbbd3..4b4708fd 100644
--- a/functions/folder_manip.php
+++ b/functions/folder_manip.php
@@ -132,7 +132,7 @@ function folders_rename_getname ($imapConnection, $delimiter, $old) {
              '<input type="submit" value="'._("Rename")."\" />\n".
              '<input type="submit" name="cancelbutton" value="'._("Cancel")."\" />\n".
              '</form><br /></td></tr></table>';
-    echo "\n\n</body></html>";
+    echo "\n</td></tr></table>\n</td></tr></table>\n\n</body></html>";
     
     sqimap_logout($imapConnection);    
     exit;
@@ -212,7 +212,7 @@ function folders_delete_ask ($imapConnection, $folder_name)
         addSubmit(_("No"), 'cancelbutton').
         '</p></form><br /></td></tr></table>';
 
-    echo "\n\n</body></html>";
+    echo "\n</td></tr></table>\n</td></tr></table>\n\n</body></html>";
 
     sqimap_logout($imapConnection);    
     exit;
diff --git a/plugins/listcommands/functions.php b/plugins/listcommands/functions.php
index 7028ed2f..31906a2f 100644
--- a/plugins/listcommands/functions.php
+++ b/plugins/listcommands/functions.php
@@ -45,7 +45,7 @@ function plugin_listcommands_menu_do() {
             } else {
                 $url = "plugins/listcommands/mailout.php?action=$cmd&amp;";
             }
-            $url .= 'send_to=' . strtr($act,'?','&');
+            $url .= 'send_to=' . str_replace('?','&amp;', $act);
 
             $output[] = makeComposeLink($url, $fieldsdescr[$cmd]);
 
@@ -89,4 +89,4 @@ function listcommands_fieldsdescr() {
             'help'        => _("Help"));
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/plugins/message_details/message_details_bottom.php b/plugins/message_details/message_details_bottom.php
index 6eb88203..e2e93551 100644
--- a/plugins/message_details/message_details_bottom.php
+++ b/plugins/message_details/message_details_bottom.php
@@ -315,7 +315,7 @@ for ($i=1; $i < $count; $i++) {
 //$returnValue .= returnTime($start).'<br />';
 $xtra = <<<ECHO
 
-<style>
+<style type="text/css">
 
 <!--
 .ent_body {
diff --git a/plugins/message_details/message_details_main.php b/plugins/message_details/message_details_main.php
index 09d873e4..ca53778f 100644
--- a/plugins/message_details/message_details_main.php
+++ b/plugins/message_details/message_details_main.php
@@ -27,8 +27,11 @@ displayHtmlHeader( _("Message Details"), '', FALSE );
 sqgetGlobalVar('mailbox', $mailbox, SQ_GET);
 sqgetGlobalVar('passed_id', $passed_id, SQ_GET);
 
-echo "<frameset rows=\"60, *\" noresize border=\"0\">\n";
-echo '<frame src="message_details_top.php?mailbox=' . urlencode($mailbox) .'&amp;passed_id=' . "$passed_id". '" name="top_frame" scrolling="off" />';
-echo '<frame src="message_details_bottom.php?mailbox=' . urlencode($mailbox) .'&amp;get_message_details=yes&amp;passed_id=' . "$passed_id" . '" name="bottom_frame" />';
+echo "<frameset rows=\"60, *\" >\n";
+echo '<frame src="message_details_top.php?mailbox=' . urlencode($mailbox) .'&amp;passed_id=' . "$passed_id".
+    '" name="top_frame" scrolling="no" noresize="noresize" frameborder="0" />';
+echo '<frame src="message_details_bottom.php?mailbox=' . urlencode($mailbox) .
+    '&amp;get_message_details=yes&amp;passed_id=' . "$passed_id" .
+    '" name="bottom_frame" frameborder="0" />';
 echo  '</frameset>'."\n"."</html>\n";
 ?>
diff --git a/plugins/message_details/message_details_top.php b/plugins/message_details/message_details_top.php
index 1d2254ed..0baae888 100644
--- a/plugins/message_details/message_details_top.php
+++ b/plugins/message_details/message_details_top.php
@@ -21,7 +21,7 @@ require_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/forms.php');
 
 displayHtmlHeader( _("Message Details"),
-             "<script language=\"javascript\">\n".
+             "<script language=\"javascript\" type=\"text/javascript\">\n".
              "<!--\n".
              "function printPopup() {\n".
                 "parent.frames[1].focus();\n".
@@ -34,7 +34,7 @@ sqgetGlobalVar('passed_id', $passed_id, SQ_GET);
 sqgetGlobalVar('mailbox', $mailbox, SQ_GET);
 
 echo "<body text=\"$color[8]\" bgcolor=\"$color[3]\" link=\"$color[7]\" vlink=\"$color[7]\" alink=\"$color[7]\">\n" .
-     '<center><b>' .
+     '<center>' .
      addForm(SM_PATH . 'src/download.php', 'GET').
      addHidden('mailbox', $mailbox).
      addHidden('passed_id', $passed_id).
@@ -43,8 +43,7 @@ echo "<body text=\"$color[8]\" bgcolor=\"$color[3]\" link=\"$color[7]\" vlink=\"
      '<input type="button" value="' . _("Print") . '" onclick="printPopup()" />&nbsp;&nbsp;'.
      '<input type="button" value="' . _("Close Window") . '" onclick="window.parent.close()" />&nbsp;&nbsp;'.
      addSubmit(_("Save Message")).
-     '</form>'.
-     '</b>'.
+     '</form></center>'.
      '</body>'.
      "</html>\n";
-?>
\ No newline at end of file
+?>
diff --git a/src/help.php b/src/help.php
index ca7987eb..beefed12 100644
--- a/src/help.php
+++ b/src/help.php
@@ -154,7 +154,7 @@ if ( $chapter == 0 || !isset( $helpdir[$chapter-1] ) ) {
     echo html_tag( 'table', '', 'center', '', 'cellpadding="0" cellspacing="0" border="0"' ) .
          html_tag( 'tr' ) .
          html_tag( 'td' ) .
-         '<b><center>' . _("Table of Contents") . '</center></b><br />';
+         '<center><b>' . _("Table of Contents") . '</b></center><br />';
     echo html_tag( 'ol' );
     for ($i=0, $cnt = count($helpdir); $i < $cnt; $i++) {
         $doc = file("../help/$user_language/$helpdir[$i]");
@@ -168,7 +168,7 @@ if ( $chapter == 0 || !isset( $helpdir[$chapter-1] ) ) {
 } else {
     $doc = file("../help/$user_language/" . $helpdir[$chapter-1]);
     $help_info = get_info($doc, 0);
-    echo '<small><center>';
+    echo '<center><small>';
     if ($chapter <= 1){
         echo '<font color="' . $color[9] . '">' . _("Previous")
              . '</font> | ';
@@ -183,7 +183,7 @@ if ( $chapter == 0 || !isset( $helpdir[$chapter-1] ) ) {
         echo ' | <a href="../src/help.php?chapter=' . ($chapter+1)
              . '">' . _("Next") . '</a>';
     }
-    echo '</center></small><br />';
+    echo '</small></center><br />';
 
     echo '<font size="5"><b>' . $chapter . ' - ' . $help_info[0]
          . '</b></font><br /><br />';
@@ -212,4 +212,4 @@ echo html_tag( 'tr',
             html_tag( 'td', '&nbsp;', 'left', $color[0] )
         );
 ?>
-</table></body></html>
\ No newline at end of file
+</table></body></html>
diff --git a/src/printer_friendly_top.php b/src/printer_friendly_top.php
index cb8dbe0e..1a9b2072 100644
--- a/src/printer_friendly_top.php
+++ b/src/printer_friendly_top.php
@@ -34,12 +34,10 @@ displayHtmlHeader( _("Printer Friendly"),
 
 echo '<body text="'.$color[8].'" bgcolor="'.$color[3].'" link="'.$color[7].'" vlink="'.$color[7].'" alink="'.$color[7]."\">\n" .
      html_tag( 'div',
-         '<b>'.
          '<form>'.
          '<input type="button" value="' . _("Print") . '" onclick="printPopup()" /> '.
          '<input type="button" value="' . _("Close") . '" onclick="window.parent.close()" />'.
-         '</form>'.
-         '</b>',
+         '</form>',
      'right' );
 ?>
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/src/signout.php b/src/signout.php
index 34bd00a6..3f2a13f5 100644
--- a/src/signout.php
+++ b/src/signout.php
@@ -83,18 +83,18 @@ echo
 html_tag( 'table',
     html_tag( 'tr',
          html_tag( 'th', _("Sign Out"), 'center' ) ,
-    '', $color[0], 'width="100%"' ) .
+    '', $color[0] ) .
     $plugin_message .
     html_tag( 'tr',
          html_tag( 'td', _("You have been successfully signed out.") .
              '<br /><a href="login.php" target="' . $frame_top . '">' .
              _("Click here to log back in.") . '</a><br />' ,
          'center' ) ,
-    '', $color[4], 'width="100%"' ) .
+    '', $color[4] ) .
     html_tag( 'tr',
          html_tag( 'td', '<br />', 'center' ) ,
-    '', $color[0], 'width="100%"' ) ,
-'center', $color[4], 'width="50%" cols="1" cellpadding="2" cellspacing="0" border="0"' )
+    '', $color[0] ) ,
+'center', $color[4], 'width="50%" cellpadding="2" cellspacing="0" border="0"' )
 ?>
 </body>
 </html>
diff --git a/src/view_header.php b/src/view_header.php
index 7df97dc5..ed3e7a90 100644
--- a/src/view_header.php
+++ b/src/view_header.php
@@ -93,15 +93,15 @@ function view_header($header, $mailbox, $color) {
          _("Viewing Full Header") . '</b> - '.
          '<a href="';
     echo_template_var($ret_addr);
-    echo '">' ._("View message") . "</a></b></td></tr></table>\n";
+    echo '">' ._("View message") . "</a></td></tr></table>\n";
 
     echo_template_var($header,
         array(
             '<table width="99%" cellpadding="2" cellspacing="0" border="0" '.
                 "align=center>\n".'<tr><td>',
-            '<nobr><tt><b>',
+            '<tt style="white-space: nowrap;"><b>',
             '</b>',
-            '</tt></nobr>',
+            '</tt>',
             '</td></tr></table>'."\n"
          )
     );
@@ -130,4 +130,4 @@ $mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, t
 $header = parse_viewheader($imapConnection,$passed_id, $passed_ent_id);
 view_header($header, $mailbox, $color);
 
-?>
\ No newline at end of file
+?>
-- 
2.25.1