<?php echo "$org_title: " . _("Address Book"); ?>

From 39bfea8fa9fd939da9766a79381f68ea4b725c23 Mon Sep 17 00:00:00 2001 From: jervfors Date: Sat, 14 Aug 2004 02:41:12 +0000 Subject: [PATCH] XHTML fixes git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@7897 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/forms.php | 2 +- src/addrbook_popup.php | 2 +- src/addrbook_search.php | 54 +++++++++++----------- src/addrbook_search_html.php | 86 +++++++++++++++++----------------- src/addressbook.php | 40 ++++++++-------- src/compose.php | 90 ++++++++++++++++++------------------ src/folders.php | 2 +- src/folders_create.php | 4 +- src/help.php | 14 +++--- src/left_main.php | 19 ++++---- src/options.php | 22 ++++----- src/options_highlight.php | 20 ++++---- src/options_identities.php | 12 ++--- src/options_order.php | 4 +- src/read_body.php | 2 +- 15 files changed, 184 insertions(+), 189 deletions(-) diff --git a/functions/forms.php b/functions/forms.php index 3583a33f..b6ce3b37 100644 --- a/functions/forms.php +++ b/functions/forms.php @@ -128,7 +128,7 @@ function addTextArea($name, $text = '', $cols = 40, $rows = 10, $attr = '') { /** * Make a

start-tag. */ -function addForm($action, $method = 'POST', $name = '', $enctype = '', $charset = '') +function addForm($action, $method = 'post', $name = '', $enctype = '', $charset = '') { if($name) { $name = ' name="'.$name.'"'; diff --git a/src/addrbook_popup.php b/src/addrbook_popup.php index 1800c3cf..e10dc451 100644 --- a/src/addrbook_popup.php +++ b/src/addrbook_popup.php @@ -29,7 +29,7 @@ require_once(SM_PATH . 'functions/addressbook.php'); <?php echo "$org_title: " . _("Address Book"); ?> - + To | " . + "'" . $email . "');\">To | " . 'Cc | " . + "'" . $email . "');\">Cc | " . 'Bcc", + "'" . $email . "');\">Bcc", 'center', '', 'valign="top" width="5%" nowrap' ) . html_tag( 'td', ' ' . htmlspecialchars($row['name']), 'left', '', 'valign="top" nowrap' ) . html_tag( 'td', ' ' . '" . htmlspecialchars($row['email']) . '' + "'" . $email . "');\">" . htmlspecialchars($row['email']) . '' , 'left', '', 'valign="top"' ) . html_tag( 'td', htmlspecialchars($row['label']), 'left', '', 'valign="top" nowrap' ); if ($includesource) { @@ -181,22 +181,22 @@ if (!isset($backend)) { $backend = ''; } /* Choose correct colors for top and bottom frame */ if ($show == 'form' && !isset($listall)) { - echo ''; } else { - echo '\n"; + echo '\n"; } /* Empty search */ if (empty($query) && empty($show) && empty($listall)) { - echo html_tag( 'p', '
' . + echo html_tag( 'p', '
' . _("No persons matching your search were found"), 'center' ) . - "\n\n", + "\n\n", exit; } @@ -205,8 +205,8 @@ $abook = addressbook_init(); /* Create search form */ if ($show == 'form' && empty($listall)) { - echo '' . "\n" . + echo '' . "\n" . html_tag( 'table', '', '', '', 'border="0" width="100%" height="100%"' ) . html_tag( 'tr' ) . html_tag( 'td', ' ' . _("Search for") . "\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 */ if ($abook->numbackends > 1) { - echo '' . _("in") . ' '."\n". + echo '' . _("in") . ' '."\n". $selopts['-1'] = _("All address books"); $ret = $abook->get_backend_list(); @@ -231,11 +231,11 @@ if ($show == 'form' && empty($listall)) { html_tag( 'tr', html_tag( 'td', '', 'left' ) . html_tag( 'td', - '' . - ' | ' . "\n" . - ' | ' . "\n" , + '' . + ' | ' . "\n" . + ' | ' . "\n" , 'left' ) ) . '

' . "\n"; @@ -280,19 +280,19 @@ if ($show == 'form' && empty($listall)) { } if (!is_array($res)) { - echo html_tag( 'p', '
' . + echo html_tag( 'p', '
' . _("Your search failed with the following error(s)") . - ':
' . $abook->error . "\n" , + ':
' . $abook->error . "\n" , 'center' ) . - "\n\n"; + "\n\n"; exit; } if (sizeof($res) == 0) { - echo html_tag( 'p', '
' . + echo html_tag( 'p', '
' . _("No persons matching your search were found") . "\n" , 'center' ) . - "\n\n"; + "\n\n"; exit; } @@ -301,7 +301,5 @@ if ($show == 'form' && empty($listall)) { } } - -echo "\n"; - ?> + diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php index 1e0f8f45..3b128f92 100644 --- a/src/addrbook_search_html.php +++ b/src/addrbook_search_html.php @@ -19,7 +19,7 @@ * @ignore */ if (! defined('SM_PATH') ) { - define('SM_PATH','../'); + define('SM_PATH','../'); } /** SquirrelMail required files. */ @@ -53,12 +53,12 @@ function addr_insert_hidden() { echo addHidden('session', $session). 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' ) . html_tag( 'td', - ' ' . _("To") . ' ' . - ' ' . _("Cc") . ' ' . - ' ' . _("Bcc") . ' ' , + ' ' . _("To") . ' ' . + ' ' . _("Cc") . ' ' . + ' ' . _("Bcc") . ' ' , 'center', '', 'width="5%" nowrap' ) . html_tag( 'td', ' ' . htmlspecialchars($row['lastname']) . ' ' . htmlspecialchars($row['firstname']) . ' ', 'left', '', 'nowrap' ) . html_tag( 'td', ' ' . htmlspecialchars($row['email']) . ' ', 'left', '', 'nowrap' ) . @@ -134,12 +134,12 @@ if ($javascript_on) { } else { echo html_tag( 'tr', '', '', $tr_bgcolor, 'nowrap' ) . html_tag( 'td', - addCheckBox('send_to_search[T'.$line.']', FALSE, $email). + addCheckBox('send_to_search[T'.$line.']', FALSE, $email). ' ' . _("To") . ' ' . - addCheckBox('send_to_search[C'.$line.']', FALSE, $email). - ' ' . _("Cc") . ' ' . - addCheckBox('send_to_search[B'.$line.']', FALSE, $email). - ' ' . _("Bcc") . ' ' , + addCheckBox('send_to_search[C'.$line.']', FALSE, $email). + ' ' . _("Cc") . ' ' . + addCheckBox('send_to_search[B'.$line.']', FALSE, $email). + ' ' . _("Bcc") . ' ' , 'center', '', 'width="5%" nowrap' ) . html_tag( 'td', ' ' . htmlspecialchars($row['name']) . ' ', 'left', '', 'nowrap' ) . html_tag( 'td', ' ' . htmlspecialchars($row['email']) . ' ', 'left', '', 'nowrap' ) . @@ -155,13 +155,13 @@ if ($javascript_on) { if ($includesource) { $td_colspan = '5'; } else { $td_colspan = '4'; } echo html_tag( 'tr', html_tag( 'td', - '' , + '' , 'center', '', 'colspan="'. $td_colspan .'"' ) ) . - '' . - addHidden('html_addr_search_done', '1'). - ''; + '' . + addHidden('html_addr_search_done', '1'). + ''; } /* --- End functions --- */ @@ -176,7 +176,7 @@ else { $abook = addressbook_init(); -echo '
' . +echo '
' . html_tag( 'table', html_tag( 'tr', html_tag( 'td', '' . _("Address Book Search") . '', 'center', $color[0] ) @@ -189,9 +189,9 @@ echo '' . html_tag( 'table', '', 'center', '', 'border="0"' ) . html_tag( 'tr' ) . html_tag( 'td', '', 'left', '', 'nowrap valign="middle"' ) . "\n" . - addForm($PHP_SELF.'?html_addr_search=true', 'POST', 'f'). - "\n\n" . - ' ' . _("Search for") . "\n"; + addForm($PHP_SELF.'?html_addr_search=true', 'post', 'f'). + "\n\n" . + ' ' . _("Search for") . "\n"; addr_insert_hidden(); if (! isset($addrquery)) $addrquery = ''; @@ -200,13 +200,13 @@ echo addInput('addrquery', $addrquery, 26); /* List all backends to allow the user to choose where to search */ if (!isset($backend)) { $backend = ''; } if ($abook->numbackends > 1) { - echo '' . _("in") . ' '; + echo '' . _("in") . ' '; $selopts['-1'] = _("All address books"); $ret = $abook->get_backend_list(); while (list($undef,$v) = each($ret)) { - $selopts[$v->bnum] = $v->sname; + $selopts[$v->bnum] = $v->sname; } echo addSelect('backend', $selopts, $backend, TRUE); } else { @@ -216,10 +216,10 @@ if (isset($session)) { echo addHidden('session', $session); } -echo '' . - ' | ' . "\n" . - '' . "\n"; +echo '' . + ' | ' . "\n" . + '' . "\n"; addr_insert_hidden(); echo ''; do_hook('addrbook_html_search_below'); @@ -238,7 +238,7 @@ if ($addrquery == '' && empty($listall)) { $backend = $abook->localbackend; } - /* echo '
' . $abook->backends[$backend]->sname) . "
\n"; */ + /* echo '
' . $abook->backends[$backend]->sname) . "
\n"; */ $res = $abook->list_addr($backend); @@ -246,7 +246,7 @@ if ($addrquery == '' && empty($listall)) { usort($res,'alistcmp'); addr_display_result($res, false); } else { - echo html_tag( 'p', '
' . + echo html_tag( 'p', '
' . sprintf(_("Unable to list addresses from %s"), $abook->backends[$backend]->sname) . "\n" , 'center' ); @@ -271,17 +271,17 @@ else { } if (!is_array($res)) { - echo html_tag( 'p', '
' . + echo html_tag( 'p', '
' . _("Your search failed with the following error(s)") . - ':
' . $abook->error . "\n" , + ':
' . $abook->error . "\n" , 'center' ) . - "\n\n"; + "\n\n"; } else { if (sizeof($res) == 0) { - echo html_tag( 'p', '
' . + echo html_tag( 'p', '
' . _("No persons matching your search were found") . "\n" , 'center' ) . - "\n\n"; + "\n\n"; } else { addr_display_result($res); } @@ -290,11 +290,11 @@ else { } if ($addrquery == '' || sizeof($res) == 0) { - /* printf(''."\n", $PHP_SELF); */ + /* printf('
'."\n", $PHP_SELF); */ echo ''. - addForm('compose.php','POST','k'); + addForm('compose.php','POST','k'); addr_insert_hidden(); - echo '' . "\n" . + echo '' . "\n" . ''; } diff --git a/src/addressbook.php b/src/addressbook.php index 7c3ae718..aaeb00fd 100644 --- a/src/addressbook.php +++ b/src/addressbook.php @@ -79,7 +79,7 @@ function address_form($name, $submittext, $values = array()) { { echo html_tag( 'table', addressbook_inp_field(_("Nickname"), 'nickname', $name, 15, $values, - ' ' . _("Must be unique") . '') . + ' ' . _("Must be unique") . '') . addressbook_inp_field(_("E-mail address"), 'email', $name, 45, $values, '') . addressbook_inp_field(_("Last name"), 'lastname', $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) . html_tag( 'tr', html_tag( 'td', - '', + '', 'center', $color[4], 'colspan="2"') ) , 'center', '', 'border="0" cellpadding="1" width="90%"') ."\n"; } else { echo html_tag( 'table', addressbook_inp_field(_("Nickname"), 'nickname', $name, 15, $values, - ' ' . _("Must be unique") . '') . + ' ' . _("Must be unique") . '') . addressbook_inp_field(_("E-mail address"), 'email', $name, 45, $values, '') . addressbook_inp_field(_("First name"), 'firstname', $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) . html_tag( 'tr', html_tag( 'td', - '', + '', 'center', $color[4], 'colspan="2"') ) , 'center', '', 'border="0" cellpadding="1" width="90%"') ."\n"; @@ -115,12 +115,12 @@ function list_writable_backends($name) { global $color, $abook; if ( $name != 'addaddr' ) { return; } if ( $abook->numbackends > 1 ) { - $ret = "'; $backends = $abook->get_backend_list(); while (list($undef,$v) = each($backends)) { if ($v->writeable) { - $ret .= '\n"; } } $ret .= ""; @@ -247,7 +247,7 @@ if(sqgetGlobalVar('REQUEST_METHOD', $req_method, SQ_SERVER) && $req_method == 'P $olddata = $abook->lookup($enick, $ebackend); /* Display the "new address" form */ - echo '
' . + echo '' . "\n" . html_tag( 'table', html_tag( 'tr', @@ -260,7 +260,7 @@ if(sqgetGlobalVar('REQUEST_METHOD', $req_method, SQ_SERVER) && $req_method == 'P echo addHidden('oldnick', $olddata['nickname']). addHidden('backend', $olddata['backend']). addHidden('doedit', '1'). - '
'; + ''; } } else { @@ -282,8 +282,8 @@ if(sqgetGlobalVar('REQUEST_METHOD', $req_method, SQ_SERVER) && $req_method == 'P 'center', '', 'width="100%"' ); /* Display the "new address" form again */ - echo '
' . "\n" . + echo '' . "\n" . html_tag( 'table', html_tag( 'tr', html_tag( 'td', @@ -296,7 +296,7 @@ if(sqgetGlobalVar('REQUEST_METHOD', $req_method, SQ_SERVER) && $req_method == 'P addHidden('oldnick', $oldnick). addHidden('backend', $backend). addHidden('doedit', '1'). - "\n" . '
'; + "\n" . ''; $abortform = true; } } 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 if($abortform) { - echo "\n"; + echo "\n"; exit(); } } @@ -328,7 +328,7 @@ if (!empty($formerror)) { echo html_tag( 'table', html_tag( 'tr', html_tag( 'td', - "\n". '
' . _("ERROR") . ': ' . $formerror . '' ."\n", 'center' ) ), @@ -362,14 +362,14 @@ if ($showaddrlist) { echo html_tag( 'table', html_tag( 'tr', html_tag( 'td', - '\n" . - '\n", 'center', '', 'colspan="5"' ) ) . html_tag( 'tr', - html_tag( 'td', '
', 'center', '', 'colspan="5"' ) + html_tag( 'td', '
', 'center', '', 'colspan="5"' ) ) , 'center' ); echo "\n\n" . @@ -440,7 +440,7 @@ if ($showaddrlist) { if ($abook->backends[$row['backend']]->writeable) { echo html_tag( 'td', '' . - '' , 'center', '', 'valign="top" width="1%"' ); } else { diff --git a/src/compose.php b/src/compose.php index 80e48826..c0fe8795 100644 --- a/src/compose.php +++ b/src/compose.php @@ -929,14 +929,14 @@ function showInputForm ($session, $values=false) { } if ($use_javascript_addr_book) { - echo "\n". '\n\n"; + "// -->\n\n\n"; } echo "\n" . '
'. _("Draft Saved").''; + echo '
'. _("Draft Saved").''; } if ($mail_sent == 'yes') { - echo '
'. _("Your Message has been sent.").''; + echo '
'. _("Your Message has been sent.").''; } echo '' . "\n"; if ($compose_new_win == '1') { - echo '
'."\n" . - ' '. html_tag( 'td', '', 'right' ) . ''."\n"; + echo '
'."\n" . + ' '. html_tag( 'td', '', 'right' ) . ''."\n"; } if ($location_of_buttons == 'top') { showComposeButtonRow(); @@ -996,7 +996,7 @@ function showInputForm ($session, $values=false) { echo ' ' . "\n" . html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) . - _("To:") . '' . "\n" . + _("To:") . '' . "\n" . html_tag( 'td', '', 'left', $color[4], 'width="90%"' ) . addInput('send_to', $send_to, 60). '
' . "\n" . ' ' . "\n" . @@ -1029,16 +1029,16 @@ function showInputForm ($session, $values=false) { /* why this distinction? */ if ($compose_new_win == '1') { - echo ' ' . "\n" . - '
' . "\n" . - ' '; + 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 { - echo ' <TR>' . "\n" . - ' <TD BGCOLOR="' . $color[4] . '" COLSPAN=2>' . "\n" . - ' <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" . + ' <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)) { @@ -1116,7 +1116,7 @@ function showInputForm ($session, $values=false) { html_tag( 'td', '', 'left', '', 'valign="middle"' ) . ' <input name="attachfile" size="48" type="file" />' . "\n" . ' <input type="submit" name="attach"' . - ' value="' . _("Add") .'">' . "\n" . + ' value="' . _("Add") .'" />' . "\n" . $maxsize . ' </td>' . "\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><td colspan="2"><input type="submit" name="do_delete" value="' . - _("Delete selected attachments") . "\">\n" . + _("Delete selected attachments") . "\" />\n" . '</td></tr>'; } echo ' </table>' . "\n" . ' </td>' . "\n" . ' </tr>' . "\n" . - ' </TABLE>' . "\n" . - ' </TD>' . "\n" . - ' </TR>' . "\n"; + ' </table>' . "\n" . + ' </td>' . "\n" . + ' </tr>' . "\n"; } // End of file_uploads if-block /* End of attachment code */ if ($compose_new_win == '1') { - echo '</TABLE>'."\n"; + echo '</table>'."\n"; } - echo '</TABLE>' . "\n" . + echo '</table>' . "\n" . addHidden('username', $username). addHidden('smaction', $action). addHidden('mailbox', $mailbox); @@ -1181,7 +1181,7 @@ function showInputForm ($session, $values=false) { } do_hook('compose_bottom'); - echo '</BODY></HTML>' . "\n"; + echo '</body></html>' . "\n"; } @@ -1191,9 +1191,9 @@ function showComposeButtonRow() { $request_mdn, $request_dr, $data_dir, $username; - echo ' <TR>' . "\n" . - ' <TD></TD>' . "\n" . - ' <TD>' . "\n"; + echo ' <tr>' . "\n" . + ' <td></td>' . "\n" . + ' <td>' . "\n"; if ($default_use_priority) { if(!isset($mailprio)) { $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) { - echo " <SCRIPT LANGUAGE=JavaScript></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 { - 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) { - 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'); - echo ' </TD>' . "\n" . - ' </TR>' . "\n\n"; + echo ' </td>' . "\n" . + ' </tr>' . "\n\n"; } function checkInput ($show) { @@ -1546,4 +1546,4 @@ function deliverMessage($composeMessage, $draft=false) { return $succes; } -?> +?> \ No newline at end of file diff --git a/src/folders.php b/src/folders.php index 632ccf69..b9d959db 100644 --- a/src/folders.php +++ b/src/folders.php @@ -80,7 +80,7 @@ if ( isset($success) && $success ) { echo html_tag( 'table', html_tag( 'tr', 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>' , 'center' ) ) , diff --git a/src/folders_create.php b/src/folders_create.php index a4c472b2..2affca0a 100644 --- a/src/folders_create.php +++ b/src/folders_create.php @@ -42,7 +42,7 @@ if (substr_count($folder_name, '"') || substr_count($folder_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; } @@ -76,4 +76,4 @@ sqimap_logout($imapConnection); $location = get_location(); header ("Location: $location/folders.php?success=create"); -?> +?> \ No newline at end of file diff --git a/src/help.php b/src/help.php index 1fb1c309..8e59f318 100644 --- a/src/help.php +++ b/src/help.php @@ -121,7 +121,7 @@ if (file_exists("../help/$squirrelmail_language")) { } else if (file_exists('../help/en_US')) { 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']); - echo '</font></center><br>'; + echo '</font></center><br />'; $user_language = 'en_US'; } else { 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"' ) . html_tag( 'tr' ) . html_tag( 'td' ) . - '<b><center>' . _("Table of Contents") . '</center></b><br>'; + '<b><center>' . _("Table of Contents") . '</center></b><br />'; echo html_tag( 'ol' ); for ($i=0, $cnt = count($helpdir); $i < $cnt; $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) . '">' . _("Next") . '</a>'; } - echo '</center></small><br>'; + echo '</center></small><br />'; 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]) { echo $help_info[1]; @@ -203,7 +203,7 @@ if ( $chapter == 0 || !isset( $helpdir[$chapter-1] ) ) { $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'); @@ -211,5 +211,5 @@ do_hook('help_bottom'); echo html_tag( 'tr', html_tag( 'td', ' ', 'left', $color[0] ) ). - '</table></body></html>'; -?> + '</table></body></html>'; +?> \ No newline at end of file diff --git a/src/left_main.php b/src/left_main.php index 45384f96..3a819b04 100644 --- a/src/left_main.php +++ b/src/left_main.php @@ -957,11 +957,11 @@ do_hook('left_main_before'); if ($advanced_tree) { /* nice future feature, needs layout !! volunteers? */ $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><<</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 "\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. */ - $line .= "</nobr><br>\n"; + $line .= "</nobr><br />\n"; /* Output the line for this folder. */ echo $line; @@ -1122,7 +1122,6 @@ for ($i = 0; $i < count($boxes); $i++) { do_hook('left_main_after'); sqimap_logout($imapConnection); -echo '</td></tr></table>' . "\n". - "</div></body></html>\n"; - -?> \ No newline at end of file +?> +</td></tr></table>' +</div></body></html>\ diff --git a/src/options.php b/src/options.php index 9a2e3f14..24b45cfe 100644 --- a/src/options.php +++ b/src/options.php @@ -55,7 +55,7 @@ function process_optionmode_submit($optpage, $optpage_data) { echo "name = '$option->name', " . "value = '$option->value', " . "new_value = '$option->new_value'\n"; - echo "<br>"; + echo "<br />"; */ if ($option->changed()) { $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" . html_tag( 'tr' ) . "\n" . 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( 'tr' ) . "\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"; } else { /* 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 ( !isset( $max_refresh ) ) { } 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) { - 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); } } - -echo '</td></tr>' . - '</table>'. - '</td></tr>'. - '</table>' . - '</body></html>'; - ?> +</td></tr> +</table> +</td></tr> +</table> +</body></html> diff --git a/src/options_highlight.php b/src/options_highlight.php index 1e635b83..efc66d1f 100644 --- a/src/options_highlight.php +++ b/src/options_highlight.php @@ -118,13 +118,13 @@ html_tag( 'table', "\n" . html_tag( 'tr', "\n" . 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( 'tr' ) . "\n" . html_tag( 'td', '', 'left' ); 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); if ($mhl_count > 0) { 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"; } echo "</table>\n". - "<br>\n"; + "<br />\n"; } 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') { @@ -402,21 +402,21 @@ if ($action == 'edit' || $action == 'add') { $color_list[13] => _("White") ); echo addSelect('newcolor_choose', $selops, $selected_i, TRUE); - echo "<br>\n"; + echo "<br />\n"; echo ' '.addRadioBox('color_type', $selected_input, 2). ' '. _("Other:") . addInput('newcolor_input', (($selected_input && isset($theid)) ? $message_highlight_list[$theid]['color'] : ''), '7'); - echo _("Ex: 63aa7f")."<br>\n"; + echo _("Ex: 63aa7f")."<br />\n"; echo " </td>\n"; echo " </tr>\n"; # Show grid of color choices echo html_tag( 'tr', '', '', $color[0] ) . "\n"; 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++) { echo html_tag( 'tr' ) . "\n"; @@ -434,7 +434,7 @@ if ($action == 'edit' || $action == 'add') { echo html_tag( 'tr', html_tag( 'td', '<small><small> </small></small>', 'left' ) ) . "\n"; echo html_tag( 'tr', '', '', $color[0] ) . "\n"; echo html_tag( 'td', '', 'center', '', 'colspan="2"' ) . "\n"; - echo " <select name=match_type>\n"; + echo " <select name=\"match_type\">\n"; oh_opt( 'from', (isset($theid)?$message_highlight_list[$theid]['match_type'] == 'from':1), _("From") ); @@ -460,7 +460,7 @@ if ($action == 'edit' || $action == 'add') { echo " </td>\n"; echo " </tr>\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"; } do_hook('options_highlight_bottom'); diff --git a/src/options_identities.php b/src/options_identities.php index 38ab95fa..42519058 100644 --- a/src/options_identities.php +++ b/src/options_identities.php @@ -57,7 +57,7 @@ if (!empty($_POST)) { do_hook('options_identities_top'); LoadInfo($full_name, $email_address, $reply_to, $signature, ''); $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, ''); $num = 1; @@ -69,11 +69,11 @@ if (!empty($_POST)) { $num ++; } - echo '<br>' . + echo '<br />' . html_tag( 'table', "\n" . html_tag( 'tr', "\n" . html_tag( 'td', "\n" . - '<b>'. _("Options") . ' - ' . _("Advanced Identities") .'</b><br>' . + '<b>'. _("Options") . ' - ' . _("Advanced Identities") .'</b><br />' . html_tag( 'table', "\n" . html_tag( 'tr', "\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( '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") . '">'; if (! $isEmptySection && $post != '') { $return_val .= '<input type="submit" name="make_default_' . $post . '" value="'. _("Make Default") . '">'. - '<input type=submit name="delete_' . $post . '" value="'. + '<input type="submit" name="delete_' . $post . '" value="'. _("Delete") . '">'; } if (! $isEmptySection && $post != '' && $post > 1) { @@ -356,4 +356,4 @@ function ShowTableInfo($full_name, $email_address, $reply_to, $signature, $post) return ($return_val); } -?> +?> \ No newline at end of file diff --git a/src/options_order.php b/src/options_order.php index 20f413b3..1512a93b 100644 --- a/src/options_order.php +++ b/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.") ) ) , - '', '', '', 'width="65%" border="0" cellpadding="0" cellspacing="0"' ) . "<br>\n"; + '', '', '', 'width="65%" border="0" cellpadding="0" cellspacing="0"' ) . "<br />\n"; if (count($index_order)) { @@ -147,7 +147,7 @@ displayPageHeader($color, 'None'); 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> diff --git a/src/read_body.php b/src/read_body.php index 6c73bea8..0fc323fa 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -879,7 +879,7 @@ $cnt = count($ent_ar); for ($i = 0; $i < $cnt; $i++) { $messagebody .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$i], $passed_id, $mailbox); if ($i != $cnt-1) { - $messagebody .= '<hr noshade size=1 />'; + $messagebody .= '<hr noshade size="1" />'; } } -- 2.25.1