From 48985d593f418305790bc0bd5c19fcea79b00796 Mon Sep 17 00:00:00 2001 From: teepe Date: Tue, 25 Dec 2001 00:28:31 +0000 Subject: [PATCH] style police step 1 git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1924 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/compose.php | 596 +++++++++++++++++++++++++----------------------- 1 file changed, 308 insertions(+), 288 deletions(-) diff --git a/src/compose.php b/src/compose.php index 87f5e4d4..898e63a7 100644 --- a/src/compose.php +++ b/src/compose.php @@ -41,67 +41,71 @@ require_once('../functions/smtp.php'); require_once('../functions/display_messages.php'); require_once('../functions/plugin.php'); - if (!isset($attachments)) { - $attachments = array(); - session_register('attachments'); - } - - // This function is used when not sending or adding attachments - function newMail () { - global $forward_id, $imapConnection, $msg, $ent_num, $body_ary, $body, - $reply_id, $send_to, $send_to_cc, $mailbox, $send_to_bcc, $editor_size, - $draft_id, $use_signature; - - $send_to = decodeHeader($send_to); - $send_to_cc = decodeHeader($send_to_cc); - $send_to_bcc = decodeHeader($send_to_bcc); - - if ($forward_id) - $id = $forward_id; - elseif ($reply_id) - $id = $reply_id; +if (!isset($attachments)) { + $attachments = array(); + session_register('attachments'); +} + +/* This function is used when not sending or adding attachments */ +function newMail () { + global $forward_id, $imapConnection, $msg, $ent_num, $body_ary, $body, + $reply_id, $send_to, $send_to_cc, $mailbox, $send_to_bcc, $editor_size, + $draft_id, $use_signature; + + $send_to = decodeHeader($send_to); + $send_to_cc = decodeHeader($send_to_cc); + $send_to_bcc = decodeHeader($send_to_bcc); + + if ($forward_id) { + $id = $forward_id; + } elseif ($reply_id) { + $id = $reply_id; + } - if ($draft_id){ - $id = $draft_id; - $use_signature = FALSE; - } + if ($draft_id){ + $id = $draft_id; + $use_signature = FALSE; + } - if (isset($id)) { - sqimap_mailbox_select($imapConnection, $mailbox); - $message = sqimap_get_message($imapConnection, $id, $mailbox); - $orig_header = $message->header; - if ($ent_num) + if (isset($id)) { + sqimap_mailbox_select($imapConnection, $mailbox); + $message = sqimap_get_message($imapConnection, $id, $mailbox); + $orig_header = $message->header; + if ($ent_num) { $message = getEntity($message, $ent_num); - - if ($message->header->type0 == 'text' || $message->header->type1 == 'message') { - if ($ent_num) - $body = decodeBody(mime_fetch_body($imapConnection, $id, $ent_num), $message->header->encoding); - else - $body = decodeBody(mime_fetch_body($imapConnection, $id, 1), $message->header->encoding); - } else { + } + if ($message->header->type0 == 'text' || + $message->header->type1 == 'message') { + if ($ent_num) { + $body = decodeBody( + mime_fetch_body($imapConnection, $id, $ent_num), + $message->header->encoding); + } else { + $body = decodeBody( + mime_fetch_body($imapConnection, $id, 1), + $message->header->encoding); + } + } else { $body = ""; - } + } - if ($message->header->type1 == "html") + if ($message->header->type1 == "html") { $body = strip_tags($body); + } - sqUnWordWrap($body); - $body_ary = explode("\n", $body); - $i = count($body_ary) - 1; - while ($i >= 0 && ereg("^[>\\s]*$", $body_ary[$i])) { + sqUnWordWrap($body); + $body_ary = explode("\n", $body); + $i = count($body_ary) - 1; + while ($i >= 0 && ereg("^[>\\s]*$", $body_ary[$i])) { unset($body_ary[$i]); $i --; - } - $body = ""; - for ($i=0; isset($body_ary[$i]); $i++) { - if ($reply_id) - { - if (ereg('^[ >]+', $body_ary[$i])) - { + } + $body = ''; + for ($i=0; isset($body_ary[$i]); $i++) { + if ($reply_id) { + if (ereg('^[ >]+', $body_ary[$i])) { $body_ary[$i] = '>' . $body_ary[$i]; - } - else - { + } else { $body_ary[$i] = '> ' . $body_ary[$i]; } } @@ -110,16 +114,15 @@ require_once('../functions/plugin.php'); } $body .= $body_ary[$i] . "\n"; unset($body_ary[$i]); - } - if ($forward_id) - { - $bodyTop = "-------- " . _("Original Message") . " --------\n"; - $bodyTop .= _("Subject") . ": " . $orig_header->subject . "\n"; - $bodyTop .= _("From") . ": " . $orig_header->from . "\n"; - $bodyTop .= _("To") . ": " . $orig_header->to[0] . "\n"; + } + if ($forward_id) { + $bodyTop = '-------- ' . _("Original Message") . " --------\n" . + _("Subject") . ': ' . $orig_header->subject . "\n" . + _("From") . ': ' . $orig_header->from . "\n" . + _("To") . ': ' . $orig_header->to[0] . "\n"; if (count($orig_header->to) > 1) { for ($x=1; $x < count($orig_header->to); $x++) { - $bodyTop .= " " . $orig_header->to[$x] . "\n"; + $bodyTop .= ' ' . $orig_header->to[$x] . "\n"; } } $bodyTop .= "\n"; @@ -130,268 +133,285 @@ require_once('../functions/plugin.php'); } return; - } + } - if (!$send_to) { + if (!$send_to) { $send_to = sqimap_find_email($send_to); - } + } - /** This formats a CC string if they hit "reply all" **/ - if ($send_to_cc != "") { - $send_to_cc = ereg_replace( '"[^"]*"', "", $send_to_cc); - $send_to_cc = ereg_replace(";", ",", $send_to_cc); - $sendcc = explode(",", $send_to_cc); - $send_to_cc = ""; + /* This formats a CC string if they hit "reply all" */ + if ($send_to_cc != '') { + $send_to_cc = ereg_replace('"[^"]*"', '', $send_to_cc); + $send_to_cc = ereg_replace(';', ',', $send_to_cc); + $sendcc = explode(',', $send_to_cc); + $send_to_cc = ''; - for ($i = 0; $i < count($sendcc); $i++) { + for ($i = 0; $i < count($sendcc); $i++) { $sendcc[$i] = trim($sendcc[$i]); - if ($sendcc[$i] == "") - continue; + if ($sendcc[$i] == '') { + continue; + } $sendcc[$i] = sqimap_find_email($sendcc[$i]); - $whofrom = sqimap_find_displayable_name($msg["HEADER"]["FROM"]); - $whoreplyto = sqimap_find_email($msg["HEADER"]["REPLYTO"]); + $whofrom = sqimap_find_displayable_name($msg['HEADER']['FROM']); + $whoreplyto = sqimap_find_email($msg['HEADER']['REPLYTO']); if ((strtolower(trim($sendcc[$i])) != strtolower(trim($whofrom))) && (strtolower(trim($sendcc[$i])) != strtolower(trim($whoreplyto))) && - (trim($sendcc[$i]) != "")) { - $send_to_cc .= trim($sendcc[$i]) . ", "; + (trim($sendcc[$i]) != '')) { + $send_to_cc .= trim($sendcc[$i]) . ', '; } - } - $send_to_cc = trim($send_to_cc); - if (substr($send_to_cc, -1) == ",") { + } + $send_to_cc = trim($send_to_cc); + if (substr($send_to_cc, -1) == ',') { $send_to_cc = substr($send_to_cc, 0, strlen($send_to_cc) - 1); - } - } - } // function newMail() + } + } +} /* function newMail() */ - function getAttachments($message) { - global $mailbox, $attachments, $attachment_dir, $imapConnection, - $ent_num, $forward_id, $draft_id, $username; + +function getAttachments($message) { + global $mailbox, $attachments, $attachment_dir, $imapConnection, + $ent_num, $forward_id, $draft_id, $username; - if (isset($draft_id)) + if (isset($draft_id)) { $id = $draft_id; - else + } else { $id = $forward_id; + } - if (!$message) { - sqimap_mailbox_select($imapConnection, $mailbox); - $message = sqimap_get_message($imapConnection, $id, - $mailbox); - } + if (!$message) { + sqimap_mailbox_select($imapConnection, $mailbox); + $message = sqimap_get_message($imapConnection, $id, $mailbox); + } - $hashed_attachment_dir = getHashedDir($username, $attachment_dir); - if (count($message->entities) == 0) { - if ($message->header->entity_id != $ent_num) { - $filename = decodeHeader($message->header->filename); - - if ($filename == "") - $filename = "untitled-".$message->header->entity_id; - - $localfilename = GenerateRandomString(32, '', 7); - $full_localfilename = "$hashed_attachment_dir/$localfilename"; - while (file_exists($full_localfilename)) { - $localfilename = GenerateRandomString(32, '', 7); - $full_localfilename = "$hashed_attachment_dir/$localfilename"; - } - - $newAttachment = array(); - $newAttachment['localfilename'] = $localfilename; - $newAttachment['remotefilename'] = $filename; - $newAttachment['type'] = strtolower($message->header->type0 . - '/' . $message->header->type1); - - // Write Attachment to file - $fp = fopen ("$hashed_attachment_dir/$localfilename", 'w'); - fputs ($fp, decodeBody(mime_fetch_body($imapConnection, - $id, $message->header->entity_id), - $message->header->encoding)); - fclose ($fp); - - $attachments[] = $newAttachment; - } - } else { - for ($i = 0; $i < count($message->entities); $i++) { - getAttachments($message->entities[$i]); - } - } - return; - } + $hashed_attachment_dir = getHashedDir($username, $attachment_dir); + if (count($message->entities) == 0) { + if ($message->header->entity_id != $ent_num) { + $filename = decodeHeader($message->header->filename); - function showInputForm () { - global $send_to, $send_to_cc, $reply_subj, $forward_subj, $body, - $passed_body, $color, $use_signature, $signature, $prefix_sig, - $editor_size, $attachments, $subject, $newmail, - $use_javascript_addr_book, $send_to_bcc, $reply_id, $mailbox, - $from_htmladdr_search, $location_of_buttons, $attachment_dir, - $username, $data_dir, $identity, $draft_id, $delete_draft, - $mailprio; + if ($filename == "") { + $filename = "untitled-".$message->header->entity_id; + } - $subject = decodeHeader($subject); - $reply_subj = decodeHeader($reply_subj); - $forward_subj = decodeHeader($forward_subj); + $localfilename = GenerateRandomString(32, '', 7); + $full_localfilename = "$hashed_attachment_dir/$localfilename"; + while (file_exists($full_localfilename)) { + $localfilename = GenerateRandomString(32, '', 7); + $full_localfilename = "$hashed_attachment_dir/$localfilename"; + } - if ($use_javascript_addr_book) { - echo "\n\n\n"; - } + $newAttachment = array(); + $newAttachment['localfilename'] = $localfilename; + $newAttachment['remotefilename'] = $filename; + $newAttachment['type'] = strtolower($message->header->type0 . + '/' . $message->header->type1); + + /* Write Attachment to file */ + $fp = fopen ("$hashed_attachment_dir/$localfilename", 'w'); + fputs($fp, decodeBody(mime_fetch_body($imapConnection, + $id, $message->header->entity_id), + $message->header->encoding)); + fclose ($fp); + + $attachments[] = $newAttachment; + } + } else { + for ($i = 0; $i < count($message->entities); $i++) { + getAttachments($message->entities[$i]); + } + } + return; +} + +function showInputForm () { + global $send_to, $send_to_cc, $reply_subj, $forward_subj, $body, + $passed_body, $color, $use_signature, $signature, $prefix_sig, + $editor_size, $attachments, $subject, $newmail, + $use_javascript_addr_book, $send_to_bcc, $reply_id, $mailbox, + $from_htmladdr_search, $location_of_buttons, $attachment_dir, + $username, $data_dir, $identity, $draft_id, $delete_draft, + $mailprio; + + $subject = decodeHeader($subject); + $reply_subj = decodeHeader($reply_subj); + $forward_subj = decodeHeader($forward_subj); + + if ($use_javascript_addr_book) { + echo "\n". '' . "\n\n"; + } - echo "\n
\n"; + echo "\n" . '\n"; - if (isset($draft_id)) { - echo "\n"; - } - if (isset($delete_draft)) { - echo "\n"; - } + if (isset($draft_id)) { + echo '\n"; + } + if (isset($delete_draft)) { + echo '\n"; + } - echo "\n"; - - if ($location_of_buttons == 'top') showComposeButtonRow(); - - $idents = getPref($data_dir, $username, 'identities'); - if ($idents != '' && $idents > 1) { - echo " \n"; - echo " "; - } - // End of attachment code - echo "
\n"; - echo _("From:"); - echo " \n"; - echo "' . "\n"; + + if ($location_of_buttons == 'top') { showComposeButtonRow(); } + + $idents = getPref($data_dir, $username, 'identities'); + if ($idents != '' && $idents > 1) { + echo ' ' . "\n" . + ' \n"; - echo " \n"; - } - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - - echo " \n"; - echo " \n\n"; - - if ($location_of_buttons == 'between') showComposeButtonRow(); - - echo " \n"; - echo " \n"; - echo " \n"; - - if ($location_of_buttons == 'bottom') - showComposeButtonRow(); - else { - echo " \n"; - } + } + } + echo '' . "\n" . + ' ' . "\n" . + ' ' . "\n"; + } + echo ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n\n"; + + if ($location_of_buttons == 'between') { showComposeButtonRow(); } + + echo ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n"; + + if ($location_of_buttons == 'bottom') { + showComposeButtonRow(); + } else { + echo ' ' . "\n"; + } - // This code is for attachments - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - if (count($attachments)) { - $hashed_attachment_dir = getHashedDir($username, $attachment_dir); - echo "' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n"; + if (count($attachments)) { + $hashed_attachment_dir = getHashedDir($username, $attachment_dir); + echo ''; + } + /* End of attachment code */ + + echo '
' . + "\n" . + _("From:") . + ' ' . "\n" . + '\n"; - echo "
\n"; - echo _("To:"); - echo " \n"; - printf("
\n", - htmlspecialchars($send_to)); - echo "
\n"; - echo _("CC:"); - echo " \n"; - printf("
\n", - htmlspecialchars($send_to_cc)); - echo "
\n"; - echo _("BCC:"); - echo " \n"; - printf("
\n", - htmlspecialchars($send_to_bcc)); - echo "
\n"; - echo _("Subject:"); - echo " \n"; - if ($reply_subj) { - $reply_subj = str_replace("\"", "'", $reply_subj); - $reply_subj = trim($reply_subj); - if (substr(strtolower($reply_subj), 0, 3) != "re:") - $reply_subj = "Re: $reply_subj"; - printf(" ", - htmlspecialchars($reply_subj)); - } else if ($forward_subj) { - $forward_subj = trim($forward_subj); - if ((substr(strtolower($forward_subj), 0, 4) != 'fwd:') && - (substr(strtolower($forward_subj), 0, 5) != '[fwd:') && - (substr(strtolower($forward_subj), 0, 6) != '[ fwd:')) - $forward_subj = "[Fwd: $forward_subj]"; - printf(" ", - htmlspecialchars($forward_subj)); - } else { - printf(" ", - htmlspecialchars($subject)); - } - echo "
\n"; - echo "   
\n"; - echo "
 
' . "\n" . + _("To:") . + ' ' . "\n" . + '
' . "\n" . + '
' . "\n" . + _("CC:") . + ' ' . "\n" . + '
' . "\n" . + '
' . "\n" . + _("BCC:") . + ' ' . "\n" . + '
' . "\n" . + '
' . "\n" . + _("Subject:") . + ' ' . "\n"; + if ($reply_subj) { + $reply_subj = str_replace('"', "'", $reply_subj); + $reply_subj = trim($reply_subj); + if (substr(strtolower($reply_subj), 0, 3) != 're:') + $reply_subj = 'Re: ' . $reply_subj; + echo ' '; + } else if ($forward_subj) { + $forward_subj = trim($forward_subj); + if ((substr(strtolower($forward_subj), 0, 4) != 'fwd:') && + (substr(strtolower($forward_subj), 0, 5) != '[fwd:') && + (substr(strtolower($forward_subj), 0, 6) != '[ fwd:')) { + $forward_subj = '[Fwd: ' . $forward_subj . ']'; + } + echo ' '; + } else { + echo ' '; + } + echo '
' . "\n" . + '   
' . "\n" . + '
 
\n"; - echo _("Attach:"); - echo " \n"; - echo " \n"; - echo "   \n"; - echo "
\n"; - echo " "; - echo ""; - foreach ($attachments as $key => $info) { + /* This code is for attachments */ + echo '
' . "\n" . + _("Attach:") . + ' ' . "\n" . + ' ' . "\n" . + '   ' . "\n" . + '
' . "\n" . + ' ' . + ''; + foreach ($attachments as $key => $info) { $attached_file = "$hashed_attachment_dir/$info[localfilename]"; - echo "\n"; - echo $info['remotefilename'] . " - " . $info['type'] . " ("; - echo show_readable_size(filesize($attached_file)) . ")
\n"; - } + echo '\n" . + $info['remotefilename'] . ' - ' . $info['type'] . ' (' . + show_readable_size(filesize($attached_file)) . ")
\n"; + } + + echo '\n" . + '
' . "\n"; + if ($reply_id) { + echo '\n" . + ''; + do_hook("compose_bottom"); + echo '' . "\n"; +} + + + + - echo "\n"; - echo "
\n"; - if ($reply_id) { - echo "\n"; - } - printf("\n", htmlspecialchars($mailbox)); - echo ""; - do_hook("compose_bottom"); - echo "\n"; - } function showComposeButtonRow() { global $use_javascript_addr_book, $save_as_draft, -- 2.25.1