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 | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/program/include/rcube_smtp.php b/program/include/rcube_smtp.php
index 088283b..8bea14e 100644
--- a/program/include/rcube_smtp.php
+++ b/program/include/rcube_smtp.php
@@ -6,7 +6,10 @@
| |
| This file is part of the Roundcube Webmail client |
| Copyright (C) 2005-2010, The Roundcube Dev Team |
- | Licensed under the GNU GPL |
+ | |
+ | 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 |
@@ -49,7 +52,7 @@
*/
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();
@@ -58,20 +61,20 @@
$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_auth_cid' => $RCMAIL->config->get('smtp_auth_cid'),
- 'smtp_auth_pw' => $RCMAIL->config->get('smtp_auth_pw'),
- '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;
@@ -102,11 +105,11 @@
$helo_host = 'localhost';
// IDNA Support
- $smtp_host = rcube_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
@@ -135,7 +138,7 @@
}
$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_auth_cid'])) {
@@ -149,7 +152,7 @@
{
// IDNA Support
if (strpos($smtp_user, '@')) {
- $smtp_user = rcube_idn_to_ascii($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);
@@ -335,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));
}
@@ -446,12 +449,12 @@
$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 = rcube_explode_quoted_string(' ', $recipient);
+ $a = rcube_utils::explode_quoted_string(' ', $recipient);
while (list($k2, $word) = each($a))
{
if (strpos($word, "@") > 0 && $word[strlen($word)-1] != '"')
--
Gitblit v1.9.1