diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-07-31 15:00:04 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-07-31 15:00:04 -0400 |
| commit | 94ce8f2168bdd9897f54ec433ad7017fb3db1cc8 (patch) | |
| tree | db031ac7fd4788be6593e258d170c8f134533e4b /lib/app.php | |
| parent | 269922543eaf9e69dbf5a15fa0ba34704040b09c (diff) | |
| parent | dfae77dec1650f171d09d4bde88ab74029f6e8c7 (diff) | |
| download | nextcloud-server-94ce8f2168bdd9897f54ec433ad7017fb3db1cc8.tar.gz nextcloud-server-94ce8f2168bdd9897f54ec433ad7017fb3db1cc8.zip | |
Merge branch 'master' into share_api
Conflicts:
apps/contacts/lib/app.php
apps/files_sharing/js/share.js
Diffstat (limited to 'lib/app.php')
| -rwxr-xr-x | lib/app.php | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/app.php b/lib/app.php index 56132c08671..d1018c37aa7 100755 --- a/lib/app.php +++ b/lib/app.php @@ -292,16 +292,21 @@ class OC_App{ if (OC_User::isLoggedIn()) { // personal menu $settings[] = array( "id" => "personal", "order" => 1, "href" => OC_Helper::linkTo( "settings", "personal.php" ), "name" => $l->t("Personal"), "icon" => OC_Helper::imagePath( "settings", "personal.svg" )); - + // if there're some settings forms if(!empty(self::$settingsForms)) // settings menu $settings[]=array( "id" => "settings", "order" => 1000, "href" => OC_Helper::linkTo( "settings", "settings.php" ), "name" => $l->t("Settings"), "icon" => OC_Helper::imagePath( "settings", "settings.svg" )); - - // if the user is an admin - if(OC_Group::inGroup( $_SESSION["user_id"], "admin" )) { + + //SubAdmins are also allowed to access user management + if(OC_SubAdmin::isSubAdmin($_SESSION["user_id"]) || OC_Group::inGroup( $_SESSION["user_id"], "admin" )){ // admin users menu $settings[] = array( "id" => "core_users", "order" => 2, "href" => OC_Helper::linkTo( "settings", "users.php" ), "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" )) { // admin apps menu $settings[] = array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkTo( "settings", "apps.php" ).'?installed', "name" => $l->t("Apps"), "icon" => OC_Helper::imagePath( "settings", "apps.svg" )); |