Skip to content

Commit 241cb06

Browse files
author
Kristan Kenney
committed
Add restricted admin var
1 parent 24ef7d9 commit 241cb06

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

bin/v-list-sys-config

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ json_list() {
7171
"ENFORCE_SUBDOMAIN_OWNERSHIP": "'$ENFORCE_SUBDOMAIN_OWNERSHIP'",
7272
"DEBUG_MODE": "'$DEBUG_MODE'",
7373
"API": "'$API'",
74-
"API_ALLOWED_IP": "'$API_ALLOWED_IP'"
74+
"API_ALLOWED_IP": "'$API_ALLOWED_IP'",
75+
"RESTRICTED_ADMIN": "'$RESTRICTED_ADMIN'"
7576
}
7677
}'
7778
}
@@ -170,6 +171,7 @@ shell_list() {
170171
echo "Release Branch: $RELEASE_BRANCH"
171172
echo "Debug Mode: $DEBUG_MODE"
172173
echo "Theme: $THEME"
174+
echo "Restricted Admin Access: $RESTRICTED_ADMIN"
173175
echo "Updates: Notify by email: $UPGRADE_SEND_EMAIL"
174176
echo "Updates: Email install log: $UPGRADE_SEND_EMAIL_LOG"
175177
}
@@ -185,7 +187,8 @@ plain_list() {
185187
echo -ne "$FILE_MANAGER\t$REPOSITORY\t$VERSION\t$DEMO_MODE\t$RELEASE_BRANCH\t"
186188
echo -ne "$SMTP_RELAY_HOST\t$SMTP_RELAY_PORT\t$SMTP_RELAY_USER\t"
187189
echo -ne "$UPGRADE_SEND_EMAIL\t$UPGRADE_SEND_EMAIL_LOG\t$THEME\t$LANGUAGE\t$BACKUP_GZIP\t"
188-
echo -e "$BACKUP\t$WEBMAIL_ALIAS\t$DB_PMA_URL\t$DB_PGA_URL\t\t$DEBUG_MODE\t$API\t$API_ALLOWED_IP"
190+
echo -ne "$BACKUP\t$WEBMAIL_ALIAS\t$DB_PMA_URL\t$DB_PGA_URL\t\t$DEBUG_MODE\t$API\t$API_ALLOWED_IP"
191+
echo -e "$RESTRICTED_ADMIN"
189192
}
190193

191194

@@ -202,7 +205,8 @@ csv_list() {
202205
echo -n "'SMTP_RELAY','SMTP_RELAY_HOST','SMTP_RELAY_PORT','SMTP_RELAY_USER',"
203206
echo -n "'UPGRADE_SEND_EMAIL','UPGRADE_SEND_EMAIL_LOG',"
204207
echo -n "'THEME', 'LANGUAGE','BACKUP_GZIP','BACKUP','WEBMAIL_ALIAS',"
205-
echo -n "'DB_PMA_ALIAS','DB_PGA_ALIAS','DEBUG_MODE','API','API_ALLOWED_IP'"
208+
echo -n "'DB_PMA_ALIAS','DB_PGA_ALIAS','DEBUG_MODE','API','API_ALLOWED_IP',"
209+
echo -n "'RESTRICTED_ADMIN'"
206210
echo
207211
echo -n "'$WEB_SYSTEM','$WEB_RGROUPS','$WEB_PORT','$WEB_SSL',"
208212
echo -n "'$WEB_SSL_PORT','$WEB_BACKEND','$PROXY_SYSTEM','$PROXY_PORT',"
@@ -214,7 +218,7 @@ csv_list() {
214218
echo -n "'$SMTP_RELAY','$SMTP_RELAY_HOST','$SMTP_RELAY_PORT','$SMTP_RELAY_USER',"
215219
echo -n "'$UPGRADE_SEND_EMAIL','$UPGRADE_SEND_EMAIL_LOG','$THEME','$LANGUAGE',"
216220
echo -n "'$BACKUP_GZIP','$BACKUP','$WEBMAIL_ALIAS','$DB_PMA_URL','$DB_PGA_URL'"
217-
echo -n "'$DEBUG_MODE','$API','$API_ALLOWED_IP'"
221+
echo -n "'$DEBUG_MODE','$API','$API_ALLOWED_IP','$RESTRICTED_ADMIN"
218222

219223
echo
220224
}

web/templates/admin/list_web.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="l-center">
22
<div class="l-sort clearfix noselect">
33
<div class="l-unit-toolbar__buttonstrip">
4-
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin')) {?>
4+
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['RESTRICTED_ADMIN'] === 'true')) {?>
55
<!-- Hide item creation button when impersonating 'admin' account -->
66
<? } else {?>
77
<a href="/add/web/" id="btn-create" class="ui-button cancel" dir="ltr"><i class="fas fa-plus-circle status-icon green"></i><?=_('Add Web Domain')?></a>

0 commit comments

Comments
 (0)