We don't have any way to authenticate at the command line, so set

'authentication' always to 'none' when in CLI mode.

diff --git a/agora/scripts/phorum2agora.php b/agora/scripts/phorum2agora.php
index 009bc91..00cc3f7 100755 (executable)
--- a/agora/scripts/phorum2agora.php
+++ b/agora/scripts/phorum2agora.php
@@ -16,7 +16,7 @@
  */
 
 require_once dirname(__FILE__) . '/../lib/Application.php';
-Horde_Registry::appInit('agora', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('agora', array('cli' => true));
 
 /* Open Agora database. */
 $db_agora = $db_phorum = $injector->getInstance('Horde_Core_Factory_DbPear')->create();

diff --git a/agora/scripts/upgrades/2007-09-23_last_message.php b/agora/scripts/upgrades/2007-09-23_last_message.php
index e7ed9f1..acb9e54 100644 (file)
--- a/agora/scripts/upgrades/2007-09-23_last_message.php
+++ b/agora/scripts/upgrades/2007-09-23_last_message.php
@@ -5,7 +5,7 @@
  */
 
 require_once dirname(__FILE__) . '/../../lib/Application.php';
-Horde_Registry::appInit('agora', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('agora', array('cli' => true));
 
 /* Open the database. */
 $params = Horde::getDriverConfig('storage', 'sql');

diff --git a/agora/threads.php b/agora/threads.php
index 449ac68..2f71887 100644 (file)
--- a/agora/threads.php
+++ b/agora/threads.php
@@ -12,7 +12,7 @@
  */
 
 require_once dirname(__FILE__) . '/lib/Application.php';
-Horde_Registry::appInit('agora', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('agora', array('cli' => true));
 
 /* Make sure we have a forum id. */
 list($forum_id, , $scope) = Agora::getAgoraId();

diff --git a/agora/view.php b/agora/view.php
index 3ef6c56..77b13a7 100644 (file)
--- a/agora/view.php
+++ b/agora/view.php
@@ -11,7 +11,7 @@
  */
 
 require_once dirname(__FILE__) . '/lib/Application.php';
-Horde_Registry::appInit('agora', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('agora', array('cli' => true));
 
 $action_id = Horde_Util::getFormData('action_id', 'download');
 $file_id = Horde_Util::getFormData('file_id');

diff --git a/ansel/scripts/all_images_exif_to_tags.php b/ansel/scripts/all_images_exif_to_tags.php
index 0a700c5..9db70be 100755 (executable)
--- a/ansel/scripts/all_images_exif_to_tags.php
+++ b/ansel/scripts/all_images_exif_to_tags.php
@@ -10,7 +10,7 @@
 */
 
 require_once dirname(__FILE__) . '/../../lib/Application.php';
-Horde_Registry::appInit('ansel', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('ansel', array('cli' => true));
 
 /* Command line options */
 $ret = Console_Getopt::getopt(Console_Getopt::readPHPArgv(), 'hu:p:f:',

diff --git a/ansel/scripts/ansel.php b/ansel/scripts/ansel.php
index a6f4f28..ee8c2b9 100755 (executable)
--- a/ansel/scripts/ansel.php
+++ b/ansel/scripts/ansel.php
@@ -10,7 +10,7 @@
 */
 
 require_once dirname(__FILE__) . '/../lib/Application.php';
-Horde_Registry::appInit('ansel', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('ansel', array('cli' => true));
 
 // We accept the user name on the command-line.
 $ret = Console_Getopt::getopt(Console_Getopt::readPHPArgv(),

diff --git a/ansel/scripts/garbage_collection.php b/ansel/scripts/garbage_collection.php
index b93dd3e..8219125 100755 (executable)
--- a/ansel/scripts/garbage_collection.php
+++ b/ansel/scripts/garbage_collection.php
@@ -10,7 +10,7 @@
  */
 
 require_once dirname(__FILE__) . '/../lib/Application.php';
-Horde_Registry::appInit('ansel', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('ansel', array('cli' => true));
 
 // Default arguments.
 $move = $verbose = false;

diff --git a/ansel/scripts/recursive_import.php b/ansel/scripts/recursive_import.php
index 5a35c86..7a59223 100755 (executable)
--- a/ansel/scripts/recursive_import.php
+++ b/ansel/scripts/recursive_import.php
@@ -10,7 +10,7 @@
 */
 
 require_once dirname(__FILE__) . '/../../lib/Application.php';
-Horde_Registry::appInit('ansel', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('ansel', array('cli' => true));
 
 // We accept the user name on the command-line.
 $ret = Console_Getopt::getopt(Console_Getopt::readPHPArgv(), 'hu:p:lc:g:a:d:o:k',

diff --git a/ansel/scripts/remote_import.php b/ansel/scripts/remote_import.php
index 90062ce..c86178c 100755 (executable)
--- a/ansel/scripts/remote_import.php
+++ b/ansel/scripts/remote_import.php
@@ -13,7 +13,7 @@
 */
 
 require_once dirname(__FILE__) . '/../lib/Application.php';
-Horde_Registry::appInit('ansel', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('ansel', array('cli' => true));
 
 /* Command line options */
 $ret = Console_Getopt::getopt(Console_Getopt::readPHPArgv(), 'hu:p:g:s:d:kr:zl',

diff --git a/folks/scripts/activity.php b/folks/scripts/activity.php
index 5f985a4..c21cc9c 100644 (file)
--- a/folks/scripts/activity.php
+++ b/folks/scripts/activity.php
@@ -17,7 +17,7 @@
 exit;
 
 require_once dirname(__FILE__) . '/../lib/Application.php';
-Horde_Registry::appInit('folks', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('folks', array('cli' => true));
 
 try {
     $db = $injector->getInstance('Horde_Core_Factory_DbPear')->create();

diff --git a/folks/scripts/import_letter.php b/folks/scripts/import_letter.php
index c1aca26..caf230c 100644 (file)
--- a/folks/scripts/import_letter.php
+++ b/folks/scripts/import_letter.php
@@ -17,7 +17,7 @@
 exit;
 
 require_once dirname(__FILE__) . '/../lib/Application.php';
-Horde_Registry::appInit('folks', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('folks', array('cli' => true));
 
 try {
     $db = $injector->getInstance('Horde_Core_Factory_DbPear')->create();

diff --git a/folks/scripts/mail-filter.php b/folks/scripts/mail-filter.php
index 013c9c1..470524f 100644 (file)
--- a/folks/scripts/mail-filter.php
+++ b/folks/scripts/mail-filter.php
@@ -38,7 +38,7 @@ EOU;
 }
 
 require_once dirname(__FILE__) . '/../lib/Application.php';
-Horde_Registry::appInit('folks', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('folks', array('cli' => true));
 
 // Read command-line parameters.
 $info = array();

diff --git a/folks/scripts/mail.php b/folks/scripts/mail.php
index 5880fa4..9b310bb 100644 (file)
--- a/folks/scripts/mail.php
+++ b/folks/scripts/mail.php
@@ -12,7 +12,7 @@
  */
 
 require_once dirname(__FILE__) . '/../lib/Application.php';
-Horde_Registry::appInit('folks', array('authentication' => 'none', 'cli' => true, 'no_compress' => true));
+Horde_Registry::appInit('folks', array('cli' => true, 'no_compress' => true));
 
 // We accept the user name on the command-line.
 $ret = Console_Getopt::getopt(Console_Getopt::readPHPArgv(), 'h:u:p:dt:f:c:',

diff --git a/folks/scripts/popularity.php b/folks/scripts/popularity.php
index 3ecd845..175c41a 100644 (file)
--- a/folks/scripts/popularity.php
+++ b/folks/scripts/popularity.php
@@ -17,7 +17,7 @@
 exit;
 
 require_once dirname(__FILE__) . '/../lib/Application.php';
-Horde_Registry::appInit('folks', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('folks', array('cli' => true));
 
 try {
     $db = $injector->getInstance('Horde_Core_Factory_DbPear')->create();

diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index 23b71c0..4b3d915 100644 (file)
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -140,7 +140,9 @@ class Horde_Registry
      *   'none'  - Do not authenticate
      *   'throw' - Authenticate; on no auth, throw a Horde_Exception
      *   [DEFAULT] - Authenticate; on no auth redirect to login screen
-     * 'cli' - (boolean) Initialize a CLI interface.
+     * 'cli' - (boolean) Initialize a CLI interface. Setting this to true
+     *         implicits setting 'authentication' to 'none' and 'admin' and
+     *         'nocompress' to true.
      *         DEFAULT: false
      * 'nocompress' - (boolean) If set, the page will not be compressed.
      *                DEFAULT: false
@@ -199,6 +201,7 @@ class Horde_Registry
             $GLOBALS['cli'] = Horde_Cli::init();
 
             $args['nocompress'] = true;
+            $args['authentication'] = 'none';
         }
 
         // Registry.

diff --git a/framework/Rpc/test/rpc-test.php b/framework/Rpc/test/rpc-test.php
index bb84790..3138aec 100644 (file)
--- a/framework/Rpc/test/rpc-test.php
+++ b/framework/Rpc/test/rpc-test.php
@@ -5,7 +5,7 @@
  */
 
 require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/horde/lib/Application.php';
-Horde_Registry::appInit('horde', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('horde', array('cli' => true));
 
 $conf['server']['name'] = 'localhost';
 $conf['server']['port'] = 80;

diff --git a/framework/SyncML/tests/testsync.php b/framework/SyncML/tests/testsync.php
index e779433..c3e7586 100755 (executable)
--- a/framework/SyncML/tests/testsync.php
+++ b/framework/SyncML/tests/testsync.php
@@ -87,7 +87,7 @@ require_once 'SyncML/Backend.php';
 /* Do Horde includes if test for horde backend: */
 if ($syncml_backend_driver == 'Horde') {
     require_once dirname(__FILE__) . '/../../../lib/Application.php';
-    Horde_Registry::appInit('horde', array('authentication' => 'none', 'cli' => true, 'session_control' => 'none'));
+    Horde_Registry::appInit('horde', array('cli' => true, 'session_control' => 'none'));
 }
 
 if (!empty($testsetuponly)) {

diff --git a/horde/bin/alarms b/horde/bin/alarms
index 3c81c20..50f29a9 100755 (executable)
--- a/horde/bin/alarms
+++ b/horde/bin/alarms
@@ -10,6 +10,6 @@
  */
 
 require_once dirname(__FILE__) . '/../lib/Application.php';
-Horde_Registry::appInit('horde', array('authentication' => 'none', 'cli' => true, 'user_admin' => true));
+Horde_Registry::appInit('horde', array('cli' => true, 'user_admin' => true));
 
 $injector->getInstance('Horde_Alarm')->notify(null, true, false, array('notify', 'desktop'));

diff --git a/horde/bin/crond b/horde/bin/crond
index 6fe68f2..9a1c5e0 100755 (executable)
--- a/horde/bin/crond
+++ b/horde/bin/crond
@@ -22,7 +22,7 @@ $cron_tasks = array(
 // End Configuration
 
 require_once dirname(__FILE__) . '/../lib/Application.php';
-Horde_Registry::appInit('horde', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('horde', array('cli' => true));
 
 // Get an instance of the cron scheduler.
 $daemon = Horde_Scheduler::factory('Cron');

diff --git a/horde/bin/run_task b/horde/bin/run_task
index c94e9cc..c273066 100755 (executable)
--- a/horde/bin/run_task
+++ b/horde/bin/run_task
@@ -18,7 +18,7 @@
  */
 
 require_once dirname(__FILE__) . '/../lib/Application.php';
-Horde_Registry::appInit('horde', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('horde', array('cli' => true));
 
 $c = new Console_Getopt();
 $argv = $c->readPHPArgv();

diff --git a/horde/scripts/import_squirrelmail_file_prefs.php b/horde/scripts/import_squirrelmail_file_prefs.php
index c5b6af8..8396417 100755 (executable)
--- a/horde/scripts/import_squirrelmail_file_prefs.php
+++ b/horde/scripts/import_squirrelmail_file_prefs.php
@@ -17,7 +17,7 @@
  */
 
 require_once dirname(__FILE__) . '/../lib/Application.php';
-Horde_Registry::appInit('horde', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('horde', array('cli' => true));
 
 // Read command line parameters.
 if ($argc != 2) {

diff --git a/horde/scripts/import_squirrelmail_sql_prefs.php b/horde/scripts/import_squirrelmail_sql_prefs.php
index 45f546f..d623f83 100755 (executable)
--- a/horde/scripts/import_squirrelmail_sql_prefs.php
+++ b/horde/scripts/import_squirrelmail_sql_prefs.php
@@ -17,7 +17,7 @@
 
 // Do CLI checks and environment setup first.
 require_once dirname(__FILE__) . '/../lib/Application.php';
-Horde_Registry::appInit('horde', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('horde', array('cli' => true));
 
 // Read command line parameters.
 if ($argc != 2) {

diff --git a/horde/scripts/upgrades/2008-04-09_horde_syncml_map.php b/horde/scripts/upgrades/2008-04-09_horde_syncml_map.php
index 86a3333..d4779a0 100755 (executable)
--- a/horde/scripts/upgrades/2008-04-09_horde_syncml_map.php
+++ b/horde/scripts/upgrades/2008-04-09_horde_syncml_map.php
@@ -6,7 +6,7 @@
  */
 
 require_once dirname(__FILE__) . '/../../lib/Application.php';
-Horde_Registry::appInit('horde', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('horde', array('cli' => true));
 
 require_once 'Horde/DataTree.php';
 $datatree = DataTree::factory('sql',

diff --git a/horde/scripts/upgrades/2008-08-29_fix_mdb2_sequences.php b/horde/scripts/upgrades/2008-08-29_fix_mdb2_sequences.php
index a542385..40e524f 100755 (executable)
--- a/horde/scripts/upgrades/2008-08-29_fix_mdb2_sequences.php
+++ b/horde/scripts/upgrades/2008-08-29_fix_mdb2_sequences.php
@@ -24,7 +24,7 @@ $to_upgrade = array('ansel_shares' => 'share_id',
 
 /* Set up the CLI environment */
 require_once dirname(__FILE__) . '/../../lib/Application.php';
-Horde_Registry::appInit('horde', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('horde', array('cli' => true));
 
 $config = $GLOBALS['conf']['sql'];
 unset($config['charset']);

diff --git a/horde/scripts/upgrades/convert_datatree_groups_to_sql.php b/horde/scripts/upgrades/convert_datatree_groups_to_sql.php
index e5a0c09..78e5f66 100755 (executable)
--- a/horde/scripts/upgrades/convert_datatree_groups_to_sql.php
+++ b/horde/scripts/upgrades/convert_datatree_groups_to_sql.php
@@ -6,7 +6,7 @@
  */
 
 require_once dirname(__FILE__) . '/../../lib/Application.php';
-Horde_Registry::appInit('horde', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('horde', array('cli' => true));
 
 $g = Horde_Group::factory();
 

diff --git a/horde/scripts/upgrades/convert_datatree_perms_to_sql.php b/horde/scripts/upgrades/convert_datatree_perms_to_sql.php
index af9e8c2..ac51d7e 100755 (executable)
--- a/horde/scripts/upgrades/convert_datatree_perms_to_sql.php
+++ b/horde/scripts/upgrades/convert_datatree_perms_to_sql.php
@@ -6,7 +6,7 @@
  */
 
 require_once dirname(__FILE__) . '/../../lib/Application.php';
-Horde_Registry::appInit('horde', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('horde', array('cli' => true));
 
 $p = Horde_Perms::factory('datatree');
 

diff --git a/horde/scripts/upgrades/migrate_user_categories.php b/horde/scripts/upgrades/migrate_user_categories.php
index 5674940..af404e0 100755 (executable)
--- a/horde/scripts/upgrades/migrate_user_categories.php
+++ b/horde/scripts/upgrades/migrate_user_categories.php
@@ -9,7 +9,7 @@
  */
 
 require_once dirname(__FILE__) . '/../../lib/Application.php';
-Horde_Registry::appInit('horde', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('horde', array('cli' => true));
 
 $cManager = new Horde_Prefs_CategoryManager();
 $apps = $registry->listApps(array('hidden', 'notoolbar', 'active', 'admin'));

diff --git a/horde/scripts/upgrades/move_history_out_of_datatree.php b/horde/scripts/upgrades/move_history_out_of_datatree.php
index b423a56..de8010d 100755 (executable)
--- a/horde/scripts/upgrades/move_history_out_of_datatree.php
+++ b/horde/scripts/upgrades/move_history_out_of_datatree.php
@@ -6,7 +6,7 @@
  */
 
 require_once dirname(__FILE__) . '/../../lib/Application.php';
-Horde_Registry::appInit('horde', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('horde', array('cli' => true));
 
 $cli->writeln($cli->yellow("Beginning migration. This may take a very long time to complete."));
 $cli->writeln();

diff --git a/hylax/scripts/fax_create.php b/hylax/scripts/fax_create.php
index 50522ec..974c334 100755 (executable)
--- a/hylax/scripts/fax_create.php
+++ b/hylax/scripts/fax_create.php
@@ -2,7 +2,7 @@
 <?php
 
 require_once dirname(__FILE__) . '/../lib/Application.php';
-$hylax = Horde_Registry::appInit('hylax', array('authentication' => 'none', 'cli' => true));
+$hylax = Horde_Registry::appInit('hylax', array('cli' => true));
 
 /* Create the fax information array. Set fax_type to 1 for outgoing. */
 $info = array('fax_type' => 1);

diff --git a/hylax/scripts/fax_create_recv.php b/hylax/scripts/fax_create_recv.php
index 5bfe627..7d9301a 100755 (executable)
--- a/hylax/scripts/fax_create_recv.php
+++ b/hylax/scripts/fax_create_recv.php
@@ -2,7 +2,7 @@
 <?php
 
 require_once dirname(__FILE__) . '/../lib/Application.php';
-$hylax = Horde_Registry::appInit('hylax', array('authentication' => 'none', 'cli' => true));
+$hylax = Horde_Registry::appInit('hylax', array('cli' => true));
 
 /* Create the fax information array. Set fax_type to 0 for incoming. */
 $info = array('fax_type' => 0,

diff --git a/hylax/scripts/fax_save_data.php b/hylax/scripts/fax_save_data.php
index 816d233..a933b0d 100755 (executable)
--- a/hylax/scripts/fax_save_data.php
+++ b/hylax/scripts/fax_save_data.php
@@ -2,7 +2,7 @@
 <?php
 
 require_once dirname(__FILE__) . '/../lib/Application.php';
-$hylax = Horde_Registry::appInit('hylax', array('authentication' => 'none', 'cli' => true));
+$hylax = Horde_Registry::appInit('hylax', array('cli' => true));
 
 /* Store the raw fax postscript data. */
 $data = $cli->readStdin();

diff --git a/hylax/scripts/fax_save_recv_data.php b/hylax/scripts/fax_save_recv_data.php
index 601f657..7e3ad39 100755 (executable)
--- a/hylax/scripts/fax_save_recv_data.php
+++ b/hylax/scripts/fax_save_recv_data.php
@@ -2,7 +2,7 @@
 <?php
 
 require_once dirname(__FILE__) . '/../lib/Application.php';
-$hylax = Horde_Registry::appInit('hylax', array('authentication' => 'none', 'cli' => true));
+$hylax = Horde_Registry::appInit('hylax', array('cli' => true));
 
 /* Get the arguments. The first argument is the filename from which the job ID
  * is obtained, in the format 'recvq/faxNNNNN.tif'. */

diff --git a/hylax/scripts/install_cups_drivers.php b/hylax/scripts/install_cups_drivers.php
index e9a0eb9..ce0cf86 100755 (executable)
--- a/hylax/scripts/install_cups_drivers.php
+++ b/hylax/scripts/install_cups_drivers.php
@@ -2,7 +2,7 @@
 <?php
 
 require_once dirname(__FILE__) . '/../lib/Application.php';
-$hylax = Horde_Registry::appInit('hylax', array('authentication' => 'none', 'cli' => true));
+$hylax = Horde_Registry::appInit('hylax', array('cli' => true));
 
 /* The CUPS backend file. */
 $hylafax_backend = file_get_contents(HYLAX_BASE . '/scripts/cups/hylafax');

diff --git a/imp/scripts/query-imap-cache.php b/imp/scripts/query-imap-cache.php
index cacf1bc..19d294e 100755 (executable)
--- a/imp/scripts/query-imap-cache.php
+++ b/imp/scripts/query-imap-cache.php
@@ -15,7 +15,7 @@
  */
 
 require_once dirname(__FILE__) . '/../lib/Application.php';
-Horde_Registry::appInit('imp', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('imp', array('cli' => true));
 
 $c = new Console_Getopt();
 $argv = $c->readPHPArgv();

diff --git a/ingo/scripts/ingo-postfix-policyd b/ingo/scripts/ingo-postfix-policyd
index 2d0d883..1a59f5b 100755 (executable)
--- a/ingo/scripts/ingo-postfix-policyd
+++ b/ingo/scripts/ingo-postfix-policyd
@@ -61,7 +61,7 @@
  */
 
 require_once dirname(__FILE__) . '/../../lib/Application.php';
-Horde_Registry::appInit('ingo', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('ingo', array('cli' => true));
 
 exit('Not updated');
 

diff --git a/ingo/scripts/upgrades/convert_datatree_shares_to_sql.php b/ingo/scripts/upgrades/convert_datatree_shares_to_sql.php
index 0a10317..6d4f558 100755 (executable)
--- a/ingo/scripts/upgrades/convert_datatree_shares_to_sql.php
+++ b/ingo/scripts/upgrades/convert_datatree_shares_to_sql.php
@@ -8,7 +8,7 @@
 
 /* Set up the CLI environment */
 require_once dirname(__FILE__) . '/../../../lib/Application.php';
-Horde_Registry::appInit('ingo', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('ingo', array('cli' => true));
 
 $config = $GLOBALS['conf']['sql'];
 unset($config['charset']);

diff --git a/ingo/scripts/upgrades/convert_prefs_to_sql.php b/ingo/scripts/upgrades/convert_prefs_to_sql.php
index d8ce4a6..0845eb6 100755 (executable)
--- a/ingo/scripts/upgrades/convert_prefs_to_sql.php
+++ b/ingo/scripts/upgrades/convert_prefs_to_sql.php
@@ -19,7 +19,7 @@
  */
 
 require_once dirname(__FILE__) . '/../../../lib/Application.php';
-Horde_Registry::appInit('ingo', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('ingo', array('cli' => true));
 
 /* Initialize storage backends. */
 if ($conf['storage']['driver'] != 'sql') {

diff --git a/jonah/scripts/feed_tester.php b/jonah/scripts/feed_tester.php
index ed69679..e435994 100755 (executable)
--- a/jonah/scripts/feed_tester.php
+++ b/jonah/scripts/feed_tester.php
@@ -6,7 +6,7 @@
  */
 
 require_once dirname(__FILE__) . '/../lib/Application.php';
-Horde_Registry::appInit('jonah', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('jonah', array('cli' => true));
 
 if (empty($argv[1]) || !file_exists($argv[1])) {
     exit("Need a valid filename.\n");

diff --git a/kronolith/scripts/agenda.php b/kronolith/scripts/agenda.php
index 6b09f10..1526049 100755 (executable)
--- a/kronolith/scripts/agenda.php
+++ b/kronolith/scripts/agenda.php
@@ -10,7 +10,7 @@
  */
 
 require_once dirname(__FILE__) . '/../lib/Application.php';
-Horde_Registry::appInit('kronolith', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('kronolith', array('cli' => true));
 
 send_agendas();
 

diff --git a/kronolith/scripts/import_icals.php b/kronolith/scripts/import_icals.php
index 2751ae7..8372e8e 100755 (executable)
--- a/kronolith/scripts/import_icals.php
+++ b/kronolith/scripts/import_icals.php
@@ -14,7 +14,7 @@
  */
 
 require_once dirname(__FILE__) . '/../lib/Application.php';
-Horde_Registry::appInit('kronolith', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('kronolith', array('cli' => true));
 
 // Read command line parameters.
 $cli = Horde_Cli::singleton();

diff --git a/kronolith/scripts/import_squirrelmail_calendar.php b/kronolith/scripts/import_squirrelmail_calendar.php
index a75e6a0..e16074d 100755 (executable)
--- a/kronolith/scripts/import_squirrelmail_calendar.php
+++ b/kronolith/scripts/import_squirrelmail_calendar.php
@@ -16,7 +16,7 @@
 
 // Do CLI checks and environment setup first.
 require_once dirname(__FILE__) . '/../lib/Application.php';
-Horde_Registry::appInit('kronolith', array('authentication' => 'none', 'cli' => true, 'user_admin' => true));
+Horde_Registry::appInit('kronolith', array('cli' => true, 'user_admin' => true));
 
 // Read command line parameters.
 if ($argc != 2) {

diff --git a/kronolith/scripts/upgrades/convert_datatree_shares_to_sql.php b/kronolith/scripts/upgrades/convert_datatree_shares_to_sql.php
index 78d9380..fd30329 100755 (executable)
--- a/kronolith/scripts/upgrades/convert_datatree_shares_to_sql.php
+++ b/kronolith/scripts/upgrades/convert_datatree_shares_to_sql.php
@@ -8,7 +8,7 @@
 
 /* Set up the CLI environment */
 require_once dirname(__FILE__) . '/../../lib/Application.php';
-Horde_Registry::appInit('kronolith', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('kronolith', array('cli' => true));
 
 $config = $GLOBALS['conf']['sql'];
 unset($config['charset']);

diff --git a/kronolith/scripts/upgrades/convert_sql_shares_to_sqlng.php b/kronolith/scripts/upgrades/convert_sql_shares_to_sqlng.php
index b864657..a3e70bd 100755 (executable)
--- a/kronolith/scripts/upgrades/convert_sql_shares_to_sqlng.php
+++ b/kronolith/scripts/upgrades/convert_sql_shares_to_sqlng.php
@@ -12,7 +12,7 @@
 
 /* Set up the CLI environment */
 require_once dirname(__FILE__) . '/../../lib/Application.php';
-Horde_Registry::appInit('kronolith', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('kronolith', array('cli' => true));
 
 require_once dirname(__FILE__) . '/../../migration/15_kronolith_upgrade_sqlng.php';
 

diff --git a/kronolith/scripts/upgrades/convert_to_utc.php b/kronolith/scripts/upgrades/convert_to_utc.php
index 970bf2c..f7e83b3 100755 (executable)
--- a/kronolith/scripts/upgrades/convert_to_utc.php
+++ b/kronolith/scripts/upgrades/convert_to_utc.php
@@ -6,7 +6,7 @@
 
 /* Set up the CLI environment. */
 require_once dirname(__FILE__) . '/../../lib/Application.php';
-Horde_Registry::appInit('kronolith', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('kronolith', array('cli' => true));
 
 /* Prepare DB stuff. */
 PEAR::pushErrorHandling(PEAR_ERROR_CALLBACK, create_function('$e', 'echo $e->toString()."\n";exit;'));

diff --git a/nag/scripts/import_vtodos.php b/nag/scripts/import_vtodos.php
index 9b45a5f..7a6fec7 100755 (executable)
--- a/nag/scripts/import_vtodos.php
+++ b/nag/scripts/import_vtodos.php
@@ -14,7 +14,7 @@
  */
 
 require_once dirname(__FILE__) . '/../lib/Application.php';
-Horde_Registry::appInit('nag', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('nag', array('cli' => true));
 
 // Read command line parameters.
 if (count($argv) != 3) {

diff --git a/nag/scripts/upgrades/convert_datatree_shares_to_sql.php b/nag/scripts/upgrades/convert_datatree_shares_to_sql.php
index b66e250..84c4e19 100755 (executable)
--- a/nag/scripts/upgrades/convert_datatree_shares_to_sql.php
+++ b/nag/scripts/upgrades/convert_datatree_shares_to_sql.php
@@ -8,7 +8,7 @@
 
 /* Set up the CLI environment */
 require_once dirname(__FILE__) . '/../../lib/Application.php';
-Horde_Registry::appInit('nag', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('nag', array('cli' => true));
 /* Grab what we need to steal the DB config */
 require_once HORDE_BASE . '/config/conf.php';
 

diff --git a/nag/scripts/upgrades/create_missing_add_histories_sql.php b/nag/scripts/upgrades/create_missing_add_histories_sql.php
index b5355df..d2e28dd 100755 (executable)
--- a/nag/scripts/upgrades/create_missing_add_histories_sql.php
+++ b/nag/scripts/upgrades/create_missing_add_histories_sql.php
@@ -11,7 +11,7 @@
 
 // Do CLI checks and environment setup first.
 require_once dirname(__FILE__) . '/../../lib/Application.php';
-Horde_Registry::appInit('nag', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('nag', array('cli' => true));
 
 $history = $GLOBALS['injector']->getInstance('Horde_History');
 

diff --git a/turba/scripts/import_squirrelmail_file_abook.php b/turba/scripts/import_squirrelmail_file_abook.php
index 344dc6c..5d848eb 100755 (executable)
--- a/turba/scripts/import_squirrelmail_file_abook.php
+++ b/turba/scripts/import_squirrelmail_file_abook.php
@@ -18,7 +18,7 @@
 
 // Do CLI checks and environment setup first.
 require_once dirname(__FILE__) . '/../lib/Application.php';
-Horde_Registry::appInit('turba', array('authentication' => 'none', 'cli' => true, 'user_admin' => true));
+Horde_Registry::appInit('turba', array('cli' => true, 'user_admin' => true));
 
 // Read command line parameters.
 if ($argc != 2) {

diff --git a/turba/scripts/import_squirrelmail_sql_abook.php b/turba/scripts/import_squirrelmail_sql_abook.php
index 3aa47f0..bc97bf7 100755 (executable)
--- a/turba/scripts/import_squirrelmail_sql_abook.php
+++ b/turba/scripts/import_squirrelmail_sql_abook.php
@@ -17,7 +17,7 @@
 
 // Do CLI checks and environment setup first.
 require_once dirname(__FILE__) . '/../lib/Application.php';
-Horde_Registry::appInit('turba', array('authentication' => 'none', 'cli' => true, 'user_admin' => true));
+Horde_Registry::appInit('turba', array('cli' => true, 'user_admin' => true));
 
 // Read command line parameters.
 if ($argc != 2) {

diff --git a/turba/scripts/import_vcards.php b/turba/scripts/import_vcards.php
index 69590e7..a21279e 100755 (executable)
--- a/turba/scripts/import_vcards.php
+++ b/turba/scripts/import_vcards.php
@@ -15,7 +15,7 @@
 
 // Do CLI checks and environment setup first.
 require_once dirname(__FILE__) . '/../lib/Application.php';
-Horde_Registry::appInit('turba', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('turba', array('cli' => true));
 
 // Read command line parameters.
 if (count($argv) != 3) {

diff --git a/turba/scripts/upgrades/convert_datatree_shares_to_sql.php b/turba/scripts/upgrades/convert_datatree_shares_to_sql.php
index 05e0803..2f3c79e 100755 (executable)
--- a/turba/scripts/upgrades/convert_datatree_shares_to_sql.php
+++ b/turba/scripts/upgrades/convert_datatree_shares_to_sql.php
@@ -9,7 +9,7 @@
 
 /* Set up the CLI environment */
 require_once dirname(__FILE__) . '/../../lib/Application.php';
-Horde_Registry::appInit('turba', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('turba', array('cli' => true));
 
 /* Grab what we need to steal the DB config */
 require_once HORDE_BASE . '/config/conf.php';

diff --git a/turba/scripts/upgrades/public_to_horde_share.php b/turba/scripts/upgrades/public_to_horde_share.php
index eb518bb..e832fd9 100755 (executable)
--- a/turba/scripts/upgrades/public_to_horde_share.php
+++ b/turba/scripts/upgrades/public_to_horde_share.php
@@ -20,7 +20,7 @@
 
 // Load Horde and Turba enviroments
 require_once dirname(__FILE__) . '/../lib/Application.php';
-Horde_Registry::appInit('turba', array('authentication' => 'none', 'cli' => true, 'user_admin' => true));
+Horde_Registry::appInit('turba', array('cli' => true, 'user_admin' => true));
 
 $CLI->writeln('This script will turn all entries in the SQL address book into a globally shared address book.');
 $CLI->writeln('Make sure you read the script comments and be sure you know what you are doing.');

diff --git a/whups/lib/tests/TestBase.php b/whups/lib/tests/TestBase.php
index 0bf6028..d6e2945 100644 (file)
--- a/whups/lib/tests/TestBase.php
+++ b/whups/lib/tests/TestBase.php
@@ -13,7 +13,7 @@ class Whups_TestBase Extends PHPUnit_Framework_TestCase {
     function setUp()
     {
         require_once dirname(__FILE__) . '/../Application.php';
-        Horde_Registry::appInit('whups', array('authentication' => 'none', 'cli' => true));
+        Horde_Registry::appInit('whups', array('cli' => true));
     }
 
     /**

diff --git a/whups/scripts/bugzilla-import.php b/whups/scripts/bugzilla-import.php
index ff05b19..25800d8 100755 (executable)
--- a/whups/scripts/bugzilla-import.php
+++ b/whups/scripts/bugzilla-import.php
@@ -19,7 +19,7 @@ $BUGZILLA_PRIORITIES = array('P1', 'P2', 'P3', 'P4', 'P5');
 /* END CONFIGURATION */
 
 require_once dirname(__FILE__) . '/../lib/Application.php';
-Horde_Registry::appInit('whups', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('whups', array('cli' => true));
 
 function sectionHeader($text)
 {

diff --git a/whups/scripts/mail-filter.php b/whups/scripts/mail-filter.php
index 777442f..e3e1dc3 100755 (executable)
--- a/whups/scripts/mail-filter.php
+++ b/whups/scripts/mail-filter.php
@@ -57,7 +57,7 @@ function _dump($hash)
 }
 
 require_once dirname(__FILE__) . '/../lib/Application.php';
-Horde_Registry::appInit('whups', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('whups', array('cli' => true));
 
 // Set server name.
 $conf['server']['name'] = $conf['mail']['server_name'];

diff --git a/wicked/scripts/convert_to_utf8.php b/wicked/scripts/convert_to_utf8.php
index c4cc698..ac2e381 100755 (executable)
--- a/wicked/scripts/convert_to_utf8.php
+++ b/wicked/scripts/convert_to_utf8.php
@@ -13,7 +13,7 @@
  */
 
 require_once dirname(__FILE__) . '/../lib/Application.php';
-Horde_Registry::appInit('wicked', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('wicked', array('cli' => true));
 
 // Create driver instance.
 if ($conf['storage']['driver'] != 'sql') {

diff --git a/wicked/scripts/mail-filter.php b/wicked/scripts/mail-filter.php
index 40e20ab..783f63d 100755 (executable)
--- a/wicked/scripts/mail-filter.php
+++ b/wicked/scripts/mail-filter.php
@@ -27,7 +27,7 @@ function headerValue($headers, $name)
 }
 
 require_once dirname(__FILE__) . '/../lib/Application.php';
-Horde_Registry::appInit('wicked', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('wicked', array('cli' => true));
 
 $dateFormat = "F j, Y";
 $keepHeaders = array('From', 'To', 'Subject', 'Cc', 'Date');

diff --git a/wicked/scripts/wicked.php b/wicked/scripts/wicked.php
index de77677..e5c07a5 100755 (executable)
--- a/wicked/scripts/wicked.php
+++ b/wicked/scripts/wicked.php
@@ -10,7 +10,7 @@
 */
 
 require_once dirname(__FILE__) . '/../lib/Application.php';
-Horde_Registry::appInit('wicked', array('authentication' => 'none', 'cli' => true));
+Horde_Registry::appInit('wicked', array('cli' => true));
 
 $debug = false;
 $out = 'screen';