We use cookies to ensure you get the best experience on our website
首頁 探索 說明
註冊 登入
0ct0pu5
/
squirrelmail
1
0
複刻 0
檔案 問題管理 0 合併請求 0 Wiki
瀏覽代碼

XHTML fixes

Fredrik Jervfors 21 年之前
父節點
1a308fafc6
當前提交
656ef3c870
共有 15 個文件被更改，包括 184 次插入 和 189 次删除
統一視圖 顯示文件統計
  1. 1 1
      functions/forms.php
  2. 1 1
      src/addrbook_popup.php
  3. 26 28
      src/addrbook_search.php
  4. 43 43
      src/addrbook_search_html.php
  5. 20 20
      src/addressbook.php
  6. 45 45
      src/compose.php
  7. 1 1
      src/folders.php
  8. 2 2
      src/folders_create.php
  9. 7 7
      src/help.php
  10. 9 10
      src/left_main.php
  11. 10 12
      src/options.php
  12. 10 10
      src/options_highlight.php
  13. 6 6
      src/options_identities.php
  14. 2 2
      src/options_order.php
  15. 1 1
      src/read_body.php

+ 1 - 1
functions/forms.php
查看文件 

@@ -128,7 +128,7 @@ function addTextArea($name, $text = '', $cols = 40, $rows = 10, $attr = '') {
 
 /**
 
 /**
 
  * Make a <form> start-tag.
 
  * Make a <form> start-tag.
 
  */
 
  */
 
-function addForm($action, $method = 'POST', $name = '', $enctype = '', $charset = '')
 
+function addForm($action, $method = 'post', $name = '', $enctype = '', $charset = '')
 
 {
 
 {
 
     if($name) {
 
     if($name) {
 
         $name = ' name="'.$name.'"';
 
         $name = ' name="'.$name.'"';

+ 1 - 1
src/addrbook_popup.php
查看文件 

@@ -29,7 +29,7 @@ require_once(SM_PATH . 'functions/addressbook.php');
 
     <head>
 
     <head>
 
         <title><?php echo "$org_title: " . _("Address Book"); ?></title>
 
         <title><?php echo "$org_title: " . _("Address Book"); ?></title>
 
     </head>
 
     </head>
 
-    <frameset rows="60,*" border=0>
 
+    <frameset rows="60,*" border="0">
 
         <frame name="abookmain"
 
         <frame name="abookmain"
 
                marginwidth="0"
 
                marginwidth="0"
 
                scrolling="no"
 
                scrolling="no"

+ 26 - 28
src/addrbook_search.php
查看文件 

@@ -145,16 +145,16 @@ function display_result($res, $includesource = true) {
 
         echo html_tag( 'tr', '', '', $tr_bgcolor, 'nowrap' ) .
 
         echo html_tag( 'tr', '', '', $tr_bgcolor, 'nowrap' ) .
 
         html_tag( 'td',
 
         html_tag( 'td',
 
              '<small><a href="javascript:to_address(' . 
              '<small><a href="javascript:to_address(' . 
-                                       "'" . $email . "');\">To</A> | " .
 
+                                       "'" . $email . "');\">To</a> | " .
 
              '<a href="javascript:cc_address(' . 
              '<a href="javascript:cc_address(' . 
-                                       "'" . $email . "');\">Cc</A> | " .
 
+                                       "'" . $email . "');\">Cc</a> | " .
 
              '<a href="javascript:bcc_address(' . 
              '<a href="javascript:bcc_address(' . 
-                                 "'" . $email . "');\">Bcc</A></small>",
 
+                                 "'" . $email . "');\">Bcc</a></small>",
 
         'center', '', 'valign="top" width="5%" nowrap' ) .
 
         'center', '', 'valign="top" width="5%" nowrap' ) .
 
         html_tag( 'td', '&nbsp;' . htmlspecialchars($row['name']), 'left', '', 'valign="top" nowrap' ) .
 
         html_tag( 'td', '&nbsp;' . htmlspecialchars($row['name']), 'left', '', 'valign="top" nowrap' ) .
 
         html_tag( 'td', '&nbsp;' .
 
         html_tag( 'td', '&nbsp;' .
 
              '<a href="javascript:to_and_close(' .
 
              '<a href="javascript:to_and_close(' .
 
-                 "'" . $email . "');\">" . htmlspecialchars($row['email']) . '</A>'
 
+                 "'" . $email . "');\">" . htmlspecialchars($row['email']) . '</a>'
 
         , 'left', '', 'valign="top"' ) .
 
         , 'left', '', 'valign="top"' ) .
 
         html_tag( 'td', htmlspecialchars($row['label']), 'left', '', 'valign="top" nowrap' );
 
         html_tag( 'td', htmlspecialchars($row['label']), 'left', '', 'valign="top" nowrap' );
 
         if ($includesource) {
 
         if ($includesource) {
 
@@ -181,22 +181,22 @@ if (!isset($backend)) { $backend = ''; }
 
 
 
 /* Choose correct colors for top and bottom frame */
 
 /* Choose correct colors for top and bottom frame */
 
 if ($show == 'form' && !isset($listall)) {
 
 if ($show == 'form' && !isset($listall)) {
 
-    echo '<BODY TEXT="' . $color[6] . '" BGCOLOR="' . $color[3] . '" ' .
 
-               'LINK="' . $color[6] . '" VLINK="'   . $color[6] . '" ' .
 
-                                        'ALINK="'   . $color[6] . '" ' .
 
+    echo '<body text="' . $color[6] . '" bgcolor="' . $color[3] . '" ' .
 
+               'link="' . $color[6] . '" vlink="'   . $color[6] . '" ' .
 
+                                        'alink="'   . $color[6] . '" ' .
 
          'OnLoad="document.sform.query.focus();">';
 
          'OnLoad="document.sform.query.focus();">';
 
 } else {
 
 } else {
 
-    echo '<BODY TEXT="' . $color[8] . '" BGCOLOR="' . $color[4] . '" ' .
 
-               'LINK="' . $color[7] . '" VLINK="'   . $color[7] . '" ' .
 
-                                        'ALINK="'   . $color[7] . "\">\n";
 
+    echo '<body text="' . $color[8] . '" bgcolor="' . $color[4] . '" ' .
 
+               'link="' . $color[7] . '" vlink="'   . $color[7] . '" ' .
 
+                                        'alink="'   . $color[7] . "\">\n";
 
 }
 
 }
 
 
 
 /* Empty search */
 
 /* Empty search */
 
 if (empty($query) && empty($show) && empty($listall)) {
 
 if (empty($query) && empty($show) && empty($listall)) {
 
-    echo html_tag( 'p', '<br>' .
 
+    echo html_tag( 'p', '<br />' .
 
                       _("No persons matching your search were found"),
 
                       _("No persons matching your search were found"),
 
             'center' ) .
 
             'center' ) .
 
-          "\n</BODY></HTML>\n",
 
+          "\n</body></html>\n",
 
     exit;
 
     exit;
 
 }
 
 }
 
 
 
@@ -205,8 +205,8 @@ $abook = addressbook_init();
 
 
 
 /* Create search form */
 
 /* Create search form */
 
 if ($show == 'form' && empty($listall)) {
 
 if ($show == 'form' && empty($listall)) {
 
-    echo '<FORM NAME=sform TARGET=abookres ACTION="addrbook_search.php'. 
-         '" METHOD="POST">' . "\n" .
 
+    echo '<form name="sform" target="abookres" action="addrbook_search.php'. 
+         '" method="post">' . "\n" .
 
          html_tag( 'table', '', '', '', 'border="0" width="100%" height="100%"' ) .
 
          html_tag( 'table', '', '', '', 'border="0" width="100%" height="100%"' ) .
 
          html_tag( 'tr' ) .
 
          html_tag( 'tr' ) .
 
          html_tag( 'td', '  <strong>' . _("Search for") . "</strong>\n", 'left', '', 'nowrap valign="middle" width="10%"' ) .
 
          html_tag( 'td', '  <strong>' . _("Search for") . "</strong>\n", 'left', '', 'nowrap valign="middle" width="10%"' ) .
 
@@ -215,7 +215,7 @@ if ($show == 'form' && empty($listall)) {
 
 
 
     /* List all backends to allow the user to choose where to search */
 
     /* List all backends to allow the user to choose where to search */
 
     if ($abook->numbackends > 1) {
 
     if ($abook->numbackends > 1) {
 
-        echo '<STRONG>' . _("in") . '</STRONG>&nbsp;'."\n".
 
+        echo '<strong>' . _("in") . '</strong>&nbsp;'."\n".
 
 	$selopts['-1'] = _("All address books");
 
 	$selopts['-1'] = _("All address books");
 
 	
 	
         $ret = $abook->get_backend_list();
 
         $ret = $abook->get_backend_list();
 
@@ -231,11 +231,11 @@ if ($show == 'form' && empty($listall)) {
 
     html_tag( 'tr',
 
     html_tag( 'tr',
 
                     html_tag( 'td', '', 'left' ) .
 
                     html_tag( 'td', '', 'left' ) .
 
                     html_tag( 'td',
 
                     html_tag( 'td',
 
-                            '<INPUT TYPE=submit VALUE="' . _("Search") . '" NAME=show>' .
 
-                            '&nbsp;|&nbsp;<INPUT TYPE=submit VALUE="' . _("List all") .
 
-                            '" NAME=listall>' . "\n" .
 
-                            '&nbsp;|&nbsp;<INPUT TYPE=button VALUE="' . _("Close") .
 
-                            '" onclick="parent.close();">' . "\n" ,
 
+                            '<input type="submit" value="' . _("Search") . '" name="show" />' .
 
+                            '&nbsp;|&nbsp;<input type="submit" value="' . _("List all") .
 
+                            '" name="listall" />' . "\n" .
 
+                            '&nbsp;|&nbsp;<input type="button" value="' . _("Close") .
 
+                            '" onclick="parent.close();" />' . "\n" ,
 
                     'left' )
 
                     'left' )
 
             ) .
 
             ) .
 
          '</table></form>' . "\n";
 
          '</table></form>' . "\n";
 
@@ -280,19 +280,19 @@ if ($show == 'form' && empty($listall)) {
 
             }
 
             }
 
         
         
             if (!is_array($res)) {
 
             if (!is_array($res)) {
 
-                echo html_tag( 'p', '<b><br>' .
 
+                echo html_tag( 'p', '<b><br />' .
 
                                  _("Your search failed with the following error(s)") .
 
                                  _("Your search failed with the following error(s)") .
 
-                                 ':<br>' . $abook->error . "</b>\n" ,
 
+                                 ':<br />' . $abook->error . "</b>\n" ,
 
                        'center' ) .
 
                        'center' ) .
 
-                "\n</BODY></HTML>\n";
 
+                "\n</body></html>\n";
 
                 exit;
 
                 exit;
 
             }
 
             }
 
         
         
             if (sizeof($res) == 0) {
 
             if (sizeof($res) == 0) {
 
-                echo html_tag( 'p', '<br><b>' .
 
+                echo html_tag( 'p', '<br /><b>' .
 
                                  _("No persons matching your search were found") . "</b>\n" ,
 
                                  _("No persons matching your search were found") . "</b>\n" ,
 
                        'center' ) .
 
                        'center' ) .
 
-                "\n</BODY></HTML>\n";
 
+                "\n</body></html>\n";
 
                 exit;
 
                 exit;
 
             }
 
             }
 
         
         
@@ -301,7 +301,5 @@ if ($show == 'form' && empty($listall)) {
 
     }
 
     }
 
    
    
 }
 
 }
 
-
 
-echo "</BODY></HTML>\n";
 
-   
 ?>
 
 ?>
 
+</BODY></HTML>

+ 43 - 43
src/addrbook_search_html.php
查看文件 

@@ -19,7 +19,7 @@
 
  * @ignore
 
  * @ignore
 
  */
 
  */
 
 if (! defined('SM_PATH') ) {
 
 if (! defined('SM_PATH') ) {
 
-	define('SM_PATH','../');
 
+    define('SM_PATH','../');
 
 }
 
 }
 
 
 
 /** SquirrelMail required files. */
 
 /** SquirrelMail required files. */
 
@@ -53,12 +53,12 @@ function addr_insert_hidden() {
 
 
 
    echo addHidden('session', $session).
 
    echo addHidden('session', $session).
 
         addHidden('subject', $subject).
 
         addHidden('subject', $subject).
 
-	addHidden('send_to', $send_to).
 
-	addHidden('send_to_bcc', $send_to_bcc).
 
-	addHidden('send_to_cc', $send_to_cc).
 
-	addHidden('identity', $identity).
 
-	addHidden('mailbox', $mailbox).
 
-	addHidden('from_htmladdr_search', 'true');
 
+        addHidden('send_to', $send_to).
 
+        addHidden('send_to_bcc', $send_to_bcc).
 
+        addHidden('send_to_cc', $send_to_cc).
 
+        addHidden('identity', $identity).
 
+        addHidden('mailbox', $mailbox).
 
+        addHidden('from_htmladdr_search', 'true');
 
 }
 
 }
 
 
 
 
 
@@ -121,12 +121,12 @@ if ($javascript_on) {
 
             {
 
             {
 
         echo html_tag( 'tr', '', '', $tr_bgcolor, 'nowrap' ) .
 
         echo html_tag( 'tr', '', '', $tr_bgcolor, 'nowrap' ) .
 
         html_tag( 'td',
 
         html_tag( 'td',
 
-             '<input type=checkbox name="send_to_search[T' . $line . ']" value = "' .
 
-             htmlspecialchars($email) . '">&nbsp;' . _("To") . '&nbsp;' .
 
-             '<input type=checkbox name="send_to_search[C' . $line . ']" value = "' .
 
-             htmlspecialchars($email) . '">&nbsp;' . _("Cc") . '&nbsp;' .
 
-             '<input type=checkbox name="send_to_search[B' . $line . ']" value = "' .
 
-             htmlspecialchars($email) . '">&nbsp;' . _("Bcc") . '&nbsp;' ,
 
+             '<input type="checkbox" name="send_to_search[T' . $line . ']" value = "' .
 
+             htmlspecialchars($email) . '" />&nbsp;' . _("To") . '&nbsp;' .
 
+             '<input type="checkbox" name="send_to_search[C' . $line . ']" value = "' .
 
+             htmlspecialchars($email) . '" />&nbsp;' . _("Cc") . '&nbsp;' .
 
+             '<input type="checkbox" name="send_to_search[B' . $line . ']" value = "' .
 
+             htmlspecialchars($email) . '" />&nbsp;' . _("Bcc") . '&nbsp;' ,
 
         'center', '', 'width="5%" nowrap' ) .
 
         'center', '', 'width="5%" nowrap' ) .
 
         html_tag( 'td', '&nbsp;' . htmlspecialchars($row['lastname']) . ' ' . htmlspecialchars($row['firstname']) . '&nbsp;', 'left', '', 'nowrap' ) .
 
         html_tag( 'td', '&nbsp;' . htmlspecialchars($row['lastname']) . ' ' . htmlspecialchars($row['firstname']) . '&nbsp;', 'left', '', 'nowrap' ) .
 
         html_tag( 'td', '&nbsp;' . htmlspecialchars($row['email']) . '&nbsp;', 'left', '', 'nowrap' ) .
 
         html_tag( 'td', '&nbsp;' . htmlspecialchars($row['email']) . '&nbsp;', 'left', '', 'nowrap' ) .
 
@@ -134,12 +134,12 @@ if ($javascript_on) {
 
             } else {
 
             } else {
 
         echo html_tag( 'tr', '', '', $tr_bgcolor, 'nowrap' ) .
 
         echo html_tag( 'tr', '', '', $tr_bgcolor, 'nowrap' ) .
 
         html_tag( 'td',
 
         html_tag( 'td',
 
-	    addCheckBox('send_to_search[T'.$line.']', FALSE, $email).
 
+            addCheckBox('send_to_search[T'.$line.']', FALSE, $email).
 
             '&nbsp;' . _("To") . '&nbsp;' .
 
             '&nbsp;' . _("To") . '&nbsp;' .
 
-	    addCheckBox('send_to_search[C'.$line.']', FALSE, $email).
 
-	    '&nbsp;' . _("Cc") . '&nbsp;' .
 
-	    addCheckBox('send_to_search[B'.$line.']', FALSE, $email).
 
-	    '&nbsp;' . _("Bcc") . '&nbsp;' ,
 
+            addCheckBox('send_to_search[C'.$line.']', FALSE, $email).
 
+            '&nbsp;' . _("Cc") . '&nbsp;' .
 
+            addCheckBox('send_to_search[B'.$line.']', FALSE, $email).
 
+            '&nbsp;' . _("Bcc") . '&nbsp;' ,
 
         'center', '', 'width="5%" nowrap' ) .
 
         'center', '', 'width="5%" nowrap' ) .
 
         html_tag( 'td', '&nbsp;' . htmlspecialchars($row['name']) . '&nbsp;', 'left', '', 'nowrap' ) .
 
         html_tag( 'td', '&nbsp;' . htmlspecialchars($row['name']) . '&nbsp;', 'left', '', 'nowrap' ) .
 
         html_tag( 'td', '&nbsp;' . htmlspecialchars($row['email']) . '&nbsp;', 'left', '', 'nowrap' ) .
 
         html_tag( 'td', '&nbsp;' . htmlspecialchars($row['email']) . '&nbsp;', 'left', '', 'nowrap' ) .
 
@@ -155,13 +155,13 @@ if ($javascript_on) {
 
     if ($includesource) { $td_colspan = '5'; } else { $td_colspan = '4'; }
 
     if ($includesource) { $td_colspan = '5'; } else { $td_colspan = '4'; }
 
     echo html_tag( 'tr',
 
     echo html_tag( 'tr',
 
                 html_tag( 'td',
 
                 html_tag( 'td',
 
-                        '<INPUT TYPE=submit NAME="addr_search_done" VALUE="' .
 
-                        _("Use Addresses") . '">' ,
 
+                        '<input type="submit" name="addr_search_done" value="' .
 
+                        _("Use Addresses") . '" />' ,
 
                 'center', '', 'colspan="'. $td_colspan .'"' )
 
                 'center', '', 'colspan="'. $td_colspan .'"' )
 
             ) .
 
             ) .
 
-         '</TABLE>' .
 
-	 addHidden('html_addr_search_done', '1').
 
-         '</FORM>';
 
+         '</table>' .
 
+         addHidden('html_addr_search_done', '1').
 
+         '</form>';
 
 }
 
 }
 
 
 
 /* --- End functions --- */
 
 /* --- End functions --- */
 
@@ -176,7 +176,7 @@ else {
 
 $abook = addressbook_init();
 
 $abook = addressbook_init();
 
 
 
 
 
-echo '<br>' .
 
+echo '<br />' .
 
 html_tag( 'table',
 
 html_tag( 'table',
 
     html_tag( 'tr',
 
     html_tag( 'tr',
 
         html_tag( 'td', '<b>' . _("Address Book Search") . '</b>', 'center', $color[0] )
 
         html_tag( 'td', '<b>' . _("Address Book Search") . '</b>', 'center', $color[0] )
 
@@ -189,9 +189,9 @@ echo '<center>' .
 
     html_tag( 'table', '', 'center', '', 'border="0"' ) .
 
     html_tag( 'table', '', 'center', '', 'border="0"' ) .
 
     html_tag( 'tr' ) .
 
     html_tag( 'tr' ) .
 
     html_tag( 'td', '', 'left', '', 'nowrap valign="middle"' ) . "\n" .
 
     html_tag( 'td', '', 'left', '', 'nowrap valign="middle"' ) . "\n" .
 
-    addForm($PHP_SELF.'?html_addr_search=true', 'POST', 'f').
 
-    "\n<CENTER>\n" .
 
-    '  <nobr><STRONG>' . _("Search for") . "</STRONG>\n";
 
+    addForm($PHP_SELF.'?html_addr_search=true', 'post', 'f').
 
+    "\n<center>\n" .
 
+    '  <nobr><strong>' . _("Search for") . "</strong>\n";
 
 addr_insert_hidden();
 
 addr_insert_hidden();
 
 if (! isset($addrquery))
 
 if (! isset($addrquery))
 
     $addrquery = '';
 
     $addrquery = '';
 
@@ -200,13 +200,13 @@ echo addInput('addrquery', $addrquery, 26);
 
 /* List all backends to allow the user to choose where to search */
 
 /* List all backends to allow the user to choose where to search */
 
 if (!isset($backend)) { $backend = ''; }
 
 if (!isset($backend)) { $backend = ''; }
 
 if ($abook->numbackends > 1) {
 
 if ($abook->numbackends > 1) {
 
-    echo '<STRONG>' . _("in") . '</STRONG>&nbsp;';
 
+    echo '<strong>' . _("in") . '</strong>&nbsp;';
 
     
     
     $selopts['-1'] = _("All address books"); 
     $selopts['-1'] = _("All address books"); 
     $ret = $abook->get_backend_list();
 
     $ret = $abook->get_backend_list();
 
     
     
     while (list($undef,$v) = each($ret)) {
 
     while (list($undef,$v) = each($ret)) {
 
-    	$selopts[$v->bnum] = $v->sname;
 
+        $selopts[$v->bnum] = $v->sname;
 
     }
 
     }
 
     echo addSelect('backend', $selopts, $backend, TRUE);
 
     echo addSelect('backend', $selopts, $backend, TRUE);
 
 } else {
 
 } else {
 
@@ -216,10 +216,10 @@ if (isset($session)) {
 
     echo addHidden('session', $session);
 
     echo addHidden('session', $session);
 
 }
 
 }
 
 
 
-echo '<INPUT TYPE=submit VALUE="' . _("Search") . '">' .
 
-     '&nbsp;|&nbsp;<INPUT TYPE=submit VALUE="' . _("List all") .
 
-     '" NAME=listall>' . "\n" .
 
-     '</FORM></center></TD></TR></TABLE>' . "\n";
 
+echo '<input type="submit" value="' . _("Search") . '" />' .
 
+     '&nbsp;|&nbsp;<input type="submit" value="' . _("List all") .
 
+     '" name="listall" />' . "\n" .
 
+     '</form></center></td></tr></table>' . "\n";
 
 addr_insert_hidden();
 
 addr_insert_hidden();
 
 echo '</center>';
 
 echo '</center>';
 
 do_hook('addrbook_html_search_below');
 
 do_hook('addrbook_html_search_below');
 
@@ -238,7 +238,7 @@ if ($addrquery == '' && empty($listall)) {
 
             $backend = $abook->localbackend;
 
             $backend = $abook->localbackend;
 
         }
 
         }
 
 
 
-        /* echo '<H3 ALIGN=center>' . $abook->backends[$backend]->sname) . "</H3>\n"; */
 
+        /* echo '<h3 align="center">' . $abook->backends[$backend]->sname) . "</h3>\n"; */
 
 
 
         $res = $abook->list_addr($backend);
 
         $res = $abook->list_addr($backend);
 
 
 
@@ -246,7 +246,7 @@ if ($addrquery == '' && empty($listall)) {
 
             usort($res,'alistcmp');
 
             usort($res,'alistcmp');
 
             addr_display_result($res, false);
 
             addr_display_result($res, false);
 
         } else {
 
         } else {
 
-            echo html_tag( 'p', '<strong><br>' .
 
+            echo html_tag( 'p', '<strong><br />' .
 
                  sprintf(_("Unable to list addresses from %s"), 
                  sprintf(_("Unable to list addresses from %s"), 
                  $abook->backends[$backend]->sname) . "</strong>\n" ,
 
                  $abook->backends[$backend]->sname) . "</strong>\n" ,
 
             'center' );
 
             'center' );
 
@@ -271,17 +271,17 @@ else {
 
         }
 
         }
 
 
 
         if (!is_array($res)) {
 
         if (!is_array($res)) {
 
-            echo html_tag( 'p', '<b><br>' .
 
+            echo html_tag( 'p', '<b><br />' .
 
                              _("Your search failed with the following error(s)") .
 
                              _("Your search failed with the following error(s)") .
 
-                            ':<br>' . $abook->error . "</b>\n" ,
 
+                            ':<br />' . $abook->error . "</b>\n" ,
 
                    'center' ) .
 
                    'center' ) .
 
-            "\n</BODY></HTML>\n";
 
+            "\n</body></html>\n";
 
         } else {
 
         } else {
 
             if (sizeof($res) == 0) {
 
             if (sizeof($res) == 0) {
 
-                echo html_tag( 'p', '<br><b>' .
 
+                echo html_tag( 'p', '<br /><b>' .
 
                                  _("No persons matching your search were found") . "</b>\n" ,
 
                                  _("No persons matching your search were found") . "</b>\n" ,
 
                        'center' ) .
 
                        'center' ) .
 
-                "\n</BODY></HTML>\n";
 
+                "\n</body></html>\n";
 
             } else {
 
             } else {
 
                 addr_display_result($res);
 
                 addr_display_result($res);
 
             }
 
             }
 
@@ -290,11 +290,11 @@ else {
 
 }
 
 }
 
 
 
 if ($addrquery == '' || sizeof($res) == 0) {
 
 if ($addrquery == '' || sizeof($res) == 0) {
 
-    /* printf('<center><FORM METHOD=post NAME=k ACTION="compose.php">'."\n", $PHP_SELF); */
 
+    /* printf('<center><form method="post" name="k" action="compose.php">'."\n", $PHP_SELF); */
 
     echo '<center>'.
 
     echo '<center>'.
 
-    	addForm('compose.php','POST','k');
 
+        addForm('compose.php','POST','k');
 
     addr_insert_hidden();
 
     addr_insert_hidden();
 
-    echo '<INPUT TYPE=submit VALUE="' . _("Return") . '" NAME=return>' . "\n" .
 
+    echo '<input type="submit" value="' . _("Return") . '" name="return" />' . "\n" .
 
          '</form></center></nobr>';
 
          '</form></center></nobr>';
 
 }
 
 }

+ 20 - 20
src/addressbook.php
查看文件 

@@ -79,7 +79,7 @@ function address_form($name, $submittext, $values = array()) {
 
         {
 
         {
 
     echo html_tag( 'table',
 
     echo html_tag( 'table',
 
                        addressbook_inp_field(_("Nickname"),     'nickname', $name, 15, $values,
 
                        addressbook_inp_field(_("Nickname"),     'nickname', $name, 15, $values,
 
-                           ' <SMALL>' . _("Must be unique") . '</SMALL>') .
 
+                           ' <small>' . _("Must be unique") . '</small>') .
 
                        addressbook_inp_field(_("E-mail address"),  'email', $name, 45, $values, '') .
 
                        addressbook_inp_field(_("E-mail address"),  'email', $name, 45, $values, '') .
 
                        addressbook_inp_field(_("Last name"),    'lastname', $name, 45, $values, '') .
 
                        addressbook_inp_field(_("Last name"),    'lastname', $name, 45, $values, '') .
 
                        addressbook_inp_field(_("First name"),  'firstname', $name, 45, $values, '') .
 
                        addressbook_inp_field(_("First name"),  'firstname', $name, 45, $values, '') .
 
@@ -87,15 +87,15 @@ function address_form($name, $submittext, $values = array()) {
 
                    list_writable_backends($name) .
 
                    list_writable_backends($name) .
 
                        html_tag( 'tr',
 
                        html_tag( 'tr',
 
                            html_tag( 'td',
 
                            html_tag( 'td',
 
-                                       '<INPUT TYPE=submit NAME="' . htmlentities($name) . '[SUBMIT]" VALUE="' .
 
-                                       $submittext . '">',
 
+                                       '<input type="submit" name="' . htmlentities($name) . '[SUBMIT]" value="' .
 
+                                       $submittext . '" />',
 
                                    'center', $color[4], 'colspan="2"')
 
                                    'center', $color[4], 'colspan="2"')
 
                        )
 
                        )
 
     , 'center', '', 'border="0" cellpadding="1" width="90%"') ."\n";
 
     , 'center', '', 'border="0" cellpadding="1" width="90%"') ."\n";
 
         } else {
 
         } else {
 
     echo html_tag( 'table',
 
     echo html_tag( 'table',
 
                        addressbook_inp_field(_("Nickname"),     'nickname', $name, 15, $values,
 
                        addressbook_inp_field(_("Nickname"),     'nickname', $name, 15, $values,
 
-                           ' <SMALL>' . _("Must be unique") . '</SMALL>') .
 
+                           ' <small>' . _("Must be unique") . '</small>') .
 
                        addressbook_inp_field(_("E-mail address"),  'email', $name, 45, $values, '') .
 
                        addressbook_inp_field(_("E-mail address"),  'email', $name, 45, $values, '') .
 
                        addressbook_inp_field(_("First name"),  'firstname', $name, 45, $values, '') .
 
                        addressbook_inp_field(_("First name"),  'firstname', $name, 45, $values, '') .
 
                        addressbook_inp_field(_("Last name"),    'lastname', $name, 45, $values, '') .
 
                        addressbook_inp_field(_("Last name"),    'lastname', $name, 45, $values, '') .
 
@@ -103,8 +103,8 @@ function address_form($name, $submittext, $values = array()) {
 
                    list_writable_backends($name) .
 
                    list_writable_backends($name) .
 
                        html_tag( 'tr',
 
                        html_tag( 'tr',
 
                            html_tag( 'td',
 
                            html_tag( 'td',
 
-                                       '<INPUT TYPE=submit NAME="' . htmlentities($name) . '[SUBMIT]" VALUE="' .
 
-                                       $submittext . '">',
 
+                                       '<input type="submit" name="' . htmlentities($name) . '[SUBMIT]" value="' .
 
+                                       $submittext . '" />',
 
                                    'center', $color[4], 'colspan="2"')
 
                                    'center', $color[4], 'colspan="2"')
 
                        )
 
                        )
 
     , 'center', '', 'border="0" cellpadding="1" width="90%"') ."\n";
 
     , 'center', '', 'border="0" cellpadding="1" width="90%"') ."\n";
 
@@ -115,12 +115,12 @@ function list_writable_backends($name) {
 
   global $color, $abook;
 
   global $color, $abook;
 
   if ( $name != 'addaddr' ) { return; }
 
   if ( $name != 'addaddr' ) { return; }
 
   if ( $abook->numbackends > 1 ) {
 
   if ( $abook->numbackends > 1 ) {
 
-    $ret = "<select name=backend>";
 
+    $ret = '<select name="backend">';
 
     $backends = $abook->get_backend_list();
 
     $backends = $abook->get_backend_list();
 
     while (list($undef,$v) = each($backends)) {
 
     while (list($undef,$v) = each($backends)) {
 
       if ($v->writeable) {
 
       if ($v->writeable) {
 
-        $ret .= '<OPTION VALUE=' . $v->bnum;
 
-        $ret .= '>' . $v->sname . "\n";
 
+        $ret .= '<option value="' . $v->bnum;
 
+        $ret .= '">' . $v->sname . "</option>\n";
 
       }
 
       }
 
     }
 
     }
 
     $ret .= "</select>";
 
     $ret .= "</select>";
 
@@ -247,7 +247,7 @@ if(sqgetGlobalVar('REQUEST_METHOD', $req_method, SQ_SERVER) && $req_method == 'P
 
                         $olddata = $abook->lookup($enick, $ebackend);
 
                         $olddata = $abook->lookup($enick, $ebackend);
 
 
 
                         /* Display the "new address" form */
 
                         /* Display the "new address" form */
 
-                        echo '<FORM ACTION="' . $form_url . '" METHOD="POST">' .
 
+                        echo '<form action="' . $form_url . '" method="post">' .
 
                              "\n" .
 
                              "\n" .
 
                              html_tag( 'table',
 
                              html_tag( 'table',
 
                                 html_tag( 'tr',
 
                                 html_tag( 'tr',
 
@@ -260,7 +260,7 @@ if(sqgetGlobalVar('REQUEST_METHOD', $req_method, SQ_SERVER) && $req_method == 'P
 
                         echo addHidden('oldnick', $olddata['nickname']).
 
                         echo addHidden('oldnick', $olddata['nickname']).
 
                              addHidden('backend', $olddata['backend']).
 
                              addHidden('backend', $olddata['backend']).
 
                              addHidden('doedit', '1').
 
                              addHidden('doedit', '1').
 
-                             '</FORM>';
 
+                             '</form>';
 
                     }
 
                     }
 
                 } else {
 
                 } else {
 
 
 
@@ -282,8 +282,8 @@ if(sqgetGlobalVar('REQUEST_METHOD', $req_method, SQ_SERVER) && $req_method == 'P
 
                              'center', '', 'width="100%"' );
 
                              'center', '', 'width="100%"' );
 
 
 
                             /* Display the "new address" form again */
 
                             /* Display the "new address" form again */
 
-                            echo '<FORM ACTION="' . $form_url .
 
-                                 '" METHOD="POST">' . "\n" .
 
+                            echo '<form action="' . $form_url .
 
+                                 '" method="post">' . "\n" .
 
                                  html_tag( 'table',
 
                                  html_tag( 'table',
 
                                      html_tag( 'tr',
 
                                      html_tag( 'tr',
 
                                          html_tag( 'td',
 
                                          html_tag( 'td',
 
@@ -296,7 +296,7 @@ if(sqgetGlobalVar('REQUEST_METHOD', $req_method, SQ_SERVER) && $req_method == 'P
 
                               addHidden('oldnick', $oldnick).
 
                               addHidden('oldnick', $oldnick).
 
                               addHidden('backend', $backend).
 
                               addHidden('backend', $backend).
 
                               addHidden('doedit',  '1').
 
                               addHidden('doedit',  '1').
 
-                                 "\n" . '</FORM>';
 
+                                 "\n" . '</form>';
 
                             $abortform = true;
 
                             $abortform = true;
 
                         }
 
                         }
 
                     } else {
 
                     } else {
 
@@ -312,7 +312,7 @@ if(sqgetGlobalVar('REQUEST_METHOD', $req_method, SQ_SERVER) && $req_method == 'P
 
 
 
     // Some times we end output before forms are printed
 
     // Some times we end output before forms are printed
 
     if($abortform) {
 
     if($abortform) {
 
-       echo "</BODY></HTML>\n";
 
+       echo "</body></html>\n";
 
        exit();
 
        exit();
 
     }
 
     }
 
 }
 
 }
 
@@ -328,7 +328,7 @@ if (!empty($formerror)) {
 
     echo html_tag( 'table',
 
     echo html_tag( 'table',
 
         html_tag( 'tr',
 
         html_tag( 'tr',
 
             html_tag( 'td',
 
             html_tag( 'td',
 
-                   "\n". '<br><strong><font color="' . $color[2] .
 
+                   "\n". '<br /><strong><font color="' . $color[2] .
 
                    '">' . _("ERROR") . ': ' . $formerror . '</font></strong>' ."\n",
 
                    '">' . _("ERROR") . ': ' . $formerror . '</font></strong>' ."\n",
 
             'center' )
 
             'center' )
 
         ),
 
         ),
 
@@ -362,14 +362,14 @@ if ($showaddrlist) {
 
                     echo html_tag( 'table',
 
                     echo html_tag( 'table',
 
                                     html_tag( 'tr',
 
                                     html_tag( 'tr',
 
                                           html_tag( 'td',
 
                                           html_tag( 'td',
 
-                                                     '<input type=submit name=editaddr value="' . 
+                                                     '<input type="submit" name="editaddr" value="' . 
                                                      _("Edit selected") . "\" />\n" .
 
                                                      _("Edit selected") . "\" />\n" .
 
-                                                     '<input type=submit name=deladdr value="' .
 
+                                                     '<input type="submit" name="deladdr" value="' .
 
                                                      _("Delete selected") . "\" />\n",
 
                                                      _("Delete selected") . "\" />\n",
 
                                           'center', '', 'colspan="5"' )
 
                                           'center', '', 'colspan="5"' )
 
                                     ) .
 
                                     ) .
 
                                     html_tag( 'tr',
 
                                     html_tag( 'tr',
 
-                                          html_tag( 'td', '&nbsp;<br>', 'center', '', 'colspan="5"' )
 
+                                          html_tag( 'td', '&nbsp;<br />', 'center', '', 'colspan="5"' )
 
                                     ) ,
 
                                     ) ,
 
                              'center' );
 
                              'center' );
 
                     echo "\n<!-- start of address book table -->\n" .
 
                     echo "\n<!-- start of address book table -->\n" .
 
@@ -440,7 +440,7 @@ if ($showaddrlist) {
 
             if ($abook->backends[$row['backend']]->writeable) {
 
             if ($abook->backends[$row['backend']]->writeable) {
 
                 echo html_tag( 'td',
 
                 echo html_tag( 'td',
 
                 '<small>' .
 
                 '<small>' .
 
-                '<input type=checkbox ' . $selected . ' name="sel[]" value="' .
 
+                '<input type="checkbox" ' . $selected . ' name="sel[]" value="' .
 
                 $row['backend'] . ':' . $row['nickname'] . '" /></small>' ,
 
                 $row['backend'] . ':' . $row['nickname'] . '" /></small>' ,
 
                 'center', '', 'valign="top" width="1%"' );
 
                 'center', '', 'valign="top" width="1%"' );
 
             } else {
 
             } else {

+ 45 - 45
src/compose.php
查看文件 

@@ -929,14 +929,14 @@ function showInputForm ($session, $values=false) {
 
     }
 
     }
 
 
 
     if ($use_javascript_addr_book) {
 
     if ($use_javascript_addr_book) {
 
-        echo "\n". '<SCRIPT LANGUAGE=JavaScript>'."\n<!--\n" .
 
+        echo "\n". '<script language="JavaScript">'."\n<!--\n" .
 
              'function open_abook() { ' . "\n" .
 
              'function open_abook() { ' . "\n" .
 
              '  var nwin = window.open("addrbook_popup.php","abookpopup",' .
 
              '  var nwin = window.open("addrbook_popup.php","abookpopup",' .
 
              '"width=670,height=300,resizable=yes,scrollbars=yes");' . "\n" .
 
              '"width=670,height=300,resizable=yes,scrollbars=yes");' . "\n" .
 
              '  if((!nwin.opener) && (document.windows != null))' . "\n" .
 
              '  if((!nwin.opener) && (document.windows != null))' . "\n" .
 
              '    nwin.opener = document.windows;' . "\n" .
 
              '    nwin.opener = document.windows;' . "\n" .
 
              "}\n" .
 
              "}\n" .
 
-             "// -->\n</SCRIPT>\n\n";
 
+             "// -->\n</script>\n\n";
 
     }
 
     }
 
 
 
     echo "\n" . '<form name="compose" action="compose.php" method="post" ' .
 
     echo "\n" . '<form name="compose" action="compose.php" method="post" ' .
 
@@ -962,15 +962,15 @@ function showInputForm ($session, $values=false) {
 
     }
 
     }
 
 
 
     if ($saved_draft == 'yes') {
 
     if ($saved_draft == 'yes') {
 
-        echo '<BR><CENTER><B>'. _("Draft Saved").'</CENTER></B>';
 
+        echo '<br /><center><b>'. _("Draft Saved").'</center></b>';
 
     }
 
     }
 
     if ($mail_sent == 'yes') {
 
     if ($mail_sent == 'yes') {
 
-        echo '<BR><CENTER><B>'. _("Your Message has been sent.").'</CENTER></B>';
 
+        echo '<br /><center><b>'. _("Your Message has been sent.").'</center></b>';
 
     }
 
     }
 
     echo '<table align="center" cellspacing="0" border="0">' . "\n";
 
     echo '<table align="center" cellspacing="0" border="0">' . "\n";
 
     if ($compose_new_win == '1') {
 
     if ($compose_new_win == '1') {
 
-        echo '<TABLE ALIGN=CENTER BGCOLOR="'.$color[0].'" WIDTH="100%" BORDER=0>'."\n" .
 
-             '   <TR><TD></TD>'. html_tag( 'td', '', 'right' ) . '<INPUT TYPE="BUTTON" NAME="Close" onClick="return self.close()" VALUE='._("Close").'></TD></TR>'."\n";
 
+        echo '<table align="center" bgcolor="'.$color[0].'" width="100%" border="0">'."\n" .
 
+             '   <tr><td></td>'. html_tag( 'td', '', 'right' ) . '<input type="button" name="Close" onClick="return self.close()" value="'._("Close").'" /></td></tr>'."\n";
 
     }
 
     }
 
     if ($location_of_buttons == 'top') {
 
     if ($location_of_buttons == 'top') {
 
         showComposeButtonRow();
 
         showComposeButtonRow();
 
@@ -996,7 +996,7 @@ function showInputForm ($session, $values=false) {
 
 
 
     echo '   <tr>' . "\n" .
 
     echo '   <tr>' . "\n" .
 
                 html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) .
 
                 html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) .
 
-                _("To:") . '</TD>' . "\n" .
 
+                _("To:") . '</td>' . "\n" .
 
                 html_tag( 'td', '', 'left', $color[4], 'width="90%"' ) .
 
                 html_tag( 'td', '', 'left', $color[4], 'width="90%"' ) .
 
                 addInput('send_to', $send_to, 60). '<br />' . "\n" .
 
                 addInput('send_to', $send_to, 60). '<br />' . "\n" .
 
          '      </td>' . "\n" .
 
          '      </td>' . "\n" .
 
@@ -1029,16 +1029,16 @@ function showInputForm ($session, $values=false) {
 
 
 
     /* why this distinction? */
 
     /* why this distinction? */
 
     if ($compose_new_win == '1') {
 
     if ($compose_new_win == '1') {
 
-        echo '   <TR>' . "\n" .
 
-             '      <TD BGCOLOR="' . $color[0] . '" COLSPAN=2 ALIGN=CENTER>' . "\n" .
 
-             '         <TEXTAREA NAME="body" ID="body" ROWS="' . (int)$editor_height .
 
-             '" COLS="' . (int)$editor_size . '" WRAP="VIRTUAL">';
 
+        echo '   <tr>' . "\n" .
 
+             '      <td bgcolor="' . $color[0] . '" colspan="2" align="center">' . "\n" .
 
+             '         <textarea name="body" id="body" rows="' . (int)$editor_height .
 
+             '" cols="' . (int)$editor_size . '" wrap="virtual">';
 
     }
 
     }
 
     else {
 
     else {
 
-        echo '   <TR>' . "\n" .
 
-            '      <TD BGCOLOR="' . $color[4] . '" COLSPAN=2>' . "\n" .
 
-            '         &nbsp;&nbsp;<TEXTAREA NAME="body" ID="body" ROWS="' . (int)$editor_height .
 
-            '" COLS="' . (int)$editor_size . '" WRAP="VIRTUAL">';
 
+        echo '   <tr>' . "\n" .
 
+            '      <td bgcolor="' . $color[4] . '" colspan="2">' . "\n" .
 
+            '         &nbsp;&nbsp;<textarea name="body" id="body" rows="' . (int)$editor_height .
 
+            '" cols="' . (int)$editor_size . '" wrap="virtual">';
 
     }
 
     }
 
 
 
     if ($use_signature == true && $newmail == true && !isset($from_htmladdr_search)) {
 
     if ($use_signature == true && $newmail == true && !isset($from_htmladdr_search)) {
 
@@ -1116,7 +1116,7 @@ function showInputForm ($session, $values=false) {
 
                                  html_tag( 'td', '', 'left', '', 'valign="middle"' ) .
 
                                  html_tag( 'td', '', 'left', '', 'valign="middle"' ) .
 
          '                          <input name="attachfile" size="48" type="file" />' . "\n" .
 
          '                          <input name="attachfile" size="48" type="file" />' . "\n" .
 
          '                          &nbsp;&nbsp;<input type="submit" name="attach"' .
 
          '                          &nbsp;&nbsp;<input type="submit" name="attach"' .
 
-                                    ' value="' . _("Add") .'">' . "\n" .
 
+                                    ' value="' . _("Add") .'" />' . "\n" .
 
                                     $maxsize .
 
                                     $maxsize .
 
          '                       </td>' . "\n" .
 
          '                       </td>' . "\n" .
 
          '                    </tr>' . "\n";
 
          '                    </tr>' . "\n";
 
@@ -1145,22 +1145,22 @@ function showInputForm ($session, $values=false) {
 
           echo '<tr>' . html_tag( 'td', '', 'left', $color[0], 'colspan="2"' ) . $s .'</td></tr>';
 
           echo '<tr>' . html_tag( 'td', '', 'left', $color[0], 'colspan="2"' ) . $s .'</td></tr>';
 
        }
 
        }
 
        echo '<tr><td colspan="2"><input type="submit" name="do_delete" value="' .
 
        echo '<tr><td colspan="2"><input type="submit" name="do_delete" value="' .
 
-            _("Delete selected attachments") . "\">\n" .
 
+            _("Delete selected attachments") . "\" />\n" .
 
             '</td></tr>';
 
             '</td></tr>';
 
     }
 
     }
 
     echo '                  </table>' . "\n" .
 
     echo '                  </table>' . "\n" .
 
          '               </td>' . "\n" .
 
          '               </td>' . "\n" .
 
          '            </tr>' . "\n" .
 
          '            </tr>' . "\n" .
 
-         '         </TABLE>' . "\n" .
 
-         '      </TD>' . "\n" .
 
-         '   </TR>' . "\n";
 
+         '         </table>' . "\n" .
 
+         '      </td>' . "\n" .
 
+         '   </tr>' . "\n";
 
         } // End of file_uploads if-block
 
         } // End of file_uploads if-block
 
     /* End of attachment code */
 
     /* End of attachment code */
 
     if ($compose_new_win == '1') {
 
     if ($compose_new_win == '1') {
 
-        echo '</TABLE>'."\n";
 
+        echo '</table>'."\n";
 
     }
 
     }
 
 
 
-    echo '</TABLE>' . "\n" .
 
+    echo '</table>' . "\n" .
 
       addHidden('username', $username).
 
       addHidden('username', $username).
 
       addHidden('smaction', $action).
 
       addHidden('smaction', $action).
 
       addHidden('mailbox', $mailbox);
 
       addHidden('mailbox', $mailbox);
 
@@ -1181,7 +1181,7 @@ function showInputForm ($session, $values=false) {
 
     }
 
     }
 
 
 
     do_hook('compose_bottom');
 
     do_hook('compose_bottom');
 
-    echo '</BODY></HTML>' . "\n";
 
+    echo '</body></html>' . "\n";
 
 }
 
 }
 
 
 
 
 
@@ -1191,9 +1191,9 @@ function showComposeButtonRow() {
 
            $request_mdn, $request_dr,
 
            $request_mdn, $request_dr,
 
            $data_dir, $username;
 
            $data_dir, $username;
 
 
 
-    echo '   <TR>' . "\n" .
 
-         '      <TD></TD>' . "\n" .
 
-         '      <TD>' . "\n";
 
+    echo '   <tr>' . "\n" .
 
+         '      <td></td>' . "\n" .
 
+         '      <td>' . "\n";
 
     if ($default_use_priority) {
 
     if ($default_use_priority) {
 
         if(!isset($mailprio)) {
 
         if(!isset($mailprio)) {
 
             $mailprio = '3';
 
             $mailprio = '3';
 
@@ -1213,34 +1213,34 @@ function showComposeButtonRow() {
 
         }
 
         }
 
     }
 
     }
 
 
 
-    echo '      </TD>' . "\n" .
 
-         '   </TR>' . "\n" .
 
-         '   <TR>'  . "\n" .
 
-         '      <TD></TD>' . "\n" .
 
-         '      <TD>' . "\n" .
 
-         '         <INPUT TYPE=SUBMIT NAME="sigappend" VALUE="' . _("Signature") . '">' . "\n";
 
+    echo '      </td>' . "\n" .
 
+         '   </tr>' . "\n" .
 
+         '   <tr>'  . "\n" .
 
+         '      <td></td>' . "\n" .
 
+         '      <td>' . "\n" .
 
+         '         <input type="submit" name="sigappend" value="' . _("Signature") . '" />' . "\n";
 
     if ($use_javascript_addr_book) {
 
     if ($use_javascript_addr_book) {
 
-        echo "         <SCRIPT LANGUAGE=JavaScript><!--\n document.write(\"".
 
+        echo "         <script language=\"JavaScript\"><!--\n document.write(\"".
 
              "            <input type=button value=\\\""._("Addresses").
 
              "            <input type=button value=\\\""._("Addresses").
 
-                                 "\\\" onclick='javascript:open_abook();'>\");".
 
-             "            // --></SCRIPT><NOSCRIPT>\n".
 
-             "            <input type=submit name=\"html_addr_search\" value=\"".
 
-                              _("Addresses")."\">".
 
-             "         </NOSCRIPT>\n";
 
+                                 "\\\" onclick=\"javascript:open_abook();\" />\");".
 
+             "            // --></script><noscript>\n".
 
+             '            <input type="submit" name="html_addr_search" value="'.
 
+                              _("Addresses").'" />'.
 
+             "         </noscript>\n";
 
     } else {
 
     } else {
 
-        echo '         <input type=submit name="html_addr_search" value="'.
 
-                                 _("Addresses").'">' . "\n";
 
+        echo '         <input type="submit" name="html_addr_search" value="'.
 
+                                 _("Addresses").'" />' . "\n";
 
     }
 
     }
 
 
 
     if ($save_as_draft) {
 
     if ($save_as_draft) {
 
-        echo '         <input type="submit" name ="draft" value="' . _("Save Draft") . "\">\n";
 
+        echo '         <input type="submit" name ="draft" value="' . _("Save Draft") . "\" />\n";
 
     }
 
     }
 
 
 
-    echo '         <INPUT TYPE=submit NAME=send VALUE="'. _("Send") . '">' . "\n";
 
+    echo '         <input type="submit" name="send" value="'. _("Send") . '" />' . "\n";
 
     do_hook('compose_button_row');
 
     do_hook('compose_button_row');
 
 
 
-    echo '      </TD>' . "\n" .
 
-         '   </TR>' . "\n\n";
 
+    echo '      </td>' . "\n" .
 
+         '   </tr>' . "\n\n";
 
 }
 
 }
 
 
 
 function checkInput ($show) {
 
 function checkInput ($show) {
 
@@ -1546,4 +1546,4 @@ function deliverMessage($composeMessage, $draft=false) {
 
     return $succes;
 
     return $succes;
 
 }
 
 }
 
 
 
-?>
 
+?>

+ 1 - 1
src/folders.php
查看文件 

@@ -80,7 +80,7 @@ if ( isset($success) && $success ) {
 
     echo html_tag( 'table',
 
     echo html_tag( 'table',
 
                 html_tag( 'tr',
 
                 html_tag( 'tr',
 
                      html_tag( 'td', $td_str .
 
                      html_tag( 'td', $td_str .
 
-                               '<a href="../src/left_main.php" target=left>' .
 
+                               '<a href="../src/left_main.php" target="left">' .
 
                                _("refresh folder list") . '</a>' ,
 
                                _("refresh folder list") . '</a>' ,
 
                      'center' )
 
                      'center' )
 
                 ) ,
 
                 ) ,

+ 2 - 2
src/folders_create.php
查看文件 

@@ -42,7 +42,7 @@ if (substr_count($folder_name, '"') || substr_count($folder_name, "\\") ||
 
     displayPageHeader($color, 'None');
 
     displayPageHeader($color, 'None');
 
 
 
     plain_error_message(_("Illegal folder name. Please select a different name.").
 
     plain_error_message(_("Illegal folder name. Please select a different name.").
 
-        '<BR><A HREF="../src/folders.php">'._("Click here to go back").'</A>.', $color);
 
+        '<br /><a href="../src/folders.php">'._("Click here to go back").'</a>.', $color);
 
 
 
     exit;
 
     exit;
 
 }
 
 }
 
@@ -76,4 +76,4 @@ sqimap_logout($imapConnection);
 
 $location = get_location();
 
 $location = get_location();
 
 header ("Location: $location/folders.php?success=create");
 
 header ("Location: $location/folders.php?success=create");
 
 
 
-?>
 
+?>

+ 7 - 7
src/help.php
查看文件 

@@ -121,7 +121,7 @@ if (file_exists("../help/$squirrelmail_language")) {
 
 } else if (file_exists('../help/en_US')) {
 
 } else if (file_exists('../help/en_US')) {
 
     echo "<center><font color=\"$color[2]\">";
 
     echo "<center><font color=\"$color[2]\">";
 
     printf (_("The help has not been translated to %s. It will be displayed in English instead."), $languages[$squirrelmail_language]['NAME']);
 
     printf (_("The help has not been translated to %s. It will be displayed in English instead."), $languages[$squirrelmail_language]['NAME']);
 
-    echo '</font></center><br>';
 
+    echo '</font></center><br />';
 
     $user_language = 'en_US';
 
     $user_language = 'en_US';
 
 } else {
 
 } else {
 
     error_box( _("Some or all of the help documents are not present!"), $color );
 
     error_box( _("Some or all of the help documents are not present!"), $color );
 
@@ -154,7 +154,7 @@ if ( $chapter == 0 || !isset( $helpdir[$chapter-1] ) ) {
 
     echo html_tag( 'table', '', 'center', '', 'cellpadding="0" cellspacing="0" border="0"' ) .
 
     echo html_tag( 'table', '', 'center', '', 'cellpadding="0" cellspacing="0" border="0"' ) .
 
 	        html_tag( 'tr' ) .
 
 	        html_tag( 'tr' ) .
 
                     html_tag( 'td' ) .
 
                     html_tag( 'td' ) .
 
-                         '<b><center>' . _("Table of Contents") . '</center></b><br>';
 
+                         '<b><center>' . _("Table of Contents") . '</center></b><br />';
 
     echo html_tag( 'ol' );
 
     echo html_tag( 'ol' );
 
     for ($i=0, $cnt = count($helpdir); $i < $cnt; $i++) {
 
     for ($i=0, $cnt = count($helpdir); $i < $cnt; $i++) {
 
         $doc = file("../help/$user_language/$helpdir[$i]");
 
         $doc = file("../help/$user_language/$helpdir[$i]");
 
@@ -183,10 +183,10 @@ if ( $chapter == 0 || !isset( $helpdir[$chapter-1] ) ) {
 
         echo ' | <a href="../src/help.php?chapter=' . ($chapter+1)
 
         echo ' | <a href="../src/help.php?chapter=' . ($chapter+1)
 
              . '">' . _("Next") . '</a>';
 
              . '">' . _("Next") . '</a>';
 
     }
 
     }
 
-    echo '</center></small><br>';
 
+    echo '</center></small><br />';
 
 
 
     echo '<font size="5"><b>' . $chapter . ' - ' . $help_info[0]
 
     echo '<font size="5"><b>' . $chapter . ' - ' . $help_info[0]
 
-         . '</b></font><br><br>';
 
+         . '</b></font><br /><br />';
 
 
 
     if (isset($help_info[1]) && $help_info[1]) {
 
     if (isset($help_info[1]) && $help_info[1]) {
 
         echo $help_info[1];
 
         echo $help_info[1];
 
@@ -203,7 +203,7 @@ if ( $chapter == 0 || !isset( $helpdir[$chapter-1] ) ) {
 
     	$n = $help_info[3];
 
     	$n = $help_info[3];
 
     }
 
     }
 
 
 
-    echo '<br><center><a href="#pagetop">' . _("Top") . '</a></center>';
 
+    echo '<br /><center><a href="#pagetop">' . _("Top") . '</a></center>';
 
 }
 
 }
 
 
 
 do_hook('help_bottom');
 
 do_hook('help_bottom');
 
@@ -211,5 +211,5 @@ do_hook('help_bottom');
 
 echo html_tag( 'tr',
 
 echo html_tag( 'tr',
 
             html_tag( 'td', '&nbsp;', 'left', $color[0] )
 
             html_tag( 'td', '&nbsp;', 'left', $color[0] )
 
         ).
 
         ).
 
-       '</table></body></html>';
 
-?>
 
+        '</table></body></html>';
 
+?>

+ 9 - 10
src/left_main.php
查看文件 

@@ -957,11 +957,11 @@ do_hook('left_main_before');
 
 if ($advanced_tree) {
 
 if ($advanced_tree) {
 
    /* nice future feature, needs layout !! volunteers?   */
 
    /* nice future feature, needs layout !! volunteers?   */
 
    $right_pos = $left_size - 20;
 
    $right_pos = $left_size - 20;
 
-/*   echo '<div style="position:absolute;top:0;border=solid;border-width:0.1em;border-color:blue;"><div ID="hidef" style="width=20;font-size:12"><A HREF="javascript:hideframe(true)"><b><<</b></a></div>';
 
-   echo '<div ID="showf" style="width=20;font-size:12;display:none;"><a href="javascript:hideframe(false)"><b>>></b></a></div>';
 
-   echo '<div ID="incrf" style="width=20;font-size:12"><a href="javascript:resizeframe(true)"><b>></b></a></div>';
 
-   echo '<div ID="decrf" style="width=20;font-size:12"><a href="javascript:resizeframe(false)"><b><</b></a></div></div>';
 
-   echo '<div ID="leftframe"><br /><br />';*/
 
+/*   echo '<div style="position:absolute;top:0;border=solid;border-width:0.1em;border-color:blue;"><div id="hidef" style="width=20;font-size:12"><a href="javascript:hideframe(true)"><b>&lt;&lt;</b></a></div>';
 
+   echo '<div id="showf" style="width=20;font-size:12;display:none;"><a href="javascript:hideframe(false)"><b>&gt;&gt;</b></a></div>';
 
+   echo '<div id="incrf" style="width=20;font-size:12"><a href="javascript:resizeframe(true)"><b>&gt;</b></a></div>';
 
+   echo '<div id="decrf" style="width=20;font-size:12"><a href="javascript:resizeframe(false)"><b>&lt;</b></a></div></div>';
 
+   echo '<div id="leftframe"><br /><br />';*/
 
 }
 
 }
 
 
 
 echo "\n\n" . html_tag( 'table', '', 'left', '', 'border="0" cellspacing="0" cellpadding="0" width="99%"' ) .
 
 echo "\n\n" . html_tag( 'table', '', 'left', '', 'border="0" cellspacing="0" cellpadding="0" width="99%"' ) .
 
@@ -1094,7 +1094,7 @@ for ($i = 0; $i < count($boxes); $i++) {
 
         }
 
         }
 
 
 
         /* Put the final touches on our folder line. */
 
         /* Put the final touches on our folder line. */
 
-        $line .= "</nobr><br>\n";
 
+        $line .= "</nobr><br />\n";
 
 
 
         /* Output the line for this folder. */
 
         /* Output the line for this folder. */
 
         echo $line;
 
         echo $line;
 
@@ -1122,7 +1122,6 @@ for ($i = 0; $i < count($boxes); $i++) {
 
 do_hook('left_main_after');
 
 do_hook('left_main_after');
 
 sqimap_logout($imapConnection);
 
 sqimap_logout($imapConnection);
 
 
 
-echo '</td></tr></table>' . "\n".
 
-    "</div></body></html>\n";
 
-
 
-?>
 
+?>
 
+</td></tr></table>'
 
+</div></body></html>\

+ 10 - 12
src/options.php
查看文件 

@@ -55,7 +55,7 @@ function process_optionmode_submit($optpage, $optpage_data) {
 
             echo "name = '$option->name', "
 
             echo "name = '$option->name', "
 
                . "value = '$option->value', "
 
                . "value = '$option->value', "
 
                . "new_value = '$option->new_value'\n";
 
                . "new_value = '$option->new_value'\n";
 
-            echo "<br>";
 
+            echo "<br />";
 
             */
 
             */
 
             if ($option->changed()) {
 
             if ($option->changed()) {
 
                 $option->save();
 
                 $option->save();
 
@@ -274,7 +274,7 @@ displayPageHeader($color, 'None', (isset($optpage_data['xtra']) ? $optpage_data[
 
 echo html_tag( 'table', '', 'center', $color[0], 'width="95%" cellpadding="1" cellspacing="0" border="0"' ) . "\n" .
 
 echo html_tag( 'table', '', 'center', $color[0], 'width="95%" cellpadding="1" cellspacing="0" border="0"' ) . "\n" .
 
         html_tag( 'tr' ) . "\n" .
 
         html_tag( 'tr' ) . "\n" .
 
             html_tag( 'td', '', 'center' ) .
 
             html_tag( 'td', '', 'center' ) .
 
-                "<b>$optpage_title</b><br>\n".
 
+                "<b>$optpage_title</b><br />\n".
 
                 html_tag( 'table', '', '', '', 'width="100%" cellpadding="5" cellspacing="0" border="0"' ) . "\n" .
 
                 html_tag( 'table', '', '', '', 'width="100%" cellpadding="5" cellspacing="0" border="0"' ) . "\n" .
 
                     html_tag( 'tr' ) . "\n" .
 
                     html_tag( 'tr' ) . "\n" .
 
                         html_tag( 'td', '', 'center', $color[4] ) . "\n";
 
                         html_tag( 'td', '', 'center', $color[4] ) . "\n";
 
@@ -302,15 +302,15 @@ if ($optpage == SMOPT_PAGE_MAIN) {
 
             echo '<b>' . _("Some of your preference changes are not applied.") . "</b><br />\n";
 
             echo '<b>' . _("Some of your preference changes are not applied.") . "</b><br />\n";
 
         } else {
 
         } else {
 
             /* Display a message indicating a successful save. */
 
             /* Display a message indicating a successful save. */
 
-            echo '<b>' . _("Successfully Saved Options") . ": $optpage_name</b><br>\n";
 
+            echo '<b>' . _("Successfully Saved Options") . ": $optpage_name</b><br />\n";
 
         }
 
         }
 
 
 
         /* If $max_refresh != SMOPT_REFRESH_NONE, provide a refresh link. */
 
         /* If $max_refresh != SMOPT_REFRESH_NONE, provide a refresh link. */
 
         if ( !isset( $max_refresh ) ) {
 
         if ( !isset( $max_refresh ) ) {
 
         } else if ($max_refresh == SMOPT_REFRESH_FOLDERLIST) {
 
         } else if ($max_refresh == SMOPT_REFRESH_FOLDERLIST) {
 
-            echo '<a href="../src/left_main.php" target="left">' . _("Refresh Folder List") . '</a><br>';
 
+            echo '<a href="../src/left_main.php" target="left">' . _("Refresh Folder List") . '</a><br />';
 
         } else if ($max_refresh) {
 
         } else if ($max_refresh) {
 
-            echo '<a href="../src/webmail.php?right_frame=options.php" target="' . $frame_top . '">' . _("Refresh Page") . '</a><br>';
 
+            echo '<a href="../src/webmail.php?right_frame=options.php" target="' . $frame_top . '">' . _("Refresh Page") . '</a><br />';
 
         }
 
         }
 
     }
 
     }
 
     /******************************************/
 
     /******************************************/
 
@@ -464,11 +464,9 @@ if ($optpage == SMOPT_PAGE_MAIN) {
 
         do_hook($bottom_hook_name);    
         do_hook($bottom_hook_name);    
     }
 
     }
 
 }
 
 }
 
-
 
-echo        '</td></tr>' .
 
-        '</table>'.
 
-        '</td></tr>'.
 
-     '</table>' .
 
-     '</body></html>';
 
-
 
 ?>
 
 ?>
 
+</td></tr>
 
+</table>
 
+</td></tr>
 
+</table>
 
+</body></html>

+ 10 - 10
src/options_highlight.php
查看文件 

@@ -118,13 +118,13 @@ html_tag( 'table', "\n" .
 
     html_tag( 'tr', "\n" .
 
     html_tag( 'tr', "\n" .
 
         html_tag( 'td', '<center><b>' . _("Options") . ' - ' . _("Message Highlighting") . '</b></center>', 'left')
 
         html_tag( 'td', '<center><b>' . _("Options") . ' - ' . _("Message Highlighting") . '</b></center>', 'left')
 
     ),
 
     ),
 
-    'center', $color[9], 'width="95%" border="0" cellpadding="1" cellspacing="0"' ) . "<br>\n" .
 
+    'center', $color[9], 'width="95%" border="0" cellpadding="1" cellspacing="0"' ) . "<br />\n" .
 
 html_tag( 'table', '', '', '', 'width="100%" border="0" cellpadding="1" cellspacing="0"' ) . 
 html_tag( 'table', '', '', '', 'width="100%" border="0" cellpadding="1" cellspacing="0"' ) . 
      html_tag( 'tr' ) . "\n" .
 
      html_tag( 'tr' ) . "\n" .
 
          html_tag( 'td', '', 'left' );
 
          html_tag( 'td', '', 'left' );
 
 
 
 echo '<center>[<a href="options_highlight.php?action=add">' . _("New") . '</a>]'.
 
 echo '<center>[<a href="options_highlight.php?action=add">' . _("New") . '</a>]'.
 
-        ' - [<a href="options.php">'._("Done").'</a>]</center><br>'."\n";
 
+        ' - [<a href="options.php">'._("Done").'</a>]</center><br />'."\n";
 
 $mhl_count = count($message_highlight_list);
 
 $mhl_count = count($message_highlight_list);
 
 if ($mhl_count > 0) {
 
 if ($mhl_count > 0) {
 
     echo html_tag( 'table', '', 'center', '', 'width="80%" border="0" cellpadding="3" cellspacing="0"' ) . "\n";
 
     echo html_tag( 'table', '', 'center', '', 'width="80%" border="0" cellpadding="3" cellspacing="0"' ) . "\n";
 
@@ -174,10 +174,10 @@ if ($mhl_count > 0) {
 
                 '', $message_highlight_list[$i]['color'] ) . "\n";
 
                 '', $message_highlight_list[$i]['color'] ) . "\n";
 
     }
 
     }
 
     echo "</table>\n".
 
     echo "</table>\n".
 
-        "<br>\n";
 
+        "<br />\n";
 
 } else {
 
 } else {
 
-    echo '<center>' . _("No highlighting is defined") . "</center><br>\n".
 
-        "<br>\n";
 
+    echo '<center>' . _("No highlighting is defined") . "</center><br />\n".
 
+        "<br />\n";
 
 }
 
 }
 
 if ($action == 'edit' || $action == 'add') {
 
 if ($action == 'edit' || $action == 'add') {
 
 
 
@@ -402,21 +402,21 @@ if ($action == 'edit' || $action == 'add') {
 
 	$color_list[13] => _("White") );
 
 	$color_list[13] => _("White") );
 
 	
 	
     echo addSelect('newcolor_choose', $selops, $selected_i, TRUE);
 
     echo addSelect('newcolor_choose', $selops, $selected_i, TRUE);
 
-    echo "<br>\n";
 
+    echo "<br />\n";
 
 
 
     echo '         '.addRadioBox('color_type', $selected_input, 2).
 
     echo '         '.addRadioBox('color_type', $selected_input, 2).
 
         ' &nbsp;'. _("Other:") .
 
         ' &nbsp;'. _("Other:") .
 
 	addInput('newcolor_input',
 
 	addInput('newcolor_input',
 
 	    (($selected_input && isset($theid)) ? $message_highlight_list[$theid]['color'] : ''),
 
 	    (($selected_input && isset($theid)) ? $message_highlight_list[$theid]['color'] : ''),
 
 	    '7');
 
 	    '7');
 
-    echo _("Ex: 63aa7f")."<br>\n";
 
+    echo _("Ex: 63aa7f")."<br />\n";
 
     echo "      </td>\n";
 
     echo "      </td>\n";
 
     echo "   </tr>\n";
 
     echo "   </tr>\n";
 
 
 
     # Show grid of color choices
 
     # Show grid of color choices
 
     echo html_tag( 'tr', '', '', $color[0] ) . "\n";
 
     echo html_tag( 'tr', '', '', $color[0] ) . "\n";
 
     echo html_tag( 'td', '', 'left', '', 'colspan="2"' );
 
     echo html_tag( 'td', '', 'left', '', 'colspan="2"' );
 
-    echo html_tag( 'table', '', 'center', '', 'border=0 cellpadding="2" cellspacing="1"' ) . "\n";
 
+    echo html_tag( 'table', '', 'center', '', 'border="0" cellpadding="2" cellspacing="1"' ) . "\n";
 
 
 
     for($x = 0; $x < 5; $x++) {
 
     for($x = 0; $x < 5; $x++) {
 
         echo html_tag( 'tr' ) . "\n";
 
         echo html_tag( 'tr' ) . "\n";
 
@@ -434,7 +434,7 @@ if ($action == 'edit' || $action == 'add') {
 
     echo html_tag( 'tr', html_tag( 'td', '<small><small>&nbsp;</small></small>', 'left' ) ) . "\n";
 
     echo html_tag( 'tr', html_tag( 'td', '<small><small>&nbsp;</small></small>', 'left' ) ) . "\n";
 
     echo html_tag( 'tr', '', '', $color[0] ) . "\n";
 
     echo html_tag( 'tr', '', '', $color[0] ) . "\n";
 
     echo html_tag( 'td', '', 'center', '', 'colspan="2"' ) . "\n";
 
     echo html_tag( 'td', '', 'center', '', 'colspan="2"' ) . "\n";
 
-    echo "         <select name=match_type>\n";
 
+    echo "         <select name=\"match_type\">\n";
 
     oh_opt( 'from',
 
     oh_opt( 'from',
 
             (isset($theid)?$message_highlight_list[$theid]['match_type'] == 'from':1),
 
             (isset($theid)?$message_highlight_list[$theid]['match_type'] == 'from':1),
 
             _("From") );
 
             _("From") );
 
@@ -460,7 +460,7 @@ if ($action == 'edit' || $action == 'add') {
 
     echo "        </td>\n";
 
     echo "        </td>\n";
 
     echo "   </tr>\n";
 
     echo "   </tr>\n";
 
     echo "</table>\n";
 
     echo "</table>\n";
 
-    echo '<center><input type="submit" value="' . _("Submit") . "\"></center>\n";
 
+    echo '<center><input type="submit" value="' . _("Submit") . "\" /></center>\n";
 
     echo "</form>\n";
 
     echo "</form>\n";
 
 }
 
 }
 
 do_hook('options_highlight_bottom');
 
 do_hook('options_highlight_bottom');

+ 6 - 6
src/options_identities.php
查看文件 

@@ -57,7 +57,7 @@ if (!empty($_POST)) {
 
    do_hook('options_identities_top');
 
    do_hook('options_identities_top');
 
    LoadInfo($full_name, $email_address, $reply_to, $signature, '');
 
    LoadInfo($full_name, $email_address, $reply_to, $signature, '');
 
    $td_str = '';
 
    $td_str = '';
 
-   $td_str .= '<form name="f" action="options_identities.php" method="post"><br>';
 
+   $td_str .= '<form name="f" action="options_identities.php" method="post"><br />';
 
    $td_str .= ShowTableInfo($full_name, $email_address, $reply_to, $signature, '');
 
    $td_str .= ShowTableInfo($full_name, $email_address, $reply_to, $signature, '');
 
   
   
    $num = 1;
 
    $num = 1;
 
@@ -69,11 +69,11 @@ if (!empty($_POST)) {
 
        $num ++;
 
        $num ++;
 
        }
 
        }
 
 
 
-   echo '<br>' . 
+   echo '<br />' . 
    html_tag( 'table', "\n" .
 
    html_tag( 'table', "\n" .
 
        html_tag( 'tr', "\n" .
 
        html_tag( 'tr', "\n" .
 
            html_tag( 'td', "\n" .
 
            html_tag( 'td', "\n" .
 
-               '<b>'. _("Options") . ' - ' . _("Advanced Identities") .'</b><br>' .
 
+               '<b>'. _("Options") . ' - ' . _("Advanced Identities") .'</b><br />' .
 
                html_tag( 'table', "\n" .
 
                html_tag( 'table', "\n" .
 
                    html_tag( 'tr', "\n" .
 
                    html_tag( 'tr', "\n" .
 
                        html_tag( 'td', "\n" .
 
                        html_tag( 'td', "\n" .
 
@@ -336,14 +336,14 @@ function ShowTableInfo($full_name, $email_address, $reply_to, $signature, $post)
 
     $return_val .= html_tag( 'tr', '', '', $OtherBG);
 
     $return_val .= html_tag( 'tr', '', '', $OtherBG);
 
     $return_val .= html_tag( 'td', '&nbsp;', 'left' );
 
     $return_val .= html_tag( 'td', '&nbsp;', 'left' );
 
     $return_val .= html_tag( 'td', '', 'left' );
 
     $return_val .= html_tag( 'td', '', 'left' );
 
-    $return_val .= '<input type=hidden name="form_for_'. $post .'" value="1">';
 
+    $return_val .= '<input type="hidden" name="form_for_'. $post .'" value="1">';
 
     $return_val .= '<input type="submit" name="update" value="' . _("Save / Update") . '">';
 
     $return_val .= '<input type="submit" name="update" value="' . _("Save / Update") . '">';
 
 
 
 
 
     if (! $isEmptySection && $post != '') {
 
     if (! $isEmptySection && $post != '') {
 
         $return_val .= '<input type="submit" name="make_default_' . $post . '" value="'.
 
         $return_val .= '<input type="submit" name="make_default_' . $post . '" value="'.
 
              _("Make Default") . '">'.
 
              _("Make Default") . '">'.
 
-             '<input type=submit name="delete_' . $post . '" value="'.
 
+             '<input type="submit" name="delete_' . $post . '" value="'.
 
              _("Delete") . '">';
 
              _("Delete") . '">';
 
     }
 
     }
 
     if (! $isEmptySection && $post != '' && $post > 1) {
 
     if (! $isEmptySection && $post != '' && $post > 1) {
 
@@ -356,4 +356,4 @@ function ShowTableInfo($full_name, $email_address, $reply_to, $signature, $post)
 
 
 
     return ($return_val);
 
     return ($return_val);
 
 }
 
 }
 
-?>
 
+?>

+ 2 - 2
src/options_order.php
查看文件 

@@ -99,7 +99,7 @@ displayPageHeader($color, 'None');
 
                         _("The index order is the order that the columns are arranged in the message index. You can add, remove, and move columns around to customize them to fit your needs.")
 
                         _("The index order is the order that the columns are arranged in the message index. You can add, remove, and move columns around to customize them to fit your needs.")
 
                     )
 
                     )
 
                 ) ,
 
                 ) ,
 
-            '', '', '', 'width="65%" border="0" cellpadding="0" cellspacing="0"' ) . "<br>\n";
 
+            '', '', '', 'width="65%" border="0" cellpadding="0" cellspacing="0"' ) . "<br />\n";
 
  
  
     if (count($index_order))
 
     if (count($index_order))
 
     {
 
     {
 
@@ -147,7 +147,7 @@ displayPageHeader($color, 'None');
 
         echo '</form>';
 
         echo '</form>';
 
     }
 
     }
 
  
  
-    echo html_tag( 'p', '<a href="../src/options.php">' . _("Return to options page") . '</a></p><br>' );
 
+    echo html_tag( 'p', '<a href="../src/options.php">' . _("Return to options page") . '</a></p><br />' );
 
 
 
 ?>
 
 ?>
 
     </td></tr>
 
     </td></tr>

+ 1 - 1
src/read_body.php
查看文件 

@@ -879,7 +879,7 @@ $cnt = count($ent_ar);
 
 for ($i = 0; $i < $cnt; $i++) {
 
 for ($i = 0; $i < $cnt; $i++) {
 
    $messagebody .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$i], $passed_id, $mailbox);
 
    $messagebody .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$i], $passed_id, $mailbox);
 
    if ($i != $cnt-1) {
 
    if ($i != $cnt-1) {
 
-       $messagebody .= '<hr noshade size=1 />';
 
+       $messagebody .= '<hr noshade size="1" />';
 
    }
 
    }
 
 }
 
 }

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5