From 0b17277eaeebdee278230d7cd2550a1a9e2fcf9f Mon Sep 17 00:00:00 2001
From: till <till@php.net>
Date: Mon, 24 Mar 2008 20:52:33 -0400
Subject: [PATCH] * committing patch from #1484783
---
program/steps/mail/compose.inc | 325 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 184 insertions(+), 141 deletions(-)
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index d13f71a..fd3743e 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -30,18 +30,30 @@
// remove an attachment
if ($_action=='remove-attachment' && preg_match('/^rcmfile([0-9]+)$/', $_POST['_file'], $regs))
- {
+{
$id = $regs[1];
if (is_array($_SESSION['compose']['attachments'][$id]))
- {
+ {
@unlink($_SESSION['compose']['attachments'][$id]['path']);
$_SESSION['compose']['attachments'][$id] = NULL;
$OUTPUT->command('remove_from_attachment_list', "rcmfile$id");
$OUTPUT->send();
exit;
- }
}
+}
+if ($_action=='display-attachment' && preg_match('/^rcmfile([0-9]+)$/', $_GET['_file'], $regs))
+{
+ $id = $regs[1];
+ if (is_array($_SESSION['compose']['attachments'][$id]))
+ {
+ $apath = $_SESSION['compose']['attachments'][$id]['path'];
+ header('Content-Type: ' . $_SESSION['compose']['attachments'][$id]['mimetype']);
+ header('Content-Length: ' . filesize($apath));
+ readfile($apath);
+ }
+ exit;
+}
$MESSAGE_FORM = NULL;
$MESSAGE = NULL;
@@ -52,10 +64,10 @@
// compose when a "new/forward/reply/draft" is called - otherwise the old session attachments will appear
if (!is_array($_SESSION['compose']) || $_SESSION['compose']['id'] != get_input_value('_id', RCUBE_INPUT_GET))
- {
+{
rcmail_compose_cleanup();
$_SESSION['compose'] = array('id' => uniqid(rand()));
- }
+}
// add some labels to client
rcube_add_label('nosubject', 'norecipientwarning', 'nosubjectwarning', 'nobodywarning', 'notsentwarning', 'savingmessage', 'sendingmessage', 'messagesaved', 'converting');
@@ -74,41 +86,42 @@
if (!empty($msg_uid))
- {
+{
// similar as in program/steps/mail/show.inc
$MESSAGE = array('UID' => $msg_uid);
$MESSAGE['headers'] = &$IMAP->get_headers($msg_uid);
- $MESSAGE['structure'] = &$IMAP->get_structure($msg_uid);
+ $MESSAGE['structure'] = &$IMAP->get_structure($msg_uid);
+
+ if (!empty($MESSAGE['headers']->charset))
+ $IMAP->set_charset($MESSAGE['headers']->charset);
+
$MESSAGE['subject'] = $IMAP->decode_header($MESSAGE['headers']->subject);
$MESSAGE['parts'] = $IMAP->get_mime_numbers($MESSAGE['structure']);
if ($compose_mode == RCUBE_COMPOSE_REPLY)
- {
+ {
$_SESSION['compose']['reply_uid'] = $msg_uid;
$_SESSION['compose']['reply_msgid'] = $MESSAGE['headers']->messageID;
- $_SESSION['compose']['references'] = $MESSAGE['headers']->reference;
- $_SESSION['compose']['references'] .= !empty($MESSAGE['headers']->reference) ? ' ' : '';
- $_SESSION['compose']['references'] .= $MESSAGE['headers']->messageID;
+ $_SESSION['compose']['references'] = trim($MESSAGE['headers']->references . " " . $MESSAGE['headers']->messageID);
if (!empty($_GET['_all']))
$MESSAGE['reply_all'] = 1;
- }
- else if ($compose_mode == RCUBE_COMPOSE_FORWARD)
- {
- $_SESSION['compose']['forward_uid'] = $msg_uid;
- }
- else if ($compose_mode == RCUBE_COMPOSE_DRAFT)
- {
- $_SESSION['compose']['draft_uid'] = $msg_uid;
- }
-
}
+ else if ($compose_mode == RCUBE_COMPOSE_FORWARD)
+ {
+ $_SESSION['compose']['forward_uid'] = $msg_uid;
+ }
+ else if ($compose_mode == RCUBE_COMPOSE_DRAFT)
+ {
+ $_SESSION['compose']['draft_uid'] = $msg_uid;
+ }
+}
/****** compose mode functions ********/
function rcmail_compose_headers($attrib)
- {
+{
global $IMAP, $MESSAGE, $DB, $compose_mode;
static $sa_recipients = array();
@@ -118,7 +131,7 @@
$part = strtolower($attrib['part']);
switch ($part)
- {
+ {
case 'from':
return rcmail_compose_header_from($attrib);
@@ -134,16 +147,16 @@
case 'cc':
if (!$fname)
- {
+ {
$fname = '_cc';
$header = 'cc';
- }
+ }
case 'bcc':
if (!$fname)
- {
+ {
$fname = '_bcc';
$header = 'bcc';
- }
+ }
$allow_attrib = array('id', 'class', 'style', 'cols', 'rows', 'tabindex');
$field_type = 'textarea';
@@ -154,15 +167,14 @@
$fname = '_replyto';
$allow_attrib = array('id', 'class', 'style', 'size', 'tabindex');
$field_type = 'textfield';
- break;
-
- }
+ break;
+ }
if ($fname && !empty($_POST[$fname]))
$fvalue = get_input_value($fname, RCUBE_INPUT_POST, TRUE);
else if ($header && $compose_mode == RCUBE_COMPOSE_REPLY)
- {
+ {
// get recipent address(es) out of the message headers
if ($header=='to' && !empty($MESSAGE['headers']->replyto))
$fvalue = $MESSAGE['headers']->replyto;
@@ -172,31 +184,31 @@
// add recipent of original message if reply to all
else if ($header=='cc' && !empty($MESSAGE['reply_all']))
- {
+ {
if ($v = $MESSAGE['headers']->to)
$fvalue .= $v;
if ($v = $MESSAGE['headers']->cc)
$fvalue .= (!empty($fvalue) ? ', ' : '') . $v;
- }
+ }
// split recipients and put them back together in a unique way
if (!empty($fvalue))
- {
+ {
$to_addresses = $IMAP->decode_address_list($fvalue);
$fvalue = '';
foreach ($to_addresses as $addr_part)
- {
+ {
if (!empty($addr_part['mailto']) && !in_array($addr_part['mailto'], $sa_recipients) && (!$MESSAGE['FROM'] || !in_array($addr_part['mailto'], $MESSAGE['FROM'])))
- {
+ {
$fvalue .= (strlen($fvalue) ? ', ':'').$addr_part['string'];
$sa_recipients[] = $addr_part['mailto'];
- }
}
}
}
+ }
else if ($header && $compose_mode == RCUBE_COMPOSE_DRAFT)
- {
+ {
// get drafted headers
if ($header=='to' && !empty($MESSAGE['headers']->to))
$fvalue = $IMAP->decode_header($MESSAGE['headers']->to);
@@ -206,11 +218,11 @@
if ($header=='bcc' && !empty($MESSAGE['headers']->bcc))
$fvalue = $IMAP->decode_header($MESSAGE['headers']->bcc);
- }
+ }
if ($fname && $field_type)
- {
+ {
// pass the following attributes to the form class
$field_attrib = array('name' => $fname);
foreach ($attrib as $attr => $value)
@@ -220,19 +232,19 @@
// create teaxtarea object
$input = new $field_type($field_attrib);
$out = $input->show($fvalue);
- }
+ }
if ($form_start)
$out = $form_start.$out;
return $out;
- }
+}
function rcmail_compose_header_from($attrib)
- {
- global $IMAP, $MESSAGE, $DB, $OUTPUT, $compose_mode;
+{
+ global $IMAP, $MESSAGE, $DB, $USER, $OUTPUT, $compose_mode;
// pass the following attributes to the form class
$field_attrib = array('name' => '_from');
@@ -243,37 +255,32 @@
// extract all recipients of the reply-message
$a_recipients = array();
if ($compose_mode == RCUBE_COMPOSE_REPLY && is_object($MESSAGE['headers']))
- {
+ {
$MESSAGE['FROM'] = array();
$a_to = $IMAP->decode_address_list($MESSAGE['headers']->to);
foreach ($a_to as $addr)
- {
+ {
if (!empty($addr['mailto']))
$a_recipients[] = $addr['mailto'];
- }
-
- if (!empty($MESSAGE['headers']->cc))
- {
- $a_cc = $IMAP->decode_address_list($MESSAGE['headers']->cc);
- foreach ($a_cc as $addr)
- {
- if (!empty($addr['mailto']))
- $a_recipients[] = $addr['mailto'];
- }
- }
}
+ if (!empty($MESSAGE['headers']->cc))
+ {
+ $a_cc = $IMAP->decode_address_list($MESSAGE['headers']->cc);
+ foreach ($a_cc as $addr)
+ {
+ if (!empty($addr['mailto']))
+ $a_recipients[] = $addr['mailto'];
+ }
+ }
+ }
+
// get this user's identities
- $sql_result = $DB->query("SELECT identity_id, name, email, signature, html_signature
- FROM ".get_table_name('identities')."
- WHERE user_id=?
- AND del<>1
- ORDER BY ".$DB->quoteIdentifier('standard')." DESC, name ASC",
- $_SESSION['user_id']);
+ $sql_result = $USER->list_identities();
if ($DB->num_rows($sql_result))
- {
+ {
$from_id = 0;
$a_signatures = array();
@@ -281,22 +288,22 @@
$select_from = new select($field_attrib);
while ($sql_arr = $DB->fetch_assoc($sql_result))
- {
+ {
$identity_id = $sql_arr['identity_id'];
$select_from->add(format_email_recipient($sql_arr['email'], $sql_arr['name']), $identity_id);
// add signature to array
if (!empty($sql_arr['signature']))
- {
+ {
$a_signatures[$identity_id]['text'] = $sql_arr['signature'];
$a_signatures[$identity_id]['is_html'] = ($sql_arr['html_signature'] == 1) ? true : false;
if ($a_signatures[$identity_id]['is_html'])
- {
+ {
$h2t = new html2text($a_signatures[$identity_id]['text'], false, false);
$plainTextPart = $h2t->get_text();
$a_signatures[$identity_id]['plain_text'] = trim($plainTextPart);
- }
}
+ }
// set identity if it's one of the reply-message recipients
if (in_array($sql_arr['email'], $a_recipients))
@@ -307,7 +314,7 @@
if ($compose_mode == RCUBE_COMPOSE_DRAFT && strstr($MESSAGE['headers']->from, $sql_arr['email']))
$from_id = $sql_arr['identity_id'];
- }
+ }
// overwrite identity selection with post parameter
if (isset($_POST['_from']))
@@ -317,23 +324,22 @@
// add signatures to client
$OUTPUT->set_env('signatures', $a_signatures);
- }
+ }
else
- {
+ {
$input_from = new textfield($field_attrib);
$out = $input_from->show($_POST['_from']);
- }
+ }
if ($form_start)
$out = $form_start.$out;
return $out;
- }
+}
-
function rcmail_compose_body($attrib)
- {
+{
global $CONFIG, $OUTPUT, $MESSAGE, $compose_mode;
list($form_start, $form_end) = get_form_tags($attrib);
@@ -464,11 +470,11 @@
$out .= "\n".'<iframe name="savetarget" src="program/blank.gif" style="width:0;height:0;visibility:hidden;"></iframe>';
return $out;
- }
+}
function rcmail_create_reply_body($body, $bodyIsHtml)
- {
+{
global $IMAP, $MESSAGE;
if (! $bodyIsHtml)
@@ -481,12 +487,12 @@
// add > to each line
for($n=0; $n<sizeof($a_lines); $n++)
- {
+ {
if (strpos($a_lines[$n], '>')===0)
$a_lines[$n] = '>'.$a_lines[$n];
else
$a_lines[$n] = '> '.$a_lines[$n];
- }
+ }
$body = join("\n", $a_lines);
@@ -505,21 +511,21 @@
}
else
{
- $prefix = sprintf("<br><br>On %s, %s wrote:<br><blockquote type=\"cite\" " .
- "style=\"padding-left: 5px; border-left: #1010ff 2px solid; " .
- "margin-left: 5px; width: 100%%\">",
- $MESSAGE['headers']->date,
- $IMAP->decode_header($MESSAGE['headers']->from));
+ $prefix = sprintf("<br><br>On %s, %s wrote:<br><blockquote type=\"cite\" " .
+ "style=\"padding-left: 5px; border-left: #1010ff 2px solid; " .
+ "margin-left: 5px; width: 100%%\">",
+ $MESSAGE['headers']->date,
+ $IMAP->decode_header($MESSAGE['headers']->from));
- $suffix = "</blockquote>";
+ $suffix = "</blockquote>";
}
return $prefix.$body.$suffix;
- }
+}
function rcmail_create_forward_body($body, $bodyIsHtml)
- {
+{
global $IMAP, $MESSAGE;
if (! $bodyIsHtml)
@@ -535,7 +541,7 @@
}
else
{
- $prefix = sprintf(
+ $prefix = sprintf(
"<br><br>-------- Original Message --------" .
"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tbody>" .
"<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">Subject: </th><td>%s</td></tr>" .
@@ -554,24 +560,28 @@
rcmail_write_compose_attachments($MESSAGE);
return $prefix.$body;
- }
+}
function rcmail_create_draft_body($body, $bodyIsHtml)
- {
+{
global $IMAP, $MESSAGE;
-
- // add attachments
- if (!isset($_SESSION['compose']['forward_attachments']) &&
- is_array($MESSAGE['parts']) && sizeof($MESSAGE['parts'])>1)
+
+ /**
+ * add attachments
+ * sizeof($MESSAGE['parts'] can be 1 - e.g. attachment, but no text!
+ */
+ if (!isset($_SESSION['compose']['forward_attachments'])
+ && is_array($MESSAGE['parts'])
+ && count($MESSAGE['parts']) > 0)
rcmail_write_compose_attachments($MESSAGE);
return $body;
- }
+}
function rcmail_write_compose_attachments(&$message)
- {
+{
global $IMAP, $CONFIG;
$temp_dir = unslashify($CONFIG['temp_dir']);
@@ -580,14 +590,14 @@
$_SESSION['compose']['attachments'] = array();
foreach ($message['parts'] as $pid => $part)
- {
- if ($part->ctype_primary != 'message' && $part->ctype_primary != 'text' &&
+ {
+ if ($part->ctype_primary != 'message' &&
($part->disposition=='attachment' || $part->disposition=='inline' || $part->headers['content-id'] ||
(empty($part->disposition) && $part->filename)))
- {
+ {
$tmp_path = tempnam($temp_dir, 'rcmAttmnt');
if ($fp = fopen($tmp_path, 'w'))
- {
+ {
fwrite($fp, $IMAP->get_message_part($message['UID'], $pid, $part->encoding));
fclose($fp);
@@ -596,16 +606,16 @@
'name' => $part->filename,
'path' => $tmp_path
);
- }
}
}
+ }
$_SESSION['compose']['forward_attachments'] = TRUE;
- }
+}
function rcmail_compose_subject($attrib)
- {
+{
global $CONFIG, $MESSAGE, $compose_mode;
list($form_start, $form_end) = get_form_tags($attrib);
@@ -622,21 +632,21 @@
// create a reply-subject
else if ($compose_mode == RCUBE_COMPOSE_REPLY)
- {
+ {
if (eregi('^re:', $MESSAGE['subject']))
$subject = $MESSAGE['subject'];
else
$subject = 'Re: '.$MESSAGE['subject'];
- }
+ }
// create a forward-subject
else if ($compose_mode == RCUBE_COMPOSE_FORWARD)
- {
+ {
if (eregi('^fwd:', $MESSAGE['subject']))
$subject = $MESSAGE['subject'];
else
$subject = 'Fwd: '.$MESSAGE['subject'];
- }
+ }
// creeate a draft-subject
else if ($compose_mode == RCUBE_COMPOSE_DRAFT)
@@ -647,11 +657,11 @@
$out .= $form_end ? "\n$form_end" : '';
return $out;
- }
+}
function rcmail_compose_attachment_list($attrib)
- {
+{
global $OUTPUT, $CONFIG;
// add ID if not given
@@ -664,7 +674,7 @@
$out = '<ul'. $attrib_str . ">\n";
if (is_array($_SESSION['compose']['attachments']))
- {
+ {
if ($attrib['deleteicon'])
$button = sprintf('<img src="%s%s" alt="%s" border="0" style="padding-right:2px;vertical-align:middle" />',
$CONFIG['skin_path'],
@@ -681,18 +691,17 @@
Q(rcube_label('delete')),
$button,
Q($a_prop['name']));
- }
+ }
$OUTPUT->add_gui_object('attachmentlist', $attrib['id']);
$out .= '</ul>';
return $out;
- }
-
+}
function rcmail_compose_attachment_form($attrib)
- {
+{
global $OUTPUT, $SESS_HIDDEN_FIELD;
// add ID if not given
@@ -720,21 +729,23 @@
$OUTPUT->add_gui_object('uploadbox', $attrib['id']);
return $out;
- }
+}
function rcmail_compose_attachment_field($attrib)
- {
+{
// allow the following attributes to be added to the <input> tag
$attrib_str = create_attrib_string($attrib, array('id', 'class', 'style', 'size'));
$out = '<input type="file" name="_attachments[]"'. $attrib_str . " />";
return $out;
- }
+}
function rcmail_priority_selector($attrib)
- {
+{
+ global $MESSAGE;
+
list($form_start, $form_end) = get_form_tags($attrib);
unset($attrib['form']);
@@ -748,18 +759,20 @@
rcube_label('highest')),
array(5, 4, 0, 2, 1));
- $sel = isset($_POST['_priority']) ? $_POST['_priority'] : 0;
+ $sel = isset($_POST['_priority']) ? $_POST['_priority'] : intval($MESSAGE['headers']->priority);
$out = $form_start ? "$form_start\n" : '';
$out .= $selector->show($sel);
$out .= $form_end ? "\n$form_end" : '';
return $out;
- }
+}
function rcmail_receipt_checkbox($attrib)
- {
+{
+ global $MESSAGE;
+
list($form_start, $form_end) = get_form_tags($attrib);
unset($attrib['form']);
@@ -771,11 +784,11 @@
$checkbox = new checkbox($attrib);
$out = $form_start ? "$form_start\n" : '';
- $out .= $checkbox->show(0);
+ $out .= $checkbox->show($MESSAGE['headers']->mdn_to ? 1 : 0);
$out .= $form_end ? "\n$form_end" : '';
return $out;
- }
+}
function rcmail_editor_selector($attrib)
@@ -796,17 +809,17 @@
if ($compose_mode == RCUBE_COMPOSE_REPLY ||
$compose_mode == RCUBE_COMPOSE_FORWARD ||
$compose_mode == RCUBE_COMPOSE_DRAFT)
- {
+ {
$hasHtml = rcmail_has_html_part($MESSAGE['parts']);
$useHtml = ($hasHtml && $CONFIG['htmleditor']);
- }
+ }
$selector = '';
$attrib['name'] = '_editorSelect';
$attrib['onchange'] = 'return rcmail_toggle_editor(this)';
foreach ($choices as $value => $text)
- {
+ {
$checked = '';
if ((($value == 'html') && $useHtml) ||
(($value != 'html') && !$useHtml))
@@ -820,26 +833,26 @@
$rb->show($value),
$attrib['id'],
rcube_label($text));
- }
+ }
return $selector;
}
function get_form_tags($attrib)
- {
+{
global $CONFIG, $OUTPUT, $MESSAGE_FORM, $SESS_HIDDEN_FIELD;
$form_start = '';
if (!strlen($MESSAGE_FORM))
- {
+ {
$hiddenfields = new hiddenfield(array('name' => '_task', 'value' => $GLOBALS['_task']));
$hiddenfields->add(array('name' => '_action', 'value' => 'send'));
$form_start = empty($attrib['form']) ? '<form name="form" action="./" method="post">' : '';
$form_start .= "\n$SESS_HIDDEN_FIELD\n";
$form_start .= $hiddenfields->show();
- }
+ }
$form_end = (strlen($MESSAGE_FORM) && !strlen($attrib['form'])) ? '</form>' : '';
$form_name = !empty($attrib['form']) ? $attrib['form'] : 'form';
@@ -850,7 +863,7 @@
$MESSAGE_FORM = $form_name;
return array($form_start, $form_end);
- }
+}
// register UI objects
@@ -866,24 +879,54 @@
'receiptcheckbox' => 'rcmail_receipt_checkbox',
));
-
/****** get contacts for this user and add them to client scripts ********/
require_once('include/rcube_contacts.inc');
+require_once('include/rcube_ldap.inc');
-$CONTACTS = new rcube_contacts($DB, $_SESSION['user_id']);
+$CONTACTS = new rcube_contacts($DB, $USER->ID);
$CONTACTS->set_pagesize(1000);
+
+$a_contacts = array();
if ($result = $CONTACTS->list_records())
- {
- $a_contacts = array();
+ {
while ($sql_arr = $result->iterate())
if ($sql_arr['email'])
- $a_contacts[] = format_email_recipient($sql_arr['email'], JQ($sql_arr['name']));
-
- $OUTPUT->set_env('contacts', $a_contacts);
+ $a_contacts[] = format_email_recipient($sql_arr['email'], $sql_arr['name']);
}
-
-
+if (isset($CONFIG['ldap_public']))
+ {
+ /* LDAP autocompletion */
+ foreach ($CONFIG['ldap_public'] as $ldapserv_config)
+ {
+ if ($ldapserv_config['fuzzy_search'] != 1)
+ {
+ continue;
+ }
+
+ $LDAP = new rcube_ldap($ldapserv_config);
+ $LDAP->connect();
+ $LDAP->set_pagesize(1000);
+
+ $results = $LDAP->search($ldapserv_config['mail_field'], "");
+
+ for ($i = 0; $i < $results->count; $i++)
+ {
+ if ($results->records[$i]['email'] != '')
+ {
+ $email = $results->records[$i]['email'];
+ $name = $results->records[$i]['name'];
+
+ $a_contacts[] = format_email_recipient($email, $name);
+ }
+ }
+ $LDAP->close();
+ }
+ }
+if ($a_contacts)
+ {
+ $OUTPUT->set_env('contacts', $a_contacts);
+ }
parse_template('compose');
-?>
+?>
\ No newline at end of file
--
Gitblit v1.9.1