github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-14 10:37:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into feature/800

Browse source 
Conflicts:
	bin/v-add-letsencrypt-user
This commit is contained in:
Derrick Hammer 2016-09-25 02:37:42 -04:00
commit 4daa17f54f
248 changed files with 6127 additions and 2139 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>
<select class="vst-list" name="v_ip">
<?php
foreach ($ips as $key => $value) {
$display_ip = $key;
if (!empty($value['NAT'])) $display_ip = $value['NAT'];
echo "\t\t\t\t<option value=\"".htmlentities($display_ip)."\"";
if ((!empty($v_ip)) && ( $display_ip == $_POST['v_ip'])){
echo ' selected';
}
echo ">".htmlentities($display_ip)."</option>\n";
foreach ($ips as $ip => $value) {
$display_ip = htmlentities(empty($value['NAT']) ? $ip : "{$value['NAT']}");
$ip_selected = (!empty($v_ip) && $ip == $_POST['v_ip']) ? 'selected' : '';
echo "\t\t\t\t<option value=\"{$ip}\" {$ip_selected}>{$display_ip}</option>\n";
}
?>
</select>