Merge branch 'master' into imp_6_2

horde · Nov 14, 2013 · 585b960 · 585b960
2 parents f4cddf3 + f7174f6
commit 585b960
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 34 deletions.
diff --git a/ansel/config/prefs.php b/ansel/config/prefs.php
@@ -187,8 +187,8 @@
     'type' => 'enum',
     'enum' => array(
         'all' => _("Anyone"),
-        'edit' => _("Authenticated users"),
-        'authenticated' => _("Users with edit permissions")
+        'edit' => _("Users with edit permissions"),
+        'authenticated' =>  _("Authenticated users")
     ),
     'desc' => _("Who should be allowed to download original photos")
 );

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php b/framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php
@@ -154,7 +154,7 @@ class Horde_ActiveSync_State_Mongo extends Horde_ActiveSync_State_Base implement
      * Const'r
      *
      * @param array  $params   Must contain:
-     *      - connection:  (Horde_Mongo_Client  The Horde_Db instance.
+     *      - connection:  (Horde_Mongo_Client  The Horde_Mongo instance.
      *
      * @return Horde_ActiveSync_State_Sql
      */
@@ -460,7 +460,7 @@ public function updateState(
 
                 try {
                     $this->_db->HAS_map->insert($document);
-                } catch (Horde_Db_Exception $e) {
+                } catch (Exception $e) {
                     throw new Horde_ActiveSync_Exception($e);
                 }
                 break;

diff --git a/framework/Core/lib/Horde/Core/Ajax/Application/Handler/Chunk.php b/framework/Core/lib/Horde/Core/Ajax/Application/Handler/Chunk.php
@@ -28,8 +28,13 @@ public function chunkContent()
         $result = new stdClass;
         if (!empty($chunk)) {
             Horde::startBuffer();
-            include $GLOBALS['registry']->get('templates', $this->_base->app) . '/chunks/' . $chunk . '.php';
-            $result->chunk = Horde::endBuffer();
+            try {
+                include $GLOBALS['registry']->get('templates', $this->_base->app) . '/chunks/' . $chunk . '.php';
+                $result->chunk = Horde::endBuffer();
+            } catch (Exception $e) {
+                Horde::endBuffer();
+                throw $e;
+            }
         }
 
         return $result;

diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
@@ -179,7 +179,7 @@ class Horde_Registry implements Horde_Shutdown_Task
      *                 (@since 2.11.0).
      *     - [DEFAULT]: Authenticate; on no auth redirect to login screen
      *   - cli: (boolean) Initialize a CLI interface. Setting this to true
-     *          implicits setting 'authentication' to 'none' and 'admin' and
+     *          implicitly sets 'authentication' to 'none' and 'admin' and
      *          'nocompress' to true.
      *          DEFAULT: false
      *   - nocompress: (boolean) If set, the page will not be compressed.

diff --git a/framework/Crypt/lib/Horde/Crypt/Pgp.php b/framework/Crypt/lib/Horde/Crypt/Pgp.php
@@ -1483,4 +1483,12 @@ public function getPublicKeyFromPrivateKey($data)
             : $result->output;
     }
 
+    /**
+     * @deprecated
+     */
+    public function generateRevocation($key, $email, $passphrase)
+    {
+        throw new Horde_Crypt_Exception('Not supported');
+    }
+
 }
diff --git a/framework/Form/lib/Horde/Form/Type.php b/framework/Form/lib/Horde/Form/Type.php
@@ -30,15 +30,11 @@ function __set($property, $value)
     }
 
     /**
-     * Initialize (kind of constructor) - Parameter list may vary on
-     * overloading.
-     *
-     * For PHP5, function signatures must be identical, so comment this out
-     * to prevent strict warnings.
+     * Initialize (kind of constructor) - Parameter list may vary on overloading
      */
-    //function init()
-    //{
-    //}
+    function init()
+    {
+    }
 
     function onSubmit()
     {

diff --git a/horde/bin/horde-translation b/horde/bin/horde-translation
@@ -416,6 +416,8 @@ class Horde_Translation_Script
      */
     public function xtract($options)
     {
+        global $registry;
+
         foreach ($options as $option) {
             switch ($option[0]) {
             case 'h':
@@ -458,15 +460,8 @@ class Horde_Translation_Script
              * an invalid charset being used in this file. */
             $tmp_file = $file . '.tmp.pot';
 
-            if (file_exists($this->dirs[$i] . '/lib/Application.php')) {
-                include_once $this->dirs[$i] . '/lib/Application.php';
-                $className = $this->apps[$i] . '_Application';
-                $appOb = new $className;
-                $version = $appOb->version;
-            } else {
-                include_once $this->dirs[$i] . '/lib/version.php';
-                $version = constant(strtoupper($this->apps[$i]) . '_VERSION');
-            }
+            $version = $registry->getVersion($this->apps[$i]);
+
             $sh = $this->xgettext
                 . ' --language=PHP'
                 . ' --from-code=iso-8859-1'
@@ -1581,12 +1576,12 @@ if (file_exists($baseFile)) {
     require_once PEAR_Config::singleton()
         ->get('horde_dir', null, 'pear.horde.org') . '/lib/Application.php';
 }
+Horde_Registry::appInit('horde', array(
+    'cli' => true,
+    'session_control' => 'none'
+));
 
-$c = new Horde_Cli();
-if (!$c->runningFromCLI()) {
-    $c->fatal('This script must be run from the command line.');
-}
-$c->init();
+$c = $cli;
 
 $c->writeln($c->bold('---------------------------'));
 $c->writeln($c->bold('Horde translation generator'));
@@ -1595,8 +1590,6 @@ $c->writeln($c->bold('---------------------------'));
 /* Instantiate main object. */
 $script = new Horde_Translation_Script();
 $script->cli = $c;
-$registry = new Horde_Support_Stub();
-$injector = new Horde_Support_Stub();
 
 /* Sanity checks */
 if (!extension_loaded('gettext')) {

diff --git a/imp/config/prefs.php b/imp/config/prefs.php
@@ -935,7 +935,7 @@
 );
 
 // Address book(s) to use when expanding addresses
-// Refer to turba/config/sources.php for possible source values
+// Refer to turba/config/backends.php for possible source values
 //
 // You can provide default values this way:
 //   'value' => json_encode(array('source_one', 'source_two'))
@@ -944,7 +944,7 @@
 );
 
 // Field(s) to use when expanding addresses
-// Refer to turba/config/sources.php for possible source and field values
+// Refer to turba/config/backends.php for possible source and field values
 //
 // If you want to provide a default value, this field depends on the
 // search_sources preference. For example:

diff --git a/turba/config/backends.php b/turba/config/backends.php
@@ -201,7 +201,7 @@
  *             still be enforced. Also note that the backend driver must have
  *             support for using this. Supported: SQL, IMAP/Kolab, and IMSP.
  *
- * all_shares: (boolean) If true (and 'use_shares'is true) the corresponding
+ * all_shares: (boolean) If true (and 'use_shares' is true) the corresponding
  *             source will be assumed to handle all shares that are not
  *             explicitly assigned to another source. Supported: IMAP/Kolab.
  *