Revert "Revert "[mms] Add configuration to allow for SMTP authenticat…

…ion if the current Horde access does not have an authenticated user."" This reverts commit 0c07366. Conflicts: framework/Core/package.xml
horde · Jul 8, 2014 · d6715f0 · d6715f0
1 parent fa29b4b
commit d6715f0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/framework/Core/lib/Horde/Core/Factory/Mail.php b/framework/Core/lib/Horde/Core/Factory/Mail.php
@@ -97,12 +97,16 @@ public function getConfig()
          * 'auth'. Will remove in create() if final config doesn't require
          * authentication. */
         if (strcasecmp($transport, 'smtp') === 0) {
-            if (!isset($params['username'])) {
-                $params['username'] = $registry->getAuth();
-            }
-            if (!isset($params['password'])) {
-                $params['password'] = $registry->getAuthCredential('password');
+            if ($auth = $registry->getAuth()) {
+                if (!empty($params['username_auth'])) {
+                    $params['username'] = $auth;
+                }
+                if (!empty($params['password_auth'])) {
+                    $params['password'] = $registry->getAuthCredential('password');
+                }
             }
+
+            unset($params['password_auth'], $params['username_auth']);
         }
 
         return array($transport, $params);

diff --git a/framework/Core/package.xml b/framework/Core/package.xml
@@ -39,7 +39,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* 
+* [mms] Add configuration to allow for SMTP authentication if the current Horde access does not have an authenticated user.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -3479,7 +3479,7 @@
    <date>2014-07-08</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* [jan] Fix bothed 2.12.0 release.
+* [jan] Fix botched 2.12.0 release.
 * [mjr] Fix closing smartmobile dialog pages (Bug #13316).
 * [mjr] Fix issue that could cause multiple tabs to be shown as active when tab_name could be a mix of integers or strings.
    </notes>
@@ -3494,7 +3494,7 @@
    <date>2014-07-08</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* 
+* [mms] Add configuration to allow for SMTP authentication if the current Horde access does not have an authenticated user.
    </notes>
   </release>
  </changelog>