From 29a5fa6110755485403a7fc057906f7164146a14 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@horde.org>
Date: Tue, 8 Jul 2014 01:13:06 -0600
Subject: [PATCH] [mms] Add configuration to allow for SMTP authentication if
 the current Horde access does not have an authenticated user.

This is needed, e.g., for IMP linked attachment view notification messages,
since these messages are sent from attachment.php - which is an
unauthenticated script.
---
 horde/config/conf.xml | 27 +++++++++++++++++----------
 horde/docs/CHANGES    | 24 ++++++++++++++++++++++++
 horde/docs/UPGRADING  |  4 ++++
 horde/package.xml     | 40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 85 insertions(+), 10 deletions(-)

diff --git a/horde/config/conf.xml b/horde/config/conf.xml
index 5caa3f8a1e3..6db3756a468 100644
--- a/horde/config/conf.xml
+++ b/horde/config/conf.xml
@@ -1391,16 +1391,23 @@
       (RFC 6409/STD 72; sending mail via port 25 is DEPRECATED.)"/>
       <configstring name="localhost" required="false" desc="The local hostname
       / domain [localhost]"/>
-      <configenum name="auth" desc="Authenticate to SMTP server?">false
-       <values>
-        <value desc="No">false</value>
-        <value desc="Yes">true</value>
-       </values>
-      </configenum>
-      <configstring name="username" required="false" desc="The username to use
-      for SMTP auth. If empty, uses the Horde authentication username."/>
-      <configstring name="password" required="false" desc="The password to use
-      for SMTP auth. If empty, uses the Horde authentication password."/>
+      <configswitch name="auth" desc="Authenticate to SMTP server?">false
+       <case name="false" desc="No" />
+       <case name="true" desc="Yes">
+        <configstring name="username" required="false" desc="The master
+        username to use for SMTP auth. Will be used if username_auth is false
+        OR for unauthenticated Horde accesses."/>
+        <configboolean name="username_auth" required="false" desc="If
+        authenticated, use the Horde authentication
+        username?">true</configboolean>
+        <configstring name="password" required="false" desc="The master
+        password to use for SMTP auth. Will be used if password_auth is false
+        OR for unauthenticated Horde accesses."/>
+        <configboolean name="password_auth" required="false" desc="If
+        authenticated, use the Horde authentication
+        password?">true</configboolean>
+       </case>
+      </configswitch>
       <configboolean name="lmtp" required="false" desc="Is this an LMTP
       (Local Mail Transfer Protocol) server?">false</configboolean>
      </configsection>
diff --git a/horde/docs/CHANGES b/horde/docs/CHANGES
index 9544a5f6afe..487f958a4d1 100644
--- a/horde/docs/CHANGES
+++ b/horde/docs/CHANGES
@@ -6,6 +6,30 @@ v5.3.0-git
       #13200).
 
 
+---------
+v5.2.0RC3
+---------
+
+[mms] Add configuration to allow for SMTP authentication if the current Horde
+      access does not have an authenticated user.
+
+
+---------
+v5.2.0RC2
+---------
+
+[mjr] Fix removing EAS device pairings via the removeUserData API (Bug #13278).
+
+
+---------
+v5.2.0RC1
+---------
+
+[jan] Add configuration for searching user DNs in LDAP groups (Bug #12128).
+[jan] Don't try to write to read-only group backends when removing user data
+      (skhorde@smail.inf.fh-bonn-rhein-sieg.de, Bug #13248).
+
+
 -----------
 v5.2.0beta2
 -----------
diff --git a/horde/docs/UPGRADING b/horde/docs/UPGRADING
index f302a7dd2e6..46861d4f7ce 100644
--- a/horde/docs/UPGRADING
+++ b/horde/docs/UPGRADING
@@ -81,10 +81,14 @@ The following options were added::
     $conf['cachecssparams']['filemtime']
     $conf['history']['driver']
     $conf['history']['params']['driverconfig']
+    $conf['mailer']['params']['password_auth']
+    $conf['mailer']['params']['username_auth']
 
 The available options for the following options were changed::
 
     $conf['activesync']['logging']['type']
+    $conf['mailer']['params']['password'] (for SMTP)
+    $conf['mailer']['params']['username'] (for SMTP)
 
 The default value for the following options were changed::
 
diff --git a/horde/package.xml b/horde/package.xml
index 7248a32a65f..2b492f32f58 100644
--- a/horde/package.xml
+++ b/horde/package.xml
@@ -3909,6 +3909,46 @@
 * [jan] Don&apos;t try to write to read-only group backends when removing user data (skhorde@smail.inf.fh-bonn-rhein-sieg.de, Bug #13248).
    </notes>
   </release>
+  <release>
+   <version>
+    <release>5.2.0RC1</release>
+    <api>5.2.0</api></version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api></stability>
+   <date>2014-06-17</date>
+   <license uri="http://www.horde.org/licenses/lgpl">LGPL-2</license>
+   <notes>
+* [jan] Add configuration for searching user DNs in LDAP groups (Bug #12128).
+* [jan] Don&apos;t try to write to read-only group backends when removing user data (skhorde@smail.inf.fh-bonn-rhein-sieg.de, Bug #13248).
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>5.2.0RC2</release>
+    <api>5.2.0</api></version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api></stability>
+   <date>2014-07-01</date>
+   <license uri="http://www.horde.org/licenses/lgpl">LGPL-2</license>
+   <notes>
+* [mjr] Fix removing EAS device pairings via the removeUserData API (Bug #13278).
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>5.2.0RC3</release>
+    <api>5.2.0</api></version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api></stability>
+   <date>2014-07-01</date>
+   <license uri="http://www.horde.org/licenses/lgpl">LGPL-2</license>
+   <notes>
+* [mms] Add configuration to allow for SMTP authentication if the current Horde access does not have an authenticated user.
+   </notes>
+  </release>
   <release>
    <version>
     <release>5.3.0</release>