From 16262e3fd2c00475cc3b43a2684a45cc8ae70829 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Wed, 19 Feb 2014 17:56:12 +0100
Subject: [PATCH] Move isadmin to template and rename it to oc_isadmin
---
core/js/js.js | 1 +
core/templates/layout.user.php | 2 +-
settings/js/isadmin.php | 20 --------------------
settings/js/users.js | 4 ++--
settings/routes.php | 2 --
settings/templates/users.php | 2 --
6 files changed, 4 insertions(+), 27 deletions(-)
delete mode 100644 settings/js/isadmin.php
diff --git a/core/js/js.js b/core/js/js.js
index d4d2583f1e5..3b3e0e99455 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -10,6 +10,7 @@ var oc_webroot;
var oc_current_user = document.getElementsByTagName('head')[0].getAttribute('data-user');
var oc_requesttoken = document.getElementsByTagName('head')[0].getAttribute('data-requesttoken');
+var oc_isadmin = document.getElementsByTagName('head')[0].getAttribute('data-isAdmin');
window.oc_config = window.oc_config || {};
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index bc1c700402e..d46f97852cc 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -6,7 +6,7 @@
<!--[if gt IE 9]><html class="ng-csp ie"><![endif]-->
<!--[if !IE]><!--><html class="ng-csp"><!--<![endif]-->
- <head data-user="<?php p($_['user_uid']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>">
+ <head data-isAdmin="<?php p(OC_User::isAdminUser(OC_User::getUser()) ? 'true' : 'false'); ?>" data-user="<?php p($_['user_uid']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>">
<title>
<?php
p(!empty($_['application'])?$_['application'].' - ':'');
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 6886db668b5..9872fb27e61 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -248,7 +248,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(
@@ -280,7 +280,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
--
GitLab