if ($useSendmail) {
require_once(SM_PATH . 'class/deliver/Deliver_SendMail.class.php');
- global $sendmail_path;
- $deliver = new Deliver_SendMail();
+ global $sendmail_path, $sendmail_args;
+ // Check for outdated configuration
+ if (!isset($sendmail_args)) {
+ if ($sendmail_path=='/var/qmail/bin/qmail-inject') {
+ $sendmail_args = '';
+ } else {
+ $sendmail_args = '-i -t';
+ }
+ }
+ $deliver = new Deliver_SendMail(array('sendmail_args'=>$sendmail_args));
$stream = $deliver->initStream($composeMessage,$sendmail_path);
} else {
require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php');
if (!(handleAsSent($mailbox) ||
$message->is_deleted ||
$passed_ent_id)) {
- $mdn_url = $PHP_SELF . '&sendreceipt=1';
+ $mdn_url = $PHP_SELF;
+ $mdn_url = set_url_var($PHP_SELF, 'mailbox', urlencode($mailbox));
+ $mdn_url = set_url_var($PHP_SELF, 'passed_id', $passed_id);
+ $mdn_url = set_url_var($PHP_SELF, 'passed_ent_id', $passed_ent_id);
+ $mdn_url = set_url_var($PHP_SELF, 'sendreceipt', 1);
if ($FirstTimeSee && $javascript_on) {
$script = '<script type="text/javascript">' . "\n";
$script .= '<!--'. "\n";
global $base_uri, $draft_folder, $where, $what, $color, $sort,
$startMessage, $PHP_SELF, $save_as_draft,
$enable_forward_as_attachment, $imapConnection, $lastTargetMailbox,
- $username, $delete_prev_next_display,
+ $username, $delete_prev_next_display, $show_copy_buttons,
$compose_new_win, $javascript_on, $compose_width, $compose_height;
//FIXME cleanup argument list, use $aMailbox where possible
}
$menu_row .= '</select> ';
- $menu_row .= getButton('submit', 'moveButton',_("Move")) . "\n" . '</form>';
+ $menu_row .= getButton('submit', 'moveButton',_("Move")) . "\n";
+
+ // Add msg copy button
+ if ($show_copy_buttons) {
+ $menu_row .= getButton('submit', 'copyButton', _("Copy"));
+ }
+
+ $menu_row .= '</form>';
}
$menu_row .= '</td></tr>';
/* Output the download and/or unsafe images link/-s, if any. */
if ($download_and_unsafe_link) {
- echo $download_and_unsafe_link;
+ echo $download_and_unsafe_link;
}
do_hook("read_body_header_right");
/* get the globals we may need */
-sqgetGlobalVar('key', $key, SQ_COOKIE);
-sqgetGlobalVar('username', $username, SQ_SESSION);
-sqgetGlobalVar('onetimepad',$onetimepad, SQ_SESSION);
sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
-sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION);
sqgetGlobalVar('lastTargetMailbox', $lastTargetMailbox, SQ_SESSION);
if (!sqgetGlobalVar('messages', $messages, SQ_SESSION) ) {
$messages = array();
/* end of get globals */
global $sqimap_capabilities, $lastTargetMailbox;
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+$imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0);
$aMailbox = sqm_api_mailbox_select($imapConnection, $iAccount, $mailbox,array('setindex' => $what, 'offset' => $startMessage),array());
$mailbox_cache[$iAccount.'_'.$aMailbox['NAME']] = $aMailbox;
sqsession_register($mailbox_cache,'mailbox_cache');
$_SESSION['mailbox_cache'] = $mailbox_cache;
-$oTemplate->display('footer.tpl');
displayPageHeader($color, $mailbox,'','');
formatMenuBar($aMailbox, $passed_id, $passed_ent_id, $message,false);
do_hook('read_body_bottom');
sqimap_logout($imapConnection);
-
+$oTemplate->display('footer.tpl');
?>