if ( sqgetGlobalVar('smaction_reply_all',$tmp) ) $action = 'reply_all';
if ( sqgetGlobalVar('smaction_forward',$tmp) ) $action = 'forward';
if ( sqgetGlobalVar('smaction_attache',$tmp) ) $action = 'forward_as_attachment';
+ if ( sqgetGlobalVar('smaction_draft',$tmp) ) $action = 'draft';
+ if ( sqgetGlobalVar('smaction_edit_new',$tmp) ) $action = 'edit_as_new';
}
/* Location (For HTTP 1.1 Header("Location: ...") redirects) */
$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('identitiy', $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" .
$s_a[] = '<table bgcolor="'.$color[0].
'" border="0"><tr><td>'.
- addCheckBox('delete[]', $key).
+ addCheckBox('delete[]', FALSE, $key).
"</td><td>\n" . $attached_filename .
'</td><td>-</td><td> ' . $type . '</td><td>('.
show_readable_size( filesize( $attached_file ) ) . ')</td></tr></table>'."\n";
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);