Skip to content

Commit 9754eb6

Browse files
serghey-rodinserghey-rodin
committed
no suspend on user level
1 parent 84a967a commit 9754eb6

File tree

9 files changed

+7
-117
lines changed

9 files changed

+7
-117
lines changed

‎web/templates/user/list_cron.html‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
<option value=""><?=__('apply to selected')?></option>
4242
<? if($panel[$user]['CRON_REPORTS'] == 'yes') echo '<option value="delete-cron-reports">'.__('turn off notifications').'</option>'; ?>
4343
<? if($panel[$user]['CRON_REPORTS'] == 'no') echo '<option value="add-cron-reports">'.__('turn on notifications').'</option>'; ?>
44-
<option value="suspend"><?=__('suspend')?></option>
45-
<option value="unsuspend"><?=__('unsuspend')?></option>
4644
<option value="delete"><?=__('delete')?></option>
4745
</select>
4846
</div>
@@ -91,15 +89,6 @@
9189
<div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
9290
<div class="actions-panel clearfix">
9391
<div class="actions-panel__col actions-panel__edit"><a href="/edit/cron/?job=<?=$data[$key]['JOB']?>"><?=__('edit')?> <i></i></a></div>
94-
<div class="actions-panel__col actions-panel__suspend">
95-
<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
96-
<?=__($spnd_action)?> <i class="do_<?=$spnd_action?>"></i>
97-
<input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" />
98-
<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
99-
<p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
100-
</div>
101-
</a>
102-
</div>
10392
<div class="actions-panel__col actions-panel__delete">
10493
<a id="delete_link_<?=$i?>" class="data-controls do_delete">
10594
<?=__('delete')?> <i class="do_delete"></i>

‎web/templates/user/list_db.html‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
if ($data[$key]['TYPE'] == 'mysql'){
2424
$mysql = 1;
2525

26-
$db_admin_link = "http://".$http_host."/phpmyadmin/";
26+
$db_myadmin_link = "http://".$http_host."/phpmyadmin/";
2727
if (!empty($_SESSION['DB_PMA_URL']))
2828
$db_myadmin_link = $_SESSION['DB_PMA_URL'];
2929
}
3030
if ($data[$key]['TYPE'] == 'pgsql'){
3131
$pgsql = 1;
32-
$db_admin_link = "http://".$http_host."/phppgadmin/";
32+
$db_pgadmin_link = "http://".$http_host."/phppgadmin/";
3333
if (!empty($_SESSION['DB_PGA_URL']))
3434
$db_pgadmin_link = $_SESSION['DB_PGA_URL'];
3535
}
@@ -41,6 +41,7 @@
4141
echo '<td class="step-right"><a class="vst" href="'.$db_pgadmin_link.'" target="_blank">phpPgAdmin</td>';
4242
}
4343
?>
44+
4445
<td class="l-sort-toolbar__search-box step-left">
4546
<form action="/search/" method="get">
4647
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -61,8 +62,6 @@
6162
<div class="l-select">
6263
<select name="action" id="">
6364
<option value=""><?=__('apply to selected')?></option>
64-
<option value="suspend"><?=__('suspend')?></option>
65-
<option value="unsuspend"><?=__('unsuspend')?></option>
6665
<option value="delete"><?=__('delete')?></option>
6766
</select>
6867
</div>
@@ -121,15 +120,6 @@
121120
<div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
122121
<div class="actions-panel clearfix">
123122
<div class="actions-panel__col actions-panel__edit"><a href="/edit/db/?database=<?=$key?>"><?=__('edit')?> <i></i></a></div>
124-
<div class="actions-panel__col actions-panel__suspend">
125-
<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
126-
<?=__($spnd_action)?> <i class="do_<?=$spnd_action?>"></i>
127-
<input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/db/?database=<?=$key?>&token=<?=$_SESSION['token']?>" />
128-
<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
129-
<p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
130-
</div>
131-
</a>
132-
</div>
133123
<div class="actions-panel__col actions-panel__delete">
134124
<a id="delete_link_<?=$i?>" class="data-controls do_delete">
135125
<?=__('delete')?> <i class="do_delete"></i>

‎web/templates/user/list_dns.html‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
<div class="l-select">
3434
<select name="action" id="">
3535
<option value=""><?=__('apply to selected')?></option>
36-
<option value="suspend"><?php print __('suspend');?></option>
37-
<option value="unsuspend"><?php print __('unsuspend');?></option>
3836
<option value="delete"><?php print __('delete');?></option>
3937
</select>
4038
</div>
@@ -84,15 +82,6 @@
8482
<div class="actions-panel__col actions-panel__logs"><a href="/list/dns/?domain=<?=$key?>"><?=__('list records',$data[$key]['RECORDS'])?> <i></i></a></div>
8583
<div class="actions-panel__col actions-panel__add"><a href="/add/dns/?domain=<?=$key?>"><?=__('add record')?> <i></i></a></div>
8684
<div class="actions-panel__col actions-panel__edit"><a href="/edit/dns/?domain=<?=$key?>"><?=__('edit')?> <i></i></a></div>
87-
<div class="actions-panel__col actions-panel__suspend">
88-
<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
89-
<?=__($spnd_action)?> <i class="do_<?=$spnd_action?>"></i>
90-
<input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/dns/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
91-
<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
92-
<p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
93-
</div>
94-
</a>
95-
</div>
9685
<div class="actions-panel__col actions-panel__delete">
9786
<a id="delete_link_<?=$i?>" class="data-controls do_delete">
9887
<?=__('delete')?> <i class="do_delete"></i>

‎web/templates/user/list_dns_rec.html‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@
1717
</td>
1818
<td>
1919
<form action="/bulk/dns/" method="post">
20+
<input type="hidden" name="domain" value="<?=htmlentities($_GET['domain'])?>" />
2021
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
2122
<div class="l-select">
22-
<select name="" id="">
23+
<select name="action" id="">
2324
<option value=""><?=__('apply to selected')?></option>
24-
<option value="suspend"><?php print __('suspend');?></option>
25-
<option value="unsuspend"><?php print __('unsuspend');?></option>
2625
<option value="delete"><?php print __('delete');?></option>
2726
</select>
2827
</div>
@@ -71,8 +70,8 @@
7170
v_unit_id="<?=$key?>" v_section="dns_rec">
7271
<div class="l-unit-toolbar clearfix">
7372
<div class="l-unit-toolbar__col l-unit-toolbar__col--left">
74-
<input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="check" value="check<?php echo $i ?>">
75-
<label for="check<?php echo $i ?>" class="check-label"></label>
73+
<input id="check<?=$data[$key]['ID']?>" class="ch-toggle" type="checkbox" name="record[]" value="<?=$data[$key]['ID']?>">
74+
<label for="check<?=$data[$key]['ID']?>" class="check-label"></label>
7675
</div>
7776
<!-- l-unit-toolbar__col -->
7877
<div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">

‎web/templates/user/list_mail.html‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@
3939
<div class="l-select">
4040
<select name="action" id="">
4141
<option value=""><?=__('apply to selected')?></option>
42-
<option value="suspend"><?=__('suspend')?></option>
43-
<option value="unsuspend"><?=__('unsuspend')?></option>
4442
<option value="delete"><?=__('delete')?></option>
4543
</select>
4644
</div>
@@ -100,15 +98,6 @@
10098
<div class="actions-panel__col actions-panel__logs"><a href="?domain=<?=$key?>"><?=__('list accounts',$data[$key]['ACCOUNTS'])?> <i></i></a></div>
10199
<div class="actions-panel__col actions-panel__add"><a href="/add/mail/?domain=<?=$key?>"><?=__('add account')?> <i></i></a></div>
102100
<div class="actions-panel__col actions-panel__edit"><a href="/edit/mail/?domain=<?=$key?>"><?=__('edit')?> <i></i></a></div>
103-
<div class="actions-panel__col actions-panel__suspend">
104-
<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
105-
<?=__($spnd_action)?> <i class="do_<?=$spnd_action?>"></i>
106-
<input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/mail/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
107-
<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
108-
<p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
109-
</div>
110-
</a>
111-
</div>
112101
<div class="actions-panel__col actions-panel__delete">
113102
<a id="delete_link_<?=$i?>" class="data-controls do_delete">
114103
<?=__('delete')?> <i class="do_delete"></i>

‎web/templates/user/list_mail_acc.html‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
3838
<div class="l-select">
3939
<select name="" id="">
4040
<option value=""><?=__('apply to selected')?></option>
41-
<option value="suspend"><?=__('suspend')?></option>
42-
<option value="unsuspend"><?=__('unsuspend')?></option>
4341
<option value="delete"><?=__('delete')?></option>
4442
</select>
4543
</div>
@@ -95,15 +93,6 @@
9593
<div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
9694
<div class="actions-panel clearfix">
9795
<div class="actions-panel__col actions-panel__edit"><a href="/edit/mail/?domain=<?=$_GET['domain']?>&account=<?=$key?>"><?=__('edit')?> <i></i></a></div>
98-
<div class="actions-panel__col actions-panel__suspend">
99-
<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
100-
<?=__($spnd_action)?> <i class="do_<?=$spnd_action?>"></i>
101-
<input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/mail/?domain=<?=$_GET['domain']?>&token=<?=$_SESSION['token']?>" />
102-
<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
103-
<p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
104-
</div>
105-
</a>
106-
</div>
10796
<div class="actions-panel__col actions-panel__delete">
10897
<a id="delete_link_<?=$i?>" class="data-controls do_delete">
10998
<?=__('delete')?> <i class="do_delete"></i>

‎web/templates/user/list_search.html‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -125,39 +125,6 @@
125125
<div class="actions-panel__col actions-panel__logs"><a href="http://<?=$data[$key]['RESULT']?>/vstats/" target="_blank"><?=__('open webstats')?> <i></i></a></div>
126126
<? } ?>
127127

128-
129-
<?
130-
if ($data[$key]['KEY'] == 'RECORD') {
131-
$spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&record_id='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
132-
$cnfrm = 'SUSPEND_RECORD_CONFIRMATION';
133-
}
134-
if ($data[$key]['KEY'] == 'ACCOUNT') {
135-
$spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&account='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
136-
$cnfrm = 'SUSPEND_USER_CONFIRMATION';
137-
}
138-
if ($data[$key]['KEY'] == 'JOB') {
139-
$spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?job='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
140-
$cnfrm = 'SUSPEND_CRON_CONFIRMATION';
141-
}
142-
if ($data[$key]['KEY'] == 'DATABASE') {
143-
$spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?database='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
144-
$cnfrm = 'SUSPEND_DATABASE_CONFIRMATION';
145-
}
146-
if (($data[$key]['KEY'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB') && ($data[$key]['KEY'] != 'DATABASE') ) {
147-
$spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?'.strtolower($data[$key]['KEY']).'='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
148-
$cnfrm = 'SUSPEND_DOMAIN_CONFIRMATION';
149-
}
150-
?>
151-
<div class="actions-panel__col actions-panel__suspend">
152-
<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
153-
<?=__($spnd_action)?> <i class="do_<?=$spnd_action?>"></i>
154-
<input type="hidden" name="<?=$spnd_action?>_url" value="<?=$spnd_lnk?>&token=<?=$_SESSION['token']?>" />
155-
<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
156-
<p class="confirmation"><?=__($cnfrm, $data[$key]['RESULT'])?></p>
157-
</div>
158-
</a>
159-
</div>
160-
161128
<?
162129
if ($data[$key]['KEY'] == 'RECORD') {
163130
$delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&record_id='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];

‎web/templates/user/list_user.html‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@
4444
<option value="rebuild db"><?=__('rebuild db')?></option>
4545
<option value="rebuild cron"><?=__('rebuild cron')?></option>
4646
<option value="update counters"><?=__('update counters')?></option>
47-
<option value="suspend"><?= __('suspend')?></option>
48-
<option value="unsuspend"><?=__('unsuspend')?></option>
4947
<option value="delete"><?=__('delete')?></option>
5048
</select>
5149
</div>
@@ -122,15 +120,6 @@
122120
<div class="actions-panel__col actions-panel__loginas"><a href="/login/?loginas=<?=$key?>""><?=__('login as')?> <i></i></a></div>
123121
<?}?>
124122
<div class="actions-panel__col actions-panel__edit"><a href="/edit/user/?user=<?=$key?>"><?=__('edit')?> <i></i></a></div>
125-
<div class="actions-panel__col actions-panel__suspend">
126-
<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
127-
<?=__($spnd_action)?> <i class="do_<?=$spnd_action?>"></i>
128-
<input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/user/?user=<?=$key?>&token=<?=$_SESSION['token']?>" />
129-
<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
130-
<p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
131-
</div>
132-
</a>
133-
</div>
134123
<div class="actions-panel__col actions-panel__delete">
135124
<a id="delete_link_<?=$i?>" class="data-controls do_delete">
136125
<?=__('delete')?> <i class="do_delete"></i>

‎web/templates/user/list_web.html‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232
<div class="l-select">
3333
<select name="action">
3434
<option value=""><?=__('apply to selected')?></option>
35-
<option value="suspend"><?=__('suspend')?></option>
36-
<option value="unsuspend"><?=__('unsuspend')?></option>
3735
<option value="delete"><?=__('delete')?></option>
3836
</select>
3937
</div>
@@ -140,15 +138,6 @@
140138
<? if (!empty($data[$key]['STATS'])) { ?>
141139
<div class="actions-panel__col actions-panel__logs"><a href="http://<?=$key?>/vstats/" target="_blank"><?=__('open webstats')?> <i></i></a></div>
142140
<? } ?>
143-
<div class="actions-panel__col actions-panel__suspend">
144-
<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
145-
<?=__($spnd_action)?> <i class="do_<?=$spnd_action?>"></i>
146-
<input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action ?>/web/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
147-
<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
148-
<p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
149-
</div>
150-
</a>
151-
</div>
152141
<div class="actions-panel__col actions-panel__delete">
153142
<a id="delete_link_<?=$i?>" class="data-controls do_delete">
154143
<?=__('delete')?> <i class="do_delete"></i>

0 commit comments

Comments
 (0)