summaryrefslogtreecommitdiffstats
path: root/lib/app.php
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2013-01-14 19:45:17 +0100
committerLukas Reschke <lukas@statuscode.ch>2013-01-14 19:45:17 +0100
commit31b1a73e1f508a33843835b632ee05c7bfc2aaaf (patch)
treee590662315799744155151b2c6c9148d2e9e860e /lib/app.php
parentfa78fbe0c3e281c91468bee92c871be7b1e48c79 (diff)
downloadnextcloud-server-31b1a73e1f508a33843835b632ee05c7bfc2aaaf.tar.gz
nextcloud-server-31b1a73e1f508a33843835b632ee05c7bfc2aaaf.zip
Check if user is admin - bool
There was no "isAdminUser()" function which returned bool. This is irritiating as there were a loooooooot of places in the code which checked this itself with `OC_Group::inGroup($uid, 'admin)` - why not use a function for this? (Especially if you consider that we might change the group name in the future, which would lead to problems then) Additionally, @Raydiation needed such a method for his AppFramework :)
Diffstat (limited to 'lib/app.php')
-rw-r--r--lib/app.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/app.php b/lib/app.php
index e60bce2a201..3b039733fe5 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -313,14 +313,14 @@ class OC_App{
$settings[]=array( "id" => "settings", "order" => 1000, "href" => OC_Helper::linkToRoute( "settings_settings" ), "name" => $l->t("Settings"), "icon" => OC_Helper::imagePath( "settings", "settings.svg" ));
//SubAdmins are also allowed to access user management
- if(OC_SubAdmin::isSubAdmin($_SESSION["user_id"]) || OC_Group::inGroup( $_SESSION["user_id"], "admin" )) {
+ if(OC_SubAdmin::isSubAdmin(OC_User::getUser())) {
// admin users menu
$settings[] = array( "id" => "core_users", "order" => 2, "href" => OC_Helper::linkToRoute( "settings_users" ), "name" => $l->t("Users"), "icon" => OC_Helper::imagePath( "settings", "users.svg" ));
}
// if the user is an admin
- if(OC_Group::inGroup( $_SESSION["user_id"], "admin" )) {
+ if(OC_User::isAdminUser(OC_User::getUser())) {
// admin apps menu
$settings[] = array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkToRoute( "settings_apps" ).'?installed', "name" => $l->t("Apps"), "icon" => OC_Helper::imagePath( "settings", "apps.svg" ));