include("../functions/smtp.php");
if (!isset($display_messages_php))
include("../functions/display_messages.php");
+ if (!isset($auth_php))
+ include ("../functions/auth.php");
include("../src/load_prefs.php");
$send_to = decodeHeader($send_to);
$send_to_cc = decodeHeader($send_to_cc);
- if ($forward_id) {
- sqimap_mailbox_select($imapConnection, $mailbox);
- $msg = sqimap_get_message($imapConnection, $forward_id, $mailbox);
-
- if (containsType($msg, "text", "html", $ent_num)) {
- $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"]);
- } else if (containsType($msg, "text", "plain", $ent_num)) {
- $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"]);
- }
- // add other primary displaying msg types here
- else {
- // find any type that's displayable
- if (containsType($msg, "text", "any_type", $ent_num)) {
- $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"]);
- } else if (containsType($msg, "msg", "any_type", $ent_num)) {
- $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"]);
- } else {
- $body = _("No Message");
- }
- }
-
- $type1 = $msg["ENTITIES"][$ent_num]["TYPE1"];
-
- $tmp = _("-------- Original Message ---------\n");
- $body_ary = explode("\n", $body);
- $body = "";
- for ($i=0;$i < count($body_ary);$i++) {
- if ($type1 == "html")
- $tmp .= strip_tags($body_ary[$i]);
- else
- $tmp .= $body_ary[$i];
- $body = "$body$tmp\n";
- $tmp = "";
- }
- }
-
- if ($reply_id) {
+ if ($forward_id)
+ $id = $forward_id;
+ else if ($reply_id)
+ $id = $reply_id;
+
+ if ($id) {
sqimap_mailbox_select($imapConnection, $mailbox);
- $msg = sqimap_get_message($imapConnection, $reply_id, $mailbox);
-
- if (containsType($msg, "text", "html", $ent_num)) {
- $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"], false);
- } else if (containsType($msg, "text", "plain", $ent_num)) {
- $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"], false);
- }
- // add other primary displaying msg types here
- else {
- // find any type that's displayable
- if (containsType($msg, "text", "any_type", $ent_num)) {
- $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"], false);
- } else if (containsType($msg, "msg", "any_type", $ent_num)) {
- $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"], false);
- } else {
- $body = _("No Message");
- }
+ $message = sqimap_get_message($imapConnection, $id, $mailbox);
+ $message = getEntity($message, $ent_num);
+
+ if ($message->header->type0 == "text" || $message->header->type1 == "message") {
+ $body = decodeBody(mime_fetch_body($imapConnection, $id, $message->header->entity_id), $message->header->encoding);
+ } else {
+ $body = "";
}
- $type1 = $msg["ENTITIES"][$ent_num]["TYPE1"];
-
+ if ($forward_id)
+ $tmp = _("-------- Original Message ---------\n");
+ if ($message->header->type1 == "html")
+ $body = strip_tags($body);
+
$body_ary = explode("\n", $body);
$body = "";
- for ($i=0;$i < count($body_ary);$i++) {
- if ($type1 == "html")
- $tmp = strip_tags($body_ary[$i]);
+ for ($i=0; $i < count($body_ary); $i++) {
+ $tmp = $body_ary[$i];
+
+ if ($forward_id)
+ $body = "$body$tmp\n";
else
- $tmp = $body_ary[$i];
- $body = "$body> $tmp\n";
+ $body = "$body> $tmp\n";
}
+
}
-
+
if (!$send_to) {
$send_to = sqimap_find_email($send_to);
}
echo "<input type=hidden name=reply_id value=$reply_id>\n";
}
echo "<input type=hidden name=mailbox value=$mailbox>\n";
- echo "<TABLE COLS=2 WIDTH=50 ALIGN=center CELLSPACING=0 BORDER=0>\n";
+ echo "<TABLE WIDTH=50 ALIGN=center CELLSPACING=0 BORDER=0>\n";
echo " <TR>\n";
echo " <TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
echo _("To:");
- echo " </TD><TD colspan=2 WIDTH=% BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
+ echo " </TD><TD colspan=2 WIDTH=\"100%\" BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
if ($send_to)
- echo " <INPUT TYPE=TEXT NAME=send_to VALUE=\"$send_to\" SIZE=60><BR>";
+ echo " <INPUT TYPE=TEXT NAME=\"send_to\" VALUE=\"$send_to\" SIZE=60><BR>\n";
else
- echo " <INPUT TYPE=TEXT NAME=send_to SIZE=60><BR>";
+ echo " <INPUT TYPE=TEXT NAME=\"send_to\" SIZE=60><BR>\n";
echo " </TD>\n";
echo " </TR>\n";
echo " <TR>\n";
echo " <TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
echo _("CC:");
- echo " </TD><TD WIDTH=% colspan=2 BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
+ echo " </TD><TD colspan=2 BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
if ($send_to_cc)
- echo " <INPUT TYPE=TEXT NAME=send_to_cc SIZE=60 VALUE=\"$send_to_cc\"><BR>";
+ echo " <INPUT TYPE=TEXT NAME=\"send_to_cc\" SIZE=60 VALUE=\"$send_to_cc\"><BR>\n";
else
- echo " <INPUT TYPE=TEXT NAME=send_to_cc SIZE=60><BR>";
+ echo " <INPUT TYPE=TEXT NAME=\"send_to_cc\" SIZE=60><BR>\n";
echo " </TD>\n";
echo " </TR>\n";
echo " <TR>\n";
echo " <TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
echo _("BCC:");
- echo " </TD><TD WIDTH=% BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
+ echo " </TD><TD BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
if ($send_to_bcc)
- echo " <INPUT TYPE=TEXT NAME=send_to_bcc VALUE=\"$send_to_bcc\" SIZE=55><BR>";
+ echo " <INPUT TYPE=TEXT NAME=\"send_to_bcc\" VALUE=\"$send_to_bcc\" SIZE=60><BR>\n";
else
- echo " <INPUT TYPE=TEXT NAME=send_to_bcc SIZE=55><BR>";
- echo " </TD>\n";
- echo "<TD width=1% BGCOLOR=\"$color[4]\" ALIGN=Right>";
-
- if ($use_javascript_addr_book) {
- echo "<SCRIPT LANGUAGE=JavaScript><!--\n document.write(\"";
- echo "<input type=button value=\\\""._("Addresses")."\\\" onclick='javascript:open_abook();'>\");";
- echo "// --></SCRIPT><NOSCRIPT>\n";
- echo "<input type=submit name=html_addr_search value=\""._("Addresses")."\">";
- echo "</NOSCRIPT>\n";
- } else {
- echo "<input type=submit name=html_addr_search value=\""._("Addresses")."\">";
- }
+ echo " <INPUT TYPE=TEXT NAME=\"send_to_bcc\" SIZE=60><BR>";
echo "</TD></TR>\n";
echo " <TR>\n";
echo " <TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
echo _("Subject:");
- echo " </TD><TD WIDTH=% BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
+ echo " </TD><TD BGCOLOR=\"$color[4]\" ALIGN=LEFT>\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 " <INPUT TYPE=TEXT NAME=subject SIZE=55 VALUE=\"$reply_subj\">";
+ echo " <INPUT TYPE=TEXT NAME=subject SIZE=60 VALUE=\"$reply_subj\">";
} else if ($forward_subj) {
$forward_subj = str_replace("\"", "'", $forward_subj);
$forward_subj = stripslashes($forward_subj);
(substr(strtolower($forward_subj), 0, 5) != "[fwd:") &&
(substr(strtolower($forward_subj), 0, 6) != "[ fwd:"))
$forward_subj = "[Fwd: $forward_subj]";
- echo " <INPUT TYPE=TEXT NAME=subject SIZE=55 VALUE=\"$forward_subj\">";
+ echo " <INPUT TYPE=TEXT NAME=subject SIZE=60 VALUE=\"$forward_subj\">";
} else {
- echo " <INPUT TYPE=TEXT NAME=subject VALUE=\"$subject\" SIZE=55>";
+ echo " <INPUT TYPE=TEXT NAME=subject VALUE=\"$subject\" SIZE=60>";
}
- echo "</td><td align=right>";
- echo "<INPUT TYPE=SUBMIT NAME=send VALUE=\"". _("Send") . "\">";
- echo " </TD>\n";
- echo " </TR>\n";
+ echo "</td></tr>\n\n";
+
+ echo " <TR><td>\n </td><td>\n";
+ if ($use_javascript_addr_book) {
+ echo " <SCRIPT LANGUAGE=JavaScript><!--\n document.write(\"";
+ echo " <input type=button value=\\\""._("Addresses")."\\\" onclick='javascript:open_abook();'>\");";
+ echo " // --></SCRIPT><NOSCRIPT>\n";
+ echo " <input type=submit name=\"html_addr_search\" value=\""._("Addresses")."\">";
+ echo " </NOSCRIPT>\n";
+ } else {
+ echo " <input type=submit name=\"html_addr_search\" value=\""._("Addresses")."\">";
+ }
+ echo "\n <INPUT TYPE=SUBMIT NAME=send VALUE=\"". _("Send") . "\">\n";
+ echo " </TD>\n";
+ echo " </TR>\n\n";
+
echo " <TR>\n";
echo " <TD BGCOLOR=\"$color[4]\" COLSPAN=3>\n";
echo " <tr>\n";
echo " <TD WIDTH=50 BGCOLOR=\"$color[0]\" VALIGN=TOP ALIGN=RIGHT>\n";
echo " <SMALL><BR></SMALL>"._("Attach:");
- echo " </td><td width=% colspan=2 ALIGN=left BGCOLOR=\"$color[0]\">\n";
+ echo " </td><td colspan=2 ALIGN=left BGCOLOR=\"$color[0]\">\n";
// echo " <INPUT TYPE=\"hidden\" name=\"MAX_FILE_SIZE\"\n";
// echo " value=\"10000\">\n";
echo " <INPUT NAME=\"attachfile\" TYPE=\"file\">\n";
echo " <input type=\"submit\" name=\"attach\"\n";
echo " value=\"" . _("Add") ."\">\n";
echo " </td>\n";
- echo " </font>\n";
echo " </tr>\n";
if (isset($attachments) && count($attachments)>0) {
echo "</tr><tr><td width=50 bgcolor=\"$color[0]\" align=right>\n";
echo " ";
- echo "</td><td width=% align=left colspan=2 bgcolor=\"$color[0]\">";
+ echo "</td><td align=left colspan=2 bgcolor=\"$color[0]\">";
while (list($localname, $remotename) = each($attachments)) {
echo "<input type=\"checkbox\" name=\"delete[]\" value=\"$localname\">\n";
echo "$remotename <input type=\"hidden\" name=\"attachments[$localname]\" value=\"$remotename\"><br>\n";
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, $reply_id);
header ("Location: right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=1");
} else {
- echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
- displayPageHeader($color, "None");
+ displayPageHeader($color, $mailbox);
checkInput(true);
showInputForm();
}
} else if ($html_addr_search_done) {
- echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
- $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
- displayPageHeader($color, "None");
+ is_logged_in();
+ displayPageHeader($color, $mailbox);
$body = stripslashes($body);
$send_to = stripslashes($send_to);
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.
+ // 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 "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\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;
showInputForm();
} else if (isset($do_delete)) {
- echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\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);
showInputForm();
} else {
- echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
- displayPageHeader($color, "None");
+ displayPageHeader($color, $mailbox);
$newmail = true;
newMail();
projects / squirrelmail.git / blobdiff