remove datatree driver in H4

diff --git a/framework/Auth/lib/Horde/Auth/Signup/Datatree.php b/framework/Auth/lib/Horde/Auth/Signup/Datatree.php
deleted file mode 100644 (file)
index a3e19f4..0000000
--- a/framework/Auth/lib/Horde/Auth/Signup/Datatree.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-
-require_once 'Horde/DataTree.php';
-
-/**
- * Horde_Auth_Signup:: This class provides an interface to sign up or have
- * new users sign themselves up into the horde installation, depending
- * on how the admin has configured Horde.
- *
- * Copyright 2002-2009 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://opensource.org/licenses/lgpl-2.1.php
- *
- * @author  Marko Djukic <marko@oblo.com>
- * @package Horde_Auth
- */
-class Horde_Auth_Signup_Datatree extends Horde_Auth_Signup {
-
-    /**
-     * Pointer to a DataTree instance to manage/store signups
-     *
-     * @var DataTree
-     */
-    var $_datatree;
-
-    public function _-construct()
-    {
-        global $conf;
-
-        if (empty($conf['datatree']['driver'])) {
-            Horde::fatal(_("You must configure a DataTree backend to use Signups."), __FILE__, __LINE__);
-        }
-        $driver = $conf['datatree']['driver'];
-        $this->_datatree = DataTree::singleton($driver,
-                                                array_merge(Horde::getDriverConfig('datatree', $driver),
-                                                            array('group' => 'horde.signup')));
-    }
-
-    /**
-     * Stores the signup data in the backend.
-     *
-     * @params DataTreeObject_Signup $signup  Signup data.
-     */
-    protected function _queueSignup($signup)
-    {
-        return $this->_datatree->add($signup);
-    }
-
-    /**
-     * Get a user's queued signup information.
-     *
-     * @param string $username  The username to retrieve the queued info for.
-     *
-     * @return DataTreeObject_Signup  The DataTreeObject for the requested
-     *                                signup.
-     */
-    public function getQueuedSignup($username)
-    {
-        return $this->_datatree->getObject($username, 'DataTreeObject_Signup');
-    }
-
-    /**
-     * Get the queued information for all pending signups.
-     *
-     * @return array  An array of DataTreeObject_Signup objects, one for
-     *                each signup in the queue.
-     */
-    public function getQueuedSignups()
-    {
-        $signups = array();
-        foreach ($this->_datatree->get(DATATREE_FORMAT_FLAT, DATATREE_ROOT, true) as $username) {
-            if ($username != DATATREE_ROOT) {
-                $signups[] = $this->_datatree->getObject($username);
-            }
-        }
-        return $signups;
-    }
-
-    /**
-     * Remove a queued signup.
-     *
-     * @param string $username  The user to remove from the signup queue.
-     */
-    public function removeQueuedSignup($username)
-    {
-        $this->_datatree->remove($username);
-    }
-
-    /**
-     * Return a new signup object.
-     *
-     * @param string $name  The signups's name.
-     *
-     * @return DataTreeObject_Signup  A new signup object.
-     */
-    public function newSignup($name)
-    {
-        if (empty($name)) {
-            return PEAR::raiseError('Signup names must be non-empty');
-        }
-        return new DataTreeObject_Signup($name);
-    }
-
-}
-
-/**
- * Extension of the DataTreeObject class for storing Signup
- * information in the DataTree driver. If you want to store
- * specialized Signup information, you should extend this class
- * instead of extending DataTreeObject directly.
- *
- * @author  Marko Djukic <marko@oblo.com>
- * @package Horde_Auth
- */
-class DataTreeObject_Signup extends DataTreeObject {
-
-    /**
-     * We want to see queued signups in descending order of receipt.
-     * Insert new signups at position 0 and push the rest down.
-     *
-     * @var integer
-     */
-    var $order = 0;
-
-    /**
-     * The DataTreeObject_Signup constructor. Just makes sure to call
-     * the parent constructor so that the signup's is is set
-     * properly.
-     *
-     * @param string $id  The id of the signup.
-     */
-    function DataTreeObject_Signup($id)
-    {
-        parent::DataTreeObject($id);
-        if (is_null($this->data)) {
-            $this->data = array();
-        }
-    }
-
-}

diff --git a/framework/Auth/package.xml b/framework/Auth/package.xml
index 71c1255..22a9bfa 100644 (file)
--- a/framework/Auth/package.xml
+++ b/framework/Auth/package.xml
@@ -39,7 +39,6 @@ http://pear.php.net/dtd/package-2.0.xsd">
     <dir name="Horde">
      <dir name="Auth">
       <dir name="Signup">
-       <file name="Datatree.php" role="php" />
        <file name="Sql.php" role="php" />
       </dir> <!-- /lib/Horde/Auth/Signup -->
       <file name="Application.php" role="php" />
@@ -112,10 +111,6 @@ http://pear.php.net/dtd/package-2.0.xsd">
   </required>
   <optional>
    <package>
-    <name>DataTree</name>
-    <channel>pear.horde.org</channel>
-   </package>
-   <package>
     <name>Form</name>
     <channel>pear.horde.org</channel>
    </package>
@@ -145,7 +140,6 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </dependencies>
  <phprelease>
   <filelist>
-   <install name="lib/Horde/Auth/Signup/Datatree.php" as="Horde/Auth/Signup/Datatree.php" />
    <install name="lib/Horde/Auth/Signup/Sql.php" as="Horde/Auth/Signup/Sql.php" />
    <install name="lib/Horde/Auth/Application.php" as="Horde/Auth/Application.php" />
    <install name="lib/Horde/Auth/Auto.php" as="Horde/Auth/Auto.php" />