github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-21 05:44:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:serghey-rodin/vesta

Browse source
This commit is contained in:
skid 2016-08-09 16:25:42 +03:00
commit 652ba9c8f6
3 changed files with 10 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
web/templates/admin/add_web.html
View file

@ -62,14 +62,10 @@
<td> <td>
<select class="vst-list" name="v_ip"> <select class="vst-list" name="v_ip">
<?php <?php
foreach ($ips as $key => $value) { foreach ($ips as $ip => $value) {
$display_ip = $key; $display_ip = htmlentities(empty($value['NAT']) ? $ip : "{$ip} → {$value['NAT']}");
if (!empty($value['NAT'])) $display_ip = $value['NAT']; $ip_selected = (!empty($v_ip) && $ip == $_POST['v_ip']) ? 'selected' : '';
echo "\t\t\t\t<option value=\"".htmlentities($display_ip)."\""; echo "\t\t\t\t<option value=\"{$ip}\" {$ip_selected}>{$display_ip}</option>\n";
if ((!empty($v_ip)) && ( $display_ip == $_POST['v_ip'])){
echo ' selected';
}
echo ">".htmlentities($display_ip)."</option>\n";
} }
?> ?>
</select> </select>

13
web/templates/admin/edit_web.html
View file

@ -65,15 +65,10 @@
<td> <td>
<select class="vst-list" name="v_ip"> <select class="vst-list" name="v_ip">
<?php <?php
foreach ($ips as $key => $value) { foreach ($ips as $ip => $value) {
$display_ip = $key; $display_ip = htmlentities(empty($value['NAT']) ? $ip : "{$ip} → {$value['NAT']}");
if (!empty($value['NAT'])) $display_ip = $value['NAT']; $ip_selected = ((!empty($v_ip) && $ip == $v_ip) || $v_ip == "'{$ip}'") ? 'selected' : '';
$skey = "'".$display_ip."'"; echo "\n\t\t\t\t\t\t\t\t\t\t\t\t<option value=\"{$ip}\" {$ip_selected}>{$display_ip}</option>\n";
echo "\n\t\t\t\t\t\t\t\t\t\t\t\t<option value=\"".htmlentities($display_ip)."\"";
if ((!empty($v_ip)) && ( $display_ip == $v_ip ) || ( $skey == $v_ip )){
echo ' selected';
}
echo ">".htmlentities($display_ip)."</option>\n";
} }
?> ?>
</select> </select>

3
web/templates/admin/list_web.html
View file

@ -57,6 +57,7 @@
<div class="l-center units narrow"> <div class="l-center units narrow">
<?php <?php
$ips = json_decode(shell_exec(VESTA_CMD.'v-list-sys-ips json'), true);
foreach ($data as $key => $value) { foreach ($data as $key => $value) {
++$i; ++$i;
if ($data[$key]['SUSPENDED'] == 'yes') { if ($data[$key]['SUSPENDED'] == 'yes') {
@ -178,7 +179,7 @@ sort-name="<?=$key?>" sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-dis
</div> </div>
<!-- /.l-unit__name --> <!-- /.l-unit__name -->
<div class="l-unit__ip"> <div class="l-unit__ip">
<?=str_replace('.', '<span>.</span>', $data[$key]['IP'])?> <?=empty($ips[$data[$key]['IP']]['NAT']) ? $data[$key]['IP'] : "{$data[$key]['IP']} → {$ips[$data[$key]['IP']]['NAT']}"; ?>
</div> </div>
<!-- /.l-unit__ip --> <!-- /.l-unit__ip -->
<div class="l-unit__stats"> <div class="l-unit__stats">