From: Michael M Slusarz <slusarz@curecanti.org>
Date: Thu, 9 Jul 2009 05:29:11 +0000 (-0600)
Subject: Registry:: -> Horde_Registry::
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=7cb5bd4d945a0cbecae06f44557918cf1e40d251;p=horde.git

Registry:: -> Horde_Registry::
---

diff --git a/babel/lib/base.php b/babel/lib/base.php
index da72d1f6e..ed5a7b27b 100644
--- a/babel/lib/base.php
+++ b/babel/lib/base.php
@@ -27,7 +27,7 @@ $notification = &Horde_Notification::singleton();
 $notification->attach('status');
 
 /* Registry. */
-$registry = &Registry::singleton();
+$registry = Horde_Registry::singleton();
 
 if (is_a(($pushed = $registry->pushApp('babel', !defined('AUTH_HANDLER'))), 'PEAR_Error')) {
     if ($pushed->getCode() == 'permission_denied') {
diff --git a/chora/lib/base.php b/chora/lib/base.php
index 458c51ae8..cd02a84a7 100644
--- a/chora/lib/base.php
+++ b/chora/lib/base.php
@@ -30,7 +30,7 @@ if (!defined('CHORA_BASE')) {
 require_once HORDE_BASE . '/lib/core.php';
 
 // Registry
-$registry = &Registry::singleton();
+$registry = Horde_Registry::singleton();
 if (is_a(($pushed = $registry->pushApp('chora', !defined('AUTH_HANDLER'))), 'PEAR_Error')) {
     if ($pushed->getCode() == 'permission_denied') {
         Horde::authenticationFailureRedirect();
diff --git a/crumb/lib/base.php b/crumb/lib/base.php
index 33fb283aa..c562d9e73 100644
--- a/crumb/lib/base.php
+++ b/crumb/lib/base.php
@@ -23,7 +23,7 @@ if (!defined('HORDE_BASE')) {
 require_once HORDE_BASE . '/lib/core.php';
 
 // Registry.
-$registry = &Registry::singleton();
+$registry = Horde_Registry::singleton();
 if (is_a(($pushed = $registry->pushApp('crumb', !defined('AUTH_HANDLER'))), 'PEAR_Error')) {
     if ($pushed->getCode() == 'permission_denied') {
         Horde::authenticationFailureRedirect();
diff --git a/fima/lib/base.php b/fima/lib/base.php
index 1c4906a44..571e4f3c9 100644
--- a/fima/lib/base.php
+++ b/fima/lib/base.php
@@ -20,11 +20,11 @@ require_once HORDE_BASE . '/lib/core.php';
 // Registry.
 $session_control = Horde_Util::nonInputVar('session_control');
 if ($session_control == 'none') {
-    $registry = &Registry::singleton(HORDE_SESSION_NONE);
+    $registry = Horde_Registry::singleton(HORDE_SESSION_NONE);
 } elseif ($session_control == 'readonly') {
-    $registry = &Registry::singleton(HORDE_SESSION_READONLY);
+    $registry = Horde_Registry::singleton(HORDE_SESSION_READONLY);
 } else {
-    $registry = &Registry::singleton();
+    $registry = Horde_Registry::singleton();
 }
 
 if (is_a(($pushed = $registry->pushApp('fima', !defined('AUTH_HANDLER'))), 'PEAR_Error')) {
diff --git a/folks/lib/base.php b/folks/lib/base.php
index 5267aacf1..847ba3866 100644
--- a/folks/lib/base.php
+++ b/folks/lib/base.php
@@ -18,7 +18,7 @@ if (!defined('HORDE_BASE')) {
 require_once HORDE_BASE . '/lib/core.php';
 
 // Registry.
-$registry = &Registry::singleton();
+$registry = Horde_Registry::singleton();
 if (($pushed = $registry->pushApp('folks', !defined('AUTH_HANDLER'))) instanceof PEAR_Error) {
     if ($pushed->getCode() == 'permission_denied') {
         Horde::authenticationFailureRedirect();
diff --git a/framework/Model/www/test.php b/framework/Model/www/test.php
index 4d4c9dde0..73850430e 100644
--- a/framework/Model/www/test.php
+++ b/framework/Model/www/test.php
@@ -14,7 +14,7 @@
 require_once HORDE_BASE . '/lib/core.php';
 require_once 'Horde/Autoloader.php';
 Horde_Autoloader::addClassPath(dirname(__FILE__));
-$registry = Registry::singleton();
+$registry = Horde_Registry::singleton();
 $vars = Horde_Variables::getDefaultVariables();
 
 $vars->set('example_bar', 'text with a beginning and an end');
diff --git a/imp/lib/base.php b/imp/lib/base.php
index 5aac18c8c..cbc3b5f85 100644
--- a/imp/lib/base.php
+++ b/imp/lib/base.php
@@ -47,14 +47,14 @@ case 'netscape':
     break;
 
 case 'none':
-    $s_ctrl = Registry::SESSION_NONE;
+    $s_ctrl = Horde_Registry::SESSION_NONE;
     break;
 
 case 'readonly':
-    $s_ctrl = Registry::SESSION_READONLY;
+    $s_ctrl = Horde_Registry::SESSION_READONLY;
     break;
 }
-$registry = Registry::singleton($s_ctrl);
+$registry = Horde_Registry::singleton($s_ctrl);
 
 // We explicitly do not check application permissions for the compose
 // and login pages, since those are handled below and need to fall through
diff --git a/ingo/lib/base.php b/ingo/lib/base.php
index 5e71221c6..aa09dbb24 100644
--- a/ingo/lib/base.php
+++ b/ingo/lib/base.php
@@ -19,7 +19,7 @@ require_once dirname(__FILE__) . '/base.load.php';
 require_once HORDE_BASE . '/lib/core.php';
 
 // Registry.
-$registry = &Registry::singleton();
+$registry = Horde_Registry::singleton();
 if (is_a(($pushed = $registry->pushApp('ingo', !defined('AUTH_HANDLER'))), 'PEAR_Error')) {
     if ($pushed->getCode() == 'permission_denied') {
         Horde::authenticationFailureRedirect();
diff --git a/jeta/lib/base.php b/jeta/lib/base.php
index 61976533a..c3f6d1719 100644
--- a/jeta/lib/base.php
+++ b/jeta/lib/base.php
@@ -26,7 +26,7 @@ if (!defined('JETA_BASE')) {
 require_once HORDE_BASE . '/lib/core.php';
 
 // Registry.
-$registry = &Registry::singleton();
+$registry = Horde_Registry::singleton();
 if (is_a(($pushed = $registry->pushApp('jeta', !defined('AUTH_HANDLER'))), 'PEAR_Error')) {
     if ($pushed->getCode() == 'permission_denied') {
         Horde::authenticationFailureRedirect();
diff --git a/kastalia/download.php b/kastalia/download.php
index 1a4fa3ef1..e7a9cb7fe 100755
--- a/kastalia/download.php
+++ b/kastalia/download.php
@@ -30,7 +30,7 @@ if (!defined('HORDE_BASE')) {
 require_once HORDE_BASE . '/lib/core.php';
 
 // Registry.
-$registry = &Registry::singleton();
+$registry = Horde_Registry::singleton();
 if (is_a(($pushed = $registry->pushApp('kastalia', !defined('AUTH_HANDLER'))), 'PEAR_Error')) {
     if ($pushed->getCode() == 'permission_denied') {
         Horde::authenticationFailureRedirect();
@@ -157,4 +157,4 @@ function DownloadFile($file_location,$file_name) {
         exit(1);
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/kastalia/lib/base.php b/kastalia/lib/base.php
index 7eeb5008e..46345ec3f 100755
--- a/kastalia/lib/base.php
+++ b/kastalia/lib/base.php
@@ -20,7 +20,7 @@ if (!defined('HORDE_BASE')) {
 require_once HORDE_BASE . '/lib/core.php';
 
 // Registry.
-$registry = &Registry::singleton();
+$registry = Horde_Registry::singleton();
 if (is_a(($pushed = $registry->pushApp('kastalia', !defined('AUTH_HANDLER'))), 'PEAR_Error')) {
     if ($pushed->getCode() == 'permission_denied') {
         Horde::authenticationFailureRedirect();
diff --git a/koward/lib/Koward.php b/koward/lib/Koward.php
index d01f712fc..dfe6abefc 100644
--- a/koward/lib/Koward.php
+++ b/koward/lib/Koward.php
@@ -54,13 +54,11 @@ class Koward {
 
         /* Horde core classes that aren't autoloaded. */
         include_once 'Horde/NLS.php';
-        include_once 'Horde/Auth.php';
         include_once 'Horde/Perms.php';
-        include_once 'Horde/Registry.php';
 
-        $registry = Registry::singleton();
+        $registry = Horde_Registry::singleton();
 
-        $notification = &Horde_Notification::singleton();
+        $notification = Horde_Notification::singleton();
         $notification->attach('status');
 
         /* Browser detection object. */
diff --git a/kronolith/lib/Imple/Embed.php b/kronolith/lib/Imple/Embed.php
index e2b9daf7b..d284a6bb0 100644
--- a/kronolith/lib/Imple/Embed.php
+++ b/kronolith/lib/Imple/Embed.php
@@ -62,7 +62,7 @@ class Kronolith_Imple_Embed extends Kronolith_Imple {
         }
 
         /* Load the registry with no session control */
-        $registry = &Registry::singleton(Registry::SESSION_NONE);
+        $registry = Horde_Registry::singleton(Horde_Registry::SESSION_NONE);
 
 
         /* Build the block parameters */
diff --git a/kronolith/lib/base.php b/kronolith/lib/base.php
index 5b3f6dc74..54530bcc9 100644
--- a/kronolith/lib/base.php
+++ b/kronolith/lib/base.php
@@ -21,11 +21,11 @@ require_once HORDE_BASE . '/lib/core.php';
 /* Registry. */
 $session_control = Horde_Util::nonInputVar('session_control');
 if ($session_control == 'none') {
-    $registry = &Registry::singleton(Registry::SESSION_NONE);
+    $registry = Horde_Registry::singleton(Horde_Registry::SESSION_NONE);
 } elseif ($session_control == 'readonly') {
-    $registry = &Registry::singleton(Registry::SESSION_READONLY);
+    $registry = Horde_Registry::singleton(Horde_Registry::SESSION_READONLY);
 } else {
-    $registry = &Registry::singleton();
+    $registry = Horde_Registry::singleton();
 }
 
 if (is_a(($pushed = $registry->pushApp('kronolith', !defined('AUTH_HANDLER'))), 'PEAR_Error')) {
diff --git a/kronolith/pref_api.php b/kronolith/pref_api.php
index 410fd1735..663985092 100644
--- a/kronolith/pref_api.php
+++ b/kronolith/pref_api.php
@@ -11,7 +11,7 @@
 require_once dirname(__FILE__) . '/lib/base.load.php';
 require_once HORDE_BASE . '/lib/core.php';
 
-$registry = &Registry::singleton();
+$registry = Horde_Registry::singleton();
 
 /* Which application. */
 $app = Horde_Util::getFormData('app');
diff --git a/kronolith/scripts/import_icals.php b/kronolith/scripts/import_icals.php
index c2d8c4ef1..90be8f9f7 100755
--- a/kronolith/scripts/import_icals.php
+++ b/kronolith/scripts/import_icals.php
@@ -20,7 +20,6 @@
 
 // Do CLI checks and environment setup first.
 require_once HORDE_BASE . '/lib/core.php';
-require_once 'Horde/Cli.php';
 
 // Make sure no one runs this from the web.
 if (!Horde_Cli::runningFromCLI()) {
@@ -29,7 +28,7 @@ if (!Horde_Cli::runningFromCLI()) {
 
 // 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.
@@ -48,7 +47,7 @@ if (empty($ical)) {
 }
 
 // Registry.
-$registry = Registry::singleton();
+$registry = Horde_Registry::singleton();
 
 // Set user.
 Horde_Auth::setAuth($user, array());
diff --git a/news/lib/base.php b/news/lib/base.php
index a22f0e4a2..4414d0632 100644
--- a/news/lib/base.php
+++ b/news/lib/base.php
@@ -23,7 +23,7 @@ if (!defined('HORDE_BASE')) {
 require_once HORDE_BASE . '/lib/core.php';
 
 // Registry.
-$registry = &Registry::singleton();
+$registry = Horde_Registry::singleton();
 if (($pushed = $registry->pushApp('news', !defined('AUTH_HANDLER'))) instanceof PEAR_Error) {
     if ($pushed->getCode() == 'permission_denied') {
         Horde::authenticationFailureRedirect();
diff --git a/skoli/lib/base.php b/skoli/lib/base.php
index 6f31e129e..196676bbf 100644
--- a/skoli/lib/base.php
+++ b/skoli/lib/base.php
@@ -18,7 +18,7 @@ if (!defined('HORDE_BASE')) {
 require_once HORDE_BASE . '/lib/core.php';
 
 // Registry.
-$registry = &Registry::singleton();
+$registry = Horde_Registry::singleton();
 if (is_a(($pushed = $registry->pushApp('skoli', !defined('AUTH_HANDLER'))), 'PEAR_Error')) {
     if ($pushed->getCode() == 'permission_denied') {
         Horde::authenticationFailureRedirect();
diff --git a/skoli/pref_api.php b/skoli/pref_api.php
index 941e9de9c..182b827db 100644
--- a/skoli/pref_api.php
+++ b/skoli/pref_api.php
@@ -13,7 +13,7 @@
 @define('HORDE_BASE', dirname(dirname(__FILE__)));
 require_once HORDE_BASE . '/lib/core.php';
 
-$registry = &Registry::singleton();
+$registry = Horde_Registry::singleton();
 
 /* Which application. */
 $app = Horde_Util::getFormData('app');
diff --git a/timeobjects/lib/base.php b/timeobjects/lib/base.php
index 0fc4c1749..cfc736125 100644
--- a/timeobjects/lib/base.php
+++ b/timeobjects/lib/base.php
@@ -23,11 +23,11 @@ require_once HORDE_BASE . '/lib/core.php';
 /* Registry. */
 $session_control = Horde_Util::nonInputVar('session_control');
 if ($session_control == 'none') {
-    $registry = &Registry::singleton(Registry::SESSION_NONE);
+    $registry = Horde_Registry::singleton(Horde_Registry::SESSION_NONE);
 } elseif ($session_control == 'readonly') {
-    $registry = &Registry::singleton(Registry::SESSION_READONLY);
+    $registry = Horde_Registry::singleton(Horde_Registry::SESSION_READONLY);
 } else {
-    $registry = &Registry::singleton();
+    $registry = Horde_Registry::singleton();
 }
 
 if (is_a(($pushed = $registry->pushApp('timeobjects', !defined('AUTH_HANDLER'))), 'PEAR_Error')) {