Merge branch 'master' into imp_6_2

horde · Dec 5, 2013 · 847f843 · 847f843
2 parents db5e29b + 73284e8
commit 847f843
Show file tree

Hide file tree

Showing 35 changed files with 814 additions and 949 deletions.
diff --git a/framework/Core/js/keynavlist.js b/framework/Core/js/keynavlist.js
@@ -167,7 +167,9 @@ var KeyNavList = Class.create({
         if ((divL.get('border-box-height') + dt + off.top + 10) > v.height) {
             this.div.setStyle({
                 height: (v.height - dt - off.top - 10) + 'px',
-                width: (this.div.scrollWidth + 5) + 'px'
+            });
+            this.div.setStyle({
+                width: (2 * this.div.getWidth() - this.div.scrollWidth) + 'px'
             });
         }
 

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>
-* 
+* [jan] Fix padding of drop down lists with scrollbars (Bug #11971).
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -3253,7 +3253,7 @@
    <date>2013-11-19</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* 
+* [jan] Fix padding of drop down lists with scrollbars (Bug #11971).
    </notes>
   </release>
  </changelog>

diff --git a/framework/Form/lib/Horde/Form.php b/framework/Form/lib/Horde/Form.php
@@ -719,6 +719,11 @@ function getInfo($vars, &$info)
     function _getInfoFromVariables($variables, &$vars, &$info)
     {
         foreach ($variables as $var) {
+            if ($var->isDisabled()) {
+                // Disabled fields are not submitted by some browsers, so don't
+                // pretend they were.
+                continue;
+            }
             if ($var->isArrayVal()) {
                 $var->getInfo($vars, $values);
                 if (is_array($values)) {

diff --git a/framework/HashTable/lib/Horde/HashTable/Base.php b/framework/HashTable/lib/Horde/HashTable/Base.php
@@ -218,6 +218,7 @@ protected function _getExists($keys, $callback)
             ? $out
             : reset($out);
     }
+
     /**
      * Set the value of a key.
      *

diff --git a/framework/Imap_Client/composer.json b/framework/Imap_Client/composer.json
@@ -11,8 +11,8 @@
             "role": "lead"
         }
     ],
-    "version": "2.16.1",
-    "time": "2013-11-21",
+    "version": "2.16.2",
+    "time": "2013-11-27",
     "repositories": [
         {
             "type": "pear",

diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Base.php b/framework/Imap_Client/lib/Horde/Imap/Client/Base.php
@@ -2629,7 +2629,7 @@ public function fetch($mailbox, $query, array $options = array())
     }
 
     /**
-     * Wrapper for fetch() to allow internal state to be rest on exception.
+     * Wrapper for fetch() to allow internal state to be reset on exception.
      *
      * @internal
      * @see fetch()

diff --git a/framework/Imap_Client/package.xml b/framework/Imap_Client/package.xml
@@ -10,9 +10,9 @@
   <email>slusarz@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2013-11-21</date>
+ <date>2013-11-27</date>
  <version>
-  <release>2.16.2</release>
+  <release>2.16.3</release>
   <api>2.16.0</api>
  </version>
  <stability>
@@ -21,7 +21,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* [mms] Don&apos;t login to IMAP server if namespace information is already cached.
+* 
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -2081,11 +2081,24 @@
    <stability>
     <release>stable</release>
     <api>stable</api></stability>
-   <date>2013-11-21</date>
+   <date>2013-11-27</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
 * [mms] Don&apos;t login to IMAP server if namespace information is already cached.
    </notes>
   </release>
+  <release>
+   <version>
+    <release>2.16.3</release>
+    <api>2.16.0</api></version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api></stability>
+   <date>2013-11-26</date>
+   <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
+   <notes>
+* 
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/framework/Imap_Client/test/Horde/Imap/Client/RemoteImapServerTest.php b/framework/Imap_Client/test/Horde/Imap/Client/RemoteImapServerTest.php
@@ -407,6 +407,18 @@ public function testCommands()
 
         // Deleting test mailbox.
         $this->imap->deleteMailbox($test_mbox);
+
+        // Do a test append to a non-existent mailbox - this MUST fail (RFC
+        // 3501 [6.3.11]).
+        try {
+            $this->imap->append($test_mbox, array(
+                array(
+                    'data' => file_get_contents(__DIR__ . '/fixtures/remote1.txt'),
+                    'flags' => array(Horde_Imap_Client::FLAG_FLAGGED)
+                )
+            ));
+            $this->fail('Expecting exception.');
+        } catch (Horde_Imap_Client_Exception $e) {}
     }
 
 }
diff --git a/framework/Notification/lib/Horde/Notification/Handler.php b/framework/Notification/lib/Horde/Notification/Handler.php
@@ -224,7 +224,7 @@ public function addDecorator(Horde_Notification_Handler_Decorator_Base $decorato
      *
      * @param mixed $event    Horde_Notification_Event object or message
      *                        string.
-     * @param integer $type   The type of message.
+     * @param string $type    The type of message.
      * @param array $flags    Array of optional flags that will be passed to
      *                        the registered listeners.
      * @param array $options  Additional options:

diff --git a/framework/Prefs/lib/Horde/Prefs/Translation.php b/framework/Prefs/lib/Horde/Prefs/Translation.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * @package Prefs
- *
  * Copyright 2010-2013 Horde LLC (http://www.horde.org/)
  *
  * See the enclosed file COPYING for license information (LGPL). If you