XHTML fixes

functions/imap_mailbox.php

@@ -542,9 +542,9 @@ function sqimap_mailbox_option_list($imap_stream, $show_selected = 0, $folder_sk
                 }
             }
             if ($show_selected != 0 && in_array($lowerbox, $show_selected) ) {
-                $mbox_options .= '<OPTION VALUE="' . htmlspecialchars($box) .'" SELECTED>'.$box2.'</OPTION>' . "\n";
+                $mbox_options .= '<option value="' . htmlspecialchars($box) .'" selected="selected">'.$box2.'</option>' . "\n";
             } else {
-                $mbox_options .= '<OPTION VALUE="' . htmlspecialchars($box) .'">'.$box2.'</OPTION>' . "\n";
+                $mbox_options .= '<option value="' . htmlspecialchars($box) .'">'.$box2.'</option>' . "\n";
             }
         }
     }
@@ -1054,4 +1054,4 @@ function sqimap_get_status_mbx_tree($imap_stream,&$mbx_tree) {
     }
 }
 
-?>
+?>

src/folders.php

@@ -40,7 +40,7 @@ sqgetGlobalVar('success', $success, SQ_GET);
 
 /* end of get globals */
 
-echo '<br>' .
+echo '<br />' .
     html_tag( 'table', '', 'center', $color[0], 'width="95%" cellpadding="1" cellspacing="0" border="0"' ) .
         html_tag( 'tr' ) .
             html_tag( 'td', '', 'center' ) . '<b>' . _("Folders") . '</b>' .
@@ -74,7 +74,7 @@ if ( isset($success) && $success ) {
             break;
     }
 
-    $td_str .= '</b><br>';        
+    $td_str .= '</b><br />';
 
 
     echo html_tag( 'table',
@@ -87,7 +87,7 @@ if ( isset($success) && $success ) {
             'center', '', 'width="100%" cellpadding="4" cellspacing="0" border="0"' );
 }
 
-echo "\n<br>";
+echo "\n<br />";
 
 $imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0);
 $boxes = sqimap_mailbox_list($imapConnection,true);
@@ -101,8 +101,8 @@ echo html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="4" cellspaci
                 html_tag( 'td', '', 'center', $color[0] ) .
      addForm('folders_create.php', 'POST', 'cf').
      addInput('folder_name', '', 25).
-     "<BR>\n". _("as a subfolder of"). '<BR>'.
-     "<TT><SELECT NAME=subfolder>\n";
+     "<br />\n". _("as a subfolder of"). '<br />'.
+     "<tt><select name=\"subfolder\">\n";
 
 $show_selected = array();
 $skip_folders = array();
@@ -115,9 +115,9 @@ if ( $server_type == 'courier' ) {
 }
 
 if ( $default_sub_of_inbox == false ) {
-    echo '<OPTION SELECTED VALUE="">[ '._("None")." ]\n";
+    echo '<option selected="selected" value="">[ '._("None")." ]</option>\n";
 } else {
-    echo '<OPTION VALUE="">[ '._("None")." ]\n";
+    echo '<option value="">[ '._("None")." ]</option>\n";
     $show_selected = array('inbox');
 }
 
@@ -127,15 +127,15 @@ if ( $default_sub_of_inbox == false ) {
 // use the long format to show subfolders in an intelligible way if parent is missing (special folder)
 echo sqimap_mailbox_option_list($imapConnection, $show_selected, $skip_folders, $boxes, 'noinferiors', true);
 
-echo "</SELECT></TT>\n";
+echo "</select></tt>\n";
 if ($show_contain_subfolders_option) {
-    echo '<br>'.
+    echo '<br />'.
          addCheckBox('contain_subs', FALSE, '1') .' &nbsp;'
        . _("Let this folder contain subfolders")
-       . '<BR>';
+       . '<br />';
 }
-echo "<input type=SUBMIT VALUE=\""._("Create")."\">\n";
-echo "</FORM></td></tr>\n";
+echo "<input type=\"submit\" value=\""._("Create")."\" />\n";
+echo "</form></td></tr>\n";
 
 echo html_tag( 'tr',
             html_tag( 'td', '&nbsp;', 'left', $color[4] )
@@ -197,8 +197,8 @@ echo html_tag( 'tr',
 
 if ($count_special_folders < count($boxes)) {
     echo addForm('folders_rename_getname.php')
-       . "<TT><SELECT NAME=old>\n"
-       . '         <OPTION VALUE="">[ ' . _("Select a folder") . " ]</OPTION>\n";
+       . "<tt><select name=\"old\">\n"
+       . '         <option value="">[ ' . _("Select a folder") . " ]</option>\n";
 
     // use existing IMAP connection, we have no special values to show, 
     // but we do include values to skip. Use the pre-created $boxes to save an IMAP query.
@@ -206,13 +206,13 @@ if ($count_special_folders < count($boxes)) {
     // use long format to make sure folder names make sense when parents may be missing.
     echo sqimap_mailbox_option_list($imapConnection, 0, $skip_folders, $boxes, NULL, true);
 
-    echo "</SELECT></TT>\n".
-         "<input type=SUBMIT VALUE=\"".
+    echo "</select></tt>\n".
+         '<input type="submit" value="'.
          _("Rename").
-         "\">\n".
-         "</FORM></td></tr>\n";
+         "\" />\n".
+         "</form></td></tr>\n";
 } else {
-    echo _("No folders found") . '<br><br></td></tr>';
+    echo _("No folders found") . '<br /><br /></td></tr>';
 }
 $boxes_sub = $boxes;
 
@@ -229,20 +229,20 @@ echo html_tag( 'tr',
 
 if ($count_special_folders < count($boxes)) {
     echo addForm('folders_delete.php')
-       . "<TT><SELECT NAME=mailbox>\n"
-       . '         <OPTION VALUE="">[ ' . _("Select a folder") . " ]</OPTION>\n";
+       . "<tt><select name=\"mailbox\">\n"
+       . '         <option value="">[ ' . _("Select a folder") . " ]</option>\n";
 
     // send NULL for the flag - ALL folders are eligible for delete (except what we've got in skiplist)
     // use long format to make sure folder names make sense when parents may be missing.
     echo sqimap_mailbox_option_list($imapConnection, 0, $skip_folders, $boxes, NULL, true);
 
-    echo "</SELECT></TT>\n"
-       . '<input type=SUBMIT VALUE="'
+    echo "</select></tt>\n"
+       . '<input type="submit" value="'
        . _("Delete")
-       . "\">\n"
+       . "\" />\n"
        . "</form></td></tr>\n";
 } else {
-    echo _("No folders found") . "<br><br></td></tr>";
+    echo _("No folders found") . "<br /><br /></td></tr>";
 }
 
 echo html_tag( 'tr',
@@ -260,7 +260,7 @@ echo html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="4" cellspaci
 
 if ($count_special_folders < count($boxes)) {
     echo addForm('folders_subscribe.php?method=unsub')
-       . "<TT><SELECT NAME=\"mailbox[]\" multiple size=8>\n";
+       . "<tt><select name=\"mailbox[]\" multiple=\"multiple\" size=\"8\">\n";
     for ($i = 0; $i < count($boxes); $i++) {
         $use_folder = true;
         if ((strtolower($boxes[$i]["unformatted"]) != "inbox") &&
@@ -270,14 +270,14 @@ if ($count_special_folders < count($boxes)) {
             $box = htmlspecialchars($boxes[$i]["unformatted-dm"]);
             $box2 = str_replace(' ', '&nbsp;',
                                 htmlspecialchars(imap_utf7_decode_local($boxes[$i]["unformatted-disp"])));
-            echo "         <OPTION VALUE=\"$box\">$box2\n";
+            echo "         <option value=\"$box\">$box2</option>\n";
         }
     }
-    echo "</SELECT></TT><br><br>\n"
-       . '<input type=SUBMIT VALUE="'
+    echo "</select></tt><br /><br />\n"
+       . '<input type="submit" value="'
        . _("Unsubscribe")
-       . "\">\n"
-       . "</FORM></td>\n";
+       . "\" />\n"
+       . "</form></td>\n";
 } else {
     echo _("No folders were found to unsubscribe from!") . '</td>';
 }
@@ -308,24 +308,24 @@ if(!$no_list_for_subscribe) {
   }
   if ($box && $box2) {
     echo addForm('folders_subscribe.php?method=sub')
-       . '<tt><select name="mailbox[]" multiple size=8>';
+       . '<tt><select name="mailbox[]" multiple="multiple" size="8">';
 
     for ($q = 0; $q < count($box); $q++) {      
-       echo "         <OPTION VALUE=\"$box[$q]\">".$box2[$q]."\n";
+       echo '         <option value="$box[$q]">'.$box2[$q]."</option>\n";
     }      
-    echo '</select></tt><br><br>'
-       . '<input type=SUBMIT VALUE="'. _("Subscribe") . "\">\n"
-       . "</FORM></td></tr></table><BR>\n";
+    echo '</select></tt><br /><br />'
+       . '<input type="submit" value="'. _("Subscribe") . "\" />\n"
+       . "</form></td></tr></table><br />\n";
   } else {
     echo _("No folders were found to subscribe to!") . '</td></tr></table>';
   }
 } else {
   /* don't perform the list action -- this is much faster */
   echo addForm('folders_subscribe.php?method=sub')
-     . _("Subscribe to:") . '<br>'
-     . '<tt><input type="text" name="mailbox[]" size=35>'
-     . '<INPUT TYPE=SUBMIT VALUE="'. _("Subscribe") . "\">\n"
-     . "</FORM></TD></TR></TABLE><BR>\n";
+     . _("Subscribe to:") . '<br />'
+     . '<tt><input type="text" name="mailbox[]" size="35" />'
+     . '<input type="submit" value="'. _("Subscribe") . "\" />\n"
+     . "</form></td></tr></table><br />\n";
 }
 
 do_hook('folders_bottom');

src/folders_delete.php

@@ -45,7 +45,7 @@ if ($mailbox == '') {
     displayPageHeader($color, 'None');
 
     plain_error_message(_("You have not selected a folder to delete. Please do so.").
-	'<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;
 }
 
@@ -58,7 +58,7 @@ if ( sqgetGlobalVar('backingout', $tmp, SQ_POST) ) {
 if( !sqgetGlobalVar('confirmed', $tmp, SQ_POST) ) {
     displayPageHeader($color, 'None');
 
-    echo '<br>' .
+    echo '<br />' .
         html_tag( 'table', '', 'center', '', 'width="95%" border="0"' ) .
         html_tag( 'tr',
             html_tag( 'td', '<b>' . _("Delete Folder") . '</b>', 'center', $color[0] )
@@ -66,11 +66,11 @@ if( !sqgetGlobalVar('confirmed', $tmp, SQ_POST) ) {
         html_tag( 'tr' ) .
         html_tag( 'td', '', 'center', $color[4] ) .
         sprintf(_("Are you sure you want to delete %s?"), str_replace(array(' ','<','>'),array('&nbsp;','&lt;','&gt;'),imap_utf7_decode_local($mailbox))).
-	addForm('folders_delete.php', 'POST').
-	addHidden('mailbox', $mailbox).
-        '<INPUT TYPE=SUBMIT NAME="confirmed" VALUE="'._("Yes")."\">\n".
-        '<INPUT TYPE=SUBMIT NAME="backingout" VALUE="'._("No")."\">\n".
-        '</p></FORM><BR></td></tr></table>';
+        addForm('folders_delete.php', 'POST').
+        addHidden('mailbox', $mailbox).
+        '<input type="submit" name="confirmed" value="'._("Yes")."\" />\n".
+        '<input type="submit" name="backingout" value="'._("No")."\" />\n".
+        '</p></form><br /></td></tr></table>';
 
     exit;
 }
@@ -141,4 +141,4 @@ sqimap_logout($imap_stream);
 $location = get_location();
 header ("Location: $location/folders.php?success=delete");
 
-?>
+?>

src/folders_rename_do.php

@@ -42,7 +42,7 @@ if (substr_count($new_name, '"') || substr_count($new_name, "\\") ||
     displayPageHeader($color, 'None');
 
     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;
 }
@@ -82,4 +82,4 @@ if ($old_name <> $new_name) {
 
 header ('Location: ' . get_location() . '/folders.php?success=rename');
 
-?>
+?>

src/folders_rename_getname.php

@@ -39,7 +39,7 @@ if ($old == '') {
     displayPageHeader($color, 'None');
 
     plain_error_message(_("You have not selected a folder to rename. Please do so.").
-        '<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;
 }
 
@@ -62,23 +62,23 @@ if (strpos($old, $delimiter)) {
 
 
 displayPageHeader($color, 'None');
-echo '<br>' .
+echo '<br />' .
     html_tag( 'table', '', 'center', '', 'width="95%" border="0"' ) .
         html_tag( 'tr',
             html_tag( 'td', '<b>' . _("Rename a folder") . '</b>', 'center', $color[0] )
         ) .
         html_tag( 'tr' ) .
             html_tag( 'td', '', 'center', $color[4] ) .
-	    addForm('folders_rename_do.php').
+            addForm('folders_rename_do.php').
      _("New name:").
-     '<br><b>' . htmlspecialchars($old_parent) . ' ' . htmlspecialchars($delimiter) . '</b>' .
-     addInput('new_name', $old_name, 25) . '<BR>' . "\n";
+     '<br /><b>' . htmlspecialchars($old_parent) . ' ' . htmlspecialchars($delimiter) . '</b>' .
+     addInput('new_name', $old_name, 25) . '<br />' . "\n";
 if ( $isfolder ) {
     echo addHidden('isfolder', 'true');
 }
 echo addHidden('orig', $old).
      addHidden('old_name', $old_name).
-     '<INPUT TYPE=SUBMIT VALUE="'._("Submit")."\">\n".
-     '</FORM><BR></td></tr></table>';
+     '<input type="submit" value="'._("Submit")."\" />\n".
+     '</form><br /></td></tr></table>';
 
-?>
+?>

src/read_body.php

@@ -265,7 +265,7 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
         $success = $deliver->finalizeStream($stream);
     }
     if (!$success) {
-        $msg  = $deliver->dlv_msg . '<br>' .
+        $msg  = $deliver->dlv_msg . '<br />' .
                 _("Server replied: ") . $deliver->dlv_ret_nr . ' '.
                 $deliver->dlv_server_msg;
         require_once(SM_PATH . 'functions/display_messages.php');
@@ -636,7 +636,7 @@ function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message, $removed
     $menu_row .= getButton('SUBMIT', 'smaction_reply_all', _("Reply All"), $on_click) ."\n";
     $menu_row .= getButton('SUBMIT', 'smaction_forward', _("Forward"), $on_click);
     if ($enable_forward_as_attachment)
-        $menu_row .= '<input type="checkbox" name="smaction_attache">' . _("As Attachment") .'&nbsp;&nbsp;'."\n";
+        $menu_row .= '<input type="checkbox" name="smaction_attache" />' . _("As Attachment") .'&nbsp;&nbsp;'."\n";
 
     $menu_row .= '</form>&nbsp;';
 
@@ -649,7 +649,7 @@ function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message, $removed
             $menu_row .= addHidden('mailbox', $aMailbox['NAME']);
             $menu_row .= addHidden('msg[0]', $passed_id);
             $menu_row .= getButton('SUBMIT', 'delete', _("Delete"));
-            $menu_row .= '<input type="checkbox" name="bypass_trash">' . _("Bypass Trash");
+            $menu_row .= '<input type="checkbox" name="bypass_trash" />' . _("Bypass Trash");
         } else {
             $menu_row .= getButton('SUBMIT', 'delete', _("Delete"), '', FALSE) . "\n"; // delete button is disabled
         }