From: Ben Klang <ben@alkaloid.net>
Date: Sun, 3 Oct 2010 15:08:08 +0000 (-0400)
Subject: Get a factory directly from the injector
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=c0710b14c70f4c66bc728bbb84613d2400758b90;p=horde.git

Get a factory directly from the injector
---

diff --git a/ansel/lib/Ansel.php b/ansel/lib/Ansel.php
index fd678e9ac..4f9a2e3b4 100644
--- a/ansel/lib/Ansel.php
+++ b/ansel/lib/Ansel.php
@@ -580,7 +580,7 @@ class Ansel
             } elseif ($owner == $GLOBALS['registry']->getAuth()) {
                 $owner_title = _("My Galleries");
             } elseif (!empty($GLOBALS['conf']['gallery']['customlabel'])) {
-                $uprefs = $GLOBALS['injector']->getInstance('Horde_Prefs')->getPrefs('ansel', array(
+                $uprefs = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Prefs')->getPrefs('ansel', array(
                     'cache' => false,
                     'user' => $owner
                 ));
diff --git a/ansel/lib/View/List.php b/ansel/lib/View/List.php
index 389dd4a26..cdae4f757 100644
--- a/ansel/lib/View/List.php
+++ b/ansel/lib/View/List.php
@@ -149,7 +149,7 @@ class Ansel_View_List extends Ansel_View_Base
             if ($this->_owner == $GLOBALS['registry']->getAuth() && empty($this->_params['api'])) {
                 return  _("My Galleries");
             } elseif (!empty($GLOBALS['conf']['gallery']['customlabel'])) {
-                $uprefs = $GLOBALS['injector']->getInstance('Horde_Prefs')->getPrefs('ansel', array(
+                $uprefs = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Prefs')->getPrefs('ansel', array(
                     'cache' => false,
                     'owner' => $this->_owner
                 ));
diff --git a/ansel/templates/group/owner.inc b/ansel/templates/group/owner.inc
index 6dc8b885a..b0b833b36 100644
--- a/ansel/templates/group/owner.inc
+++ b/ansel/templates/group/owner.inc
@@ -3,7 +3,7 @@ if ($group == $GLOBALS['registry']->getAuth()) {
     $owner_title = _("My Galleries");
     $custom = '';
 } elseif (!empty($GLOBALS['conf']['gallery']['customlabel'])) {
-    $uprefs = $injector->getInstance('Horde_Prefs')->getPrefs('ansel', array(
+    $uprefs = $injector->getInstance('Horde_Core_Factory_Prefs')->getPrefs('ansel', array(
         'cache' => false,
         'user' => $group
     ));
diff --git a/folks/lib/Friends.php b/folks/lib/Friends.php
index a0eb899df..6e46b1887 100644
--- a/folks/lib/Friends.php
+++ b/folks/lib/Friends.php
@@ -143,7 +143,7 @@ class Folks_Friends {
             return (boolean)$GLOBALS['prefs']->getValue('friends_approval');
         }
 
-        $prefs = $GLOBALS['injector']->getInstance('Horde_Prefs')->getPrefs('folks', array(
+        $prefs = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Prefs')->getPrefs('folks', array(
             'cache' => false,
             'user' => $GLOBALS['registry']->convertUsername($user, true)
         ));
diff --git a/framework/Core/lib/Horde/Core/Binder/Prefs.php b/framework/Core/lib/Horde/Core/Binder/Prefs.php
deleted file mode 100644
index 4c025401e..000000000
--- a/framework/Core/lib/Horde/Core/Binder/Prefs.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * @category Horde
- * @package  Core
- */
-class Horde_Core_Binder_Prefs implements Horde_Injector_Binder
-{
-    public function create(Horde_Injector $injector)
-    {
-        return new Horde_Core_Factory_Prefs($injector);
-    }
-
-    public function equals(Horde_Injector_Binder $binder)
-    {
-        return false;
-    }
-}
diff --git a/framework/Core/lib/Horde/Core/Factory/Identity.php b/framework/Core/lib/Horde/Core/Factory/Identity.php
index fd4311e57..ac239e313 100644
--- a/framework/Core/lib/Horde/Core/Factory/Identity.php
+++ b/framework/Core/lib/Horde/Core/Factory/Identity.php
@@ -82,7 +82,7 @@ class Horde_Core_Factory_Identity
             if (isset($prefs) && ($params['user'] == $registry->getAuth())) {
                 $params['prefs'] = $prefs;
             } else {
-                $params['prefs'] = $injector->getInstance('Horde_Prefs')->getPrefs($registry->getApp(), array(
+                $params['prefs'] = $injector->getInstance('Horde_Core_Factory_Prefs')->getPrefs($registry->getApp(), array(
                     'cache' => false,
                     'user' => $user
                 ));
diff --git a/framework/Core/lib/Horde/Core/Sidebar.php b/framework/Core/lib/Horde/Core/Sidebar.php
index 97cf7e4dd..0457b2b95 100644
--- a/framework/Core/lib/Horde/Core/Sidebar.php
+++ b/framework/Core/lib/Horde/Core/Sidebar.php
@@ -73,7 +73,7 @@ class Horde_Core_Sidebar
         }
 
         if (Horde_Menu::showService('prefs') &&
-            !($injector->getInstance('Horde_Prefs')->getPrefs() instanceof Horde_Prefs_Session)) {
+            !($injector->getInstance('Horde_Core_Factory_Prefs')->getPrefs() instanceof Horde_Prefs_Session)) {
             $menu['prefs'] = array(
                 'icon' => Horde_Themes::img('prefs.png'),
                 'name' => _("Preferences"),
diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index 7542c8f08..0d8028191 100644
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -282,7 +282,6 @@ class Horde_Registry
             'Horde_Memcache' => 'Horde_Core_Binder_Memcache',
             'Horde_Mime_Viewer' => 'Horde_Core_Binder_MimeViewer',
             'Horde_Notification' => 'Horde_Core_Binder_Notification',
-            'Horde_Prefs' => 'Horde_Core_Binder_Prefs',
             'Horde_Prefs_Identity' => 'Horde_Core_Binder_Identity',
             // 'Horde_Registry' - initialized below
             'Horde_Secret' => 'Horde_Core_Binder_Secret',
@@ -1404,7 +1403,7 @@ class Horde_Registry
             );
         }
 
-        $prefs = $injector->getInstance('Horde_Prefs')->getPrefs($app, $opts);
+        $prefs = $injector->getInstance('Horde_Core_Factory_Prefs')->getPrefs($app, $opts);
     }
 
     /**
@@ -1729,7 +1728,7 @@ class Horde_Registry
         unset($_SESSION['horde_auth']);
 
         /* Remove the user's cached preferences if they are present. */
-        $GLOBALS['injector']->getInstance('Horde_Prefs')->clearCache();
+        $GLOBALS['injector']->getInstance('Horde_Core_Factory_Prefs')->clearCache();
 
         if ($destroy) {
             session_destroy();
@@ -2118,7 +2117,7 @@ class Horde_Registry
 
         /* Reload preferences for the new user. */
         unset($GLOBALS['prefs']);
-        $GLOBALS['injector']->getInstance('Horde_Prefs')->clearCache();
+        $GLOBALS['injector']->getInstance('Horde_Core_Factory_Prefs')->clearCache();
         $this->loadPrefs();
 
         $this->setLanguageEnvironment($GLOBALS['prefs']->getValue('language'), $app);
diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index 13e8928fb..6aa2a80bf 100644
--- a/framework/Core/package.xml
+++ b/framework/Core/package.xml
@@ -24,7 +24,7 @@ Application Framework.</description>
   <active>yes</active>
  </developer>
  <date>2010-10-02</date>
- <time>22:28:34</time>
+ <time>22:52:58</time>
  <version>
   <release>0.1.0</release>
   <api>0.1.0</api>
@@ -110,6 +110,7 @@ Application Framework.</description>
        </dir> <!-- /lib/Horde/Core/Autoloader/Callback -->
       </dir> <!-- /lib/Horde/Core/Autoloader -->
       <dir name="Binder">
+       <file name="Alarm.php" role="php" />
        <file name="Auth.php" role="php" />
        <file name="AuthFactory.php" role="php" />
        <file name="AuthSignup.php" role="php" />
@@ -131,7 +132,6 @@ Application Framework.</description>
        <file name="Memcache.php" role="php" />
        <file name="MimeViewer.php" role="php" />
        <file name="Notification.php" role="php" />
-       <file name="Prefs.php" role="php" />
        <file name="Secret.php" role="php" />
        <file name="SessionHandler.php" role="php" />
        <file name="ShareFactory.php" role="php" />
@@ -431,6 +431,7 @@ Application Framework.</description>
    <install as="Horde/Core/Auth/Signup/SqlObject.php" name="lib/Horde/Core/Auth/Signup/SqlObject.php" />
    <install as="Horde/Core/Autoloader/Callback/Mime.php" name="lib/Horde/Core/Autoloader/Callback/Mime.php" />
    <install as="Horde/Core/Autoloader/Callback/Nls.php" name="lib/Horde/Core/Autoloader/Callback/Nls.php" />
+   <install as="Horde/Core/Binder/Alarm.php" name="lib/Horde/Core/Binder/Alarm.php" />
    <install as="Horde/Core/Binder/Auth.php" name="lib/Horde/Core/Binder/Auth.php" />
    <install as="Horde/Core/Binder/AuthFactory.php" name="lib/Horde/Core/Binder/AuthFactory.php" />
    <install as="Horde/Core/Binder/AuthSignup.php" name="lib/Horde/Core/Binder/AuthSignup.php" />
@@ -452,7 +453,6 @@ Application Framework.</description>
    <install as="Horde/Core/Binder/Memcache.php" name="lib/Horde/Core/Binder/Memcache.php" />
    <install as="Horde/Core/Binder/MimeViewer.php" name="lib/Horde/Core/Binder/MimeViewer.php" />
    <install as="Horde/Core/Binder/Notification.php" name="lib/Horde/Core/Binder/Notification.php" />
-   <install as="Horde/Core/Binder/Prefs.php" name="lib/Horde/Core/Binder/Prefs.php" />
    <install as="Horde/Core/Binder/Secret.php" name="lib/Horde/Core/Binder/Secret.php" />
    <install as="Horde/Core/Binder/SessionHandler.php" name="lib/Horde/Core/Binder/SessionHandler.php" />
    <install as="Horde/Core/Binder/ShareFactory.php" name="lib/Horde/Core/Binder/ShareFactory.php" />
diff --git a/horde/lib/Api.php b/horde/lib/Api.php
index 7a1b6f484..4152c4b62 100644
--- a/horde/lib/Api.php
+++ b/horde/lib/Api.php
@@ -220,7 +220,7 @@ class Horde_Api extends Horde_Registry_Api
         $haveError = false;
 
         /* Remove user's prefs */
-        $prefs = $injector->getInstance('Horde_Prefs')->getPrefs('horde', array(
+        $prefs = $injector->getInstance('Horde_Core_Factory_Prefs')->getPrefs('horde', array(
             'user' => $user
         ));
         try {
diff --git a/horde/scripts/import_squirrelmail_file_prefs.php b/horde/scripts/import_squirrelmail_file_prefs.php
index 9ca65c50b..db173bc5a 100755
--- a/horde/scripts/import_squirrelmail_file_prefs.php
+++ b/horde/scripts/import_squirrelmail_file_prefs.php
@@ -57,7 +57,7 @@ foreach($files as $file) {
     $cli->message('Importing ' . $user . '\'s preferences');
 
     // Reset user prefs
-    $prefs = $injector->getInstance('Horde_Prefs')->getPrefs('horde', array(
+    $prefs = $injector->getInstance('Horde_Core_Factory_Prefs')->getPrefs('horde', array(
         'cache' => false,
         'user' => $user
     ));
diff --git a/horde/scripts/import_squirrelmail_sql_prefs.php b/horde/scripts/import_squirrelmail_sql_prefs.php
index 341691e08..9d934f965 100755
--- a/horde/scripts/import_squirrelmail_sql_prefs.php
+++ b/horde/scripts/import_squirrelmail_sql_prefs.php
@@ -64,7 +64,7 @@ function importPrefs()
 
     $GLOBALS['registry']->setAuth($user, array());
     $cli->message('Importing ' . $user . '\'s preferences');
-    $prefs = $GLOBALS['injector']->getInstance('Horde_Prefs')->getPrefs('horde', array(
+    $prefs = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Prefs')->getPrefs('horde', array(
         'cache' => false,
         'user' => $user
     ));
diff --git a/horde/services/resetpassword.php b/horde/services/resetpassword.php
index beb59ebb1..ee33ff2fe 100644
--- a/horde/services/resetpassword.php
+++ b/horde/services/resetpassword.php
@@ -34,7 +34,7 @@ $can_validate = false;
 /* If a username has been supplied try fetching the prefs stored info. */
 if ($username = $vars->get('username')) {
     $username = Horde_Auth::addHook($username);
-    $prefs = $injector->getInstance('Horde_Prefs')->getPrefs('horde', array(
+    $prefs = $injector->getInstance('Horde_Core_Factory_Prefs')->getPrefs('horde', array(
         'cache' => false,
         'user' => $username
     ));
diff --git a/imp/attachment.php b/imp/attachment.php
index b5d321233..294547385 100644
--- a/imp/attachment.php
+++ b/imp/attachment.php
@@ -70,7 +70,7 @@ if ($conf['compose']['link_attachments_notify']) {
 
             /* Load $mail_user's preferences so that we can use their
              * locale information for the notification message. */
-            $prefs = $injector->getInstance('Horde_Prefs')->getPrefs('horde', array(
+            $prefs = $injector->getInstance('Horde_Core_Factory_Prefs')->getPrefs('horde', array(
                 'cache' => false,
                 'user' => $mail_user
             ));
diff --git a/ingo/lib/Storage/Prefs.php b/ingo/lib/Storage/Prefs.php
index 0b0b71e93..056a23625 100644
--- a/ingo/lib/Storage/Prefs.php
+++ b/ingo/lib/Storage/Prefs.php
@@ -34,7 +34,7 @@ class Ingo_Storage_Prefs extends Ingo_Storage
      */
     protected function _retrieve($field, $readonly = false)
     {
-        $prefs = $GLOBALS['injector']->getInstance('Horde_Prefs')->getPrefs('ingo', array(
+        $prefs = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Prefs')->getPrefs('ingo', array(
             'cache' => false,
             'user' => Ingo::getUser()
         ));
@@ -131,7 +131,7 @@ class Ingo_Storage_Prefs extends Ingo_Storage
      */
     protected function _store($ob)
     {
-        $prefs = $GLOBALS['injector']->getInstance('Horde_Prefs')->getPrefs('ingo', array(
+        $prefs = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Prefs')->getPrefs('ingo', array(
             'cache' => false,
             'user' => Ingo::getUser()
         ));
diff --git a/kronolith/fb.php b/kronolith/fb.php
index d08375207..94f4554cb 100644
--- a/kronolith/fb.php
+++ b/kronolith/fb.php
@@ -31,7 +31,7 @@ $key = 'kronolith.fb.' . ($user ? 'u.' . $user : 'c.' . $cal);
 $fb = $cache->get($key, 360);
 if (!$fb) {
     if ($user) {
-        $prefs = $GLOBALS['injector']->getInstance('Horde_Prefs')->getPrefs('kronolith', array(
+        $prefs = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Prefs')->getPrefs('kronolith', array(
             'cache' => false,
             'user' => $user
         ));
diff --git a/kronolith/lib/Api.php b/kronolith/lib/Api.php
index e653d4a8c..c1bdb7864 100644
--- a/kronolith/lib/Api.php
+++ b/kronolith/lib/Api.php
@@ -1218,7 +1218,7 @@ class Kronolith_Api extends Horde_Registry_Api
                     if ($alarm_user == $current_user) {
                         $prefs = $GLOBALS['prefs'];
                     } else {
-                        $prefs = $GLOBALS['injector']->getInstance('Horde_Prefs')->getPrefs('kronolith', array(
+                        $prefs = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Prefs')->getPrefs('kronolith', array(
                             'cache' => false,
                             'user' => $alarm_user
                         ));
diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php
index a2546d5e2..615bf0bc6 100644
--- a/kronolith/lib/Kronolith.php
+++ b/kronolith/lib/Kronolith.php
@@ -2553,7 +2553,7 @@ class Kronolith
      */
     public static function _notificationPref($user, $mode, $calendar = null)
     {
-        $prefs = $GLOBALS['injector']->getInstance('Horde_Prefs')->getPrefs('kronolith', array(
+        $prefs = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Prefs')->getPrefs('kronolith', array(
             'cache' => false,
             'user' => $user
         ));
diff --git a/kronolith/scripts/agenda.php b/kronolith/scripts/agenda.php
index 3cfe4a241..d3c7573ac 100755
--- a/kronolith/scripts/agenda.php
+++ b/kronolith/scripts/agenda.php
@@ -59,7 +59,7 @@ function send_agendas()
 
     // Loop through the users and generate an agenda for them
     foreach ($users as $user) {
-        $prefs = $GLOBALS['injector']->getInstance('Horde_Prefs')->getPrefs('kronolith', array(
+        $prefs = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Prefs')->getPrefs('kronolith', array(
             'user' => $user
         ));
         $agenda_calendars = $prefs->getValue('daily_agenda');
diff --git a/kronolith/scripts/upgrades/convert_to_utc.php b/kronolith/scripts/upgrades/convert_to_utc.php
index 0b7bb108b..acb3e201e 100755
--- a/kronolith/scripts/upgrades/convert_to_utc.php
+++ b/kronolith/scripts/upgrades/convert_to_utc.php
@@ -34,7 +34,7 @@ while ($row = $result->fetchRow(DB_FETCHMODE_ASSOC)) {
         if (!is_null($creator)) {
             echo "$count\n";
         }
-        $prefs = $injector->getInstance('Horde_Prefs')->getPrefs('horde', array(
+        $prefs = $injector->getInstance('Horde_Core_Factory_Prefs')->getPrefs('horde', array(
             'cache' => false,
             'user' => $row['event_creator_id']
         ));
diff --git a/nag/lib/Api.php b/nag/lib/Api.php
index 30409e75c..4df09c8a5 100644
--- a/nag/lib/Api.php
+++ b/nag/lib/Api.php
@@ -1454,7 +1454,7 @@ class Nag_Api extends Horde_Registry_Api
                 $users = array($user);
             }
             foreach ($users as $alarm_user) {
-                $prefs = $GLOBALS['injector']->getInstance('Horde_Prefs')->getPrefs('nag', array(
+                $prefs = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Prefs')->getPrefs('nag', array(
                     'cache' => false,
                     'user' => $alarm_user
                 ));
diff --git a/nag/lib/Nag.php b/nag/lib/Nag.php
index 2dcad84bd..3bf0a8c9e 100644
--- a/nag/lib/Nag.php
+++ b/nag/lib/Nag.php
@@ -1068,7 +1068,7 @@ class Nag
      */
     public static function _notificationPref($user, $mode, $tasklist = null)
     {
-        $prefs = $GLOBALS['injector']->getInstance('Horde_Prefs')->getPrefs('nag', array(
+        $prefs = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Prefs')->getPrefs('nag', array(
             'cache' => false,
             'user' => $user
         ));
diff --git a/turba/scripts/import_squirrelmail_file_abook.php b/turba/scripts/import_squirrelmail_file_abook.php
index 0f60edc56..52e3a956b 100755
--- a/turba/scripts/import_squirrelmail_file_abook.php
+++ b/turba/scripts/import_squirrelmail_file_abook.php
@@ -57,7 +57,7 @@ foreach($files as $file) {
 
     // Reset user prefs
     unset($prefs);
-    $prefs = $injector->getInstance('Horde_Prefs')->getPrefs('turba', array(
+    $prefs = $injector->getInstance('Horde_Core_Factory_Prefs')->getPrefs('turba', array(
         'cache' => false,
         'user' => $user
     ));
diff --git a/turba/scripts/import_squirrelmail_sql_abook.php b/turba/scripts/import_squirrelmail_sql_abook.php
index 18a67101e..d54581d51 100755
--- a/turba/scripts/import_squirrelmail_sql_abook.php
+++ b/turba/scripts/import_squirrelmail_sql_abook.php
@@ -53,7 +53,7 @@ while ($row = $handle->fetchRow(DB_FETCHMODE_ASSOC)) {
         $cli->message('Importing ' . $user . '\'s address book');
 
         // Reset user prefs
-        $prefs = $injector->getInstance('Horde_Prefs')->getPrefs('turba', array(
+        $prefs = $injector->getInstance('Horde_Core_Factory_Prefs')->getPrefs('turba', array(
             'cache' => false,
             'user' => $user
         ));