From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Mon, 24 May 2010 18:47:08 +0000 (-0400)
Subject: use the injector
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=f5399cbe5655d87958e9c0a10c42938573bdec28;p=horde.git

use the injector
---

diff --git a/ansel/lib/Ansel.php b/ansel/lib/Ansel.php
index 51348f290..c222495d6 100644
--- a/ansel/lib/Ansel.php
+++ b/ansel/lib/Ansel.php
@@ -55,19 +55,6 @@ class Ansel
     }
 
     /**
-     * Create and initialize the VFS object
-     *
-     * @return  VFS object.
-     */
-    static public function getVFS()
-    {
-        // @TODO: need to refactor the Vfs binder to a factory so we can handle
-        // vfs objects for different scopes.
-        $v_params = Horde::getVFSConfig('images');
-        return VFS::singleton($v_params['type'], $v_params['params']);
-    }
-
-    /**
      * Return a string containing an <option> listing of the given
      * gallery array.
      *
diff --git a/ansel/lib/Application.php b/ansel/lib/Application.php
index b5f60283c..932dd56ce 100644
--- a/ansel/lib/Application.php
+++ b/ansel/lib/Application.php
@@ -69,7 +69,7 @@ class Ansel_Application extends Horde_Registry_Application
         // Create db, share, and vfs instances.
         $GLOBALS['ansel_db'] = Ansel::getDb();
         $GLOBALS['ansel_storage'] = new Ansel_Storage();
-        $GLOBALS['ansel_vfs'] = Ansel::getVFS();
+        $GLOBALS['ansel_vfs'] = $GLOBALS['injector']->getInstance('Horde_Vfs')->getVfs('images');
 
         // Get list of available styles for this client.
         $GLOBALS['ansel_styles'] = Ansel::getAvailableStyles();
diff --git a/folks/lib/Driver.php b/folks/lib/Driver.php
index babe102b2..4f6808c19 100644
--- a/folks/lib/Driver.php
+++ b/folks/lib/Driver.php
@@ -61,21 +61,6 @@ class Folks_Driver {
     }
 
     /**
-     * Load VFS Backend
-     *
-     * @throws Horde_Exception
-     */
-    protected function _loadVFS()
-    {
-        $v_params = Horde::getVFSConfig('images');
-        try {
-            return VFS::singleton($v_params['type'], $v_params['params']);
-        } catch (VFS_Exception $e) {
-            return PEAR::raiseError($e->getMessage());
-        }
-    }
-
-    /**
      * Store image
      *
      * @param string $file   Image file
@@ -85,12 +70,7 @@ class Folks_Driver {
     {
         global $conf;
 
-        try {
-        $vfs = $this->_loadVFS();
-        if ($vfs instanceof PEAR_Error) {
-            return $vfs;
-        }
-
+        $vfs = $GLOBALS['injector']->getInstance('Horde_Vfs')->getVfs('images');
         $p = hash('md5', $user);
         $vfspath = Folks::VFS_PATH . '/' . substr(str_pad($p, 2, 0, STR_PAD_LEFT), -2) . '/';
         $vfs_name = $p . '.' . $conf['images']['image_type'];
@@ -138,11 +118,7 @@ class Folks_Driver {
      */
     public function deleteImage($user)
     {
-        $vfs = $this->_loadVFS();
-        if ($vfs instanceof PEAR_Error) {
-            return $vfs;
-        }
-
+        $vfs = $GLOBALS['injector']->getInstance('Horde_Vfs')->getVfs('images');
         $p = hash('md5', $user);
         $vfspath = Folks::VFS_PATH . '/' . substr(str_pad($p, 2, 0, STR_PAD_LEFT), -2) . '/';
         $vfs_name = $p . '.' . $GLOBALS['conf']['images']['image_type'];
diff --git a/news/lib/News.php b/news/lib/News.php
index 0a2314026..e64373448 100644
--- a/news/lib/News.php
+++ b/news/lib/News.php
@@ -225,24 +225,6 @@ class News {
     }
 
     /**
-     * Load VFS Backend
-     *
-     * @throws Horde_Exception
-     * @throws VFS_Exception
-     */
-    static public function loadVFS()
-    {
-        static $vfs;
-
-        if ($vfs) {
-            return $vfs;
-        }
-
-        $v_params = Horde::getVFSConfig('images');
-        return VFS::singleton($v_params['type'], $v_params['params']);
-    }
-
-    /**
      * Store image
      *
      * @param $id     Image owner record id
@@ -254,7 +236,7 @@ class News {
     {
         global $conf;
 
-        $vfs = self::loadVFS();
+        $vfs = $GLOBALS['injector']->getInstance('Horde_Vfs')->getVfs('images');
         $vfspath = self::VFS_PATH . '/images/' . $type;
         $vfs_name = $id . '.' . $conf['images']['image_type'];
 
@@ -317,7 +299,7 @@ class News {
      */
     static public function deleteImage($id)
     {
-        $vfs = self::loadVFS();
+        $vfs = $GLOBALS['injector']->getInstance('Horde_Vfs')->getVfs('images');
         $vfs_name = $id . '.' . $GLOBALS['conf']['images']['image_type'];
         $vfs->deleteFile(self::VFS_PATH . '/images/news/full', $vfs_name);
         $vfs->deleteFile(self::VFS_PATH . '/images/news/small', $vfs_name);
@@ -332,7 +314,7 @@ class News {
      */
     static public function saveFile($file_id, $file_src)
     {
-        $vfs = self::loadVFS();
+        $vfs = $GLOBALS['injector']->getInstance('Horde_Vfs')->getVfs('images');
         $vfs->writeData(self::VFS_PATH . '/files/', $file_id, file_get_contents($file_src), true);
     }
 
@@ -343,7 +325,7 @@ class News {
      */
     static public function getFile($file_id)
     {
-        $vfs = self::loadVFS();
+        $vfs = $GLOBALS['injector']->getInstance('Horde_Vfs')->getVfs('images');
         $vfs->read(self::VFS_PATH . '/files/', $file_id);
     }
 
@@ -354,7 +336,7 @@ class News {
      */
     static public function deleteFile($file_id)
     {
-        $vfs = self::loadVFS();
+        $vfs = $GLOBALS['injector']->getInstance('Horde_Vfs')->getVfs('images');
         if ($vfs->exists(self::VFS_PATH . '/files/', $file_id)) {
             $vfs->deleteFile(self::VFS_PATH . '/files/', $file_id);
         }
diff --git a/turba/lib/Object.php b/turba/lib/Object.php
index 943015cef..2dfb378da 100644
--- a/turba/lib/Object.php
+++ b/turba/lib/Object.php
@@ -312,7 +312,7 @@ class Turba_Object {
             if ($this->_vfs->exists(TURBA_VFS_PATH, $this->getValue('__uid'))) {
                 return $this->_vfs->listFolder(TURBA_VFS_PATH . '/' . $this->getValue('__uid'));
             }
-        } catch (VFS_Exception $e) {}
+        } catch (Turba_Exception $e) {}
 
         return array();
     }
@@ -396,16 +396,10 @@ class Turba_Object {
     {
         if (!isset($this->_vfs)) {
             try {
-                $v_params = Horde::getVFSConfig('documents');
+                $this->_vfs = $GLOBALS['injector']->getInstance('Horde_Vfs')->getVfs('documents');
             } catch (Horde_Exception $e) {
                 throw new Turba_Exception($e);
             }
-
-            try {
-                $this->_vfs = VFS::singleton($v_params['type'], $v_params['params']);
-            } catch (VFS_Exception $e) {
-                throw new Turba_Exception($e);
-            }
         }
     }
 
diff --git a/turba/view.php b/turba/view.php
index b9bf53d82..323215036 100644
--- a/turba/view.php
+++ b/turba/view.php
@@ -39,15 +39,10 @@ if (!$object->hasPermission(Horde_Perms::READ)) {
 }
 
 try {
-    $v_params = Horde::getVFSConfig('documents');
+    $vfs = $GLOBALS['injector']->getInstance('Horde_Vfs')->getVfs('documents');
 } catch (Horde_Exception $e) {
     throw new Turba_Exception($e);
 }
-try {
-    $vfs = VFS::singleton($v_params['type'], $v_params['params']);
-} catch (VFS_Exception $e) {
-    throw new Turba_Exception($e);
-}
 
 try {
     $data = $vfs->read(TURBA_VFS_PATH . '/' . $object->getValue('__uid'), $filename);