projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add trailing text to boolean-radio widgets
[squirrelmail.git]
/
functions
/
compose.php
diff --git
a/functions/compose.php
b/functions/compose.php
index 753c3888140f11cebc2d2a984d2081487328ddd1..607184b447b2cd29e8446ed2d20d25a128d4aa29 100644
(file)
--- a/
functions/compose.php
+++ b/
functions/compose.php
@@
-6,7
+6,7
@@
* Functions for message compositon: writing a message, attaching files etc.
*
* @author Thijs Kinkhorst <kink at squirrelmail.org>
* Functions for message compositon: writing a message, attaching files etc.
*
* @author Thijs Kinkhorst <kink at squirrelmail.org>
- * @copyright
© 1999-200
7 The SquirrelMail Project Team
+ * @copyright
1999-201
7 The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
@@
-93,6
+93,9
@@
function sq_get_attach_tempfile()
function sq_send_mail($to, $subject, $body, $from, $cc='', $bcc='', $message='')
{
function sq_send_mail($to, $subject, $body, $from, $cc='', $bcc='', $message='')
{
+ require_once(SM_PATH . 'functions/mime.php');
+ require_once(SM_PATH . 'class/mime.class.php');
+
if (empty($message))
{
$message = new Message();
if (empty($message))
{
$message = new Message();
@@
-102,9
+105,9
@@
function sq_send_mail($to, $subject, $body, $from, $cc='', $bcc='', $message='')
$content_type = new ContentType('text/plain');
global $special_encoding, $default_charset;
if ($special_encoding)
$content_type = new ContentType('text/plain');
global $special_encoding, $default_charset;
if ($special_encoding)
- $
rfc822_
header->encoding = $special_encoding;
+ $header->encoding = $special_encoding;
else
else
- $
rfc822_
header->encoding = '8bit';
+ $header->encoding = '8bit';
if ($default_charset)
$content_type->properties['charset']=$default_charset;
$header->content_type = $content_type;
if ($default_charset)
$content_type->properties['charset']=$default_charset;
$header->content_type = $content_type;
@@
-127,14
+130,16
@@
function sq_send_mail($to, $subject, $body, $from, $cc='', $bcc='', $message='')
if (!$useSendmail) {
require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php');
$deliver = new Deliver_SMTP();
if (!$useSendmail) {
require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php');
$deliver = new Deliver_SMTP();
- global $smtpServerAddress, $smtpPort, $pop_before_smtp, $domain;
+ global $smtpServerAddress, $smtpPort, $pop_before_smtp,
+ $domain, $pop_before_smtp_host;
$authPop = (isset($pop_before_smtp) && $pop_before_smtp) ? true : false;
$authPop = (isset($pop_before_smtp) && $pop_before_smtp) ? true : false;
+ if (empty($pop_before_smtp_host)) $pop_before_smtp_host = $smtpServerAddress;
$user = '';
$pass = '';
get_smtp_user($user, $pass);
$stream = $deliver->initStream($message,$domain,0,
$user = '';
$pass = '';
get_smtp_user($user, $pass);
$stream = $deliver->initStream($message,$domain,0,
- $smtpServerAddress, $smtpPort, $user, $pass, $authPop);
+ $smtpServerAddress, $smtpPort, $user, $pass, $authPop
, $pop_before_smtp_host
);
} else {
require_once(SM_PATH . 'class/deliver/Deliver_SendMail.class.php');
global $sendmail_path, $sendmail_args;
} else {
require_once(SM_PATH . 'class/deliver/Deliver_SendMail.class.php');
global $sendmail_path, $sendmail_args;