From f265009a3bf872cf6c9d9aaefe7949e1688555a0 Mon Sep 17 00:00:00 2001 From: jervfors Date: Sun, 5 Feb 2006 11:18:50 +0000 Subject: [PATCH] Replacing deprecated HTML "center" element. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@10645 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/display_messages.php | 4 ++-- functions/mime.php | 4 ++-- plugins/abook_take/functions.php | 4 ++-- plugins/administrator/options.php | 8 +++---- plugins/change_password/options.php | 2 +- plugins/filters/options.php | 8 +++---- plugins/filters/spamoptions.php | 6 ++--- plugins/fortune/functions.php | 6 ++--- plugins/info/options.php | 22 +++++++++---------- plugins/listcommands/mailout.php | 2 +- plugins/mail_fetch/fetch.php | 4 ++-- .../message_details/message_details_top.php | 4 ++-- plugins/newmail/newmail.php | 4 ++-- plugins/newmail/testsound.php | 4 ++-- plugins/spamcop/options.php | 4 ++-- plugins/translate/options.php | 2 +- src/about.php | 4 ++-- src/addrbook_search_html.php | 12 +++++----- src/compose.php | 20 ++++++++--------- src/help.php | 14 ++++++------ src/image.php | 4 ++-- src/login.php | 6 ++--- src/options_highlight.php | 10 ++++----- src/vcard.php | 6 ++--- src/view_text.php | 8 +++---- 25 files changed, 86 insertions(+), 86 deletions(-) diff --git a/functions/display_messages.php b/functions/display_messages.php index 17fc090f..fb8b6f87 100644 --- a/functions/display_messages.php +++ b/functions/display_messages.php @@ -107,7 +107,7 @@ function logout_error( $errString, $errTitle = '' ) { displayHtmlHeader( $org_name.' - '.$errTitle, '', false ); echo '\n\n". - ''; + '

'; if (isset($org_logo) && ($org_logo != '')) { echo ' '.sprintf(_(

'. ''. _("Go to the login page") . ''. - '

'; + ''; } /** diff --git a/functions/mime.php b/functions/mime.php index 490aa43e..d8ab3cbd 100644 --- a/functions/mime.php +++ b/functions/mime.php @@ -451,7 +451,7 @@ function formatBody($imap_stream, $message, $color, $wrap_at, $ent_num, $id, $ma if (isset($passed_ent_id)) { $link .= '&passed_ent_id='.$passed_ent_id; } - $body .= '' . _("Download this as a file") . ''; if ($view_unsafe_images) { $text = _("Hide Unsafe Images"); @@ -466,7 +466,7 @@ function formatBody($imap_stream, $message, $color, $wrap_at, $ent_num, $id, $ma if($text != '') { $body .= ' | ' . $text . ''; } - $body .= '
' . "\n"; + $body .= '
' . "\n"; } return $body; } diff --git a/plugins/abook_take/functions.php b/plugins/abook_take/functions.php index 98bcc6b7..0e046eb7 100644 --- a/plugins/abook_take/functions.php +++ b/plugins/abook_take/functions.php @@ -57,7 +57,7 @@ function abook_take_read() global $message; echo '
' . addForm(SM_PATH . 'plugins/abook_take/take.php') . - '' . "\n"; + '

' . "\n"; if (isset($message->rfc822_header->reply_to)) abook_take_read_array($message->rfc822_header->reply_to); @@ -69,7 +69,7 @@ function abook_take_read() abook_take_read_array($message->rfc822_header->to); echo addSubmit(_("Take Address")) . - '

'; + ''; } function abook_take_pref() diff --git a/plugins/administrator/options.php b/plugins/administrator/options.php index bc17ddf5..7faf33dd 100644 --- a/plugins/administrator/options.php +++ b/plugins/administrator/options.php @@ -272,7 +272,7 @@ if ( sqgetGlobalVar('switch', $switch, SQ_GET) ) { } echo '

' . - '

'. + '

'. ''. ''. @@ -581,7 +581,7 @@ if ( $colapse['Group8'] == 'off' ) { $i++; } } - echo ''; } else { echo '\n". - '

'. _("Configuration Administrator").'

'; + echo ''; + echo '

'; foreach ( $op_plugin as $plg ) { if ( in_array( $plg, $plugins ) ) { $sw = ' checked="checked"'; @@ -598,7 +598,7 @@ if ( $colapse['Group8'] == 'off' ) { "". "\n"; } - echo '

'. sprintf(_("Plugin directory could not be found: %s"), $plugpath). @@ -609,7 +609,7 @@ echo '

'. ''. _("Test Configuration")."

'; + '

'; /* Write the options to the file. diff --git a/plugins/change_password/options.php b/plugins/change_password/options.php index 901a096d..58b18cbe 100644 --- a/plugins/change_password/options.php +++ b/plugins/change_password/options.php @@ -88,7 +88,7 @@ do_hook('change_password_init');
0) { diff --git a/plugins/filters/options.php b/plugins/filters/options.php index 36d67a18..58ecfddd 100644 --- a/plugins/filters/options.php +++ b/plugins/filters/options.php @@ -88,7 +88,7 @@ if (sqgetGlobalVar('filter_submit',$filter_submit,SQ_POST)) { } elseif (sqgetGlobalVar('user_submit',$user_submit,SQ_POST)) { sqgetGlobalVar('filters_user_scan_set',$filters_user_scan_set,SQ_POST); setPref($data_dir, $username, 'filters_user_scan', $filters_user_scan_set); - echo '
'._("Saved Scan type")."\n"; + echo '

'._("Saved Scan type")."

\n"; } $filters = load_filters(); @@ -97,14 +97,14 @@ if (sqgetGlobalVar('filter_submit',$filter_submit,SQ_POST)) { echo html_tag( 'table', html_tag( 'tr', html_tag( 'td', - '' . _("Options") . ' - ' . _("Message Filtering") . '' , + '

' . _("Options") . ' - ' . _("Message Filtering") . '

' , 'left', $color[0] ) ), 'center', '', 'width="95%" border="0" cellpadding="2" cellspacing="0"' ) . '
'. - ''. + '

'. html_tag( 'table', '', '', '', 'border="0" cellpadding="2" cellspacing="0"' ) . html_tag( 'tr' ) . html_tag( 'th', _("What to Scan:"), 'right', '', 'style="white-space: nowrap;"' ) . @@ -124,7 +124,7 @@ if (sqgetGlobalVar('filter_submit',$filter_submit,SQ_POST)) { ''. html_tag( 'td', '', 'left' ) . '

- +

'. - ''. + ''. ''. html_tag( 'div', '[' . _("New") . diff --git a/plugins/filters/spamoptions.php b/plugins/filters/spamoptions.php index 2457cc70..b4977941 100644 --- a/plugins/filters/spamoptions.php +++ b/plugins/filters/spamoptions.php @@ -96,7 +96,7 @@ if (isset($action) && $action == 'spam') { } echo ''; } else { // action is not set or action is not spam echo html_tag( 'p', '', 'center' ) . '[' . _("Edit") . ']' . - ' - [' . _("Done") . ']

'; + ' - [' . _("Done") . ']

'; printf( _("Spam is sent to %s."), ($filters_spam_folder?''.htmlspecialchars(imap_utf7_decode_local($filters_spam_folder)).'':'['._("not set yet").']' ) ); echo '
'; printf( _("Spam scan is limited to %s."), '' . ( ($filters_spam_scan == 'new')?_("Unread messages only"):_("All messages") ) . '' ); diff --git a/plugins/fortune/functions.php b/plugins/fortune/functions.php index cd98d0f2..5bded057 100644 --- a/plugins/fortune/functions.php +++ b/plugins/fortune/functions.php @@ -49,19 +49,19 @@ function fortune_function() { $fortune_command=$fortune_location; } - echo "\n". + echo "

\n". "

\n"; echo '

'; if (!$exist) { printf(_("%s is not found."),$fortune_location); } else { - echo "" . _("Today's Fortune") . "

\n" .
+        echo "" . _("Today's Fortune") . "
\n" .
             htmlspecialchars(shell_exec($fortune_command)) .
             "\n";
     }
 
-    echo '

'; + echo ''; } /** diff --git a/plugins/info/options.php b/plugins/info/options.php index a1bf81d8..f5ee2a4c 100644 --- a/plugins/info/options.php +++ b/plugins/info/options.php @@ -68,10 +68,10 @@ $list = array ('TEST_0', 'TEST_8', 'TEST_9'); -echo '
'._("IMAP server information")."
\n". - ''. +echo '

'._("IMAP server information")."

\n". + '

'. '

\n". - '\n". + '

\n". '

'. _("Server Capability response:"). "
\n"; @@ -98,7 +98,7 @@ else { 'default_charset = '.htmlspecialchars($default_charset)."\n"; } -echo "

\n"; +echo "

\n"; if ($submit == 'submit') { @@ -129,7 +129,7 @@ elseif (!$submit || $submit == 'default') { } echo "

\n". - "\n". + "

\n". '\n". @@ -148,12 +148,12 @@ foreach($type as $index=>$value) { addInput($index, $value, 60); } -echo "

'. _("Select"). '	'._("Test Name"). '	'._("IMAP command string")."

\n". - ''. +echo "
\n". + '

'. addSubmit('submit','submit'). addSubmit('clear','submit'). addSubmit('default','submit'). - "

\n"; + "
\n"; $tests = array(); @@ -172,7 +172,7 @@ if ($submit == 'submit') { $starttime = (float)$sec + (float)$usec; } - echo '\n". + echo '

\n". '\n". '\n"; @@ -194,10 +194,10 @@ if ($submit == 'submit') { '\n"; } - echo "

'.$tests[$i]."

'. _("Request:")."

'.sprintf(_("%s ms"),round((($endtime - $starttime)*1000),3))."

\n"; + echo "
\n"; } } -echo ''; +echo ''; sqimap_logout($imap_stream); /** diff --git a/plugins/listcommands/mailout.php b/plugins/listcommands/mailout.php index 5667d44a..9a76fd3b 100644 --- a/plugins/listcommands/mailout.php +++ b/plugins/listcommands/mailout.php @@ -83,5 +83,5 @@ echo '
' . addHidden('mailbox', $mailbox) . addSubmit(_("Send Mail"), 'send'); ?> -

+

\ No newline at end of file diff --git a/plugins/mail_fetch/fetch.php b/plugins/mail_fetch/fetch.php index 205ad317..268f22e4 100644 --- a/plugins/mail_fetch/fetch.php +++ b/plugins/mail_fetch/fetch.php @@ -109,7 +109,7 @@ function Mail_Fetch_Select_Server($mailfetch) { $mailfetch = Mail_Fetch_Servers(); displayPageHeader($color, 'None'); -echo '
'; +echo '

'; echo html_tag( 'table', html_tag( 'tr', @@ -321,6 +321,6 @@ for ($i_loop=$i_start;$i_loop<$i_stop;$i_loop++) { Mail_Fetch_Status(_("Done")); } ?> -

+ \ No newline at end of file diff --git a/plugins/message_details/message_details_top.php b/plugins/message_details/message_details_top.php index 8354a718..67d4f1a3 100644 --- a/plugins/message_details/message_details_top.php +++ b/plugins/message_details/message_details_top.php @@ -35,7 +35,7 @@ sqgetGlobalVar('passed_id', $passed_id, SQ_GET); sqgetGlobalVar('mailbox', $mailbox, SQ_GET); echo "\n" . - '' . + '

' . addForm(SM_PATH . 'src/download.php', 'GET'). addHidden('mailbox', $mailbox). addHidden('passed_id', $passed_id). @@ -44,7 +44,7 @@ echo " '. ' '. addSubmit(_("Save Message")). - '

'. + ''. ''. "\n"; ?> \ No newline at end of file diff --git a/plugins/newmail/newmail.php b/plugins/newmail/newmail.php index 465df15e..a6d66991 100644 --- a/plugins/newmail/newmail.php +++ b/plugins/newmail/newmail.php @@ -24,7 +24,7 @@ $numnew = (int)$numnew; displayHtmlHeader( _("New Mail"), '', FALSE ); echo ''."\n". - ''. "\n" . + '

'. "\n" . html_tag( 'table', "\n" . html_tag( 'tr', "\n" . html_tag( 'td', '' . _("SquirrelMail Notice:") . '', 'center', $color[0] ) @@ -41,7 +41,7 @@ $numnew = (int)$numnew; 'center' ) ) , '', '', 'width="100%" cellpadding="2" cellspacing="2" border="0"' ) . - '

' . + '' . "