From: Gunnar Wrobel <p@rdus.de>
Date: Wed, 17 Mar 2010 19:43:12 +0000 (+0100)
Subject: Start the Horde_Kolab_Storage_Connection handler.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=eec1674729696090fcd0094554d4cdce3fa1efbf;p=horde.git

Start the Horde_Kolab_Storage_Connection handler.
---

diff --git a/framework/Core/lib/Horde/Core/Factory/KolabStorage.php b/framework/Core/lib/Horde/Core/Factory/KolabStorage.php
index 204db3b4d..cfdd68ce8 100644
--- a/framework/Core/lib/Horde/Core/Factory/KolabStorage.php
+++ b/framework/Core/lib/Horde/Core/Factory/KolabStorage.php
@@ -95,6 +95,7 @@ class Horde_Core_Factory_KolabStorage
         }
 
         return new Horde_Kolab_Storage(
+            new Horde_Kolab_Storage_Connection(),
             'Imap',
             array(
                 'hostspec' => $session->getImapServer(),
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage.php
index 6c0896bd1..148e252e6 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage.php
@@ -51,11 +51,11 @@
 class Horde_Kolab_Storage
 {
     /**
-     * Singleton instance.
+     * The master Kolab storage system.
      *
-     * @var Horde_Kolab_Storage
+     * @var Horde_Kolab_Storage_Connection
      */
-    static protected $instances = array();
+    private $_master;
 
     /**
      * An array of Horde_Kolab_Storage_Driver connections to Kolab
@@ -120,8 +120,12 @@ class Horde_Kolab_Storage
      * @param string $driver The driver used for the primary storage connection.
      * @param array  $params Additional connection parameters.
      */
-    public function __construct($driver, $params = array())
-    {
+    public function __construct(
+        Horde_Kolab_Storage_Connection $master,
+        $driver, $params = array()
+    ) {
+        $this->_master = $master;
+
         $this->_driver = $driver;
         $this->_params = $params;
 
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Connection.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Connection.php
new file mode 100644
index 000000000..8ba66617a
--- /dev/null
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Connection.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * A connection to a Kolab storage system.
+ *
+ * PHP version 5
+ *
+ * @category Kolab
+ * @package  Kolab_Storage
+ * @author   Gunnar Wrobel <wrobel@pardus.de>
+ * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
+ * @link     http://pear.horde.org/index.php?package=Kolab_Storage
+ */
+
+/**
+ * A connection to a Kolab storage system.
+ *
+ * Copyright 2009-2010 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (LGPL). If you
+ * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
+ *
+ * @category Kolab
+ * @package  Kolab_Storage
+ * @author   Gunnar Wrobel <wrobel@pardus.de>
+ * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
+ * @link     http://pear.horde.org/index.php?package=Kolab_Storage
+ */
+class Horde_Kolab_Storage_Connection
+{
+}