From 66510e20d36cb8da4f3012ef063de7bfce9b51aa Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 09 May 2012 07:52:28 -0400
Subject: [PATCH] Merge pull request #1 from Brianetta/de-svn
---
program/include/rcube_smtp.php | 96 ++++++++++++++++++++++++++++-------------------
1 files changed, 57 insertions(+), 39 deletions(-)
diff --git a/program/include/rcube_smtp.php b/program/include/rcube_smtp.php
index 6b25cd1..8bea14e 100644
--- a/program/include/rcube_smtp.php
+++ b/program/include/rcube_smtp.php
@@ -5,8 +5,11 @@
| program/include/rcube_smtp.php |
| |
| This file is part of the Roundcube Webmail client |
- | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland |
- | Licensed under the GNU GPL |
+ | Copyright (C) 2005-2010, The Roundcube Dev Team |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
| PURPOSE: |
| Provide SMTP functionality using socket connections |
@@ -44,33 +47,34 @@
* @param string Server port
* @param string User name
* @param string Password
- * @param string Optional authorization ID to be used as authorization proxy
*
* @return bool Returns true on success, or false on error
*/
- public function connect($host=null, $port=null, $user=null, $pass=null, $authz=null)
+ public function connect($host=null, $port=null, $user=null, $pass=null)
{
- $RCMAIL = rcmail::get_instance();
-
+ $rcube = rcube::get_instance();
+
// disconnect/destroy $this->conn
$this->disconnect();
-
+
// reset error/response var
$this->error = $this->response = null;
-
+
// let plugins alter smtp connection config
- $CONFIG = $RCMAIL->plugins->exec_hook('smtp_connect', array(
- 'smtp_server' => $host ? $host : $RCMAIL->config->get('smtp_server'),
- 'smtp_port' => $port ? $port : $RCMAIL->config->get('smtp_port', 25),
- 'smtp_user' => $user ? $user : $RCMAIL->config->get('smtp_user'),
- 'smtp_pass' => $pass ? $pass : $RCMAIL->config->get('smtp_pass'),
- 'smtp_authzid' => $authz ? $authz : $RCMAIL->config->get('smtp_authzid'),
- 'smtp_auth_type' => $RCMAIL->config->get('smtp_auth_type'),
- 'smtp_helo_host' => $RCMAIL->config->get('smtp_helo_host'),
- 'smtp_timeout' => $RCMAIL->config->get('smtp_timeout'),
+ $CONFIG = $rcube->plugins->exec_hook('smtp_connect', array(
+ 'smtp_server' => $host ? $host : $rcube->config->get('smtp_server'),
+ 'smtp_port' => $port ? $port : $rcube->config->get('smtp_port', 25),
+ 'smtp_user' => $user ? $user : $rcube->config->get('smtp_user'),
+ 'smtp_pass' => $pass ? $pass : $rcube->config->get('smtp_pass'),
+ 'smtp_auth_cid' => $rcube->config->get('smtp_auth_cid'),
+ 'smtp_auth_pw' => $rcube->config->get('smtp_auth_pw'),
+ 'smtp_auth_type' => $rcube->config->get('smtp_auth_type'),
+ 'smtp_helo_host' => $rcube->config->get('smtp_helo_host'),
+ 'smtp_timeout' => $rcube->config->get('smtp_timeout'),
+ 'smtp_auth_callbacks' => array(),
));
- $smtp_host = rcube_parse_host($CONFIG['smtp_server']);
+ $smtp_host = rcube_utils::parse_host($CONFIG['smtp_server']);
// when called from Installer it's possible to have empty $smtp_host here
if (!$smtp_host) $smtp_host = 'localhost';
$smtp_port = is_numeric($CONFIG['smtp_port']) ? $CONFIG['smtp_port'] : 25;
@@ -101,38 +105,55 @@
$helo_host = 'localhost';
// IDNA Support
- $smtp_host = idn_to_ascii($smtp_host);
+ $smtp_host = rcube_utils::idn_to_ascii($smtp_host);
$this->conn = new Net_SMTP($smtp_host, $smtp_port, $helo_host);
- if($RCMAIL->config->get('smtp_debug'))
+ if ($rcube->config->get('smtp_debug'))
$this->conn->setDebug(true, array($this, 'debug_handler'));
+
+ // register authentication methods
+ if (!empty($CONFIG['smtp_auth_callbacks']) && method_exists($this->conn, 'setAuthMethod')) {
+ foreach ($CONFIG['smtp_auth_callbacks'] as $callback) {
+ $this->conn->setAuthMethod($callback['name'], $callback['function'],
+ isset($callback['prepend']) ? $callback['prepend'] : true);
+ }
+ }
// try to connect to server and exit on failure
$result = $this->conn->connect($smtp_timeout);
- if (PEAR::isError($result))
- {
+
+ if (PEAR::isError($result)) {
$this->response[] = "Connection failed: ".$result->getMessage();
$this->error = array('label' => 'smtpconnerror', 'vars' => array('code' => $this->conn->_code));
$this->conn = null;
return false;
}
+ // workaround for timeout bug in Net_SMTP 1.5.[0-1] (#1487843)
+ if (method_exists($this->conn, 'setTimeout')
+ && ($timeout = ini_get('default_socket_timeout'))
+ ) {
+ $this->conn->setTimeout($timeout);
+ }
+
$smtp_user = str_replace('%u', $_SESSION['username'], $CONFIG['smtp_user']);
- $smtp_pass = str_replace('%p', $RCMAIL->decrypt($_SESSION['password']), $CONFIG['smtp_pass']);
+ $smtp_pass = str_replace('%p', $rcube->decrypt($_SESSION['password']), $CONFIG['smtp_pass']);
$smtp_auth_type = empty($CONFIG['smtp_auth_type']) ? NULL : $CONFIG['smtp_auth_type'];
- if (!empty($CONFIG['smtp_authzid'])) {
+ if (!empty($CONFIG['smtp_auth_cid'])) {
$smtp_authz = $smtp_user;
- $smtp_user = $CONFIG['smtp_authzid'];
+ $smtp_user = $CONFIG['smtp_auth_cid'];
+ $smtp_pass = $CONFIG['smtp_auth_pw'];
}
// attempt to authenticate to the SMTP server
if ($smtp_user && $smtp_pass)
{
// IDNA Support
- if (strpos($smtp_user, '@'))
- $smtp_user = idn_to_ascii($smtp_user);
+ if (strpos($smtp_user, '@')) {
+ $smtp_user = rcube_utils::idn_to_ascii($smtp_user);
+ }
$result = $this->conn->auth($smtp_user, $smtp_pass, $smtp_auth_type, $use_tls, $smtp_authz);
@@ -205,14 +226,10 @@
if ($opts['dsn']) {
$exts = $this->conn->getServiceExtensions();
- if (!isset($exts['DSN'])) {
- $this->error = array('label' => 'smtpdsnerror');
- $this->response[] = "DSN not supported";
- return false;
+ if (isset($exts['DSN'])) {
+ $from_params = 'RET=HDRS';
+ $recipient_params = 'NOTIFY=SUCCESS,FAILURE';
}
-
- $from_params = 'RET=HDRS';
- $recipient_params = 'NOTIFY=SUCCESS,FAILURE';
}
// RFC2298.3: remove envelope sender address
@@ -321,7 +338,7 @@
*/
public function debug_handler(&$smtp, $message)
{
- write_log('smtp', preg_replace('/\r\n$/', '', $message));
+ rcube::write_log('smtp', preg_replace('/\r\n$/', '', $message));
}
@@ -376,7 +393,7 @@
$from = $addresses[0];
// Reject envelope From: addresses with spaces.
- if (strstr($from, ' '))
+ if (strpos($from, ' ') !== false)
return false;
$lines[] = $key . ': ' . $value;
@@ -430,14 +447,14 @@
// if we're passed an array, assume addresses are valid and implode them before parsing.
if (is_array($recipients))
$recipients = implode(', ', $recipients);
-
+
$addresses = array();
- $recipients = rcube_explode_quoted_string(',', $recipients);
+ $recipients = rcube_utils::explode_quoted_string(',', $recipients);
reset($recipients);
while (list($k, $recipient) = each($recipients))
{
- $a = explode(" ", $recipient);
+ $a = rcube_utils::explode_quoted_string(' ', $recipient);
while (list($k2, $word) = each($a))
{
if (strpos($word, "@") > 0 && $word[strlen($word)-1] != '"')
@@ -448,6 +465,7 @@
}
}
}
+
return $addresses;
}
--
Gitblit v1.9.1