Changeset 2170 in subversion

Timestamp:

Dec 18, 2008 5:15:39 AM (4 years ago)

Author:

alec

Message:

• Fix STARTTLS before AUTH in SMTP connection (#1484883)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/lib/Net/SMTP.php (modified) (3 diffs)

trunk/roundcubemail/CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2008/12/18 (alec)
+----------
+- Fix STARTTLS before AUTH in SMTP connection (#1484883)
 
 2008/12/16 (thomasb)

trunk/roundcubemail/program/lib/Net/SMTP.php

@@ -376 +376 @@
             return true;
         }
-
+console($this->_arguments);
         foreach ($this->_arguments as $argument) {
             $verb = strtok($argument, ' ');
@@ -425 +425 @@
     function auth($uid, $pwd , $method = '')
     {
-        if (empty($this->_esmtp['AUTH'])) {
-            if (version_compare(PHP_VERSION, '5.1.0', '>=')) {
-                if (!isset($this->_esmtp['STARTTLS'])) {
-                    return PEAR::raiseError('SMTP server does not support authentication');
-                }
+        if (version_compare(PHP_VERSION, '5.1.0', '>=') && isset($this->_esmtp['STARTTLS'])) {
+
                 if (PEAR::isError($result = $this->_put('STARTTLS'))) {
                     return $result;
@@ -445 +442 @@
                  * SMTP server. */
                 $this->_negotiate();
-                if (empty($this->_esmtp['AUTH'])) {
-                    return PEAR::raiseError('SMTP server does not support authentication');
-                }
-            } else {
-                return PEAR::raiseError('SMTP server does not support authentication');
-            }
+        }
+        
+        if (empty($this->_esmtp['AUTH'])) {
+            return PEAR::raiseError('SMTP server does not support authentication');
         }