\n";
echo " | \n";
echo _("Subject:");
- echo " | \n";
+ echo " | \n";
if ($reply_subj) {
$reply_subj = str_replace("\"", "'", $reply_subj);
$reply_subj = stripslashes($reply_subj);
$reply_subj = trim($reply_subj);
if (substr(strtolower($reply_subj), 0, 3) != "re:")
$reply_subj = "Re: $reply_subj";
- echo " ";
+ printf(" ",
+ htmlspecialchars($reply_subj));
} else if ($forward_subj) {
$forward_subj = str_replace("\"", "'", $forward_subj);
$forward_subj = stripslashes($forward_subj);
@@ -220,23 +200,41 @@
(substr(strtolower($forward_subj), 0, 5) != "[fwd:") &&
(substr(strtolower($forward_subj), 0, 6) != "[ fwd:"))
$forward_subj = "[Fwd: $forward_subj]";
- echo " ";
+ printf(" ",
+ htmlspecialchars($forward_subj));
} else {
- echo " ";
+ printf(" ",
+ htmlspecialchars($subject));
}
- echo " ";
- echo " | \n";
- echo "
\n";
+ echo "\n\n";
+
+ echo " | \n";
echo " ";
- echo " | ";
+ echo " | ";
while (list($localname, $remotename) = each($attachments)) {
echo "\n";
echo "$remotename
\n";
@@ -272,10 +269,8 @@
}
function showSentForm () {
- global $PHPSESSID;
-
echo "
Message Sent!
";
- echo "You will be automatically forwarded.
If not, click here";
+ echo "You will be automatically forwarded.
If not, click here";
echo "";
}
@@ -286,38 +281,65 @@
error message, show=true **/
global $body, $send_to, $subject, $color;
- if ($body == "") {
+ if ($body == "" && $subject == "") {
if ($show)
- plain_error_message(_("You have not entered a message body."), $color);
+ plain_error_message(_("You have not entered a message body or a subject."), $color);
return false;
} else if ($send_to == "") {
if ($show)
plain_error_message(_("You have not filled in the \"To:\" field."), $color);
return false;
- } else if ($subject == "") {
- if ($show)
- plain_error_message(_("You have not entered a subject."), $color);
- return false;
}
return true;
} // function checkInput()
+
+ if (($mailbox == "") || ($mailbox == "None"))
+ $mailbox = "INBOX";
+
if(isset($send)) {
if (checkInput(false)) {
- sendMessage($send_to, $send_to_cc, $send_to_bcc, $subject, $body);
- header ("Location: right_main.php?PHPSESSID=$PHPSESSID");
+ $urlMailbox = urlencode ($mailbox);
+ sendMessage($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id);
+ header ("Location: right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=1");
} else {
- echo "\n";
$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
- displayPageHeader($color, "None");
+ displayPageHeader($color, $mailbox);
checkInput(true);
showInputForm();
+ sqimap_logout($imapConnection);
+ }
+ } else if ($html_addr_search_done) {
+ is_logged_in();
+ displayPageHeader($color, $mailbox);
+
+ $body = stripslashes($body);
+ $send_to = stripslashes($send_to);
+ $send_to_cc = stripslashes($send_to_cc);
+ $send_to_bcc = stripslashes($send_to_bcc);
+ $subject = stripslashes($subject);
+
+ for ($i=0; $i < count($send_to_search); $i++) {
+ if ($send_to)
+ $send_to .= ", ";
+ $send_to .= $send_to_search[$i];
+ }
+
+ for ($i=0; $i < count($send_to_cc_search); $i++) {
+ if ($send_to_cc)
+ $send_to_cc .= ", ";
+ $send_to_cc .= $send_to_cc_search[$i];
}
+
+ showInputForm();
+ } else if ($html_addr_search) {
+ // I am using an include so as to elminiate an extra unnecessary click. If you
+ // can think of a better way, please implement it.
+ include ("addrbook_search_html.php");
} else if (isset($attach)) {
- echo "\n";
- $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
- displayPageHeader($color, "None");
+ is_logged_in();
+ displayPageHeader($color, $mailbox);
$localfilename = md5("$attachfile, $attachfile_name, $REMOTE_IP, $REMOTE_PORT, $UNIQUE_ID, and everything else that may add entropy");
$localfilename = $localfilename;
@@ -343,9 +365,8 @@
showInputForm();
} else if (isset($do_delete)) {
- echo "\n";
- $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
- displayPageHeader($color, "None");
+ is_logged_in();
+ displayPageHeader($color, $mailbox);
while (list($key, $localname) = each($delete)) {
array_splice ($attachments, $key, 1);
@@ -355,12 +376,12 @@
showInputForm();
} else {
- echo "\n";
$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
- displayPageHeader($color, "None");
+ displayPageHeader($color, $mailbox);
$newmail = true;
newMail();
showInputForm();
+ sqimap_logout($imapConnection);
}
?>
|