From e4e38e02cfe626ffeda26b1d4a08df7a6cd3997d Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 02 Feb 2011 14:41:41 -0500
Subject: [PATCH] Fix inconsistency in de_DE localization (#1487749)
---
program/include/rcube_smtp.php | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/program/include/rcube_smtp.php b/program/include/rcube_smtp.php
index 5acc156..3eaf052 100644
--- a/program/include/rcube_smtp.php
+++ b/program/include/rcube_smtp.php
@@ -5,7 +5,7 @@
| program/include/rcube_smtp.php |
| |
| This file is part of the Roundcube Webmail client |
- | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland |
+ | Copyright (C) 2005-2010, The Roundcube Dev Team |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -59,10 +59,12 @@
// 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_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'),
@@ -105,11 +107,11 @@
if($RCMAIL->config->get('smtp_debug'))
$this->conn->setDebug(true, array($this, 'debug_handler'));
-
+
// 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;
@@ -120,6 +122,12 @@
$smtp_pass = str_replace('%p', $RCMAIL->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'])) {
+ $smtp_authz = $smtp_user;
+ $smtp_user = $CONFIG['smtp_auth_cid'];
+ $smtp_pass = $CONFIG['smtp_auth_pw'];
+ }
+
// attempt to authenticate to the SMTP server
if ($smtp_user && $smtp_pass)
{
@@ -127,7 +135,7 @@
if (strpos($smtp_user, '@'))
$smtp_user = idn_to_ascii($smtp_user);
- $result = $this->conn->auth($smtp_user, $smtp_pass, $smtp_auth_type, $use_tls);
+ $result = $this->conn->auth($smtp_user, $smtp_pass, $smtp_auth_type, $use_tls, $smtp_authz);
if (PEAR::isError($result))
{
--
Gitblit v1.9.1