From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Sun, 3 Oct 2010 15:44:03 +0000 (-0400)
Subject: Standardize on a create() method for factory methods
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=0e86e6d7c1c54c1a5ea85e9121da8364f42f23d0;p=horde.git

Standardize on a create() method for factory methods
---

diff --git a/ansel/lib/Ansel.php b/ansel/lib/Ansel.php
index 4f9a2e3b4..7582ea3e7 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_Core_Factory_Prefs')->getPrefs('ansel', array(
+                $uprefs = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Prefs')->create('ansel', array(
                     'cache' => false,
                     'user' => $owner
                 ));
diff --git a/ansel/lib/View/List.php b/ansel/lib/View/List.php
index cdae4f757..ae41a8498 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_Core_Factory_Prefs')->getPrefs('ansel', array(
+                $uprefs = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Prefs')->create('ansel', array(
                     'cache' => false,
                     'owner' => $this->_owner
                 ));
diff --git a/ansel/templates/group/owner.inc b/ansel/templates/group/owner.inc
index b0b833b36..db4700fa9 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_Core_Factory_Prefs')->getPrefs('ansel', array(
+    $uprefs = $injector->getInstance('Horde_Core_Factory_Prefs')->create('ansel', array(
         'cache' => false,
         'user' => $group
     ));
diff --git a/folks/lib/Friends.php b/folks/lib/Friends.php
index 6e46b1887..69bea8505 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_Core_Factory_Prefs')->getPrefs('folks', array(
+        $prefs = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Prefs')->create('folks', array(
             'cache' => false,
             'user' => $GLOBALS['registry']->convertUsername($user, true)
         ));
diff --git a/framework/Core/lib/Horde/Core/Factory/Identity.php b/framework/Core/lib/Horde/Core/Factory/Identity.php
index ac239e313..b838fdb61 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_Core_Factory_Prefs')->getPrefs($registry->getApp(), array(
+                $params['prefs'] = $injector->getInstance('Horde_Core_Factory_Prefs')->create($registry->getApp(), array(
                     'cache' => false,
                     'user' => $user
                 ));
diff --git a/framework/Core/lib/Horde/Core/Factory/Prefs.php b/framework/Core/lib/Horde/Core/Factory/Prefs.php
index c8a58c466..92512aa46 100644
--- a/framework/Core/lib/Horde/Core/Factory/Prefs.php
+++ b/framework/Core/lib/Horde/Core/Factory/Prefs.php
@@ -63,7 +63,7 @@ class Horde_Core_Factory_Prefs
      *
      * @return Horde_Prefs  The singleton instance.
      */
-    public function getPrefs($scope = 'horde', array $opts = array())
+    public function create($scope = 'horde', array $opts = array())
     {
         if (empty($GLOBALS['conf']['prefs']['driver']) ||
             !empty($opts['session'])) {
diff --git a/framework/Core/lib/Horde/Core/Sidebar.php b/framework/Core/lib/Horde/Core/Sidebar.php
index 0457b2b95..aac0a2ef5 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_Core_Factory_Prefs')->getPrefs() instanceof Horde_Prefs_Session)) {
+            !($injector->getInstance('Horde_Core_Factory_Prefs')->create() 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 746dfd976..ca5607606 100644
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -1399,7 +1399,7 @@ class Horde_Registry
             );
         }
 
-        $prefs = $injector->getInstance('Horde_Core_Factory_Prefs')->getPrefs($app, $opts);
+        $prefs = $injector->getInstance('Horde_Core_Factory_Prefs')->create($app, $opts);
     }
 
     /**
diff --git a/horde/lib/Api.php b/horde/lib/Api.php
index 4152c4b62..77dc8cde1 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_Core_Factory_Prefs')->getPrefs('horde', array(
+        $prefs = $injector->getInstance('Horde_Core_Factory_Prefs')->create('horde', array(
             'user' => $user
         ));
         try {
diff --git a/horde/scripts/import_squirrelmail_file_prefs.php b/horde/scripts/import_squirrelmail_file_prefs.php
index db173bc5a..f287ea168 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_Core_Factory_Prefs')->getPrefs('horde', array(
+    $prefs = $injector->getInstance('Horde_Core_Factory_Prefs')->create('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 9d934f965..f0516d0e3 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_Core_Factory_Prefs')->getPrefs('horde', array(
+    $prefs = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Prefs')->create('horde', array(
         'cache' => false,
         'user' => $user
     ));
diff --git a/horde/services/resetpassword.php b/horde/services/resetpassword.php
index ee33ff2fe..93e92573b 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_Core_Factory_Prefs')->getPrefs('horde', array(
+    $prefs = $injector->getInstance('Horde_Core_Factory_Prefs')->create('horde', array(
         'cache' => false,
         'user' => $username
     ));
diff --git a/imp/attachment.php b/imp/attachment.php
index 294547385..35a2d674f 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_Core_Factory_Prefs')->getPrefs('horde', array(
+            $prefs = $injector->getInstance('Horde_Core_Factory_Prefs')->create('horde', array(
                 'cache' => false,
                 'user' => $mail_user
             ));
diff --git a/ingo/lib/Storage/Prefs.php b/ingo/lib/Storage/Prefs.php
index 056a23625..3c1354caf 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_Core_Factory_Prefs')->getPrefs('ingo', array(
+        $prefs = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Prefs')->create('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_Core_Factory_Prefs')->getPrefs('ingo', array(
+        $prefs = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Prefs')->create('ingo', array(
             'cache' => false,
             'user' => Ingo::getUser()
         ));
diff --git a/kronolith/fb.php b/kronolith/fb.php
index 94f4554cb..9f324fd4c 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_Core_Factory_Prefs')->getPrefs('kronolith', array(
+        $prefs = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Prefs')->create('kronolith', array(
             'cache' => false,
             'user' => $user
         ));
diff --git a/kronolith/lib/Api.php b/kronolith/lib/Api.php
index c1bdb7864..f15ee95b7 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_Core_Factory_Prefs')->getPrefs('kronolith', array(
+                        $prefs = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Prefs')->create('kronolith', array(
                             'cache' => false,
                             'user' => $alarm_user
                         ));
diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php
index 615bf0bc6..2a7daa3a6 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_Core_Factory_Prefs')->getPrefs('kronolith', array(
+        $prefs = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Prefs')->create('kronolith', array(
             'cache' => false,
             'user' => $user
         ));
diff --git a/kronolith/scripts/agenda.php b/kronolith/scripts/agenda.php
index d3c7573ac..38987e817 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_Core_Factory_Prefs')->getPrefs('kronolith', array(
+        $prefs = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Prefs')->create('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 acb3e201e..e70e6f3ea 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_Core_Factory_Prefs')->getPrefs('horde', array(
+        $prefs = $injector->getInstance('Horde_Core_Factory_Prefs')->create('horde', array(
             'cache' => false,
             'user' => $row['event_creator_id']
         ));
diff --git a/nag/lib/Api.php b/nag/lib/Api.php
index 4df09c8a5..1edd00c14 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_Core_Factory_Prefs')->getPrefs('nag', array(
+                $prefs = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Prefs')->create('nag', array(
                     'cache' => false,
                     'user' => $alarm_user
                 ));
diff --git a/nag/lib/Nag.php b/nag/lib/Nag.php
index 3bf0a8c9e..18aa91985 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_Core_Factory_Prefs')->getPrefs('nag', array(
+        $prefs = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Prefs')->create('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 52e3a956b..1c4ce1263 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_Core_Factory_Prefs')->getPrefs('turba', array(
+    $prefs = $injector->getInstance('Horde_Core_Factory_Prefs')->create('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 d54581d51..1fa4a40d6 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_Core_Factory_Prefs')->getPrefs('turba', array(
+        $prefs = $injector->getInstance('Horde_Core_Factory_Prefs')->create('turba', array(
             'cache' => false,
             'user' => $user
         ));