* - Send mail
* - Save As Draft
*
- * $Id$
+ * @version $Id$
* @package squirrelmail
*/
-/** Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
define('SM_PATH','../');
/* SquirrelMail required files. */
$identity = '';
$from_o = $orig_header->from;
+ if (is_array($from_o)) {
+ if (isset($from_o[0])) {
+ $from_o = $from_o[0];
+ }
+ }
if (is_object($from_o)) {
$orig_from = $from_o->getAddress();
} else {
if ($identity_match) {
$identity = $identity_match;
}
- // we need identiy here fore draft case #845290
- // echo $identity."leer";
}
switch ($action) {
html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) .
_("From:") . '</td>' . "\n" .
html_tag( 'td', '', 'left', $color[4], 'width="90%"' ) .
- ' '.
- addSelect('identity', $ident_list, $identity, TRUE);
+ ' '.
+ addSelect('identity', $ident_list, $identity, TRUE);
echo ' </td>' . "\n" .
' </tr>' . "\n";
}
+
echo ' <tr>' . "\n" .
html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) .
_("To:") . '</TD>' . "\n" .
$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 ??? */
- /* THEFIX: browsers don't replace space with nbsp. SM replaces
- space with nbsp when decodes headers. If problem still happens,
- use cleanup_nbsp() */
-
-// $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);
unset ($imap_deliver);
return $length;
} else {
- $msg = '<br>Error: '._("Draft folder")." $draft_folder" . ' does not exist.';
+ $msg = '<br />'.sprintf(_("Error: Draft folder %s does not exist."), $draft_folder);
plain_error_message($msg, $color);
return false;
}
$succes = $deliver->finalizeStream($stream);
}
if (!$succes) {
- $msg = $deliver->dlv_msg . '<br>' .
+ $msg = $deliver->dlv_msg . '<br />' .
_("Server replied: ") . $deliver->dlv_ret_nr . ' '.
$deliver->dlv_server_msg;
plain_error_message($msg, $color);