From e02775fe9c3db5ce9aa7836a087c93c54425cde8 Mon Sep 17 00:00:00 2001 From: philippe_mingo Date: Mon, 11 Feb 2002 20:27:00 +0000 Subject: [PATCH] Code cleanup git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2422 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/compose.php | 20 ++++++++------------ src/delete_message.php | 7 ++++--- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/compose.php b/src/compose.php index 8effe774..c8a3b160 100644 --- a/src/compose.php +++ b/src/compose.php @@ -112,8 +112,8 @@ if (isset($send)) { } $body = $newBody; - do_hook("compose_send"); - + do_hook('compose_send'); + $MDN = False; // we are not sending a mdn response if (! isset($mailprio)) { $Result = sendMessage($send_to, $send_to_cc, $send_to_bcc, @@ -158,8 +158,7 @@ if (isset($send)) { showInputForm(); /* sqimap_logout($imapConnection); */ } -} -elseif (isset($html_addr_search_done)) { +} elseif (isset($html_addr_search_done)) { if ($compose_new_win == '1') { compose_Header($color, $mailbox); } @@ -190,8 +189,7 @@ elseif (isset($html_addr_search_done)) { } } showInputForm(); -} -elseif (isset($html_addr_search)) { +} elseif (isset($html_addr_search)) { if (isset($HTTP_POST_FILES['attachfile']) && $HTTP_POST_FILES['attachfile']['tmp_name'] && $HTTP_POST_FILES['attachfile']['tmp_name'] != 'none') { @@ -204,8 +202,7 @@ elseif (isset($html_addr_search)) { * click. If you can think of a better way, please implement it. */ include_once('./addrbook_search_html.php'); -} -elseif (isset($attach)) { +} elseif (isset($attach)) { if (saveAttachedFiles()) { plain_error_message(_("Could not move/copy file. File not attached"), $color); } @@ -216,8 +213,7 @@ elseif (isset($attach)) { displayPageHeader($color, $mailbox); } showInputForm(); -} -elseif (isset($do_delete)) { +} elseif (isset($do_delete)) { if ($compose_new_win == '1') { compose_Header($color, $mailbox); } @@ -482,7 +478,7 @@ function showInputForm () { echo "\n" . '
\n"; @@ -815,4 +811,4 @@ function getReplyCitation($orig_from) return ($start . $orig_from . $end . "\n"); } -?> +?> \ No newline at end of file diff --git a/src/delete_message.php b/src/delete_message.php index af16dd59..a801ba40 100644 --- a/src/delete_message.php +++ b/src/delete_message.php @@ -41,10 +41,11 @@ if (isset($where) && isset($what)) { header("Location: $location/compose.php?mail_sent=$mail_sent&saved_draft=$saved_draft"); } else { - header("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=" . - urlencode($mailbox)); + header("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=" . + urlencode($mailbox)); } } sqimap_logout($imapConnection); -?> + +?> \ No newline at end of file -- 2.25.1