refactoring web section: new html formating

web/add/web/index.php

@@ -229,10 +229,8 @@ top_panel($user,$TAB);
 
 // Are you admin?
 if ($_SESSION['user'] == 'admin') {
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_add_web.html');
     include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_web.html');
 } else {
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_add_web.html');
     include($_SERVER['DOCUMENT_ROOT'].'/templates/user/add_web.html');
 }
     unset($_SESSION['error_msg']);

web/edit/web/index.php

@@ -509,10 +509,8 @@ top_panel($user,$TAB);
 
     }
 if ($_SESSION['user'] == 'admin') {
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_edit_web.html');
     include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_web.html');
 } else {
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_edit_web.html');
     include($_SERVER['DOCUMENT_ROOT'].'/templates/user/edit_web.html');
 }
     unset($_SESSION['error_msg']);

web/list/web/index.php

@@ -13,23 +13,16 @@ top_panel($user,$TAB);
 
 // Data
 if ($_SESSION['user'] == 'admin') {
-
     exec (VESTA_CMD."v_list_web_domains $user json", $output, $return_var);
     check_error($return_var);
     $data = json_decode(implode('', $output), true);
     $data = array_reverse($data);
-    unset($output);
-
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_web.html');
     include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_web.html');
 } else {
     exec (VESTA_CMD."v_list_web_domains $user json", $output, $return_var);
     check_error($return_var);
     $data = json_decode(implode('', $output), true);
     $data = array_reverse($data);
-    unset($output);
-
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/user/menu_web.html');
     include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_web.html');
 }
 

web/templates/admin/add_web.html

@@ -1,102 +1,235 @@
-<script language="javascript">
-  function elementHideShow(elementToHideOrShow)
-    {
-      var el = document.getElementById(elementToHideOrShow);
-      if (el.style.display == "block") {
-        el.style.display = "none";
-      } else {
-        el.style.display = "block";
-      }
-    }
-</script>
 
+                                <table class="sub-menu" style="background: white;">
+                                    <tr>
+                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Adding Domain</b></a>
+                                            <?php
+                                                if (!empty($_SESSION['error_msg'])) {
+                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                } else {
+                                                    if (!empty($_SESSION['ok_msg'])) {
+                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                    }
+                                                }
+                                            ?>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
 
-<table class='data'>
-<tr class="data-add">
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-        <table class="data-col1">
-            <tr><td style="padding: 18 0 4 18;"></td></tr>
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
-        <table width="830px"><tr>
-            <td></td>
-        </tr></table>
-        <table class="data-col2" width="600px">
-            <form method="post" name="v_add_user">
-            <tr><td class="add-text" style="padding: 10 0 0 2px;">Domain</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?> ></td></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">IP address</td></tr>
-            <tr><td><select class="add-list" name="v_ip">
-            <?php
-                foreach ($ips as $key => $value) {
-                    echo "\t\t\t\t<option value=\"".$key."\"";
-                    if ((!empty($v_ip)) && ( $key == $_POST['v_ip'])){
-                        echo ' selected';
-                    }
-                    echo ">".$key."</option>\n";
-                }
-            ?>
-                </select></td></tr>
-
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">DNS support</td></tr>
-            <tr><td><input type="checkbox" size="20" class="add-checkbox" name="v_dns" <?php if (empty($v_dns)) echo "checked=yes"; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Mail support</td></tr>
-            <tr><td><input type="checkbox" size="20" class="add-checkbox" name="v_mail" <?php if (empty($v_mail)) echo "checked=yes"; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;"><a href="javascript:elementHideShow('advtable');" class="add-advanced">Advanced Options ⇢</a></td></tr>
-            <tr><td class="add-text" style="padding: 9px 0 0 0px;">
-                <table style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
-                    <tr><td class="add-text" style="padding: 0 0 0 2px;">Domain Aliases</td></tr>
-                    <tr><td><textarea size="20" class="add-textinput" name="v_aliases"><?php if (!empty($v_aliases)) echo $v_aliases;  ?></textarea></td></tr>
-                    <tr><td class="add-text" style="padding: 10px 0 0 2px;">Apache Template</td></tr>
-                    <tr><td><select class="add-list" name="v_template">
-                    <?php
-                        foreach ($templates as $key => $value) {
-                            echo "\t\t\t\t<option value=\"".$value."\"";
-                            if ((!empty($v_template)) && ( $value == $_POST['v_template'])){
-                                echo ' selected' ;
-                            }
-                            if ((empty($v_template)) && ( $value == $template)){
-                                echo ' selected' ;
-                            }
-                            echo "> ".$value." </option>\n";
-                        }
-                    ?>
-                        </select></td></tr>
-
-                    <tr><td class="add-text" style="padding: 10px 0 0 2px;">Error Logging</td></tr>
-                    <tr><td><input type="checkbox" size="20" class="add-checkbox" name="v_elog" <?php if (!empty($v_elog)) echo "checked=yes" ?>></tr>
-                    <tr><td class="add-text" style="padding: 10px 0 0 2px;">Nginx Support</td></tr>
-                    <tr><td><input type="checkbox" size="20" class="add-checkbox" name="v_nginx" <?php if (empty($v_nginx)) echo "checked=yes" ?>></tr>
-                    <tr><td class="add-text" style="padding: 10px 0 0 2px;">SSL Support</td></tr>
-                    <tr><td><input type="checkbox" size="20" class="add-checkbox" name="v_ssl" <?php if (!empty($v_ssl)) echo "checked=yes" ?>></tr>
-                    <tr><td class="add-text" style="padding: 10px 0 0 2px;">SSL Certificate</td></tr>
-                    <tr><td><textarea size="20" class="add-textinput" name="v_ssl_crt"><?php if (!empty($v_ssl_crt)) echo $v_ssl_crt;  ?></textarea></tr>
-                    <tr><td class="add-text" style="padding: 10px 0 0 2px;">SSL Key</td></tr>
-                    <tr><td><textarea size="20" class="add-textinput" name="v_ssl_key"><?php if (!empty($v_ssl_key)) echo $v_ssl_key;  ?></textarea></tr>
-                    <tr><td class="add-text" style="padding: 10px 0 0 2px;">SSL Certificate Authority <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(optional)</span></td></tr>
-                    <tr><td><textarea size="20" class="add-textinput" name="v_ssl_ca"><?php if (!empty($v_ssl_ca)) echo $v_ssl_ca;  ?></textarea></tr>
-                    <tr><td class="add-text" style="padding: 10px 0 0 2px;">Web Statistics</td></tr>
-                    <tr><td><select class="add-list" name="v_stats">
-                    <?php
-                        foreach ($stats as $key => $value) {
-                            $svalue = "'".$value."'";
-                            echo "\t\t\t\t<option value=\"".$value."\"";
-                            if (empty($v_stats)) $v_stats = 'none';
-                            if (( $value == $v_stats ) || ($svalue == $v_stats )){
-                                echo ' selected' ;
+                    <form id="vstobjects" name="v_add_web" method="post">
+                        <script language="javascript">
+                            function elementHideShow(elementToHideOrShow){
+                                var el = document.getElementById(elementToHideOrShow);
+                                if (el.style.display == "block") {
+                                    el.style.display = "none";
+                                } else {
+                                    el.style.display = "block";
+                                }
                             }
-                            echo ">".$value."</option>\n";
-                        }
-                    ?>
-                    </select></td></tr>
-                </table>
-            </td></tr>
-            <tr><td style="padding: 24px 0 0 0;">
-                <input type="submit" name="ok" value="OK" class="add-button"></form>
-                <input type="button" class="add-button" value="Cancel" onClick="location.href='/list/web/'">
-            </td></tr>
-        </table>
-    </td>
-</tr>
-</table>
+                        </script>
+    
+                        <table class='data'>
+                            <tr class="data-add">
+                            <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
+                                <table class="data-col1">
+                                    <tr>
+                                        <td style="padding: 18 0 4 18;"></td>
+                                    </tr>
+                                </table>
+                            </td>
+                            <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                <table width="830px">
+                                    <tr>
+                                        <td></td>
+                                    </tr>
+                                </table>
+                                <table class="data-col2" width="600px">
+                                    <tr>
+                                        <td class="add-text" style="padding: 10 0 0 2px;">
+                                            Domain
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <input type="text" size="20" class="add-input" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?>>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="add-text" style="padding: 10px 0 0 2px;">
+                                            IP address
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <select class="add-list" name="v_ip">
+                                                <?php
+                                                    foreach ($ips as $key => $value) {
+                                                        echo "\t\t\t\t<option value=\"".$key."\"";
+                                                        if ((!empty($v_ip)) && ( $key == $_POST['v_ip'])){
+                                                            echo ' selected';
+                                                        }
+                                                        echo ">".$key."</option>\n";
+                                                    }
+                                                ?>
+                                            </select>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="add-text" style="padding: 10px 0 0 2px;">
+                                            DNS support
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <input type="checkbox" size="20" class="add-checkbox" name="v_dns" <?php if (empty($v_dns)) echo "checked=yes"; ?>>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="add-text" style="padding: 10px 0 0 2px;">
+                                            Mail support
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <input type="checkbox" size="20" class="add-checkbox" name="v_mail" <?php if (empty($v_mail)) echo "checked=yes"; ?>>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="add-text" style="padding: 10px 0 0 2px;">
+                                            <a href="javascript:elementHideShow('advtable');" class="add-advanced">Advanced Options ⇢</a>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="add-text" style="padding: 9px 0 0 0px;">
+                                            <table style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
+                                                <tr>
+                                                    <td class="add-text" style="padding: 0 0 0 2px;">
+                                                        Domain Aliases
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <textarea size="20" class="add-textinput" name="v_aliases"><?php if (!empty($v_aliases)) echo $v_aliases;  ?></textarea>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                        Apache Template
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <select class="add-list" name="v_template">
+                                                            <?php
+                                                                foreach ($templates as $key => $value) {
+                                                                    echo "\t\t\t\t<option value=\"".$value."\"";
+                                                                    if ((!empty($v_template)) && ( $value == $_POST['v_template'])){
+                                                                        echo ' selected' ;
+                                                                    }
+                                                                    if ((empty($v_template)) && ( $value == $template)){
+                                                                        echo ' selected' ;
+                                                                    }
+                                                                    echo "> ".$value." </option>\n";
+                                                                }
+                                                            ?>
+                                                        </select>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                        Error Logging
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <input type="checkbox" size="20" class="add-checkbox" name="v_elog" <?php if (!empty($v_elog)) echo "checked=yes" ?>>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                        Nginx Support
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <input type="checkbox" size="20" class="add-checkbox" name="v_nginx" <?php if (empty($v_nginx)) echo "checked=yes" ?>>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                        SSL Support
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <input type="checkbox" size="20" class="add-checkbox" name="v_ssl" <?php if (!empty($v_ssl)) echo "checked=yes" ?>>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                        SSL Certificate
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <textarea size="20" class="add-textinput" name="v_ssl_crt"><?php if (!empty($v_ssl_crt)) echo $v_ssl_crt;  ?></textarea>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                        SSL Key
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <textarea size="20" class="add-textinput" name="v_ssl_key"><?php if (!empty($v_ssl_key)) echo $v_ssl_key;  ?></textarea>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                        SSL Certificate Authority <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(optional)</span>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <textarea size="20" class="add-textinput" name="v_ssl_ca"><?php if (!empty($v_ssl_ca)) echo $v_ssl_ca;  ?></textarea>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                        Web Statistics
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <select class="add-list" name="v_stats">
+                                                            <?php
+                                                                foreach ($stats as $key => $value) {
+                                                                    $svalue = "'".$value."'";
+                                                                    echo "\t\t\t\t<option value=\"".$value."\"";
+                                                                    if (empty($v_stats)) $v_stats = 'none';
+                                                                    if (( $value == $v_stats ) || ($svalue == $v_stats )){
+                                                                        echo ' selected' ;
+                                                                    }
+                                                                    echo ">".$value."</option>\n";
+                                                                }
+                                                            ?> 
+                                                        </select>
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td style="padding: 24px 0 0 0;">
+                                            <input type="submit" name="ok" value="OK" class="button">
+                                            <input type="button" class="button" value="Cancel" onclick="location.href='/list/web/'">
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
+                </form>

web/templates/admin/edit_web.html

@@ -1,122 +1,250 @@
-<script type="text/javascript">
-  function elementHideShow(elementToHideOrShow)
-    {
-      var el = document.getElementById(elementToHideOrShow);
-      if (el.style.display == "block") {
-        el.style.display = "none";
-      } else {
-        el.style.display = "block";
-      }
-    }
-    function randomString() {
-        var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-        var string_length = 10;
-        var randomstring = '';
-        for (var i=0; i<string_length; i++) {
-          var rnum = Math.floor(Math.random() * chars.length);
-          randomstring += chars.substring(rnum,rnum+1);
-        }
-        document.getElementById('v_password').value = randomstring;
-    }
-</script>
-<table class='data'>
-<tr class="data-add">
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-        <table class="data-col1">
-            <tr><td style="padding: 24px 0 2px 4px;"><a class="data-date" ?><?php echo date("d M Y", strtotime($v_date))?></a></td></tr>
-            <tr><td style="padding: 0 0 6px 4px;"><a class="data-date" ?><?php echo $v_time?></a></td></tr>
-            <tr><td style="padding: 0 0 0 21px;" class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
-        <table width="830px"><tr>
-            <td></td>
-        </tr></table>
-        <form method="post" name="v_edit_user">
-        <table class="data-col2" width="830px">
-            <tr><td class="add-text" style="padding: 10 0 0 2px;">Domain</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?> disabled> <input type="hidden" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?>></td></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">IP address</td></tr>
-            <tr><td><select class="add-list" name="v_ip">
-            <?php
-                foreach ($ips as $key => $value) {
-                    echo "\t\t\t\t<option value=\"".$key."\"";
-                    $skey = "'".$key."'";
-                    if ((!empty($v_ip)) && ( $key == $v_ip ) || ( $skey == $v_ip )){
-                        echo ' selected';
-                    }
-                    echo ">".$key."</option>\n";
-                }
-            ?>
-                </select></td></tr>
 
-            <tr><td class="add-text" style="padding: 10 0 0 2px;">Aliases</td></tr>
-            <tr><td><textarea size="20" class="add-textinput" name="v_aliases"><?php if (!empty($v_aliases)) echo $v_aliases;  ?></textarea></td></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Template</td></tr>
-            <tr><td><select class="add-list" name="v_template">
-            <?php
-                foreach ($templates as $key => $value) {
-                    echo "\t\t\t\t<option value=\"".$value."\"";
-                    $svalue = "'".$value."'";
-                    if ((!empty($v_template)) && ( $value == $v_template ) || ($svalue == $v_template)){
-                        echo ' selected' ;
-                    }
-                    echo ">".$value."</option>\n";
-                }
-            ?>
-                </select></td></tr>
+                                <table class="sub-menu" style="background: white;">
+                                    <tr>
+                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Editing Domain</b></a>
+                                            <?php
+                                                if (!empty($_SESSION['error_msg'])) {
+                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                } else {
+                                                    if (!empty($_SESSION['ok_msg'])) {
+                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                    }
+                                                }
+                                            ?>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
 
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Error Logging</td></tr>
-            <tr><td><input type="checkbox" size="20" class="add-checkbox" name="v_elog" <?php if ($v_elog == 'yes') echo "checked=yes" ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Nginx Support</td></tr>
-            <tr><td><input type="checkbox" size="20" class="add-checkbox" name="v_nginx" <?php if (!empty($v_nginx)) echo "checked=yes" ?> onclick="javascript:elementHideShow('nginxtable');"></tr>
-            <tr><td><table style="display:<?php if (empty($v_nginx)) { echo 'none';} else {echo 'block';}?> ;" id="nginxtable"><tr>
-                <tr><td class="add-text" style="padding: 9px 0 0 2px;">Nginx Supported Extentions</td></tr>
-                <tr><td><textarea size="20" class="add-textinput" name="v_nginx_ext"><?php if (!empty($v_nginx_ext)) { echo $v_nginx_ext;} else { echo 'jpg, jpeg, gif, png, ico, svg, css, zip, tgz, gz, rar, bz2, exe, pdf, doc, xls, ppt, txt, odt, ods, odp, odf, tar, bmp, rtf, js, mp3, avi, mpeg, flv, html, htm'; }  ?></textarea></tr>
-            </td></tr></tr></table></td></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">SSL Support</td></tr>
-            <tr><td><input type="checkbox" size="20" class="add-checkbox" name="v_ssl" <?php if ($v_ssl == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');"></tr>
-            <tr><td><table style="display:<?php if ($v_ssl == 'no' ) { echo 'none';} else {echo 'block';}?> ;" id="ssltable"><tr>
-                <tr><td class="add-text" style="padding: 9px 0 0 2px;">SSL HomeDirectory</td></tr>
-                <tr><td><select class="add-list" name="v_ssl_home">
-                    <option value='same' <?php if ($v_ssl_home == 'same') echo "selected";?> >public_html</option>
-                    <option value='single' <?php if ($v_ssl_home == 'single') echo "selected";?>>public_shtml</option>
-                </select></td></tr>
-                <tr><td class="add-text" style="padding: 10px 0 0 2px;">SSL Certificate</td></tr>
-                <tr><td><textarea size="20" class="add-textinput" name="v_ssl_crt"><?php if (!empty($v_ssl_crt)) echo $v_ssl_crt; ?></textarea></td></tr>
-                <tr><td class="add-text" style="padding: 10px 0 0 2px;">SSL Key</td></tr>
-                <tr><td><textarea size="20" class="add-textinput" name="v_ssl_key"><?php if (!empty($v_ssl_key)) echo $v_ssl_key; ?></textarea></td></tr>
-                <tr><td class="add-text" style="padding: 10px 0 0 2px;">SSL Certificate Authority <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(optional)</span></td></tr>
-                <tr><td><textarea size="20" class="add-textinput" name="v_ssl_ca"><?php if (!empty($v_ssl_ca)) echo $v_ssl_ca; ?></textarea></td></tr>
-            </td></tr></tr></table></td></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Web Statistics</td></tr>
-            <tr><td><select class="add-list" name="v_stats">
-            <?php
-                foreach ($stats as $key => $value) {
-                    $svalue = "'".$value."'";
-                    echo "\t\t\t\t<option value=\"".$value."\"";
-                    if (empty($v_stats)) $v_stats = 'none';
-                    if (( $value == $v_stats ) || ($svalue == $v_stats )){
-                        echo ' selected' ;
-                    }
-                    echo ">".$value."</option>\n";
-                }
-            ?>
-            </select></td></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Web Statistic Authorization</td></tr>
-            <tr><td><input type="checkbox" size="20" class="add-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('statstable');"> </tr>
-            <tr><td><table style="display:<?php if (empty($v_stats_user)) { echo 'none';} else {echo 'block';}?> ;" id="statstable" name="v_add_web_domain_stats_user"><tr>
-                <tr><td class="add-text" style="padding: 9px 0 0 2px;">Web Statistics Username</td></tr>
-                <tr><td><input type="text" size="20" class="add-input" name="v_stats_user" <?php if (!empty($v_stats_user)) echo "value=".$v_stats_user;  ?>></tr>
-                <tr><td class="add-text" style="padding: 10px 0 0 2px;">Web Statistics Password <a href="javascript:randomString();" class="genpass">generate</a></td></tr>
-                <tr><td><input type="text" size="20" class="add-input" name="v_stats_password" <?php if (!empty($v_stats_password)) echo "value=".$v_stats_password;  ?> id="v_password"></tr>
-            </td></tr></tr></table>
-            <tr><td style="padding: 24px 0 0 0;">
-                <input type="submit" class="add-button" name="save" value="Save"></form>
-                <input type="button" class="add-button" value="Cancel" onClick="location.href='/list/web/'">
-            </td></tr>
-            </form>
-        </table>
-    </td>
-</tr>
-</table>
+                    <form id="vstobjects" name="v_edit_user" method="post">
+                        <script language="javascript">
+                            function elementHideShow(elementToHideOrShow){
+                                var el = document.getElementById(elementToHideOrShow);
+                                if (el.style.display == "block") {
+                                    el.style.display = "none";
+                                } else {
+                                    el.style.display = "block";
+                                }
+                            }
+                            function randomString() {
+                                var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+                                var string_length = 10;
+                                var randomstring = '';
+                                for (var i=0; i<string_length; i++) {
+                                  var rnum = Math.floor(Math.random() * chars.length);
+                                  randomstring += chars.substring(rnum,rnum+1);
+                                }
+                                document.getElementById('v_password').value = randomstring;
+                            }
+                        </script>
+                        <table class='data'>
+                            <tr class="data-add">
+                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
+                                    <table class="data-col1">
+                                        <tr><td style="padding: 24px 0 2px 4px;"><a class="data-date" ?><?php echo date("d M Y", strtotime($v_date))?></a></td></tr>
+                                        <tr><td style="padding: 0 0 6px 4px;"><a class="data-date" ?><?php echo $v_time?></a></td></tr>
+                                        <tr><td style="padding: 0 0 0 21px;" class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
+                                    </table>
+                                </td>
+                                <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                    <table width="830px">
+                                        <tr>
+                                            <td></td>
+                                        </tr>
+                                    </table>
+                                    <table class="data-col2" width="830px">
+                                        <tr>
+                                            <td class="add-text" style="padding: 10 0 0 2px;">
+                                                Domain
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?> disabled> <input type="hidden" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                IP address
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <select class="add-list" name="v_ip">
+                                                    <?php
+                                                        foreach ($ips as $key => $value) {
+                                                            echo "\n\t\t\t\t\t\t\t\t\t\t<option value=\"".$key."\"";
+                                                            $skey = "'".$key."'";
+                                                            if ((!empty($v_ip)) && ( $key == $v_ip ) || ( $skey == $v_ip )){
+                                                                echo ' selected';
+                                                            }
+                                                            echo ">".$key."</option>\n";
+                                                        }
+                                                    ?>
+                                                </select>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10 0 0 2px;">
+                                                Aliases
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <textarea size="20" class="add-textinput" name="v_aliases"><?php if (!empty($v_aliases)) echo $v_aliases;  ?></textarea>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Template
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <select class="add-list" name="v_template">
+                                                    <?php
+                                                        foreach ($templates as $key => $value) {
+                                                            echo "\t\t\t\t<option value=\"".$value."\"";
+                                                            $svalue = "'".$value."'";
+                                                            if ((!empty($v_template)) && ( $value == $v_template ) || ($svalue == $v_template)){
+                                                                echo ' selected' ;
+                                                            }
+                                                            echo ">".$value."</option>\n";
+                                                        }
+                                                    ?> 
+                                                </select>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Error Logging
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="checkbox" size="20" class="add-checkbox" name="v_elog" <?php if ($v_elog == 'yes') echo "checked=yes" ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Nginx Support
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="checkbox" size="20" class="add-checkbox" name="v_nginx" <?php if (!empty($v_nginx)) echo "checked=yes" ?> onclick="javascript:elementHideShow('nginxtable');">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <table style="display:<?php if (empty($v_nginx)) { echo 'none';} else {echo 'block';}?> ;" id="nginxtable">
+                                                    <tr>
+                                                        <td class="add-text" style="padding: 9px 0 0 2px;">
+                                                            Nginx Supported Extentions
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <textarea size="20" class="add-textinput" name="v_nginx_ext"><?php if (!empty($v_nginx_ext)) { echo $v_nginx_ext;} else { echo 'jpg, jpeg, gif, png, ico, svg, css, zip, tgz, gz, rar, bz2, exe, pdf, doc, xls, ppt, txt, odt, ods, odp, odf, tar, bmp, rtf, js, mp3, avi, mpeg, flv, html, htm'; }  ?></textarea>
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                SSL Support
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="checkbox" size="20" class="add-checkbox" name="v_ssl" <?php if ($v_ssl == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <table style="display:<?php if ($v_ssl == 'no' ) { echo 'none';} else {echo 'block';}?> ;" id="ssltable">
+                                                    <tr>
+                                                        <td class="add-text" style="padding: 9px 0 0 2px;">
+                                                            SSL HomeDirectory
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <select class="add-list" name="v_ssl_home">
+                                                                <option value='same' <?php if ($v_ssl_home == 'same') echo "selected";?>>
+                                                                     public_html
+                                                                </option>
+                                                                <option value='single' <?php if ($v_ssl_home == 'single') echo "selected";?>>
+                                                                    public_shtml
+                                                                </option>
+                                                            </select>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                            SSL Certificate
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <textarea size="20" class="add-textinput" name="v_ssl_crt"><?php if (!empty($v_ssl_crt)) echo $v_ssl_crt; ?></textarea>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                            SSL Key
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <textarea size="20" class="add-textinput" name="v_ssl_key"><?php if (!empty($v_ssl_key)) echo $v_ssl_key; ?></textarea>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                            SSL Certificate Authority <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(optional)</span>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <textarea size="20" class="add-textinput" name="v_ssl_ca"><?php if (!empty($v_ssl_ca)) echo $v_ssl_ca; ?></textarea>
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                        </tr>
+                                        <tr><td class="add-text" style="padding: 10px 0 0 2px;">Web Statistics</td></tr>
+                                        <tr><td><select class="add-list" name="v_stats">
+                                        <?php
+                                            foreach ($stats as $key => $value) {
+                                                $svalue = "'".$value."'";
+                                                echo "\t\t\t\t<option value=\"".$value."\"";
+                                                if (empty($v_stats)) $v_stats = 'none';
+                                                if (( $value == $v_stats ) || ($svalue == $v_stats )){
+                                                    echo ' selected' ;
+                                                }
+                                                echo ">".$value."</option>\n";
+                                            }
+                                        ?>
+                                        </select></td></tr>
+                                        <tr><td class="add-text" style="padding: 10px 0 0 2px;">Web Statistic Authorization</td></tr>
+                                        <tr><td><input type="checkbox" size="20" class="add-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('statstable');"> </tr>
+                                        <tr><td><table style="display:<?php if (empty($v_stats_user)) { echo 'none';} else {echo 'block';}?> ;" id="statstable" name="v_add_web_domain_stats_user"><tr>
+                                            <tr><td class="add-text" style="padding: 9px 0 0 2px;">Web Statistics Username</td></tr>
+                                            <tr><td><input type="text" size="20" class="add-input" name="v_stats_user" <?php if (!empty($v_stats_user)) echo "value=".$v_stats_user;  ?>></tr>
+                                            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Web Statistics Password <a href="javascript:randomString();" class="genpass">generate</a></td></tr>
+                                            <tr><td><input type="text" size="20" class="add-input" name="v_stats_password" <?php if (!empty($v_stats_password)) echo "value=".$v_stats_password;  ?> id="v_password"></tr>
+                                        </td></tr></tr></table>
+                                        <tr><td style="padding: 24px 0 0 0;">
+                                            <input type="submit" class="button" name="save" value="Save"></form>
+                                            <input type="button" class="button" value="Cancel" onClick="location.href='/list/web/'">
+                                        </td></tr>
+                                        </form>
+                                    </table>
+                                </td>
+                            </tr>
+                            </table>
+                                                                                

web/templates/admin/list_web.html

@@ -1,164 +1,241 @@
-<table class='data'>
 
-<?php
-foreach ($data as $key => $value) {
-    ++$i;
-    if ($data[$key]['SUSPENDED'] == 'yes') {
-        $status = 'suspended';
-        $spnd_action = 'unsuspend' ;
-    } else {
-        $status = 'active';
-        $spnd_action = 'suspend' ;
-    }
-
-    if (!empty($data[$key]['SSL_HOME'])) {
-        if ($data[$key]['SSL_HOME'] == 'same') {
-            $ssl_home = 'public_html';
-        } else {
-            $ssl_home = 'public_shtml';
-        }
-    } else {
-        $ssl_home = '';
-    }
-    if (strlen($data[$key]['NGINX_EXT']) > 16 ) {
-        $nginx_ext_title = str_replace(',', ', ', $data[$key]['NGINX_EXT']);
-        $nginx_ext = substr($data[$key]['NGINX_EXT'], 0, 16);
-        $nginx_ext = trim($nginx_ext, ",");
-        $nginx_ext = str_replace(',', ', ', $nginx_ext);
-        $nginx_ext = $nginx_ext.", ...";
-    } else {
-        $nginx_ext_title = '';
-        $nginx_ext = str_replace(',', ', ', $data[$key]['NGINX_EXT']);
-    }
-
-    ?>
-<script type="text/javascript">
-    $(function(){
-        $('#<?php echo $spnd_action ?>_dialog_<?php echo "$i" ?>').dialog({
-            modal: true,
-            autoOpen: false,
-            width: 360,
-            buttons: {
-                "Ok": function(event, ui) {
-                     location.href = '/<?php echo $spnd_action ?>/web/?domain=<?php echo "$key" ?>';
-                },
-                "Cancel": function() {
-                    $(this).dialog("close");
-                }
-            }
-        });
-        $('#<?php echo $spnd_action ?>_link_<?php echo "$i" ?>').click(function(){
-            $('#<?php echo $spnd_action ?>_dialog_<?php echo "$i" ?>').dialog('open');
-            return false;
-        });
-
-        $('#delete_dialog_<?php echo "$i" ?>').dialog({
-            modal: true,
-            autoOpen: false,
-            width: 360,
-            buttons: {
-                "Ok": function(event, ui) {
-                     location.href = '/delete/web/?domain=<?php echo "$key" ?>';
-                },
-                "Cancel": function() {
-                    $(this).dialog("close");
-                }
-            }
-        });
-        $('#delete_link_<?php echo "$i" ?>').click(function(){
-            $('#delete_dialog_<?php echo "$i" ?>').dialog('open');
-            return false;
-        });
+                                <table class="sub-menu" style="background: white;">
+                                    <tr>
+                                        <td style="padding: 12px 0 8px 6px">
+                                            <div style="float:left">
+                                                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/web/'"> Add Domain </button>
+                                            </div>
+                                            <div style="text-align: right; float: right;">
+                                                <input type="text" size="30" style="padding: 3px 80px 3px 0; margin: 0 2px 0 0;">
+                                                <button> Search </button>
+                                            </div>
+                                            <div style="float:left; padding-left: 26px;">
+                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
+                                                <select style="margin:0 2px 0 0px;" >
+                                                    <option>apply to selected</option>
+                                                    <option>rebuild</option>
+                                                    <option>update counters</option>
+                                                    <option>suspend</option>
+                                                    <option>unsuspend</option>
+                                                    <option>delete</option>
+                                                </select>
+                                                <button style="width:27px;"> › </button>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
 
-    });
-</script>
+                    <form id="vstobjects">
+                        <table class='data'>
+                            <?php
+                                foreach ($data as $key => $value) {
+                                    ++$i;
+                                    if ($data[$key]['SUSPENDED'] == 'yes') {
+                                        $status = 'suspended';
+                                        $spnd_action = 'unsuspend' ;
+                                    } else {
+                                        $status = 'active';
+                                        $spnd_action = 'suspend' ;
+                                    }
+                                    if (!empty($data[$key]['SSL_HOME'])) {
+                                        if ($data[$key]['SSL_HOME'] == 'same') {
+                                            $ssl_home = 'public_html';
+                                        } else {
+                                            $ssl_home = 'public_shtml';
+                                        }
+                                    } else {
+                                        $ssl_home = '';
+                                    }
+                                    if (strlen($data[$key]['NGINX_EXT']) > 16 ) {
+                                        $nginx_ext_title = str_replace(',', ', ', $data[$key]['NGINX_EXT']);
+                                        $nginx_ext = substr($data[$key]['NGINX_EXT'], 0, 16);
+                                        $nginx_ext = trim($nginx_ext, ",");
+                                        $nginx_ext = str_replace(',', ', ', $nginx_ext);
+                                        $nginx_ext = $nginx_ext.", ...";
+                                    } else {
+                                        $nginx_ext_title = '';
+                                        $nginx_ext = str_replace(',', ', ', $data[$key]['NGINX_EXT']);
+                                    }
+                                ?>
+                            <script type="text/javascript">
+                                $(function(){
+                                    $('#<?php echo $spnd_action ?>_dialog_<?php echo "$i" ?>').dialog({
+                                        modal: true,
+                                        autoOpen: false,
+                                        width: 360,
+                                        buttons: {
+                                            "Ok": function(event, ui) {
+                                                 location.href = '/<?php echo $spnd_action ?>/web/?domain=<?php echo "$key" ?>';
+                                            },
+                                            "Cancel": function() {
+                                                $(this).dialog("close");
+                                            }
+                                        }
+                                    });
+                                    $('#<?php echo $spnd_action ?>_link_<?php echo "$i" ?>').click(function(){
+                                        $('#<?php echo $spnd_action ?>_dialog_<?php echo "$i" ?>').dialog('open');
+                                        return false;
+                                    });
+                                    $('#delete_dialog_<?php echo "$i" ?>').dialog({
+                                        modal: true,
+                                        autoOpen: false,
+                                        width: 360,
+                                        buttons: {
+                                            "Ok": function(event, ui) {
+                                                 location.href = '/delete/web/?domain=<?php echo "$key" ?>';
+                                            },
+                                            "Cancel": function() {
+                                                $(this).dialog("close");
+                                            }
+                                        }
+                                    });
+                                    $('#delete_link_<?php echo "$i" ?>').click(function(){
+                                        $('#delete_dialog_<?php echo "$i" ?>').dialog('open');
+                                        return false;
+                                    });
+                                });
+                            </script>
 
-<tr class="data-row">
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-        <table class="data-col1">
-            <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="domain" value="<?php echo "$key" ?>" ></td></tr>
-            <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
-            <tr><td class="data-<?php echo $status ?>"><b><?php echo $status ?></b></td></tr>
+                            <tr class="data-row">
+                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
+                                    <table class="data-col1">
+                                        <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="domain" value="<?php echo "$key" ?>" ></td></tr>
+                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
+                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo $status ?></b></td></tr>
+                                    </table>
+                                </td>
+                                <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                    <table width="830px">
+                                        <tr>
+                                            <td></td>
+                                            <?php
+                                                if (!empty($data[$key]['STATS'])) {
+                                                    echo '                                                <td class="data-controls" width="114px"><img src="/images/new_window.png" width="8px" height="8px">';
+                                                    echo "<a href='http://".$key."/vstats/' target='_blank'> open webstats </a></td>";
+                                                }
+                                             ?> 
+                                            <td class="data-controls" width="50px"><img src="/images/edit.png" width="8px" height="8px"><a href="/edit/web/?domain=<?php echo "$key" ?>"> edit</a></td>
+                                            <td class="data-controls" width="80px">
+                                                <img src="/images/suspend.png" width="7px" height="8px">
+                                                <a href="#" id="<?php echo $spnd_action ?>_link_<?php echo "$i" ?>"> <?php echo $spnd_action ?></a>
+                                                <div id="<?php echo $spnd_action ?>_dialog_<?php echo "$i" ?>" title="Confirmation">
+                                                    <p class="counter-value">Are you sure you want to <?php echo $spnd_action ?> <b><?php echo "$key" ?></b> domain?</p>
+                                                </div>
+                                            </td>
+                                            <td class="data-controls" width="70px">
+                                                <img src="/images/delete.png" width="7px" height="7px">
+                                                <a href="#" id="delete_link_<?php echo $i ?>"> delete</a>
+                                                <div id="delete_dialog_<?php echo $i ?>" title="Confirmation">
+                                                    <p class="counter-value">Are you sure you want to delete <b><?php echo "$key" ?></b> domain?</p>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    </table>
 
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
-        <table width="830px"><tr>
-            <td></td>
-            <?php if (!empty($data[$key]['STATS'])) {
-                echo '            <td class="data-controls" width="114px"><img src="/images/new_window.png" width="8px" height="8px">';
-                echo "<a href='http://".$key."/vstats/' target='_blank'> open webstats </a></td>";
-            } ?>
-            <td class="data-controls" width="50px"><img src="/images/edit.png" width="8px" height="8px"><a href="/edit/web/?domain=<?php echo "$key" ?>"> edit</a></td>
-            <td class="data-controls" width="80px">
-                <img src="/images/suspend.png" width="7px" height="8px">
-                <a href="#" id="<?php echo $spnd_action ?>_link_<?php echo "$i" ?>"> <?php echo $spnd_action ?></a>
-                <div id="<?php echo $spnd_action ?>_dialog_<?php echo "$i" ?>" title="Confirmation">
-                    <p class="counter-value">Are you sure you want to <?php echo $spnd_action ?> <b><?php echo "$key" ?></b> domain?</p>
-                </div>
-            </td>
-            <td class="data-controls" width="70px">
-                <img src="/images/delete.png" width="7px" height="7px">
-                <a href="#" id="delete_link_<?php echo $i ?>"> delete</a>
-                <div id="delete_dialog_<?php echo $i ?>" title="Confirmation">
-                    <p class="counter-value">Are you sure you want to delete <b><?php echo "$key" ?></b> domain?</p>
-                </div>
-            </td>
-        </tr></table>
+                                    <table class="data-col2" width="830px">
+                                        <tr>
+                                            <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
+                                                <b><?php echo $key ?></b> <a class="aliases" style="padding: 0 30px 0 8px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td style="vertical-align:top;" >
+                                                <table>
+                                                    <tr>
+                                                        <td class="counter-name" style="padding: 2px 0 0 2px;">
+                                                            <?php echo $data[$key]['IP'] ?> 
+                                                        </td>
+                                                    <tr>
+                                                        <td class="counter-name" style="padding: 0 0 8px 2px">
+                                                            [<?php echo $data[$key]['TPL'] ?>] template
+                                                        </td>
+                                                </tr>
+                                                    <tr>
+                                                        <td class="chart1" style="padding: 0 0 0 2px">
+                                                            Bandwidth: <?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?> 
+                                                            <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                                <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$panel[$user]['BANDWIDTH']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="chart1" style="padding: 0 0 0 2px">Disk: <?php echo humanize_usage($data[$key]['U_DISK']) ?>
+                                                            <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                                <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                        </div>
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                            <td style="vertical-align:top;" width="250">
+                                                <table>
+                                                    <tr>
+                                                        <td class="counter-name">CGI Support:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['CGI'] ?></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Error Log:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['ELOG'] ?></td>
+                                                    </tr>
+                                                <tr>
+                                                        <td class="counter-name">Web Statistics:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['STATS'] ?></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Statistics Auth:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['STATS_AUTH'] ?></td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                            <td rowspan=4 style="vertical-align:top;" width="300">
+                                                <table width="300">
+                                                    <tr>
+                                                        <td class="counter-name" width="40%">SSL Support:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['SSL'] ?></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">SSL Home:</td>
+                                                        <td class="counter-value"><?php echo $ssl_home ?></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Nginx Template:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['NGINX'] ?></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Nginx Extentions:</td>
+                                                        <td class="counter-value" <?php if (!empty($nginx_ext_title)) echo "title='".$nginx_ext_title."'" ?>><?php echo $nginx_ext ?></td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                            <?php
+                                }
+                            ?> 
+                        </table>
 
-        <table class="data-col2" width="830px">
-            <tr><td colspan=3 class="domain" style="padding: 0 0 0 4px;"><b><?php echo $key ?></b> <a class="aliases" style="padding: 0 30px 0 8px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a></td></tr>
-            <tr>
-                <td style="vertical-align:top;" >
-                    <table>
-                        <tr><td class="counter-name" style="padding: 2px 0 0 2px;"><?php echo $data[$key]['IP'] ?></td>
-                        <tr><td class="counter-name" style="padding: 0 0 8px 2px">[<?php echo $data[$key]['TPL'] ?>] template</td></tr>
-                        <tr><td class="chart1" style="padding: 0 0 0 2px">Bandwidth: <?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>
-                            <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;"><div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$panel[$user]['BANDWIDTH']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div></div></td></tr>
-                        <tr><td class="chart1" style="padding: 0 0 0 2px">Disk: <?php echo humanize_usage($data[$key]['U_DISK']) ?>
-                            <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;"><div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div></div></td></tr>
-                    </table>
-                </td>
-                <td style="vertical-align:top;" width="250">
-                    <table>
-                        <tr><td class="counter-name">CGI Support:</td><td class="counter-value"><?php echo $data[$key]['CGI'] ?></td></tr>
-                        <tr><td class="counter-name">Error Log:</td><td class="counter-value"><?php echo $data[$key]['ELOG'] ?></td></tr>
-                        <tr><td class="counter-name">Web Statistics:</td><td class="counter-value"><?php echo $data[$key]['STATS'] ?></td></tr>
-                        <tr><td class="counter-name">Statistics Auth:</td><td class="counter-value"><?php echo $data[$key]['STATS_AUTH'] ?></td></tr>
-                    </table>
-                </td>
-                <td rowspan=4 style="vertical-align:top;" width="300">
-                    <table width="300">
-                        <tr><td class="counter-name" width="40%">SSL Support:</td><td class="counter-value"><?php echo $data[$key]['SSL'] ?></td></tr>
-                        <tr><td class="counter-name">SSL Home:</td><td class="counter-value"><?php echo $ssl_home ?></td></tr>
-                        <tr><td class="counter-name">Nginx Template:</td><td class="counter-value"><?php echo $data[$key]['NGINX'] ?></td></tr>
-                        <tr><td class="counter-name">Nginx Extentions:</td><td class="counter-value" <?php if (!empty($nginx_ext_title)) echo "title='".$nginx_ext_title."'" ?>><?php echo $nginx_ext ?></td></tr>
-                    </table>
-                </td>
-            </tr>
-        </table>
-    </td>
-</tr>
+                        <?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?>
 
 
-    <?php
-}
-?>
-</table>
-<?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?>
-<table class="data-count">
-<tr>
-    <td>→ 
-    <?php
-        if ( $i == 1) {
-            echo "1 web domain ";
-        } else {
-            echo "$i web domains ";
-        }
-    ?>
-    </td>
-</tr>
-</table>
-</form>
-<?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:279px\"><tr><td></td></tr></table>"; ?>
-<?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:113px\"><tr><td></td></tr></table>"; ?>
+                        <table class="data-count">
+                            <tr>
+                                <td width="160px">
+                                <td>
+                                    <?php
+                                        if ( $i == 1) {
+                                            echo "1 web domain ";
+                                        } else {
+                                            echo "$i web domains ";
+                                        }
+                                    ?> 
+                                </td>
+                            </tr>
+                        </table>
+                    </form>
+                    <?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:279px\"><tr><td></td></tr></table>"; ?>
+                    <?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:138px\"><tr><td></td></tr></table>"; ?>

web/templates/admin/menu_add_web.html

@@ -1,15 +0,0 @@
-<table class="sub-menu">
-<tr>
-    <td style="padding: 14px 0 24px 0;" ><a class="add-name"><b>Adding Web Domain</b></a>
-    <?php 
-        if (!empty($_SESSION['error_msg'])) {
-            echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
-        } else {
-            if (!empty($_SESSION['ok_msg'])) {
-                echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
-            }
-        }
-    ?>
-    </td>
-</tr>
-</table>

web/templates/admin/menu_edit_web.html

@@ -1,15 +0,0 @@
-<table class="sub-menu">
-<tr>
-    <td style="padding: 14px 0 24px 0;" ><a class="add-name"><b>Editing Web Domain</b></a>
-    <?php 
-        if (!empty($_SESSION['error_msg'])) {
-            echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
-        } else {
-            if (!empty($_SESSION['ok_msg'])) {
-                echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
-            }
-        }
-    ?>
-    </td>
-</tr>
-</table>

web/templates/admin/menu_web.html

@@ -1,42 +0,0 @@
-<?php
-    if (!empty($_SESSION['error_msg'])) {
-?>
-        <script type="text/javascript">
-            $(function() {
-                $( "#dialog:ui-dialog" ).dialog( "destroy" );
-                $( "#dialog-message" ).dialog({
-                    modal: true,
-                    buttons: {
-                        Ok: function() {
-                            $( this ).dialog( "close" );
-                        }
-                    }
-                });
-            });
-        </script>
-        <div id="dialog-message" title="Error">
-        <p><?php echo $_SESSION['error_msg'] ?>.</p>
-        </div>
-<?php
-        unset($_SESSION['error_msg']);
-    }
-?>
-<table class="sub-menu">
-<tr>
-    <td width="142px" style="padding: 16px 0 16px 6px">
-    <button style="width:120px; padding: 2px 0px 2px 0px;" onclick="location.href='/add/web/'">Add Domain</button>
-    <td>
-<a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
-    <select style="margin:0 0 0 0px" name="action">
-        <option>apply to selected</option>
-        <option>rebuild</option>
-        <option>suspend</option>
-        <option>unsuspend</option>
-        <option>delete</option>
-    </select> <button> > </button></td>
-</td>
-    <td style="text-align: right;"><input type="text" size="30" style="padding: 3px 80px 3px 0;"> <button> Search </button></td>
-</tr><tr>
-</tr>
-</table>
-<form id="vstobjects">

web/templates/login.html

@@ -1,148 +1,180 @@
-    <link rel="icon" href="/images/favicon.ico" type="image/x-icon">
-    <title> Vesta - Login </title>
-    <style type="text/css">
-    body {
-        padding: 0;
-        margin: 0;
-        margin-left: auto;
-        margin-right: auto;
-        background-image: url(/images/b.png);
-        font-family: Arial, sans-serif;
-    }
+<html>
+    <head>
+        <link rel="icon" href="/images/favicon.ico" type="image/x-icon">
+        <title> Vesta - Login </title>
+        <style type="text/css">
+            body {
+                padding: 0;
+                margin: 0;
+                margin-left: auto;
+                margin-right: auto;
+                background-image: url(/images/b.png);
+                font-family: Arial, sans-serif;
+            }
 
-    .forgot {
-        color: #484243;
-        font-family: Arial, sans-serif;
-        font-size: 8pt;
-        padding: 0 10px 0 0;
-    }
+            .forgot {
+                color: #484243;
+                font-family: Arial, sans-serif;
+                font-size: 8pt;
+                padding: 0 10px 0 0;
+            }
 
-    .login {
-        margin: 80px 0 80px 0;
-        padding: 0;
-        border-top: 1px solid #cccccc;
-        border-left: 1px solid #cccccc;
-        border-right: 1px solid #cccccc;
-        background: #ebe9dc;
-        text-align: left;
-        vertical-align:top;
-        width: 500px;
-        box-shadow: 0 0 8px 8px #d7d7d7;
-    }
+            .login {
+                margin: 80px 0 80px 0;
+                padding: 0;
+                border-top: 1px solid #cccccc;
+                border-left: 1px solid #cccccc;
+                border-right: 1px solid #cccccc;
+                background: #ebe9dc;
+                text-align: left;
+                vertical-align:top;
+                width: 500px;
+                box-shadow: 0 0 2px 2px #d7d7d7;
+            }
+        
+            .login-box {
+                text-align: left;
+                vertical-align:top;
+                padding: 0 0 10px 40px;
+            }
 
-    .login-box {
-        text-align: left;
-        vertical-align:top;
-        padding: 0 0 10px 40px;
-    }
+            .login-text1 {
+                padding: 10px 0 0 2px;
+                color: #433832;
+                font-family: Arial, sans-serif;
+                font-size: 12pt;
+            }
 
-    .login-text1 {
-        padding: 10px 0 0 2px;
-        color: #433832;
-        font-family: Arial, sans-serif;
-        font-size: 12pt;
-    }
-    .login-text1 a {
-        padding: 0 6px;
-        font-family: Arial, sans-serif;
-        font-size: 10pt;
-        text-shadow: none;
-    }
-    .login-text2 {
-        padding: 12px 0 10px 0;
-        color: #484243;
-    }
+            .login-text1 a {
+                padding: 0 6px;
+                font-family: Arial, sans-serif;
+                font-size: 10pt;
+                text-shadow: none;
+            }
 
-    .login-bottom {
-        color: #574F51;
-        text-align: right;
-        width: 500px;
-        height: 50px;
-        background: #484243;
-        padding: 0 8px 0 0;
-        margin: 0;
-    }
-    .vestacp{
-        font-size: 8pt;
-        color: #CCCCB4;
-        text-align: right;
-        padding: 20px 0 0 0;
-    }
-    .error {
-        font-size: 10pt;
-        color: #DE6C5D;
-    }
-    .loggin-input {
-        color: #555;
-        background-color: #FFFFFF;
-        border: 1px solid #999999;
-        border-radius: 3px 3px 3px 3px;
-        color: #555555;
-        font-family: Arial,sans-serif;
-        font-size: 14pt;
-        padding: 4px;
-        width: 360px;
-    }
+            .login-text2 {
+                padding: 12px 0 10px 0;
+                color: #484243;
+            }
+        
+            .login-bottom {
+                color: #574F51;
+                text-align: right;
+                width: 500px;
+                height: 50px;
+                background: #484243;
+                padding: 0 8px 0 0;
+                margin: 0;
+            }
 
-    .loggin-button {
-        padding: 4px;
-        margin: 0 6px 0 0;
-        cursor: pointer;
-        color: #333333;
-        background-color: #f6f6f6;
-        border: 1px solid #ACACAC;
-        border-radius: 3px 3px 3px 3px;
-        font-size: 12px;
-        padding: 3px 16px;
-        width: 105px;
-    }
+            .vestacp{
+                font-size: 8pt;
+                color: #CCCCB4;
+                text-align: right;
+                padding: 20px 0 0 0;
+            }
 
-    .loggin-button:hover {
-        background-color: #f0f0f0;
-    }
+            .error {
+                font-size: 10pt;
+                color: #DE6C5D;
+            }
 
-    .loggin-button:active {
-        background-color: #EBE9DC;
-    }
-    </style>
-</head>
-<body>
-<center>
-<table class="login">
-<tr>
-    <td>
-    <table>
-    <tr>
-        <td style="padding: 0 10 0 42;">
-            <a href="/"><img border=0 src="/images/logo.png" width="124px" height="46px" alt="Vesta Control Panel" /></a>
-        </td>
-        <td style="padding: 20px 0 0 0;"><form method="post" action="/login/" >
-            <table class="login-box">
-            <tr>
-                <td><p class="login-text1">Username</p></td>
-            </tr><tr>
-                <td><input tabindex="1" type="text" size="20px" style="width:200px;" name="user" class="loggin-input"></td>
-            </tr><tr>
-                <td><p class="login-text1">Password <a tabindex="5" class="forgot" href="/reset/" >(forgot password)</a></p></td>
-            </tr><tr>
-                <td><input tabindex="2" type="password" size="20px"  style="width:200px;" name="password" class="loggin-input"></td>
-            </tr><tr>
-                <td><p class="login-text2"><input tabindex="4" type="checkbox" style="margin: 0 8px 0 0" >Remember me</p></td>
-            </tr><tr>
-                <td><input tabindex="3" type="submit" value="Log In" class="loggin-button"></td>
-            </tr>
+            .loggin-input {
+                color: #555;
+                background-color: #FFFFFF;
+                border: 1px solid #999999;
+                border-radius: 3px 3px 3px 3px;
+                color: #555555;
+                font-family: Arial,sans-serif;
+                font-size: 14pt;
+                padding: 4px;
+                width: 360px;
+            }
+
+            .loggin-button {
+                padding: 4px;
+                margin: 0 6px 0 0;
+                cursor: pointer;
+                color: #333333;
+                background-color: #f6f6f6;
+                border: 1px solid #ACACAC;
+                border-radius: 3px 3px 3px 3px;
+                font-size: 12px;
+                padding: 3px 16px;
+                width: 105px;
+            }
+
+            .loggin-button:hover {
+                background-color: #f0f0f0;
+            }
+
+            .loggin-button:active {
+                background-color: #EBE9DC;
+            }
+        </style>
+    </head>
+    <body>
+        <center>
+            <table class="login">
+                <tr>
+                    <td>
+                        <table>
+                            <tr>
+                                <td style="padding: 0 10 0 42;">
+                                    <a href="/"><img border=0 src="/images/logo.png" width="124px" height="46px" alt="Vesta Control Panel" /></a>
+                                </td>
+                                <td style="padding: 20px 0 0 0;">
+                                    <form method="post" action="/login/" >
+                                    <table class="login-box">
+                                        <tr>
+                                            <td>
+                                                <p class="login-text1">Username</p>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input tabindex="1" type="text" size="20px" style="width:200px;" name="user" class="loggin-input">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <p class="login-text1">Password <a tabindex="5" class="forgot" href="/reset/" >(forgot password)</a></p>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input tabindex="2" type="password" size="20px"  style="width:200px;" name="password" class="loggin-input">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <p class="login-text2"><input tabindex="4" type="checkbox" style="margin: 0 8px 0 0" >Remember me</p>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input tabindex="3" type="submit" value="Log In" class="loggin-button">
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </form>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td colspan=2>
+                                <table class="login-bottom">
+                                    <tr>
+                                        <td>.<?php if (isset($ERROR)) echo $ERROR ?></td>
+                                    </tr>
+                                    <tr>
+                                        <td> <a tabindex="6" class="vestacp" href="http://vestacp.com" >vestacp.com</a></td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
+                </tr>
             </table>
-            </form>
-        </td>
-    </tr><tr>
-    <td colspan=2>
-        <table class="login-bottom">
-            <tr><td>.<?php if (isset($ERROR)) echo $ERROR ?></td></tr>
-            <tr><td> <a tabindex="6" class="vestacp" href="http://vestacp.com" >vestacp.com</a></td></tr>
-        </table>
-    </tr>
-    </table>
-</tr></table>
-</center>
-</body>
+        </center>
+    </body>
 </html>

web/templates/user/add_web.html

@@ -1,87 +1,212 @@
-<script language="javascript">
-  function elementHideShow(elementToHideOrShow)
-    {
-      var el = document.getElementById(elementToHideOrShow);
-      if (el.style.display == "block") {
-        el.style.display = "none";
-      } else {
-        el.style.display = "block";
-      }
-    }
-</script>
 
+                                <table class="sub-menu" style="background: white;">
+                                    <tr>
+                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Adding Domain</b></a>
+                                            <?php
+                                                if (!empty($_SESSION['error_msg'])) {
+                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                } else {
+                                                    if (!empty($_SESSION['ok_msg'])) {
+                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                    }
+                                                }
+                                            ?>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
 
-<table class='data'>
-<tr class="data-add">
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-        <table class="data-col1">
-            <tr><td style="padding: 18 0 4 18;"></td></tr>
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
-        <table width="830px"><tr>
-            <td></td>
-        </tr></table>
-        <table class="data-col2" width="600px">
-            <form method="post" name="v_add_user">
-            <tr><td class="add-text" style="padding: 10 0 0 2px;">Domain</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?> ></td></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">IP address</td></tr>
-            <tr><td><select class="add-list" name="v_ip">
-            <?php
-                foreach ($ips as $key => $value) {
-                    echo "\t\t\t\t<option value=\"".$key."\"";
-                    if ((!empty($v_ip)) && ( $key == $_POST['v_ip'])){
-                        echo ' selected';
-                    }
-                    echo ">".$key."</option>\n";
-                }
-            ?>
-                </select></td></tr>
-
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">DNS support</td></tr>
-            <tr><td><input type="checkbox" size="20" class="add-checkbox" name="v_dns" <?php if (empty($v_dns)) echo "checked=yes"; ?>></tr>
-
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Mail support</td></tr>
-            <tr><td><input type="checkbox" size="20" class="add-checkbox" name="v_mail" <?php if (empty($v_mail)) echo "checked=yes"; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;"><a href="javascript:elementHideShow('advtable');" class="add-advanced">Advanced Options ⇢</a></td></tr>
-            <tr><td class="add-text" style="padding: 9px 0 0 0px;">
-                <table style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
-                    <tr><td class="add-text" style="padding: 0 0 0 2px;">Domain Aliases</td></tr>
-                    <tr><td><textarea size="20" class="add-textinput" name="v_aliases"><?php if (!empty($v_aliases)) echo $v_aliases;  ?></textarea></td></tr>
-                    <tr><td class="add-text" style="padding: 10px 0 0 2px;">Error Logging</td></tr>
-                    <tr><td><input type="checkbox" size="20" class="add-checkbox" name="v_elog" <?php if (!empty($v_elog)) echo "checked=yes" ?>></tr>
-                    <tr><td class="add-text" style="padding: 10px 0 0 2px;">Nginx Support</td></tr>
-                    <tr><td><input type="checkbox" size="20" class="add-checkbox" name="v_nginx" <?php if (empty($v_nginx)) echo "checked=yes" ?>></tr>
-                    <tr><td class="add-text" style="padding: 10px 0 0 2px;">SSL Support</td></tr>
-                    <tr><td><input type="checkbox" size="20" class="add-checkbox" name="v_ssl" <?php if (!empty($v_ssl)) echo "checked=yes" ?>></tr>
-                    <tr><td class="add-text" style="padding: 10px 0 0 2px;">SSL Certificate</td></tr>
-                    <tr><td><textarea size="20" class="add-textinput" name="v_ssl_crt"><?php if (!empty($v_ssl_crt)) echo $v_ssl_crt;  ?></textarea></tr>
-                    <tr><td class="add-text" style="padding: 10px 0 0 2px;">SSL Key</td></tr>
-                    <tr><td><textarea size="20" class="add-textinput" name="v_ssl_key"><?php if (!empty($v_ssl_key)) echo $v_ssl_key;  ?></textarea></tr>
-                    <tr><td class="add-text" style="padding: 10px 0 0 2px;">SSL Certificate Authority <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(optional)</span></td></tr>
-                    <tr><td><textarea size="20" class="add-textinput" name="v_ssl_ca"><?php if (!empty($v_ssl_ca)) echo $v_ssl_ca;  ?></textarea></tr>
-                    <tr><td class="add-text" style="padding: 10px 0 0 2px;">Web Statistics</td></tr>
-                    <tr><td><select class="add-list" name="v_stats">
-                    <?php
-                        foreach ($stats as $key => $value) {
-                            $svalue = "'".$value."'";
-                            echo "\t\t\t\t<option value=\"".$value."\"";
-                            if (empty($v_stats)) $v_stats = 'none';
-                            if (( $value == $v_stats ) || ($svalue == $v_stats )){
-                                echo ' selected' ;
+                    <form id="vstobjects" name="v_add_web" method="post">
+                        <script language="javascript">
+                            function elementHideShow(elementToHideOrShow){
+                                var el = document.getElementById(elementToHideOrShow);
+                                if (el.style.display == "block") {
+                                    el.style.display = "none";
+                                } else {
+                                    el.style.display = "block";
+                                }
                             }
-                            echo ">".$value."</option>\n";
-                        }
-                    ?>
-                    </select></td></tr>
-                </table>
-            </td></tr>
-            <tr><td style="padding: 24px 0 0 0;">
-                <input type="submit" name="ok" value="OK" class="add-button"></form>
-                <input type="button" class="add-button" value="Cancel" onClick="location.href='/list/web/'">
-            </td></tr>
-        </table>
-    </td>
-</tr>
-</table>
+                        </script>
+    
+                        <table class='data'>
+                            <tr class="data-add">
+                            <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
+                                <table class="data-col1">
+                                    <tr>
+                                        <td style="padding: 18 0 4 18;"></td>
+                                    </tr>
+                                </table>
+                            </td>
+                            <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                <table width="830px">
+                                    <tr>
+                                        <td></td>
+                                    </tr>
+                                </table>
+                                <table class="data-col2" width="600px">
+                                    <tr>
+                                        <td class="add-text" style="padding: 10 0 0 2px;">
+                                            Domain
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <input type="text" size="20" class="add-input" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?>>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="add-text" style="padding: 10px 0 0 2px;">
+                                            IP address
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <select class="add-list" name="v_ip">
+                                                <?php
+                                                    foreach ($ips as $key => $value) {
+                                                        echo "\t\t\t\t<option value=\"".$key."\"";
+                                                        if ((!empty($v_ip)) && ( $key == $_POST['v_ip'])){
+                                                            echo ' selected';
+                                                        }
+                                                        echo ">".$key."</option>\n";
+                                                    }
+                                                ?>
+                                            </select>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="add-text" style="padding: 10px 0 0 2px;">
+                                            DNS support
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <input type="checkbox" size="20" class="add-checkbox" name="v_dns" <?php if (empty($v_dns)) echo "checked=yes"; ?>>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="add-text" style="padding: 10px 0 0 2px;">
+                                            Mail support
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <input type="checkbox" size="20" class="add-checkbox" name="v_mail" <?php if (empty($v_mail)) echo "checked=yes"; ?>>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="add-text" style="padding: 10px 0 0 2px;">
+                                            <a href="javascript:elementHideShow('advtable');" class="add-advanced">Advanced Options ⇢</a>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="add-text" style="padding: 9px 0 0 0px;">
+                                            <table style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
+                                                <tr>
+                                                    <td class="add-text" style="padding: 0 0 0 2px;">
+                                                        Domain Aliases
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <textarea size="20" class="add-textinput" name="v_aliases"><?php if (!empty($v_aliases)) echo $v_aliases;  ?></textarea>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                        Error Logging
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <input type="checkbox" size="20" class="add-checkbox" name="v_elog" <?php if (!empty($v_elog)) echo "checked=yes" ?>>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                        Nginx Support
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <input type="checkbox" size="20" class="add-checkbox" name="v_nginx" <?php if (empty($v_nginx)) echo "checked=yes" ?>>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                        SSL Support
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <input type="checkbox" size="20" class="add-checkbox" name="v_ssl" <?php if (!empty($v_ssl)) echo "checked=yes" ?>>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                        SSL Certificate
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <textarea size="20" class="add-textinput" name="v_ssl_crt"><?php if (!empty($v_ssl_crt)) echo $v_ssl_crt;  ?></textarea>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                        SSL Key
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <textarea size="20" class="add-textinput" name="v_ssl_key"><?php if (!empty($v_ssl_key)) echo $v_ssl_key;  ?></textarea>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                        SSL Certificate Authority <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(optional)</span>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <textarea size="20" class="add-textinput" name="v_ssl_ca"><?php if (!empty($v_ssl_ca)) echo $v_ssl_ca;  ?></textarea>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                        Web Statistics
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <select class="add-list" name="v_stats">
+                                                            <?php
+                                                                foreach ($stats as $key => $value) {
+                                                                    $svalue = "'".$value."'";
+                                                                    echo "\t\t\t\t<option value=\"".$value."\"";
+                                                                    if (empty($v_stats)) $v_stats = 'none';
+                                                                    if (( $value == $v_stats ) || ($svalue == $v_stats )){
+                                                                        echo ' selected' ;
+                                                                    }
+                                                                    echo ">".$value."</option>\n";
+                                                                }
+                                                            ?> 
+                                                        </select>
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td style="padding: 24px 0 0 0;">
+                                            <input type="submit" name="ok" value="OK" class="button">
+                                            <input type="button" class="button" value="Cancel" onclick="location.href='/list/web/'">
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
+                </form>

web/templates/user/edit_web.html

@@ -1,108 +1,229 @@
-<script type="text/javascript">
-  function elementHideShow(elementToHideOrShow)
-    {
-      var el = document.getElementById(elementToHideOrShow);
-      if (el.style.display == "block") {
-        el.style.display = "none";
-      } else {
-        el.style.display = "block";
-      }
-    }
-    function randomString() {
-        var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-        var string_length = 10;
-        var randomstring = '';
-        for (var i=0; i<string_length; i++) {
-          var rnum = Math.floor(Math.random() * chars.length);
-          randomstring += chars.substring(rnum,rnum+1);
-        }
-        document.getElementById('v_password').value = randomstring;
-    }
-</script>
-<table class='data'>
-<tr class="data-add">
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-        <table class="data-col1">
-            <tr><td style="padding: 24px 0 2px 4px;"><a class="data-date" ?><?php echo date("d M Y", strtotime($v_date))?></a></td></tr>
-            <tr><td style="padding: 0 0 6px 4px;"><a class="data-date" ?><?php echo $v_time?></a></td></tr>
-            <tr><td style="padding: 0 0 0 21px;" class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
-        <table width="830px"><tr>
-            <td></td>
-        </tr></table>
-        <form method="post" name="v_edit_user">
-        <table class="data-col2" width="830px">
-            <tr><td class="add-text" style="padding: 10 0 0 2px;">Domain</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?> disabled> <input type="hidden" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?>></td></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">IP address</td></tr>
-            <tr><td><select class="add-list" name="v_ip">
-            <?php
-                foreach ($ips as $key => $value) {
-                    echo "\t\t\t\t<option value=\"".$key."\"";
-                    $skey = "'".$key."'";
-                    if ((!empty($v_ip)) && ( $key == $v_ip ) || ( $skey == $v_ip )){
-                        echo ' selected';
-                    }
-                    echo ">".$key."</option>\n";
-                }
-            ?>
-                </select></td></tr>
 
-            <tr><td class="add-text" style="padding: 10 0 0 2px;">Aliases</td></tr>
-            <tr><td><textarea size="20" class="add-textinput" name="v_aliases"><?php if (!empty($v_aliases)) echo $v_aliases;  ?></textarea></td></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Error Logging</td></tr>
-            <tr><td><input type="checkbox" size="20" class="add-checkbox" name="v_elog" <?php if ($v_elog == 'yes') echo "checked=yes" ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Nginx Support</td></tr>
-            <tr><td><input type="checkbox" size="20" class="add-checkbox" name="v_nginx" <?php if (!empty($v_nginx)) echo "checked=yes" ?> onclick="javascript:elementHideShow('nginxtable');"></tr>
-            <tr><td><table style="display:<?php if (empty($v_nginx)) { echo 'none';} else {echo 'block';}?> ;" id="nginxtable"><tr>
-                <tr><td class="add-text" style="padding: 9px 0 0 2px;">Nginx Supported Extentions</td></tr>
-                <tr><td><textarea size="20" class="add-textinput" name="v_nginx_ext"><?php if (!empty($v_nginx_ext)) { echo $v_nginx_ext;} else { echo 'jpg, jpeg, gif, png, ico, svg, css, zip, tgz, gz, rar, bz2, exe, pdf, doc, xls, ppt, txt, odt, ods, odp, odf, tar, bmp, rtf, js, mp3, avi, mpeg, flv, html, htm'; }  ?></textarea></tr>
-            </td></tr></tr></table></td></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">SSL Support</td></tr>
-            <tr><td><input type="checkbox" size="20" class="add-checkbox" name="v_ssl" <?php if ($v_ssl == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');"></tr>
-            <tr><td><table style="display:<?php if ($v_ssl == 'no' ) { echo 'none';} else {echo 'block';}?> ;" id="ssltable"><tr>
-                <tr><td class="add-text" style="padding: 9px 0 0 2px;">SSL HomeDirectory</td></tr>
-                <tr><td><select class="add-list" name="v_ssl_home">
-                    <option value='same' <?php if ($v_ssl_home == 'same') echo "selected";?> >public_html</option>
-                    <option value='single' <?php if ($v_ssl_home == 'single') echo "selected";?>>public_shtml</option>
-                </select></td></tr>
-                <tr><td class="add-text" style="padding: 10px 0 0 2px;">SSL Certificate</td></tr>
-                <tr><td><textarea size="20" class="add-textinput" name="v_ssl_crt"><?php if (!empty($v_ssl_crt)) echo $v_ssl_crt; ?></textarea></td></tr>
-                <tr><td class="add-text" style="padding: 10px 0 0 2px;">SSL Key</td></tr>
-                <tr><td><textarea size="20" class="add-textinput" name="v_ssl_key"><?php if (!empty($v_ssl_key)) echo $v_ssl_key; ?></textarea></td></tr>
-                <tr><td class="add-text" style="padding: 10px 0 0 2px;">SSL Certificate Authority <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(optional)</span></td></tr>
-                <tr><td><textarea size="20" class="add-textinput" name="v_ssl_ca"><?php if (!empty($v_ssl_ca)) echo $v_ssl_ca; ?></textarea></td></tr>
-            </td></tr></tr></table></td></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Web Statistics</td></tr>
-            <tr><td><select class="add-list" name="v_stats">
-            <?php
-                foreach ($stats as $key => $value) {
-                    $svalue = "'".$value."'";
-                    echo "\t\t\t\t<option value=\"".$value."\"";
-                    if (empty($v_stats)) $v_stats = 'none';
-                    if (( $value == $v_stats ) || ($svalue == $v_stats )){
-                        echo ' selected' ;
-                    }
-                    echo ">".$value."</option>\n";
-                }
-            ?>
-            </select></td></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Web Statistic Authorization</td></tr>
-            <tr><td><input type="checkbox" size="20" class="add-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('statstable');"> </tr>
-            <tr><td><table style="display:<?php if (empty($v_stats_user)) { echo 'none';} else {echo 'block';}?> ;" id="statstable" name="v_add_web_domain_stats_user"><tr>
-                <tr><td class="add-text" style="padding: 9px 0 0 2px;">Web Statistics Username</td></tr>
-                <tr><td><input type="text" size="20" class="add-input" name="v_stats_user" <?php if (!empty($v_stats_user)) echo "value=".$v_stats_user;  ?>></tr>
-                <tr><td class="add-text" style="padding: 10px 0 0 2px;">Web Statistics Password <a href="javascript:randomString();" class="genpass">generate</a></td></tr>
-                <tr><td><input type="text" size="20" class="add-input" name="v_stats_password" <?php if (!empty($v_stats_password)) echo "value=".$v_stats_password;  ?> id="v_password"></tr>
-            </td></tr></tr></table>
-            <tr><td style="padding: 24px 0 0 0;">
-                <input type="submit" class="add-button" name="save" value="Save"></form>
-                <input type="button" class="add-button" value="Cancel" onClick="location.href='/list/web/'">
-            </td></tr>
-            </form>
-        </table>
-    </td>
-</tr>
-</table>
+                                <table class="sub-menu" style="background: white;">
+                                    <tr>
+                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Editing Domain</b></a>
+                                            <?php
+                                                if (!empty($_SESSION['error_msg'])) {
+                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                } else {
+                                                    if (!empty($_SESSION['ok_msg'])) {
+                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                    }
+                                                }
+                                            ?>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
+
+                    <form id="vstobjects" name="v_edit_user" method="post">
+                        <script language="javascript">
+                            function elementHideShow(elementToHideOrShow){
+                                var el = document.getElementById(elementToHideOrShow);
+                                if (el.style.display == "block") {
+                                    el.style.display = "none";
+                                } else {
+                                    el.style.display = "block";
+                                }
+                            }
+                            function randomString() {
+                                var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+                                var string_length = 10;
+                                var randomstring = '';
+                                for (var i=0; i<string_length; i++) {
+                                  var rnum = Math.floor(Math.random() * chars.length);
+                                  randomstring += chars.substring(rnum,rnum+1);
+                                }
+                                document.getElementById('v_password').value = randomstring;
+                            }
+                        </script>
+                        <table class='data'>
+                            <tr class="data-add">
+                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
+                                    <table class="data-col1">
+                                        <tr><td style="padding: 24px 0 2px 4px;"><a class="data-date" ?><?php echo date("d M Y", strtotime($v_date))?></a></td></tr>
+                                        <tr><td style="padding: 0 0 6px 4px;"><a class="data-date" ?><?php echo $v_time?></a></td></tr>
+                                        <tr><td style="padding: 0 0 0 21px;" class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
+                                    </table>
+                                </td>
+                                <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                    <table width="830px">
+                                        <tr>
+                                            <td></td>
+                                        </tr>
+                                    </table>
+                                    <table class="data-col2" width="830px">
+                                        <tr>
+                                            <td class="add-text" style="padding: 10 0 0 2px;">
+                                                Domain
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?> disabled> <input type="hidden" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                IP address
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <select class="add-list" name="v_ip">
+                                                    <?php
+                                                        foreach ($ips as $key => $value) {
+                                                            echo "\n\t\t\t\t\t\t\t\t\t\t<option value=\"".$key."\"";
+                                                            $skey = "'".$key."'";
+                                                            if ((!empty($v_ip)) && ( $key == $v_ip ) || ( $skey == $v_ip )){
+                                                                echo ' selected';
+                                                            }
+                                                            echo ">".$key."</option>\n";
+                                                        }
+                                                    ?>
+                                                </select>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10 0 0 2px;">
+                                                Aliases
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <textarea size="20" class="add-textinput" name="v_aliases"><?php if (!empty($v_aliases)) echo $v_aliases;  ?></textarea>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Error Logging
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="checkbox" size="20" class="add-checkbox" name="v_elog" <?php if ($v_elog == 'yes') echo "checked=yes" ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Nginx Support
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="checkbox" size="20" class="add-checkbox" name="v_nginx" <?php if (!empty($v_nginx)) echo "checked=yes" ?> onclick="javascript:elementHideShow('nginxtable');">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <table style="display:<?php if (empty($v_nginx)) { echo 'none';} else {echo 'block';}?> ;" id="nginxtable">
+                                                    <tr>
+                                                        <td class="add-text" style="padding: 9px 0 0 2px;">
+                                                            Nginx Supported Extentions
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <textarea size="20" class="add-textinput" name="v_nginx_ext"><?php if (!empty($v_nginx_ext)) { echo $v_nginx_ext;} else { echo 'jpg, jpeg, gif, png, ico, svg, css, zip, tgz, gz, rar, bz2, exe, pdf, doc, xls, ppt, txt, odt, ods, odp, odf, tar, bmp, rtf, js, mp3, avi, mpeg, flv, html, htm'; }  ?></textarea>
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                SSL Support
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="checkbox" size="20" class="add-checkbox" name="v_ssl" <?php if ($v_ssl == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <table style="display:<?php if ($v_ssl == 'no' ) { echo 'none';} else {echo 'block';}?> ;" id="ssltable">
+                                                    <tr>
+                                                        <td class="add-text" style="padding: 9px 0 0 2px;">
+                                                            SSL HomeDirectory
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <select class="add-list" name="v_ssl_home">
+                                                                <option value='same' <?php if ($v_ssl_home == 'same') echo "selected";?>>
+                                                                     public_html
+                                                                </option>
+                                                                <option value='single' <?php if ($v_ssl_home == 'single') echo "selected";?>>
+                                                                    public_shtml
+                                                                </option>
+                                                            </select>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                            SSL Certificate
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <textarea size="20" class="add-textinput" name="v_ssl_crt"><?php if (!empty($v_ssl_crt)) echo $v_ssl_crt; ?></textarea>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                            SSL Key
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <textarea size="20" class="add-textinput" name="v_ssl_key"><?php if (!empty($v_ssl_key)) echo $v_ssl_key; ?></textarea>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                            SSL Certificate Authority <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(optional)</span>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <textarea size="20" class="add-textinput" name="v_ssl_ca"><?php if (!empty($v_ssl_ca)) echo $v_ssl_ca; ?></textarea>
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                        </tr>
+                                        <tr><td class="add-text" style="padding: 10px 0 0 2px;">Web Statistics</td></tr>
+                                        <tr><td><select class="add-list" name="v_stats">
+                                        <?php
+                                            foreach ($stats as $key => $value) {
+                                                $svalue = "'".$value."'";
+                                                echo "\t\t\t\t<option value=\"".$value."\"";
+                                                if (empty($v_stats)) $v_stats = 'none';
+                                                if (( $value == $v_stats ) || ($svalue == $v_stats )){
+                                                    echo ' selected' ;
+                                                }
+                                                echo ">".$value."</option>\n";
+                                            }
+                                        ?>
+                                        </select></td></tr>
+                                        <tr><td class="add-text" style="padding: 10px 0 0 2px;">Web Statistic Authorization</td></tr>
+                                        <tr><td><input type="checkbox" size="20" class="add-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('statstable');"> </tr>
+                                        <tr><td><table style="display:<?php if (empty($v_stats_user)) { echo 'none';} else {echo 'block';}?> ;" id="statstable" name="v_add_web_domain_stats_user"><tr>
+                                            <tr><td class="add-text" style="padding: 9px 0 0 2px;">Web Statistics Username</td></tr>
+                                            <tr><td><input type="text" size="20" class="add-input" name="v_stats_user" <?php if (!empty($v_stats_user)) echo "value=".$v_stats_user;  ?>></tr>
+                                            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Web Statistics Password <a href="javascript:randomString();" class="genpass">generate</a></td></tr>
+                                            <tr><td><input type="text" size="20" class="add-input" name="v_stats_password" <?php if (!empty($v_stats_password)) echo "value=".$v_stats_password;  ?> id="v_password"></tr>
+                                        </td></tr></tr></table>
+                                        <tr><td style="padding: 24px 0 0 0;">
+                                            <input type="submit" class="button" name="save" value="Save"></form>
+                                            <input type="button" class="button" value="Cancel" onClick="location.href='/list/web/'">
+                                        </td></tr>
+                                        </form>
+                                    </table>
+                                </td>
+                            </tr>
+                            </table>
+                                                                                

web/templates/user/list_web.html

@@ -1,139 +1,234 @@
-<table class='data'>
 
-<?php
-foreach ($data as $key => $value) {
-    ++$i;
-    if ($data[$key]['SUSPENDED'] == 'yes') {
-        $status = 'suspended';
-        $spnd_action = 'unsuspend' ;
-    } else {
-        $status = 'active';
-        $spnd_action = 'suspend' ;
-    }
-
-    if (!empty($data[$key]['SSL_HOME'])) {
-        if ($data[$key]['SSL_HOME'] == 'same') {
-            $ssl_home = 'public_html';
-        } else {
-            $ssl_home = 'public_shtml';
-        }
-    } else {
-        $ssl_home = '';
-    }
-    if (strlen($data[$key]['NGINX_EXT']) > 16 ) {
-        $nginx_ext_title = str_replace(',', ', ', $data[$key]['NGINX_EXT']);
-        $nginx_ext = substr($data[$key]['NGINX_EXT'], 0, 16);
-        $nginx_ext = trim($nginx_ext, ",");
-        $nginx_ext = str_replace(',', ', ', $nginx_ext);
-        $nginx_ext = $nginx_ext.", ...";
-    } else {
-        $nginx_ext_title = '';
-        $nginx_ext = str_replace(',', ', ', $data[$key]['NGINX_EXT']);
-    }
-
-    ?>
-<script type="text/javascript">
-    $(function(){
-        $('#delete_dialog_<?php echo "$i" ?>').dialog({
-            modal: true,
-            autoOpen: false,
-            width: 360,
-            buttons: {
-                "Ok": function(event, ui) {
-                     location.href = '/delete/web/?domain=<?php echo "$key" ?>';
-                },
-                "Cancel": function() {
-                    $(this).dialog("close");
-                }
-            }
-        });
-        $('#delete_link_<?php echo "$i" ?>').click(function(){
-            $('#delete_dialog_<?php echo "$i" ?>').dialog('open');
-            return false;
-        });
+                                <table class="sub-menu" style="background: white;">
+                                    <tr>
+                                        <td style="padding: 12px 0 8px 6px">
+                                            <div style="float:left">
+                                                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/web/'"> Add Domain </button>
+                                            </div>
+                                            <div style="text-align: right; float: right;">
+                                                <input type="text" size="30" style="padding: 3px 80px 3px 0; margin: 0 2px 0 0;">
+                                                <button> Search </button>
+                                            </div>
+                                            <div style="float:left; padding-left: 26px;">
+                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
+                                                <select style="margin:0 2px 0 0px;" >
+                                                    <option>apply to selected</option>
+                                                    <option>rebuild</option>
+                                                    <option>update counters</option>
+                                                    <option>suspend</option>
+                                                    <option>unsuspend</option>
+                                                    <option>delete</option>
+                                                </select>
+                                                <button style="width:27px;"> › </button>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
 
-    });
-</script>
+                    <form id="vstobjects">
+                        <table class='data'>
+                            <?php
+                                foreach ($data as $key => $value) {
+                                    ++$i;
+                                    if ($data[$key]['SUSPENDED'] == 'yes') {
+                                        $status = 'suspended';
+                                        $spnd_action = 'unsuspend' ;
+                                    } else {
+                                        $status = 'active';
+                                        $spnd_action = 'suspend' ;
+                                    }
+                                    if (!empty($data[$key]['SSL_HOME'])) {
+                                        if ($data[$key]['SSL_HOME'] == 'same') {
+                                            $ssl_home = 'public_html';
+                                        } else {
+                                            $ssl_home = 'public_shtml';
+                                        }
+                                    } else {
+                                        $ssl_home = '';
+                                    }
+                                    if (strlen($data[$key]['NGINX_EXT']) > 16 ) {
+                                        $nginx_ext_title = str_replace(',', ', ', $data[$key]['NGINX_EXT']);
+                                        $nginx_ext = substr($data[$key]['NGINX_EXT'], 0, 16);
+                                        $nginx_ext = trim($nginx_ext, ",");
+                                        $nginx_ext = str_replace(',', ', ', $nginx_ext);
+                                        $nginx_ext = $nginx_ext.", ...";
+                                    } else {
+                                        $nginx_ext_title = '';
+                                        $nginx_ext = str_replace(',', ', ', $data[$key]['NGINX_EXT']);
+                                    }
+                                ?>
+                            <script type="text/javascript">
+                                $(function(){
+                                    $('#<?php echo $spnd_action ?>_dialog_<?php echo "$i" ?>').dialog({
+                                        modal: true,
+                                        autoOpen: false,
+                                        width: 360,
+                                        buttons: {
+                                            "Ok": function(event, ui) {
+                                                 location.href = '/<?php echo $spnd_action ?>/web/?domain=<?php echo "$key" ?>';
+                                            },
+                                            "Cancel": function() {
+                                                $(this).dialog("close");
+                                            }
+                                        }
+                                    });
+                                    $('#<?php echo $spnd_action ?>_link_<?php echo "$i" ?>').click(function(){
+                                        $('#<?php echo $spnd_action ?>_dialog_<?php echo "$i" ?>').dialog('open');
+                                        return false;
+                                    });
+                                    $('#delete_dialog_<?php echo "$i" ?>').dialog({
+                                        modal: true,
+                                        autoOpen: false,
+                                        width: 360,
+                                        buttons: {
+                                            "Ok": function(event, ui) {
+                                                 location.href = '/delete/web/?domain=<?php echo "$key" ?>';
+                                            },
+                                            "Cancel": function() {
+                                                $(this).dialog("close");
+                                            }
+                                        }
+                                    });
+                                    $('#delete_link_<?php echo "$i" ?>').click(function(){
+                                        $('#delete_dialog_<?php echo "$i" ?>').dialog('open');
+                                        return false;
+                                    });
+                                });
+                            </script>
 
-<tr class="data-row">
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-        <table class="data-col1">
-            <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="object" ></td></tr>
-            <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
-            <tr><td class="data-<?php echo $status ?>"><b><?php echo $status ?></b></td></tr>
+                            <tr class="data-row">
+                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
+                                    <table class="data-col1">
+                                        <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="domain" value="<?php echo "$key" ?>" ></td></tr>
+                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
+                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo $status ?></b></td></tr>
+                                    </table>
+                                </td>
+                                <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                    <table width="830px">
+                                        <tr>
+                                            <td></td>
+                                            <?php
+                                                if (!empty($data[$key]['STATS'])) {
+                                                    echo '                                                <td class="data-controls" width="114px"><img src="/images/new_window.png" width="8px" height="8px">';
+                                                    echo "<a href='http://".$key."/vstats/' target='_blank'> open webstats </a></td>";
+                                                }
+                                             ?> 
+                                            <td class="data-controls" width="50px"><img src="/images/edit.png" width="8px" height="8px"><a href="/edit/web/?domain=<?php echo "$key" ?>"> edit</a></td>
+                                            <td class="data-controls" width="70px">
+                                                <img src="/images/delete.png" width="7px" height="7px">
+                                                <a href="#" id="delete_link_<?php echo $i ?>"> delete</a>
+                                                <div id="delete_dialog_<?php echo $i ?>" title="Confirmation">
+                                                    <p class="counter-value">Are you sure you want to delete <b><?php echo "$key" ?></b> domain?</p>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    </table>
 
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
-        <table width="830px"><tr>
-            <td></td>
-            <?php if (!empty($data[$key]['STATS'])) {
-                echo '            <td class="data-controls" width="114px"><img src="/images/new_window.png" width="8px" height="8px">';
-                echo "<a href='http://".$key."/vstats/' target='_blank'> open webstats </a></td>";
-            } ?>
-            <td class="data-controls" width="50px"><img src="/images/edit.png" width="8px" height="8px"><a href="/edit/web/?domain=<?php echo "$key" ?>"> edit</a></td>
-            <td class="data-controls" width="70px">
-                <img src="/images/delete.png" width="7px" height="7px">
-                <a href="#" id="delete_link_<?php echo $i ?>"> delete</a>
-                <div id="delete_dialog_<?php echo $i ?>" title="Confirmation">
-                    <p class="counter-value">Are you sure you want to delete <b><?php echo "$key" ?></b> domain?</p>
-                </div>
-            </td>
-        </tr></table>
+                                    <table class="data-col2" width="830px">
+                                        <tr>
+                                            <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
+                                                <b><?php echo $key ?></b> <a class="aliases" style="padding: 0 30px 0 8px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td style="vertical-align:top;" >
+                                                <table>
+                                                    <tr>
+                                                        <td class="counter-name" style="padding: 2px 0 0 2px;">
+                                                            <?php echo $data[$key]['IP'] ?> 
+                                                        </td>
+                                                    <tr>
+                                                        <td class="counter-name" style="padding: 0 0 8px 2px">
+                                                            [<?php echo $data[$key]['TPL'] ?>] template
+                                                        </td>
+                                                </tr>
+                                                    <tr>
+                                                        <td class="chart1" style="padding: 0 0 0 2px">
+                                                            Bandwidth: <?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?> 
+                                                            <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                                <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$panel[$user]['BANDWIDTH']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="chart1" style="padding: 0 0 0 2px">Disk: <?php echo humanize_usage($data[$key]['U_DISK']) ?>
+                                                            <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                                <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                        </div>
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                            <td style="vertical-align:top;" width="250">
+                                                <table>
+                                                    <tr>
+                                                        <td class="counter-name">CGI Support:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['CGI'] ?></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Error Log:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['ELOG'] ?></td>
+                                                    </tr>
+                                                <tr>
+                                                        <td class="counter-name">Web Statistics:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['STATS'] ?></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Statistics Auth:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['STATS_AUTH'] ?></td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                            <td rowspan=4 style="vertical-align:top;" width="300">
+                                                <table width="300">
+                                                    <tr>
+                                                        <td class="counter-name" width="40%">SSL Support:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['SSL'] ?></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">SSL Home:</td>
+                                                        <td class="counter-value"><?php echo $ssl_home ?></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Nginx Template:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['NGINX'] ?></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Nginx Extentions:</td>
+                                                        <td class="counter-value" <?php if (!empty($nginx_ext_title)) echo "title='".$nginx_ext_title."'" ?>><?php echo $nginx_ext ?></td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                            <?php
+                                }
+                            ?> 
+                        </table>
 
-        <table class="data-col2" width="830px">
-            <tr><td colspan=3 class="domain" style="padding: 0 0 0 4px;"><b><?php echo $key ?></b> <a class="aliases" style="padding: 0 30px 0 8px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a></td></tr>
-            <tr>
-                <td style="vertical-align:top;" >
-                    <table>
-                        <tr><td class="counter-name" style="padding: 2px 0 0 2px;"><?php echo $data[$key]['IP'] ?></td>
-                        <tr><td class="counter-name" style="padding: 0 0 8px 2px">[<?php echo $data[$key]['TPL'] ?>] template</td></tr>
-                        <tr><td class="chart1" style="padding: 0 0 0 2px">Bandwidth: <?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>
-                            <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;"><div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$panel[$user]['BANDWIDTH']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div></div></td></tr>
-                        <tr><td class="chart1" style="padding: 0 0 0 2px">Disk: <?php echo humanize_usage($data[$key]['U_DISK']) ?>
-                            <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;"><div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div></div></td></tr>
-                    </table>
-                </td>
-                <td style="vertical-align:top;" width="250">
-                    <table>
-                        <tr><td class="counter-name">CGI Support:</td><td class="counter-value"><?php echo $data[$key]['CGI'] ?></td></tr>
-                        <tr><td class="counter-name">Error Log:</td><td class="counter-value"><?php echo $data[$key]['ELOG'] ?></td></tr>
-                        <tr><td class="counter-name">Web Statistics:</td><td class="counter-value"><?php echo $data[$key]['STATS'] ?></td></tr>
-                        <tr><td class="counter-name">Statistics Auth:</td><td class="counter-value"><?php echo $data[$key]['STATS_AUTH'] ?></td></tr>
-                    </table>
-                </td>
-                <td rowspan=4 style="vertical-align:top;" width="300">
-                    <table width="300">
-                        <tr><td class="counter-name" width="40%">SSL Support:</td><td class="counter-value"><?php echo $data[$key]['SSL'] ?></td></tr>
-                        <tr><td class="counter-name">SSL Home:</td><td class="counter-value"><?php echo $ssl_home ?></td></tr>
-                        <tr><td class="counter-name">Nginx Template:</td><td class="counter-value"><?php echo $data[$key]['NGINX'] ?></td></tr>
-                        <tr><td class="counter-name">Nginx Extentions:</td><td class="counter-value" <?php if (!empty($nginx_ext_title)) echo "title='".$nginx_ext_title."'" ?>><?php echo $nginx_ext ?></td></tr>
-                    </table>
-                </td>
-            </tr>
-        </table>
-    </td>
-</tr>
+                        <?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?>
 
 
-    <?php
-}
-?>
-</table>
-<?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?>
-<table class="data-count">
-<tr>
-    <td>→ 
-    <?php
-        if ( $i == 1) {
-            echo "1 web domain ";
-        } else {
-            echo "$i web domains ";
-        }
-    ?>
-    </td>
-</tr>
-</table>
-</form>
-<?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:279px\"><tr><td></td></tr></table>"; ?>
-<?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:113px\"><tr><td></td></tr></table>"; ?>
+                        <table class="data-count">
+                            <tr>
+                                <td width="160px">
+                                <td>
+                                    <?php
+                                        if ( $i == 1) {
+                                            echo "1 web domain ";
+                                        } else {
+                                            echo "$i web domains ";
+                                        }
+                                    ?> 
+                                </td>
+                            </tr>
+                        </table>
+                    </form>
+                    <?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:279px\"><tr><td></td></tr></table>"; ?>
+                    <?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:138px\"><tr><td></td></tr></table>"; ?>

web/templates/user/menu_web.html

@@ -1,16 +0,0 @@
-<table class="sub-menu">
-<tr>
-    <td width="142px" style="padding: 16px 0 16px 6px">
-    <button style="width:120px; padding: 2px 0px 2px 0px;" onclick="location.href='/add/web/'">Add Domain</button>
-    <td><a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
-    <select style="margin:0 0 0 0px">
-        <option>apply to selected</option>
-        <option>update counters</option>
-        <option>delete</option>
-    </select> <button> > </button></td>
-</td>
-    <td style="text-align: right;"><input type="text" size="30" style="padding: 3px 80px 3px 0;"> <button> Search </button></td>
-</tr><tr>
-</tr>
-</table>
-<form id="vstobjects">