From: Arcady G. <ant...@us...> - 2001-12-27 19:49:08
|
Update of /cvsroot/squirrelmail/squirrelmail/src In directory usw-pr-cvs1:/tmp/cvs-serv21407 Modified Files: compose.php Log Message: Re-uglified `else's. ;^) Index: compose.php =================================================================== RCS file: /cvsroot/squirrelmail/squirrelmail/src/compose.php,v retrieving revision 1.187 retrieving revision 1.188 diff -u -w -r1.187 -r1.188 --- compose.php 2001/12/26 22:01:07 1.187 +++ compose.php 2001/12/27 19:49:04 1.188 @@ -39,16 +39,14 @@ if (!saveMessageAsDraft($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id)) { showInputForm(); exit(); - } - else { + } else { $draft_message = _("Draft Email Saved"); /* If this is a resumed draft, then delete the original */ if(isset($delete_draft)) { Header("Location: delete_message.php?mailbox=$draft_folder". "&message=$delete_draft&sort=$sort&startMessage=1"); exit(); - } - else { + } else { Header("Location: right_main.php?mailbox=$draft_folder&sort=$sort". "&startMessage=1¬e=$draft_message"); exit(); @@ -94,8 +92,7 @@ } if (strlen($line) <= $editor_size + 1) { $newBody .= $line . "\n"; - } - else { + } else { sqWordWrap($line, $editor_size) . "\n"; $newBody .= $line; } @@ -107,8 +104,7 @@ if (! isset($mailprio)) { $Result = sendMessage($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id); - } - else { + } else { $Result = sendMessage($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id, $mailprio); } @@ -124,8 +120,7 @@ Header("Location: right_main.php?mailbox=$urlMailbox&sort=$sort". "&startMessage=1"); - } - else { + } else { /* *$imapConnection = sqimap_login($username, $key, $imapServerAddress, * $imapPort, 0); @@ -204,8 +199,7 @@ } showInputForm(); -} -else { +} else { /* * This handles the default case as well as the error case * (they had the same code) --> if (isset($smtpErrors)) @@ -275,9 +269,8 @@ $body = decodeBody( mime_fetch_body($imapConnection, $id, 1), $message->header->encoding); - } } - else { + } else { $body = ''; } @@ -297,8 +290,7 @@ if ($reply_id) { if (ereg('^[ >]+', $body_ary[$i])) { $body_ary[$i] = '>' . $body_ary[$i]; - } - else { + } else { $body_ary[$i] = '> ' . $body_ary[$i]; } } @@ -372,8 +364,7 @@ if (isset($draft_id)) { $id = $draft_id; - } - else { + } else { $id = $forward_id; } @@ -412,9 +403,8 @@ fclose ($fp); $attachments[] = $newAttachment; - } } - else { + } else { for ($i = 0; $i < count($message->entities); $i++) { getAttachments($message->entities[$i]); } @@ -539,8 +529,7 @@ } echo ' <INPUT TYPE=text NAME=subject SIZE=60 VALUE="' . htmlspecialchars($forward_subj) . '">'; - } - else { + } else { echo ' <INPUT TYPE=text NAME=subject SIZE=60 VALUE="' . htmlspecialchars($subject) . '">'; } @@ -627,8 +616,7 @@ echo " <input type=submit name=\"html_addr_search\" value=\"". _("Addresses")."\">"; echo " </NOSCRIPT>\n"; - } - else { + } else { echo " <input type=submit name=\"html_addr_search\" value=\"". _("Addresses")."\">"; } @@ -734,8 +722,7 @@ $orig_from = trim(substr($orig_from, 0, strpos($orig_from, '<'))); $orig_from = str_replace('"', '', $orig_from); $orig_from = str_replace("'", '', $orig_from); - } - else { + } else { $end_parpos = strrpos($orig_from, ')'); $end_parpos -= ($end_parpos === false ? $end_parpos : $parpos + 1); $orig_from = trim(substr($orig_from, $parpos + 1, $end_parpos)); |