Legacy OC_SubAdmin is now just a wrapper

This commit is contained in:
Roeland Jago Douma 2015-10-20 12:32:59 +02:00 committed by Thomas Müller
parent 0e9ab13943
commit c515628ebe
1 changed files with 57 additions and 79 deletions

View File

@ -24,8 +24,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
OC_Hook::connect('OC_User', 'post_deleteUser', 'OC_SubAdmin', 'post_deleteUser');
OC_Hook::connect('OC_User', 'post_deleteGroup', 'OC_SubAdmin', 'post_deleteGroup');
/**
* This class provides all methods needed for managing groups.
*
@ -42,10 +41,11 @@ class OC_SubAdmin{
* @return boolean
*/
public static function createSubAdmin($uid, $gid) {
$stmt = OC_DB::prepare('INSERT INTO `*PREFIX*group_admin` (`gid`,`uid`) VALUES(?,?)');
$stmt->execute(array($gid, $uid));
OC_Hook::emit( "OC_SubAdmin", "post_createSubAdmin", array( "gid" => $gid ));
return true;
$groupManager = \OC::$server->getGroupManager();
$userManager = \OC::$server->getUserManager();
$subAdmin = $groupManager->getSubAdmin();
return $subAdmin->createSubAdmin($userManager->get($uid), $groupManager->get($gid));
}
/**
@ -55,10 +55,11 @@ class OC_SubAdmin{
* @return boolean
*/
public static function deleteSubAdmin($uid, $gid) {
$stmt = OC_DB::prepare('DELETE FROM `*PREFIX*group_admin` WHERE `gid` = ? AND `uid` = ?');
$stmt->execute(array($gid, $uid));
OC_Hook::emit( "OC_SubAdmin", "post_deleteSubAdmin", array( "gid" => $gid ));
return true;
$groupManager = \OC::$server->getGroupManager();
$userManager = \OC::$server->getUserManager();
$subAdmin = $groupManager->getSubAdmin();
return $subAdmin->deleteSubAdmin($userManager->get($uid), $groupManager->get($gid));
}
/**
@ -67,11 +68,16 @@ class OC_SubAdmin{
* @return array
*/
public static function getSubAdminsGroups($uid) {
$stmt = OC_DB::prepare('SELECT `gid` FROM `*PREFIX*group_admin` WHERE `uid` = ?');
$result = $stmt->execute(array($uid));
$gids = array();
while($row = $result->fetchRow()) {
$gids[] = $row['gid'];
$groupManager = \OC::$server->getGroupManager();
$userManager = \OC::$server->getUserManager();
$subAdmin = $groupManager->getSubAdmin();
$groups = $subAdmin->getSubAdminsGroups($userManager->get($uid));
// New class returns IGroup[] so convert back
$gids = [];
foreach ($groups as $group) {
$gids[] = $group->getGID();
}
return $gids;
}
@ -82,11 +88,15 @@ class OC_SubAdmin{
* @return array
*/
public static function getGroupsSubAdmins($gid) {
$stmt = OC_DB::prepare('SELECT `uid` FROM `*PREFIX*group_admin` WHERE `gid` = ?');
$result = $stmt->execute(array($gid));
$uids = array();
while($row = $result->fetchRow()) {
$uids[] = $row['uid'];
$groupManager = \OC::$server->getGroupManager();
$subAdmin = $groupManager->getSubAdmin();
$users = $subAdmin->getGroupsSubAdmins($groupManager->get($gid));
// New class returns IUser[] so convert back
$uids = [];
foreach ($users as $user) {
$uids[] = $user->getUID();
}
return $uids;
}
@ -96,13 +106,20 @@ class OC_SubAdmin{
* @return array
*/
public static function getAllSubAdmins() {
$stmt = OC_DB::prepare('SELECT * FROM `*PREFIX*group_admin`');
$result = $stmt->execute();
$subadmins = array();
while($row = $result->fetchRow()) {
$subadmins[] = $row;
$groupManager = \OC::$server->getGroupManager();
$subAdmin = $groupManager->getSubAdmin();
$subAdmins = $subAdmin->getAllSubAdmins();
// New class returns IUser[] so convert back
$result = [];
foreach ($subAdmins as $subAdmin) {
$result[] = [
'gid' => $subAdmin['group']->getGID(),
'uid' => $subAdmin['user']->getUID(),
];
}
return $subadmins;
return $result;
}
/**
@ -112,13 +129,11 @@ class OC_SubAdmin{
* @return bool
*/
public static function isSubAdminofGroup($uid, $gid) {
$stmt = OC_DB::prepare('SELECT COUNT(*) AS `count` FROM `*PREFIX*group_admin` WHERE `uid` = ? AND `gid` = ?');
$result = $stmt->execute(array($uid, $gid));
$result = $result->fetchRow();
if($result['count'] >= 1) {
return true;
}
return false;
$groupManager = \OC::$server->getGroupManager();
$userManager = \OC::$server->getUserManager();
$subAdmin = $groupManager->getSubAdmin();
return $subAdmin->isSubAdminOfGroup($userManager->get($uid), $groupManager->get($gid));
}
/**
@ -127,18 +142,11 @@ class OC_SubAdmin{
* @return bool
*/
public static function isSubAdmin($uid) {
// Check if the user is already an admin
if(OC_Group::inGroup($uid, 'admin' )) {
return true;
}
$groupManager = \OC::$server->getGroupManager();
$userManager = \OC::$server->getUserManager();
$subAdmin = $groupManager->getSubAdmin();
$stmt = OC_DB::prepare('SELECT COUNT(*) AS `count` FROM `*PREFIX*group_admin` WHERE `uid` = ?');
$result = $stmt->execute(array($uid));
$result = $result->fetchRow();
if($result['count'] > 0) {
return true;
}
return false;
return $subAdmin->isSubAdmin($userManager->get($uid));
}
/**
@ -148,19 +156,11 @@ class OC_SubAdmin{
* @return bool
*/
public static function isUserAccessible($subadmin, $user) {
if(!self::isSubAdmin($subadmin)) {
return false;
}
if(OC_User::isAdminUser($user)) {
return false;
}
$accessiblegroups = self::getSubAdminsGroups($subadmin);
foreach($accessiblegroups as $accessiblegroup) {
if(OC_Group::inGroup($user, $accessiblegroup)) {
return true;
}
}
return false;
$groupManager = \OC::$server->getGroupManager();
$userManager = \OC::$server->getUserManager();
$subAdmin = $groupManager->getSubAdmin();
return $subAdmin->isUserAccessible($userManager->get($subadmin), $userManager->get($user));
}
/*
@ -169,26 +169,4 @@ class OC_SubAdmin{
public static function isGroupAccessible($subadmin, $group) {
return self::isSubAdminofGroup($subadmin, $group);
}
/**
* delete all SubAdmins by uid
* @param array $parameters
* @return boolean
*/
public static function post_deleteUser($parameters) {
$stmt = OC_DB::prepare('DELETE FROM `*PREFIX*group_admin` WHERE `uid` = ?');
$stmt->execute(array($parameters['uid']));
return true;
}
/**
* delete all SubAdmins by gid
* @param array $parameters
* @return boolean
*/
public static function post_deleteGroup($parameters) {
$stmt = OC_DB::prepare('DELETE FROM `*PREFIX*group_admin` WHERE `gid` = ?');
$stmt->execute(array($parameters['gid']));
return true;
}
}