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 | 509 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 273 insertions(+), 236 deletions(-)
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 76aa78f..fd3743e 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -5,7 +5,7 @@
| program/steps/mail/compose.inc |
| |
| This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland |
+ | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -20,6 +20,7 @@
*/
require_once('Mail/mimeDecode.php');
+require_once('lib/html2text.inc');
// define constants for message compose mode
define('RCUBE_COMPOSE_REPLY', 0x0106);
@@ -28,35 +29,51 @@
// remove an attachment
-if ($_action=='remove-attachment' && preg_match('/^rcmfile([0-9]+)$/', $_GET['_file'], $regs))
- {
+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;
- $commands = sprintf("parent.%s.remove_from_attachment_list('rcmfile%d');\n", $JS_OBJECT_NAME, $id);
- rcube_remote_response($commands);
+ $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;
-// nothing below is called during message composition, only at "new/forward/reply/draft" initialization
-// since there are many ways to leave the compose page improperly, it seems necessary to clean-up an old
+// Nothing below is called during message composition, only at "new/forward/reply/draft" initialization or
+// if a compose-ID is given (i.e. when the compose step is opened in a new window/tab).
+// Since there are many ways to leave the compose page improperly, it seems necessary to clean-up an old
// compose when a "new/forward/reply/draft" is called - otherwise the old session attachments will appear
-rcmail_compose_cleanup();
-$_SESSION['compose'] = array('id' => uniqid(rand()));
+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');
// add config parameter to client script
-$OUTPUT->add_script(sprintf("%s.set_env('draft_autosave', %d);", $JS_OBJECT_NAME, !empty($CONFIG['drafts_mbox']) ? $CONFIG['draft_autosave'] : 0));
+$OUTPUT->set_env('draft_autosave', !empty($CONFIG['drafts_mbox']) ? $CONFIG['draft_autosave'] : 0);
// get reference message and set compose mode
@@ -69,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();
@@ -113,45 +131,34 @@
$part = strtolower($attrib['part']);
switch ($part)
- {
+ {
case 'from':
return rcmail_compose_header_from($attrib);
case 'to':
$fname = '_to';
$header = 'to';
-
- // we have contact id's as get parameters
- if (!empty($_GET['_to']) && preg_match('/^[0-9]+(,[0-9]+)*$/', $_GET['_to']))
- {
- $a_recipients = array();
- $sql_result = $DB->query("SELECT name, email
- FROM ".get_table_name('contacts')."
- WHERE user_id=?
- AND del<>1
- AND contact_id IN (".$_GET['_to'].")",
- $_SESSION['user_id']);
-
- while ($sql_arr = $DB->fetch_assoc($sql_result))
- $a_recipients[] = format_email_recipient($sql_arr['email'], $sql_arr['name']);
-
- if (sizeof($a_recipients))
- $fvalue = join(', ', $a_recipients);
- }
+
+ // we have a set of recipients stored is session
+ if (($mailto_id = get_input_value('_mailto', RCUBE_INPUT_GET)) && $_SESSION['mailto'][$mailto_id])
+ $fvalue = $_SESSION['mailto'][$mailto_id];
else if (!empty($_GET['_to']))
$fvalue = get_input_value('_to', RCUBE_INPUT_GET);
case 'cc':
if (!$fname)
- {
+ {
$fname = '_cc';
$header = 'cc';
- }
+ }
case 'bcc':
if (!$fname)
+ {
$fname = '_bcc';
+ $header = 'bcc';
+ }
- $allow_attrib = array('id', 'class', 'style', 'cols', 'rows', 'wrap', 'tabindex');
+ $allow_attrib = array('id', 'class', 'style', 'cols', 'rows', 'tabindex');
$field_type = 'textarea';
break;
@@ -160,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;
@@ -178,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'])))
{
- if (!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);
@@ -212,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)
@@ -226,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, $JS_OBJECT_NAME, $compose_mode;
+{
+ global $IMAP, $MESSAGE, $DB, $USER, $OUTPUT, $compose_mode;
// pass the following attributes to the form class
$field_attrib = array('name' => '_from');
@@ -249,54 +255,55 @@
// 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();
- $field_attrib['onchange'] = "$JS_OBJECT_NAME.change_identity(this)";
+ $field_attrib['onchange'] = JS_OBJECT_NAME.".change_identity(this)";
$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']))
@@ -316,25 +323,24 @@
$out = $select_from->show($from_id);
// add signatures to client
- $OUTPUT->add_script(sprintf("%s.set_env('signatures', %s);", $JS_OBJECT_NAME, array2js($a_signatures)));
- }
+ $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, $JS_OBJECT_NAME, $compose_mode;
+{
+ global $CONFIG, $OUTPUT, $MESSAGE, $compose_mode;
list($form_start, $form_end) = get_form_tags($attrib);
unset($attrib['form']);
@@ -370,8 +376,8 @@
$body = rcmail_first_text_part($MESSAGE);
$isHtml = false;
}
- if (strlen($body))
- $body = rcmail_create_reply_body($body, $isHtml);
+
+ $body = rcmail_create_reply_body($body, $isHtml);
}
// forward message body inline
else if ($compose_mode == RCUBE_COMPOSE_FORWARD)
@@ -387,8 +393,8 @@
$body = rcmail_first_text_part($MESSAGE);
$isHtml = false;
}
- if (strlen($body))
- $body = rcmail_create_forward_body($body, $isHtml);
+
+ $body = rcmail_create_forward_body($body, $isHtml);
}
else if ($compose_mode == RCUBE_COMPOSE_DRAFT)
{
@@ -403,8 +409,8 @@
$body = rcmail_first_text_part($MESSAGE);
$isHtml = false;
}
- if (strlen($body))
- $body = rcmail_create_draft_body($body, $isHtml);
+
+ $body = rcmail_create_draft_body($body, $isHtml);
}
$OUTPUT->include_script('tiny_mce/tiny_mce.js');
@@ -437,25 +443,26 @@
$lang_set = "googie.setLanguages(".array2js($CONFIG['spellcheck_languages']).");\n";
$OUTPUT->include_script('googiespell.js');
- $OUTPUT->add_script(sprintf("var googie = new GoogieSpell('\$__skin_path/images/googiespell/','%s&_action=spell&lang=');\n".
- "googie.lang_chck_spell = \"%s\";\n".
- "googie.lang_rsm_edt = \"%s\";\n".
- "googie.lang_close = \"%s\";\n".
- "googie.lang_revert = \"%s\";\n".
- "googie.lang_no_error_found = \"%s\";\n%s".
- "googie.setCurrentLanguage('%s');\n".
- "googie.decorateTextarea('%s');\n".
- "%s.set_env('spellcheck', googie);",
- $GLOBALS['COMM_PATH'],
- rep_specialchars_output(rcube_label('checkspelling')),
- rep_specialchars_output(rcube_label('resumeediting')),
- rep_specialchars_output(rcube_label('close')),
- rep_specialchars_output(rcube_label('revertto')),
- rep_specialchars_output(rcube_label('nospellerrors')),
- $lang_set,
- substr($_SESSION['user_lang'], 0, 2),
- $attrib['id'],
- $JS_OBJECT_NAME), 'foot');
+ $OUTPUT->add_script(sprintf(
+ "var googie = new GoogieSpell('\$__skin_path/images/googiespell/','%s&_action=spell&lang=');\n".
+ "googie.lang_chck_spell = \"%s\";\n".
+ "googie.lang_rsm_edt = \"%s\";\n".
+ "googie.lang_close = \"%s\";\n".
+ "googie.lang_revert = \"%s\";\n".
+ "googie.lang_no_error_found = \"%s\";\n%s".
+ "googie.setCurrentLanguage('%s');\n".
+ "googie.decorateTextarea('%s');\n".
+ "%s.set_env('spellcheck', googie);",
+ $GLOBALS['COMM_PATH'],
+ JQ(Q(rcube_label('checkspelling'))),
+ JQ(Q(rcube_label('resumeediting'))),
+ JQ(Q(rcube_label('close'))),
+ JQ(Q(rcube_label('revertto'))),
+ JQ(Q(rcube_label('nospellerrors'))),
+ $lang_set,
+ substr($_SESSION['user_lang'], 0, 2),
+ $attrib['id'],
+ JS_OBJECT_NAME), 'foot');
rcube_add_label('checking');
}
@@ -463,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)
@@ -480,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);
@@ -504,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)
@@ -534,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>" .
@@ -542,36 +549,39 @@
"<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">From: </th><td>%s</td></tr>" .
"<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">To: </th><td>%s</td></tr>" .
"</tbody></table><br>",
- rep_specialchars_output($MESSAGE['subject']),
- rep_specialchars_output($MESSAGE['headers']->date),
- rep_specialchars_output($IMAP->decode_header($MESSAGE['headers']->from)),
- rep_specialchars_output($IMAP->decode_header($MESSAGE['headers']->to)));
+ Q($MESSAGE['subject']),
+ Q($MESSAGE['headers']->date),
+ Q($IMAP->decode_header($MESSAGE['headers']->from)),
+ Q($IMAP->decode_header($MESSAGE['headers']->to)));
}
// add attachments
- if (!isset($_SESSION['compose']['forward_attachments']) &&
- is_array($MESSAGE['parts']) && sizeof($MESSAGE['parts'])>1)
+ if (!isset($_SESSION['compose']['forward_attachments']) && is_array($MESSAGE['parts']))
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,36 +590,32 @@
$_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->d_parameters['filename'] || $part->ctype_parameters['name']))))
- {
+ (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);
- $filename = !empty($part->d_parameters['filename']) ? $part->d_parameters['filename'] :
- (!empty($part->ctype_parameters['name']) ? $part->ctype_parameters['name'] :
- (!empty($part->headers['content-description']) ? $part->headers['content-description'] : 'file'));
-
$_SESSION['compose']['attachments'][] = array(
- 'name' => rcube_imap::decode_mime_string($filename),
'mimetype' => $part->ctype_primary . '/' . $part->ctype_secondary,
+ '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);
@@ -626,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)
@@ -651,12 +657,12 @@
$out .= $form_end ? "\n$form_end" : '';
return $out;
- }
+}
function rcmail_compose_attachment_list($attrib)
- {
- global $OUTPUT, $JS_OBJECT_NAME, $CONFIG;
+{
+ global $OUTPUT, $CONFIG;
// add ID if not given
if (!$attrib['id'])
@@ -668,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'],
@@ -680,24 +686,23 @@
foreach ($_SESSION['compose']['attachments'] as $id => $a_prop)
$out .= sprintf('<li id="rcmfile%d"><a href="#delete" onclick="return %s.command(\'remove-attachment\',\'rcmfile%d\', this)" title="%s">%s</a>%s</li>',
$id,
- $JS_OBJECT_NAME,
+ JS_OBJECT_NAME,
$id,
- rcube_label('delete'),
+ Q(rcube_label('delete')),
$button,
- rep_specialchars_output($a_prop['name']));
- }
+ Q($a_prop['name']));
+ }
- $OUTPUT->add_script(sprintf("%s.gui_object('attachmentlist', '%s');", $JS_OBJECT_NAME, $attrib['id']));
+ $OUTPUT->add_gui_object('attachmentlist', $attrib['id']);
$out .= '</ul>';
return $out;
- }
-
+}
function rcmail_compose_attachment_form($attrib)
- {
- global $OUTPUT, $JS_OBJECT_NAME, $SESS_HIDDEN_FIELD;
+{
+ global $OUTPUT, $SESS_HIDDEN_FIELD;
// add ID if not given
if (!$attrib['id'])
@@ -708,6 +713,7 @@
$input_field = rcmail_compose_attachment_field(array());
$label_send = rcube_label('upload');
$label_close = rcube_label('close');
+ $js_instance = JS_OBJECT_NAME;
$out = <<<EOF
<div$attrib_str>
@@ -715,29 +721,31 @@
$SESS_HIDDEN_FIELD
$input_field<br />
<input type="button" value="$label_close" class="button" onclick="document.getElementById('$attrib[id]').style.visibility='hidden'" />
-<input type="button" value="$label_send" class="button" onclick="$JS_OBJECT_NAME.command('send-attachment', this.form)" />
+<input type="button" value="$label_send" class="button" onclick="$js_instance.command('send-attachment', this.form)" />
</form>
</div>
EOF;
- $OUTPUT->add_script(sprintf("%s.gui_object('uploadbox', '%s');", $JS_OBJECT_NAME, $attrib['id']));
+ $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']);
@@ -751,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']);
@@ -774,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)
@@ -799,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['onclick'] = 'return rcmail_toggle_editor(this)';
+ $attrib['onchange'] = 'return rcmail_toggle_editor(this)';
foreach ($choices as $value => $text)
- {
+ {
$checked = '';
if ((($value == 'html') && $useHtml) ||
(($value != 'html') && !$useHtml))
@@ -819,77 +829,104 @@
$attrib['id'] = '_' . $value;
$rb = new radiobutton($attrib);
- $selector .= sprintf("<td>%s</td><td class=\"title\"><label for=\"%s\">%s</label></td>",
+ $selector .= sprintf("%s<label for=\"%s\">%s</label>",
$rb->show($value),
$attrib['id'],
rcube_label($text));
- }
+ }
return $selector;
}
function get_form_tags($attrib)
- {
- global $CONFIG, $OUTPUT, $JS_OBJECT_NAME, $MESSAGE_FORM, $SESS_HIDDEN_FIELD;
+{
+ 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';
if (!strlen($MESSAGE_FORM))
- $OUTPUT->add_script("$JS_OBJECT_NAME.gui_object('messageform', '$form_name');");
+ $OUTPUT->add_gui_object('messageform', $form_name);
$MESSAGE_FORM = $form_name;
return array($form_start, $form_end);
- }
+}
-function format_email_recipient($email, $name='')
- {
- if ($name && $name != $email)
- return sprintf('%s <%s>', strpos($name, ",") ? '"'.$name.'"' : $name, $email);
- else
- return $email;
- }
-
-
-function rcmail_charset_pulldown($selected='ISO-8859-1')
- {
- $select = new select();
-
-
- return $select->show($selected);
- }
-
+// register UI objects
+$OUTPUT->add_handlers(array(
+ 'composeheaders' => 'rcmail_compose_headers',
+ 'composesubject' => 'rcmail_compose_subject',
+ 'composebody' => 'rcmail_compose_body',
+ 'composeattachmentlist' => 'rcmail_compose_attachment_list',
+ 'composeattachmentform' => 'rcmail_compose_attachment_form',
+ 'composeattachment' => 'rcmail_compose_attachment_field',
+ 'priorityselector' => 'rcmail_priority_selector',
+ 'editorselector' => 'rcmail_editor_selector',
+ 'receiptcheckbox' => 'rcmail_receipt_checkbox',
+));
/****** get contacts for this user and add them to client scripts ********/
-$sql_result = $DB->query("SELECT name, email
- FROM ".get_table_name('contacts')." WHERE user_id=?
- AND del<>1",$_SESSION['user_id']);
+require_once('include/rcube_contacts.inc');
+require_once('include/rcube_ldap.inc');
+
+$CONTACTS = new rcube_contacts($DB, $USER->ID);
+$CONTACTS->set_pagesize(1000);
+
+$a_contacts = array();
-if ($DB->num_rows($sql_result))
- {
- $a_contacts = array();
- while ($sql_arr = $DB->fetch_assoc($sql_result))
+if ($result = $CONTACTS->list_records())
+ {
+ while ($sql_arr = $result->iterate())
if ($sql_arr['email'])
- $a_contacts[] = format_email_recipient($sql_arr['email'], rep_specialchars_output($sql_arr['name'], 'js'));
-
- $OUTPUT->add_script(sprintf("$JS_OBJECT_NAME.set_env('contacts', %s);", array2js($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