improving kondurake patches

Author: skid

web/templates/admin/add_web.html

@@ -63,7 +63,7 @@
                                 <select class="vst-list" name="v_ip">
                                     <?php
                                         foreach ($ips as $ip => $value) {
-                                            $display_ip = htmlentities(empty($value['NAT']) ? $ip : "{$ip} → {$value['NAT']}");
+                                            $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";
                                         }

web/templates/admin/edit_web.html

@@ -66,7 +66,7 @@
                                     <select class="vst-list" name="v_ip">
                                         <?php
                                             foreach ($ips as $ip => $value) {
-                                                $display_ip = htmlentities(empty($value['NAT']) ? $ip : "{$ip} → {$value['NAT']}");
+                                                $display_ip = htmlentities(empty($value['NAT']) ? $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";
                                             }

web/templates/admin/list_web.html

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