Skip to content

Commit 022d613

Browse files
author
Kristan Kenney
committed
Merge branch 'feature/user-roles' into feature/user-auth-log
2 parents 66ddf6a + 13895cc commit 022d613

File tree

7 files changed

+44
-31
lines changed

7 files changed

+44
-31
lines changed

‎web/templates/admin/list_backup.html‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
<div class="l-sort clearfix noselect">
33
<div class="l-unit-toolbar__buttonstrip">
44
<a href="/schedule/backup/?token=<?=$_SESSION['token']?>" class="ui-button cancel" dir="ltr"><i class="fas fa-plus-circle status-icon green"></i><?=_('Create Backup')?></a>
5-
<a href="/list/backup/exclusions/" class="ui-button cancel" dir="ltr"><i class="fas fa-folder-minus status-icon orange"></i><?=_('backup exclusions')?></a>
5+
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin')) {?>
6+
<!-- Restrict ability to edit backup exclusions when impersonating 'admin' account -->
7+
<? } else { ?>
8+
<a href="/list/backup/exclusions/" class="ui-button cancel" dir="ltr"><i class="fas fa-folder-minus status-icon orange"></i><?=_('backup exclusions')?></a>
9+
<? } ?>
610
</div>
711
<div class="l-sort-toolbar clearfix">
812
<table>
@@ -81,15 +85,19 @@
8185
<div class="actions-panel clearfix">
8286
<div class="actions-panel__col actions-panel__download shortcut-d" key-action="href"><a href="/download/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('download')?>"><i class="fas fa-file-download status-icon lightblue status-icon dim"></i></a></div>
8387
<div class="actions-panel__col actions-panel__list shortcut-enter" key-action="href"><a href="/list/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('restore')?>"><i class="fas fa-undo status-icon green status-icon dim"></i></a></div>
84-
<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
85-
<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?=_('delete')?>">
86-
<i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
87-
<input type="hidden" name="delete_url" value="/delete/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>" />
88-
<div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
89-
<p class="confirmation"><?=sprintf(_('DELETE_BACKUP_CONFIRMATION'),$key)?></p>
90-
</div>
91-
</a>
92-
</div>
88+
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin')) {?>
89+
<!-- Restrict ability to delete backups when impersonating 'admin' account -->
90+
<? } else { ?>
91+
<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
92+
<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?=_('delete')?>">
93+
<i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
94+
<input type="hidden" name="delete_url" value="/delete/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>" />
95+
<div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
96+
<p class="confirmation"><?=sprintf(_('DELETE_BACKUP_CONFIRMATION'),$key)?></p>
97+
</div>
98+
</a>
99+
</div>
100+
<? } ?>
93101
</div>
94102
</div>
95103
</div>

‎web/templates/admin/list_cron.html‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
<div class="l-center">
22
<div class="l-sort clearfix noselect">
33
<div class="l-unit-toolbar__buttonstrip">
4-
<a href="/add/cron/" id="btn-create" class="ui-button cancel" dir="ltr"><i class="fas fa-plus-circle status-icon green"></i><?=_('Add Cron Job')?></a>
5-
<?
6-
if($panel[$user]['CRON_REPORTS'] == 'yes') {
7-
echo '<a class="ui-button cancel" dir="ltr" href="/delete/cron/reports/?token='.$_SESSION['token'].'"><i class="fas fa-toggle-off status-icon green"></i>'._('turn off notifications').'</a>';
8-
} else {
9-
echo '<a class="ui-button cancel" dir="ltr" href="/add/cron/reports/?token='.$_SESSION['token'].'"><i class="fas fa-toggle-off status-icon grey"></i>'._('turn on notifications').'</a>';
10-
}
11-
?>
4+
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin')) {?>
5+
<!-- Restrict ability to add cron jobs or disable/enable cron job notifications when impersonating 'admin' account -->
6+
<? } else { ?>
7+
<a href="/add/cron/" id="btn-create" class="ui-button cancel" dir="ltr"><i class="fas fa-plus-circle status-icon green"></i><?=_('Add Cron Job')?></a>
8+
<? if($panel[$user]['CRON_REPORTS'] == 'yes') { ?>
9+
<a class="ui-button cancel" dir="ltr" href="/delete/cron/reports/?token='.$_SESSION['token'].'"><i class="fas fa-toggle-off status-icon green"></i><?=_('turn off notifications')?></a>
10+
<? } else { ?>
11+
<a class="ui-button cancel" dir="ltr" href="/add/cron/reports/?token='.$_SESSION['token'].'"><i class="fas fa-toggle-off status-icon grey"></i><?=_('turn on notifications')?></a>
12+
<? } ?>
13+
<? } ?>
1214
</div>
1315
<ul class="context-menu sort-order animated fadeIn" style="display:none;">
1416
<li entity="sort-date" sort_as_int="1"><span class="name active"><?=_('Date')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
@@ -88,12 +90,16 @@
8890
<div class="clearfix l-unit__stat-col--left super-compact">
8991
<input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="job[]" value="<?php echo $key ?>">
9092
</div>
91-
<div class="clearfix l-unit__stat-col--left wide-5 truncate"><b><a href="/edit/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing Cron Job')?>"><?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?></a></b></div>
93+
94+
<div class="clearfix l-unit__stat-col--left wide-5 truncate"><b><a href="/edit/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing Cron Job')?>"><?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?></a></b> </div>
9295
<!-- START QUICK ACTION TOOLBAR AREA -->
9396
<div class="clearfix l-unit__stat-col--left compact-2 text-right">
9497
<div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
9598
<div class="actions-panel clearfix">
96-
<div class="actions-panel__col actions-panel__download shortcut-enter" key-action="href"><a href="/edit/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing Cron Job')?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim"></i></a></div>
99+
<? if (($_SESSION['userContext'] === 'admin') && (isset($_SESSION['look'])) && ($_SESSION['look'] === 'admin')) {?>
100+
<!-- Restrict other administrators from deleting or suspending 'admin' user cron jobs -->
101+
<div class="actions-panel__col actions-panel__download shortcut-enter" key-action="href"><a href="/edit/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing Cron Job')?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim"></i></a></div>
102+
<? } else { ?>
97103
<div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
98104
<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>" title="<?=_($spnd_action)?>">
99105
<i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
@@ -112,6 +118,7 @@
112118
</div>
113119
</a>
114120
</div>
121+
<? } ?>
115122
</div>
116123
</div>
117124
</div>

‎web/templates/admin/list_db.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['user'] === 'admin') && (!isset($_SESSION['look']))) {?>
4+
<? if (($_SESSION['user'] === 'admin') && (!isset($_SESSION['look'])) || ($_SESSION['look'] === 'admin')) {?>
55
<!-- Hide item creation button from 'admin' account unless impersonating another user -->
66
<? } else {?>
77
<a href="/add/db/" id="btn-create" class="ui-button cancel" dir="ltr"><i class="fas fa-plus-circle status-icon green"></i><?=_('Add Database')?></a>

‎web/templates/admin/list_dns.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['user'] === 'admin') && (!isset($_SESSION['look']))) {?>
4+
<? if (($_SESSION['user'] === 'admin') && (!isset($_SESSION['look'])) || ($_SESSION['look'] === 'admin')) {?>
55
<!-- Hide item creation button from 'admin' account unless impersonating another user -->
66
<? } else {?>
77
<a href="/add/dns/" id="btn-create" class="ui-button cancel" dir="ltr"><i class="fas fa-plus-circle status-icon green"></i><?=_('Add DNS Domain')?></a>

‎web/templates/admin/list_mail.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['user'] === 'admin') && (!isset($_SESSION['look']))) {?>
4+
<? if (($_SESSION['user'] === 'admin') && (!isset($_SESSION['look'])) || ($_SESSION['look'] === 'admin')) {?>
55
<!-- Hide item creation button from 'admin' account unless impersonating another user -->
66
<? } else {?>
77
<a href="/add/mail/" id="btn-create" class="ui-button cancel" dir="ltr"><i class="fas fa-plus-circle status-icon green"></i><?=_('Add Mail Domain')?></a>

‎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['user'] === 'admin') && (!isset($_SESSION['look']))) {?>
4+
<? if (($_SESSION['user'] === 'admin') && (!isset($_SESSION['look'])) || ($_SESSION['look'] === 'admin')) {?>
55
<!-- Hide item creation button from 'admin' account unless impersonating another user -->
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>

‎web/templates/user/list_cron.html‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22
<div class="l-sort clearfix noselect">
33
<div class="l-unit-toolbar__buttonstrip">
44
<a href="/add/cron/" id="btn-create" class="ui-button cancel" dir="ltr"><i class="fas fa-plus-circle status-icon green"></i><?=_('Add Cron Job')?></a>
5-
<?
6-
if($panel[$user]['CRON_REPORTS'] == 'yes') {
7-
echo '<a class="ui-button cancel" dir="ltr" href="/delete/cron/reports/?token='.$_SESSION['token'].'"><i class="fas fa-bell status-icon orange"></i>'._('turn off notifications').'</a>';
8-
} else {
9-
echo '<a class="ui-button cancel" dir="ltr" href="/add/cron/reports/?token='.$_SESSION['token'].'"><i class="fas fa-bell-slash status-icon orange"></i>'._('turn on notifications').'</a>';
10-
}
11-
?>
5+
<? if($panel[$user]['CRON_REPORTS'] == 'yes') { ?>
6+
<a class="ui-button cancel" dir="ltr" href="/delete/cron/reports/?token='.$_SESSION['token'].'"><i class="fas fa-toggle-off status-icon green"></i><?=_('turn off notifications')?></a>
7+
<? } else { ?>
8+
<a class="ui-button cancel" dir="ltr" href="/add/cron/reports/?token='.$_SESSION['token'].'"><i class="fas fa-toggle-off status-icon grey"></i><?=_('turn on notifications')?></a>
9+
<? } ?>
1210
</div>
1311
<ul class="context-menu sort-order animated fadeIn" style="display:none;">
1412
<li entity="sort-date" sort_as_int="1"><span class="name active"><?=_('Date')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>

0 commit comments

Comments
 (0)