|
@@ -41,10 +41,8 @@
|
|
include("../src/load_prefs.php");
|
|
include("../src/load_prefs.php");
|
|
|
|
|
|
if (!isset($attachments))
|
|
if (!isset($attachments))
|
|
- {
|
|
|
|
$attachments = array();
|
|
$attachments = array();
|
|
- }
|
|
|
|
-
|
|
|
|
|
|
+
|
|
// This function is used when not sending or adding attachments
|
|
// This function is used when not sending or adding attachments
|
|
function newMail () {
|
|
function newMail () {
|
|
global $forward_id, $imapConnection, $msg, $ent_num, $body_ary, $body,
|
|
global $forward_id, $imapConnection, $msg, $ent_num, $body_ary, $body,
|
|
@@ -304,19 +302,20 @@
|
|
}
|
|
}
|
|
|
|
|
|
// This code is for attachments
|
|
// This code is for attachments
|
|
- echo " <tr bgcolor=\"$color[0]\">\n";
|
|
|
|
- echo " <TD VALIGN=TOP ALIGN=RIGHT>"._("Attach:");
|
|
|
|
- echo " </td><td ALIGN=left>\n";
|
|
|
|
|
|
+ echo " <tr>\n";
|
|
|
|
+ echo " <TD BGCOLOR=\"$color[0]\" VALIGN=TOP ALIGN=RIGHT>\n";
|
|
|
|
+ echo " <SMALL><BR></SMALL>"._("Attach:");
|
|
|
|
+ echo " </td><td ALIGN=left BGCOLOR=\"$color[0]\">\n";
|
|
echo " <INPUT NAME=\"attachfile\" SIZE=48 TYPE=\"file\">\n";
|
|
echo " <INPUT NAME=\"attachfile\" SIZE=48 TYPE=\"file\">\n";
|
|
echo " <input type=\"submit\" name=\"attach\"";
|
|
echo " <input type=\"submit\" name=\"attach\"";
|
|
echo " value=\"" . _("Add") ."\">\n";
|
|
echo " value=\"" . _("Add") ."\">\n";
|
|
echo " </td>\n";
|
|
echo " </td>\n";
|
|
echo " </tr>\n";
|
|
echo " </tr>\n";
|
|
if (count($attachments) > 0) {
|
|
if (count($attachments) > 0) {
|
|
- echo "<tr bgcolor=\"$color[0]\"><td align=right>\n";
|
|
|
|
|
|
+ echo "<tr><td bgcolor=\"$color[0]\" align=right>\n";
|
|
echo " ";
|
|
echo " ";
|
|
- echo "</td><td align=left>";
|
|
|
|
- foreach ($attachments as $localname => $remotename) {
|
|
|
|
|
|
+ echo "</td><td align=left bgcolor=\"$color[0]\">";
|
|
|
|
+ while (list($localname, $remotename) = each($attachments)) {
|
|
echo "<input type=\"checkbox\" name=\"delete[]\" value=\"$localname\">\n";
|
|
echo "<input type=\"checkbox\" name=\"delete[]\" value=\"$localname\">\n";
|
|
echo "$remotename <input type=\"hidden\" name=\"attachments[$localname]\" value=\"$remotename\"><br>\n";
|
|
echo "$remotename <input type=\"hidden\" name=\"attachments[$localname]\" value=\"$remotename\"><br>\n";
|
|
}
|
|
}
|
|
@@ -471,6 +470,12 @@
|
|
$send_to_cc .= $send_to_cc_search[$i];
|
|
$send_to_cc .= $send_to_cc_search[$i];
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ for ($i=0; $i < count($send_to_bcc_search); $i++) {
|
|
|
|
+ if ($send_to_bcc)
|
|
|
|
+ $send_to_bcc .= ", ";
|
|
|
|
+ $send_to_bcc .= $send_to_bcc_search[$i];
|
|
|
|
+ }
|
|
|
|
+
|
|
showInputForm();
|
|
showInputForm();
|
|
} else if (isset($html_addr_search)) {
|
|
} else if (isset($html_addr_search)) {
|
|
// I am using an include so as to elminiate an extra unnecessary click. If you
|
|
// I am using an include so as to elminiate an extra unnecessary click. If you
|