*/
/**
- * Path for SquirrelMail required files.
- * @ignore
+ * Include the SquirrelMail initialization file.
*/
-define('SM_PATH','../');
+require('../include/init.php');
/* SquirrelMail required files. */
-include_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');
$_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)) {
}
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 = '';
}
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>';
}
}
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;
}
}
_("Server replied:") . ' ' . $deliver->dlv_ret_nr . ' ' .
nl2br(htmlspecialchars($deliver->dlv_server_msg));
}
- plain_error_message($msg, $color);
+ 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());
// check if we are allowed to set the \\Answered flag
if (in_array('\\answered',$aMailbox['PERMANENTFLAGS'], true)) {
}
return $success;
}
-
-?>
\ No newline at end of file
+?>