Going XHTML.

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

diff --git a/functions/global.php b/functions/global.php
index 73f4ef9b1c7f9814bcea81420878ffe980626f07..8d28dd242e7277e449d913c8dcdb41bce5ef89cc 100644 (file)
--- a/functions/global.php
+++ b/functions/global.php
@@ -136,8 +136,8 @@ function sqsession_is_registered ($name) {
   * input we should retrieve.  An example is if we have:
   *     <select name="startMessage_1">
   *     <select name="startMessage_2">
-  *     <input type="submit" name="form_submit_1">
-  *     <input type="submit" name="form_submit_2">
+  *     <input type="submit" name="form_submit_1" />
+  *     <input type="submit" name="form_submit_2" />
   * and we want to know which one of the select inputs should be
   * returned as $startMessage (without the suffix!), this function
   * decides by looking for either "form_submit_1" or "form_submit_2"
@@ -638,5 +638,3 @@ function sm_print_r() {
     print htmlentities($buffer);
     print '</pre></div>';
 }
-
-

diff --git a/functions/page_header.php b/functions/page_header.php
index c181479ddd08fdcfeaf26a2b5599496bf24aa8aa..aff1feb391eef1e8830b06e01c4cf0ce53db2303 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -46,7 +46,7 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE
 
     $header_tags = '';
 
-    $header_tags .= "<meta name=\"robots\" content=\"noindex,nofollow\">\n";
+    $header_tags .= "<meta name=\"robots\" content=\"noindex,nofollow\" />\n";
 
     $used_fontset = (!empty($chosen_fontset) ? $chosen_fontset : $default_fontset);
     $used_fontsize = (!empty($chosen_fontsize) ? $chosen_fontsize : $default_fontsize);
@@ -103,7 +103,7 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE
          * recommendations and switch to unicode.
          */
         $header_tags .= "<!-- \xfd\xfe -->\n";
-        $header_tags .= '<meta http-equiv="Content-type" content="text/html; charset=euc-jp">' . "\n";
+        $header_tags .= '<meta http-equiv="Content-type" content="text/html; charset=euc-jp" />' . "\n";
     }
     if ($do_hook) {
         // NOTE! plugins here MUST assign output to template 

diff --git a/functions/template/general_util.php b/functions/template/general_util.php
index 8ea12de51137256309db4dfc00383fe4965cacca..bfc50caa95b8a6cc4288d1bf3049002e9810ca61 100644 (file)
--- a/functions/template/general_util.php
+++ b/functions/template/general_util.php
@@ -21,18 +21,14 @@
   * @param boolean $alt       Whether or not this is an alternate 
   *                           stylesheet (optional; default TRUE).
   * @param string  $mtype     The target media display type (optional; default "screen").
-  * @param string  $xhtml_end The XHTML-compliant close tag syntax to 
-  *                           use (optional; default "/")
   *
   * @return string The full text of the stylesheet link.
   *
   */
-function create_css_link($uri, $name='', $alt=TRUE, $mtype='screen', $xhtml_end='/') {
+function create_css_link($uri, $name='', $alt=TRUE, $mtype='screen') {
 // FIXME: Add closing / to link and meta elements only after 
 //        switching to xhtml 1.0 Transitional.
 //        It is not compatible with html 4.01 Transitional
-$xhtml_end='';
-
     if (empty($uri)) {
         return '';
     }
@@ -72,7 +68,7 @@ $xhtml_end='';
         $rel   = 'rel="'.( $alt ? 'alternate ' : '' ).'stylesheet" ';
     }
 
-    return '<link '.$media.$title.$rel.'type="text/css" '.$href." $xhtml_end>\n";
+    return '<link '.$media.$title.$rel.'type="text/css" '.$href." />\n";
 }
 
 
@@ -177,5 +173,3 @@ function displayErrors () {
 function humanReadableSize ($size) {
     return show_readable_size($size);
 }
-
-

diff --git a/plugins/newmail/newmail_opt.php b/plugins/newmail/newmail_opt.php
index 24678eef40474f05575de083d037e6a60011f5e7..f8a4ba27c92f9519ad6064f52e50d2a12f3b1b91 100644 (file)
--- a/plugins/newmail/newmail_opt.php
+++ b/plugins/newmail/newmail_opt.php
@@ -191,7 +191,7 @@ if ($newmail_allowsound) {
         // upload form
         echo  html_tag('tr')
             . html_tag('td',_("Upload Media File:"),'right','','style="white-space: nowrap;"')
-            . html_tag('td','<input type="file" size="40" name="media_file">')
+            . html_tag('td','<input type="file" size="40" name="media_file" />')
             . "</tr>\n";
         // display currently uploaded file information
         echo  html_tag('tr')

diff --git a/src/options_identities.php b/src/options_identities.php
index 7a49817cb54cc8aeb8425faea980e159fb7bc705..33c5c7305d637b11f694902f5d3d6835de294636 100644 (file)
--- a/src/options_identities.php
+++ b/src/options_identities.php
@@ -196,7 +196,7 @@ function sti_input( $title, $name, $data, $bgcolor ) {
     $str = '';
     $str .= '<tr' . $bgcolor . ">\n";
     $str .= '  <td style="white-space: nowrap;text-align:right;">' . $title . ' </td>' . "\n";
-    $str .= '  <td> <input type="text" name="' . $name . '" size="50" value="'. htmlspecialchars($data) . '"> </td>' . "\n";
+    $str .= '  <td> <input type="text" name="' . $name . '" size="50" value="'. htmlspecialchars($data) . '" /> </td>' . "\n";
     $str .= '</tr>';
 
     return $str;

diff --git a/templates/default/addrbook_addedit.tpl b/templates/default/addrbook_addedit.tpl
index 8164aa75d26e581751420002970b7eb63b4fdbb5..6bc5fc6443127d430cdc9b2fbd957cb59756d341 100644 (file)
--- a/templates/default/addrbook_addedit.tpl
+++ b/templates/default/addrbook_addedit.tpl
@@ -113,7 +113,7 @@ $formname = $edit ? 'editaddr' : 'addaddr';
  </tr>
             <?php
         } else {
-            echo '<input type="hidden" name="backend" value="1">'."\n";
+            echo '<input type="hidden" name="backend" value="1" />'."\n";
         }
     }
  ?>
@@ -123,4 +123,4 @@ $formname = $edit ? 'editaddr' : 'addaddr';
   </td>
  </tr>
 </table>
-</div>
\ No newline at end of file
+</div>

diff --git a/templates/default/addrbook_search_list.tpl b/templates/default/addrbook_search_list.tpl
index d581f499f2e3787013be6cd1d8d2bf49f2eda634..6ba660eaa9faac3b26f342ad5eb94ba5905453db 100644 (file)
--- a/templates/default/addrbook_search_list.tpl
+++ b/templates/default/addrbook_search_list.tpl
@@ -73,9 +73,9 @@ if ($use_js) {
         <?php
     } else {
         ?>
-   <input type="checkbox" name=<?php echo '"send_to_search[T'.$index.']"'; ?> value=<?php echo '"'.$contact['FullAddress'].'"'; ?> id=<?php echo '"send_to_search_T'.$index.'_"'; ?>><label for=<?php echo '"send_to_search_T'.$index.'_"'; ?>><?php echo _("To"); ?></label>
-   <input type="checkbox" name=<?php echo '"send_to_search[C'.$index.']"'; ?> value=<?php echo '"'.$contact['FullAddress'].'"'; ?> id=<?php echo '"send_to_search_C'.$index.'_"'; ?>><label for=<?php echo '"send_to_search_C'.$index.'_"'; ?>><?php echo _("Cc"); ?></label>
-   <input type="checkbox" name=<?php echo '"send_to_search[B'.$index.']"'; ?> value=<?php echo '"'.$contact['FullAddress'].'"'; ?> id=<?php echo '"send_to_search_B'.$index.'_"'; ?>><label for=<?php echo '"send_to_search_B'.$index.'_"'; ?>><?php echo _("Bcc"); ?></label>
+   <input type="checkbox" name=<?php echo '"send_to_search[T'.$index.']"'; ?> value=<?php echo '"'.$contact['FullAddress'].'"'; ?> id=<?php echo '"send_to_search_T'.$index.'_"'; ?> /><label for=<?php echo '"send_to_search_T'.$index.'_"'; ?>><?php echo _("To"); ?></label>
+   <input type="checkbox" name=<?php echo '"send_to_search[C'.$index.']"'; ?> value=<?php echo '"'.$contact['FullAddress'].'"'; ?> id=<?php echo '"send_to_search_C'.$index.'_"'; ?> /><label for=<?php echo '"send_to_search_C'.$index.'_"'; ?>><?php echo _("Cc"); ?></label>
+   <input type="checkbox" name=<?php echo '"send_to_search[B'.$index.']"'; ?> value=<?php echo '"'.$contact['FullAddress'].'"'; ?> id=<?php echo '"send_to_search_B'.$index.'_"'; ?> /><label for=<?php echo '"send_to_search_B'.$index.'_"'; ?>><?php echo _("Bcc"); ?></label>
         <?php
     }
    ?> 
@@ -99,4 +99,4 @@ if (!$use_js) {
     echo '<input type="submit" name="addr_search_cancel" value="'. _("Cancel") .'" />'."\n";
 }
 ?>
-</div>
\ No newline at end of file
+</div>

diff --git a/templates/default/addressbook_search_form.tpl b/templates/default/addressbook_search_form.tpl
index 8f6cb6961b8a60291d83c8cfc4ee1ade065b696d..980dca9de5d312527990fbec6e5a4a4091e24939 100644 (file)
--- a/templates/default/addressbook_search_form.tpl
+++ b/templates/default/addressbook_search_form.tpl
@@ -54,7 +54,7 @@ extract($t);
         <?php
     } else {
         ?>
-   <input type="hidden" name="backend" value="-1">
+   <input type="hidden" name="backend" value="-1" />
         <?php
     }
    ?>
@@ -79,4 +79,4 @@ extract($t);
   </td>
  </tr>
 </table>
-</div>
\ No newline at end of file
+</div>

diff --git a/templates/default/compose_attachments.tpl b/templates/default/compose_attachments.tpl
index dd66910acdbc6f1bcfb1a783f83000830920e0cf..e4234881f5c7255ee2305758179126f518850e6f 100644 (file)
--- a/templates/default/compose_attachments.tpl
+++ b/templates/default/compose_attachments.tpl
@@ -25,7 +25,7 @@ extract($t);
    <?php echo _("New") .' '. _("Attachment");?>:
   </td>
   <td class="fieldValue">
-   <input type="file" name="attachfile" size="48">
+   <input type="file" name="attachfile" size="48" />
    &nbsp;
    <input type="submit" name="attach" value="<?php echo _("Attach"); ?>" />
    &nbsp;

diff --git a/templates/default/folder_manip.tpl b/templates/default/folder_manip.tpl
index 010b74747407026be1952256fabbdde43e8d736a..63cb82663b359d281ee3d8b951ec1bb5a52e6167 100644 (file)
--- a/templates/default/folder_manip.tpl
+++ b/templates/default/folder_manip.tpl
@@ -92,7 +92,7 @@ extract($t);
         if ( !empty($rendel_folder_list) ) {
             ?>
      <form method="post" action="folders.php" name="rf" id="rf">
-     <input type="hidden" name="smaction" value="rename">
+     <input type="hidden" name="smaction" value="rename" />
      <select name="old_name">
       <option value="">[ <?php echo _("Select a folder") ?> ]</option>
       <?php echo $rendel_folder_list ?>
@@ -123,7 +123,7 @@ extract($t);
         if ( !empty($rendel_folder_list) ) { 
             ?>
       <form method="post" action="folders.php" name="df" id="df">
-      <input type="hidden" name="smaction" value="delete">
+      <input type="hidden" name="smaction" value="delete" />
       <select name="folder_name">
        <option value="">[ <?php echo _("Select a folder") ?> ]</option>
        <?php echo $rendel_folder_list ?>
@@ -175,7 +175,7 @@ extract($t);
         if ($no_list_for_subscribe) {
             ?>
       <form method="post" action="folders.php" name="sf" id="sf">
-      <input type="hidden" name="smaction" value="subscribe">
+      <input type="hidden" name="smaction" value="subscribe" />
       <input type="text" name="folder_names[]" size="25" />
       <input type="submit" value="<?php echo _("Subscribe") ?>" />
       </form>

diff --git a/templates/default/folder_manip_dialog.tpl b/templates/default/folder_manip_dialog.tpl
index 0cb7a1f79dbc36e6ef5b3b5fda724b795122aa65..d2e033fed0ab8b8069b3a26669fd6d117ee04c51 100644 (file)
--- a/templates/default/folder_manip_dialog.tpl
+++ b/templates/default/folder_manip_dialog.tpl
@@ -69,7 +69,7 @@ if ( $dialog_type == 'rename' ) {
   <td>
    <?php echo sprintf(_("Are you sure you want to delete %s?"), $visible_folder_name); ?>
    <br /><br />
-   <input type="hidden" name="smaction" value="delete">
+   <input type="hidden" name="smaction" value="delete" />
    <input type="hidden" name="folder_name" value="<?php echo $folder_name ?>" />
    <input type="submit" name="confirmed" value="<?php echo _("Yes") ?>" />
    <input type="submit" name="cancelbutton" value="<?php echo _("No") ?>" />

diff --git a/templates/default/message_list_controls.tpl b/templates/default/message_list_controls.tpl
index 5ca52d9f5212a75823e965fbd98c61e2e1c79558..038a18a7d206e6220489aae7bf8f7efbe8091194 100644 (file)
--- a/templates/default/message_list_controls.tpl
+++ b/templates/default/message_list_controls.tpl
@@ -95,7 +95,7 @@ extract($t);
                 }
                 break;
             case 'hidden':
-                echo '<input type="hidden" name="'.$widget_name.'" value="'. $widget_attrs['value']."\">\n";
+                echo '<input type="hidden" name="'.$widget_name.'" value="'. $widget_attrs['value']."\" />\n";
                 break;
             default: break;
             }

diff --git a/templates/default/options_order.tpl b/templates/default/options_order.tpl
index 1113be5d1fe92f5ffb9c0b1270f1c6d8fd89c919..defc61a4389e2a75b904fd47b1c34720db4a74df 100644 (file)
--- a/templates/default/options_order.tpl
+++ b/templates/default/options_order.tpl
@@ -67,7 +67,7 @@ extract($t);
  <tr>
   <td>
    <form action=<?php echo '"'.$addField_action.'"'; ?> method="GET">
-   <input type="hidden" name="method" value="add">
+   <input type="hidden" name="method" value="add" />
    <select name="num">
     <?php
         foreach ($not_used as $field_id=>$name) {
@@ -88,4 +88,4 @@ extract($t);
   </td>
  </tr>
 </table>
-</div>
\ No newline at end of file
+</div>

diff --git a/templates/default/protocol_header.tpl b/templates/default/protocol_header.tpl
index ae807e8cf493d10820349250ee266034944669ce..b04120f7fdc682b8e407406421136c3085defe12 100644 (file)
--- a/templates/default/protocol_header.tpl
+++ b/templates/default/protocol_header.tpl
@@ -27,11 +27,11 @@ extract($t);
 
 if ($frames) { 
     ?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/frameset.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
     <?php
 } else { 
     ?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
     <?php 
 }
 if (empty($lang)) {

diff --git a/templates/default/read_menubar_buttons.tpl b/templates/default/read_menubar_buttons.tpl
index 4f0e4a6f3829feb36612cc38a96f6c3a1d4ca4df..21adcefc4a7be504405abf0e8a7afa9217808d1f 100644 (file)
--- a/templates/default/read_menubar_buttons.tpl
+++ b/templates/default/read_menubar_buttons.tpl
@@ -102,7 +102,7 @@ if ($nav_on_top) {
     <?php
     if ($forward_as_attachment_enabled) {
         ?>
-    <input type="checkbox" name="smaction_attache" id="smaction_attache">
+    <input type="checkbox" name="smaction_attache" id="smaction_attache" />
     <label for="smaction_attache"><?php echo _("As Attachment"); ?></label>
         <?php
     }
@@ -117,7 +117,7 @@ if ($nav_on_top) {
      <?php echo $delete_form_extra; ?>
      <small>
      <input type="submit" name="delete" value="<?php echo _("Delete"); ?>" />
-     <input type="checkbox" name="bypass_trash" id="bypass_trash"><label for="bypass_trash"><?php echo _("Bypass Trash"); ?></label>
+     <input type="checkbox" name="bypass_trash" id="bypass_trash" /><label for="bypass_trash"><?php echo _("Bypass Trash"); ?></label>
      </small>
     </form>
         <?php

diff --git a/templates/default_advanced/read_menubar_buttons.tpl b/templates/default_advanced/read_menubar_buttons.tpl
index c2566460a40ae56c35d5798cce79eff963d92d4b..0819c05f330974e33a0fd96db2f22db74040fd81 100644 (file)
--- a/templates/default_advanced/read_menubar_buttons.tpl
+++ b/templates/default_advanced/read_menubar_buttons.tpl
@@ -118,7 +118,7 @@ if ($nav_on_top) {
     <?php
     if ($forward_as_attachment_enabled) {
         ?>
-    <input type="checkbox" name="smaction_attache" id="smaction_attache">
+    <input type="checkbox" name="smaction_attache" id="smaction_attache" />
     <label for="smaction_attache"><?php echo _("As Attachment"); ?></label>
         <?php
     }
@@ -143,7 +143,7 @@ if ($show_preview_pane && $pp_refresh_message_list)
 
 echo ' />'; ?>
 
-     <input type="checkbox" name="bypass_trash" id="bypass_trash"><label for="bypass_trash"><?php echo _("Bypass Trash"); ?></label>
+     <input type="checkbox" name="bypass_trash" id="bypass_trash" /><label for="bypass_trash"><?php echo _("Bypass Trash"); ?></label>
      </small>
     </form>
         <?php