githubFork/roundcubemail.git

			@@ -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,15 +29,15 @@


			// 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;
			}
			}
			@@ -45,18 +46,22 @@
			$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
			@@ -81,9 +86,7 @@
			{
			$_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;
			@@ -120,24 +123,10 @@
			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);

			@@ -149,9 +138,12 @@
			}
			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;

			@@ -193,7 +185,7 @@
			$fvalue = '';
			foreach ($to_addresses as $addr_part)
			{
			if (!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['FROM'] \|\| !in_array($addr_part['mailto'], $MESSAGE['FROM'])))
			{
			$fvalue .= (strlen($fvalue) ? ', ':'').$addr_part['string'];
			$sa_recipients[] = $addr_part['mailto'];
			@@ -238,7 +230,7 @@

			function rcmail_compose_header_from($attrib)
			{
			global $IMAP, $MESSAGE, $DB, $OUTPUT, $JS_OBJECT_NAME, $compose_mode;
			global $IMAP, $MESSAGE, $DB, $OUTPUT, $compose_mode;

			// pass the following attributes to the form class
			$field_attrib = array('name' => '_from');
			@@ -283,7 +275,7 @@
			$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))
			@@ -296,6 +288,12 @@
			{
			$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
			@@ -316,7 +314,7 @@
			$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
			{
			@@ -334,7 +332,7 @@

			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 +368,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 +385,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 +401,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 +435,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');
			}
			@@ -542,17 +541,16 @@
			"<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;
			}

			@@ -583,7 +581,7 @@
			{
			if ($part->ctype_primary != 'message' && $part->ctype_primary != 'text' &&
			($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'))
			@@ -591,13 +589,9 @@
			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
			);
			}
			@@ -656,7 +650,7 @@

			function rcmail_compose_attachment_list($attrib)
			{
			global $OUTPUT, $JS_OBJECT_NAME, $CONFIG;
			global $OUTPUT, $CONFIG;

			// add ID if not given
			if (!$attrib['id'])
			@@ -680,14 +674,14 @@
			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;
			@@ -697,7 +691,7 @@

			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 +702,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,13 +710,13 @@
			$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;
			}

			@@ -807,7 +802,7 @@
			$selector = '';

			$attrib['name'] = '_editorSelect';
			$attrib['onclick'] = 'return rcmail_toggle_editor(this)';
			$attrib['onchange'] = 'return rcmail_toggle_editor(this)';
			foreach ($choices as $value => $text)
			{
			$checked = '';
			@@ -819,7 +814,7 @@

			$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));
			@@ -831,7 +826,7 @@

			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))
			@@ -848,7 +843,7 @@
			$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;

			@@ -856,38 +851,35 @@
			}


			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');

			$CONTACTS = new rcube_contacts($DB, $_SESSION['user_id']);
			$CONTACTS->set_pagesize(1000);

			if ($DB->num_rows($sql_result))
			if ($result = $CONTACTS->list_records())
			{
			$a_contacts = array();
			while ($sql_arr = $DB->fetch_assoc($sql_result))
			while ($sql_arr = $result->iterate())
			if ($sql_arr['email'])
			$a_contacts[] = format_email_recipient($sql_arr['email'], rep_specialchars_output($sql_arr['name'], 'js'));
			$a_contacts[] = format_email_recipient($sql_arr['email'], JQ($sql_arr['name']));

			$OUTPUT->add_script(sprintf("$JS_OBJECT_NAME.set_env('contacts', %s);", array2js($a_contacts)));
			$OUTPUT->set_env('contacts', $a_contacts);
			}