github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-07-06 04:51:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix for banlist deletion

Browse source
This commit is contained in:
Serghey Rodin 2016-06-28 16:18:17 +03:00
parent 48cf929e22
commit b9c29b20bd
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/v-list-firewall-ban
View file

@ -25,7 +25,7 @@ json_list() {
eval $str eval $str
echo -n ' "'$IP'": { echo -n ' "'$IP'": {
"IP": "'$IP'", "IP": "'$IP'",
"CHAIN": "'$COMMENT'", "CHAIN": "'$CHAIN'",
"TIME": "'$TIME'", "TIME": "'$TIME'",
"DATE": "'$DATE'" "DATE": "'$DATE'"
}' }'

7
web/templates/admin/list_firewall_banlist.html
View file

@ -47,12 +47,13 @@
foreach ($data as $key => $value) { foreach ($data as $key => $value) {
++$i; ++$i;
list($ip,$chain) = explode(":",$key); list($ip,$chain) = explode(":",$key);
?> ?>
<div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended';?>"> <div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended';?>">
<div class="l-unit-toolbar clearfix"> <div class="l-unit-toolbar clearfix">
<div class="l-unit-toolbar__col l-unit-toolbar__col--left"> <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
<input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="ipchain[]" value="<?php echo $ip . ':' . $chain ?>"> <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="ipchain[]" value="<?php echo $ip . ':' . $value['CHAIN'] ?>">
<label for="check<?php echo $i ?>" class="check-label"></label> <label for="check<?php echo $i ?>" class="check-label"></label>
</div> </div>
<!-- l-unit-toolbar__col --> <!-- l-unit-toolbar__col -->
@ -61,7 +62,7 @@
<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js"> <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
<a id="delete_link_<?=$i?>" class="data-controls do_delete"> <a id="delete_link_<?=$i?>" class="data-controls do_delete">
<?=__('delete')?> <i class="do_delete"></i> <?=__('delete')?> <i class="do_delete"></i>
<input type="hidden" name="delete_url" value="/delete/firewall/banlist/?ip=<?=$ip?>&chain=<?=$chain?>&token=<?=$_SESSION['token']?>" /> <input type="hidden" name="delete_url" value="/delete/firewall/banlist/?ip=<?=$ip?>&chain=<?=$value['CHAIN']?>&token=<?=$_SESSION['token']?>" />
<div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>"> <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
<p class="confirmation"><?=__('DELETE_IP_CONFIRMATION',$key)?></p> <p class="confirmation"><?=__('DELETE_IP_CONFIRMATION',$key)?></p>
</div> </div>
@ -82,7 +83,7 @@
<div class="l-unit__stats"> <div class="l-unit__stats">
<div class="clearfix l-unit__stat-col--left wide"><b><?=$data[$key]['DATE']?></b> &nbsp; <?=$data[$key]['TIME']?> </div> <div class="clearfix l-unit__stat-col--left wide"><b><?=$data[$key]['DATE']?></b> &nbsp; <?=$data[$key]['TIME']?> </div>
<div class="clearfix l-unit__stat-col--left"></div> <div class="clearfix l-unit__stat-col--left"></div>
<div class="clearfix l-unit__stat-col--left wide-3"><b><?=$chain?></b></div> <div class="clearfix l-unit__stat-col--left wide-3"><b><?=$value['CHAIN']?></b></div>
<div class="clearfix l-unit__stat-col--left"><b><?=$ip?></b></div> <div class="clearfix l-unit__stat-col--left"><b><?=$ip?></b></div>
</div> </div>
<!-- /.l-unit__stats --> <!-- /.l-unit__stats -->