From: Chuck Hagenbuch Date: Sun, 4 Oct 2009 03:10:49 +0000 (-0400) Subject: Remove references, consolidate includes X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=11999697816a84d2d5d0894eb86aeb530b79dc20;p=horde.git Remove references, consolidate includes --- diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Permission.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Permission.php index cc0ca2d74..eea928e44 100644 --- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Permission.php +++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Permission.php @@ -17,11 +17,10 @@ require_once 'Horde/Autoloader.php'; /** - * The Horde_Perms package does not work with Horde_Autoloader yet. - * - * @todo Fix once Horde_Perms has been converted to H4 + * Packages that aren't autoloadable yet */ require_once 'Horde/Perms.php'; +require_once 'Horde/Group.php'; /** * The Horde_Kolab_Storage_Permission provides a bridge between Horde Permission @@ -38,8 +37,8 @@ require_once 'Horde/Perms.php'; * @license http://www.fsf.org/copyleft/lgpl.html LGPL * @link http://pear.horde.org/index.php?package=Kolab_Storage */ -class Horde_Kolab_Storage_Permission extends Horde_Permission { - +class Horde_Kolab_Storage_Permission extends Horde_Permission +{ /** * The folder name. * @@ -70,7 +69,7 @@ class Horde_Kolab_Storage_Permission extends Horde_Permission { * @param array $perms A set of initial * permissions. */ - public function __construct(&$folder, $perms = null) + public function __construct($folder, $perms = null) { $this->setFolder($folder); if (!isset($perms)) { @@ -104,7 +103,7 @@ class Horde_Kolab_Storage_Permission extends Horde_Permission { * * @param Horde_Kolab_Storage_Folder $folder Kolab Folder object. */ - public function setFolder(Horde_Kolab_Storage_Folder &$folder) + public function setFolder(Horde_Kolab_Storage_Folder $folder) { $this->_folder = $folder; } @@ -192,8 +191,7 @@ class Horde_Kolab_Storage_Permission extends Horde_Permission { // Is it a group? if (substr($user, 0, 6) == 'group:') { if (!isset($groups)) { - require_once 'Horde/Group.php'; - $groups = &Group::singleton(); + $groups = Group::singleton(); } $group_id = $groups->getGroupId(substr($user, 6)); if (!is_a($group_id, 'PEAR_Error')) { @@ -233,8 +231,7 @@ class Horde_Kolab_Storage_Permission extends Horde_Permission { foreach ($user_perms as $userentry => $perms) { if ($user == 'groups') { if (!isset($groups)) { - require_once 'Horde/Group.php'; - $groups = &Group::singleton(); + $groups = Group::singleton(); } // Convert group id back to name $group_name = $groups->getGroupName($userentry); @@ -266,8 +263,7 @@ class Horde_Kolab_Storage_Permission extends Horde_Permission { foreach ($user_perms as $userentry => $perms) { if ($user == 'groups') { if (!isset($groups)) { - require_once 'Horde/Group.php'; - $groups = &Group::singleton(); + $groups = Group::singleton(); } // Convert group id back to name $group_name = $groups->getGroupName($userentry); @@ -359,8 +355,7 @@ class Horde_Kolab_Storage_Permission extends Horde_Permission { // If no user permissions are found, try group permissions. $groupperms = $this->getGroupPermissions(); if (!empty($groupperms)) { - require_once 'Horde/Group.php'; - $groups = &Group::singleton(); + $groups = Group::singleton(); $composite_perm = null; foreach ($this->data['groups'] as $group => $perm) { diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Perms.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Perms.php index 63f4920be..e722da95f 100644 --- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Perms.php +++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Perms.php @@ -5,8 +5,11 @@ * $Horde: framework/Kolab_Storage/lib/Horde/Kolab/Storage/Perms.php,v 1.3 2009/01/06 17:49:27 jan Exp $ */ -/** Basic Horde Permission library. **/ +/** + * Packages that aren't autoloadable yet + */ require_once 'Horde/Perms.php'; +require_once 'Horde/Group.php'; /** * The Horde_Permission_Kolab provides a bridge between Horde @@ -23,8 +26,8 @@ require_once 'Horde/Perms.php'; * @author Gunnar Wrobel * @package Kolab_Storage */ -class Horde_Permission_Kolab extends Horde_Permission { - +class Horde_Permission_Kolab extends Horde_Permission +{ /** * The folder name. * @@ -54,7 +57,7 @@ class Horde_Permission_Kolab extends Horde_Permission { these permissions belong to. * @param array $perms A set of initial permissions. */ - function Horde_Permission_Kolab(&$folder, $perms = null) + function Horde_Permission_Kolab($folder, $perms = null) { $this->setFolder($folder); if (!isset($perms)) { @@ -88,7 +91,7 @@ class Horde_Permission_Kolab extends Horde_Permission { * * @param string $folder Kolab Folder object. */ - function setFolder(&$folder) + function setFolder($folder) { $this->_folder = $folder; } @@ -175,8 +178,7 @@ class Horde_Permission_Kolab extends Horde_Permission { // Is it a group? if (substr($user, 0, 6) == 'group:') { if (!isset($groups)) { - require_once 'Horde/Group.php'; - $groups = &Group::singleton(); + $groups = Group::singleton(); } $group_id = $groups->getGroupId(substr($user, 6)); if (!is_a($group_id, 'PEAR_Error')) { @@ -216,8 +218,7 @@ class Horde_Permission_Kolab extends Horde_Permission { foreach ($user_perms as $userentry => $perms) { if ($user == 'groups') { if (!isset($groups)) { - require_once 'Horde/Group.php'; - $groups = &Group::singleton(); + $groups = Group::singleton(); } // Convert group id back to name $group_name = $groups->getGroupName($userentry); @@ -258,8 +259,7 @@ class Horde_Permission_Kolab extends Horde_Permission { foreach ($user_perms as $userentry => $perms) { if ($user == 'groups') { if (!isset($groups)) { - require_once 'Horde/Group.php'; - $groups = &Group::singleton(); + $groups = Group::singleton(); } // Convert group id back to name $group_name = $groups->getGroupName($userentry); @@ -365,8 +365,7 @@ class Horde_Permission_Kolab extends Horde_Permission { // If no user permissions are found, try group permissions. $groupperms = $this->getGroupPermissions(); if (!empty($groupperms)) { - require_once 'Horde/Group.php'; - $groups = &Group::singleton(); + $groups = Group::singleton(); $composite_perm = null; foreach ($this->data['groups'] as $group => $perm) {