diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2013-01-14 12:53:18 -0800 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2013-01-14 12:53:18 -0800 |
| commit | 53ca0db434f3ad8d043a0a9b76bd59f22af38f99 (patch) | |
| tree | fd69b40c08932941f31edbb57d8911d847ff230a /lib/subadmin.php | |
| parent | 8b2307ce4b258f103506f85e787acbd552e83302 (diff) | |
| parent | eab6d7eb23f66ac4a662a036336b292138e4484c (diff) | |
| download | nextcloud-server-53ca0db434f3ad8d043a0a9b76bd59f22af38f99.tar.gz nextcloud-server-53ca0db434f3ad8d043a0a9b76bd59f22af38f99.zip | |
Merge pull request #1177 from owncloud/OC_User--isAdminUser()
Check if user is admin - bool
Diffstat (limited to 'lib/subadmin.php')
| -rw-r--r-- | lib/subadmin.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/subadmin.php b/lib/subadmin.php index 9e83e6da430..8cda7240ac9 100644 --- a/lib/subadmin.php +++ b/lib/subadmin.php @@ -122,6 +122,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; + } + $stmt = OC_DB::prepare('SELECT COUNT(*) AS `count` FROM `*PREFIX*group_admin` WHERE `uid` = ?'); $result = $stmt->execute(array($uid)); $result = $result->fetchRow(); @@ -141,7 +146,7 @@ class OC_SubAdmin{ if(!self::isSubAdmin($subadmin)) { return false; } - if(OC_Group::inGroup($user, 'admin')) { + if(OC_User::isAdminUser($user)) { return false; } $accessiblegroups = self::getSubAdminsGroups($subadmin); |