From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Thu, 7 Oct 2010 21:14:22 +0000 (-0400)
Subject: Remove unnesessary binder, ask for the Horde_Core_Factory_Share object directly
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=c685edee620ef4d9931ef899c7f1ad162bf430af;p=horde.git

Remove unnesessary binder, ask for the Horde_Core_Factory_Share object directly
---

diff --git a/ansel/lib/Injector/Factory/Storage.php b/ansel/lib/Injector/Factory/Storage.php
index 743b8ea86..a75893f56 100644
--- a/ansel/lib/Injector/Factory/Storage.php
+++ b/ansel/lib/Injector/Factory/Storage.php
@@ -37,7 +37,7 @@ class Ansel_Injector_Factory_Storage
     {
         $scope = $this->_injector->getInstance('Ansel_Config')->get('scope');
         if (empty($this->_instances[$scope])) {
-            $this->_instances[$scope] = new Ansel_Storage($this->_injector->getInstance('Horde_Share_Factory')->getScope($scope, 'Sql_Hierarchical'));
+            $this->_instances[$scope] = new Ansel_Storage($this->_injector->getInstance('Horde_Core_Factory_Share')->create($scope, 'Sql_Hierarchical'));
         }
 
        return $this->_instances[$scope];
diff --git a/folks/lib/Driver.php b/folks/lib/Driver.php
index 00ae4b437..5e78b0f55 100644
--- a/folks/lib/Driver.php
+++ b/folks/lib/Driver.php
@@ -463,7 +463,7 @@ class Folks_Driver {
 
         // Delete groups
         if ($GLOBALS['conf']['friends']) {
-            $shares = $GLOBALS['injector']->getInstance('Horde_Share_Factory')->getScope();
+            $shares = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Share')->create();
             $groups = $shares->listShares($GLOBALS['registry']->getAuth(), Horde_Perms::SHOW, true);
             foreach ($groups as $share) {
                 $result = $shares->removeShare($share);
diff --git a/folks/lib/Friends/shared.php b/folks/lib/Friends/shared.php
index 4fb8f3f74..6776358b0 100644
--- a/folks/lib/Friends/shared.php
+++ b/folks/lib/Friends/shared.php
@@ -42,7 +42,7 @@ class Folks_Friends_shared extends  Folks_Friends_sql {
      */
     public function getGroupOwner($group)
     {
-        $GLOBALS['folks_shares'] = $GLOBALS['injector']->getInstance('Horde_Share_Factory')->getScope();
+        $GLOBALS['folks_shares'] = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Share')->create();
 
         try {
             $share = $GLOBALS['folks_shares']->getShareById($group);
@@ -57,7 +57,7 @@ class Folks_Friends_shared extends  Folks_Friends_sql {
      */
     protected function _getGroups()
     {
-        $GLOBALS['folks_shares'] = $GLOBALS['injector']->getInstance('Horde_Share_Factory')->getScope();
+        $GLOBALS['folks_shares'] = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Share')->create();
         $groups = $GLOBALS['folks_shares']->listShares($this->_user, Horde_Perms::READ);
 
         $list = array();
@@ -79,7 +79,7 @@ class Folks_Friends_shared extends  Folks_Friends_sql {
             return PEAR::raiseError(_("A group names cannot be empty"));
         }
 
-        $GLOBALS['folks_shares'] = $GLOBALS['injector']->getInstance('Horde_Share_Factory')->getScope();
+        $GLOBALS['folks_shares'] = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Share')->create();
         $share = $GLOBALS['folks_shares']->getShareById($group);
 
         // Only owners of a group can delete them
@@ -107,7 +107,7 @@ class Folks_Friends_shared extends  Folks_Friends_sql {
      */
     public function removeGroup($group)
     {
-        $GLOBALS['folks_shares'] = $GLOBALS['injector']->getInstance('Horde_Share_Factory')->getScope();
+        $GLOBALS['folks_shares'] = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Share')->create();
 
         $share = $GLOBALS['folks_shares']->getShareById($group);
         if ($share instanceof PEAR_Error) {
@@ -158,7 +158,7 @@ class Folks_Friends_shared extends  Folks_Friends_sql {
             return PEAR::raiseError(sprintf(_("You already have a group named \"%s\"."), $name));
         }
 
-        $GLOBALS['folks_shares'] = $GLOBALS['injector']->getInstance('Horde_Share_Factory')->getScope();
+        $GLOBALS['folks_shares'] = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Share')->create();
 
         $share = $GLOBALS['folks_shares']->newShare(strval(new Horde_Support_Uuid()));
 
diff --git a/folks/perms.php b/folks/perms.php
index 5d7c7c987..54f4e61d7 100644
--- a/folks/perms.php
+++ b/folks/perms.php
@@ -11,7 +11,7 @@
 
 require_once dirname(__FILE__) . '/lib/base.php';
 
-$shares = $injector->getInstance('Horde_Share_Factory')->getScope();
+$shares = $injector->getInstance('Horde_Core_Factory_Share')->create();
 $groups = $injector->getInstance('Horde_Group');
 $auth = $injector->getInstance('Horde_Auth_Factory')->getAuth();
 
diff --git a/framework/Core/lib/Horde/Core/Binder/ShareFactory.php b/framework/Core/lib/Horde/Core/Binder/ShareFactory.php
deleted file mode 100644
index 36f4cb9c3..000000000
--- a/framework/Core/lib/Horde/Core/Binder/ShareFactory.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * @category Horde
- * @package  Core
- */
-class Horde_Core_Binder_ShareFactory implements Horde_Injector_Binder
-{
-    public function create(Horde_Injector $injector)
-    {
-        return new Horde_Core_Factory_Share($injector);
-    }
-
-    public function equals(Horde_Injector_Binder $binder)
-    {
-        return false;
-    }
-
-}
diff --git a/framework/Core/lib/Horde/Core/Factory/Share.php b/framework/Core/lib/Horde/Core/Factory/Share.php
index 7ba5fb08c..087026178 100644
--- a/framework/Core/lib/Horde/Core/Factory/Share.php
+++ b/framework/Core/lib/Horde/Core/Factory/Share.php
@@ -56,7 +56,7 @@ class Horde_Core_Factory_Share
      * @return Horde_Share  The Horde_Share instance.
      * @throws Horde_Exception
      */
-    public function getScope($app = null, $driver = null)
+    public function create($app = null, $driver = null)
     {
         if (empty($driver)) {
             $driver = $GLOBALS['conf']['share']['driver'];
diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index 2b49f8384..56c93c326 100644
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -252,7 +252,6 @@ class Horde_Registry
         $binders = array(
             'Horde_Auth_Factory' => new Horde_Core_Binder_AuthFactory(),
             'Horde_Core_Auth_Signup' => new Horde_Core_Binder_AuthSignup(),
-            'Horde_Share_Factory' => new Horde_Core_Binder_ShareFactory(),
             'Horde_Template' => new Horde_Core_Binder_Template(),
             'Horde_Text_Filter' => new Horde_Core_Binder_TextFilter(),
             'Horde_Tree' => new Horde_Core_Binder_Tree(),
diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index d019ce719..94315af65 100644
--- a/framework/Core/package.xml
+++ b/framework/Core/package.xml
@@ -113,7 +113,6 @@ Application Framework.</description>
        <file name="Auth.php" role="php" />
        <file name="AuthFactory.php" role="php" />
        <file name="AuthSignup.php" role="php" />
-       <file name="ShareFactory.php" role="php" />
        <file name="Template.php" role="php" />
        <file name="TextFilter.php" role="php" />
        <file name="Tree.php" role="php" />
@@ -426,7 +425,6 @@ Application Framework.</description>
    <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" />
-   <install as="Horde/Core/Binder/ShareFactory.php" name="lib/Horde/Core/Binder/ShareFactory.php" />
    <install as="Horde/Core/Binder/Template.php" name="lib/Horde/Core/Binder/Template.php" />
    <install as="Horde/Core/Binder/TextFilter.php" name="lib/Horde/Core/Binder/TextFilter.php" />
    <install as="Horde/Core/Binder/Tree.php" name="lib/Horde/Core/Binder/Tree.php" />
diff --git a/framework/Group/lib/Horde/Group/Contactlists.php b/framework/Group/lib/Horde/Group/Contactlists.php
index f3624434a..9f27a0022 100644
--- a/framework/Group/lib/Horde/Group/Contactlists.php
+++ b/framework/Group/lib/Horde/Group/Contactlists.php
@@ -339,7 +339,7 @@ class Horde_Group_Contactlists extends Horde_Group
             if ($source['use_shares']) {
                 if (empty($contact_shares)) {
                     $scope = $GLOBALS['registry']->hasInterface('contacts');
-                    $shares = $GLOBALS['injector']->getInstance('Horde_Share_Factory')->getScope($scope);
+                    $shares = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Share')->create($scope);
                     $this->_contact_shares = $shares->listShares($GLOBALS['registry']->getAuth(), Horde_Perms::SHOW, $GLOBALS['registry']->getAuth());
                 }
                 // Contruct a list of owner ids to use
diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Scenario.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Scenario.php
index 84323f9d3..2b6c54d32 100644
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Scenario.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Scenario.php
@@ -88,7 +88,7 @@ class Horde_Kolab_Storage_Scenario extends Horde_Kolab_Server_Integration_Scenar
             $folder->setACL($arguments[0], 'alrid');
             break;
         case 'retrieving the list of shares for the application':
-            $shares = $GLOBALS['injector']->getInstance('Horde_Share_Factory')->getScope($arguments[0], 'kolab');
+            $shares = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Share')->create($arguments[0], 'kolab');
 
             $world['list'] = $shares->listShares(Auth::getAuth());
             break;
diff --git a/framework/Prefs/lib/Horde/Prefs/KolabImap.php b/framework/Prefs/lib/Horde/Prefs/KolabImap.php
index 7e4e7e78c..109749bec 100644
--- a/framework/Prefs/lib/Horde/Prefs/KolabImap.php
+++ b/framework/Prefs/lib/Horde/Prefs/KolabImap.php
@@ -38,7 +38,7 @@ class Horde_Prefs_KolabImap extends Horde_Prefs_Base
             return;
         }
 
-        $shares = $GLOBALS['injector']->getInstance('Horde_Share_Factory')->getScope('h-prefs');
+        $shares = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Share')->create('h-prefs');
         $default = $shares->getDefaultShare();
         if ($default instanceof PEAR_Error) {
             if ($this->_opts['logger']) {
diff --git a/horde/lib/Api.php b/horde/lib/Api.php
index 77dc8cde1..a0e2bcbc0 100644
--- a/horde/lib/Api.php
+++ b/horde/lib/Api.php
@@ -476,7 +476,7 @@ class Horde_Api extends Horde_Registry_Api
             throw new Horde_Exception(_("You are not allowed to add shares."));
         }
 
-        $shares = $GLOBALS['injector']->getInstance('Horde_Share_Factory')->getScope($scope);
+        $shares = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Share')->create($scope);
 
         if (is_a($share = &$shares->newShare($shareName), 'PEAR_Error')) {
             throw new Horde_Exception($share);
@@ -505,7 +505,7 @@ class Horde_Api extends Horde_Registry_Api
             throw new Horde_Exceptionr(_("You are not allowed to delete shares."));
         }
 
-        $shares = $GLOBALS['injector']->getInstance('Horde_Share_Factory')->getScope($scope);
+        $shares = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Share')->create($scope);
 
         if (is_a($share = &$shares->getShare($shareName), 'PEAR_Error')) {
             throw new Horde_Exception($share);
@@ -532,7 +532,7 @@ class Horde_Api extends Horde_Registry_Api
             throw new Horde_Exception(_("You are not allowed to list shares."));
         }
 
-        $shares = $GLOBALS['injector']->getInstance('Horde_Share_Factory')->getScope($scope);
+        $shares = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Share')->create($scope);
 
         $share_list = &$shares->listShares($userName, Horde_Perms::SHOW, $userName);
         $myshares = array();
@@ -561,7 +561,7 @@ class Horde_Api extends Horde_Registry_Api
             throw new Horde_Exception(_("You are not allowed to change shares."));
         }
 
-        $shares = $GLOBALS['injector']->getInstance('Horde_Share_Factory')->getScope($scope);
+        $shares = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Share')->create($scope);
 
         if (is_a($share = &$shares->getShare($shareName), 'PEAR_Error')) {
             throw new Horde_Exception($share);
@@ -598,7 +598,7 @@ class Horde_Api extends Horde_Registry_Api
             throw new Horde_Exception(_("You are not allowed to change shares."));
         }
 
-        $shares = $GLOBALS['injector']->getInstance('Horde_Share_Factory')->getScope($scope);
+        $shares = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Share')->create($scope);
 
         if (is_a($share = &$shares->getShare($shareName), 'PEAR_Error')) {
             throw new Horde_Exception($share);
@@ -640,7 +640,7 @@ class Horde_Api extends Horde_Registry_Api
             throw new Horde_Exception(_("You are not allowed to change shares."));
         }
 
-        $shares = $GLOBALS['injector']->getInstance('Horde_Share_Factory')->getScope($scope);
+        $shares = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Share')->create($scope);
 
         if (is_a($share = &$shares->getShare($shareName), 'PEAR_Error')) {
             throw new Horde_Exception($share);
@@ -667,7 +667,7 @@ class Horde_Api extends Horde_Registry_Api
             throw new Horde_Exception(_("You are not allowed to change shares."));
         }
 
-        $shares = $GLOBALS['injector']->getInstance('Horde_Share_Factory')->getScope($scope);
+        $shares = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Share')->create($scope);
 
         if (is_a($share = &$shares->getShare($shareName), 'PEAR_Error')) {
             throw new Horde_Exception($share);
@@ -707,7 +707,7 @@ class Horde_Api extends Horde_Registry_Api
             Horde_Perms::EDIT => 'edit',
             Horde_Perms::DELETE => 'delete');
 
-        $shares = $GLOBALS['injector']->getInstance('Horde_Share_Factory')->getScope($scope);
+        $shares = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Share')->create($scope);
 
         if (is_a($share = &$shares->getShare($shareName), 'PEAR_Error')) {
             throw new Horde_Exception($share);
@@ -749,7 +749,7 @@ class Horde_Api extends Horde_Registry_Api
             Horde_Perms::EDIT => 'edit',
             Horde_Perms::DELETE => 'delete');
 
-        $shares = $GLOBALS['injector']->getInstance('Horde_Share_Factory')->getScope($scope);
+        $shares = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Share')->create($scope);
 
         if (is_a($share = &$shares->getShare($shareName), 'PEAR_Error')) {
             throw new Horde_Exception($share);
@@ -786,7 +786,7 @@ class Horde_Api extends Horde_Registry_Api
             throw new Horde_Exception(_("You are not allowed to list users of shares."));
         }
 
-        $shares = $GLOBALS['injector']->getInstance('Horde_Share_Factory')->getScope($scope);
+        $shares = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Share')->create($scope);
 
         if (is_a($share = &$shares->getShare($shareName), 'PEAR_Error')) {
             throw new Horde_Exception($share);
@@ -820,7 +820,7 @@ class Horde_Api extends Horde_Registry_Api
             throw new Horde_Exception(_("You are not allowed to list groups of shares."));
         }
 
-        $shares = $GLOBALS['injector']->getInstance('Horde_Share_Factory')->getScope($scope);
+        $shares = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Share')->create($scope);
 
         if (is_a($share = &$shares->getShare($shareName), 'PEAR_Error')) {
             throw new Horde_Exception($share);
diff --git a/horde/services/shares/edit.php b/horde/services/shares/edit.php
index 816ede511..1a6c74784 100644
--- a/horde/services/shares/edit.php
+++ b/horde/services/shares/edit.php
@@ -24,7 +24,7 @@ $fieldsList = array(
 );
 
 $app = Horde_Util::getFormData('app');
-$shares = $injector->getInstance('Horde_Share_Factory')->getScope($app);
+$shares = $injector->getInstance('Horde_Core_Factory_Share')->create($app);
 $groups = $injector->getInstance('Horde_Group');
 $auth = $injector->getInstance('Horde_Auth_Factory')->getAuth();
 $help = $registry->hasMethod('shareHelp', $app)
diff --git a/ingo/lib/Application.php b/ingo/lib/Application.php
index 47e859c72..63146377e 100644
--- a/ingo/lib/Application.php
+++ b/ingo/lib/Application.php
@@ -64,7 +64,7 @@ class Ingo_Application extends Horde_Registry_Application
         // Create shares if necessary.
         $transport = Ingo::getTransport();
         if ($transport->supportShares()) {
-            $GLOBALS['ingo_shares'] = $GLOBALS['injector']->getInstance('Horde_Share_Factory')->getScope();
+            $GLOBALS['ingo_shares'] = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Share')->create();
             $GLOBALS['all_rulesets'] = Ingo::listRulesets();
 
             /* If personal share doesn't exist then create it. */
diff --git a/kronolith/lib/Application.php b/kronolith/lib/Application.php
index d26a0bb3c..da5e46435 100644
--- a/kronolith/lib/Application.php
+++ b/kronolith/lib/Application.php
@@ -68,7 +68,7 @@ class Kronolith_Application extends Horde_Registry_Application
         $GLOBALS['registry']->setTimeZone();
 
         /* Create a share instance. */
-        $GLOBALS['kronolith_shares'] = $GLOBALS['injector']->getInstance('Horde_Share_Factory')->getScope();
+        $GLOBALS['kronolith_shares'] = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Share')->create();
 
         Kronolith::initialize();
     }
diff --git a/kronolith/perms.php b/kronolith/perms.php
index 29c6150e6..68f96a2dd 100644
--- a/kronolith/perms.php
+++ b/kronolith/perms.php
@@ -21,7 +21,7 @@ if (!empty($conf['share']['no_sharing'])) {
     throw new Horde_Exception('Permission denied.');
 }
 
-$shares = $injector->getInstance('Horde_Share_Factory')->getScope();
+$shares = $injector->getInstance('Horde_Core_Factory_Share')->create();
 $groups = $injector->getInstance('Horde_Group');
 $auth = $injector->getInstance('Horde_Auth_Factory')->getAuth();
 
diff --git a/mnemo/lib/Block/summary.php b/mnemo/lib/Block/summary.php
index 0247dedab..30a5f3b51 100644
--- a/mnemo/lib/Block/summary.php
+++ b/mnemo/lib/Block/summary.php
@@ -56,7 +56,7 @@ class Horde_Block_Mnemo_summary extends Horde_Block
         $fgcolors = $cManager->fgColors();
 
         if (!empty($this->_params['show_notepad'])) {
-            $shares = $GLOBALS['injector']->getInstance('Horde_Share_Factory')->getScope();
+            $shares = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Share')->create();
         }
 
         $html = '';
diff --git a/mnemo/lib/Mnemo.php b/mnemo/lib/Mnemo.php
index 1538f2b37..f37dde8e3 100644
--- a/mnemo/lib/Mnemo.php
+++ b/mnemo/lib/Mnemo.php
@@ -399,7 +399,7 @@ class Mnemo {
      */
     public static function initialize()
     {
-        $GLOBALS['mnemo_shares'] = $GLOBALS['injector']->getInstance('Horde_Share_Factory')->getScope();
+        $GLOBALS['mnemo_shares'] = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Share')->create();
 
         // Update the preference for which notepads to display. If the
         // user doesn't have any selected notepads for view then fall
diff --git a/nag/lib/Application.php b/nag/lib/Application.php
index 45429e0e5..056c0ef82 100644
--- a/nag/lib/Application.php
+++ b/nag/lib/Application.php
@@ -51,7 +51,7 @@ class Nag_Application extends Horde_Registry_Application
         $GLOBALS['registry']->setTimeZone();
 
         // Create a share instance.
-        $GLOBALS['nag_shares'] = $GLOBALS['injector']->getInstance('Horde_Share_Factory')->getScope();
+        $GLOBALS['nag_shares'] = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Share')->create();
 
         Nag::initialize();
     }
diff --git a/nag/lib/Block/summary.php b/nag/lib/Block/summary.php
index 0aee2c787..b0ad2ad54 100644
--- a/nag/lib/Block/summary.php
+++ b/nag/lib/Block/summary.php
@@ -202,7 +202,7 @@ class Horde_Block_nag_summary extends Horde_Block
 
             if (!empty($this->_params['show_tasklist'])) {
                 $owner = $task->tasklist;
-                $shares = $GLOBALS['injector']->getInstance('Horde_Share_Factory')->getScope();
+                $shares = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Share')->create();
                 $share = $shares->getShare($owner);
                 $owner = $share->get('name');
                 $html .= '<td width="1%" class="nowrap">'
diff --git a/turba/lib/Application.php b/turba/lib/Application.php
index 36d17bf82..8f452400d 100644
--- a/turba/lib/Application.php
+++ b/turba/lib/Application.php
@@ -81,7 +81,7 @@ class Turba_Application extends Horde_Registry_Application
             if (!empty($cfg['use_shares'])) {
                 // Create a share instance.
                 $_SESSION['turba']['has_share'] = true;
-                $GLOBALS['turba_shares'] = $GLOBALS['injector']->getInstance('Horde_Share_Factory')->getScope();
+                $GLOBALS['turba_shares'] = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Share')->create();
                 $cfgSources = Turba::getConfigFromShares($cfgSources);
                 break;
             }
diff --git a/turba/lib/tests/KolabTestBase.php b/turba/lib/tests/KolabTestBase.php
index 4500e082e..d53607d26 100644
--- a/turba/lib/tests/KolabTestBase.php
+++ b/turba/lib/tests/KolabTestBase.php
@@ -156,7 +156,7 @@ class Turba_KolabTestBase extends Horde_Kolab_Test_Storage
         $this->prepareNewFolder($world['storage'], 'test2', 'contact');
 
         $_SESSION['turba']['has_share'] =  true;
-        $GLOBALS['turba_shares'] = $GLOBALS['injector']->getInstance('Horde_Share_Factory')->getScope();
+        $GLOBALS['turba_shares'] = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Share')->create();
 
         $GLOBALS['cfgSources'] = Turba::getConfigFromShares($cfgSources);
     }
diff --git a/turba/scripts/import_squirrelmail_sql_abook.php b/turba/scripts/import_squirrelmail_sql_abook.php
index 1fa4a40d6..2a9c6c2b6 100755
--- a/turba/scripts/import_squirrelmail_sql_abook.php
+++ b/turba/scripts/import_squirrelmail_sql_abook.php
@@ -38,7 +38,7 @@ $handle = $db->query('SELECT owner, nickname, firstname, lastname, email, label
 if ($handle instanceof PEAR_Error) {
     $cli->fatal($handle->toString());
 }
-$turba_shares = $GLOBALS['injector']->getInstance('Horde_Share_Factory')->getScope();
+$turba_shares = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Share')->create();
 $user = null;
 $count = 0;
 while ($row = $handle->fetchRow(DB_FETCHMODE_ASSOC)) {
diff --git a/whups/lib/Query.php b/whups/lib/Query.php
index 318083917..ee632233b 100644
--- a/whups/lib/Query.php
+++ b/whups/lib/Query.php
@@ -876,7 +876,7 @@ class Whups_QueryManager {
      */
     function Whups_QueryManager()
     {
-        $this->_shareManager = $GLOBALS['injector']->getInstance('Horde_Share_Factory')->getScope();
+        $this->_shareManager = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Share')->create();
     }
 
     /**