From: teepe Date: Wed, 26 Dec 2001 14:42:38 +0000 (+0000) Subject: some more html cleanup provided by Dave Huang X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=bd9bbfefba8fa274260a37c965f7510bb6670599 some more html cleanup provided by Dave Huang git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1961 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/ChangeLog b/ChangeLog index 1905b643..b1f34e23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,7 +8,8 @@ Version 1.2.2 -- ?? - Fixed an infinite loop in printer friendly when wrapping option is not in the prefs. Bug reported by Boris Manojlovic - + - Html cleanup, with patch from Dave Huang (#496712) + Version 1.2.1 -- 25 December 2001 --------------------------------- diff --git a/functions/display_messages.php b/functions/display_messages.php index 3c8e72e6..9c06da2e 100644 --- a/functions/display_messages.php +++ b/functions/display_messages.php @@ -15,7 +15,7 @@ function error_username_password_incorrect() { echo '
'. - ''. + '

'. ''. ''. '' . @@ -31,15 +31,15 @@ function error_username_password_incorrect() { function general_info($motd, $org_logo, $version, $org_name, $color) { echo '
'; - echo "

' . _("ERROR") . '

"; - echo ''; + echo "

"; + echo ''; echo ' '; echo "

"; echo ' '; printf (_("Welcome to %s's WebMail system"), $org_name); echo ' '; echo '

'; - echo ' '; + echo '

'; echo ' '; echo ' \n

'; if ( strlen($org_logo) > 3 ) { @@ -65,7 +65,7 @@ function error_message($message, $mailbox, $sort, $startMessage, $color) { $urlMailbox = urlencode($mailbox); echo '
'; - echo ""; + echo "

"; echo ' '; echo " \n

"; echo " " . _("ERROR") . ''; @@ -81,7 +81,7 @@ function error_message($message, $mailbox, $sort, $startMessage, $color) { function plain_error_message($message, $color) { echo '
'; - echo ""; + echo "

"; echo ' '; echo " \n"; if (isset($msg['FLAG_FLAGGED']) && ($msg['FLAG_FLAGGED'] == true)) { - $flag = ""; + $flag = ""; $flag_end = ''; } else { $flag = ''; @@ -105,16 +105,16 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start for ($i=1; $i <= count($index_order); $i++) { switch ($index_order[$i]) { case 1: /* checkbox */ - echo " \n"; + echo " \n"; break; case 2: /* from */ - echo " \n"; + echo " \n"; break; case 3: /* date */ - echo " \n"; + echo " \n"; break; case 4: /* subject */ - echo " \n"; break; case 6: /* size */ - echo " \n"; break; @@ -445,11 +445,11 @@ function displayMessageArray($imapConnection, $num_msgs, $start_msg, &$msgs, $ms } echo '

"; echo " " . _("ERROR") . ''; diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index d92acc80..e9e53fb6 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -48,7 +48,7 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start echo "
		$italic$bold$flag$fontstr$senderName$fontstr_end$flag_end$bold_end$italic_end	$italic$bold$flag$fontstr$senderName$fontstr_end$flag_end$bold_end$italic_end	$bold$flag$fontstr".$msg["DATE_STRING"]."$fontstr_end$flag_end$bold_end	$bold$flag$fontstr".$msg["DATE_STRING"]."$fontstr_end$flag_end$bold_end	$bold"; + echo "	$bold"; if (! isset($search_stuff)) { $search_stuff = ''; } echo "\n"; + echo "	\n"; if (isset($msg['FLAG_ANSWERED']) && $msg['FLAG_ANSWERED'] == true) { echo "A\n"; @@ -142,11 +142,11 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start } if ($default_use_priority) { if (ereg('(1\|2)',substr($msg['PRIORITY'],0,1))) { - echo "!\n"; + echo "!\n"; $stuff = true; } if (ereg('(5)',substr($msg['PRIORITY'],0,1))) { - echo "?\n"; + echo "?\n"; $stuff = true; } } @@ -161,7 +161,7 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start echo "	$bold$fontstr" . + echo "	$bold$fontstr" . show_readable_size($msg['SIZE']) . "$fontstr_end$bold_end

'. - "" . - "" . - "

". + "

$paginator_str

" . + "". + "". "

" . + "". "

$paginator_str

$msg_cnt_str

". - "

"; /** End of message-list table */ @@ -478,7 +478,8 @@ function mail_message_listing_beginning * This is the beginning of the message list table. * It wraps around all messages */ - echo "\n" + echo "\n" + . "

\n" . "' . "\n

" . " \n" . " \n" @@ -486,10 +487,9 @@ function mail_message_listing_beginning . "

$paginator

\n" . '

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

\n" + . " \n" . ' ' . _("Move Selected To:") . "\n" . " \n" @@ -497,7 +497,7 @@ function mail_message_listing_beginning . "

\n" + . " \n" . '

". - "\n" . - '' . _("Toggle All") . "\n"; + '' . _("Toggle All") . "\n"; } else { $result .= "\n" . + $body .= "

\n" . "\n

\n" . _("Attachments") . ':' . "

\n" . diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php index 49fd3b63..51d2b538 100644 --- a/src/addrbook_search_html.php +++ b/src/addrbook_search_html.php @@ -111,7 +111,7 @@ $abook = addressbook_init(); ?>
- +

diff --git a/src/addressbook.php b/src/addressbook.php index 550b430e..43e36777 100644 --- a/src/addressbook.php +++ b/src/addressbook.php @@ -161,11 +161,11 @@ if($REQUEST_METHOD == 'POST') { /* Display the "new address" form */ echo '' . "\n" . - '' . "\n" . + '

' . "\n" . '\n

' . "\n" . '' . _("Update address") . - "\n

\n"; + "\n

\n"; address_form("editaddr", _("Update address"), $olddata); echo '\n" . @@ -184,20 +184,20 @@ if($REQUEST_METHOD == 'POST') { /* Handle error messages */ if (!$r) { /* Display error */ - echo '' . + echo '

' . "\n" . '\n

' . "\n" . '
' . _("ERROR") . ": " . $abook->error . - '' . "\n

\n"; + '' . "\n

\n"; /* Display the "new address" form again */ echo '' . "\n" . - '' . + '

' . "\n" . '\n

' . "\n" . '' . _("Update address") . - "\n

\n"; + "\n

\n"; address_form("editaddr", _("Update address"), $newdata); echo '\n" . @@ -233,10 +233,10 @@ if($REQUEST_METHOD == 'POST') { /* Display error messages */ if (!empty($formerror)) { - echo '' . "\n" . + echo '

' . "\n" . '\n

' . "\n" . '
' . '' . _("ERROR") . ': ' . $formerror . - '' . "\n

\n"; + '' . "\n

\n"; } @@ -275,7 +275,7 @@ if ($showaddrlist) { echo '' . "\n" . '\n

' . "\n" . '' . $row['source'] . - "\n

\n" . + "\n

\n" . '' . '\n" . '\n" . '

'; + "\">\n" . '

'; } + echo '' } /* end of addresslist */ /* Display the "new address" form */ echo '' . "\n" . ''; diff --git a/src/download.php b/src/download.php index 2ee84adf..6ba0939e 100644 --- a/src/download.php +++ b/src/download.php @@ -44,7 +44,7 @@ require_once('../functions/date.php'); displayPageHeader($color, 'None'); - echo "
' . "

"; + echo "

"; echo ""; echo _("Viewing a text attachment") . " - "; if ($where && $what) { @@ -61,7 +61,7 @@ require_once('../functions/date.php'); echo ""; echo "

"; - echo " diff --git a/src/folders_rename_getname.php b/src/folders_rename_getname.php index 8d6b1a23..c5a85c99 100644 --- a/src/folders_rename_getname.php +++ b/src/folders_rename_getname.php @@ -48,7 +48,7 @@ require_once('../functions/imap.php'); } displayPageHeader($color, 'None'); - echo "

"; + echo "

"; echo "

"; if ($type1 == 'html') { diff --git a/src/folders.php b/src/folders.php index 577818b4..eb7d634d 100644 --- a/src/folders.php +++ b/src/folders.php @@ -275,10 +275,9 @@ if ($box && $box2) { } else { echo _("No folders were found to subscribe to!") . "

"; } -?> - - +do_hook("folders_bottom"); +?>

"; + echo "

"; echo ""; diff --git a/src/image.php b/src/image.php index 2a323a2a..5da68587 100644 --- a/src/image.php +++ b/src/image.php @@ -35,7 +35,7 @@ require_once('../src/load_prefs.php'); displayPageHeader($color, 'None'); echo '
' . - '

"; echo _("Rename a folder"); echo "

' . + '

' . "\n" . '

' . '' . diff --git a/src/login.php b/src/login.php index 033e9efc..27e9bc18 100644 --- a/src/login.php +++ b/src/login.php @@ -113,7 +113,7 @@ if (isset($emailaddress)) { "\n", FALSE ); /* Set the title of this page. */ - echo "\n". + echo "\n". "
\n"; $username_form_name = 'login_username'; @@ -131,13 +131,13 @@ if (isset($emailaddress)) { "\n". "\n". - " ". "
\n". - ' ' . sprintf (_("%s Login"), $org_name) . "\n". + "
\n". + ' ' . sprintf (_("%s Login"), $org_name) . "\n". "
\n". " \n". - ' \n". - " \n". + " \n". " \n". diff --git a/src/options.php b/src/options.php index 4f4c7688..b89cf21f 100644 --- a/src/options.php +++ b/src/options.php @@ -305,7 +305,7 @@ if ($optpage == SMOPT_PAGE_MAIN) { $first_optpage = false; echo "
' . _("Name:") . " \n". + ' ' . _("Name:") . " \n". " \n". "
" . '
' . - ""; + "
"; foreach ($optpage_blocks as $next_optpage) { if ($first_optpage == false) { $first_optpage = $next_optpage; @@ -319,7 +319,7 @@ if ($optpage == SMOPT_PAGE_MAIN) { print_optionpages_row($first_optpage); } - echo "
\n"; + echo "

\n"; do_hook('options_link_and_description'); @@ -329,9 +329,9 @@ if ($optpage == SMOPT_PAGE_MAIN) { /*************************************************************************/ } else { echo '
' . "\n" - . '' . "\n" . create_optpage_element($optpage) - . create_optmode_element(SMOPT_MODE_SUBMIT); + . create_optmode_element(SMOPT_MODE_SUBMIT) + . '

' . "\n"; /* Output the option groups for this page. */ print_option_groups($optpage_data['options']); @@ -436,7 +436,7 @@ if ($optpage == SMOPT_PAGE_MAIN) { echo ""; } - echo '' . + echo '' . "\n" . '' . ""; } - echo '' . + echo '' . "\n" . '


" . $leftopt['desc'] . @@ -450,7 +450,7 @@ if ($optpage == SMOPT_PAGE_MAIN) { echo "

' . '

\n"; diff --git a/src/options_highlight.php b/src/options_highlight.php index e50a54fe..55ab27cc 100644 --- a/src/options_highlight.php +++ b/src/options_highlight.php @@ -20,7 +20,7 @@ require_once('../functions/plugin.php'); function oh_opt( $val, $sel, $tit ) { echo "\n"; } @@ -68,7 +68,7 @@ if (count($message_highlight_list) >= 1) { echo ''."\n"; for ($i=0; $i < count($message_highlight_list); $i++) { echo ''. - "

". + "

". "[". _("Edit") . '] [' . "\n"; echo '' . "\n"; echo " \n"; - echo " ' . "\n"; echo ' \n"; # Show grid of color choices - echo "\n"; + echo "\n"; echo ' ' . "\n"; echo " \n"; diff --git a/src/options_identities.php b/src/options_identities.php index aff95a75..80913f45 100644 --- a/src/options_identities.php +++ b/src/options_identities.php @@ -52,7 +52,7 @@ require_once('../functions/display_messages.php'); ?>
-

\n"; + echo "

\n"; echo _("Identifying name") . ":"; echo '

' . "\n"; @@ -295,7 +295,7 @@ if ($action == 'edit' || $action == 'add') { echo "

\n"; + echo "

\n"; echo "\n"; $current_color = $message_highlight_list[$theid]['color']; for($x = 0; $x < 5; $x++) { @@ -303,14 +303,14 @@ if ($action == 'edit' || $action == 'add') { for($y = 0; $y < 19; $y++) { $gridindex = "$y,$x"; $gridcolor = $new_color_list[$gridindex]; - $selected = ($gridcolor == $current_color)?'SELECTED':'' ; - echo "\n"; } echo "\n"; } echo "

\n"; + $selected = ($gridcolor == $current_color)?'CHECKED':'' ; + echo "

\n"; echo "

\n"; - echo "

@@ -64,7 +64,7 @@ require_once('../functions/display_messages.php'); - +

diff --git a/src/options_order.php b/src/options_order.php index 0681adab..f0de44f7 100644 --- a/src/options_order.php +++ b/src/options_order.php @@ -42,15 +42,13 @@ require_once('../functions/plugin.php'); displayPageHeader($color, 'None'); ?>
-