**
** $Id$
**/
-
- session_start();
-
- if (!isset($strings_php))
- include("../functions/strings.php");
- if (!isset($config_php))
- include("../config/config.php");
- if (!isset($page_header_php))
- include("../functions/page_header.php");
- if (!isset($imap_php))
- include("../functions/imap.php");
- if (!isset($date_php))
- include("../functions/date.php");
- if (!isset($mime_php))
- include("../functions/mime.php");
- if (!isset($smtp_php))
- include("../functions/smtp.php");
- if (!isset($display_messages_php))
- include("../functions/display_messages.php");
- if (!isset($auth_php))
- include ("../functions/auth.php");
- if (!isset($plugin_php))
- include ("../functions/plugin.php");
+ include('../src/validate.php');
+ include("../functions/strings.php");
+ include("../config/config.php");
+ include("../functions/page_header.php");
+ include("../functions/imap.php");
+ include("../functions/date.php");
+ include("../functions/mime.php");
+ include("../functions/smtp.php");
+ include("../functions/display_messages.php");
+ include ("../functions/plugin.php");
include("../src/load_prefs.php");
if (!isset($attachments))
session_register('attachments');
}
+
// This function is used when not sending or adding attachments
function newMail () {
global $forward_id, $imapConnection, $msg, $ent_num, $body_ary, $body,
} else {
$body = "";
}
-
+
if ($message->header->type1 == "html")
$body = strip_tags($body);
}
sqWordWrap($body_ary[$i], $editor_size - 1);
$body .= $body_ary[$i] . "\n";
- unset($body_ary[$i]);
+ unset($body_ary[$i]);
}
if ($forward_id)
{
if (!$message) {
sqimap_mailbox_select($imapConnection, $mailbox);
$message = sqimap_get_message($imapConnection, $forward_id,
- $mailbox);
+ $mailbox);
}
if (count($message->entities) == 0) {
$filename = "untitled-".$message->header->entity_id;
$localfilename = GenerateRandomString(32, '', 7);
- while (file_exists($attachment_dir . $localfilename))
- $localfilename = GenerateRandomString(32, '', 7);
+ while (file_exists($attachment_dir . $localfilename))
+ $localfilename = GenerateRandomString(32, '', 7);
$newAttachment['localfilename'] = $localfilename;
- $newAttachment['remotefilename'] = $filename;
- $newAttachment['type0'] = strtolower($message->header->type0 .
- '/' . $message->header->type1);
+ $newAttachment['remotefilename'] = $filename;
+ $newAttachment['type'] = strtolower($message->header->type0 .
+ '/' . $message->header->type1);
// Write Attachment to file
$fp = fopen ($attachment_dir.$localfilename, 'w');
fputs ($fp, decodeBody(mime_fetch_body($imapConnection,
- $forward_id, $message->header->entity_id),
- $message->header->encoding));
+ $forward_id, $message->header->entity_id),
+ $message->header->encoding));
fclose ($fp);
$attachments[] = $newAttachment;
$passed_body, $color, $use_signature, $signature, $prefix_sig,
$editor_size, $attachments, $subject, $newmail,
$use_javascript_addr_book, $send_to_bcc, $reply_id, $mailbox,
- $from_htmladdr_search, $location_of_buttons;
+ $from_htmladdr_search, $location_of_buttons, $attachment_dir;
$subject = decodeHeader($subject);
$reply_subj = decodeHeader($reply_subj);
echo "\n<FORM name=compose action=\"compose.php\" METHOD=POST ENCTYPE=\"multipart/form-data\"";
do_hook("compose_form");
- echo ">\n";
+ echo ">\n";
if ($reply_id) {
echo "<input type=hidden name=reply_id value=$reply_id>\n";
}
echo "<tr><td bgcolor=\"$color[0]\" align=right>\n";
echo " ";
echo "</td><td align=left bgcolor=\"$color[0]\">";
- foreach ($attachments as $key => $info) {
+ foreach ($attachments as $key => $info) {
echo "<input type=\"checkbox\" name=\"delete[]\" value=\"$key\">\n";
- echo $info['remotefilename'] . "<br>\n";
+ echo $info['remotefilename'] . " - " . $info['type'] . " (";
+ echo show_readable_size(filesize($attachment_dir .
+ $info['localfilename'])) . ")<br>\n";
}
echo "<input type=\"submit\" name=\"do_delete\" value=\""._("Delete selected attachments")."\">\n";
function saveAttachedFiles() {
global $HTTP_POST_FILES, $attachment_dir, $attachments;
- is_logged_in();
$localfilename = GenerateRandomString(32, '', 7);
while (file_exists($attachment_dir . $localfilename))
$localfilename = GenerateRandomString(32, '', 7);
//
global $CHARSET, $SOURCE_CHARSET, $send_to, $send_to_cc, $send_to_bcc, $subject, $body;
$charset_ary = array("koi8-r" => "k",
- "windows-1251" => "w",
- "ibm866" => "a",
- "ISO-8859-5" => "i");
+ "windows-1251" => "w",
+ "ibm866" => "a",
+ "ISO-8859-5" => "i");
$body = convert_cyr_string($body, $charset_ary[$CHARSET], $charset_ary[$SOURCE_CHARSET]);
$send_to = convert_cyr_string($send_to, $charset_ary[$CHARSET], $charset_ary[$SOURCE_CHARSET]);
$send_to_cc = convert_cyr_string($send_to_cc, $charset_ary[$CHARSET], $charset_ary[$SOURCE_CHARSET]);
if (! isset($reply_id))
$reply_id = 0;
// Set $default_charset to correspond with the user's selection
- // of language interface.
- set_my_charset();
- sendMessage($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id);
- header ("Location: right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=1");
+ // of language interface.
+ set_my_charset();
+ do_hook("compose_send");
+
+ if (! sendMessage($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id)) {
+ showInputForm();
+ exit();
+ }
+ Header("Location: right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=1");
} else {
//$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
displayPageHeader($color, $mailbox);
//sqimap_logout($imapConnection);
}
} else if (isset($html_addr_search_done)) {
- is_logged_in();
displayPageHeader($color, $mailbox);
- for ($i=0; $i < count($send_to_search); $i++) {
- if ($send_to)
- $send_to .= ", ";
- $send_to .= $send_to_search[$i];
+ if (isset($send_to_search) && is_array($send_to_search))
+ {
+ 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];
+ if (isset($send_to_cc_search) && is_array($send_to_cc_search))
+ {
+ 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];
+ }
}
- 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];
+ if (isset($send_to_bcc_search) && is_array($send_to_bcc_search))
+ {
+ 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();
} else if (isset($html_addr_search)) {
+ if (isset($HTTP_POST_FILES['attachfile']) &&
+ $HTTP_POST_FILES['attachfile']['tmp_name'] &&
+ $HTTP_POST_FILES['attachfile']['tmp_name'] != 'none')
+ {
+ if (saveAttachedFiles())
+ plain_error_message(_("Could not move/copy file. File not attached"), $color);
+ }
// 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");
displayPageHeader($color, $mailbox);
showInputForm();
} else if (isset($do_delete)) {
- is_logged_in();
displayPageHeader($color, $mailbox);
if (isset($delete) && is_array($delete))
{
unlink ($attachment_dir.$attachments[$index]['localfilename']);
unset ($attachments[$index]);
- }
+ }
}
showInputForm();
- function ClearAttachments()
- {
+ function ClearAttachments() {
global $attachments, $attachment_dir;
- foreach ($attachments as $info)
- {
- if (file_exists($attachment_dir . $info['localfilename']))
- {
+ foreach ($attachments as $info) {
+ if (file_exists($attachment_dir . $info['localfilename'])) {
unlink($attachment_dir . $info['localfilename']);
- }
+ }
}
$attachments = array();
projects / squirrelmail.git / blobdiff