Skip to content

Commit 2210734

Browse files
author
Kristan Kenney
committed
Allow 'admin' account to create/edit its own domain properties
1 parent b99b45d commit 2210734

File tree

8 files changed

+38
-38
lines changed

8 files changed

+38
-38
lines changed

‎web/templates/admin/list_backup.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="l-sort clearfix noselect">
33
<div class="l-unit-toolbar__buttonstrip">
44
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin')) {?>
5-
<!-- Restrict ability to create or edit backups or exclusions when impersonating 'admin' account -->
5+
<!-- Hide item creation button when impersonating 'admin' account -->
66
<? } else { ?>
77
<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>
88
<a href="/list/backup/exclusions/" class="ui-button cancel" dir="ltr"><i class="fas fa-folder-minus status-icon orange"></i><?=_('backup exclusions')?></a>

‎web/templates/admin/list_cron.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="l-sort clearfix noselect">
33
<div class="l-unit-toolbar__buttonstrip">
44
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin')) {?>
5-
<!-- Restrict ability to add cron jobs or disable/enable cron job notifications when impersonating 'admin' account -->
5+
<!-- Hide item creation button when impersonating 'admin' account -->
66
<? } else { ?>
77
<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>
88
<? if($panel[$user]['CRON_REPORTS'] == 'yes') { ?>

‎web/templates/admin/list_db.html‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1+
<?
2+
list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
3+
4+
$db_myadmin_link = "//".$http_host."/phpmyadmin/";
5+
$db_pgadmin_link = "//".$http_host."/phppgadmin/";
6+
7+
if (!empty($_SESSION['DB_PMA_ALIAS'])) {
8+
$db_myadmin_link = "//".$http_host."/".$_SESSION['DB_PMA_ALIAS']."/";
9+
}
10+
if (!empty($_SESSION['DB_PGA_ALIAS'])) {
11+
$db_pgadmin_link = "//".$http_host."/".$_SESSION['DB_PGA_ALIAS']."/";
12+
}
13+
?>
114
<div class="l-center">
215
<div class="l-sort clearfix noselect">
316
<div class="l-unit-toolbar__buttonstrip">
4-
<? if (($_SESSION['user'] === 'admin') && (!isset($_SESSION['look'])) || ($_SESSION['look'] === 'admin')) {?>
5-
<!-- Hide item creation button from 'admin' account unless impersonating another user -->
17+
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin')) {?>
18+
<!-- Hide item creation button when impersonating 'admin' account -->
619
<? } else {?>
720
<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>
8-
<? } ?>
9-
<?
10-
list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
11-
12-
$db_myadmin_link = "//".$http_host."/phpmyadmin/";
13-
$db_pgadmin_link = "//".$http_host."/phppgadmin/";
14-
15-
if (!empty($_SESSION['DB_PMA_ALIAS'])) {
16-
$db_myadmin_link = "//".$http_host."/".$_SESSION['DB_PMA_ALIAS']."/";
17-
}
18-
if (!empty($_SESSION['DB_PGA_ALIAS'])) {
19-
$db_pgadmin_link = "//".$http_host."/".$_SESSION['DB_PGA_ALIAS']."/";
20-
}
21-
?>
22-
<? if (($_SESSION['DB_SYSTEM'] === 'mysql') || ($_SESSION['DB_SYSTEM'] === 'mysql,pgsql') || ($_SESSION['DB_SYSTEM'] === 'pgsql,mysql')) {?>
23-
<a class="ui-button cancel" dir="ltr" href="<?php echo $db_myadmin_link; ?>" target="_blank"><i class="fas fa-database status-icon orange"></i>phpMyAdmin</a>
24-
<? } ?>
25-
<? if (($_SESSION['DB_SYSTEM'] === 'pgsql') || ($_SESSION['DB_SYSTEM'] === 'mysql,pgsql') || ($_SESSION['DB_SYSTEM'] === 'pgsql,mysql')) {?>
26-
<a class="ui-button cancel" dir="ltr" href="<?php echo $db_pgadmin_link; ?>" target="_blank"><i class="fas fa-database status-icon orange"></i>phpPgAdmin</a>
21+
<? if (($_SESSION['DB_SYSTEM'] === 'mysql') || ($_SESSION['DB_SYSTEM'] === 'mysql,pgsql') || ($_SESSION['DB_SYSTEM'] === 'pgsql,mysql')) {?>
22+
<a class="ui-button cancel" dir="ltr" href="<?php echo $db_myadmin_link; ?>" target="_blank"><i class="fas fa-database status-icon orange"></i>phpMyAdmin</a>
23+
<? } ?>
24+
<? if (($_SESSION['DB_SYSTEM'] === 'pgsql') || ($_SESSION['DB_SYSTEM'] === 'mysql,pgsql') || ($_SESSION['DB_SYSTEM'] === 'pgsql,mysql')) {?>
25+
<a class="ui-button cancel" dir="ltr" href="<?php echo $db_pgadmin_link; ?>" target="_blank"><i class="fas fa-database status-icon orange"></i>phpPgAdmin</a>
26+
<? } ?>
2727
<? } ?>
2828
</div>
2929
<ul class="context-menu sort-order animated fadeIn" style="display:none;">

‎web/templates/admin/list_dns.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
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'])) || ($_SESSION['look'] === 'admin')) {?>
5-
<!-- Hide item creation button from 'admin' account unless impersonating another user -->
4+
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin')) {?>
5+
<!-- Hide item creation button when impersonating 'admin' account -->
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>
88
<? } ?>

‎web/templates/admin/list_dns_rec.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div class="l-unit-toolbar__buttonstrip">
44
<a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/dns/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back')?></a>
55
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin')) {?>
6-
<!-- Restrict the ability to add or edit domain items when impersonating 'admin' user -->
6+
<!-- Hide item creation button when impersonating 'admin' account -->
77
<? } else { ?>
88
<a href="/add/dns/?domain=<?=htmlentities($_GET['domain'])?>" id="btn-create" class="ui-button cancel" dir="ltr"><i class="fas fa-plus-circle status-icon green"></i> <?=_('Add Record')?></a>
99
<a href="/edit/dns/?domain=<?=htmlentities($_GET['domain'])?>" id="btn-create" class="ui-button cancel" dir="ltr"><i class="fas fa-pencil-alt status-icon blue"></i> <?=_('Editing DNS Domain')?></a>

‎web/templates/admin/list_mail.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
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'])) || ($_SESSION['look'] === 'admin')) {?>
5-
<!-- Hide item creation button from 'admin' account unless impersonating another user -->
4+
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin')) {?>
5+
<!-- Hide item creation button when impersonating 'admin' account -->
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>
88
<? } ?>

‎web/templates/admin/list_mail_acc.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div class="l-unit-toolbar__buttonstrip">
88
<a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/mail/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back')?></a>
99
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin')) {?>
10-
<!-- Restrict ability to create or edit domain items when impersonating 'admin' account -->
10+
<!-- Hide item creation button when impersonating 'admin' account -->
1111
<? } else { ?>
1212
<a href="/add/mail/?domain=<?=htmlentities($_GET['domain'])?>" id="btn-create" class="ui-button cancel" dir="ltr"><i class="fas fa-plus-circle status-icon green"></i><?=_('Add Mail Account')?></a>
1313
<a href="/edit/mail/?domain=<?=htmlentities($_GET['domain'])?>" id="btn-create" class="ui-button cancel" dir="ltr"><i class="fas fa-pencil-alt status-icon blue"></i><?=_('Editing Mail Domain')?></a>
@@ -103,7 +103,7 @@
103103
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin')) {?>
104104
<b><?=$key."@".$_GET['domain']?></b>
105105
<? } else { ?>
106-
<b><a href="/edit/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing Mail Account')?>: <?=$key?>@<?=htmlspecialchars($_GET['domain'])?>"><?=$key."@".$_GET['domain']?></a></b></div>
106+
<b><a href="/edit/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing Mail Account')?>: <?=$key?>@<?=htmlspecialchars($_GET['domain'])?>"><?=$key."@".$_GET['domain']?></a></b>
107107
<? } ?>
108108
</div>
109109
<!-- START QUICK ACTION TOOLBAR AREA -->
@@ -129,15 +129,15 @@
129129
<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
130130
<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?=_('delete')?>">
131131
<i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
132-
<input type="hidden" name="delete_url" value="/delete/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?=$key?>&token=<?=$_SESSION['token']?>" />
133-
<div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
134-
<p class="confirmation"><?=sprintf(_('DELETE_MAIL_ACCOUNT_CONFIRMATION'),$key)?></p>
135-
</div>
132+
<input type="hidden" name="delete_url" value="/delete/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?=$key?>&token=<?=$_SESSION['token']?>" />
133+
<div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
134+
<p class="confirmation"><?=sprintf(_('DELETE_MAIL_ACCOUNT_CONFIRMATION'),$key)?></p>
135+
</div>
136136
</a>
137137
</div>
138138
<? } ?>
139-
</div>
140-
</div>
139+
</div>
140+
</div>
141141
<!-- END QUICK ACTION TOOLBAR AREA -->
142142
</div>
143143

‎web/templates/admin/list_web.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
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'])) || ($_SESSION['look'] === 'admin')) {?>
5-
<!-- Hide item creation button from 'admin' account unless impersonating another user -->
4+
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin')) {?>
5+
<!-- 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>
88
<? } ?>

0 commit comments

Comments
 (0)