Horde_CLI:: -> Horde_Cli::

diff --git a/folks/scripts/activity.php b/folks/scripts/activity.php
index 4c6a632..160f644 100644 (file)
--- a/folks/scripts/activity.php
+++ b/folks/scripts/activity.php
@@ -18,17 +18,14 @@ exit;
 define('AUTH_HANDLER', true);
 require_once dirname(__FILE__) . '/../lib/base.php';
 
-// Do CLI checks and environment setup first.
-require_once 'Horde/CLI.php';
-
 // Make sure no one runs this from the web.
-if (!Horde_CLI::runningFromCLI()) {
+if (!Horde_Cli::runningFromCLI()) {
     exit("Must be run from the command line\n");
 }
 
 // Load the CLI environment.
-Horde_CLI::init();
-$cli = &Horde_CLI::singleton();
+Horde_Cli::init();
+$cli = &Horde_Cli::singleton();
 
 $db = DB::connect($conf['sql']);
 if ($db instanceof PEAR_Error) {
@@ -140,4 +137,4 @@ while (list($u,$v) = each($users)) {
     }
 
     $cli->message($u . ' ' . $p, 'cli.success');
-}
\ No newline at end of file
+}

diff --git a/folks/scripts/mail-filter.php b/folks/scripts/mail-filter.php
index 10de438..bf0b4c5 100644 (file)
--- a/folks/scripts/mail-filter.php
+++ b/folks/scripts/mail-filter.php
@@ -42,17 +42,17 @@ define('HORDE_BASE', dirname(__FILE__) . '/../..');
 
 // Do CLI checks and environment setup first.
 require_once HORDE_BASE . '/lib/core.php';
-require_once 'Horde/CLI.php';
+require_once 'Horde/Cli.php';
 
 // Make sure no one runs this from the web.
-if (!Horde_CLI::runningFromCLI()) {
+if (!Horde_Cli::runningFromCLI()) {
     exit("Must be run from the command line\n");
 }
 
 // Load the CLI environment - make sure there's no time limit, init some
 // variables, etc.
-Horde_CLI::init();
-$cli = &Horde_CLI::singleton();
+Horde_Cli::init();
+$cli = &Horde_Cli::singleton();
 
 require_once dirname(__FILE__) . '/../lib/base.php';
 require_once 'Console/Getopt.php';

diff --git a/folks/scripts/mail.php b/folks/scripts/mail.php
index 2aed62b..3d59137 100644 (file)
--- a/folks/scripts/mail.php
+++ b/folks/scripts/mail.php
@@ -18,16 +18,16 @@ define('AUTH_HANDLER', true);
 define('FOLKS_BASE', dirname(__FILE__) . '/..');
 
 // Do CLI checks and environment setup first.
-require_once 'Horde/CLI.php';
+require_once 'Horde/Cli.php';
 
 // Make sure no one runs this from the web.
-if (!Horde_CLI::runningFromCLI()) {
+if (!Horde_Cli::runningFromCLI()) {
     exit("Must be run from the command line\n");
 }
 
 // Load the CLI environment.
-Horde_CLI::init();
-$cli = &Horde_CLI::singleton();
+Horde_Cli::init();
+$cli = &Horde_Cli::singleton();
 
 // Load Folks.
 require_once FOLKS_BASE . '/lib/base.php';

diff --git a/folks/scripts/popularity.php b/folks/scripts/popularity.php
index c452a4a..f16b855 100644 (file)
--- a/folks/scripts/popularity.php
+++ b/folks/scripts/popularity.php
@@ -18,17 +18,14 @@ exit;
 define('AUTH_HANDLER', true);
 require_once dirname(__FILE__) . '/../lib/base.php';
 
-// Do CLI checks and environment setup first.
-require_once 'Horde/CLI.php';
-
 // Make sure no one runs this from the web.
-if (!Horde_CLI::runningFromCLI()) {
+if (!Horde_Cli::runningFromCLI()) {
     exit("Must be run from the command line\n");
 }
 
 // Load the CLI environment.
-Horde_CLI::init();
-$cli = &Horde_CLI::singleton();
+Horde_Cli::init();
+$cli = &Horde_Cli::singleton();
 
 $db = DB::connect($conf['sql']);
 if ($db instanceof PEAR_Error) {
@@ -123,4 +120,4 @@ while ( list($u,$v) = each($users) ) {
     }
 
     $cli->message($u . ' ' . $p, 'cli.success');
-}
\ No newline at end of file
+}

diff --git a/imp/scripts/bounce_spam.php b/imp/scripts/bounce_spam.php
index f3c7c6b..189cb19 100755 (executable)
--- a/imp/scripts/bounce_spam.php
+++ b/imp/scripts/bounce_spam.php
@@ -17,10 +17,10 @@
  */
 
 define('IMP_CONFIG', dirname(__FILE__) . '/../config');
-require_once 'Horde/CLI.php';
+require_once 'Horde/Cli.php';
 
 /* Make sure no one runs this from the web. */
-if (!Horde_CLI::runningFromCLI()) {
+if (!Horde_Cli::runningFromCLI()) {
     fwrite(STDERR, "Must be run from the command line\n");
     exit(1);
 }
@@ -32,10 +32,10 @@ if (!file_exists(IMP_CONFIG . '/bounce.txt')) {
 
 /* Load the CLI environment - make sure there's no time limit, init some
  * variables, etc. */
-Horde_CLI::init();
+Horde_Cli::init();
 
 /* Read the message content. */
-$data = Horde_CLI::readStdin();
+$data = Horde_Cli::readStdin();
 
 /* Who's the spammer? */
 preg_match('/return-path: <(.*?)>\r?\n/i', $data, $matches);

diff --git a/ingo/scripts/ingo-postfix-policyd b/ingo/scripts/ingo-postfix-policyd
index 278fe02..1969347 100755 (executable)
--- a/ingo/scripts/ingo-postfix-policyd
+++ b/ingo/scripts/ingo-postfix-policyd
@@ -67,13 +67,13 @@
 require_once HORDE_BASE . '/lib/core.php';
 
 // Make sure no one runs this from the web.
-if (!Horde_CLI::runningFromCLI()) {
+if (!Horde_Cli::runningFromCLI()) {
     exit(1);
 }
 
 // Load the CLI environment - make sure there's no time limit, init some
 // variables, etc.
-Horde_CLI::init();
+Horde_Cli::init();
 
 // Include needed libraries.
 require_once dirname(dirname(__FILE__)) . '/lib/base.php';

diff --git a/ingo/scripts/upgrades/convert_datatree_shares_to_sql.php b/ingo/scripts/upgrades/convert_datatree_shares_to_sql.php
index 820ae1e..73ad514 100755 (executable)
--- a/ingo/scripts/upgrades/convert_datatree_shares_to_sql.php
+++ b/ingo/scripts/upgrades/convert_datatree_shares_to_sql.php
@@ -11,10 +11,10 @@
 
 /* Set up the CLI environment */
 require_once HORDE_BASE . '/lib/core.php';
-if (!Horde_CLI::runningFromCli()) {
+if (!Horde_Cli::runningFromCli()) {
     exit("Must be run from the command line\n");
 }
-$cli = &Horde_CLI::singleton();
+$cli = &Horde_Cli::singleton();
 $cli->init();
 
 /* Grab what we need to steal the DB config */

diff --git a/ingo/scripts/upgrades/convert_prefs_to_sql.php b/ingo/scripts/upgrades/convert_prefs_to_sql.php
index a7fd44e..0569249 100755 (executable)
--- a/ingo/scripts/upgrades/convert_prefs_to_sql.php
+++ b/ingo/scripts/upgrades/convert_prefs_to_sql.php
@@ -25,14 +25,14 @@
 require_once HORDE_BASE . '/lib/core.php';
 
 /* Make sure no one runs this from the web. */
-if (!Horde_CLI::runningFromCLI()) {
+if (!Horde_Cli::runningFromCLI()) {
     exit("Must be run from the command line\n");
 }
 
 /* Load the CLI environment - make sure there's no time limit, init some
  * variables, etc. */
-Horde_CLI::init();
-$cli = &Horde_CLI::singleton();
+Horde_Cli::init();
+$cli = &Horde_Cli::singleton();
 
 /* Initialize the needed libraries. */
 require_once dirname(dirname(dirname(__FILE__))) . '/lib/base.php';

diff --git a/koward/lib/Koward.php b/koward/lib/Koward.php
index 9426158..7c325ea 100644 (file)
--- a/koward/lib/Koward.php
+++ b/koward/lib/Koward.php
@@ -202,7 +202,7 @@ class Koward {
                 if (!empty($session->user_uid)) {
                     $user = $this->getObject($session->user_uid);
                     if (get_class($user) == $this->conf['koward']['cli_admin']
-                        && Horde_CLI::runningFromCLI()) {
+                        && Horde_Cli::runningFromCLI()) {
                         return true;
                     }
                     $type = $this->getType($user);

diff --git a/koward/script/Koward/koward.php b/koward/script/Koward/koward.php
index e73ed96..8df9d86 100644 (file)
--- a/koward/script/Koward/koward.php
+++ b/koward/script/Koward/koward.php
@@ -34,7 +34,7 @@ if (!$opts->base) {
  * Ensure that the base parameters (especially SERVER_NAME) get set for the
  * command line.
  */
-$cli = Horde_CLI::singleton();
+$cli = Horde_Cli::singleton();
 $cli->init();
 
 /**

diff --git a/kronolith/lib/tests/toicalendar.phpt b/kronolith/lib/tests/toicalendar.phpt
index 2c26f7f..a5a5b6a 100644 (file)
--- a/kronolith/lib/tests/toicalendar.phpt
+++ b/kronolith/lib/tests/toicalendar.phpt
@@ -3,8 +3,8 @@ Kronolith_Event::toiCalendar() test.
 --FILE--
 <?php
 
-require 'Horde/CLI.php';
-Horde_CLI::init();
+require 'Horde/Cli.php';
+Horde_Cli::init();
 define('AUTH_HANDLER', true);
 require dirname(__FILE__) . '/../base.php';
 require 'Horde/iCalendar.php';

diff --git a/kronolith/scripts/agenda.php b/kronolith/scripts/agenda.php
index 9909403..052a099 100755 (executable)
--- a/kronolith/scripts/agenda.php
+++ b/kronolith/scripts/agenda.php
@@ -13,18 +13,16 @@
 
 define('AUTH_HANDLER', true);
 require_once dirname(__FILE__) . '/../lib/base.php';
-require_once HORDE_BASE . '/lib/core.php';
-require_once 'Horde/CLI.php';
 require_once 'Horde/Identity.php';
 
 // Make sure no one runs this from the web.
-if (!Horde_CLI::runningFromCLI()) {
+if (!Horde_Cli::runningFromCLI()) {
     exit("Must be run from the command line\n");
 }
 
 // Load the CLI environment - make sure there's no time limit, init
 // some variables, etc.
-Horde_CLI::init();
+Horde_Cli::init();
 
 send_agendas();
 exit(0);

diff --git a/kronolith/scripts/import_icals.php b/kronolith/scripts/import_icals.php
index d99bb4c..3c26b51 100755 (executable)
--- a/kronolith/scripts/import_icals.php
+++ b/kronolith/scripts/import_icals.php
@@ -20,16 +20,16 @@
 
 // Do CLI checks and environment setup first.
 require_once HORDE_BASE . '/lib/core.php';
-require_once 'Horde/CLI.php';
+require_once 'Horde/Cli.php';
 
 // Make sure no one runs this from the web.
-if (!Horde_CLI::runningFromCLI()) {
+if (!Horde_Cli::runningFromCLI()) {
     exit("Must be run from the command line\n");
 }
 
 // Load the CLI environment - make sure there's no time limit, init some
 // variables, etc.
-$cli = &Horde_CLI::singleton();
+$cli = &Horde_Cli::singleton();
 $cli->init();
 
 // Read command line parameters.

diff --git a/kronolith/scripts/import_squirrelmail_calendar.php b/kronolith/scripts/import_squirrelmail_calendar.php
index 374bb00..e3996aa 100755 (executable)
--- a/kronolith/scripts/import_squirrelmail_calendar.php
+++ b/kronolith/scripts/import_squirrelmail_calendar.php
@@ -22,16 +22,16 @@
 
 // Do CLI checks and environment setup first.
 require_once HORDE_BASE . '/lib/core.php';
-require_once 'Horde/CLI.php';
+require_once 'Horde/Cli.php';
 
 // Makre sure no one runs this from the web.
-if (!Horde_CLI::runningFromCli()) {
+if (!Horde_Cli::runningFromCli()) {
     exit("Must be run from the command line\n");
 }
 
 // Load the CLI environment - make sure there's no time limit, init some
 // variables, etc.
-$cli = &Horde_CLI::singleton();
+$cli = &Horde_Cli::singleton();
 $cli->init();
 
 // Read command line parameters.

diff --git a/kronolith/scripts/upgrades/convert_datatree_shares_to_sql.php b/kronolith/scripts/upgrades/convert_datatree_shares_to_sql.php
index ee552d0..7db3b0d 100755 (executable)
--- a/kronolith/scripts/upgrades/convert_datatree_shares_to_sql.php
+++ b/kronolith/scripts/upgrades/convert_datatree_shares_to_sql.php
@@ -4,8 +4,6 @@
  * This script migrates Kronolith's share data from the datatree Horde_Share
  * driver to the new SQL Horde_Share driver. You should run the appropriate
  * 2.1_to_2.2.sql upgrade script for your RDBMS before executing this script.
- *
- * $Horde: kronolith/scripts/upgrades/convert_datatree_shares_to_sql.php,v 1.7 2008/10/23 15:45:05 jan Exp $
  */
 
 @define('AUTH_HANDLER', true);
@@ -13,11 +11,11 @@
 
 /* Set up the CLI environment */
 require_once HORDE_BASE . '/lib/core.php';
-require_once 'Horde/CLI.php';
-if (!Horde_CLI::runningFromCli()) {
+require_once 'Horde/Cli.php';
+if (!Horde_Cli::runningFromCli()) {
     exit("Must be run from the command line\n");
 }
-$cli = &Horde_CLI::singleton();
+$cli = &Horde_Cli::singleton();
 $cli->init();
 
 /* Grab what we need to steal the DB config */

diff --git a/kronolith/scripts/upgrades/convert_to_utc.php b/kronolith/scripts/upgrades/convert_to_utc.php
index 9fa8de2..980be7d 100755 (executable)
--- a/kronolith/scripts/upgrades/convert_to_utc.php
+++ b/kronolith/scripts/upgrades/convert_to_utc.php
@@ -2,8 +2,6 @@
 <?php
 /**
  * This script converts all dates from the user's timezone to UTC.
- *
- * $Horde: kronolith/scripts/upgrades/convert_to_utc.php,v 1.2 2008/10/23 10:18:10 jan Exp $
  */
 
 @define('AUTH_HANDLER', true);
@@ -11,11 +9,11 @@
 
 /* Set up the CLI environment. */
 require_once HORDE_BASE . '/lib/core.php';
-require_once 'Horde/CLI.php';
-if (!Horde_CLI::runningFromCLI()) {
+require_once 'Horde/Cli.php';
+if (!Horde_Cli::runningFromCLI()) {
     exit("Must be run from the command line\n");
 }
-$cli = &Horde_CLI::singleton();
+$cli = &Horde_Cli::singleton();
 $cli->init();
 
 /* Load required libraries. */