Merge branch 'master' into ansel-ajax

horde · Jun 21, 2014 · 575cac4 · 575cac4
2 parents bdc88dc + 9e4fd59
commit 575cac4
Show file tree

Hide file tree

Showing 109 changed files with 1,098 additions and 571 deletions.
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php b/framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php
@@ -967,13 +967,19 @@ public function removeState(array $options)
             }
             if (!empty($device_query)) {
                 $this->_db->delete($device_query, $values);
-            } elseif (!empty($user_query) && empty($options['devId'])) {
-                // If there was a user_deletion, check if we should remove the
-                // device entry as well
-                $sql = 'SELECT COUNT(*) FROM ' . $this->_syncUsersTable . ' WHERE device_id = ?';
-                if (!$this->_db->selectValue($sql, array($options['devId']))) {
-                    $query = 'DELETE FROM ' . $this->_syncDeviceTable . ' WHERE device_id = ?';
-                    $this->_db->delete($query, array($options['devId']));
+            } elseif (!empty($user_query)) {
+                $sql = 'SELECT t1.device_id FROM horde_activesync_device t1 '
+                    . 'LEFT JOIN horde_activesync_device_users t2 '
+                    . 'ON t1.device_id = t2.device_id WHERE t2.device_id IS NULL';
+                try {
+                    $devids = $this->_db->selectValues($sql);
+                    foreach ($devids as $id) {
+                        $this->_db->delete(
+                            'DELETE FROM horde_activesync_device WHERE device_id = ?',
+                            array($id));
+                    }
+                } catch (Horde_Db_Exception $e) {
+                    throw new Horde_ActiveSync_Exception($e->getMessage());
                 }
             }
         } catch (Horde_Db_Exception $e) {

diff --git a/framework/ActiveSync/package.xml b/framework/ActiveSync/package.xml
@@ -21,7 +21,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
-* 
+* [mjr] Fix removing orphaned device entries (Bug #13277).
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -2222,7 +2222,7 @@
    <date>2014-06-12</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
-* 
+* [mjr] Fix removing orphaned device entries (Bug #13277).
    </notes>
   </release>
  </changelog>

diff --git a/framework/Auth/composer.json b/framework/Auth/composer.json
@@ -21,8 +21,8 @@
             "role": "lead"
         }
     ],
-    "version": "2.1.4",
-    "time": "2014-05-21",
+    "version": "2.1.5",
+    "time": "2014-06-17",
     "repositories": [
         {
             "type": "pear",

diff --git a/framework/Auth/package.xml b/framework/Auth/package.xml
@@ -23,9 +23,9 @@
   <email>slusarz@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2014-06-11</date>
+ <date>2014-06-17</date>
  <version>
-  <release>2.1.5</release>
+  <release>2.1.6</release>
   <api>2.1.0</api>
  </version>
  <stability>
@@ -34,7 +34,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* [jan] Add Polish translatio (Maciej Uhlig &lt;maciej.uhlig@us.edu.pl&gt;).
+* 
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -968,11 +968,24 @@
    <stability>
     <release>stable</release>
     <api>stable</api></stability>
-   <date>2014-06-11</date>
+   <date>2014-06-17</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
 * [jan] Add Polish translatio (Maciej Uhlig &lt;maciej.uhlig@us.edu.pl&gt;).
    </notes>
   </release>
+  <release>
+   <version>
+    <release>2.1.6</release>
+    <api>2.1.0</api></version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api></stability>
+   <date>2014-06-17</date>
+   <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
+   <notes>
+* 
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/framework/Core/composer.json b/framework/Core/composer.json
@@ -26,8 +26,8 @@
             "role": "developer"
         }
     ],
-    "version": "2.12.0beta3",
-    "time": "2014-06-10",
+    "version": "2.12.0RC1",
+    "time": "2014-06-17",
     "repositories": [
         {
             "type": "pear",

diff --git a/framework/Core/js/redbox.js b/framework/Core/js/redbox.js
@@ -75,8 +75,10 @@ var RedBox = {
 
     close: function()
     {
-        $('RB_window').fade({ duration: this.duration, queue: 'end' });
-        if (this.overlay) {
+        if ($('RB_window').visible()) {
+            $('RB_window').fade({ duration: this.duration, queue: 'end' });
+        }
+        if (this.overlay && $('RB_overlay').visible()) {
             $('RB_overlay').fade({ duration: this.duration, queue: 'end' });
         }
     },

diff --git a/framework/Core/lib/Horde/Core/Ajax/Response/HordeCore.php b/framework/Core/lib/Horde/Core/Ajax/Response/HordeCore.php
@@ -111,7 +111,8 @@ protected function _jsonData()
                 $ob->msgs[] = array_filter(array(
                     'flags' => $val->flags,
                     'message' => $val->message,
-                    'type' => $val->type
+                    'type' => $val->type,
+                    'webnotify' => isset($val->webnotify) ? $val->webnotify : null
                 ));
             }
         }

diff --git a/framework/Core/lib/Horde/Core/Factory/ActiveSyncState.php b/framework/Core/lib/Horde/Core/Factory/ActiveSyncState.php
@@ -9,6 +9,10 @@ public function create(Horde_Injector $injector)
     {
         global $conf;
 
+        if (empty($conf['activesync']['enabled'])) {
+            throw new Horde_Exception('ActiveSync is disabled.');
+        }
+
         $driver = $conf['activesync']['storage'];
         switch (Horde_String::lower($driver)) {
         case 'nosql':

diff --git a/framework/Core/lib/Horde/Core/Factory/Data.php b/framework/Core/lib/Horde/Core/Factory/Data.php
@@ -41,6 +41,9 @@ public function create($driver, array $params = array())
         $class = $this->_getDriverName($driver, 'Horde_Data');
         $params['browser'] = $this->_injector->getInstance('Horde_Browser');
         $params['vars'] = $this->_injector->getInstance('Horde_Variables');
+        $params['http'] = $this->_injector
+            ->getInstance('Horde_Core_Factory_HttpClient')
+            ->create(array('request.verifyPeer' => false));
 
         return new $class($this->_injector->getInstance('Horde_Core_Data_Storage'), $params);
     }

diff --git a/framework/Core/lib/Horde/Core/Mime/Viewer/Vcard.php b/framework/Core/lib/Horde/Core/Mime/Viewer/Vcard.php
@@ -393,7 +393,7 @@ protected function _renderInline()
         if ($registry->hasMethod('contacts/import') &&
             $registry->hasMethod('contacts/sources')) {
             $html .= '<div class="horde-form-buttons"><form action="'
-                . Horde::selfUrl() . '" method="get" name="vcard_import">'
+                . Horde::selfUrl() . '" method="get" name="vcard_import" id="vcard_import">'
                 . Horde_Util::formInput();
             foreach ($_GET as $key => $val) {
                 $html .= '<input type="hidden" name="' . htmlspecialchars($key)

diff --git a/framework/Core/lib/Horde/Core/Nosql.php b/framework/Core/lib/Horde/Core/Nosql.php
@@ -47,19 +47,39 @@ public function getDrivers($app = 'horde', $mask = 0)
         /* Handle framework-level drivers here. */
         if ($app == 'horde') {
             $backends = array(
-                'Horde_ActiveSync_State_Mongo' => $injector->getInstance('Horde_ActiveSyncState'),
-                'Horde_Cache_Storage_Mongo' => $injector->getInstance('Horde_Core_Factory_Cache')->storage,
-                'Horde_History_Mongo' => $injector->getInstance('Horde_History'),
-                'Horde_Lock_Mongo' => $injector->getInstance('Horde_Lock'),
-                'Horde_Prefs_Storage_Mongo' => $injector->getInstance('Horde_Core_Factory_Prefs')->storage,
-                'Horde_SessionHandler_Storage_Mongo' => $injector->getInstance('Horde_Core_Factory_SessionHandler')->storage,
-                'Horde_Token_Mongo' => $injector->getInstance('Horde_Token'),
-                'Horde_Vfs_Mongo' => $injector->getInstance('Horde_Core_Factory_Vfs')->create()
+                'Horde_ActiveSync_State_Mongo' => function() use ($injector) {
+                    return $injector->getInstance('Horde_ActiveSyncState');
+                },
+                'Horde_Cache_Storage_Mongo' => function() use ($injector) {
+                    return $injector->getInstance('Horde_Core_Factory_Cache')->storage;
+                },
+                'Horde_History_Mongo' => function() use ($injector) {
+                    return $injector->getInstance('Horde_History');
+                },
+                'Horde_Lock_Mongo' => function() use ($injector) {
+                    return $injector->getInstance('Horde_Lock');
+                },
+                'Horde_Prefs_Storage_Mongo' => function() use ($injector) {
+                    return $injector->getInstance('Horde_Core_Factory_Prefs')->storage;
+                },
+                'Horde_SessionHandler_Storage_Mongo' => function() use ($injector) {
+                    return $injector->getInstance('Horde_Core_Factory_SessionHandler')->storage;
+                },
+                'Horde_Token_Mongo' => function() use ($injector) {
+                    return $injector->getInstance('Horde_Token');
+                },
+                'Horde_Vfs_Mongo' => function() use ($injector) {
+                    return $injector->getInstance('Horde_Core_Factory_Vfs')->create();
+                },
             );
 
-            foreach ($backends as $key => $val) {
-                if ($val instanceof $key) {
-                    $drivers[] = $val;
+            foreach ($backends as $key => $func) {
+                try {
+                    $val = $func();
+                    if ($val instanceof $key) {
+                        $drivers[] = $val;
+                    }
+                } catch (Horde_Exception $e) {
                 }
             }
         }

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>2014-06-10</date>
+ <date>2014-06-21</date>
  <version>
-  <release>2.12.0beta4</release>
+  <release>2.12.0RC2</release>
   <api>2.12.0</api>
  </version>
  <stability>
@@ -39,10 +39,9 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* [mjr] Fix updating attendee response status when receeived via ActiveSync.
-* [jan] Add &lt;configldapuser&gt; configuration item.
-* [jan] Add base DN to LDAP configuration for searching user DNs.
-* [jan] Allow to specify port for PostgreSQL socket connections (Request #13250).
+* [mjr] Improvements to vcard mime handler to allow for ajax updating (Bug #13101).
+* [jan] Fix delay when fading the same dialog more than once.
+* [jan] Catch exceptions from NoSQL backends when building indices.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -3423,25 +3422,40 @@
    <date>2014-06-10</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* [mjr] Fix incorrect processing of autocompleted data when using prettyautocompleter (Bug #13256).
 * [mms] Allow any HordeCore AJAX response object to return JSON-HTML output, instead of pure JSON.
    </notes>
   </release>
   <release>
    <version>
-    <release>2.12.0beta4</release>
+    <release>2.12.0RC1</release>
     <api>2.12.0</api></version>
    <stability>
     <release>beta</release>
     <api>beta</api></stability>
-   <date>2014-06-10</date>
+   <date>2014-06-17</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* [mjr] Fix updating attendee response status when receeived via ActiveSync.
+* [mjr] Fix incorrect processing of autocompleted data when using prettyautocompleter (Bug #13256).
+* [mjr] Fix updating attendee response status when received via ActiveSync.
 * [jan] Add &lt;configldapuser&gt; configuration item.
 * [jan] Add base DN to LDAP configuration for searching user DNs.
 * [jan] Allow to specify port for PostgreSQL socket connections (Request #13250).
    </notes>
   </release>
+  <release>
+   <version>
+    <release>2.12.0RC2</release>
+    <api>2.12.0</api></version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api></stability>
+   <date>2014-06-21</date>
+   <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
+   <notes>
+* [mjr] Improvements to vcard mime handler to allow for ajax updating (Bug #13101).
+* [jan] Fix delay when fading the same dialog more than once.
+* [jan] Catch exceptions from NoSQL backends when building indices.
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/framework/Crypt/lib/Horde/Crypt/Pgp/Parse.php b/framework/Crypt/lib/Horde/Crypt/Pgp/Parse.php
@@ -57,8 +57,9 @@ class Horde_Crypt_Pgp_Parse
     const ARMOR_TEXT = 6;
 
     /**
-     * Metadata names for signature data.
+     * Metadata names for data.
      */
+    const PGP_ARMOR = 'pgp_armor'; /* @since 2.5.0 */
     const SIG_CHARSET = 'pgp_sig_charset';
     const SIG_RAW = 'pgp_sig_raw';
 
@@ -178,7 +179,7 @@ public function parseToPart($text, $charset = 'UTF-8')
             case self::ARMOR_MESSAGE:
                 $part = new Horde_Mime_Part();
                 $part->setType('multipart/encrypted');
-                $part->setMetadata(IMP_Mime_Viewer_Pgp::PGP_ARMOR, true);
+                $part->setMetadata(self::PGP_ARMOR, true);
                 $part->setContentTypeParameter('protocol', 'application/pgp-encrypted');
 
                 $part1 = new Horde_Mime_Part();

diff --git a/framework/Crypt/package.xml b/framework/Crypt/package.xml
@@ -18,16 +18,16 @@
  </lead>
  <date>2014-05-21</date>
  <version>
-  <release>2.4.4</release>
-  <api>2.4.0</api>
+  <release>2.5.0</release>
+  <api>2.5.0</api>
  </version>
  <stability>
   <release>stable</release>
   <api>stable</api>
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* 
+* [mms] Fix reference to constant outside of the package.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -1024,15 +1024,15 @@ Initial release as a PEAR package
   </release>
   <release>
    <version>
-    <release>2.4.4</release>
-    <api>2.4.0</api></version>
+    <release>2.5.0</release>
+    <api>2.5.0</api></version>
    <stability>
     <release>stable</release>
     <api>stable</api></stability>
    <date>2014-05-21</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* 
+* [mms] Fix reference to constant outside of the package.
    </notes>
   </release>
  </changelog>