[mms] Support LMTP servers when sending mail.

framework/Core/lib/Horde/Core/Factory/Mail.php

@@ -48,7 +48,12 @@ public function create($config = null)
         }
 
         if (strcasecmp($transport, 'smtp') === 0) {
-            $transport = 'Smtphorde';
+            if (empty($params['lmtp'])) {
+                $transport = 'Smtphorde';
+            } else {
+                unset($params['lmtp']);
+                $transport = 'Lmtphorde';
+            }
         }
 
         if (empty($params['auth'])) {

framework/Core/package.xml

@@ -39,6 +39,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
+* [mms] Support LMTP servers when sending mail.
 * [mms] Add Horde_Registry#hasLink() (Bug #13175).
 * [mjr] Fix returning mailbox list for ActiveSync clients when not using IMAP subscriptions (Bug #13177).
 * [jan] Update Hungarian translation (Andras Galos &lt;galosa@netinform.hu&gt;).
@@ -1189,13 +1190,6 @@
     <max>3.0.0alpha1</max>
     <exclude>3.0.0alpha1</exclude>
    </package>
-   <package>
-    <name>Horde_Smtp</name>
-    <channel>pear.horde.org</channel>
-    <min>1.0.0</min>
-    <max>2.0.0alpha1</max>
-    <exclude>2.0.0alpha1</exclude>
-   </package>
    <package>
     <name>Horde_Support</name>
     <channel>pear.horde.org</channel>
@@ -1383,7 +1377,7 @@
    <package>
     <name>Horde_Mail</name>
     <channel>pear.horde.org</channel>
-    <min>2.1.0</min>
+    <min>2.3.0</min>
     <max>3.0.0alpha1</max>
     <exclude>3.0.0alpha1</exclude>
    </package>
@@ -3394,6 +3388,7 @@
    <date>2014-05-14</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
+* [mms] Support LMTP servers when sending mail.
 * [mms] Add Horde_Registry#hasLink() (Bug #13175).
 * [mjr] Fix returning mailbox list for ActiveSync clients when not using IMAP subscriptions (Bug #13177).
 * [jan] Update Hungarian translation (Andras Galos &lt;galosa@netinform.hu&gt;).

horde/config/conf.xml

@@ -1363,7 +1363,7 @@
    <configswitch name="type" desc="What method should we use for sending
    mail?">sendmail
     <case name="null" desc="Disable mailing" />
-    <case name="sendmail" desc="Use the local sendmail binary">
+    <case name="sendmail" desc="Local sendmail binary">
      <configsection name="params">
       <configstring name="sendmail_path" required="false" desc="The location
       of the sendmail binary on the filesystem
@@ -1378,7 +1378,7 @@
       blank, the system default is used)."></configstring>
      </configsection>
     </case>
-    <case name="smtp" desc="Use a SMTP server (HIGHLY RECOMMENDED)">
+    <case name="smtp" desc="SMTP server (HIGHLY RECOMMENDED)">
      <configsection name="params">
       <configstring name="host" required="false" desc="The server to connect
       to [localhost]"/>
@@ -1397,6 +1397,8 @@
       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."/>
+      <configboolean name="lmtp" required="false" desc="Is this an LMTP
+      (Local Mail Transfer Protocol) server?">false</configboolean>
      </configsection>
     </case>
    </configswitch>

horde/docs/CHANGES

@@ -2,6 +2,7 @@
 v5.2.0-git
 ----------
 
+[mms] Support LMTP servers when sending mail.
 
 
 ------------

horde/docs/UPGRADING

@@ -59,6 +59,8 @@ It is now possible to use X509 certificates either in addition to, or in place
 of traditional HTTP Basic authentication for ActiveSync. Refer to the
 ActiveSync configuration section for more details.
 
+An additional option is now available for the SMTP Mailer driver: 'lmtp'.
+
 A new NoSQL driver is now available for storing ActiveSync device state. Refer
 to the ActiveSync configuration section for more details.
 

horde/package.xml

@@ -39,7 +39,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl">LGPL-2</license>
  <notes>
-* 
+* [mms] Support LMTP servers when sending mail.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -3876,7 +3876,7 @@
    <date>2014-05-05</date>
    <license uri="http://www.horde.org/licenses/lgpl">LGPL-2</license>
    <notes>
-* 
+* [mms] Support LMTP servers when sending mail.
    </notes>
   </release>
  </changelog>

imp/config/backends.php

@@ -161,6 +161,7 @@
  *                   used by the Horde-wide SMTP configuration (only if those
  *                   fields are not defined for this backend in IMP).
  *     - host: [*] (string) SMTP server host.
+ *     - lmtp: [*] (boolean) If true, the server uses the LMTP protocol.
  *     - localhost: [*] (string) The local hostname.
  *     - password: (string) Password to use for SMTP server authentication.
  *     - port: [*] (integer) SMTP server port.
@@ -390,6 +391,7 @@
     //    'debug' => false,
     //    'horde_auth' => false,
     //    'host' => 'smtp.example.com',
+    //    'lmtp' => false,
     //    'localhost' => 'localhost',
     //    'password' => null,
     //    /* Mail from a MUA SHOULD be sent via the mail submission port (587)

imp/docs/CHANGES

@@ -2,6 +2,7 @@
 v6.2.0-git
 ----------
 
+[mms] Support LMTP servers when sending mail.
 [mms] Fix regression where creating a mailbox that is currently a container
       would not subscribe to that mailbox.
 [mms] Add checks to ensure that saved session expiration message was created by

imp/docs/RELEASE_NOTES

@@ -39,11 +39,13 @@ For detailed installation and configuration instructions, please see
 http://www.horde.org/apps/imp/docs/INSTALL
 
 The major changes compared to IMP version H5 (6.2.0alpha1) are:
+    * LMTP servers are now supported for sending mail.
     * Small improvements.
 ML;
 
 /* Freshmeat release notes, not more than 600 characters. */
 $this->notes['fm']['changes'] = <<<FM
+LMTP servers are now supported for sending mail.
 Small improvements.
 FM;
 

imp/docs/RFCS

@@ -94,6 +94,7 @@ SMTP
 The following SMTP extensions/features are supported
 
 :STD 10/RFC 1870: Message Size Declaration
+:RFC 2033:        Local Mail Transfer Protocol (LMTP)
 :RFC 2034:        Enhanced-Status-Codes
 :RFC 2195:        CRAM-MD5 (SASL Authentication)
 :RFC 2595/4616:   TLS & PLAIN (SASL Authentication)

imp/docs/UPGRADING

@@ -55,6 +55,8 @@ caching backends.
 
 The 'interval' parameter has been added to the quota configuration.
 
+The 'lmtp' parameter has been added to the smtp configuration.
+
 
 Configuration Options (conf.php)
 --------------------------------

imp/package.xml

@@ -33,6 +33,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
+* [mms] Support LMTP servers when sending mail.
 * [mms] Fix regression where creating a mailbox that is currently a container would not subscribe to that mailbox.
 * [mms] Add checks to ensure that saved session expiration message was created by the user rather than an outside source.
 * [mms] Improved handling for multiple expand/collapse actions in the dynamic folder list (Bug #13170).
@@ -3600,6 +3601,7 @@
    <date>2014-05-14</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
+* [mms] Support LMTP servers when sending mail.
 * [mms] Fix regression where creating a mailbox that is currently a container would not subscribe to that mailbox.
 * [mms] Add checks to ensure that saved session expiration message was created by the user rather than an outside source.
 * [mms] Improved handling for multiple expand/collapse actions in the dynamic folder list (Bug #13170).