From cfcc7d62a0bddf360c5f9500ad2b6576b7e550f6 Mon Sep 17 00:00:00 2001
From: kondurake <viktor.kondurake@gmail.com>
Date: Tue, 2 Aug 2016 18:48:21 +0300
Subject: [PATCH] Fix "Parsing error" if a NAT IP is specified

https://bugs.vestacp.com/issues/325
---
 web/templates/admin/edit_web.html | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/web/templates/admin/edit_web.html b/web/templates/admin/edit_web.html
index afa34174..4680cd6b 100644
--- a/web/templates/admin/edit_web.html
+++ b/web/templates/admin/edit_web.html
@@ -65,15 +65,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'];
-                                                $skey = "'".$display_ip."'";
-                                                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";
+                                            foreach ($ips as $ip => $value) {
+                                                $display_ip = htmlentities(empty($value['NAT']) ? $ip : "{$ip} → {$value['NAT']}");
+                                                $ip_selected = ((!empty($v_ip) && $ip == $v_ip) || $v_ip == "'{$ip}'")  ? 'selected' : '';
+                                                echo "\n\t\t\t\t\t\t\t\t\t\t\t\t<option value=\"{$ip}\" {$ip_selected}>{$display_ip}</option>\n";
                                             }
                                         ?>
                                     </select>