*/
/**
- * Path for SquirrelMail required files.
- * @ignore
+ * Include the SquirrelMail initialization file.
*/
-define('SM_PATH','../');
+require('../include/init.php');
/* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/global.php');
-require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'functions/imap_general.php');
+require_once(SM_PATH . 'functions/imap_messages.php');
require_once(SM_PATH . 'functions/date.php');
require_once(SM_PATH . 'functions/mime.php');
-require_once(SM_PATH . 'functions/plugin.php');
-require_once(SM_PATH . 'functions/display_messages.php');
require_once(SM_PATH . 'class/deliver/Deliver.class.php');
require_once(SM_PATH . 'functions/addressbook.php');
require_once(SM_PATH . 'functions/forms.php');
sqgetGlobalVar('composesession', $composesession, SQ_SESSION);
sqgetGlobalVar('compose_messages', $compose_messages, SQ_SESSION);
+sqgetGlobalVar('delayed_errors', $delayed_errors, SQ_SESSION);
+if (is_array($delayed_errors)) {
+ $oErrorHandler->AssignDelayedErrors($delayed_errors);
+ sqsession_unregister("delayed_errors");
+}
/** SESSION/POST/GET VARS */
sqgetGlobalVar('session',$session);
}
sqimap_logout($imap_stream);
}
+ if (count($oErrorHandler->aErrors)) {
+ sqsession_register($oErrorHandler->aErrors,"delayed_errors");
+ }
session_write_close();
if ($compose_new_win == '1') {
if ( !isset($pageheader_sent) || !$pageheader_sent ) {
Header("Location: $location/compose.php?saved_draft=yes&session=$composesession");
} else {
- echo ' <br><br><center><a href="' . $location
+ echo ' <br><br><div style="text-align: center;"><a href="' . $location
. '/compose.php?saved_sent=yes&session=' . $composesession . '">'
- . _("Return") . '</a></center>';
+ . _("Return") . '</a></div>';
}
exit();
} else {
Header("Location: $location/right_main.php?mailbox=" . urlencode($draft_folder) .
"&startMessage=1¬e=".urlencode($draft_message));
} else {
- echo ' <br><br><center><a href="' . $location
+ echo ' <br><br><div style="text-align: center;"><a href="' . $location
. '/right_main.php?mailbox=' . urlencode($draft_folder)
. '&startMessage=1&note=' . urlencode($draft_message) .'">'
- . _("Return") . '</a></center>';
+ . _("Return") . '</a></div>';
}
exit();
}
$composeMessage=$compose_messages[$session];
$Result = deliverMessage($composeMessage);
+
do_hook('compose_send_after', $Result, $composeMessage);
if (! $Result) {
showInputForm($session);
exit();
}
unset($compose_messages[$session]);
-
+
/* if it is resumed draft, delete draft message */
if ( isset($delete_draft)) {
$imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, false);
}
sqimap_logout($imap_stream);
}
+ /*
+ * Store the error array in the session because they will be lost on a redirect
+ */
+ if (count($oErrorHandler->aErrors)) {
+ sqsession_register($oErrorHandler->aErrors,"delayed_errors");
+ }
session_write_close();
if ($compose_new_win == '1') {
if ( !isset($pageheader_sent) || !$pageheader_sent ) {
Header("Location: $location/compose.php?mail_sent=yes");
} else {
- echo ' <br><br><center><a href="' . $location
+ echo ' <br><br><div style="text-align: center;"><a href="' . $location
. '/compose.php?mail_sent=yes">'
- . _("Return") . '</a></center>';
+ . _("Return") . '</a></div>';
}
exit();
} else {
Header("Location: $location/right_main.php?mailbox=$urlMailbox".
"&startMessage=$startMessage&mail_sent=yes");
} else {
- echo ' <br><br><center><a href="' . $location
+ echo ' <br><br><div style="text-align: center;"><a href="' . $location
. "/right_main.php?mailbox=$urlMailbox"
. "&startMessage=$startMessage&mail_sent=yes\">"
- . _("Return") . '</a></center>';
+ . _("Return") . '</a></div>';
}
exit();
}
$_FILES['attachfile']['tmp_name'] &&
$_FILES['attachfile']['tmp_name'] != 'none') {
if(saveAttachedFiles($session)) {
- plain_error_message(_("Could not move/copy file. File not attached"), $color);
+ plain_error_message(_("Could not move/copy file. File not attached"));
}
}
/*
*/
include_once('./addrbook_search_html.php');
} elseif (isset($attach)) {
- if (saveAttachedFiles($session)) {
- plain_error_message(_("Could not move/copy file. File not attached"), $color);
- }
if ($compose_new_win == '1') {
compose_Header($color, $mailbox);
} else {
displayPageHeader($color, $mailbox);
}
+ if (saveAttachedFiles($session)) {
+ plain_error_message(_("Could not move/copy file. File not attached"));
+ }
showInputForm($session);
}
elseif (isset($sigappend)) {
$username, $data_dir, $identity, $idents, $delete_draft,
$mailprio, $compose_new_win, $saved_draft, $mail_sent, $sig_first,
$username, $compose_messages, $composesession, $default_charset,
- $compose_onsubmit;
+ $compose_onsubmit, $oTemplate;
if (checkForJavascript()) {
$onfocus = ' onfocus="alreadyFocused=true;"';
}
if ($use_javascript_addr_book) {
- echo "\n". '<script language="JavaScript">'."\n<!--\n" .
+ echo "\n". '<script type="text/javascript">'."\n<!--\n" .
'function open_abook() { ' . "\n" .
' var nwin = window.open("addrbook_popup.php","abookpopup",' .
'"width=670,height=300,resizable=yes,scrollbars=yes");' . "\n" .
// Plugins that use compose_form hook can add an array entry
// to the globally scoped $compose_onsubmit; we add them up
- // here and format the form tag's full onsubmit handler.
- // Each plugin should use "return false" if they need to
+ // here and format the form tag's full onsubmit handler.
+ // Each plugin should use "return false" if they need to
// stop form submission but otherwise should NOT use "return
// true" to give other plugins the chance to do what they need
// to do; SquirrelMail itself will add the final "return true".
// need to quote accordingly.
if (checkForJavascript()) {
$onsubmit_text = ' onsubmit="';
- if (empty($compose_onsubmit))
+ if (empty($compose_onsubmit))
$compose_onsubmit = array();
- else if (!is_array($compose_onsubmit))
+ else if (!is_array($compose_onsubmit))
$compose_onsubmit = array($compose_onsubmit);
foreach ($compose_onsubmit as $text) {
$text = trim($text);
- if (substr($text, -1) != ';' && substr($text, -1) != '}')
+ if (substr($text, -1) != ';' && substr($text, -1) != '}')
$text .= '; ';
$onsubmit_text .= $text;
}
echo $onsubmit_text . ' return true;"';
}
-
+
echo ">\n";
}
if ($saved_draft == 'yes') {
- echo '<br /><center><b>'. _("Draft Saved").'</center></b>';
+ echo '<br /><div style="text-align: center;"><b>'. _("Draft Saved").'</div></b>';
}
if ($mail_sent == 'yes') {
- echo '<br /><center><b>'. _("Your Message has been sent.").'</center></b>';
+ echo '<br /><div style="text-align: center;"><b>'. _("Your Message has been sent.").'</div></b>';
}
if ($compose_new_win == '1') {
echo '<table align="center" bgcolor="'.$color[0].'" width="100%" border="0">'."\n" .
}
echo ' <tr>' . "\n" .
html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) .
- _("From:") . '</td>' . "\n" .
+ '<label for="identity">' . _("From:") . '</label></td>' . "\n" .
html_tag( 'td', '', 'left', $color[4], 'width="90%"' ) .
' '.
addSelect('identity', $ident_list, $identity, TRUE);
echo ' <tr>' . "\n" .
html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) .
- _("To") . ':</td>' . "\n" .
+ '<label for="send_to">' . _("To") . '</label>:</td>' . "\n" .
html_tag( 'td', '', 'left', $color[4], 'width="90%"' ) .
addInput('send_to', $send_to, 60, 0, $onfocus_array). '<br />' . "\n" .
' </td>' . "\n" .
' </tr>' . "\n" .
' <tr>' . "\n" .
html_tag( 'td', '', 'right', $color[4] ) .
- _("Cc") . ':</td>' . "\n" .
+ '<label for="send_to_cc">' . _("Cc") . '</label>:</td>' . "\n" .
html_tag( 'td', '', 'left', $color[4] ) .
addInput('send_to_cc', $send_to_cc, 60, 0, $onfocus_array). '<br />' . "\n" .
' </td>' . "\n" .
' </tr>' . "\n" .
' <tr>' . "\n" .
html_tag( 'td', '', 'right', $color[4] ) .
- _("Bcc") . ':</td>' . "\n" .
+ '<label for="send_to_bcc">' . _("Bcc") . '</label>:</td>' . "\n" .
html_tag( 'td', '', 'left', $color[4] ) .
addInput('send_to_bcc', $send_to_bcc, 60, 0, $onfocus_array).'<br />' . "\n" .
' </td>' . "\n" .
' </tr>' . "\n" .
' <tr>' . "\n" .
html_tag( 'td', '', 'right', $color[4] ) .
- _("Subject") . ':</td>' . "\n" .
+ '<label for="subject">' . _("Subject") . '</label>:</td>' . "\n" .
html_tag( 'td', '', 'left', $color[4] ) . "\n";
echo ' '.addInput('subject', $subject, 60, 0, $onfocus_array).
' </td>' . "\n" .
showComposeButtonRow();
}
- /* why this distinction? */
+ /**
+ * When message is compose in new window, different colors are used.
+ */
if ($compose_new_win == '1') {
echo ' <tr>' . "\n" .
' <td bgcolor="' . $color[0] . '" colspan="2" align="center">' . "\n" .
' <textarea name="body" id="body" rows="' . (int)$editor_height .
- '" cols="' . (int)$editor_size . '" wrap="virtual"' . $onfocus . '>';
+ '" cols="' . (int)$editor_size . '"' . $onfocus . '>';
}
else {
echo ' <tr>' . "\n" .
' <td bgcolor="' . $color[4] . '" colspan="2">' . "\n" .
' <textarea name="body" id="body" rows="' . (int)$editor_height .
- '" cols="' . (int)$editor_size . '" wrap="virtual"' . $onfocus . '>';
+ '" cols="' . (int)$editor_size . '"' . $onfocus . '>';
}
if ($use_signature == true && $newmail == true && !isset($from_htmladdr_search)) {
}
if(count($sizes) > 0) {
- $maxsize = '(max. ' . show_readable_size( min( $sizes ) ) . ')';
- echo addHidden('MAX_FILE_SIZE', min( $sizes ));
+ $maxsize = '(max. ' . show_readable_size( min( $sizes ) ) . ')'
+ . addHidden('MAX_FILE_SIZE', min( $sizes ));
} else {
$maxsize = '';
}
}
do_hook('compose_bottom');
- echo '</body></html>' . "\n";
+ $oTemplate->display('footer.tpl');
}
if(!isset($mailprio)) {
$mailprio = '3';
}
- echo ' ' . _("Priority") .
+ echo ' <label for="mailprio">' . _("Priority") . '</label>: '.
addSelect('mailprio', array(
'1' => _("High"),
'3' => _("Normal"),
if ($default_use_mdn) {
if ($mdn_user_support) {
echo ' ' . _("Receipt") .': '.
- addCheckBox('request_mdn', $request_mdn == '1', '1'). _("On Read").
- addCheckBox('request_dr', $request_dr == '1', '1'). _("On Delivery");
+ addCheckBox('request_mdn', $request_mdn == '1', '1') .
+ '<label for="request_mdn">' . _("On Read") . '</label>' .
+ addCheckBox('request_dr', $request_dr == '1', '1') .
+ '<label for="request_dr">' . _("On Delivery") . '</label>';
}
}
' <td>' . "\n" .
' <input type="submit" name="sigappend" value="' . _("Signature") . '" />' . "\n";
if ($use_javascript_addr_book) {
- echo " <script language=\"JavaScript\"><!--\n document.write(\"".
+ echo " <script type=\"text/javascript\"><!--\n document.write(\"".
" <input type=button value=\\\""._("Addresses").
"\\\" onclick=\\\"javascript:open_abook();\\\" />\");".
" // --></script><noscript>\n".
if ($send_to == '' && $send_to_bcc == '') {
if ($show) {
- plain_error_message(_("You have not filled in the \"To:\" field."), $color);
+ plain_error_message(_("You have not filled in the \"To:\" field."));
}
return false;
}
return $length;
} else {
$msg = '<br />'.sprintf(_("Error: Draft folder %s does not exist."), htmlspecialchars($draft_folder));
- plain_error_message($msg, $color);
+ plain_error_message($msg);
return false;
}
}
}
if (!$success) {
// $deliver->dlv_server_msg is not always server's reply
- $msg = $deliver->dlv_msg . '<br />' .
- _("Server replied:") . ' ' . $deliver->dlv_ret_nr . ' ' .
- $deliver->dlv_server_msg;
- plain_error_message($msg, $color);
+ $msg = $deliver->dlv_msg;
+ if (!empty($deliver->dlv_server_msg)) {
+ // add 'server replied' part only when it is not empty.
+ // Delivery error can be generated by delivery class itself
+ $msg.='<br />' .
+ _("Server replied:") . ' ' . $deliver->dlv_ret_nr . ' ' .
+ nl2br(htmlspecialchars($deliver->dlv_server_msg));
+ }
+ plain_error_message($msg);
} else {
unset ($deliver);
$move_to_sent = getPref($data_dir,$username,'move_to_sent');
$composeMessage->purgeAttachments();
if ($action == 'reply' || $action == 'reply_all') {
+ require(SM_PATH . 'functions/mailbox_display.php');
$aMailbox = sqm_api_mailbox_select($imap_stream, $iAccount, $mailbox,array('setindex' => $what, 'offset' => $startMessage),array());
- //sqimap_mailbox_select ($imap_stream, $mailbox);
- $aUpdatedMsgs = sqimap_toggle_flag($imap_stream, array($passed_id), '\\Answered', true, false);
- if (isset($aUpdatedMsgs[$passed_id]['FLAGS'])) {
- /**
- * Only update the cached headers if the header is
- * cached.
- */
- if (isset($aMailbox['MSG_HEADERS'][$passed_id])) {
- $aMailbox['MSG_HEADERS'][$passed_id]['FLAGS'] = $aMsg['FLAGS'];
+ // check if we are allowed to set the \\Answered flag
+ if (in_array('\\answered',$aMailbox['PERMANENTFLAGS'], true)) {
+ $aUpdatedMsgs = sqimap_toggle_flag($imap_stream, array($passed_id), '\\Answered', true, false);
+ if (isset($aUpdatedMsgs[$passed_id]['FLAGS'])) {
+ /**
+ * Only update the cached headers if the header is
+ * cached.
+ */
+ if (isset($aMailbox['MSG_HEADERS'][$passed_id])) {
+ $aMailbox['MSG_HEADERS'][$passed_id]['FLAGS'] = $aMsg['FLAGS'];
+ }
}
}
/**
}
return $success;
}
-
?>