From ff0969a01edab0a4f1e256132c1c4da2dcfe5e3b Mon Sep 17 00:00:00 2001 From: jervfors Date: Thu, 12 Aug 2004 03:47:03 +0000 Subject: [PATCH] XHTML fixes git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@7891 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/imap_mailbox.php | 6 +-- src/folders.php | 80 +++++++++++++++++----------------- src/folders_delete.php | 16 +++---- src/folders_rename_do.php | 4 +- src/folders_rename_getname.php | 16 +++---- src/read_body.php | 6 +-- 6 files changed, 64 insertions(+), 64 deletions(-) diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php index 0a50cf86..2bcb1478 100755 --- a/functions/imap_mailbox.php +++ b/functions/imap_mailbox.php @@ -542,9 +542,9 @@ function sqimap_mailbox_option_list($imap_stream, $show_selected = 0, $folder_sk } } if ($show_selected != 0 && in_array($lowerbox, $show_selected) ) { - $mbox_options .= '' . "\n"; + $mbox_options .= '' . "\n"; } else { - $mbox_options .= '' . "\n"; + $mbox_options .= '' . "\n"; } } } @@ -1054,4 +1054,4 @@ function sqimap_get_status_mbx_tree($imap_stream,&$mbx_tree) { } } -?> +?> \ No newline at end of file diff --git a/src/folders.php b/src/folders.php index 7dd930c0..632ccf69 100644 --- a/src/folders.php +++ b/src/folders.php @@ -40,7 +40,7 @@ sqgetGlobalVar('success', $success, SQ_GET); /* end of get globals */ -echo '
' . +echo '
' . html_tag( 'table', '', 'center', $color[0], 'width="95%" cellpadding="1" cellspacing="0" border="0"' ) . html_tag( 'tr' ) . html_tag( 'td', '', 'center' ) . '' . _("Folders") . '' . @@ -74,7 +74,7 @@ if ( isset($success) && $success ) { break; } - $td_str .= '
'; + $td_str .= '
'; echo html_tag( 'table', @@ -87,7 +87,7 @@ if ( isset($success) && $success ) { 'center', '', 'width="100%" cellpadding="4" cellspacing="0" border="0"' ); } -echo "\n
"; +echo "\n
"; $imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0); $boxes = sqimap_mailbox_list($imapConnection,true); @@ -101,8 +101,8 @@ echo html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="4" cellspaci html_tag( 'td', '', 'center', $color[0] ) . addForm('folders_create.php', 'POST', 'cf'). addInput('folder_name', '', 25). - "
\n". _("as a subfolder of"). '
'. - "\n"; $show_selected = array(); $skip_folders = array(); @@ -115,9 +115,9 @@ if ( $server_type == 'courier' ) { } if ( $default_sub_of_inbox == false ) { - echo '\n"; } else { - echo '\n"; $show_selected = array('inbox'); } @@ -127,15 +127,15 @@ if ( $default_sub_of_inbox == false ) { // use the long format to show subfolders in an intelligible way if parent is missing (special folder) echo sqimap_mailbox_option_list($imapConnection, $show_selected, $skip_folders, $boxes, 'noinferiors', true); -echo "\n"; +echo "\n"; if ($show_contain_subfolders_option) { - echo '
'. + echo '
'. addCheckBox('contain_subs', FALSE, '1') .'  ' . _("Let this folder contain subfolders") - . '
'; + . '
'; } -echo "\n"; -echo "\n"; +echo "\n"; +echo "\n"; echo html_tag( 'tr', html_tag( 'td', ' ', 'left', $color[4] ) @@ -197,8 +197,8 @@ echo html_tag( 'tr', if ($count_special_folders < count($boxes)) { echo addForm('folders_rename_getname.php') - . "\n" + . ' \n"; // use existing IMAP connection, we have no special values to show, // but we do include values to skip. Use the pre-created $boxes to save an IMAP query. @@ -206,13 +206,13 @@ if ($count_special_folders < count($boxes)) { // use long format to make sure folder names make sense when parents may be missing. echo sqimap_mailbox_option_list($imapConnection, 0, $skip_folders, $boxes, NULL, true); - echo "\n". - "\n". + '\n". - "\n"; + "\" />\n". + "\n"; } else { - echo _("No folders found") . '

'; + echo _("No folders found") . '

'; } $boxes_sub = $boxes; @@ -229,20 +229,20 @@ echo html_tag( 'tr', if ($count_special_folders < count($boxes)) { echo addForm('folders_delete.php') - . "\n" + . ' \n"; // send NULL for the flag - ALL folders are eligible for delete (except what we've got in skiplist) // use long format to make sure folder names make sense when parents may be missing. echo sqimap_mailbox_option_list($imapConnection, 0, $skip_folders, $boxes, NULL, true); - echo "\n" - . '\n" + . '\n" + . "\" />\n" . "\n"; } else { - echo _("No folders found") . "

"; + echo _("No folders found") . "

"; } echo html_tag( 'tr', @@ -260,7 +260,7 @@ echo html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="4" cellspaci if ($count_special_folders < count($boxes)) { echo addForm('folders_subscribe.php?method=unsub') - . "\n"; for ($i = 0; $i < count($boxes); $i++) { $use_folder = true; if ((strtolower($boxes[$i]["unformatted"]) != "inbox") && @@ -270,14 +270,14 @@ if ($count_special_folders < count($boxes)) { $box = htmlspecialchars($boxes[$i]["unformatted-dm"]); $box2 = str_replace(' ', ' ', htmlspecialchars(imap_utf7_decode_local($boxes[$i]["unformatted-disp"]))); - echo " \n"; } } - echo "

\n" - . '

\n" + . '\n" - . "\n"; + . "\" />\n" + . "\n"; } else { echo _("No folders were found to unsubscribe from!") . ''; } @@ -308,24 +308,24 @@ if(!$no_list_for_subscribe) { } if ($box && $box2) { echo addForm('folders_subscribe.php?method=sub') - . ''; for ($q = 0; $q < count($box); $q++) { - echo " \n"; } - echo '

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

' + . '\n" + . "
\n"; } else { echo _("No folders were found to subscribe to!") . ''; } } else { /* don't perform the list action -- this is much faster */ echo addForm('folders_subscribe.php?method=sub') - . _("Subscribe to:") . '
' - . '' - . '\n" - . "
\n"; + . _("Subscribe to:") . '
' + . '' + . '\n" + . "
\n"; } do_hook('folders_bottom'); diff --git a/src/folders_delete.php b/src/folders_delete.php index c75e1306..0059c25e 100644 --- a/src/folders_delete.php +++ b/src/folders_delete.php @@ -45,7 +45,7 @@ if ($mailbox == '') { displayPageHeader($color, 'None'); plain_error_message(_("You have not selected a folder to delete. Please do so."). - '
'._("Click here to go back").'.', $color); + '
'._("Click here to go back").'.', $color); exit; } @@ -58,7 +58,7 @@ if ( sqgetGlobalVar('backingout', $tmp, SQ_POST) ) { if( !sqgetGlobalVar('confirmed', $tmp, SQ_POST) ) { displayPageHeader($color, 'None'); - echo '
' . + echo '
' . html_tag( 'table', '', 'center', '', 'width="95%" border="0"' ) . html_tag( 'tr', html_tag( 'td', '' . _("Delete Folder") . '', 'center', $color[0] ) @@ -66,11 +66,11 @@ if( !sqgetGlobalVar('confirmed', $tmp, SQ_POST) ) { html_tag( 'tr' ) . html_tag( 'td', '', 'center', $color[4] ) . sprintf(_("Are you sure you want to delete %s?"), str_replace(array(' ','<','>'),array(' ','<','>'),imap_utf7_decode_local($mailbox))). - addForm('folders_delete.php', 'POST'). - addHidden('mailbox', $mailbox). - '\n". - '\n". - '


'; + addForm('folders_delete.php', 'POST'). + addHidden('mailbox', $mailbox). + '\n". + '\n". + '


'; exit; } @@ -141,4 +141,4 @@ sqimap_logout($imap_stream); $location = get_location(); header ("Location: $location/folders.php?success=delete"); -?> +?> \ No newline at end of file diff --git a/src/folders_rename_do.php b/src/folders_rename_do.php index e7db59ce..5970fde9 100644 --- a/src/folders_rename_do.php +++ b/src/folders_rename_do.php @@ -42,7 +42,7 @@ if (substr_count($new_name, '"') || substr_count($new_name, "\\") || displayPageHeader($color, 'None'); plain_error_message(_("Illegal folder name. Please select a different name."). - '
'._("Click here to go back").'.', $color); + '
'._("Click here to go back").'.', $color); exit; } @@ -82,4 +82,4 @@ if ($old_name <> $new_name) { header ('Location: ' . get_location() . '/folders.php?success=rename'); -?> +?> \ No newline at end of file diff --git a/src/folders_rename_getname.php b/src/folders_rename_getname.php index 4fa233b9..6c5b5e6c 100644 --- a/src/folders_rename_getname.php +++ b/src/folders_rename_getname.php @@ -39,7 +39,7 @@ if ($old == '') { displayPageHeader($color, 'None'); plain_error_message(_("You have not selected a folder to rename. Please do so."). - '
'._("Click here to go back").'.', $color); + '
'._("Click here to go back").'.', $color); exit; } @@ -62,23 +62,23 @@ if (strpos($old, $delimiter)) { displayPageHeader($color, 'None'); -echo '
' . +echo '
' . html_tag( 'table', '', 'center', '', 'width="95%" border="0"' ) . html_tag( 'tr', html_tag( 'td', '' . _("Rename a folder") . '', 'center', $color[0] ) ) . html_tag( 'tr' ) . html_tag( 'td', '', 'center', $color[4] ) . - addForm('folders_rename_do.php'). + addForm('folders_rename_do.php'). _("New name:"). - '
' . htmlspecialchars($old_parent) . ' ' . htmlspecialchars($delimiter) . '' . - addInput('new_name', $old_name, 25) . '
' . "\n"; + '
' . htmlspecialchars($old_parent) . ' ' . htmlspecialchars($delimiter) . '' . + addInput('new_name', $old_name, 25) . '
' . "\n"; if ( $isfolder ) { echo addHidden('isfolder', 'true'); } echo addHidden('orig', $old). addHidden('old_name', $old_name). - '\n". - '
'; + '\n". + '
'; -?> +?> \ No newline at end of file diff --git a/src/read_body.php b/src/read_body.php index c3b73903..6c73bea8 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -265,7 +265,7 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { $success = $deliver->finalizeStream($stream); } if (!$success) { - $msg = $deliver->dlv_msg . '
' . + $msg = $deliver->dlv_msg . '
' . _("Server replied: ") . $deliver->dlv_ret_nr . ' '. $deliver->dlv_server_msg; require_once(SM_PATH . 'functions/display_messages.php'); @@ -636,7 +636,7 @@ function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message, $removed $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 .= '' . _("As Attachment") .'  '."\n"; + $menu_row .= '' . _("As Attachment") .'  '."\n"; $menu_row .= ' '; @@ -649,7 +649,7 @@ function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message, $removed $menu_row .= addHidden('mailbox', $aMailbox['NAME']); $menu_row .= addHidden('msg[0]', $passed_id); $menu_row .= getButton('SUBMIT', 'delete', _("Delete")); - $menu_row .= '' . _("Bypass Trash"); + $menu_row .= '' . _("Bypass Trash"); } else { $menu_row .= getButton('SUBMIT', 'delete', _("Delete"), '', FALSE) . "\n"; // delete button is disabled } -- 2.25.1