From 6d5dbae53cd4b4b97da0b0c558292a7f1062a524 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 25 Jul 2008 11:13:15 -0400
Subject: [PATCH] Prefer File_Info over mime_content_type + detect mime type when uploading + some code style
---
program/steps/mail/compose.inc | 386 +++++++++++++++++++++++-------------------------------
1 files changed, 164 insertions(+), 222 deletions(-)
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index aaeca24..9da449d 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-2007, RoundCube Dev. - Switzerland |
+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -26,7 +26,7 @@
// remove an attachment
-if ($_action=='remove-attachment' && preg_match('/^rcmfile([0-9]+)$/', $_POST['_file'], $regs))
+if ($RCMAIL->action=='remove-attachment' && preg_match('/^rcmfile([0-9]+)$/', $_POST['_file'], $regs))
{
$id = $regs[1];
if (is_array($_SESSION['compose']['attachments'][$id]))
@@ -39,7 +39,7 @@
}
}
-if ($_action=='display-attachment' && preg_match('/^rcmfile([0-9]+)$/', $_GET['_file'], $regs))
+if ($RCMAIL->action=='display-attachment' && preg_match('/^rcmfile([0-9]+)$/', $_GET['_file'], $regs))
{
$id = $regs[1];
if (is_array($_SESSION['compose']['attachments'][$id]))
@@ -63,7 +63,10 @@
if (!is_array($_SESSION['compose']) || $_SESSION['compose']['id'] != get_input_value('_id', RCUBE_INPUT_GET))
{
rcmail_compose_cleanup();
- $_SESSION['compose'] = array('id' => uniqid(rand()));
+ $_SESSION['compose'] = array('id' => uniqid(rand()), 'param' => array_map('strip_tags', $_GET));
+
+ // redirect to a unique URL with all parameters stored in session
+ $OUTPUT->redirect(array('_action' => 'compose', '_id' => $_SESSION['compose']['id']));
}
// add some labels to client
@@ -74,43 +77,33 @@
// get reference message and set compose mode
-if ($msg_uid = get_input_value('_reply_uid', RCUBE_INPUT_GET))
+if ($msg_uid = $_SESSION['compose']['param']['_reply_uid'])
$compose_mode = RCUBE_COMPOSE_REPLY;
-else if ($msg_uid = get_input_value('_forward_uid', RCUBE_INPUT_GET))
+else if ($msg_uid = $_SESSION['compose']['param']['_forward_uid'])
$compose_mode = RCUBE_COMPOSE_FORWARD;
-else if ($msg_uid = get_input_value('_draft_uid', RCUBE_INPUT_GET))
+else if ($msg_uid = $_SESSION['compose']['param']['_draft_uid'])
$compose_mode = RCUBE_COMPOSE_DRAFT;
-
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 = new rcube_message($msg_uid);
- if (!empty($MESSAGE['headers']->charset))
- $IMAP->set_charset($MESSAGE['headers']->charset);
+ 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'] = trim($MESSAGE['headers']->references . " " . $MESSAGE['headers']->messageID);
+ $_SESSION['compose']['reply_msgid'] = $MESSAGE->headers->messageID;
+ $_SESSION['compose']['references'] = trim($MESSAGE->headers->references . " " . $MESSAGE->headers->messageID);
- if (!empty($_GET['_all']))
- $MESSAGE['reply_all'] = 1;
+ if (!empty($_SESSION['compose']['param']['_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;
}
}
@@ -137,10 +130,10 @@
$header = 'to';
// 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);
+ if (($mailto_id = $_SESSION['compose']['param']['_mailto']) && $_SESSION['mailto'][$mailto_id])
+ $fvalue = urldecode($_SESSION['mailto'][$mailto_id]);
+ else if (!empty($_SESSION['compose']['param']['_to']))
+ $fvalue = $_SESSION['compose']['param']['_to'];
case 'cc':
if (!$fname)
@@ -173,19 +166,19 @@
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;
+ if ($header=='to' && !empty($MESSAGE->headers->replyto))
+ $fvalue = $MESSAGE->headers->replyto;
- else if ($header=='to' && !empty($MESSAGE['headers']->from))
- $fvalue = $MESSAGE['headers']->from;
+ else if ($header=='to' && !empty($MESSAGE->headers->from))
+ $fvalue = $MESSAGE->headers->from;
// add recipent of original message if reply to all
- else if ($header=='cc' && !empty($MESSAGE['reply_all']))
+ else if ($header=='cc' && !empty($MESSAGE->reply_all))
{
- if ($v = $MESSAGE['headers']->to)
+ if ($v = $MESSAGE->headers->to)
$fvalue .= $v;
- if ($v = $MESSAGE['headers']->cc)
+ if ($v = $MESSAGE->headers->cc)
$fvalue .= (!empty($fvalue) ? ', ' : '') . $v;
}
@@ -196,7 +189,7 @@
$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 (!empty($addr_part['mailto']) && !in_array($addr_part['mailto'], $sa_recipients) && (!$MESSAGE->compose_from || !in_array($addr_part['mailto'], $MESSAGE->compose_from)))
{
$fvalue .= (strlen($fvalue) ? ', ':'').$addr_part['string'];
$sa_recipients[] = $addr_part['mailto'];
@@ -207,14 +200,14 @@
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);
+ if ($header=='to' && !empty($MESSAGE->headers->to))
+ $fvalue = $MESSAGE->get_header('to');
- if ($header=='cc' && !empty($MESSAGE['headers']->cc))
- $fvalue = $IMAP->decode_header($MESSAGE['headers']->cc);
+ if ($header=='cc' && !empty($MESSAGE->headers->cc))
+ $fvalue = $MESSAGE->get_header('cc');
- if ($header=='bcc' && !empty($MESSAGE['headers']->bcc))
- $fvalue = $IMAP->decode_header($MESSAGE['headers']->bcc);
+ if ($header=='bcc' && !empty($MESSAGE->headers->bcc))
+ $fvalue = $MESSAGE->get_header('bcc');
}
@@ -251,20 +244,20 @@
// extract all recipients of the reply-message
$a_recipients = array();
- if ($compose_mode == RCUBE_COMPOSE_REPLY && is_object($MESSAGE['headers']))
+ if ($compose_mode == RCUBE_COMPOSE_REPLY && is_object($MESSAGE->headers))
{
- $MESSAGE['FROM'] = array();
+ $MESSAGE->compose_from = array();
- $a_to = $IMAP->decode_address_list($MESSAGE['headers']->to);
+ $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))
+ if (!empty($MESSAGE->headers->cc))
{
- $a_cc = $IMAP->decode_address_list($MESSAGE['headers']->cc);
+ $a_cc = $IMAP->decode_address_list($MESSAGE->headers->cc);
foreach ($a_cc as $addr)
{
if (!empty($addr['mailto']))
@@ -298,7 +291,7 @@
{
$h2t = new html2text($a_signatures[$identity_id]['text'], false, false);
$plainTextPart = $h2t->get_text();
- $a_signatures[$identity_id]['plain_text'] = trim($plainTextPart);
+ $a_signatures[$identity_id]['plain_text'] = trim(html_entity_decode($plainTextPart, ENT_NOQUOTES, 'UTF-8'));
}
}
@@ -306,10 +299,10 @@
if (in_array($sql_arr['email'], $a_recipients))
$from_id = $sql_arr['identity_id'];
- if ($compose_mode == RCUBE_COMPOSE_REPLY && is_array($MESSAGE['FROM']))
- $MESSAGE['FROM'][] = $sql_arr['email'];
+ if ($compose_mode == RCUBE_COMPOSE_REPLY && is_array($MESSAGE->compose_from))
+ $MESSAGE->compose_from[] = $sql_arr['email'];
- if ($compose_mode == RCUBE_COMPOSE_DRAFT && strstr($MESSAGE['headers']->from, $sql_arr['email']))
+ if ($compose_mode == RCUBE_COMPOSE_DRAFT && strstr($MESSAGE->headers->from, $sql_arr['email']))
$from_id = $sql_arr['identity_id'];
}
@@ -337,7 +330,7 @@
function rcmail_compose_body($attrib)
{
- global $CONFIG, $OUTPUT, $MESSAGE, $compose_mode;
+ global $RCMAIL, $CONFIG, $OUTPUT, $MESSAGE, $compose_mode;
list($form_start, $form_end) = get_form_tags($attrib);
unset($attrib['form']);
@@ -356,67 +349,44 @@
// use posted message body
if (!empty($_POST['_message']))
+ {
+ $body = get_input_value('_message', RCUBE_INPUT_POST, true);
+ }
+ else if ($compose_mode)
+ {
+ if ($isHtml && $MESSAGE->has_html_part())
{
- $body = get_input_value('_message', RCUBE_INPUT_POST, TRUE);
- }
- // compose reply-body
- else if ($compose_mode == RCUBE_COMPOSE_REPLY)
- {
- $hasHtml = rcmail_has_html_part($MESSAGE['parts']);
- if ($hasHtml && $CONFIG['htmleditor'])
- {
- $body = rcmail_first_html_part($MESSAGE);
+ $body = $MESSAGE->first_html_part();
$isHtml = true;
- }
- else
- {
- $body = rcmail_first_text_part($MESSAGE);
- $isHtml = false;
- }
-
- $body = rcmail_create_reply_body($body, $isHtml);
}
- // forward message body inline
- else if ($compose_mode == RCUBE_COMPOSE_FORWARD)
+ else
{
- $hasHtml = rcmail_has_html_part($MESSAGE['parts']);
- if ($hasHtml && $CONFIG['htmleditor'])
- {
- $body = rcmail_first_html_part($MESSAGE);
- $isHtml = true;
- }
- else
- {
- $body = rcmail_first_text_part($MESSAGE);
+ $body = $MESSAGE->first_text_part();
$isHtml = false;
- }
-
- $body = rcmail_create_forward_body($body, $isHtml);
}
- else if ($compose_mode == RCUBE_COMPOSE_DRAFT)
- {
- $hasHtml = rcmail_has_html_part($MESSAGE['parts']);
- if ($hasHtml && $CONFIG['htmleditor'])
- {
- $body = rcmail_first_html_part($MESSAGE);
- $isHtml = true;
- }
- else
- {
- $body = rcmail_first_text_part($MESSAGE);
- $isHtml = false;
- }
+
+ // compose reply-body
+ if ($compose_mode == RCUBE_COMPOSE_REPLY)
+ $body = rcmail_create_reply_body($body, $isHtml);
+ // forward message body inline
+ else if ($compose_mode == RCUBE_COMPOSE_FORWARD)
+ $body = rcmail_create_forward_body($body, $isHtml);
+ // load draft message body
+ else if ($compose_mode == RCUBE_COMPOSE_DRAFT)
+ $body = rcmail_create_draft_body($body, $isHtml);
+ }
- $body = rcmail_create_draft_body($body, $isHtml);
- }
+ $tinylang = substr($_SESSION['language'], 0, 2);
+ if (!file_exists('program/js/tiny_mce/langs/'.$tinylang.'.js'))
+ $tinylang = 'en';
$OUTPUT->include_script('tiny_mce/tiny_mce.js');
$OUTPUT->include_script("editor.js");
- $OUTPUT->add_script('rcmail_editor_init("$__skin_path");');
+ $OUTPUT->add_script('rcmail_editor_init("$__skin_path", "'.$tinylang.'");');
$out = $form_start ? "$form_start\n" : '';
- $saveid = new html_hiddenfield(array('name' => '_draft_saveid', 'value' => $compose_mode==RCUBE_COMPOSE_DRAFT ? str_replace(array('<','>'), "", $MESSAGE['headers']->messageID) : ''));
+ $saveid = new html_hiddenfield(array('name' => '_draft_saveid', 'value' => $compose_mode==RCUBE_COMPOSE_DRAFT ? str_replace(array('<','>'), "", $MESSAGE->headers->messageID) : ''));
$out .= $saveid->show();
$drafttoggle = new html_hiddenfield(array('name' => '_draft', 'value' => 'yes'));
@@ -426,8 +396,7 @@
$out .= $msgtype->show();
// If desired, set this text area to be editable by TinyMCE
- if ($isHtml)
- $attrib['mce_editable'] = "true";
+ if ($isHtml) $attrib['class'] = "mce_editor";
$textarea = new html_textarea($attrib);
$out .= $textarea->show($body);
$out .= $form_end ? "\n$form_end" : '';
@@ -450,21 +419,21 @@
"googie.setCurrentLanguage('%s');\n".
"googie.decorateTextarea('%s');\n".
"%s.set_env('spellcheck', googie);",
- $GLOBALS['COMM_PATH'],
+ $RCMAIL->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),
+ substr($_SESSION['language'], 0, 2),
$attrib['id'],
JS_OBJECT_NAME), 'foot');
rcube_add_label('checking');
}
- $out .= "\n".'<iframe name="savetarget" src="program/blank.gif" style="width:0;height:0;visibility:hidden;"></iframe>';
+ $out .= "\n".'<iframe name="savetarget" src="program/blank.gif" style="width:0;height:0;border:none;visibility:hidden;"></iframe>';
return $out;
}
@@ -495,11 +464,11 @@
// add title line
$prefix = sprintf("\n\n\nOn %s, %s wrote:\n",
- $MESSAGE['headers']->date,
- $IMAP->decode_header($MESSAGE['headers']->from));
+ $MESSAGE->headers->date,
+ $MESSAGE->get_header('from'));
// try to remove the signature
- if ($sp = strrstr($body, '-- '))
+ if ($sp = strrpos($body, '-- '))
{
if ($body{$sp+3}==' ' || $body{$sp+3}=="\n" || $body{$sp+3}=="\r")
$body = substr($body, 0, $sp-1);
@@ -508,12 +477,10 @@
}
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 />\n",
+ $MESSAGE->headers->date,
+ Q($MESSAGE->get_header('from')));
+ $prefix .= '<blockquote type="cite" style="padding-left:5px; border-left:#1010ff 2px solid; margin-left:5px; width:100%">';
$suffix = "</blockquote>";
}
@@ -525,36 +492,36 @@
{
global $IMAP, $MESSAGE;
- if (! $bodyIsHtml)
+ if (!$bodyIsHtml)
{
// soft-wrap message first
$body = wordwrap($body, 80);
$prefix = sprintf("\n\n\n-------- Original Message --------\nSubject: %s\nDate: %s\nFrom: %s\nTo: %s\n\n",
- $MESSAGE['subject'],
- $MESSAGE['headers']->date,
- $IMAP->decode_header($MESSAGE['headers']->from),
- $IMAP->decode_header($MESSAGE['headers']->to));
+ $MESSAGE->subject,
+ $MESSAGE->headers->date,
+ $MESSAGE->get_header('from'),
+ $MESSAGE->get_header('to'));
}
else
{
$prefix = sprintf(
- "<br><br>-------- Original Message --------" .
+ "<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>" .
"<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">Date: </th><td>%s</td></tr>" .
"<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>",
- Q($MESSAGE['subject']),
- Q($MESSAGE['headers']->date),
- Q($IMAP->decode_header($MESSAGE['headers']->from)),
- Q($IMAP->decode_header($MESSAGE['headers']->to)));
+ Q($MESSAGE->subject),
+ Q($MESSAGE->headers->date),
+ Q($MESSAGE->get_header('from')),
+ Q($MESSAGE->get_header('to')));
}
// add attachments
- if (!isset($_SESSION['compose']['forward_attachments']) && is_array($MESSAGE['parts']))
- rcmail_write_compose_attachments($MESSAGE);
+ if (!isset($_SESSION['compose']['forward_attachments']) && is_array($MESSAGE->mime_parts))
+ rcmail_write_compose_attachments($MESSAGE, $bodyIsHtml);
return $prefix.$body;
}
@@ -562,40 +529,40 @@
function rcmail_create_draft_body($body, $bodyIsHtml)
{
- global $IMAP, $MESSAGE;
+ global $MESSAGE;
/**
* add attachments
- * sizeof($MESSAGE['parts'] can be 1 - e.g. attachment, but no text!
+ * sizeof($MESSAGE->mime_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);
+ && is_array($MESSAGE->mime_parts)
+ && count($MESSAGE->mime_parts) > 0)
+ rcmail_write_compose_attachments($MESSAGE, $bodyIsHtml);
return $body;
}
-function rcmail_write_compose_attachments(&$message)
+function rcmail_write_compose_attachments(&$message, $bodyIsHtml)
{
- global $IMAP, $CONFIG;
+ global $RCMAIL, $IMAP;
- $temp_dir = unslashify($CONFIG['temp_dir']);
+ $temp_dir = unslashify($RCMAIL->config->get('temp_dir'));
if (!is_array($_SESSION['compose']['attachments']))
$_SESSION['compose']['attachments'] = array();
- foreach ($message['parts'] as $pid => $part)
+ foreach ((array)$message->mime_parts as $pid => $part)
{
- if ($part->ctype_primary != 'message' &&
+ if (($part->ctype_primary != 'message' || !$bodyIsHtml) &&
($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));
+ fwrite($fp, $message->get_part_content($pid));
fclose($fp);
$_SESSION['compose']['attachments'][] = array(
@@ -607,13 +574,13 @@
}
}
- $_SESSION['compose']['forward_attachments'] = TRUE;
+ $_SESSION['compose']['forward_attachments'] = true;
}
function rcmail_compose_subject($attrib)
{
- global $CONFIG, $MESSAGE, $compose_mode;
+ global $MESSAGE, $compose_mode;
list($form_start, $form_end) = get_form_tags($attrib);
unset($attrib['form']);
@@ -630,24 +597,24 @@
// create a reply-subject
else if ($compose_mode == RCUBE_COMPOSE_REPLY)
{
- if (eregi('^re:', $MESSAGE['subject']))
- $subject = $MESSAGE['subject'];
+ if (eregi('^re:', $MESSAGE->subject))
+ $subject = $MESSAGE->subject;
else
- $subject = 'Re: '.$MESSAGE['subject'];
+ $subject = 'Re: '.$MESSAGE->subject;
}
// create a forward-subject
else if ($compose_mode == RCUBE_COMPOSE_FORWARD)
{
- if (eregi('^fwd:', $MESSAGE['subject']))
- $subject = $MESSAGE['subject'];
+ if (eregi('^fwd:', $MESSAGE->subject))
+ $subject = $MESSAGE->subject;
else
- $subject = 'Fwd: '.$MESSAGE['subject'];
+ $subject = 'Fwd: '.$MESSAGE->subject;
}
// creeate a draft-subject
else if ($compose_mode == RCUBE_COMPOSE_DRAFT)
- $subject = $MESSAGE['subject'];
+ $subject = $MESSAGE->subject;
$out = $form_start ? "$form_start\n" : '';
$out .= $textfield->show($subject);
@@ -665,64 +632,55 @@
if (!$attrib['id'])
$attrib['id'] = 'rcmAttachmentList';
- // allow the following attributes to be added to the <ul> tag
- $attrib_str = create_attrib_string($attrib, array('id', 'class', 'style'));
-
- $out = '<ul'. $attrib_str . ">\n";
+ $out = "\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'],
- $attrib['deleteicon'],
- rcube_label('delete'));
+ $button = html::img(array(
+ 'src' => $CONFIG['skin_path'] . $attrib['deleteicon'],
+ 'alt' => rcube_label('delete'),
+ 'style' => "border:0;padding-right:2px;vertical-align:middle"));
else
- $button = rcube_label('delete');
+ $button = Q(rcube_label('delete'));
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,
- $id,
- Q(rcube_label('delete')),
- $button,
- Q($a_prop['name']));
+ {
+ if (empty($a_prop))
+ continue;
+
+ $out .= html::tag('li', array('id' => "rcmfile".$id),
+ html::a(array(
+ 'href' => "#delete",
+ 'title' => rcube_label('delete'),
+ 'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%d', this)", JS_OBJECT_NAME, $id)),
+ $button) . Q($a_prop['name']));
+ }
}
$OUTPUT->add_gui_object('attachmentlist', $attrib['id']);
- $out .= '</ul>';
- return $out;
+ return html::tag('ul', $attrib, $out, html::$common_attrib);
}
function rcmail_compose_attachment_form($attrib)
{
- global $OUTPUT, $SESS_HIDDEN_FIELD;
+ global $OUTPUT;
// add ID if not given
if (!$attrib['id'])
$attrib['id'] = 'rcmUploadbox';
- // allow the following attributes to be added to the <div> tag
- $attrib_str = create_attrib_string($attrib, array('id', 'class', 'style'));
- $input_field = rcmail_compose_attachment_field(array());
- $label_send = rcube_label('upload');
- $label_close = rcube_label('close');
- $js_instance = JS_OBJECT_NAME;
+ $button = new html_inputfield(array('type' => 'button', 'class' => 'button'));
- $out = <<<EOF
-<div$attrib_str>
-<form action="./" method="post" enctype="multipart/form-data">
-$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_instance.command('send-attachment', this.form)" />
-</form>
-</div>
-EOF;
-
+ $out = html::div($attrib,
+ $OUTPUT->form_tag(array('name' => 'form', 'method' => 'post', 'enctype' => 'multipart/form-data')) .
+ rcmail_compose_attachment_field(array()) . html::br() .
+ $button->show(rcube_label('close'), array('onclick' => "document.getElementById('$attrib[id]').style.visibility='hidden'")) .
+ $button->show(rcube_label('upload'), array('onclick' => JS_OBJECT_NAME . ".command('send-attachment', this.form)"))
+ );
+
$OUTPUT->add_gui_object('uploadbox', $attrib['id']);
return $out;
@@ -756,7 +714,7 @@
rcube_label('highest')),
array(5, 4, 0, 2, 1));
- $sel = isset($_POST['_priority']) ? $_POST['_priority'] : intval($MESSAGE['headers']->priority);
+ $sel = isset($_POST['_priority']) ? $_POST['_priority'] : intval($MESSAGE->headers->priority);
$out = $form_start ? "$form_start\n" : '';
$out .= $selector->show($sel);
@@ -768,7 +726,7 @@
function rcmail_receipt_checkbox($attrib)
{
- global $MESSAGE;
+ global $MESSAGE, $compose_mode;
list($form_start, $form_end) = get_form_tags($attrib);
unset($attrib['form']);
@@ -781,7 +739,8 @@
$checkbox = new html_checkbox($attrib);
$out = $form_start ? "$form_start\n" : '';
- $out .= $checkbox->show($MESSAGE['headers']->mdn_to ? 1 : 0);
+ $out .= $checkbox->show(
+ $compose_mode == RCUBE_COMPOSE_DRAFT && $MESSAGE->headers->mdn_to ? 1 : 0);
$out .= $form_end ? "\n$form_end" : '';
return $out;
@@ -797,39 +756,20 @@
'plain' => 'plaintoggle'
);
- // determine whether HTML or plain text should be checked
- if ($CONFIG['htmleditor'])
- $useHtml = true;
- else
- $useHtml = false;
+ // determine whether HTML or plain text should be checked
+ $useHtml = $CONFIG['htmleditor'] ? true : false;
- 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']);
- }
+ if ($compose_mode)
+ $useHtml = ($useHtml && $MESSAGE->has_html_part());
$selector = '';
-
- $attrib['name'] = '_editorSelect';
- $attrib['onchange'] = 'return rcmail_toggle_editor(this)';
+ $chosenvalue = $useHtml ? 'html' : 'plain';
+ $radio = new html_radiobutton(array('name' => '_editorSelect', 'onclick' => 'return rcmail_toggle_editor(this)'));
foreach ($choices as $value => $text)
{
- $checked = '';
- if ((($value == 'html') && $useHtml) ||
- (($value != 'html') && !$useHtml))
- $attrib['checked'] = 'true';
- else
- unset($attrib['checked']);
-
$attrib['id'] = '_' . $value;
- $rb = new html_radiobutton($attrib);
- $selector .= sprintf("%s<label for=\"%s\">%s</label>",
- $rb->show($value),
- $attrib['id'],
- rcube_label($text));
+ $attrib['value'] = $value;
+ $selector .= $radio->show($chosenvalue, $attrib) . html::label($attrib['id'], Q(rcube_label($text)));
}
return $selector;
@@ -838,16 +778,15 @@
function get_form_tags($attrib)
{
- global $CONFIG, $OUTPUT, $MESSAGE_FORM, $SESS_HIDDEN_FIELD;
+ global $RCMAIL, $MESSAGE_FORM;
$form_start = '';
if (!strlen($MESSAGE_FORM))
{
- $hiddenfields = new html_hiddenfield(array('name' => '_task', 'value' => $GLOBALS['_task']));
+ $hiddenfields = new html_hiddenfield(array('name' => '_task', 'value' => $RCMAIL->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 = empty($attrib['form']) ? $RCMAIL->output->form_tag(array('name' => "form", 'method' => "post")) : '';
$form_start .= $hiddenfields->show();
}
@@ -855,7 +794,7 @@
$form_name = !empty($attrib['form']) ? $attrib['form'] : 'form';
if (!strlen($MESSAGE_FORM))
- $OUTPUT->add_gui_object('messageform', $form_name);
+ $RCMAIL->output->add_gui_object('messageform', $form_name);
$MESSAGE_FORM = $form_name;
@@ -889,15 +828,16 @@
if ($sql_arr['email'])
$a_contacts[] = format_email_recipient($sql_arr['email'], $sql_arr['name']);
}
-if (isset($CONFIG['ldap_public']))
+if (!empty($CONFIG['ldap_public']) && is_array($CONFIG['ldap_public']))
{
/* LDAP autocompletion */
foreach ($CONFIG['ldap_public'] as $ldapserv_config)
{
- if ($ldapserv_config['fuzzy_search'] != 1)
+ if ($ldapserv_config['fuzzy_search'] != 1 ||
+ $ldapserv_config['global_search'] != 1)
{
continue;
- }
+ }
$LDAP = new rcube_ldap($ldapserv_config);
$LDAP->connect();
@@ -921,6 +861,8 @@
if ($a_contacts)
{
$OUTPUT->set_env('contacts', $a_contacts);
- }
+ }
+
$OUTPUT->send('compose');
-?>
\ No newline at end of file
+
+?>
--
Gitblit v1.9.1