From e7e73ef125c92d67216a73b9519b648eb872fa1f Mon Sep 17 00:00:00 2001 From: fallas Date: Tue, 4 Dec 2001 09:46:06 +0000 Subject: [PATCH] File Formatting git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1840 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/draft_actions.php | 231 ++++++++++++++++++++---------------------- 1 file changed, 110 insertions(+), 121 deletions(-) diff --git a/src/draft_actions.php b/src/draft_actions.php index e20e3f03..a665ba5a 100644 --- a/src/draft_actions.php +++ b/src/draft_actions.php @@ -9,182 +9,171 @@ * $Id$ */ -/*****************************************************************/ -/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!! ***/ -/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION. ***/ -/*** + Base level indent should begin at left margin, as ***/ -/*** the require_once below looks. ***/ -/*** + All identation should consist of four space blocks ***/ -/*** + Tab characters are evil. ***/ -/*** + all comments should use "slash-star ... star-slash" ***/ -/*** style -- no pound characters, no slash-slash style ***/ -/*** + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD ***/ -/*** ALWAYS USE { AND } CHARACTERS!!! ***/ -/*** + Please use ' instead of ", when possible. Note " ***/ -/*** should always be used in _( ) function calls. ***/ -/*** Thank you for your help making the SM code more readable. ***/ -/*****************************************************************/ - require_once ('../src/validate.php'); - /* Print all the needed RFC822 headers */ - function write822HeaderForDraft ($fp, $t, $c, $b, $subject, $more_headers) { - global $REMOTE_ADDR, $SERVER_NAME, $REMOTE_PORT; - global $data_dir, $username, $popuser, $domain, $version, $useSendmail; - global $default_charset, $HTTP_VIA, $HTTP_X_FORWARDED_FOR; - global $REMOTE_HOST, $identity; +/* Print all the needed RFC822 headers */ +function write822HeaderForDraft ($fp, $t, $c, $b, $subject, $more_headers) { + global $REMOTE_ADDR, $SERVER_NAME, $REMOTE_PORT; + global $data_dir, $username, $popuser, $domain, $version, $useSendmail; + global $default_charset, $HTTP_VIA, $HTTP_X_FORWARDED_FOR; + global $REMOTE_HOST, $identity; - // Storing the header to make sure the header is the same - // everytime the header is printed. - static $header, $headerlength; + /* Storing the header to make sure the header is the same */ + /* everytime the header is printed. */ + static $header, $headerlength; - if ($header == '') { - if (isset($identity) && ($identity != 'default')) { + if ($header == '') { + if (isset($identity) && ($identity != 'default')) { $reply_to = getPref($data_dir, $username, 'reply_to' . $identity); $from = getPref($data_dir, $username, 'full_name' . $identity); $from_addr = getPref($data_dir, $username, 'email_address' . $identity); - } else { + } else { $reply_to = getPref($data_dir, $username, 'reply_to'); $from = getPref($data_dir, $username, 'full_name'); $from_addr = getPref($data_dir, $username, 'email_address'); - } + } - if ($from_addr == '') { + if ($from_addr == '') { $from_addr = $popuser.'@'.$domain; - } + } - /* Encoding 8-bit characters and making from line */ - $subject = encodeHeader($subject); - if ($from == '') { + /* Encoding 8-bit characters and making from line */ + $subject = encodeHeader($subject); + if ($from == '') { $from = "<$from_addr>"; - } else { + } else { $from = '"' . encodeHeader($from) . "\" <$from_addr>"; - } + } - /* This creates an RFC 822 date */ - $date = date("D, j M Y H:i:s ", mktime()) . timezone(); + /* This creates an RFC 822 date */ + $date = date("D, j M Y H:i:s ", mktime()) . timezone(); - /* Create a message-id */ - $message_id = '<' . $REMOTE_PORT . '.' . $REMOTE_ADDR . '.'; - $message_id .= time() . '.squirrel@' . $SERVER_NAME .'>'; + /* Create a message-id */ + $message_id = '<' . $REMOTE_PORT . '.' . $REMOTE_ADDR . '.'; + $message_id .= time() . '.squirrel@' . $SERVER_NAME .'>'; - /* Insert header fields */ - $header = "Message-ID: $message_id\r\n"; - $header .= "Date: $date\r\n"; - $header .= "Subject: $subject\r\n"; - $header .= "From: $from\r\n"; - $header .= "To: $t\r\n"; // Who it's TO + /* Insert header fields */ + $header = "Message-ID: $message_id\r\n"; + $header .= "Date: $date\r\n"; + $header .= "Subject: $subject\r\n"; + $header .= "From: $from\r\n"; + $header .= "To: $t\r\n"; // Who it's TO - /* Insert headers from the $more_headers array */ - if(is_array($more_headers)) { + /* Insert headers from the $more_headers array */ + if(is_array($more_headers)) { reset($more_headers); while(list($h_name, $h_val) = each($more_headers)) { $header .= sprintf("%s: %s\r\n", $h_name, $h_val); } - } + } - if ($c) { + if ($c) { $header .= "Cc: $c\r\n"; // Who the CCs are - } + } - if ($b) { + if ($b) { $header .= "Bcc: $b\r\n"; // Who the BCCs are - } + } - if ($reply_to != '') + if ($reply_to != '') { $header .= "Reply-To: $reply_to\r\n"; + } - $header .= "X-Mailer: SquirrelMail (version $version)\r\n"; // Identify SquirrelMail + $header .= "X-Mailer: SquirrelMail (version $version)\r\n"; // Identify SquirrelMail - /* Do the MIME-stuff */ - $header .= "MIME-Version: 1.0\r\n"; + /* Do the MIME-stuff */ + $header .= "MIME-Version: 1.0\r\n"; - if (isMultipart()) { + if (isMultipart()) { $header .= 'Content-Type: multipart/mixed; boundary="'; $header .= mimeBoundary(); $header .= "\"\r\n"; - } else { + } else { if ($default_charset != '') - $header .= "Content-Type: text/plain; charset=$default_charset\r\n"; + $header .= "Content-Type: text/plain; charset=$default_charset\r\n"; else - $header .= "Content-Type: text/plain;\r\n"; + $header .= "Content-Type: text/plain;\r\n"; $header .= "Content-Transfer-Encoding: 8bit\r\n"; - } - $header .= "\r\n"; // One blank line to separate header and body + } + $header .= "\r\n"; // One blank line to separate header and body - $headerlength = strlen($header); - } + $headerlength = strlen($header); + } - // Write the header - fputs ($fp, $header); + /* Write the header */ + fputs ($fp, $header); - return $headerlength; - } + return $headerlength; +} - // Send the body - function writeBodyForDraft ($fp, $passedBody) { - global $default_charset; +/* Send the body */ +function writeBodyForDraft ($fp, $passedBody) { + global $default_charset; - $attachmentlength = 0; + $attachmentlength = 0; - if (isMultipart()) { - $body = '--'.mimeBoundary()."\r\n"; + if (isMultipart()) { + $body = '--'.mimeBoundary()."\r\n"; - if ($default_charset != "") + if ($default_charset != ""){ $body .= "Content-Type: text/plain; charset=$default_charset\r\n"; - else + } else { $body .= "Content-Type: text/plain\r\n"; + } - $body .= "Content-Transfer-Encoding: 8bit\r\n\r\n"; - $body .= $passedBody . "\r\n\r\n"; - fputs ($fp, $body); + $body .= "Content-Transfer-Encoding: 8bit\r\n\r\n"; + $body .= $passedBody . "\r\n\r\n"; + fputs ($fp, $body); - $attachmentlength = attachFiles($fp); + $attachmentlength = attachFiles($fp); - if (!isset($postbody)) $postbody = ""; - $postbody .= "\r\n--".mimeBoundary()."--\r\n\r\n"; - fputs ($fp, $postbody); - } else { - $body = $passedBody . "\r\n"; - fputs ($fp, $body); - $postbody = "\r\n"; - fputs ($fp, $postbody); - } + if (!isset($postbody)) $postbody = ""; + $postbody .= "\r\n--".mimeBoundary()."--\r\n\r\n"; + fputs ($fp, $postbody); + } else { + $body = $passedBody . "\r\n"; + fputs ($fp, $body); + $postbody = "\r\n"; + fputs ($fp, $postbody); + } - return (strlen($body) + strlen($postbody) + $attachmentlength); - } + return (strlen($body) + strlen($postbody) + $attachmentlength); +} - function saveMessageAsDraft($t, $c, $b, $subject, $body, $reply_id) { - global $useSendmail, $msg_id, $is_reply, $mailbox, $onetimepad; - global $data_dir, $username, $domain, $key, $version, $sent_folder, $imapServerAddress, $imapPort; - global $draft_folder, $attachment_dir; - $more_headers = Array(); +function saveMessageAsDraft($t, $c, $b, $subject, $body, $reply_id) { + global $useSendmail, $msg_id, $is_reply, $mailbox, $onetimepad; + global $data_dir, $username, $domain, $key, $version, $sent_folder, $imapServerAddress, $imapPort; + global $draft_folder, $attachment_dir; + $more_headers = Array(); - $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 1); + $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 1); - $tmpDraftFile = "draft-" . GenerateRandomString(32, '', 7); - while ( file_exists($attachment_dir .$tmpDraftFile) ) + $tmpDraftFile = "draft-" . GenerateRandomString(32, '', 7); + while ( file_exists($attachment_dir .$tmpDraftFile)){ $tmpDraftFile = "draft-" . GenerateRandomString(32, '', 7); - $fp = fopen($attachment_dir . $tmpDraftFile, 'w'); - - $headerlength = write822HeaderForDraft ($fp, $t, $c, $b, $subject, $more_headers, FALSE); - $bodylength = writeBodyForDraft ($fp, $body, FALSE); - fclose($fp); - - $length = ($headerlength + $bodylength); - - if (sqimap_mailbox_exists ($imap_stream, $draft_folder)) { - sqimap_append ($imap_stream, $draft_folder, $length); - write822HeaderForDraft ($imap_stream, $t, $c, $b, $subject, $more_headers, TRUE); - writeBodyForDraft ($imap_stream, $body, TRUE); - sqimap_append_done ($imap_stream); - } - sqimap_logout($imap_stream); - if ($length) - ClearAttachments(); - if (file_exists($attachment_dir . $tmpDraftFile) ) - unlink ($attachment_dir . $tmpDraftFile); - return $length; + } + $fp = fopen($attachment_dir . $tmpDraftFile, 'w'); + + $headerlength = write822HeaderForDraft ($fp, $t, $c, $b, $subject, $more_headers, FALSE); + $bodylength = writeBodyForDraft ($fp, $body, FALSE); + fclose($fp); + + $length = ($headerlength + $bodylength); + + if (sqimap_mailbox_exists ($imap_stream, $draft_folder)) { + sqimap_append ($imap_stream, $draft_folder, $length); + write822HeaderForDraft ($imap_stream, $t, $c, $b, $subject, $more_headers, TRUE); + writeBodyForDraft ($imap_stream, $body, TRUE); + sqimap_append_done ($imap_stream); + } + sqimap_logout($imap_stream); + if ($length){ + ClearAttachments(); + } + if (file_exists($attachment_dir . $tmpDraftFile)){ + unlink ($attachment_dir . $tmpDraftFile); + } + return $length; } ?> -- 2.25.1