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

Author: skid

web/templates/admin/add_web.html

@@ -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 : "{$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>

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>

web/templates/admin/list_web.html

@@ -57,6 +57,7 @@
 
     <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') {
@@ -178,7 +179,7 @@
           </div>
           <!-- /.l-unit__name -->
           <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>
           <!-- /.l-unit__ip -->
           <div class="l-unit__stats">