require_once(SM_PATH . 'functions/imap.php');
require_once(SM_PATH . 'functions/date.php');
require_once(SM_PATH . 'functions/mime.php');
-//require_once(SM_PATH . 'functions/smtp.php');
require_once(SM_PATH . 'functions/plugin.php');
require_once(SM_PATH . 'functions/display_messages.php');
require_once(SM_PATH . 'class/deliver/Deliver.class.php');
+/* --------------------- Get globals ------------------------------------- */
+$username = $_SESSION['username'];
+$onetimepad = $_SESSION['onetimepad'];
+$base_uri = $_SESSION['base_uri'];
+$delimiter = $_SESSION['delimiter'];
+
+if (isset($_POST['return'])) {
+ $html_addr_search_done = 'Use Addresses';
+}
+if ( isset($_SESSION['composesession']) ) {
+ $composesession = $_SESSION['composesession'];
+}
+sqextractGlobalVar('action');
+sqextractGlobalVar('session');
+sqextractGlobalVar('mailbox');
+sqextractGlobalVar('identity');
+sqextractGlobalVar('send_to');
+sqextractGlobalVar('send_to_cc');
+sqextractGlobalVar('send_to_bcc');
+sqextractGlobalVar('subject');
+sqextractGlobalVar('body');
+sqextractGlobalVar('mailprio');
+sqextractGlobalVar('request_mdn');
+sqextractGlobalVar('request_dr');
+sqextractGlobalVar('html_addr_search');
+sqextractGlobalVar('mail_sent');
+sqextractGlobalVar('passed_id');
+sqextractGlobalVar('passed_ent_id');
+sqextractGlobalVar('send');
+
+if ( isset($_POST['sigappend']) ) {
+ $sigappend = $_POST['sigappend'];
+}
+/* From addressbook search */
+if ( isset($_POST['from_htmladdr_search']) ) {
+ $from_htmladdr_search = $_POST['from_htmladdr_search'];
+}
+if ( isset($_POST['addr_search_done']) ) {
+ $html_addr_search_done = $_POST['addr_search_done'];
+}
+if ( isset($_POST['send_to_search']) ) {
+ $send_to_search = &$_POST['send_to_search'];
+}
+
+/* Attachments */
+sqextractGlobalVar('attach');
+if ( isset($_POST['do_delete']) ) {
+ $do_delete = $_POST['do_delete'];
+}
+if ( isset($_POST['delete']) ) {
+ $delete = &$_POST['delete'];
+}
+if ( isset($_SESSION['compose_messages']) ) {
+ $compose_messages = &$_SESSION['compose_messages'];
+}
+
+
+/* Forward message as attachment */
+if ( isset($_GET['attachedmessages']) ) {
+ $attachedmessages = $_GET['attachedmessages'];
+}
+
+/* Drafts */
+sqextractGlobalVar('draft');
+sqextractGlobalVar('draft_id');
+sqextractGlobalVar('ent_num');
+sqextractGlobalVar('saved_draft');
+sqextractGlobalVar('delete_draft');
+
+$key = $_COOKIE['key'];
+
/* --------------------- Specific Functions ------------------------------ */
+
function replyAllString($header) {
global $include_self_reply_all, $username, $data_dir;
$excl_arr = array();
* vars.
*/
//$session_expired = false;
-if (session_is_registered('session_expired_post')) {
+sqsession_unregister('session_expired_post');
+if (false && sqsession_is_registered('session_expired_post')) {
global $session_expired_post, $session_expired;
/*
* extra check for username so we don't display previous post data from
* another user during this session.
*/
if ($session_expired_post['username'] != $username) {
- session_unregister('session_expired_post');
- session_unregister('session_expired');
+ sqsession_unregister('session_expired_post');
+ sqsession_unregister('session_expired');
} else {
foreach ($session_expired_post as $postvar => $val) {
if (isset($val)) {
}
$session_expired = true;
}
- session_unregister('session_expired_post');
- session_unregister('session_expired');
+ sqsession_unregister('session_expired_post');
+ sqsession_unregister('session_expired');
if (!isset($mailbox)) {
$mailbox = '';
}
+
if ($compose_new_win == '1') {
compose_Header($color, $mailbox);
} else {
showInputForm($session, false);
exit();
}
-
if (!isset($composesession)) {
$composesession = 0;
sqsession_register(0,'composesession');
}
if (!isset($session) || (isset($newmessage) && $newmessage)) {
+ sqsession_unregister('composesession');
$session = "$composesession" +1;
$composesession = $session;
sqsession_register($composesession,'composesession');
$mailbox = 'INBOX';
}
-if (isset($draft)) {
- /*
- * Set $default_charset to correspond with the user's selection
- * of language interface.
- */
- set_my_charset();
- $composeMessage=$compose_messages[$session];
- $Result = sendMessage($composeMessage, true);
-
+if ($draft) {
+ /*
+ * Set $default_charset to correspond with the user's selection
+ * of language interface.
+ */
+ set_my_charset();
+ $composeMessage=$compose_messages[$session];
if (! sendMessage($composeMessage, true)) {
showInputForm($session);
exit();
}
}
-if (isset($send)) {
- if (isset($HTTP_POST_FILES['attachfile']) &&
- $HTTP_POST_FILES['attachfile']['tmp_name'] &&
- $HTTP_POST_FILES['attachfile']['tmp_name'] != 'none') {
+if ($send) {
+ if (isset($_FILES['attachfile']) &&
+ $_FILES['attachfile']['tmp_name'] &&
+ $_FILES['attachfile']['tmp_name'] != 'none') {
$AttachFailure = saveAttachedFiles($session);
}
if (checkInput(false) && !isset($AttachFailure)) {
$body = $newBody;
do_hook('compose_send');
$composeMessage=$compose_messages[$session];
+
$Result = sendMessage($composeMessage);
if (! $Result) {
showInputForm($session);
"&startMessage=1");
}
} else {
- /*
- *$imapConnection = sqimap_login($username, $key, $imapServerAddress,
- * $imapPort, 0);
- */
if ($compose_new_win == '1') {
compose_Header($color, $mailbox);
}
}
showInputForm($session);
} elseif (isset($html_addr_search)) {
- if (isset($HTTP_POST_FILES['attachfile']) &&
- $HTTP_POST_FILES['attachfile']['tmp_name'] &&
- $HTTP_POST_FILES['attachfile']['tmp_name'] != 'none') {
- if (saveAttachedFiles($session)) {
+ if (isset($_FILES['attachfile']) &&
+ $_FILES['attachfile']['tmp_name'] &&
+ $_FILES['attachfile']['tmp_name'] != 'none') {
+ if(saveAttachedFiles($session)) {
plain_error_message(_("Could not move/copy file. File not attached"), $color);
}
}
$body = getforwardHeader($orig_header) . $body;
sqUnWordWrap($body);
$composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection);
+ $body = "\n" . $body;
break;
case ('forward_as_attachment'):
$composeMessage = getMessage_RFC822_Attachment($message, $composeMessage, $passed_id, $passed_ent_id, $imapConnection);
}
/* this corrects some wrapping/quoting problems on replies */
$rewrap_body = explode("\n", $body);
-
- $body = getReplyCitation($orig_header->from->personal);
+ $from = (is_array($orig_header->from)) ?
+ $orig_header->from[0] : $orig_header->from;
+ $body = getReplyCitation($from->getAddress(false));
+ sqUnWordWrap($body);
$cnt = count($rewrap_body);
for ($i=0;$i<$cnt;$i++) {
- // sqWordWrap($rewrap_body[$i], ($editor_size - 2));
+ sqWordWrap($rewrap_body[$i], ($editor_size));
if (preg_match("/^(>+)/", $rewrap_body[$i], $matches)) {
$gt = $matches[1];
- $body .= '>' . str_replace("\n", "\n$gt ", $rewrap_body[$i]) ."\n";
+ $body .= '>' . str_replace("\n", "\n>$gt ", rtrim($rewrap_body[$i])) ."\n";
} else {
- $body .= '> ' . $rewrap_body[$i] . "\n";
+ $body .= '> ' . str_replace("\n", "\n> ", rtrim($rewrap_body[$i])) . "\n";
}
unset($rewrap_body[$i]);
}
echo "\n" . '<FORM name=compose action="compose.php" METHOD=POST ' .
'ENCTYPE="multipart/form-data"';
do_hook("compose_form");
-
echo ">\n";
if ($location_of_buttons == 'between') {
showComposeButtonRow();
}
+
if ($compose_new_win == '1') {
echo ' <TR>' . "\n" .
' <TD BGCOLOR="' . $color[0] . '" COLSPAN=2 ALIGN=CENTER>' . "\n" .
$s_a = array();
- foreach ($composeMessage->entities as $key => $attachment) {
+ if ($composeMessage->entities) {
+ foreach ($composeMessage->entities as $key => $attachment) {
$attached_file = $attachment->att_local_name;
if ($attachment->att_local_name || $attachment->body_part) {
$attached_filename = decodeHeader($attachment->mime_header->getParameter('name'));
' ('.show_readable_size( filesize( $attached_file ) )
. ')<br>'."\n";
}
+ }
}
if (count($s_a)) {
foreach ($s_a as $s) {
'<input type="hidden" name="username" value="'. $username . "\">\n" .
'<input type=hidden name=action value=' . $action . ">\n" .
'<INPUT TYPE=hidden NAME=mailbox VALUE="' . htmlspecialchars($mailbox) .
- "\">\n" .
- '</FORM>';
+ "\">\n";
+ echo '</FORM>';
do_hook('compose_bottom');
echo '</BODY></HTML>' . "\n";
}
echo '<input type="submit" name ="draft" value="' . _("Save Draft") . "\">\n";
}
- echo "\n <INPUT TYPE=SUBMIT NAME=send VALUE=\"". _("Send") . "\">\n";
+ echo '<INPUT TYPE=submit NAME=send VALUE="'. _("Send") . "\">\n";
do_hook('compose_button_row');
echo " </TD></TR>\n\n";
/* True if FAILURE */
function saveAttachedFiles($session) {
- global $HTTP_POST_FILES, $attachment_dir, $attachments, $username,
+ global $_FILES, $attachment_dir, $attachments, $username,
$data_dir, $compose_messages;
+ /* get out of here if no file was attached at all */
+ if (! is_uploaded_file($_FILES['attachfile']['tmp_name']) ) {
+ return true;
+ }
+
$hashed_attachment_dir = getHashedDir($username, $attachment_dir);
$localfilename = GenerateRandomString(32, '', 7);
$full_localfilename = "$hashed_attachment_dir/$localfilename";
$full_localfilename = "$hashed_attachment_dir/$localfilename";
}
- if (!@rename($HTTP_POST_FILES['attachfile']['tmp_name'], $full_localfilename)) {
+ if (!@rename($_FILES['attachfile']['tmp_name'], $full_localfilename)) {
if (function_exists("move_uploaded_file")) {
- if (!@move_uploaded_file($HTTP_POST_FILES['attachfile']['tmp_name'], $full_localfilename)) {
+ if (!@move_uploaded_file($_FILES['attachfile']['tmp_name'],$full_localfilename)) {
return true;
}
} else {
- if (!@copy($HTTP_POST_FILES['attachfile']['tmp_name'], $full_localfilename)) {
+ if (!@copy($_FILES['attachfile']['tmp_name'], $full_localfilename)) {
return true;
}
}
}
$message = $compose_messages[$session];
- $type = strtolower($HTTP_POST_FILES['attachfile']['type']);
- $name = $HTTP_POST_FILES['attachfile']['name'];
+ $type = strtolower($_FILES['attachfile']['type']);
+ $name = $_FILES['attachfile']['name'];
$message->initAttachment($type, $name, $full_localfilename);
$compose_messages[$session] = $message;
}
$imap_stream = sqimap_login($username, $key, $imapServerAddress,
$imapPort, 0);
if (sqimap_mailbox_exists ($imap_stream, $draft_folder)) {
- require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
- $imap_deliver = new Deliver_IMAP();
- $length = $imap_deliver->mail($composeMessage);
- sqimap_append ($imap_stream, $draft_folder, $length);
- $imap_deliver->mail($composeMessage, $imap_stream);
- sqimap_append_done ($imap_stream);
- sqimap_logout($imap_stream);
- unset ($imap_deliver);
-
+ require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
+ $imap_deliver = new Deliver_IMAP();
+ $length = $imap_deliver->mail($composeMessage);
+ sqimap_append ($imap_stream, $draft_folder, $length);
+ $imap_deliver->mail($composeMessage, $imap_stream);
+ sqimap_append_done ($imap_stream);
+ sqimap_logout($imap_stream);
+ unset ($imap_deliver);
+ return $length;
+ } else {
+ $msg = '<br>Error: '._("Draft folder")." $draft_folder" . ' does not exist.';
+ plain_error_message($msg, $color);
+ return false;
}
- return $length;
}
$succes = false;
if ($stream) {
projects / squirrelmail.git / blobdiff