Horde_Registry_Application: Rename user option to user_admin

diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index 4fa450a..8a83adb 100644 (file)
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -114,8 +114,8 @@ class Horde_Registry
      *   'none' - Do not start a session
      *   'readonly' - Start session readonly
      *   [DEFAULT] - Start read/write session
-     * 'user' - (string) Set authentication to this user.
-     *          DEFAULT: null
+     * 'user_admin' - (boolean) Set authentication to an admin user?
+     *                DEFAULT: false
      * </pre>
      *
      * @return Horde_Registry_Application  The application object.
@@ -130,7 +130,7 @@ class Horde_Registry
             'nocompress' => false,
             'nologintasks' => false,
             'session_control' => null,
-            'user' => null
+            'user_admin' => null
         ), $args);
 
         // Registry.
@@ -190,8 +190,8 @@ class Horde_Registry
             Horde::compressOutput();
         }
 
-        if ($args['user']) {
-            Horde_Auth::setAuth($args['user'], array());
+        if ($args['user_admin'] && !empty($conf['auth']['admins'])) {
+            Horde_Auth::setAuth(reset($conf['auth']['admins']), array());
         }
 
         $appob->init();

diff --git a/kronolith/scripts/import_squirrelmail_calendar.php b/kronolith/scripts/import_squirrelmail_calendar.php
index e6310d4..d36a985 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' => $conf['auth']['admins'] ? $conf['auth']['admins'][0] : array()));
+Horde_Registry::appInit('kronolith', array('authentication' => 'none', 'cli' => true, 'user_admin' => true));
 
 // Read command line parameters.
 $cli = Horde_Cli::singleton();

diff --git a/turba/scripts/import_squirrelmail_file_abook.php b/turba/scripts/import_squirrelmail_file_abook.php
index 6b64e73..54c3eb0 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' => $conf['auth']['admins'] ? $conf['auth']['admins'][0] : null));
+Horde_Registry::appInit('turba', array('authentication' => 'none', 'cli' => true, 'user_admin' => true));
 
 require_once TURBA_BASE . '/lib/Object/Group.php';
 

diff --git a/turba/scripts/import_squirrelmail_sql_abook.php b/turba/scripts/import_squirrelmail_sql_abook.php
index f45ef16..19be83e 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' => $conf['auth']['admins'] ? $conf['auth']['admins'][0] : null));
+Horde_Registry::appInit('turba', array('authentication' => 'none', 'cli' => true, 'user_admin' => true));
 
 require_once TURBA_BASE . '/lib/Object/Group.php';
 

diff --git a/turba/scripts/import_vcards.php b/turba/scripts/import_vcards.php
index c1e062c..bb47c35 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, 'user' => $user));
+Horde_Registry::appInit('turba', array('authentication' => 'none', 'cli' => true));
 
 // Read command line parameters.
 $cli = Horde_Cli::singleton();
@@ -26,6 +26,8 @@ if (count($argv) != 3) {
 $source = $argv[1];
 $user = $argv[2];
 
+Horde_Auth::setAuth($user, array());
+
 // Read standard input.
 $vcard = $cli->readStdin();
 if (empty($vcard)) {

diff --git a/turba/scripts/upgrades/public_to_horde_share.php b/turba/scripts/upgrades/public_to_horde_share.php
index 1cf4000..1e35d2a 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' => $conf['auth']['admins'] ? $conf['auth']['admins'][0] : null));
+Horde_Registry::appInit('turba', array('authentication' => 'none', 'cli' => true, 'user_admin' => true));
 $CLI = Horde_Cli::singleton();
 
 $CLI->writeln('This script will turn all entries in the SQL address book into a globally shared address book.');