XHTML fixes

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

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 4229b4989c1ec36746304b063f392b036b296aa5..d353415a2cee961dc6360a810713cd05b84e7fc6 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -300,7 +300,7 @@ function printMessageInfo($aMsg) {
     $sSubject = str_replace(' ', ' ', decodeHeader($sSubject));
     $subject = processSubject($sSubject, $iIndent);
 
     $sSubject = str_replace(' ', ' ', decodeHeader($sSubject));
     $subject = processSubject($sSubject, $iIndent);
 

-    echo html_tag( 'tr','','','','VALIGN="top"') . "\n";
+    echo html_tag( 'tr','','','','valign="top"') . "\n";

 
     if (sizeof($index_order)) {
         foreach ($index_order as $index_order_part) {
 
     if (sizeof($index_order)) {
         foreach ($index_order as $index_order_part) {


@@ -1189,24 +1189,24 @@ function mail_message_listing_beginning ($imapConnection,
     // display flag buttons only if supported
     if ($show_flag_buttons  &&
         in_array('\\flagged',$aMailbox['PERMANENTFLAGS'], true) ) {
     // display flag buttons only if supported
     if ($show_flag_buttons  &&
         in_array('\\flagged',$aMailbox['PERMANENTFLAGS'], true) ) {

-        $button_str .= getButton('SUBMIT', 'markUnflagged', _("Unflag"));
-        $button_str .= getButton('SUBMIT', 'markFlagged',   _("Flag"));
+        $button_str .= getButton('submit', 'markUnflagged', _("Unflag"));
+        $button_str .= getButton('submit', 'markFlagged',   _("Flag"));

         $button_str .= " \n";
     }
     if (in_array('\\seen',$aMailbox['PERMANENTFLAGS'], true)) {
         $button_str .= " \n";
     }
     if (in_array('\\seen',$aMailbox['PERMANENTFLAGS'], true)) {

-        $button_str .= getButton('SUBMIT', 'markUnread', _("Unread"));
-        $button_str .= getButton('SUBMIT', 'markRead',   _("Read"));
+        $button_str .= getButton('submit', 'markUnread', _("Unread"));
+        $button_str .= getButton('submit', 'markRead',   _("Read"));

         $button_str .= " \n";
     }
         $button_str .= " \n";
     }

-    $button_str .= getButton('SUBMIT', 'attache',_("Forward")) .
+    $button_str .= getButton('submit', 'attache',_("Forward")) .

                    " \n";
     if (in_array('\\deleted',$aMailbox['PERMANENTFLAGS'], true)) {
                    " \n";
     if (in_array('\\deleted',$aMailbox['PERMANENTFLAGS'], true)) {

-        $button_str .= getButton('SUBMIT', 'delete',_("Delete"));
+        $button_str .= getButton('submit', 'delete',_("Delete"));

         $button_str .= '<input type="checkbox" name="bypass_trash" />' . _("Bypass Trash");
         $button_str .= "&nbsp;\n";
     }
     if (!$aMailbox['AUTO_EXPUNGE'] && $aMailbox['RIGHTS'] != 'READ-ONLY') {
         $button_str .= '<input type="checkbox" name="bypass_trash" />' . _("Bypass Trash");
         $button_str .= "&nbsp;\n";
     }
     if (!$aMailbox['AUTO_EXPUNGE'] && $aMailbox['RIGHTS'] != 'READ-ONLY') {

-        $button_str .= getButton('SUBMIT', 'expungeButton',_("Expunge"))  .'&nbsp;' . _("mailbox") . "\n";
+        $button_str .= getButton('submit', 'expungeButton',_("Expunge"))  .'&nbsp;' . _("mailbox") . "\n";

         $button_str .= '&nbsp;';
     }
 ?>
         $button_str .= '&nbsp;';
     }
 ?>


@@ -1240,7 +1240,7 @@ function mail_message_listing_beginning ($imapConnection,
                         <select name="targetMailbox">
                             <?php echo sqimap_mailbox_option_list($imapConnection, array(strtolower($lastTargetMailbox)), 0, $boxes); ?>
                         </select></tt>&nbsp;
                         <select name="targetMailbox">
                             <?php echo sqimap_mailbox_option_list($imapConnection, array(strtolower($lastTargetMailbox)), 0, $boxes); ?>
                         </select></tt>&nbsp;

-                        <?php echo getButton('SUBMIT', 'moveButton',_("Move")); ?>
+                        <?php echo getButton('submit', 'moveButton',_("Move")); ?>

                     </small>
                 <?php
                 }
                     </small>
                 <?php
                 }

diff --git a/plugins/filters/options.php b/plugins/filters/options.php
index 40bff9c12b9d2fbb02fa293851a5db58b8b98fb1..ecfc61397d4af6eb6b20d17f2fc1adc9e21522da 100644 (file)
--- a/plugins/filters/options.php
+++ b/plugins/filters/options.php
@@ -126,12 +126,12 @@ if (sqgetGlobalVar('filter_submit',$filter_submit,SQ_POST)) {
             '<select name="filters_user_scan_set">'.
             '<option value=""';
     if ($filters_user_scan == '') {
             '<select name="filters_user_scan_set">'.
             '<option value=""';
     if ($filters_user_scan == '') {

-        echo ' selected';
+        echo ' selected="selected"';

     }
     echo '>' . _("All messages") . '</option>'.
             '<option value="new"';
     if ($filters_user_scan == 'new') {
     }
     echo '>' . _("All messages") . '</option>'.
             '<option value="new"';
     if ($filters_user_scan == 'new') {

-        echo ' selected';
+        echo ' selected="selected"';

     }
     echo '>' . _("Only unread messages") . '</option>' .
             '</select>'.
     }
     echo '>' . _("Only unread messages") . '</option>' .
             '</select>'.


@@ -163,23 +163,23 @@ if (sqgetGlobalVar('filter_submit',$filter_submit,SQ_POST)) {
 
         $L = isset($filters[$theid]['where']);
 
 
         $L = isset($filters[$theid]['where']);
 

-        $sel = (($L && $filters[$theid]['where'] == 'From')?'selected':'');
-        echo "<option value=\"From\" $sel>" . _("From") . '</option>';
+        $sel = (($L && $filters[$theid]['where'] == 'From')?' selected="selected"':'');
+        echo "<option value=\"From\"$sel>" . _("From") . '</option>';

 
 

-        $sel = (($L && $filters[$theid]['where'] == 'To')?'selected':'');
-        echo "<option value=\"To\" $sel>" . _("To") . '</option>';
+        $sel = (($L && $filters[$theid]['where'] == 'To')?' selected="selected"':'');
+        echo "<option value=\"To\"$sel>" . _("To") . '</option>';

 
 

-        $sel = (($L && $filters[$theid]['where'] == 'Cc')?'selected':'');
-        echo "<option value=\"Cc\" $sel>" . _("Cc") . '</option>';
+        $sel = (($L && $filters[$theid]['where'] == 'Cc')?' selected="selected"':'');
+        echo "<option value=\"Cc\"$sel>" . _("Cc") . '</option>';

 
 

-        $sel = (($L && $filters[$theid]['where'] == 'To or Cc')?'selected':'');
-        echo "<option value=\"To or Cc\" $sel>" . _("To or Cc") . '</option>';
+        $sel = (($L && $filters[$theid]['where'] == 'To or Cc')?' selected="selected"':'');
+        echo "<option value=\"To or Cc\"$sel>" . _("To or Cc") . '</option>';

 
 

-        $sel = (($L && $filters[$theid]['where'] == 'Subject')?'selected':'');
-        echo "<option value=\"Subject\" $sel>" . _("Subject") . '</option>';
+        $sel = (($L && $filters[$theid]['where'] == 'Subject')?' selected="selected"':'');
+        echo "<option value=\"Subject\"$sel>" . _("Subject") . '</option>';

 
 

-        $sel = (($L && $filters[$theid]['where'] == 'Header')?'selected':'');
-        echo "<option value=\"Header\" $sel>" . _("Header") . '</option>';
+        $sel = (($L && $filters[$theid]['where'] == 'Header')?' selected="selected"':'');
+        echo "<option value=\"Header\"$sel>" . _("Header") . '</option>';

 
         echo         '</select>'.
                 '</td>'.
 
         echo         '</select>'.
                 '</td>'.

diff --git a/plugins/message_details/message_details_bottom.php b/plugins/message_details/message_details_bottom.php
index be24a0b21e162a9207b3e480781936a96a4a2320..29c6d8fec280642f82a95ded926409ed181a4058 100644 (file)
--- a/plugins/message_details/message_details_bottom.php
+++ b/plugins/message_details/message_details_bottom.php
@@ -104,7 +104,7 @@ for ($i=1; $i < $count; $i++) {
         } else if ($messageheader) {
             if ($header) {
                 $header=false;
         } else if ($messageheader) {
             if ($header) {
                 $header=false;

-                $end = "\n \n".'</div>'."\n \n".'<div class="ent_body" ID="'.$entStr.'B">'."\n \n"; 
+                $end = "\n \n".'</div>'."\n \n".'<div class="ent_body" id="'.$entStr.'B">'."\n \n"; 

             }
             $mimepart = -$header;
             $bnd_end = false;
             }
             $mimepart = -$header;
             $bnd_end = false;


@@ -116,7 +116,7 @@ for ($i=1; $i < $count; $i++) {
         } else {
             if ($header) {
                 $pre = '';
         } else {
             if ($header) {
                 $pre = '';

-                $end = "\n \n".'</div>'."\n \n".'<div class="ent_body" ID="'.$entStr.'B">'."\n \n"; 
+                $end = "\n \n".'</div>'."\n \n".'<div class="ent_body" id="'.$entStr.'B">'."\n \n"; 

             }
             $header = false;
             $mimepart=true;
             }
             $header = false;
             $mimepart=true;


@@ -191,7 +191,7 @@ for ($i=1; $i < $count; $i++) {
                 $content_indx++;
                 $content[$content_indx]=array();
                 $content[$content_indx]['ent'] = '<a href="#'."$entStr \">$entStr".'</a>';
                 $content_indx++;
                 $content[$content_indx]=array();
                 $content[$content_indx]['ent'] = '<a href="#'."$entStr \">$entStr".'</a>';

-                $pre .= "\n \n".'</div>'."\n \n".'<div class="entheader" ID="'.$entStr.'H"><a name="'."$entStr".'"><b><font color="'.$color[2].'">';
+                $pre .= "\n \n".'</div>'."\n \n".'<div class="entheader" id="'.$entStr.'H"><a name="'."$entStr".'"><b><font color="'.$color[2].'">';

                 $end .= '</font></b>'."\n";
                 $header = true;
                 $mimepart = false;
                 $end .= '</font></b>'."\n";
                 $header = true;
                 $mimepart = false;

diff --git a/plugins/spamcop/options.php b/plugins/spamcop/options.php
index 6367d1c40389481d06377b741936f444594f768c..d722d0d55e1354914e23fe15acd610f85e8428ee 100755 (executable)
--- a/plugins/spamcop/options.php
+++ b/plugins/spamcop/options.php
@@ -113,20 +113,20 @@ spamcop_load();
                <?php
                    if ($spamcop_quick_report) {
                        echo '<option value="quick_email"';
                <?php
                    if ($spamcop_quick_report) {
                        echo '<option value="quick_email"';

-                       if ($spamcop_method == 'quick_email') echo ' selected';
+                       if ($spamcop_method == 'quick_email') echo ' selected="selected"';

                        echo ">"._("Quick email-based reporting");
                        echo '</option>';
                    }
                ?>
              <option value="thorough_email"
                <?php
                        echo ">"._("Quick email-based reporting");
                        echo '</option>';
                    }
                ?>
              <option value="thorough_email"
                <?php

-                 if ($spamcop_method == 'thorough_email') echo ' selected';
+                 if ($spamcop_method == 'thorough_email') echo ' selected="selected"';

                  echo ">"._("Thorough email-based reporting");
                ?>
              </option>
              <option value="web_form"
                <?php
                  echo ">"._("Thorough email-based reporting");
                ?>
              </option>
              <option value="web_form"
                <?php

-                 if ($spamcop_method == 'web_form') echo ' selected';
+                 if ($spamcop_method == 'web_form') echo ' selected="selected"';

                  echo ">"._("Web-based form");
                ?>
              </option>
                  echo ">"._("Web-based form");
                ?>
              </option>


@@ -146,13 +146,13 @@ spamcop_load();
            <select name="type">
              <option value="free"
                <?php
            <select name="type">
              <option value="free"
                <?php

-                 if ($spamcop_type == 'free') echo ' selected';
+                 if ($spamcop_type == 'free') echo ' selected="selected"';

                  echo ">"._("Free reporting");
                ?>
              </option>
              <option value="member"
                <?php
                  echo ">"._("Free reporting");
                ?>
              </option>
              <option value="member"
                <?php

-                 if ($spamcop_type == 'member') echo ' selected';
+                 if ($spamcop_type == 'member') echo ' selected="selected"';

                  echo ">"._("Member services");
                ?>
              </option>
                  echo ">"._("Member services");
                ?>
              </option>

diff --git a/plugins/squirrelspell/modules/init.mod b/plugins/squirrelspell/modules/init.mod
index f303b2caf77d98045bd5421993cc3f02ab4b74af..6d384be3703862b9379b2daa911903a6c75cb60c 100644 (file)
--- a/plugins/squirrelspell/modules/init.mod
+++ b/plugins/squirrelspell/modules/init.mod
@@ -45,7 +45,7 @@ if (sizeof($langs)==1){
   for ($i=0; $i<sizeof($langs); $i++){
     $msg .= "<option";
     if (!$i) {
   for ($i=0; $i<sizeof($langs); $i++){
     $msg .= "<option";
     if (!$i) {

-      $msg .= ' selected';
+      $msg .= ' selected="selected"';

     }
     $msg .= " value=\"$langs[$i]\"> " . _($langs[$i]) . "</option>\n";
   }  
     }
     $msg .= " value=\"$langs[$i]\"> " . _($langs[$i]) . "</option>\n";
   }  

diff --git a/src/left_main.php b/src/left_main.php
index 7d8ecffd597b5f0e96ac18c2c5a6f11d12b4b492..9a1d4beb8d1589b188b9cd220b415e9cfc86a574 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -69,7 +69,7 @@ function formatMailboxName($imapConnection, $box_array) {
     /* Create the link for this folder. */
     if ($status !== false) {
     $line .= '<a href="right_main.php?PG_SHOWALL=0&amp;startMessage=1&amp;mailbox='.
     /* Create the link for this folder. */
     if ($status !== false) {
     $line .= '<a href="right_main.php?PG_SHOWALL=0&amp;startMessage=1&amp;mailbox='.

-                $mailboxURL.'" TARGET="right" STYLE="text-decoration:none">';
+                $mailboxURL.'" target="right" style="text-decoration:none">';

     }
     if ($special_color) {
         $line .= "<font color=\"$color[11]\">";
     }
     if ($special_color) {
         $line .= "<font color=\"$color[11]\">";


@@ -663,7 +663,7 @@ if (! isset($oldway) || $oldway=="" ) {
 
 if ($advanced_tree) {
 $xtra .= <<<ECHO
 
 if ($advanced_tree) {
 $xtra .= <<<ECHO

-<script language="Javascript" TYPE="text/javascript">
+<script language="Javascript" type="text/javascript">

 
 <!--
 
 
 <!--
 

diff --git a/src/options_highlight.php b/src/options_highlight.php
index efc66d1fd35f04d1cde152a2031150b4a97b51b1..c6d558d5022ac73111c04208d4e1b26047f4d9c8 100644 (file)
--- a/src/options_highlight.php
+++ b/src/options_highlight.php
@@ -42,7 +42,7 @@ sqGetGlobalVar('value', $value);
 function oh_opt( $val, $sel, $tit ) {
     echo "<option value=\"$val\"";
     if ( $sel )
 function oh_opt( $val, $sel, $tit ) {
     echo "<option value=\"$val\"";
     if ( $sel )

-        echo ' selected';
+        echo ' selected="selected"';

     echo  ">$tit</option>\n";
 }
 
     echo  ">$tit</option>\n";
 }
 

diff --git a/src/read_body.php b/src/read_body.php
index fa638803a37f358f4d4eb71397f5b38584b2d220..e07ab9db62189953a5d8505d2de76ce365a8c7e9 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -630,11 +630,11 @@ function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message, $removed
     }
     // Show Alt URI for Draft/Sent
     if (isset($comp_alt_string))
     }
     // Show Alt URI for Draft/Sent
     if (isset($comp_alt_string))

-        $menu_row .= getButton('SUBMIT', $new_button, $comp_alt_string, $on_click) . "\n";
+        $menu_row .= getButton('submit', $new_button, $comp_alt_string, $on_click) . "\n";

 
 

-    $menu_row .= getButton('SUBMIT', 'smaction_reply', _("Reply"), $on_click) . "\n";
-    $menu_row .= getButton('SUBMIT', 'smaction_reply_all', _("Reply All"), $on_click) ."\n";
-    $menu_row .= getButton('SUBMIT', 'smaction_forward', _("Forward"), $on_click);
+    $menu_row .= getButton('submit', 'smaction_reply', _("Reply"), $on_click) . "\n";
+    $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";
 
     if ($enable_forward_as_attachment)
         $menu_row .= '<input type="checkbox" name="smaction_attache" />' . _("As Attachment") .'&nbsp;&nbsp;'."\n";
 


@@ -648,10 +648,10 @@ function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message, $removed
         if (!(isset($passed_ent_id) && $passed_ent_id)) {
             $menu_row .= addHidden('mailbox', $aMailbox['NAME']);
             $menu_row .= addHidden('msg[0]', $passed_id);
         if (!(isset($passed_ent_id) && $passed_ent_id)) {
             $menu_row .= addHidden('mailbox', $aMailbox['NAME']);
             $menu_row .= addHidden('msg[0]', $passed_id);

-            $menu_row .= getButton('SUBMIT', 'delete', _("Delete"));
+            $menu_row .= getButton('submit', 'delete', _("Delete"));

             $menu_row .= '<input type="checkbox" name="bypass_trash" />' . _("Bypass Trash");
         } else {
             $menu_row .= '<input type="checkbox" name="bypass_trash" />' . _("Bypass Trash");
         } else {

-            $menu_row .= getButton('SUBMIT', 'delete', _("Delete"), '', FALSE) . "\n"; // delete button is disabled
+            $menu_row .= getButton('submit', 'delete', _("Delete"), '', FALSE) . "\n"; // delete button is disabled

         }
 
         $menu_row .= '</form>';
         }
 
         $menu_row .= '</form>';


@@ -676,7 +676,7 @@ function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message, $removed
         }
         $menu_row .= '</select> ';
 
         }
         $menu_row .= '</select> ';
 

-        $menu_row .= getButton('SUBMIT', 'moveButton',_("Move")) . "\n" . '</form>';
+        $menu_row .= getButton('submit', 'moveButton',_("Move")) . "\n" . '</form>';

     }
     $menu_row .= '</td></tr>';
 
     }
     $menu_row .= '</td></tr>';
 

diff --git a/src/search.php b/src/search.php
index 720cec595c9edb60dac04d78f7c340f4e0b0ccdb..f14484e1fbb6021dca27ffa85b21475baa03d030 100644 (file)
--- a/src/search.php
+++ b/src/search.php
@@ -661,7 +661,7 @@ function asearch_print_recent(&$boxes)
 */
 function asearch_opt($val, $sel, $tit)
 {
 */
 function asearch_opt($val, $sel, $tit)
 {

-    return '<option value="' . $val . '"' . ($sel == $val ? ' selected' : '') . '>' . $tit . '</option>' . "\n";
+    return '<option value="' . $val . '"' . ($sel == $val ? ' selected="selected"' : '') . '>' . $tit . '</option>' . "\n";

 }
 
 /** Build a <select> statement from an array
 }
 
 /** Build a <select> statement from an array


@@ -797,10 +797,10 @@ function asearch_print_form($imapConnection, &$boxes, $mailbox_array, $biop_arra
 //Submit buttons
     echo html_tag('table', '', 'center', $color[9], 'width="100%" cellpadding="1" cellspacing="0" border="0"');
     echo html_tag('tr',
 //Submit buttons
     echo html_tag('table', '', 'center', $color[9], 'width="100%" cellpadding="1" cellspacing="0" border="0"');
     echo html_tag('tr',

-                html_tag('td', getButton('SUBMIT', 'submit', $search_button_html), 'center') . "\n"
-            . html_tag('td', getButton('SUBMIT', 'submit', $add_criteria_button_html), 'center') . "\n"
-            . html_tag('td', getButton('SUBMIT', 'submit', $del_all_button_html), 'center') . "\n"
-            . html_tag('td', getButton('SUBMIT', 'submit', $del_excluded_button_html), 'center') . "\n"
+                html_tag('td', getButton('submit', 'submit', $search_button_html), 'center') . "\n"
+            . html_tag('td', getButton('submit', 'submit', $add_criteria_button_html), 'center') . "\n"
+            . html_tag('td', getButton('submit', 'submit', $del_all_button_html), 'center') . "\n"
+            . html_tag('td', getButton('submit', 'submit', $del_excluded_button_html), 'center') . "\n"

             );
     echo '</table>' . "\n";
     echo '</form>' . "\n";
             );
     echo '</table>' . "\n";
     echo '</form>' . "\n";


@@ -825,7 +825,7 @@ function asearch_print_form_row_basic($imapConnection, &$boxes, $mailbox, $biop,
     echo html_tag('td', asearch_get_form_what($what), 'center') . "\n";
 
 //Submit button
     echo html_tag('td', asearch_get_form_what($what), 'center') . "\n";
 
 //Submit button

-    echo html_tag('td', getButton('SUBMIT', 'submit', $search_button_html), 'center') . "\n";
+    echo html_tag('td', getButton('submit', 'submit', $search_button_html), 'center') . "\n";

 
     echo "</tr>\n";
 }
 
     echo "</tr>\n";
 }


@@ -892,7 +892,7 @@ function asearch_print_mailbox_msgs($imapConnection, &$aMailbox, $color)
     mail_message_listing_beginning($imapConnection, $aMailbox, $msg_cnt_str, $mailbox_title . " $paginator_str");
     echo '</td></tr>';
 
     mail_message_listing_beginning($imapConnection, $aMailbox, $msg_cnt_str, $mailbox_title . " $paginator_str");
     echo '</td></tr>';
 

-    echo '<tr><td HEIGHT="5" BGCOLOR="'.$color[4].'"></td></tr>';
+    echo '<tr><td height="5" bgcolor="'.$color[4].'"></td></tr>';

 
     echo '<tr><td>';
     echo '    <table width="100%" cellpadding="1" cellspacing="0" align="center"'.' border="0" bgcolor="'.$color[9].'">';
 
     echo '<tr><td>';
     echo '    <table width="100%" cellpadding="1" cellspacing="0" align="center"'.' border="0" bgcolor="'.$color[9].'">';