/**
* compose.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* This code sends a mail.
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');
/* --------------------- Get globals ------------------------------------- */
$username = $_SESSION['username'];
* TO list) only if $include_self_reply_all is turned off
*/
if (!$include_self_reply_all) {
- $email_address = trim(getPref($data_dir, $username, 'email_address'));
+ $email_address = strtolower(trim(getPref($data_dir, $username, 'email_address')));
$excl_ar[$email_address] = '';
$idents = getPref($data_dir, $username, 'identities');
if ($idents != '' && $idents > 1) {
for ($i = 1; $i < $idents; $i ++) {
$cur_email_address = getPref($data_dir, $username,
'email_address' . $i);
- $cur_email_address = strtolower($cur_email_address);
+ $cur_email_address = strtolower(trim($cur_email_address));
$excl_ar[$cur_email_address] = '';
}
}
if (!isset($mailbox)) {
$mailbox = '';
}
-
if ($compose_new_win == '1') {
compose_Header($color, $mailbox);
} else {
$AttachFailure = saveAttachedFiles($session);
}
if (checkInput(false) && !isset($AttachFailure)) {
+ if ($mailbox == "All Folders") {
+ /* We entered compose via the search results page */
+ $mailbox="INBOX"; /* Send 'em to INBOX, that's safe enough */
+ }
$urlMailbox = urlencode (trim($mailbox));
if (! isset($passed_id)) {
$passed_id = 0;
$username, $data_dir, $identity, $draft_id, $delete_draft,
$mailprio, $default_use_mdn, $mdn_user_support, $compose_new_win,
$saved_draft, $mail_sent, $sig_first, $edit_as_new, $action,
- $username, $compose_messages, $composesession;
+ $username, $compose_messages, $composesession, $default_charset;
$composeMessage = $compose_messages[$session];
$subject = $values['subject'];
$mailprio = $values['mailprio'];
$body = $values['body'];
- $identity = $values['identity'];
+ $identity = (int) $values['identity'];
}
if ($use_javascript_addr_book) {
echo '<TABLE ALIGN=center CELLSPACING=0 BORDER=0>' . "\n";
if ($compose_new_win == '1') {
echo '<TABLE ALIGN=CENTER BGCOLOR="'.$color[0].'" WIDTH="100%" BORDER=0>'."\n" .
- ' <TR><TD></TD><TD ALIGN="RIGHT"><INPUT TYPE="BUTTON" NAME="Close" onClick="return self.close()" VALUE='._("Close").'></TD></TR>'."\n";
+ ' <TR><TD></TD>'. html_tag( 'td', '', 'right' ) . '<INPUT TYPE="BUTTON" NAME="Close" onClick="return self.close()" VALUE='._("Close").'></TD></TR>'."\n";
}
if ($location_of_buttons == 'top') {
showComposeButtonRow();
$idents = getPref($data_dir, $username, 'identities', 0);
if ($idents > 1) {
echo ' <TR>' . "\n" .
- ' <TD BGCOLOR="' . $color[4] . '" WIDTH="10%" ALIGN=RIGHT>' .
+ html_tag( 'td', '', 'right', $color[4], 'WIDTH="10%"' ) .
_("From:") . '</TD>' . "\n" .
- ' <TD BGCOLOR="' . $color[4] . '" WIDTH="90%">' . "\n" .
+ html_tag( 'td', '', 'left', $color[4], 'WIDTH="90%"' ) .
' <select name=identity>' . "\n" .
' <option value=default>' .
htmlspecialchars(getPref($data_dir, $username, 'full_name'));
' </TR>' . "\n";
}
echo ' <TR>' . "\n" .
- ' <TD BGCOLOR="' . $color[4] . '" WIDTH="10%" ALIGN=RIGHT>' .
+ html_tag( 'td', '', 'right', $color[4], 'WIDTH="10%"' ) .
_("To:") . '</TD>' . "\n" .
- ' <TD BGCOLOR="' . $color[4] . '" WIDTH="90%">' . "\n" .
+ html_tag( 'td', '', 'left', $color[4], 'WIDTH="90%"' ) .
' <INPUT TYPE=text NAME="send_to" VALUE="' .
htmlspecialchars($send_to) . '" SIZE=60><BR>' . "\n" .
' </TD>' . "\n" .
' </TR>' . "\n" .
' <TR>' . "\n" .
- ' <TD BGCOLOR="' . $color[4] . '" ALIGN=RIGHT>' .
+ html_tag( 'td', '', 'right', $color[4] ) .
_("CC:") . '</TD>' . "\n" .
- ' <TD BGCOLOR="' . $color[4] . '" ALIGN=LEFT>' . "\n" .
+ html_tag( 'td', '', 'left', $color[4] ) .
' <INPUT TYPE=text NAME="send_to_cc" SIZE=60 VALUE="' .
htmlspecialchars($send_to_cc) . '"><BR>' . "\n" .
' </TD>' . "\n" .
' </TR>' . "\n" .
' <TR>' . "\n" .
- ' <TD BGCOLOR="' . $color[4] . '" ALIGN=RIGHT>' .
+ html_tag( 'td', '', 'right', $color[4] ) .
_("BCC:") . '</TD>' . "\n" .
- ' <TD BGCOLOR="' . $color[4] . '" ALIGN=LEFT>' . "\n" .
+ html_tag( 'td', '', 'left', $color[4] ) .
' <INPUT TYPE=text NAME="send_to_bcc" VALUE="' .
htmlspecialchars($send_to_bcc) . '" SIZE=60><BR>' . "\n" .
' </TD>' . "\n" .
' </TR>' . "\n" .
' <TR>' . "\n" .
- ' <TD BGCOLOR="' . $color[4] . '" ALIGN=RIGHT>' .
+ html_tag( 'td', '', 'right', $color[4] ) .
_("Subject:") . '</TD>' . "\n" .
- ' <TD BGCOLOR="' . $color[4] . '" ALIGN=LEFT>' . "\n";
+ html_tag( 'td', '', 'left', $color[4] ) . "\n";
echo ' <INPUT TYPE=text NAME=subject SIZE=60 VALUE="' .
htmlspecialchars($subject) . '">' . "\n" .
' </TD>' . "\n" .
$editor_size . '" WRAP="VIRTUAL">';
}
if ($use_signature == true && $newmail == true && !isset($from_htmladdr_search)) {
+ if ($idents > 1) {
+ if ($identity == 'default') {
+ $no = 'g';
+ } else {
+ $no = $identity;
+ }
+ $signature = getSig($data_dir, $username, $no);
+ }
+
if ($sig_first == '1') {
- if ($charset == 'iso-2022-jp') {
+ if ($default_charset == 'iso-2022-jp') {
echo "\n\n".($prefix_sig==true? "-- \n":'').mb_convert_encoding($signature, 'EUC-JP');
} else {
echo "\n\n".($prefix_sig==true? "-- \n":'').htmlspecialchars($signature);
}
else {
echo "\n\n".htmlspecialchars($body);
- if ($charset == 'iso-2022-jp') {
+ if ($default_charset == 'iso-2022-jp') {
echo "\n\n".($prefix_sig==true? "-- \n":'').mb_convert_encoding($signature, 'EUC-JP');
}else{
echo "\n\n".($prefix_sig==true? "-- \n":'').htmlspecialchars($signature);
showComposeButtonRow();
} else {
echo ' <TR>' . "\n" .
- ' <TD COLSPAN=2 ALIGN=RIGHT>' . "\n" .
+ html_tag( 'td', '', 'right', '', 'COLSPAN=2' ) . "\n" .
' <INPUT TYPE=SUBMIT NAME=send VALUE="' . _("Send") . '">' . "\n" .
' <BR><BR>' . "\n" .
' </TD>' . "\n" .
}
/* This code is for attachments */
+ if ((bool) ini_get('file_uploads')) {
echo ' <TR>' . "\n" .
' <TD COLSPAN=2>' . "\n" .
' <table width="100%" cellpadding="1" cellspacing="0" align="center"'.
' <table width="100%" cellpadding="3" cellspacing="0" align="center"'.
' border="0">' . "\n" .
' <TR>' . "\n" .
- ' <TD VALIGN=MIDDLE ALIGN=RIGHT>' .
+ html_tag( 'td', '', 'right', '', 'VALIGN=MIDDLE' ) .
_("Attach:") . '</TD>' . "\n" .
- ' <TD VALIGN=MIDDLE ALIGN=LEFT>' . "\n" .
+ html_tag( 'td', '', 'left', '', 'VALIGN=MIDDLE' ) .
' <INPUT NAME="attachfile" SIZE=48 TYPE="file">' . "\n" .
' <input type="submit" name="attach"' .
' value="' . _("Add") .'">' . "\n" .
$attached_filename = decodeHeader($attachment->mime_header->getParameter('name'));
$type = $attachment->mime_header->type0.'/'.
$attachment->mime_header->type1;
- $s_a[] = '<input type="checkbox" name="delete[]" value="' .
- $key . "\">\n" . $attached_filename . ' - ' . $type .
- ' ('.show_readable_size( filesize( $attached_file ) )
- . ')<br>'."\n";
+
+ $s_a[] = '<table bgcolor="'.$color[0].'" border="0"><tr><td><input type="checkbox" name="delete[]" value
+="' .
+ $key . "\"></td><td>\n" . $attached_filename . '</td><td>-</
+td><td> ' . $type . '</td><td>('.show_readable_size( filesize( $attached_file ) ) . '
+)</td></tr></table>'."\n";
}
}
}
if (count($s_a)) {
foreach ($s_a as $s) {
- echo '<tr><td align=left colspan="2" bgcolor="' . $color[0] . '">'.$s.'</td></tr>';
+ echo '<tr>' . html_tag( 'td', '', 'left', $color[0], 'colspan="2"' ) . $s .'</td></tr>';
}
echo '<tr><td colspan="2"><input type="submit" name="do_delete" value="' .
_("Delete selected attachments") . "\">\n" .
' </TABLE>' . "\n" .
' </TD>' . "\n" .
' </TR>' . "\n";
-
+ } // End of file_uploads if-block
/* End of attachment code */
if ($compose_new_win == '1') {
echo '</TABLE>'."\n";
}
+
echo '</TABLE>' . "\n" .
'<input type="hidden" name="username" value="'. $username . "\">\n" .
'<input type=hidden name=action value="' . $action . "\">\n" .
echo '<input type=hidden name=composesession value="' . $composesession . "\">\n";
echo '<input type=hidden name=querystring value="' . $_SERVER['QUERY_STRING'] . "\">\n";
echo '</FORM>';
+ if (!(bool) ini_get('file_uploads')) {
+ /* File uploads are off, so we didn't show that part of the form.
+ To avoid bogus bug reports, tell the user why. */
+ echo 'Because PHP file uploads are turned off, you can not attach files ';
+ echo "to this message. Please see your system administrator for details.\r\n";
+ }
+
+
do_hook('compose_bottom');
echo '</BODY></HTML>' . "\n";
}
$full_localfilename = "$hashed_attachment_dir/$localfilename";
}
+ // FIXME: we SHOULD prefer move_uploaded_file over rename because
+ // m_u_f works better with restricted PHP installes (safe_mode, open_basedir)
if (!@rename($_FILES['attachfile']['tmp_name'], $full_localfilename)) {
- if (function_exists("move_uploaded_file")) {
if (!@move_uploaded_file($_FILES['attachfile']['tmp_name'],$full_localfilename)) {
return true;
}
- } else {
- if (!@copy($_FILES['attachfile']['tmp_name'], $full_localfilename)) {
- return true;
- }
- }
}
$message = $compose_messages[$session];
$type = strtolower($_FILES['attachfile']['type']);
global $imapServerAddress, $imapPort, $sent_folder, $key;
$rfc822_header = $composeMessage->rfc822_header;
- $rfc822_header->to = $rfc822_header->parseAddress($send_to,true, array(), '', $domain);
- $rfc822_header->cc = $rfc822_header->parseAddress($send_to_cc,true,array(), '',$domain);
- $rfc822_header->bcc = $rfc822_header->parseAddress($send_to_bcc,true, array(), '',$domain);
+
+ $abook = addressbook_init(false, true);
+
+ $rfc822_header->to = $rfc822_header->parseAddress($send_to,true, array(), '', $domain, array(&$abook,'lookup'));
+ $rfc822_header->cc = $rfc822_header->parseAddress($send_to_cc,true,array(), '',$domain, array(&$abook,'lookup'));
+ $rfc822_header->bcc = $rfc822_header->parseAddress($send_to_bcc,true, array(), '',$domain, array(&$abook,'lookup'));
$rfc822_header->priority = $mailprio;
$rfc822_header->subject = $subject;
$special_encoding='';
if (!$useSendmail && !$draft) {
require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php');
$deliver = new Deliver_SMTP();
- global $smtpServerAddress, $smtpPort, $use_authenticated_smtp, $pop_before_smtp;
- if ($use_authenticated_smtp) {
- global $key, $onetimepad;
- $user = $username;
- $pass = OneTimePadDecrypt($key, $onetimepad);
+ global $smtpServerAddress, $smtpPort, $pop_before_smtp, $smtp_auth_mech;
+
+ if ($smtp_auth_mech == 'none') {
+ $user = '';
+ $pass = '';
} else {
- $user = '';
- $pass = '';
+ global $key, $onetimepad;
+ $user = $username;
+ $pass = OneTimePadDecrypt($key, $onetimepad);
}
+
$authPop = (isset($pop_before_smtp) && $pop_before_smtp) ? true : false;
$stream = $deliver->initStream($composeMessage,$domain,0,
$smtpServerAddress, $smtpPort, $user, $pass, $authPop);
$succes = $deliver->finalizeStream($stream);
}
if (!$succes) {
- $msg = $deliver->dlv_msg . '<br>Server replied: '.$deliver->dlv_ret_nr;
+ $msg = $deliver->dlv_msg . '<br>' .
+ _("Server replied: ") . $deliver->dlv_ret_nr . ' '.
+ $deliver->dlv_server_msg;
plain_error_message($msg, $color);
} else {
unset ($deliver);
projects / squirrelmail.git / blobdiff