require_once(SM_PATH . 'functions/display_messages.php');
require_once(SM_PATH . 'class/deliver/Deliver.class.php');
require_once(SM_PATH . 'functions/addressbook.php');
+require_once(SM_PATH . 'functions/identity.php');
/* --------------------- Get globals ------------------------------------- */
/** COOKIE VARS */
sqgetGlobalVar('action',$action);
sqgetGlobalVar('session',$session);
sqgetGlobalVar('mailbox',$mailbox);
-sqgetGlobalVar('identity',$identity);
+if(!sqgetGlobalVar('identity',$identity)) {
+ $identity=0;
+}
sqgetGlobalVar('send_to',$send_to);
sqgetGlobalVar('send_to_cc',$send_to_cc);
sqgetGlobalVar('send_to_bcc',$send_to_bcc);
/* Location (For HTTP 1.1 Header("Location: ...") redirects) */
$location = get_location();
+/* Identities (fetch only once) */
+$idents = get_identities();
/* --------------------- Specific Functions ------------------------------ */
function replyAllString($header) {
- global $include_self_reply_all, $username, $data_dir;
+ global $include_self_reply_all, $idents;
$excl_ar = array();
/**
* 1) Remove the addresses we'll be sending the message 'to'
* TO list) only if $include_self_reply_all is turned off
*/
if (!$include_self_reply_all) {
- $email_address = strtolower(trim(getPref($data_dir, $username, 'email_address')));
- $excl_ar[$email_address] = '';
- $idents = getPref($data_dir, $username, 'identities');
- if ($idents != '' && $idents > 1) {
- $first_id = false;
- for ($i = 1; $i < $idents; $i ++) {
- $cur_email_address = getPref($data_dir, $username,
- 'email_address' . $i);
- $cur_email_address = strtolower(trim($cur_email_address));
- $excl_ar[$cur_email_address] = '';
- }
- }
+ foreach($idents as $id) {
+ $excl_ar[strtolower(trim($id['email_address']))] = '';
+ }
}
/**
}
$body = $newBody;
- do_hook('compose_send');
+
$composeMessage=$compose_messages[$session];
$Result = deliverMessage($composeMessage);
showInputForm($session);
}
elseif (isset($sigappend)) {
- $idents = getPref($data_dir, $username, 'identities', 0);
- if ($idents > 1) {
- if ($identity == 'default') {
- $no = 'g';
- } else {
- $no = $identity;
- }
- $signature = getSig($data_dir, $username, $no);
- }
+ $signature = $idents[$identity]['signature'];
+
$body .= "\n\n".($prefix_sig==true? "-- \n":'').$signature;
if ($compose_new_win == '1') {
compose_Header($color, $mailbox);
/* This function is used when not sending or adding attachments */
function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $session='') {
- global $editor_size, $default_use_priority, $body,
+ global $editor_size, $default_use_priority, $body, $idents,
$use_signature, $composesession, $data_dir, $username,
$username, $key, $imapServerAddress, $imapPort, $compose_messages,
$composeMessage;
- global $languages, $squirrelmail_language;
+ global $languages, $squirrelmail_language;
$send_to = $send_to_cc = $send_to_bcc = $subject = $identity = '';
$mailprio = 3;
//ClearAttachments($session);
$identity = '';
- $idents = getPref($data_dir, $username, 'identities');
$from_o = $orig_header->from;
if (is_object($from_o)) {
$orig_from = $from_o->getAddress();
} else {
$orig_from = '';
}
+
$identities = array();
- if (!empty($idents) && $idents > 1) {
- $identities[] = '"'. getPref($data_dir, $username, 'full_name')
- . '" <' . getPref($data_dir, $username, 'email_address') . '>';
- for ($i = 1; $i < $idents; $i++) {
- $enc_from_name = '"'.
- getPref($data_dir, $username, 'full_name' . $i) .
- '" <' .
- getPref($data_dir, $username, 'email_address' . $i) . '>';
- if ($enc_from_name == $orig_from && $i) {
- $identity = $i;
+ if (count($idents) > 1) {
+ foreach($idents as $nr=>$data) {
+ $enc_from_name = '"'.$data['full_name'].'" <'. $data['email_address'].'>';
+ if($enc_from_name == $orig_from) {
+ $identity = $nr;
break;
}
$identities[] = $enc_from_name;
}
+
$identity_match = $orig_header->findAddress($identities);
if ($identity_match) {
$identity = $identity_match;
$send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'),false,true);
$subject = decodeHeader($orig_header->subject,false,true);
// /* remember the references and in-reply-to headers in case of an reply */
-// $composeMessage->rfc822_header->more_headers['References'] = $orig_header->references;
-// $composeMessage->rfc822_header->more_headers['In-Reply-To'] = $orig_header->in_reply_to;
+ $composeMessage->rfc822_header->more_headers['References'] = $orig_header->references;
+ $composeMessage->rfc822_header->more_headers['In-Reply-To'] = $orig_header->in_reply_to;
$body_ary = explode("\n", $body);
$cnt = count($body_ary) ;
$body = '';
case ('forward'):
$send_to = '';
$subject = decodeHeader($orig_header->subject,false,true);
- if ((substr(strtolower($subject), 0, 4) != 'fwd:') &&
+ if ((substr(strtolower($subject), 0, 4) != 'fwd:') &&
(substr(strtolower($subject), 0, 5) != '[fwd:') &&
(substr(strtolower($subject), 0, 6) != '[ fwd:')) {
$subject = '[Fwd: ' . $subject . ']';
if ( !in_array($message->entity_id, $entities) && $message->entity_id) {
switch ($message->type0) {
case 'message':
- if ($message->type1 == 'rfc822') {
- $filename = $message->rfc822_header->subject.'.eml';
- if ($filename == "") {
- $filename = "untitled-".$message->entity_id.'.eml';
- }
- } else {
- $filename = $message->getFilename();
- }
+ if ($message->type1 == 'rfc822') {
+ $filename = $message->rfc822_header->subject.'.eml';
+ if ($filename == "") {
+ $filename = "untitled-".$message->entity_id.'.eml';
+ }
+ } else {
+ $filename = $message->getFilename();
+ }
break;
default:
+ if (!$message->mime_header) { /* temporary hack */
+ $message->mime_header = $message->header;
+ }
$filename = $message->getFilename();
break;
}
$full_localfilename = "$hashed_attachment_dir/$localfilename";
}
$message->att_local_name = $full_localfilename;
- if (!$message->mime_header) { /* temporary hack */
- $message->mime_header = $message->header;
- }
+
+ $composeMessage->initAttachment($message->type0.'/'.$message->type1,$filename,
+ $full_localfilename);
- $composeMessage->addEntity($message);
-
/* Write Attachment to file */
$fp = fopen ("$hashed_attachment_dir/$localfilename", 'wb');
fputs($fp, decodeBody(mime_fetch_body($imapConnection,
$editor_size, $attachments, $subject, $newmail,
$use_javascript_addr_book, $send_to_bcc, $passed_id, $mailbox,
$from_htmladdr_search, $location_of_buttons, $attachment_dir,
- $username, $data_dir, $identity, $draft_id, $delete_draft,
+ $username, $data_dir, $identity, $idents, $draft_id, $delete_draft,
$mailprio, $default_use_mdn, $mdn_user_support, $compose_new_win,
$saved_draft, $mail_sent, $sig_first, $edit_as_new, $action,
$username, $compose_messages, $composesession, $default_charset;
}
if ($use_javascript_addr_book) {
- echo "\n". '<SCRIPT LANGUAGE=JavaScript><!--' . "\n" .
+ echo "\n". '<SCRIPT LANGUAGE=JavaScript>'."\n<!--\n" .
'function open_abook() { ' . "\n" .
' var nwin = window.open("addrbook_popup.php","abookpopup",' .
'"width=670,height=300,resizable=yes,scrollbars=yes");' . "\n" .
' if((!nwin.opener) && (document.windows != null))' . "\n" .
' nwin.opener = document.windows;' . "\n" .
"}\n" .
- '// --></SCRIPT>' . "\n\n";
+ "// -->\n</SCRIPT>\n\n";
}
echo "\n" . '<FORM name=compose action="compose.php" METHOD=POST ' .
}
/* display select list for identities */
- $idents = getPref($data_dir, $username, 'identities', 0);
- if ($idents > 1) {
- $fn = getPref($data_dir, $username, 'full_name');
- $em = getPref($data_dir, $username, 'email_address');
+ if (count($idents) > 1) {
echo ' <tr>' . "\n" .
html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) .
_("From:") . '</td>' . "\n" .
html_tag( 'td', '', 'left', $color[4], 'width="90%"' ) .
- ' <select name="identity">' . "\n" .
- ' <option value="default">' .
- htmlspecialchars($fn);
- if ($em != '') {
- if($fn != '') {
- echo htmlspecialchars(' <' . $em . '>') . "\n";
- } else {
- echo htmlspecialchars($em) . "\n";
- }
- }
- for ($i = 1; $i < $idents; $i ++) {
- $fn = getPref($data_dir, $username, 'full_name' . $i);
- $em = getPref($data_dir, $username, 'email_address' . $i);
-
- echo '<option value="' . $i . '"';
- if (isset($identity) && $identity == $i) {
+ ' <select name="identity">' . "\n" ;
+ foreach($idents as $id=>$data) {
+ echo '<option value="'.$id.'"';
+ if($id == $identity) {
echo ' selected';
}
- echo '>' . htmlspecialchars($fn);
- if ($em != '') {
- if($fn != '') {
- echo htmlspecialchars(' <' . $em . '>') . "\n";
- } else {
- echo htmlspecialchars($em) . "\n";
- }
- }
- echo '</option>';
+ echo '>'.htmlspecialchars($data['full_name'].' <'.$data['email_address'].'>').
+ "</option>\n";
}
+
echo '</select>' . "\n" .
' </td>' . "\n" .
' </tr>' . "\n";
}
if ($use_signature == true && $newmail == true && !isset($from_htmladdr_search)) {
- if ($idents > 1) {
- if ($identity == 'default') {
- $no = 'g';
- } else {
- $no = $identity;
- }
- $signature = getSig($data_dir, $username, $no);
- }
+ $signature = $idents[$identity]['signature'];
if ($sig_first == '1') {
if ($default_charset == 'iso-2022-jp') {
} else {
$maxsize = '';
}
-
+ echo '<INPUT TYPE="hidden" name="MAX_FILE_SIZE" value="'.min( $sizes ).'">';
echo ' <tr>' . "\n" .
' <td colspan="2">' . "\n" .
' <table width="100%" cellpadding="1" cellspacing="0" align="center"'.
function deliverMessage($composeMessage, $draft=false) {
global $send_to, $send_to_cc, $send_to_bcc, $mailprio, $subject, $body,
- $username, $popuser, $usernamedata, $identity, $data_dir,
+ $username, $popuser, $usernamedata, $identity, $idents, $data_dir,
$request_mdn, $request_dr, $default_charset, $color, $useSendmail,
$domain, $action, $default_move_to_sent, $move_to_sent;
global $imapServerAddress, $imapPort, $sent_folder, $key;
+ /* some browsers replace <space> by nonbreaking spaces
+ by replacing them back to spaces addressparsing works */
+ /* FIXME: How to handle in case of other charsets where "\240"
+ is not a non breaking space ??? */
+
+ $send_to = str_replace("\240",' ',$send_to);
+ $send_to_cc = str_replace("\240",' ',$send_to_cc);
+ $send_to_bcc = str_replace("\240",' ',$send_to_bcc);
+
$rfc822_header = $composeMessage->rfc822_header;
$abook = addressbook_init(false, true);
$popuser = $username;
}
$reply_to = '';
- if (isset($identity) && $identity != 'default') {
- $from_mail = getPref($data_dir, $username,'email_address' . $identity);
- $full_name = getPref($data_dir, $username,'full_name' . $identity);
- $reply_to = getPref($data_dir, $username,'reply_to' . $identity);
- } else {
- $from_mail = getPref($data_dir, $username, 'email_address');
- $full_name = getPref($data_dir, $username, 'full_name');
- $reply_to = getPref($data_dir, $username,'reply_to');
- }
+ $from_mail = $idents[$identity]['email_address'];
+ $full_name = $idents[$identity]['full_name'];
+ $reply_to = $idents[$identity]['reply_to'];
if (!$from_mail) {
$from_mail = "$popuser@$domain";
}
} else {
$rfc822_header->encoding = '8bit';
}
- }
- if ($default_charset) {
- $content_type->properties['charset']=$default_charset;
+ if ($default_charset) {
+ $content_type->properties['charset']=$default_charset;
+ }
}
$rfc822_header->content_type = $content_type;
$composeMessage->rfc822_header = $rfc822_header;
+ /* Here you can modify the message structure just before we hand
+ it over to deliver */
+ do_hook('compose_send');
+
if (!$useSendmail && !$draft) {
require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php');
$deliver = new Deliver_SMTP();
unset ($deliver);
$move_to_sent = getPref($data_dir,$username,'move_to_sent');
$imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
- if (sqimap_mailbox_exists ($imap_stream, $sent_folder) && ((isset($move_to_sent) && $move_to_sent) ||
- (isset($default_move_to_sent) && $default_move_to_sent))) {
- sqimap_append ($imap_stream, $sent_folder, $length);
+
+ /* Move to sent code */
+ if (isset($default_move_to_sent) && ($default_move_to_sent != 0)) {
+ $svr_allow_sent = true;
+ } else {
+ $svr_allow_sent = false;
+ }
+
+ if (isset($sent_folder) && (($sent_folder != '') || ($sent_folder != 'none'))
+ && sqimap_mailbox_exists( $imap_stream, $sent_folder)) {
+ $fld_sent = true;
+ } else {
+ $fld_sent = false;
+ }
+
+ if ((isset($move_to_sent) && ($move_to_sent != 0)) || (!isset($move_to_sent))) {
+ $lcl_allow_sent = true;
+ } else {
+ $lcl_allow_sent = false;
+ }
+
+ if (($fld_sent && $svr_allow_sent && !$lcl_allow_sent) || ($fld_sent && $lcl_allow_sent)) {
+ sqimap_append ($imap_stream, $sent_folder, $length);
require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
$imap_deliver = new Deliver_IMAP();
$imap_deliver->mail($composeMessage, $imap_stream);
- sqimap_append_done ($imap_stream, $sent_folder);
+ sqimap_append_done ($imap_stream, $sent_folder);
unset ($imap_deliver);
}
global $passed_id, $mailbox, $action;