From e70b3b24fc8ac7b54a820ae87ce8f4af4043125e Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 09 Oct 2008 02:25:43 -0400
Subject: [PATCH] - send set_unread_count() only when changing /Seen status
---
program/include/rcube_smtp.inc | 99 +++++++++++++++++++++++++++++++++----------------
1 files changed, 66 insertions(+), 33 deletions(-)
diff --git a/program/include/rcube_smtp.inc b/program/include/rcube_smtp.inc
index e569175..4e54490 100644
--- a/program/include/rcube_smtp.inc
+++ b/program/include/rcube_smtp.inc
@@ -5,7 +5,7 @@
| program/include/rcube_smtp.inc |
| |
| This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland |
+ | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -19,6 +19,11 @@
*/
+/**
+ * SMTP delivery functions
+ *
+ * @package Mail
+ */
// include required PEAR classes
require_once('Net/SMTP.php');
@@ -47,18 +52,32 @@
* @param string The full text of the message body, including any Mime parts, etc.
*
* @return bool Returns TRUE on success, or FALSE on error
- * @access public
*/
-function smtp_mail($from, $recipients, $headers, &$body)
+function smtp_mail($from, $recipients, &$headers, &$body, &$response)
{
- global $SMTP_CONN, $CONFIG, $SMTP_ERROR;
+ global $SMTP_CONN, $CONFIG, $RCMAIL;
$smtp_timeout = null;
+ $smtp_host = $CONFIG['smtp_server'];
$smtp_port = is_numeric($CONFIG['smtp_port']) ? $CONFIG['smtp_port'] : 25;
+ $smtp_host_url = parse_url($CONFIG['smtp_server']);
- // create Net_SMTP object and connect to server
- if (!is_object($smtp_conn))
+ // overwrite port
+ if (isset($smtp_host_url['host']) && isset($smtp_host_url['port']))
{
- $SMTP_CONN = new Net_SMTP($CONFIG['smtp_server'], $smtp_port, 'localhost');
+ $smtp_host = $smtp_host_url['host'];
+ $smtp_port = $smtp_host_url['port'];
+ }
+
+ // re-write smtp host
+ if (isset($smtp_host_url['host']) && isset($smtp_host_url['scheme']))
+ $smtp_host = sprintf('%s://%s', $smtp_host_url['scheme'], $smtp_host_url['host']);
+
+
+ // create Net_SMTP object and connect to server
+ if (!is_object($SMTP_CONN))
+ {
+ $helo_host = empty($CONFIG['smtp_helo_host']) ? (empty($_SERVER['SERVER_NAME']) ? 'localhost' : $_SERVER['SERVER_NAME']) : $CONFIG['smtp_helo_host'];
+ $SMTP_CONN = new Net_SMTP($smtp_host, $smtp_port, $helo_host);
// set debugging
if ($CONFIG['debug_level'] & 8)
@@ -66,32 +85,34 @@
// try to connect to server and exit on failure
- if (PEAR::isError($SMTP_CONN->connect($smtp_timeout)))
+ $result = $SMTP_CONN->connect($smtp_timeout);
+ if (PEAR::isError($result))
{
$SMTP_CONN = null;
- $SMTP_ERROR .= "Connection failed\n";
+ $response[] = "Connection failed: ".$result->getMessage();
return FALSE;
}
// attempt to authenticate to the SMTP server
if ($CONFIG['smtp_user'] && $CONFIG['smtp_pass'])
{
- if ($CONFIG['smtp_user'] == '%u')
- $smtp_user = $_SESSION['username'];
+ if (strstr($CONFIG['smtp_user'], '%u'))
+ $smtp_user = str_replace('%u', $_SESSION['username'], $CONFIG['smtp_user']);
else
- $smtp_user = $CONFIG['smtp_user'];
-
- if ($CONFIG['smtp_pass'] == '%p')
- $smtp_pass = decrypt_passwd($_SESSION['password']);
- else
- $smtp_pass = $CONFIG['smtp_pass'];
+ $smtp_user = $CONFIG['smtp_user'];
- $smtp_auth_type = empty($CONFIG['smtp_auth_type']) ? NULL : $CONFIG['smtp_auth_type'];
-
- if (PEAR::isError($SMTP_CONN->auth($smtp_user, $smtp_pass, $smtp_auth_type)))
+ if (strstr($CONFIG['smtp_pass'], '%p'))
+ $smtp_pass = str_replace('%p', $RCMAIL->decrypt_passwd($_SESSION['password']), $CONFIG['smtp_pass']);
+ else
+ $smtp_pass = $CONFIG['smtp_pass'];
+
+ $smtp_auth_type = empty($CONFIG['smtp_auth_type']) ? NULL : $CONFIG['smtp_auth_type'];
+ $result = $SMTP_CONN->auth($smtp_user, $smtp_pass, $smtp_auth_type);
+
+ if (PEAR::isError($result))
{
smtp_reset();
- $SMTP_ERROR .= "authentication failure\n";
+ $response[] .= 'Authentication failure: ' . $result->getMessage() . ' (Code: ' . $result->getCode() . ')';
return FALSE;
}
}
@@ -115,7 +136,7 @@
else
{
smtp_reset();
- $SMTP_ERROR .= "Invalid message headers\n";
+ $response[] .= "Invalid message headers";
return FALSE;
}
@@ -123,7 +144,7 @@
if (!isset($from))
{
smtp_reset();
- $SMTP_ERROR .= "No From address has been provided\n";
+ $response[] .= "No From address has been provided";
return FALSE;
}
@@ -132,7 +153,7 @@
if (PEAR::isError($SMTP_CONN->mailFrom($from)))
{
smtp_reset();
- $SMTP_ERROR .= "Failed to set sender '$from'\n";
+ $response[] .= "Failed to set sender '$from'";
return FALSE;
}
@@ -152,21 +173,30 @@
if (PEAR::isError($SMTP_CONN->rcptTo($recipient)))
{
smtp_reset();
- $SMTP_ERROR .= "Failed to add recipient '$recipient'\n";
+ $response[] .= "Failed to add recipient '$recipient'";
return FALSE;
}
}
+ // Concatenate headers and body so it can be passed by reference to SMTP_CONN->data
+ // so preg_replace in SMTP_CONN->quotedata will store a reference instead of a copy.
+ // We are still forced to make another copy here for a couple ticks so we don't really
+ // get to save a copy in the method call.
+ $data = $text_headers . "\r\n" . $body;
+
+ // unset old vars to save data and so we can pass into SMTP_CONN->data by reference.
+ unset($text_headers, $body);
+
// Send the message's headers and the body as SMTP data.
- if (PEAR::isError($SMTP_CONN->data("$text_headers\r\n$body")))
+ if (PEAR::isError($SMTP_CONN->data($data)))
{
smtp_reset();
- $SMTP_ERROR .= "Failed to send data\n";
+ $response[] .= "Failed to send data";
return FALSE;
}
-
+ $response[] = join(': ', $SMTP_CONN->getResponse());
return TRUE;
}
@@ -301,9 +331,9 @@
reset($recipients);
while (list($k, $recipient) = each($recipients))
{
- $a = explode(" ", $recipient);
- while (list($k2, $word) = each($a))
- {
+ $a = explode(" ", $recipient);
+ while (list($k2, $word) = each($a))
+ {
if ((strpos($word, "@") > 0) && (strpos($word, "\"")===false))
{
$word = ereg_replace('^<|>$', '', trim($word));
@@ -316,6 +346,9 @@
}
+/**
+ * @access private
+ */
function smtp_explode_quoted_str($delimiter, $string)
{
$quotes=explode("\"", $string);
@@ -323,13 +356,13 @@
if (($key % 2) == 1)
$quotes[$key] = str_replace($delimiter, "_!@!_", $quotes[$key]);
$string=implode("\"", $quotes);
-
+
$result=explode($delimiter, $string);
while (list($key, $val) = each($result))
$result[$key] = str_replace("_!@!_", $delimiter, $result[$key]);
return $result;
- }
+ }
?>
--
Gitblit v1.9.1