From 00cc26e77fe3b16a8daf889f7aa5eb35c5233a1e Mon Sep 17 00:00:00 2001 From: Jan Schneider Date: Thu, 16 Dec 2010 19:15:17 +0100 Subject: [PATCH] Horde_Share -> Horde_Share_Base. --- ansel/lib/Storage.php | 2 +- framework/Core/lib/Horde/Core/Factory/Share.php | 4 ++-- framework/Core/lib/Horde/Core/Factory/ShareBase.php | 4 ++-- framework/Core/lib/Horde/Core/Share/Driver.php | 6 +++--- framework/Share/lib/Horde/{Share.php => Share/Base.php} | 12 +++++------- framework/Share/lib/Horde/Share/Datatree.php | 5 +---- framework/Share/lib/Horde/Share/Kolab.php | 4 ++-- framework/Share/lib/Horde/Share/Sql.php | 6 +++--- framework/Share/package.xml | 14 +++++++------- 9 files changed, 26 insertions(+), 31 deletions(-) rename framework/Share/lib/Horde/{Share.php => Share/Base.php} (97%) diff --git a/ansel/lib/Storage.php b/ansel/lib/Storage.php index 237983c39..5a49f7438 100644 --- a/ansel/lib/Storage.php +++ b/ansel/lib/Storage.php @@ -742,7 +742,7 @@ class Ansel_Storage /** * Check if a gallery exists. Need to do this here instead of Horde_Share - * since Horde_Share::exists() takes a share_name, not a share_id. We + * since Horde_Share_Base::exists() takes a share_name, not a share_id. We * might also be checking by gallery_slug and this is more efficient than * a listShares() call for one gallery. * diff --git a/framework/Core/lib/Horde/Core/Factory/Share.php b/framework/Core/lib/Horde/Core/Factory/Share.php index 28367e33b..5774b7ef9 100644 --- a/framework/Core/lib/Horde/Core/Factory/Share.php +++ b/framework/Core/lib/Horde/Core/Factory/Share.php @@ -8,7 +8,7 @@ */ /** - * A Horde_Injector:: based Horde_Share:: factory. + * A Horde_Injector:: based Horde_Share factory. * * Copyright 2010 The Horde Project (http://www.horde.org/) * @@ -39,7 +39,7 @@ class Horde_Core_Factory_Share } /** - * Return the Horde_Share:: instance. + * Returns the Horde_Share_Base instance. * * @param string $app The application scope to use, if not the current * app. diff --git a/framework/Core/lib/Horde/Core/Factory/ShareBase.php b/framework/Core/lib/Horde/Core/Factory/ShareBase.php index 4f1558fde..68892988a 100644 --- a/framework/Core/lib/Horde/Core/Factory/ShareBase.php +++ b/framework/Core/lib/Horde/Core/Factory/ShareBase.php @@ -1,6 +1,6 @@ _share = $share; $this->_share->setStorage($GLOBALS['injector']->getInstance($this->_storageMap[get_class($this->_share)])); @@ -217,7 +217,7 @@ class Horde_Core_Share_Driver /** * Calls the share_remove hook before delegating to the share object. * - * @see Horde_Share::removeShare + * @see Horde_Share_Base::removeShare() */ public function shareRemoveCallback(Horde_Share_Object $share) { diff --git a/framework/Share/lib/Horde/Share.php b/framework/Share/lib/Horde/Share/Base.php similarity index 97% rename from framework/Share/lib/Horde/Share.php rename to framework/Share/lib/Horde/Share/Base.php index 4f77bf44a..eba271650 100644 --- a/framework/Share/lib/Horde/Share.php +++ b/framework/Share/lib/Horde/Share/Base.php @@ -1,8 +1,6 @@ @@ -18,7 +16,7 @@ * @author Michael J. Rubinsky * @package Horde_Share */ -class Horde_Share +class Horde_Share_Base { /** * The application we're managing shares for. @@ -119,7 +117,7 @@ class Horde_Share * list - Called immediately after a list of shares is received from * storage. Passed the userid, share list, and any parameters * passed to the listShare call. Should return the (possibly - * modified) share list. @see Horde_Share::listShares() for more + * modified) share list. @see listShares() for more * info. * * @@ -373,8 +371,8 @@ class Horde_Share /** * Adds a share to the shares system. * - * The share must first be created with Horde_Share::newShare(), and have - * any initial details added to it, before this function is called. + * The share must first be created with newShare(), and have any initial + * details added to it, before this function is called. * * @param Horde_Share_Object $share The new share object. * diff --git a/framework/Share/lib/Horde/Share/Datatree.php b/framework/Share/lib/Horde/Share/Datatree.php index 2b63e7ec0..a551f65e0 100644 --- a/framework/Share/lib/Horde/Share/Datatree.php +++ b/framework/Share/lib/Horde/Share/Datatree.php @@ -1,7 +1,4 @@ * @package Horde_Share */ -class Horde_Share_Datatree extends Horde_Share +class Horde_Share_Datatree extends Horde_Share_Base { /** * The Horde_Share_Object subclass to instantiate objects as diff --git a/framework/Share/lib/Horde/Share/Kolab.php b/framework/Share/lib/Horde/Share/Kolab.php index 218025969..1fe20a669 100644 --- a/framework/Share/lib/Horde/Share/Kolab.php +++ b/framework/Share/lib/Horde/Share/Kolab.php @@ -15,7 +15,7 @@ * @author Gunnar Wrobel * @package Horde_Share */ -class Horde_Share_kolab extends Horde_Share +class Horde_Share_Kolab extends Horde_Share_Base { const VERSION = 1; @@ -171,7 +171,7 @@ class Horde_Share_kolab extends Horde_Share * Returns an array of all shares that $userid has access to. * * @param string $userid The userid of the user to check access for. - * @param array $params @see Horde_Share::listShares + * @param array $params See listShares(). * * @return array The shares the user has access to. */ diff --git a/framework/Share/lib/Horde/Share/Sql.php b/framework/Share/lib/Horde/Share/Sql.php index 236e12b35..7089f7e10 100644 --- a/framework/Share/lib/Horde/Share/Sql.php +++ b/framework/Share/lib/Horde/Share/Sql.php @@ -16,7 +16,7 @@ /** * @package Horde_Share */ -class Horde_Share_Sql extends Horde_Share +class Horde_Share_Sql extends Horde_Share_Base { /* Share has user perms */ const SQL_FLAG_USERS = 1; @@ -50,7 +50,7 @@ class Horde_Share_Sql extends Horde_Share /** * - * @see Horde_Share::__construct() + * @see Horde_Share_Base::__construct() */ public function __construct($app, $user, Horde_Perms $perms, Horde_Group $groups) { @@ -630,7 +630,7 @@ class Horde_Share_Sql extends Horde_Share . ' AND (' . Horde_SQL::buildClause($this->_db, 'g.perm', '&', $perm) . '))'; } } catch (Horde_Group_Exception $e) { - $this->_logError($e, 'Horde_Share::getShareCriteria()'); + $this->_logError($e, 'Horde_Share_Sql::getShareCriteria()'); } } else { $where = '(' . Horde_SQL::buildClause($this->_db, 's.perm_guest', '&', $perm) . ')'; diff --git a/framework/Share/package.xml b/framework/Share/package.xml index 39a5324b8..35b8c1d30 100644 --- a/framework/Share/package.xml +++ b/framework/Share/package.xml @@ -3,16 +3,16 @@ Horde_Share pear.horde.org Horde Shared Permissions System - Horde_Share:: This class provides an interface to all shared -resources a user owns or has access to. + Horde_Share provides an interface to all shared resources a user +owns or has access to. Chuck Hagenbuch chuck chuck@horde.org yes - 2010-12-07 - + 2010-12-16 + 0.0.4 0.0.4 @@ -44,6 +44,7 @@ resources a user owns or has access to. + @@ -53,7 +54,6 @@ resources a user owns or has access to. - @@ -346,7 +346,7 @@ resources a user owns or has access to. - + @@ -515,7 +515,7 @@ Initial release as a PEAR package beta beta - 2010-12-07 + 2010-12-16 LGPL * Converted to Horde 4 coding standards -- 2.11.0