diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2014-02-20 19:01:28 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2014-02-20 19:01:28 +0100 |
| commit | 917a505af4c2182e585513e5188da17ac00b0cf1 (patch) | |
| tree | b168a2b28c138b6d30f64d6b0d723f10f3748558 /settings | |
| parent | dde9193b2b523a86220cec494b60f15ef3457e65 (diff) | |
| parent | 169f4cf7ff26932ec1e07bfc3676f22c06859db7 (diff) | |
| download | nextcloud-server-917a505af4c2182e585513e5188da17ac00b0cf1.tar.gz nextcloud-server-917a505af4c2182e585513e5188da17ac00b0cf1.zip | |
Merge pull request #7291 from owncloud/adminess-raghu
Move isadmin to template and rename it to oc_isadmin
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/js/isadmin.php | 20 | ||||
| -rw-r--r-- | settings/js/users.js | 4 | ||||
| -rw-r--r-- | settings/routes.php | 2 | ||||
| -rw-r--r-- | settings/templates/users.php | 2 |
4 files changed, 2 insertions, 26 deletions
diff --git a/settings/js/isadmin.php b/settings/js/isadmin.php deleted file mode 100644 index 13a8ba1d312..00000000000 --- a/settings/js/isadmin.php +++ /dev/null @@ -1,20 +0,0 @@ -<?php -/** - * Copyright (c) 2013 Lukas Reschke <lukas@statuscode.ch> - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. - */ - -// Set the content type to Javascript -header("Content-type: text/javascript"); - -// Disallow caching -header("Cache-Control: no-cache, must-revalidate"); -header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); - -if (OC_User::isAdminUser(OC_User::getUser())) { - echo("var isadmin = true;"); -} else { - echo("var isadmin = false;"); -} diff --git a/settings/js/users.js b/settings/js/users.js index 1028a003bcf..160d0a8d9d2 100644 --- a/settings/js/users.js +++ b/settings/js/users.js @@ -273,7 +273,7 @@ var UserList = { if (user === OC.currentUser && group === 'admin') { return false; } - if (!isadmin && checked.length === 1 && checked[0] === group) { + if (!oc_isadmin && checked.length === 1 && checked[0] === group) { return false; } $.post( @@ -305,7 +305,7 @@ var UserList = { }); }; var label; - if (isadmin) { + if (oc_isadmin) { label = t('settings', 'add group'); } else { label = null; diff --git a/settings/routes.php b/settings/routes.php index 60f9d8e1001..895a9f5ccea 100644 --- a/settings/routes.php +++ b/settings/routes.php @@ -72,5 +72,3 @@ $this->create('settings_ajax_setloglevel', '/settings/ajax/setloglevel.php') ->actionInclude('settings/ajax/setloglevel.php'); $this->create('settings_ajax_setsecurity', '/settings/ajax/setsecurity.php') ->actionInclude('settings/ajax/setsecurity.php'); -$this->create('isadmin', '/settings/js/isadmin.js') - ->actionInclude('settings/js/isadmin.php'); diff --git a/settings/templates/users.php b/settings/templates/users.php index aabda0fac2f..937b40611b0 100644 --- a/settings/templates/users.php +++ b/settings/templates/users.php @@ -14,8 +14,6 @@ unset($items['admin']); $_['subadmingroups'] = array_flip($items); ?> -<script type="text/javascript" src="<?php print_unescaped(OC_Helper::linkToRoute('isadmin'));?>"></script> - <div id="controls"> <form id="newuser" autocomplete="off"> <input id="newusername" type="text" placeholder="<?php p($l->t('Login Name'))?>" /> <input |