Merge branch 'master' into horde_5_2

horde · Nov 19, 2013 · 14b329e · 14b329e
2 parents 9d4b6ee + 6eea37e
commit 14b329e
Show file tree

Hide file tree

Showing 18 changed files with 198 additions and 84 deletions.
diff --git a/framework/Core/lib/Horde/Core/Factory/Mail.php b/framework/Core/lib/Horde/Core/Factory/Mail.php
@@ -49,7 +49,9 @@ public function create($config = null)
 
         if (strcasecmp($transport, 'smtp') === 0) {
             $transport = 'Smtphorde';
-        } elseif (empty($params['auth'])) {
+        }
+
+        if (empty($params['auth'])) {
             unset($params['username'], $params['password']);
         }
 

diff --git a/framework/Core/package.xml b/framework/Core/package.xml
@@ -28,9 +28,9 @@
   <email>mrubinsk@horde.org</email>
   <active>yes</active>
  </developer>
- <date>2013-11-12</date>
+ <date>2013-11-19</date>
  <version>
-  <release>2.11.1</release>
+  <release>2.11.2</release>
   <api>2.11.0</api>
  </version>
  <stability>
@@ -3239,7 +3239,20 @@
    <stability>
     <release>stable</release>
     <api>stable</api></stability>
-   <date>2013-11-12</date>
+   <date>2013-11-19</date>
+   <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
+   <notes>
+* [jan] Don&apos;t try authentication to SMTP server if explicitly disabled (Bug #12830).
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>2.11.2</release>
+    <api>2.11.0</api></version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api></stability>
+   <date>2013-11-19</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
 * 

diff --git a/framework/Crypt/package.xml b/framework/Crypt/package.xml
@@ -16,9 +16,9 @@
   <email>jan@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2013-11-13</date>
+ <date>2013-11-19</date>
  <version>
-  <release>2.4.0</release>
+  <release>2.4.1</release>
   <api>2.4.0</api>
  </version>
  <stability>
@@ -27,12 +27,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* [mms] Remove Horde_Crypt_Pgp#generateRevocation() (Bug #7375).
-* [mms] Fix submitting PGP keys to a public keyserver (Bug #10931).
-* [mms] PGP keyserver code now uses Horde_Http_Client to connect to the keyserver.
-* [mms] Move PGP keyserver code to a separate Horde_Crypt_Pgp_Keyserver class.
-* [mms] Add Horde_Crypt_Pgp_Parse#parseToPart().
-* [mms] Move Horde_Crypt_Pgp#parsePGPData() to separate class (Horde_Crypt_Pgp_Parse), since it can be used even if GnuPG binary is not available.
+* 
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -974,7 +969,7 @@ Initial release as a PEAR package
    <stability>
     <release>stable</release>
     <api>stable</api></stability>
-   <date>2013-11-13</date>
+   <date>2013-11-19</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
 * [mms] Remove Horde_Crypt_Pgp#generateRevocation() (Bug #7375).
@@ -985,5 +980,18 @@ Initial release as a PEAR package
 * [mms] Move Horde_Crypt_Pgp#parsePGPData() to separate class (Horde_Crypt_Pgp_Parse), since it can be used even if GnuPG binary is not available.
    </notes>
   </release>
+  <release>
+   <version>
+    <release>2.4.1</release>
+    <api>2.4.0</api></version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api></stability>
+   <date>2013-11-19</date>
+   <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
+   <notes>
+* 
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/framework/Kolab_Format/package.xml b/framework/Kolab_Format/package.xml
@@ -11,9 +11,9 @@
   <email>p@rdus.de</email>
   <active>yes</active>
  </lead>
- <date>2013-10-28</date>
+ <date>2013-11-19</date>
  <version>
-  <release>2.0.5</release>
+  <release>2.0.6</release>
   <api>2.0.0</api>
  </version>
  <stability>
@@ -22,7 +22,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* [jan] Correctly translate display-name attribute of distribution lists.
+* 
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -720,11 +720,24 @@
    <stability>
     <release>stable</release>
     <api>stable</api></stability>
-   <date>2013-10-28</date>
+   <date>2013-11-19</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
 * [jan] Correctly translate display-name attribute of distribution lists.
    </notes>
   </release>
+  <release>
+   <version>
+    <release>2.0.6</release>
+    <api>2.0.0</api></version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api></stability>
+   <date>2013-11-19</date>
+   <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
+   <notes>
+* 
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data/Base.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data/Base.php
@@ -356,9 +356,7 @@ public function fetch($uids, $raw = false)
             $object = new Horde_Kolab_Storage_Object();
             $object->setDriver($this->_driver);
             $object->load($uid, $this->_folder, $writer, $structure['structure']);
-            if ($object->getType() == $this->_type) {
-                $objects[$uid] = $object;
-            }
+            $objects[$uid] = $object;
         }
         return $objects;
     }

diff --git a/framework/Kolab_Storage/package.xml b/framework/Kolab_Storage/package.xml
@@ -23,7 +23,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* [jan] Only return requested type from Horde_Kolab_Storage_Data_Base#fetch() if different types are in the same folder.
+*
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -1333,7 +1333,7 @@
    <date>2013-08-27</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* [jan] Only return requested type from Horde_Kolab_Storage_Data_Base#fetch() if different types are in the same folder.
+*
    </notes>
   </release>
  </changelog>

diff --git a/framework/Pear/package.xml b/framework/Pear/package.xml
@@ -10,9 +10,9 @@
   <email>p@rdus.de</email>
   <active>yes</active>
  </lead>
- <date>2013-10-15</date>
+ <date>2013-11-19</date>
  <version>
-  <release>1.0.0alpha6</release>
+  <release>1.0.0alpha7</release>
   <api>1.0.0</api>
  </version>
  <stability>
@@ -21,7 +21,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* [mms] Report XML parsing errors (Request #12164; math.parent@gmail.com).
+* 
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -506,10 +506,23 @@
    <stability>
     <release>alpha</release>
     <api>alpha</api></stability>
-   <date>2013-10-15</date>
+   <date>2013-11-19</date>
+   <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
+   <notes>
+* [mms] Report XML parsing errors (math.parent@gmail.com, Request #12164).
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.0.0alpha7</release>
+    <api>1.0.0</api></version>
+   <stability>
+    <release>alpha</release>
+    <api>alpha</api></stability>
+   <date>2013-11-19</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* [mms] Report XML parsing errors (Request #12164; math.parent@gmail.com).
+* 
    </notes>
   </release>
  </changelog>

diff --git a/framework/Text_Filter/package.xml b/framework/Text_Filter/package.xml
@@ -22,9 +22,9 @@
   <email>slusarz@horde.org</email>
   <active>yes</active>
  </developer>
- <date>2013-11-12</date>
+ <date>2013-11-19</date>
  <version>
-  <release>2.2.0</release>
+  <release>2.2.1</release>
   <api>2.2.0</api>
  </version>
  <stability>
@@ -991,7 +991,20 @@ Initial release as a PEAR package
    <stability>
     <release>stable</release>
     <api>stable</api></stability>
-   <date>2013-11-12</date>
+   <date>2013-11-19</date>
+   <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
+   <notes>
+* [mms] Move JSMin code to a separate package.
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>2.2.1</release>
+    <api>2.2.0</api></version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api></stability>
+   <date>2013-11-19</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
 * 

diff --git a/framework/Text_Filter_Jsmin/package.xml b/framework/Text_Filter_Jsmin/package.xml
@@ -10,9 +10,9 @@
   <email>slusarz@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2013-11-12</date>
+ <date>2013-11-19</date>
  <version>
-  <release>1.0.0</release>
+  <release>1.0.1</release>
   <api>1.0.0</api>
  </version>
  <stability>
@@ -21,7 +21,7 @@
  </stability>
  <license>JSMin</license>
  <notes>
-* [mms] Initial release.
+* 
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -98,11 +98,24 @@
    <stability>
     <release>stable</release>
     <api>stable</api></stability>
-   <date>2013-11-12</date>
+   <date>2013-11-19</date>
    <license uri="">JSMin</license>
    <notes>
 * [mms] Initial release.
    </notes>
   </release>
+  <release>
+   <version>
+    <release>1.0.1</release>
+    <api>1.0.0</api></version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api></stability>
+   <date>2013-11-19</date>
+   <license uri="">JSMin</license>
+   <notes>
+* 
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
@@ -1,7 +1,13 @@
 ----------
-v6.1.6-git
+v6.1.7-git
 ----------
 
+
+
+------
+v6.1.6
+------
+
 [mms] Fix regression where auto-saved drafts were not being deleted when
       cancelling compose message in dynamic view.
 [mms] Fix regression in parsing permission values (Bug #12812).

diff --git a/imp/docs/RELEASE_NOTES b/imp/docs/RELEASE_NOTES
@@ -10,12 +10,12 @@
  * Horde_Release::FOCUS_MAJORSECURITY - Major security fixes
  * Horde_Release::FOCUS_DOCS - Documentation improvements
  */
-$this->notes['fm']['focus'] = array(Horde_Release::FOCUS_MINORSECURITY, Horde_Release::FOCUS_MINORBUG, Horde_Release::FOCUS_MINORFEATURE);
+$this->notes['fm']['focus'] = array(Horde_Release::FOCUS_MINORBUG);
 
 /* Mailing list release notes. */
 $this->notes['ml']['changes'] = <<<ML
 The Horde Team is pleased to announce the final release of the Internet Mail
-Program (IMP) version H5 (6.1.5).
+Program (IMP) version H5 (6.1.6).
 
 IMP, the Internet Mail Program, is one of the most popular and widely deployed
 open source webmail applications in the world. It allows universal, web-based
@@ -29,17 +29,13 @@ http://www.horde.org/apps/imp/docs/UPGRADING
 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.1.4) are:
-    * Fixed XSS vulnerability.
-    * Several improvements and fixes for attachment handling.
-    * Further bugfixes and improvements.
+The major changes compared to IMP version H5 (6.1.5) are:
+    * Fixed regressions in permissions, deleting drafts, and applying ACLs.
 ML;
 
 /* Freshmeat release notes, not more than 600 characters. */
 $this->notes['fm']['changes'] = <<<FM
-Fixed XSS vulnerability.
-Several improvements and fixes for attachment handling.
-Further bugfixes and improvements.
+Fixed regressions in permissions, deleting drafts, and applying ACLs.
 FM;
 
 $this->notes['name'] = 'IMP';

diff --git a/imp/lib/Application.php b/imp/lib/Application.php
@@ -66,7 +66,7 @@ class IMP_Application extends Horde_Registry_Application
 
     /**
      */
-    public $version = 'H5 (6.1.6-git)';
+    public $version = 'H5 (6.1.7-git)';
 
     /**
      * Server key used in logged out session.