Added "admin_" prefix for ftp user names

Affected pages: Add/Edit Web entity for admin and user points

web/js/pages/add.web.js

@@ -0,0 +1,23 @@
+App.Actions.WEB.update_ftp_username_hint = function(elm, hint) {
+	if (hint.trim() == '') {
+		$(elm).parent().find('.ftp_username_hint').html('');
+	} 
+	if (hint.indexOf(GLOBAL.FTP_USER_PREFIX) == 0) {
+		hint = hint.slice(GLOBAL.FTP_USER_PREFIX.length, hint.length);
+	}
+	$(elm).parent().find('.ftp_username_hint').html(GLOBAL.FTP_USER_PREFIX + hint);
+}
+
+App.Listeners.WEB.keypress_ftp_username = function() {
+	$('input[name="v_ftp_user"]').bind('keypress', function(evt) {
+		clearTimeout(window.frp_usr_tmt);
+		window.frp_usr_tmt = setTimeout(function() {
+			var elm = $(evt.target);
+			App.Actions.WEB.update_ftp_username_hint(elm, $(elm).val());
+		}, 100);
+	});
+}
+
+//
+// Page entry point
+App.Listeners.WEB.keypress_ftp_username();

web/js/pages/edit.web.js

@@ -0,0 +1,23 @@
+App.Actions.WEB.update_ftp_username_hint = function(elm, hint) {
+	if (hint.trim() == '') {
+		$(elm).parent().find('.ftp_username_hint').html('');
+	} 
+	if (hint.indexOf(GLOBAL.FTP_USER_PREFIX) == 0) {
+		hint = hint.slice(GLOBAL.FTP_USER_PREFIX.length, hint.length);
+	}
+	$(elm).parent().find('.ftp_username_hint').html(GLOBAL.FTP_USER_PREFIX + hint);
+}
+
+App.Listeners.WEB.keypress_ftp_username = function() {
+	$('input[name="v_ftp_user"]').bind('keypress', function(evt) {
+		clearTimeout(window.frp_usr_tmt);
+		window.frp_usr_tmt = setTimeout(function() {
+			var elm = $(evt.target);
+			App.Actions.WEB.update_ftp_username_hint(elm, $(elm).val());
+		}, 100);
+	});
+}
+
+//
+// Page entry point
+App.Listeners.WEB.keypress_ftp_username();

web/js/templates.js

@@ -0,0 +1,96 @@
+/**
+ *
+ * @author: Malishev Dmitry <dima.malishev@gmail.com>
+ */
+App.Templates.html = {
+    WEB: {
+        hint: ['']
+    }
+};
+
+// Internals
+var Tpl = App.Templates;
+
+var Templator = function()
+{
+    var init = function()
+    {
+        fb.info('Templator work');
+        Templator.splitThemAll();
+        Templator.freezeTplIndexes();
+    };
+
+
+    /**
+     * Split the tpl strings into arrays
+     */
+    Templator.splitThemAll = function(){
+        fb.info('splitting tpls');
+        jQuery.each(App.Templates.html, function(o){
+            //try{
+            var tpls = App.Templates.html[o];
+            jQuery.each(tpls, function(t){
+                tpls[t] = tpls[t][0].split('~!');
+            });
+            //}catch(e){fb.error('%o %o', o, e);}
+        });
+
+    },
+
+    /**
+     * Iterates tpls
+     */
+    Templator.freezeTplIndexes = function(){
+        fb.info('freezing tpl keys');
+        jQuery.each(App.Templates.html, Templator.cacheTplIndexes);
+    },
+
+    /**
+     * Grab the tpl group key and process it
+     */
+    Templator.cacheTplIndexes = function(key)
+    {
+        var tpls = App.Templates.html[key];
+
+        jQuery.each(tpls, function(o)
+        {
+            var tpl = tpls[o];
+            Templator.catchIndex(key, o, tpl);
+        });
+    },
+
+    /**
+     * Set the indexes
+     */
+    Templator.catchIndex = function(key, ref_key, tpl)
+    {
+        'undefined' == typeof App.Templates._indexes[key] ? App.Templates._indexes[key] = {} : false;
+        'undefined' == typeof App.Templates._indexes[key][ref_key] ?
+		App.Templates._indexes[key][ref_key] = {} : false;
+
+        jQuery(tpl).each(function(index, o) {
+            if (':' == o.charAt(0)) {
+                App.Templates._indexes[key][ref_key][o.toString()] = index;
+            }
+        });
+    }
+
+    /**
+     * Get concrete templates
+     */
+    init();
+    return Templator;
+};
+
+Templator.getTemplate = function(ns, key){
+    return [
+		App.Templates._indexes[ns][key],
+		App.Templates.html[ns][key].slice(0)
+    ];
+}
+// init templator
+Tpl.Templator = Templator();
+
+Tpl.get = function(key, group){
+    return Tpl.Templator.getTemplate(group, key);
+}

web/templates/admin/add_web.html

@@ -1,359 +1,366 @@
-            <?php
-                $back = $_SESSION['back'];
-                if (empty($back)) {
-                    $back = "location.href='/list/web/'";
-                } else {
-                    $back = "location.href='".$back."'";
-                }
-            ?> 
-            <table class="submenu">
-                <tr>
-                    <td style="padding: 16px 8px;" ><a class="name"><b><?php print __('Adding Domain');?></b></a>
-                        <?php
-                            if (!empty($_SESSION['error_msg'])) {
-                                echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-                            } else {
-                                if (!empty($_SESSION['ok_msg'])) {
-                                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                                }
-                            }
-                        ?> 
-                    </td>
-                </tr>
-            </table>
-        </div>
-
-        <form id="vstobjects" name="v_add_web" method="post">
-            <script type="text/javascript">
-                $(function() {
-                    $("#v_domain").change(function() {
-                        var prefix = 'www.';
-                        document.getElementById('v_aliases').value = prefix + document.getElementById('v_domain').value;
-                    });
-                });
-                function WEBrandom() {
-                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                    var string_length = 10;
-                    var webrandom = '';
-                    for (var i=0; i<string_length; i++) {
-                        var rnum = Math.floor(Math.random() * chars.length);
-                        webrandom += chars.substring(rnum,rnum+1);
-                    }
-                    document.v_add_web.v_stats_password.value = webrandom;
-                }
-
-                function FTPrandom() {
-                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                    var string_length = 10;
-                    var ftprandomstring = '';
-                    for (var i=0; i<string_length; i++) {
-                        var rnum = Math.floor(Math.random() * chars.length);
-                        ftprandomstring += chars.substring(rnum,rnum+1);
-                    }
-                    document.v_add_web.v_ftp_password.value = ftprandomstring;
-                }
 
-                function elementHideShow(elementToHideOrShow){
-                    var el = document.getElementById(elementToHideOrShow);
-                    if (el.style.display == "block") {
-                        el.style.display = "none";
-                    } else {
-                        el.style.display = "block";
-                    }
-                }
-            </script>
+                                <?php
+                                    $back = $_SESSION['back'];
+                                    if (empty($back)) {
+                                        $back = "location.href='/list/web/'";
+                                    } else {
+                                        $back = "location.href='".$back."'";
+                                    }
+                                ?>
 
-            <table class='data'>
-                <tr class="data-add">
-                <td class="data-dotted" width="150">
-                    <table class="data-col1">
-                        <tr>
-                            <td></td>
-                        </tr>
-                    </table>
-                </td>
-                <td class="data-dotted" width="830px">
-                    <table width="830px">
-                        <tr>
-                            <td></td>
-                        </tr>
-                    </table>
-                    <table class="data-col2" width="600px">
-                        <tr>
-                            <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                <?php print __('Domain');?>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <input type="text" size="20" class="vst-input" name="v_domain" id="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?>>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                <?php print __('IP address');?>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <select class="vst-list" name="v_ip">
-                                    <?php
-                                        foreach ($ips as $key => $value) {
-                                            $display_ip = $key;
-                                            if (!empty($value['NAT'])) $display_ip = $value['NAT'];
-                                            echo "\t\t\t\t<option value=\"".$display_ip."\"";
-                                            if ((!empty($v_ip)) && ( $display_ip == $_POST['v_ip'])){
-                                                echo ' selected';
-                                            }
-                                            echo ">".$display_ip."</option>\n";
-                                        }
-                                    ?>
-                                </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                <?php print __('DNS Support');?>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <input type="checkbox" size="20" class="vst-checkbox" name="v_dns" <?php if (empty($v_dns)) echo "checked=yes"; ?>>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                <?php print __('Mail Support');?>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <input type="checkbox" size="20" class="vst-checkbox" name="v_mail" <?php if (empty($v_mail)) echo "checked=yes"; ?>>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                <a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print __('Advanced options');?></a>
+                                <table class="submenu">
+                                    <tr>
+                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Adding Domain');?></b></a>
+                                            <?php
+                                                if (!empty($_SESSION['error_msg'])) {
+                                                    echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                                                } else {
+                                                    if (!empty($_SESSION['ok_msg'])) {
+                                                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
+                                                    }
+                                                }
+                                            ?>
+                                        </td>
+                                    </tr>
+                                </table>
                             </td>
                         </tr>
                     </table>
-                    <table class="data-col2" width="600px" style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
-                        <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                <?php print __('Aliases');?>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <textarea size="20" class="vst-textinput" name="v_aliases" id="v_aliases" ><?php if (!empty($v_aliases)) echo $v_aliases;  ?></textarea>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                <?php print __('Proxy Support');?>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <input type="checkbox" size="20" class="vst-checkbox" name="v_proxy" <?php if ($v_proxy !== 'off') echo "checked=yes" ?> onclick="javascript:elementHideShow('proxytable');">
+
+                    <form id="vstobjects" name="v_add_web" method="post">
+                        <script type="text/javascript">
+                            $(function() {
+                                $("#v_domain").change(function() {
+                                    var prefix = 'www.';
+                                    document.getElementById('v_aliases').value = prefix + document.getElementById('v_domain').value;
+                                });
+                            });
+                            function WEBrandom() {
+                                var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+                                var string_length = 10;
+                                var webrandom = '';
+                                for (var i=0; i<string_length; i++) {
+                                    var rnum = Math.floor(Math.random() * chars.length);
+                                    webrandom += chars.substring(rnum,rnum+1);
+                                }
+                                document.v_add_web.v_stats_password.value = webrandom;
+                            }
+
+                            function FTPrandom() {
+                                var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+                                var string_length = 10;
+                                var ftprandomstring = '';
+                                for (var i=0; i<string_length; i++) {
+                                    var rnum = Math.floor(Math.random() * chars.length);
+                                    ftprandomstring += chars.substring(rnum,rnum+1);
+                                }
+                                document.v_add_web.v_ftp_password.value = ftprandomstring;
+                            }
+
+                            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='data'>
+                            <tr class="data-add">
+                            <td class="data-dotted" width="150">
+                                <table class="data-col1">
+                                    <tr>
+                                        <td></td>
+                                    </tr>
+                                </table>
                             </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <table style="display:<?php if ($v_proxy == 'off') { echo 'none';} else {echo 'block';}?>;" id="proxytable" >
+                            <td class="data-dotted" width="830px">
+                                <table width="830px">
                                     <tr>
-                                        <td class="vst-text" style="padding: 9px 0 0 0;">
-                                            <?php print __('Proxy Extentions');?>
+                                        <td></td>
+                                    </tr>
+                                </table>
+                                <table class="data-col2" width="600px">
+                                    <tr>
+                                        <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                            <?php print __('Domain');?>
                                         </td>
                                     </tr>
                                     <tr>
                                         <td>
-                                            <textarea size="20" class="vst-textinput" name="v_proxy_ext"><?php if (!empty($v_proxy_ext)) { echo $v_proxy_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>
+                                            <input type="text" size="20" class="vst-input" name="v_domain" id="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?>>
                                         </td>
                                     </tr>
-                                </table>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                <?php print __('SSL Support');?>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <input type="checkbox" size="20" class="vst-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 (empty($v_ssl)) { echo 'none';} else {echo 'block';}?>;" id="ssltable">
                                     <tr>
-                                        <td class="vst-text" style="padding: 9px 0 0 0;">
-                                            <?php print __('SSL Home Directory');?>
+                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                            <?php print __('IP address');?>
                                         </td>
                                     </tr>
                                     <tr>
                                         <td>
-                                            <select class="vst-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 class="vst-list" name="v_ip">
+                                                <?php
+                                                    foreach ($ips as $key => $value) {
+                                                        $display_ip = $key;
+                                                        if (!empty($value['NAT'])) $display_ip = $value['NAT'];
+                                                        echo "\t\t\t\t<option value=\"".$display_ip."\"";
+                                                        if ((!empty($v_ip)) && ( $display_ip == $_POST['v_ip'])){
+                                                            echo ' selected';
+                                                        }
+                                                        echo ">".$display_ip."</option>\n";
+                                                    }
+                                                ?>
                                             </select>
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 0;">
-                                            <?php print __('SSL Certificate');?>
+                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                            <?php print __('DNS Support');?>
                                         </td>
                                     </tr>
                                     <tr>
                                         <td>
-                                            <textarea size="20" class="vst-textinput" name="v_ssl_crt"><?php if (!empty($v_ssl_crt)) echo $v_ssl_crt; ?></textarea>
+                                            <input type="checkbox" size="20" class="vst-checkbox" name="v_dns" <?php if (empty($v_dns)) echo "checked=yes"; ?>>
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 0;">
-                                            <?php print __('SSL Key');?>
+                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                            <?php print __('Mail Support');?>
                                         </td>
                                     </tr>
                                     <tr>
                                         <td>
-                                            <textarea size="20" class="vst-textinput" name="v_ssl_key"><?php if (!empty($v_ssl_key)) echo $v_ssl_key; ?></textarea>
+                                            <input type="checkbox" size="20" class="vst-checkbox" name="v_mail" <?php if (empty($v_mail)) echo "checked=yes"; ?>>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                            <a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print __('Advanced options');?></a>
                                         </td>
                                     </tr>
+                                </table>
+                                <table class="data-col2" width="600px" style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
                                     <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 0;">
-                                            <?php print __('SSL Certificate Authority / Intermediate');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
+                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                            <?php print __('Aliases');?>
                                         </td>
                                     </tr>
                                     <tr>
                                         <td>
-                                            <textarea size="20" class="vst-textinput" name="v_ssl_ca"><?php if (!empty($v_ssl_ca)) echo $v_ssl_ca; ?></textarea>
+                                            <textarea size="20" class="vst-textinput" name="v_aliases" id="v_aliases" ><?php if (!empty($v_aliases)) echo $v_aliases;  ?></textarea>
                                         </td>
                                     </tr>
-                                </table>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                <?php print __('Web Statistics');?>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <select class="vst-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="vst-text" style="padding: 10px 0 0 2px;">
-                                <?php print __('Statistics Authorization');?>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <input type="checkbox" size="20" class="vst-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('statstable');">
-                            </td>
-                        </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>
-                                        <td class="vst-text" style="padding: 9px 0 0 0;">
-                                            <?php print __('Username');?>
+                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                            <?php print __('Proxy Support');?>
                                         </td>
                                     </tr>
                                     <tr>
                                         <td>
-                                            <input type="text" size="20" class="vst-input" name="v_stats_user" <?php if (!empty($v_stats_user)) echo "value=".$v_stats_user;  ?>>
+                                            <input type="checkbox" size="20" class="vst-checkbox" name="v_proxy" <?php if ($v_proxy !== 'off') echo "checked=yes" ?> onclick="javascript:elementHideShow('proxytable');">
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 0;">
-                                            <?php print __('Password');?> <a href="javascript:WEBrandom();" class="genpass"><?php print __('generate');?></a>
+                                        <td>
+                                            <table style="display:<?php if ($v_proxy == 'off') { echo 'none';} else {echo 'block';}?>;" id="proxytable" >
+                                                <tr>
+                                                    <td class="vst-text" style="padding: 9px 0 0 0;">
+                                                        <?php print __('Proxy Extentions');?>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <textarea size="20" class="vst-textinput" name="v_proxy_ext"><?php if (!empty($v_proxy_ext)) { echo $v_proxy_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="vst-text" style="padding: 10px 0 0 2px;">
+                                            <?php print __('SSL Support');?>
                                         </td>
                                     </tr>
                                     <tr>
                                         <td>
-                                            <input type="text" size="20" class="vst-input" name="v_stats_password" <?php if (!empty($v_stats_password)) echo "value=".$v_stats_password;  ?> id="v_password">
+                                            <input type="checkbox" size="20" class="vst-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 (empty($v_ssl)) { echo 'none';} else {echo 'block';}?>;" id="ssltable">
+                                                <tr>
+                                                    <td class="vst-text" style="padding: 9px 0 0 0;">
+                                                        <?php print __('SSL Home Directory');?>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <select class="vst-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="vst-text" style="padding: 10px 0 0 0;">
+                                                        <?php print __('SSL Certificate');?>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <textarea size="20" class="vst-textinput" name="v_ssl_crt"><?php if (!empty($v_ssl_crt)) echo $v_ssl_crt; ?></textarea>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="vst-text" style="padding: 10px 0 0 0;">
+                                                        <?php print __('SSL Key');?>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <textarea size="20" class="vst-textinput" name="v_ssl_key"><?php if (!empty($v_ssl_key)) echo $v_ssl_key; ?></textarea>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="vst-text" style="padding: 10px 0 0 0;">
+                                                        <?php print __('SSL Certificate Authority / Intermediate');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <textarea size="20" class="vst-textinput" name="v_ssl_ca"><?php if (!empty($v_ssl_ca)) echo $v_ssl_ca; ?></textarea>
+                                                    </td>
+                                                </tr>
+                                            </table>
                                         </td>
                                     </tr>
-                                </table>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                <?php print __('Additional FTP Account');?>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <input type="checkbox" size="20" class="vst-checkbox" name="v_ftp" <?php if (!empty($v_ftp)) echo "checked=yes" ?> onclick="javascript:elementHideShow('ftptable');">
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" id="ftptable" name="v_add_domain_ftp">
                                     <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 0;">
-                                            <?php print __('Username');?><br>
-                                            <span style="font-size: 10pt; color:#777;"><?php print __('Prefix will be automaticaly added to username',$user."_");?></span>
+                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                            <?php print __('Web Statistics');?>
                                         </td>
                                     </tr>
                                     <tr>
                                         <td>
-                                            <input type="text" size="20" class="vst-input" name="v_ftp_user" <?php if (!empty($v_ftp_user)) echo "value=".$v_ftp_user; ?>>
+                                            <select class="vst-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="vst-text" style="padding: 10px 0 0 2px;">
+                                            <?php print __('Statistics Authorization');?>
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 0;">
-                                            <?php print __('Password');?> <a href="javascript:FTPrandom();" class="genpass" ><?php print __('generate');?></a>
+                                        <td>
+                                            <input type="checkbox" size="20" class="vst-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('statstable');">
                                         </td>
                                     </tr>
                                     <tr>
                                         <td>
-                                            <input type="text" class="vst-input" name="v_ftp_password" <?php if (!empty($v_ftp_password)) echo "value=".$v_ftp_password; ?>>
+                                            <table style="display:<?php if (empty($v_stats_user)) { echo 'none';} else {echo 'block';}?> ;" id="statstable" name="v-add-web-domain-stats-user">
+                                                <tr>
+                                                    <td class="vst-text" style="padding: 9px 0 0 0;">
+                                                        <?php print __('Username');?>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <input type="text" size="20" class="vst-input" name="v_stats_user" <?php if (!empty($v_stats_user)) echo "value=".$v_stats_user;  ?>>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="vst-text" style="padding: 10px 0 0 0;">
+                                                        <?php print __('Password');?> <a href="javascript:WEBrandom();" class="genpass"><?php print __('generate');?></a>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <input type="text" size="20" class="vst-input" name="v_stats_password" <?php if (!empty($v_stats_password)) echo "value=".$v_stats_password;  ?> id="v_password">
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                            <?php print __('Additional FTP Account');?>
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 0;">
-                                             <?php print __('Send FTP credentials to email');?>
+                                        <td>
+                                            <input type="checkbox" size="20" class="vst-checkbox" name="v_ftp" <?php if (!empty($v_ftp)) echo "checked=yes" ?> onclick="javascript:elementHideShow('ftptable');">
                                         </td>
                                     </tr>
                                     <tr>
                                         <td>
-                                            <input type="text"  class="vst-input" name="v_ftp_email" <?php if (!empty($v_ftp_email)) echo "value=".$v_ftp_email; ?>>
+                                            <table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" id="ftptable" name="v_add_domain_ftp">
+                                                <tr>
+                                                    <td class="vst-text" style="padding: 10px 0 0 0;">
+                                                        <?php print __('Username');?><br>
+                                                        <span style="font-size: 10pt; color:#777;"><?php print __('Prefix will be automaticaly added to username',$user."_");?></span>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <input type="text" size="20" class="vst-input" name="v_ftp_user" <?php if (!empty($v_ftp_user)) echo "value=".$v_ftp_user; ?>>
+														<small class="ftp_username_hint"></small>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="vst-text" style="padding: 10px 0 0 0;">
+                                                        <?php print __('Password');?> <a href="javascript:FTPrandom();" class="genpass" ><?php print __('generate');?></a>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <input type="text" class="vst-input" name="v_ftp_password" <?php if (!empty($v_ftp_password)) echo "value=".$v_ftp_password; ?>>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="vst-text" style="padding: 10px 0 0 0;">
+                                                         <?php print __('Send FTP credentials to email');?>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <input type="text"  class="vst-input" name="v_ftp_email" <?php if (!empty($v_ftp_email)) echo "value=".$v_ftp_email; ?>>
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                </table>
+                                <table class="data-col2">
+                                    <tr>
+                                        <td style="padding: 33px 0 0 0;" width="116px">
+                                            <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
+                                        </td>
+                                        <td style="padding: 33px 0 0 0;">
+                                            <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                         </td>
                                     </tr>
                                 </table>
                             </td>
                         </tr>
                     </table>
-                    <table class="data-col2">
-                        <tr>
-                            <td style="padding: 33px 0 0 0;" width="116px">
-                                <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
-                            </td>
-                            <td style="padding: 33px 0 0 0;">
-                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
-                            </td>
-                        </tr>
-                    </table>
-                </td>
-            </tr>
-        </table>
-    </form>
+                </form>
+
+<script type="text/javascript" src="/js/pages/add.web.js"></script>

web/templates/admin/edit_web.html

@@ -1,383 +1,391 @@
-            <?php
-                $back = $_SESSION['back'];
-                if (empty($back)) {
-                    $back = "location.href='/list/web/'";
-                } else {
-                    $back = "location.href='".$back."'";
-                }
-            ?>
-            <table class="submenu">
-                <tr>
-                    <td style="padding: 16px 8px;" ><a class="name"><b><?php print __('Editing Domain');?></b></a>
-                        <?php
-                            if (!empty($_SESSION['error_msg'])) {
-                                echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-                            } else {
-                                if (!empty($_SESSION['ok_msg'])) {
-                                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
+                                <?php
+                                    $back = $_SESSION['back'];
+                                    if (empty($back)) {
+                                        $back = "location.href='/list/web/'";
+                                    } else {
+                                        $back = "location.href='".$back."'";
+                                    }
+                                ?>
+
+                                <table class="submenu">
+                                    <tr>
+                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Editing Domain');?></b></a>
+                                            <?php
+                                                if (!empty($_SESSION['error_msg'])) {
+                                                    echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                                                } else {
+                                                    if (!empty($_SESSION['ok_msg'])) {
+                                                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
+                                                    }
+                                                }
+                                            ?>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
+
+                    <form id="vstobjects" name="v_edit_web" method="post">
+                        <script language="javascript">
+                            function WEBrandom() {
+                                var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+                                var string_length = 10;
+                                var webrandom = '';
+                                for (var i=0; i<string_length; i++) {
+                                    var rnum = Math.floor(Math.random() * chars.length);
+                                    webrandom += chars.substring(rnum,rnum+1);
                                 }
+                                document.v_edit_web.v_stats_password.value = webrandom;
                             }
-                        ?> 
-                    </td>
-                </tr>
-            </table>
-        </div>
-
-        <form id="vstobjects" name="v_edit_web" method="post">
-            <script language="javascript">
-                function WEBrandom() {
-                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                    var string_length = 10;
-                    var webrandom = '';
-                    for (var i=0; i<string_length; i++) {
-                        var rnum = Math.floor(Math.random() * chars.length);
-                        webrandom += chars.substring(rnum,rnum+1);
-                    }
-                    document.v_edit_web.v_stats_password.value = webrandom;
-                }
 
-                function FTPrandom() {
-                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                    var string_length = 10;
-                    var ftprandomstring = '';
-                    for (var i=0; i<string_length; i++) {
-                        var rnum = Math.floor(Math.random() * chars.length);
-                        ftprandomstring += chars.substring(rnum,rnum+1);
-                    }
-                    document.v_edit_web.v_ftp_password.value = ftprandomstring;
-                }
+                            function FTPrandom() {
+                                var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+                                var string_length = 10;
+                                var ftprandomstring = '';
+                                for (var i=0; i<string_length; i++) {
+                                    var rnum = Math.floor(Math.random() * chars.length);
+                                    ftprandomstring += chars.substring(rnum,rnum+1);
+                                }
+                                document.v_edit_web.v_ftp_password.value = ftprandomstring;
+                            }
 
-                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='data'>
-                <tr class="data-add">
-                    <td class="data-dotted" width="150">
-                        <table class="data-col1">
-                            <tr>
-                                <td>
-                                    <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                    <a class="data-date"><?php echo $v_time?></a>
-                                </td>
-                            </tr>
-                            <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
-                        </table>
-                    </td>
-                    <td class="data-dotted" width="830px">
-                        <table width="830px">
-                            <tr>
-                                <td></td>
-                            </tr>
-                        </table>
-                        <table class="data-col2" width="830px">
-                            <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                    <?php print __('Domain');?>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <input type="text" size="20" class="vst-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="vst-text" style="padding: 10px 0 0 2px;">
-                                    <?php print __('IP Address');?>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <select class="vst-list" name="v_ip">
-                                        <?php
-                                            foreach ($ips as $key => $value) {
-                                                $display_ip = $key;
-                                                if (!empty($value['NAT'])) $display_ip = $value['NAT'];
-                                                $skey = "'".$display_ip."'";
-                                                echo "\n\t\t\t\t\t\t\t\t\t\t\t\t<option value=\"".$display_ip."\"";
-                                                if ((!empty($v_ip)) && ( $display_ip == $v_ip ) || ( $skey == $v_ip )){
-                                                    echo ' selected';
-                                                }
-                                                echo ">".$display_ip."</option>\n";
-                                            }
-                                        ?>
-                                    </select>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                    <?php print __('Aliases');?>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <textarea size="20" class="vst-textinput" name="v_aliases"><?php if (!empty($v_aliases)) echo $v_aliases;  ?></textarea>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                    <?php print __('Web Template');?>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <select class="vst-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="vst-text" style="padding: 10px 0 0 2px;">
-                                    <?php print __('Proxy Support');?>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <input type="checkbox" size="20" class="vst-checkbox" name="v_proxy" <?php if (!empty($v_proxy)) echo "checked=yes" ?> onclick="javascript:elementHideShow('proxytable');">
+                            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='data'>
+                            <tr class="data-add">
+                                <td class="data-dotted" width="150">
+                                    <table class="data-col1">
+                                        <tr>
+                                            <td style="padding: 24px 0 2px 18px;">
+                                                <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
+                                                <a class="data-date"><?php echo $v_time?></a>
+                                            </td>
+                                        </tr>
+                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
+                                    </table>
                                 </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <table style="display:<?php if (empty($v_proxy)) { echo 'none';} else {echo 'block';}?> ;" id="proxytable">
+                                <td class="data-dotted" width="830px">
+                                    <table width="830px">
+                                        <tr>
+                                            <td></td>
+                                        </tr>
+                                    </table>
+                                    <table class="data-col2" width="830px">
                                         <tr>
-                                            <td class="vst-text" style="padding: 9px 0 0 2px;">
-                                                <?php print __('Proxy Template');?>
+                                            <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                                <?php print __('Domain');?>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
-                                                <select class="vst-list" name="v_proxy_template">
+                                                <input type="text" size="20" class="vst-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="vst-text" style="padding: 10px 0 0 2px;">
+                                                <?php print __('IP Address');?>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <select class="vst-list" name="v_ip">
                                                     <?php
-                                                        foreach ($proxy_templates as $key => $value) {
-                                                            echo "\t\t\t\t<option value=\"".$value."\"";
-                                                            $svalue = "'".$value."'";
-                                                            if ((!empty($v_proxy_template)) && ( $value == $v_proxy_template ) || ($svalue == $v_proxy_template)){
-                                                                echo ' selected' ;
+                                                        foreach ($ips as $key => $value) {
+                                                            $display_ip = $key;
+                                                            if (!empty($value['NAT'])) $display_ip = $value['NAT'];
+                                                            $skey = "'".$display_ip."'";
+                                                            echo "\n\t\t\t\t\t\t\t\t\t\t\t\t<option value=\"".$display_ip."\"";
+                                                            if ((!empty($v_ip)) && ( $display_ip == $v_ip ) || ( $skey == $v_ip )){
+                                                                echo ' selected';
                                                             }
-                                                            if ((empty($v_proxy_template)) && ($value == 'default')){
-                                                                echo ' selected' ;
-                                                            }
-                                                            echo ">".$value."</option>\n";
+                                                            echo ">".$display_ip."</option>\n";
                                                         }
-                                                    ?> 
+                                                    ?>
                                                 </select>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                <?php print __('Proxy Extensions');?>
+                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                                <?php print __('Aliases');?>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
-                                                <textarea size="20" class="vst-textinput" name="v_proxy_ext"><?php if (!empty($v_proxy_ext)) { echo $v_proxy_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>
+                                                <textarea size="20" class="vst-textinput" name="v_aliases"><?php if (!empty($v_aliases)) echo $v_aliases;  ?></textarea>
                                             </td>
                                         </tr>
-                                    </table>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                    <?php print __('SSL Support');?>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <input type="checkbox" size="20" class="vst-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="vst-text" style="padding: 9px 0 0 0;">
-                                                <?php print __('SSL Home Directory');?>
+                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                                <?php print __('Web Template');?>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
-                                                <select class="vst-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 class="vst-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="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('SSL Certificate');?>
+                                                <?php print __('Proxy Support');?>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
-                                                <textarea size="20" class="vst-textinput" name="v_ssl_crt"><?php if (!empty($v_ssl_crt)) echo $v_ssl_crt; ?></textarea>
+                                                <input type="checkbox" size="20" class="vst-checkbox" name="v_proxy" <?php if (!empty($v_proxy)) echo "checked=yes" ?> onclick="javascript:elementHideShow('proxytable');">
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('SSL Key');?>
+                                            <td>
+                                                <table style="display:<?php if (empty($v_proxy)) { echo 'none';} else {echo 'block';}?> ;" id="proxytable">
+                                                    <tr>
+                                                        <td class="vst-text" style="padding: 9px 0 0 2px;">
+                                                            <?php print __('Proxy Template');?>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <select class="vst-list" name="v_proxy_template">
+                                                                <?php
+                                                                    foreach ($proxy_templates as $key => $value) {
+                                                                        echo "\t\t\t\t<option value=\"".$value."\"";
+                                                                        $svalue = "'".$value."'";
+                                                                        if ((!empty($v_proxy_template)) && ( $value == $v_proxy_template ) || ($svalue == $v_proxy_template)){
+                                                                            echo ' selected' ;
+                                                                        }
+                                                                        if ((empty($v_proxy_template)) && ($value == 'default')){
+                                                                            echo ' selected' ;
+                                                                        }
+                                                                        echo ">".$value."</option>\n";
+                                                                    }
+                                                                ?> 
+                                                            </select>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                                            <?php print __('Proxy Extensions');?>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <textarea size="20" class="vst-textinput" name="v_proxy_ext"><?php if (!empty($v_proxy_ext)) { echo $v_proxy_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>
-                                                <textarea size="20" class="vst-textinput" name="v_ssl_key"><?php if (!empty($v_ssl_key)) echo $v_ssl_key; ?></textarea>
+                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                                <?php print __('SSL Support');?>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('SSL Certificate Authority / Intermediate');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
+                                            <td>
+                                                <input type="checkbox" size="20" class="vst-checkbox" name="v_ssl" <?php if ($v_ssl == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');">
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
-                                                <textarea size="20" class="vst-textinput" name="v_ssl_ca"><?php if (!empty($v_ssl_ca)) echo $v_ssl_ca; ?></textarea>
+                                                <table style="display:<?php if ($v_ssl == 'no' ) { echo 'none';} else {echo 'block';}?> ;" id="ssltable">
+                                                    <tr>
+                                                        <td class="vst-text" style="padding: 9px 0 0 0;">
+                                                            <?php print __('SSL Home Directory');?>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <select class="vst-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="vst-text" style="padding: 10px 0 0 2px;">
+                                                            <?php print __('SSL Certificate');?>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <textarea size="20" class="vst-textinput" name="v_ssl_crt"><?php if (!empty($v_ssl_crt)) echo $v_ssl_crt; ?></textarea>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                                            <?php print __('SSL Key');?>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <textarea size="20" class="vst-textinput" name="v_ssl_key"><?php if (!empty($v_ssl_key)) echo $v_ssl_key; ?></textarea>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                                            <?php print __('SSL Certificate Authority / Intermediate');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <textarea size="20" class="vst-textinput" name="v_ssl_ca"><?php if (!empty($v_ssl_ca)) echo $v_ssl_ca; ?></textarea>
+                                                        </td>
+                                                    </tr>
+                                                </table>
                                             </td>
                                         </tr>
-                                    </table>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                    <?php print __('Web Statistics');?>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <select class="vst-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="vst-text" style="padding: 10px 0 0 2px;">
-                                    <?php print __('Statistics Authorization');?>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <input type="checkbox" size="20" class="vst-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('statstable');">
-                                </td>
-                            </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>
-                                            <td class="vst-text" style="padding: 9px 0 0 2px;">
-                                                <?php print __('Username');?>
+                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                                <?php print __('Web Statistics');?>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input type="text" size="20" class="vst-input" name="v_stats_user" <?php if (!empty($v_stats_user)) echo "value=".$v_stats_user;  ?>>
+                                                <select class="vst-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="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Password');?> <a href="javascript:WEBrandom();" class="genpass"><?php print __('generate');?></a>
+                                                <?php print __('Statistics Authorization');?>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input type="text" size="20" class="vst-input" name="v_stats_password" <?php if (!empty($v_stats_password)) echo "value=".$v_stats_password;  ?> id="v_password">
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                    <?php print __('Additional FTP Account');?>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <input type="checkbox" size="20" class="vst-checkbox" name="v_ftp" <?php if (!empty($v_ftp_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('ftptable');">
-                                    </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" id="ftptable" name="v_add_domain_ftp">
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                <?php print __('Username');?>
-                                                <?php if (empty($v_ftp_user)) echo '<br><span style="font-size: 10pt; color:#777;">' . __('Prefix will be automaticaly added to username',$user."_") . '</span>' ?> 
+                                                <input type="checkbox" size="20" class="vst-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('statstable');">
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input type="text" size="20" class="vst-input" name="v_ftp_user" <?php if (!empty($v_ftp_user)) echo "value=".$v_ftp_user;  ?>>
+                                                <table style="display:<?php if (empty($v_stats_user)) { echo 'none';} else {echo 'block';}?> ;" id="statstable" name="v-add-web-domain-stats-user">
+                                                    <tr>
+                                                        <td class="vst-text" style="padding: 9px 0 0 2px;">
+                                                            <?php print __('Username');?>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <input type="text" size="20" class="vst-input" name="v_stats_user" <?php if (!empty($v_stats_user)) echo "value=".$v_stats_user;  ?>>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                                            <?php print __('Password');?> <a href="javascript:WEBrandom();" class="genpass"><?php print __('generate');?></a>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <input type="text" size="20" class="vst-input" name="v_stats_password" <?php if (!empty($v_stats_password)) echo "value=".$v_stats_password;  ?> id="v_password">
+                                                        </td>
+                                                    </tr>
+                                                </table>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                <?php print __('Password');?> <a href="javascript:FTPrandom();" class="genpass" ><?php print __('generate');?></a>
+                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                                <?php print __('Additional FTP Account');?>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input type="text"  class="vst-input" name="v_ftp_password" <?php if (!empty($v_ftp_password)) echo "value=".$v_ftp_password;  ?>>
-                                            </td>
+                                                <input type="checkbox" size="20" class="vst-checkbox" name="v_ftp" <?php if (!empty($v_ftp_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('ftptable');">
+                                                </td>
                                         </tr>
-                                        <?php
-                                            if (empty($v_ftp_user)) {
-                                                echo '';
-                                         ?> 
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                <?php print __('Send FTP credentials to email');?>
+                                            <td>
+                                                <table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" id="ftptable" name="v_add_domain_ftp">
+                                                    <tr>
+                                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                                            <?php print __('Username');?>
+                                                            <?php if (empty($v_ftp_user)) echo '<br><span style="font-size: 10pt; color:#777;">' . __('Prefix will be automaticaly added to username',$user."_") . '</span>' ?> 
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <input type="text" size="20" class="vst-input" name="v_ftp_user" <?php if (!empty($v_ftp_user)) echo "value=".$v_ftp_user;  ?>>
+															<small class="ftp_username_hint"></small>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                                            <?php print __('Password');?> <a href="javascript:FTPrandom();" class="genpass" ><?php print __('generate');?></a>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <input type="text"  class="vst-input" name="v_ftp_password" <?php if (!empty($v_ftp_password)) echo "value=".$v_ftp_password;  ?>>
+                                                        </td>
+                                                    </tr>
+                                                    <?php
+                                                        if (empty($v_ftp_user)) {
+                                                            echo '';
+                                                     ?> 
+                                                    <tr>
+                                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                                            <?php print __('Send FTP credentials to email');?>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <input type="text"  class="vst-input" name="v_ftp_email" <?php if (!empty($v_ftp_email)) echo "value=".$v_ftp_email;  ?>>
+                                                        </td>
+                                                    </tr>
+                                                    <?php
+                                                        }
+                                                    ?> 
+                                                </table>
                                             </td>
                                         </tr>
+                                    </table>
+                                    <table class="data-col2">
                                         <tr>
-                                            <td>
-                                                <input type="text"  class="vst-input" name="v_ftp_email" <?php if (!empty($v_ftp_email)) echo "value=".$v_ftp_email;  ?>>
+                                            <td style="padding: 24px 0 0 0;" width="116px">
+                                                <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
+                                            </td>
+                                            <td style="padding: 24px 0 0 0;">
+                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                             </td>
                                         </tr>
-                                        <?php
-                                            }
-                                        ?> 
                                     </table>
                                 </td>
                             </tr>
                         </table>
-                        <table class="data-col2">
-                            <tr>
-                                <td style="padding: 24px 0 0 0;" width="116px">
-                                    <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
-                                </td>
-                                <td style="padding: 24px 0 0 0;">
-                                    <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
-                                </td>
-                            </tr>
-                        </table>
-                    </td>
-                </tr>
-            </table>
-        </form>
+                    </form>
+
+
+
+<script type="text/javascript" src="/js/pages/edit.web.js"></script>
 

web/templates/header.html

@@ -4,9 +4,900 @@
         <link rel="icon" href="/images/favicon.ico" type="image/x-icon">
         <title>Vesta - <?php echo "$TAB"; ?> </title>
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-        <link type="text/css" href="/css/main.css" rel="stylesheet" />
+        <style type="text/css">
+            body {
+                margin: 0;
+                margin-left: auto;
+                margin-right: auto;
+                font-family: Arial, Helvetica, sans-serif;
+                background-color: #e5e5e5;
+            }
+
+            form {
+                margin: 0;
+            }
+
+            .hidden {
+                display: none;
+            }
+
+            .main {
+                background-color: #ffffff;
+                padding: 0 0 18px 0;
+                box-shadow: 0 2px 4px rgba(100, 100, 100, 0.3);
+            }
+
+            .top {
+                color: #ffd76e;
+                padding: 0;
+                font-family: Arial, Helvetica, sans-serif;
+                margin: 0;
+                width: 990px;
+                font-size: 10pt;
+                text-align: left;
+                border: 0px;
+                border-collapse:collapse;
+
+            }
+
+            .top thead td {
+                background-color: #505050;
+                border-bottom: 1px solid #fff;
+                height: 25px;
+                text-align: right;
+                padding: 0 24px 0 0px;
+                weight:120px;
+            }
+
+            .top thead td:first-child{
+                border-left: 1px solid #fff;
+                border-right:none;
+                text-align:left;
+                padding: 0 0 0 0;
+                width:auto;
+            }
+
+            .top-link {
+                padding: 5px 22px 4px;
+                text-decoration: none;
+                color: #fff;
+                border-right: 1px solid #fff;
+            }
+
+            .top-link:hover {
+                color: #fff;
+                background-color: #999;
+            }
+
+            .top-link:active{
+                color: #fff;
+                background-color: #f79b44;
+            }
+
+            .top-selected-link {
+                padding: 5px 22px;
+                text-decoration: none;
+                color: #555;
+                background-color: #fff;
+                border-right: 1px solid #fff;
+            }
+
+            .top-selected-link:hover {
+                color: #174f82;
+            }
+
+            .top-selected-link:active {
+                color: #fff;
+                background-color: #f79b44;
+            }
+
+            .top-user {
+                padding: 0 2px 0 0;
+                text-decoration: none;
+                color: #ffd76e;
+            }
+
+            .top-user:hover {
+                color: #fff;
+            }
+
+            .top-user:active{
+                color: #fff;
+                background-color: #f79b44;
+            }
+
+            .top-logout {
+                text-decoration: none;
+                color: #d3d3d3;
+                border: noner;
+            }
+
+            .top-logout:hover {
+                color: #fff;
+            }
+
+            .top-logout:active {
+                color: #fff;
+                background-color: #f79b44;
+            }
+
+            .nav-logo {
+                float:left;
+                height:110px;
+                width:161px;
+                margin: 0;
+                border-bottom: 1px solid #e3e3e3;
+            }
+
+            .nav-lnk {
+                text-decoration: none;
+                color: #323232;
+                float:left;
+            }
+
+            .nav-lnk:active {
+                color: #f79b44;
+            }
+
+            .nav-block {
+                margin: 0;
+                height:110px;
+                width: 118px;
+                float:left;
+                cursor: pointer;
+                border-bottom: 1px solid #e3e3e3;
+
+            }
+
+            .nav-block:hover {
+                height:107px;
+                border-bottom: 4px solid #f79b44;
+            }
+
+            .nav-selected-block {
+                margin: 0;
+                color: #174f82;
+                height: 107px;
+                width: 118px;
+                float: left;
+                background-color: #fff;
+                border-bottom: 4px solid #777;
+                cursor: pointer;
+            }
+
+            .nav-selected-block:hover {
+                height:107px;
+                border-bottom: 4px solid #f79b44;
+            }
+
+            .nav-selected-block:active {
+                color: #f79b44;
+            }
+
+            .nav-header {
+                padding: 14px 0 0 6px;
+                margin: 0;
+                letter-spacing: -1.0px;
+                font-size: 16pt;
+                font-weight: bold;
+            }
+
+            .nav-selected-header {
+                padding: 14px 0 0 6px;
+                margin: 0;
+                letter-spacing: -1.0px;
+                font-size: 16pt;
+                font-weight: bold;
+            }
+
+            .nav-counters {
+                padding: 1px 0 0 6px;
+                margin: 0;
+                height: 58px;
+                line-height: 1.4em;
+                font-size: 9pt;
+                color: #555;
+                decoration: none;
+            }
+
+            .submenu {
+                margin-left: auto;
+                margin-right: auto;
+                width: 990px;
+                font-family:Arial, Helvetica, sans-serif;
+                height: 54px;
+                font-size: 10pt;
+                text-align: left;
+                vertical-align:top;
+                padding: 0px 10px 0px 0;
+                background-color: none repeat scroll 0% 0% white;
+            }
+
+            .submenu td {
+                vertical-align: middle;
+            }
+
+            .submenu-button-block {
+                float: left;
+            }
+
+            .submenu-button {
+                width: 130px;
+                height: 24px;
+                cursor: pointer;
+                color: #333;
+                background-color: #fafafa;
+                border: 1px solid #999;
+                border-radius: 3px 3px 3px 3px;
+                padding: 0;
+                font-size: 12px;
+                font-family:Arial, Helvetica, sans-serif;
+            }
+
+            @-moz-document url-prefix() {
+                .submenu-button {
+                    padding-bottom: 2px;
+                }
+            }
+
+            .submenu-button:hover {
+                background-color: #f0f0f0;
+            }
+
+            .submenu-button:active {
+                color: #fff;
+                border: 1px solid #f79b44;
+                background-color: #f79b44;
+            }
+
+            .submenu-select-block {
+                float:left;
+                padding-left: 18px;
+            }
+
+            .submenu-select-link {
+                color: #6A6A6A;
+                display: block;
+                float: left;
+                font-size: 8pt;
+                letter-spacing: 0.1em;
+                margin: 6px 6px 0 0;
+                text-decoration: none;
+                padding: 0 4px 0 12px
+            }
+
+            .submenu-select-link:hover {
+                text-decoration: underline;
+            }
+
+            .submenu-select-link:active {
+                color: #fff;
+                background-color: #f79b44;
+                text-decoration: underline;
+            }
+
+            .submenu-select-dropdown {
+                font-family:Arial, Helvetica, sans-serif;
+                color: #333333;
+                display: block;
+                float: left;
+                height: 24px;
+                margin: 0 4px 0 0;
+                min-width: 138px;
+            }
+
+            .submenu-search-block {
+                text-align: right;
+                float: right;
+            }
+
+            .submenu-search-field {
+                border: 1px solid #d3d3d3;
+                border-radius: 3px 3px 3px 3px;
+                color: #333;
+                font-size: 14px;
+                background-color: #fff;
+                float: left;
+                padding: 0px 3px 0px 3px;
+                height: 22px;
+                width: 250px;
+                margin: 0 4px 0 0;
+            }
+
+            .bottom {
+                background-color: #ebe9dc;
+                color: #555;
+                margin: 30px 0 0 0;
+                padding: 4px 20px 8px 0;
+                margin-left: auto;
+                margin-right: auto;
+                width: 990px;
+                font-size: 8pt;
+                text-align: center;
+                vertical-align:top;
+                line-height: 0.8em;
+                border-top: 4px solid #d3d3d3;
+            }
+
+            .bottom a:link {
+                font-size: 8pt;
+                text-decoration: none;
+                color: #555;
+            }
+
+            .bottom a:visited {
+                text-decoration: none;
+                color: #555;
+            }
+
+            .bottom a:hover {
+                text-decoration: underline;
+                color: #7fa1cb;
+            }
+
+            .vst {
+                padding: 0 4px 0 4px;
+                margin: 0;
+                text-decoration: none;
+                color: #999;
+                font-size: 12pt;
+                float: left;
+            }
+
+            .vst:hover {
+                text-decoration: underline;
+            }
+
+            .vst:active {
+                color: #fff;
+                background-color: #f79b44;
+            }
+
+            .vst-selected {
+                padding: 0 4px 0 4px;
+                margin: 0;
+                text-decoration: none;
+                color: #174f82;
+                font-size: 12pt;
+                float: left;
+            }
+
+            .vst-selected:hover {
+                text-decoration: underline;
+            }
+
+            .vst-selected:active {
+                color: #fff;
+                background-color: #f79b44;
+            }
+
+            .data {
+                border-collapse:collapse;
+                margin-left: auto;
+                margin-right: auto;
+                width: 990px;
+                font-family:Arial, Helvetica, sans-serif;
+                color: #e5a907;
+                font-size: 12pt;
+                text-align: left;
+                vertical-align:top;
+                margin: 0;
+                behavior:url("/css/csshover3.htc");
+            }
+
+            .data a {
+                text-decoration: none;
+            }
+
+            .data-row:hover {
+                margin: 0;
+                background-color: #f7f6ed;
+
+            }
+
+            .data-row:active {
+                background-color: #f7f7d8;
+            }
+
+            .datarowhover {
+                margin: 0;
+                background-color: #f7f6ed;
+            }
+
+            .data-null {
+                margin: 0;
+                width: 990px;
+                height: 10px;
+                border-top:1px dotted #d3d3d3;
+            }
+
+            .data-spacer {
+                margin: 0;
+                width: 990px;
+            }
+
+            .data-add {
+                margin: 0;
+                background-color: #f7f6ed;
+                border-left: 1px solid #e9e9e9;
+                border-right: 1px solid #e9e9e9;
+                border-bottom: 1px solid #e9e9e9;
+            }
+
+            .data-dotted {
+                text-align: left;
+                vertical-align:top;
+                border-top:1px dotted #d3d3d3;
+                padding: 0 0 26px 0;
+                margin: 0;
+            }
+
+            .data-dotted td {
+                margin: 0;
+            }
+
+            .data-col1 {
+                text-align: left;
+                padding:0;
+            }
+
+            .data-col1 tr td {
+                padding:0 0 0 20px;
+            }
+
+            .data-col1 tr:first-child td {
+                padding:23px 0 0 20px;
+            }
+
+            .data-col2 {
+                text-align: left;
+                padding: 0;
+                overflow: hidden;
+            }
+
+            .data-col2 a:visited {
+                color: green;
+            }
+
+            .data-col5 {
+                table-layout: fixed;
+                text-align: left;
+                padding: 0;
+                overflow: hidden;
+                white-space: nowrap;
+            }
+
+            .data-date {
+                padding: 0 0 0 18;
+                letter-spacing: 0.3em;
+                font-size: 8pt;
+                color: #6A6A6A
+            }
+
+            .data-active {
+                font-size: 8pt;
+                letter-spacing: 0.1em;
+                color: #81a64f;
+                padding: 0 0 13 18;
+            }
+
+            .data-suspended {
+                font-size: 8pt;
+                letter-spacing: 0.1em;
+                color: #de5543;
+                padding: 0 0 13 18;
+            }
+
+            .data-controls {
+                float: right;
+                height: 16px;
+                border-left: 1px solid #d3d3d3;
+                font-size: 8pt;
+                padding: 2px 12px 0 6px;
+                letter-spacing: 0.1em;
+                color: #174f82;
+                text-decoration: none;
+                cursor: pointer;
+            }
+
+            .data-controls:hover {
+                color: #fff;
+                background-color: #f79b44;
+            }
+
+            .data-controls:active {
+                background-color: #999
+            }
+
+            .data-controls img {
+                border: 0px;
+            }
+
+            .data-count {
+                font-family: Arial, Helvetica, sans-serif;
+                background-color: #f3f3f3;
+                color: #555;
+                font-size: 8pt;
+                margin: 18px 0 0 0;
+                text-align:right;
+                padding: 0 16px 0 0;
+            }
+
+            .chart1 {
+                color:#000;
+                font-size: 10pt;
+            }
+
+            .chart2 {
+                color: #484243;
+                font-size: 8pt;
+            }
+
+            .username {
+                color: #323232;
+                font-size: 16pt;
+            }
+
+            .domain {
+                color: #323232;
+                font-size: 16pt;
+            }
+
+            .cron {
+                color: #323232;
+                font-size: 18px;
+            }
+
+            .log {
+                color: #323232;
+                font-size: 12pt;
+            }
+
+            .aliases {
+                font-size: 12pt;
+                color: #99a7af;
+                padding: 0 0 0 8px;
+            }
+
+            .nginx-ext {
+                color: black;
+                vertical-align:top;
+                font-size: 10pt;
+            }
+
+            .fullname {
+                font-size: 18px;
+                color: #99a7af;
+                padding: 0 0 0 8px;
+            }
+
+            .counter-name {
+                white-space: nowrap;
+                vertical-align:top;
+                line-height: 1.3em;
+                font-size: 10pt;
+                color: #505050;
+                padding: 0 4px 0 0;
+            }
+
+            .cron-counter-name {
+                vertical-align:top;
+                line-height: 0.8em;
+                font-size: 8pt;
+                padding: 4 0 0 0;
+                color: #505050;
+            }
+
+            .counter-value {
+                vertical-align:top;
+                line-height: 1.2em;
+                font-size: 10pt;
+                color: #000;
+                padding: 0 0 0 4px;
+            }
+
+            .log-counter-value {
+                vertical-align:top;
+                font-size: 12pt;
+                color: #484243;
+            }
+
+            .cron-counter-value {
+                vertical-align:top;
+                line-height: 1.2em;
+                font-size: 12pt;
+                color: #484243;
+            }
+
+            .name {
+                font-size: 16pt;
+                color: #555;
+                padding: 0 0 0 10px;
+            }
+
+            .vst-ok {
+                font-size: 18px;
+                color: #62a358;
+                padding: 0 0 0 6px;
+            }
+
+            .vst-ok a{
+                color: #58934f;
+                text-decoration: none;
+            }
+
+            .vst-ok a:hover{
+                text-decoration: underline;
+            }
+
+            .vst-error {
+                font-size: 18px;
+                color: #de6c5d;
+                padding: 0 0 0 6px;
+            }
+
+            .vst-text {
+                color: #323232;
+                font-size: 12pt;
+            }
+
+            .vst-textinput {
+                background-color: #fff;
+                border: 1px solid #c0c0c0;
+                border-radius: 3px 3px 3px 3px;
+                color: #555;
+                font-size: 18px;
+                padding: 5px;
+                width: 360px;
+                height: 120px;
+            }
+
+            .vst-textinput:hover {
+                border: 1px solid #f79b44;
+            }
+
+            .vst-textinput:focus {
+                border: 1px solid #f79b44;
+            }
+
+            .vst-textinput:disabled {
+                background-color: #f1f1f1;
+            }
+
+            .vst-input {
+                background-color: #fff;
+                border: 1px solid #c0c0c0;
+                border-radius: 3px 3px 3px 3px;
+                color: #555;
+                font-size: 14pt;
+                padding: 5px;
+                width: 360px;
+                height: 28px;
+            }
+
+            .vst-input:hover {
+                border: 1px solid #f79b44;
+            }
+
+            .vst-input:focus {
+                border: 1px solid #f79b44;
+            }
+
+            .vst-input:disabled {
+                background-color: #f1f1f1;
+            }
+
+            .vst-list {
+                font-family:Arial, Helvetica, sans-serif;
+                font-size: 12pt;
+                color: #555;
+                height: 30px;
+                min-width: 136px;
+            }
+
+            @-moz-document url-prefix() {
+                .vst-list {
+                    padding-top: 2px;
+                }
+            }
+
+            .vst-checkbox {
+                padding: 5px;
+                font-size: 12pt;
+            }
+
+            .vst-checkbox:hover {
+                border: 1px solid #f79b44;
+            }
+
+            .button {
+                filter:chroma(color=#000000);
+                cursor: pointer;
+                color: #202020;
+                background-color: #fafafa;
+                border: 1px solid #999;
+                border-radius: 3px 3px 3px 3px;
+                font-size: 14px;
+                padding: 2px 16px;
+                width: 108px;
+                height: 34px;
+            }
+
+            .button:hover {
+                background-color: #f0f0f0;
+            }
+
+            .button:active {
+                color: #fff;
+                border: 1px solid #f79b44;
+                background-color: #f79b44;
+            }
+
+            .genpass {
+                color: #34536a;
+                font-size: 8pt;
+                padding: 0 5px;
+                letter-spacing: 0.1em;
+                text-decoration: underline;
+            }
+
+            .genpass:hover {
+                color: #7fa1cb;
+            }
+
+            .genpass:active {
+                background-color: #f79b44;
+                color: #fff;
+            }
+
+            .vst-advanced {
+                color: #34536a;
+                font-size: 10pt;
+                letter-spacing: 0.1em;
+                text-decoration: none;
+                padding: 0 2px;
+                border-bottom: 1px solid #f79b44;
+            }
+
+            .vst-advanced:hover {
+                color: #7fa1cb;
+            }
+
+            .vst-advanced:active {
+                color: #fff;
+                background-color: #f79b44;
+            }
+
+            .fixed{
+                position: fixed;
+                border: none;
+                top: -3px;
+                border-bottom: 1px solid #d3d3d3;
+                background-color: #fff;
+            }
+
+            *html .fixed{
+                position:absolute;
+                position:fixed;
+                _position:absolute;
+                top:0;
+                _top:expression( eval(document.body.scrollTop) + 'px' );
+            }
+
+            #vstobjects{
+                padding-top: 192px;
+                width: 996px;
+                padding-left: 3px;
+                min-height: 370px;
+            }
+
+            .login {
+                font-family:Arial, Helvetica, sans-serif;
+                margin: 80px 0 80px 0;
+                padding: 0;
+                background-color: #fff;
+                text-align: left;
+                vertical-align:top;
+                width: 500px;
+                box-shadow: 0 2px 6px rgba(100, 100, 100, 0.3);
+            }
+
+            .login-box {
+                text-align: left;
+                vertical-align:top;
+                color: #323232;
+            }
+
+            .login-bottom {
+                color: #ebe9dc;
+                text-align: right;
+                vertical-align:top;
+                width: 500px;
+                height: 50px;
+                background-color: #ebe9dc;
+                padding: 0 8px 0 0;
+                margin: 0;
+            }
+
+            .vestacp{
+                font-size: 8pt;
+                color: #323232;
+                text-align: right;
+                padding: 20px 0 0 0;
+            }
+
+            .error {
+                font-size: 10pt;
+                color: #dE6c5d;
+            }
+        </style>
+        <!--[if IE]>
+            <style type="text/css">
+                html, body, div, span, applet, object, iframe {
+                    margin: 0;
+                    padding: 0;
+                    border: 0;
+                    font-size: 100%;
+                    font: inherit;
+                    vertical-align: baseline;
+                }
+
+                .fixed {
+                    margin-top: 0px;
+                }
+
+                .vst-advanced {
+                    text-decoration: underline;
+                }
+
+                #vstobjects{
+                    padding-top: 195px;
+                    min-height: 370px;
+                    height: auto !important;
+                    height: 370px;
+                    width: 996px;
+                }
+
+                .nav-logo {
+                    float:left;
+                    height:112px;
+                    width:161px;
+                    margin: 0;
+                    border-bottom: 1px solid #d3d3d3;
+                }
+
+                .nav-block {
+                    margin: 0;
+                    height:112px;
+                    width: 118px;
+                    float:left;
+                    cursor: pointer;
+                    border-bottom: 1px solid #d3d3d3;
+                }
+
+                .nav-block:hover {
+                    height:109px;
+                    border-bottom: 4px solid #f79b44;
+                }
+
+                .nav-selected-block {
+                    margin: 0;
+                    color: #174f82;
+                    height: 109px;
+                    width: 118px;
+                    float: left;
+                    background-color: #fff;
+                    border-bottom: 4px solid #777;
+                    cursor: pointer;
+                }
+
+                .nav-selected-block:hover {
+                    height:109px;
+                    border-bottom: 4px solid #f79b44;
+                }
+            </style>
+        <![endif]-->
         <!--[if IE 7]>
-            <link rel="stylesheet" type="text/css" href="/css/ie.css" />
             <style type="text/css">
                 .data-col1 a {
                     white-space: nowrap;
@@ -29,6 +920,7 @@
                     top: 2px;
                 }
             </style>
+            <link rel="stylesheet" type="text/css" href="/css/ie.css" />
         <![endif]-->
         <link type="text/css" href="/css/jquery-custom-dialogs.css" rel="stylesheet" />
         <script type="text/javascript" src="/js/events.js"></script>
@@ -67,5 +959,9 @@
                 });
             });
         </script>
+
+	<script type="text/javascript" src="/js/app.js"></script>
+        <script type="text/javascript" src="/js/templates.js"></script>
+
     </head>
     <body>

web/templates/user/add_web.html

@@ -1,360 +1,366 @@
-            <?php
-                $back = $_SESSION['back'];
-                if (empty($back)) {
-                    $back = "location.href='/list/web/'";
-                } else {
-                    $back = "location.href='".$back."'";
-                }
-            ?> 
 
-            <table class="submenu">
-                <tr>
-                    <td style="padding: 16px 8px;" ><a class="name"><b><?php print __('Adding Domain');?></b></a>
-                        <?php
-                            if (!empty($_SESSION['error_msg'])) {
-                                echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-                            } else {
-                                if (!empty($_SESSION['ok_msg'])) {
-                                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
+                                <?php
+                                    $back = $_SESSION['back'];
+                                    if (empty($back)) {
+                                        $back = "location.href='/list/web/'";
+                                    } else {
+                                        $back = "location.href='".$back."'";
+                                    }
+                                ?>
+
+                                <table class="submenu">
+                                    <tr>
+                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Adding Web Domain');?></b></a>
+                                            <?php
+                                                if (!empty($_SESSION['error_msg'])) {
+                                                    echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                                                } else {
+                                                    if (!empty($_SESSION['ok_msg'])) {
+                                                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
+                                                    }
+                                                }
+                                            ?>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
+
+                    <form id="vstobjects" name="v_add_web" method="post">
+                        <script type="text/javascript">
+                            $(function() {
+                                $("#v_domain").change(function() {
+                                    var prefix = 'www.';
+                                    document.getElementById('v_aliases').value = prefix + document.getElementById('v_domain').value;
+                                });
+                            });
+                            function WEBrandom() {
+                                var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+                                var string_length = 10;
+                                var webrandom = '';
+                                for (var i=0; i<string_length; i++) {
+                                    var rnum = Math.floor(Math.random() * chars.length);
+                                    webrandom += chars.substring(rnum,rnum+1);
                                 }
+                                document.v_add_web.v_stats_password.value = webrandom;
                             }
-                        ?> 
-                    </td>
-                </tr>
-            </table>
-        </div>
-        <form id="vstobjects" name="v_add_web" method="post">
-            <script type="text/javascript">
-                $(function() {
-                    $("#v_domain").change(function() {
-                        var prefix = 'www.';
-                        document.getElementById('v_aliases').value = prefix + document.getElementById('v_domain').value;
-                    });
-                });
-                function WEBrandom() {
-                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                    var string_length = 10;
-                    var webrandom = '';
-                    for (var i=0; i<string_length; i++) {
-                        var rnum = Math.floor(Math.random() * chars.length);
-                        webrandom += chars.substring(rnum,rnum+1);
-                    }
-                    document.v_add_web.v_stats_password.value = webrandom;
-                }
 
-                function FTPrandom() {
-                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                    var string_length = 10;
-                    var ftprandomstring = '';
-                    for (var i=0; i<string_length; i++) {
-                        var rnum = Math.floor(Math.random() * chars.length);
-                        ftprandomstring += chars.substring(rnum,rnum+1);
-                    }
-                    document.v_add_web.v_ftp_password.value = ftprandomstring;
-                }
+                            function FTPrandom() {
+                                var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+                                var string_length = 10;
+                                var ftprandomstring = '';
+                                for (var i=0; i<string_length; i++) {
+                                    var rnum = Math.floor(Math.random() * chars.length);
+                                    ftprandomstring += chars.substring(rnum,rnum+1);
+                                }
+                                document.v_add_web.v_ftp_password.value = ftprandomstring;
+                            }
 
-                function elementHideShow(elementToHideOrShow){
-                    var el = document.getElementById(elementToHideOrShow);
-                    if (el.style.display == "block") {
-                        el.style.display = "none";
-                    } else {
-                        el.style.display = "block";
-                    }
-                }
-            </script>
+                            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='data'>
-                <tr class="data-add">
-                <td class="data-dotted" width="150">
-                    <table class="data-col1">
-                        <tr>
-                            <td></td>
-                        </tr>
-                    </table>
-                </td>
-                <td class="data-dotted" width="830px">
-                    <table width="830px">
-                        <tr>
-                            <td></td>
-                        </tr>
-                    </table>
-                    <table class="data-col2" width="600px">
-                        <tr>
-                            <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                <?php print __('Domain');?>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <input type="text" size="20" class="vst-input" name="v_domain" id="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?>>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                <?php print __('IP address');?>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <select class="vst-list" name="v_ip">
-                                    <?php
-                                        foreach ($ips as $key => $value) {
-                                            $display_ip = $key;
-                                            if (!empty($value['NAT'])) $display_ip = $value['NAT'];
-                                            echo "\t\t\t\t<option value=\"".$display_ip."\"";
-                                            if ((!empty($v_ip)) && ( $display_ip == $_POST['v_ip'])){
-                                                echo ' selected';
-                                            }
-                                            echo ">".$display_ip."</option>\n";
-                                        }
-                                    ?>
-                                </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                <?php print __('DNS Support');?>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <input type="checkbox" size="20" class="vst-checkbox" name="v_dns" <?php if (empty($v_dns)) echo "checked=yes"; ?>>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                <?php print __('Mail Support');?>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <input type="checkbox" size="20" class="vst-checkbox" name="v_mail" <?php if (empty($v_mail)) echo "checked=yes"; ?>>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                <a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print __('Advanced options');?></a>
-                            </td>
-                        </tr>
-                    </table>
-                    <table class="data-col2" width="600px" style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
-                        <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                <?php print __('Aliases');?>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <textarea size="20" class="vst-textinput" name="v_aliases" id="v_aliases" ><?php if (!empty($v_aliases)) echo $v_aliases;  ?></textarea>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                <?php print __('Proxy Support');?>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <input type="checkbox" size="20" class="vst-checkbox" name="v_proxy" <?php if ($v_proxy !== 'off') echo "checked=yes" ?> onclick="javascript:elementHideShow('proxytable');">
+                        <table class='data'>
+                            <tr class="data-add">
+                            <td class="data-dotted" width="150">
+                                <table class="data-col1">
+                                    <tr>
+                                        <td></td>
+                                    </tr>
+                                </table>
                             </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <table style="display:<?php if ($v_proxy == 'off') { echo 'none';} else {echo 'block';}?>;" id="proxytable" >
+                            <td class="data-dotted" width="830px">
+                                <table width="830px">
                                     <tr>
-                                        <td class="vst-text" style="padding: 9px 0 0 0;">
-                                            <?php print __('Proxy Extentions');?>
+                                        <td></td>
+                                    </tr>
+                                </table>
+                                <table class="data-col2" width="600px">
+                                    <tr>
+                                        <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                            <?php print __('Domain');?>
                                         </td>
                                     </tr>
                                     <tr>
                                         <td>
-                                            <textarea size="20" class="vst-textinput" name="v_proxy_ext"><?php if (!empty($v_proxy_ext)) { echo $v_proxy_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>
+                                            <input type="text" size="20" class="vst-input" name="v_domain" id="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?>>
                                         </td>
                                     </tr>
-                                </table>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                <?php print __('SSL Support');?>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <input type="checkbox" size="20" class="vst-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 (empty($v_ssl)) { echo 'none';} else {echo 'block';}?>;" id="ssltable">
                                     <tr>
-                                        <td class="vst-text" style="padding: 9px 0 0 0;">
-                                            <?php print __('SSL Home Directory');?>
+                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                            <?php print __('IP address');?>
                                         </td>
                                     </tr>
                                     <tr>
                                         <td>
-                                            <select class="vst-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 class="vst-list" name="v_ip">
+                                                <?php
+                                                    foreach ($ips as $key => $value) {
+                                                        $display_ip = $key;
+                                                        if (!empty($value['NAT'])) $display_ip = $value['NAT'];
+                                                        echo "\t\t\t\t<option value=\"".$display_ip."\"";
+                                                        if ((!empty($v_ip)) && ( $display_ip == $_POST['v_ip'])){
+                                                            echo ' selected';
+                                                        }
+                                                        echo ">".$display_ip."</option>\n";
+                                                    }
+                                                ?>
                                             </select>
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 0;">
-                                            <?php print __('SSL Certificate');?>
+                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                            <?php print __('DNS Support');?>
                                         </td>
                                     </tr>
                                     <tr>
                                         <td>
-                                            <textarea size="20" class="vst-textinput" name="v_ssl_crt"><?php if (!empty($v_ssl_crt)) echo $v_ssl_crt; ?></textarea>
+                                            <input type="checkbox" size="20" class="vst-checkbox" name="v_dns" <?php if (empty($v_dns)) echo "checked=yes"; ?>>
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 0;">
-                                            <?php print __('SSL Key');?>
+                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                            <?php print __('Mail Support');?>
                                         </td>
                                     </tr>
                                     <tr>
                                         <td>
-                                            <textarea size="20" class="vst-textinput" name="v_ssl_key"><?php if (!empty($v_ssl_key)) echo $v_ssl_key; ?></textarea>
+                                            <input type="checkbox" size="20" class="vst-checkbox" name="v_mail" <?php if (empty($v_mail)) echo "checked=yes"; ?>>
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 0;">
-                                            <?php print __('SSL Certificate Authority / Intermediate');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
+                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                            <a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print __('Advanced options');?></a>
+                                        </td>
+                                    </tr>
+                                </table>
+                                <table class="data-col2" width="600px" style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
+                                    <tr>
+                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                            <?php print __('Aliases');?>
                                         </td>
                                     </tr>
                                     <tr>
                                         <td>
-                                            <textarea size="20" class="vst-textinput" name="v_ssl_ca"><?php if (!empty($v_ssl_ca)) echo $v_ssl_ca; ?></textarea>
+                                            <textarea size="20" class="vst-textinput" name="v_aliases" id="v_aliases" ><?php if (!empty($v_aliases)) echo $v_aliases;  ?></textarea>
                                         </td>
                                     </tr>
-                                </table>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                <?php print __('Web Statistics');?>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <select class="vst-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="vst-text" style="padding: 10px 0 0 2px;">
-                                <?php print __('Statistics Authorization');?>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <input type="checkbox" size="20" class="vst-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('statstable');">
-                            </td>
-                        </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>
-                                        <td class="vst-text" style="padding: 9px 0 0 0;">
-                                            <?php print __('Username');?>
+                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                            <?php print __('Proxy Support');?>
                                         </td>
                                     </tr>
                                     <tr>
                                         <td>
-                                            <input type="text" size="20" class="vst-input" name="v_stats_user" <?php if (!empty($v_stats_user)) echo "value=".$v_stats_user;  ?>>
+                                            <input type="checkbox" size="20" class="vst-checkbox" name="v_proxy" <?php if ($v_proxy !== 'off') echo "checked=yes" ?> onclick="javascript:elementHideShow('proxytable');">
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 0;">
-                                            <?php print __('Password');?> <a href="javascript:WEBrandom();" class="genpass"><?php print __('generate');?></a>
+                                        <td>
+                                            <table style="display:<?php if ($v_proxy == 'off') { echo 'none';} else {echo 'block';}?>;" id="proxytable" >
+                                                <tr>
+                                                    <td class="vst-text" style="padding: 9px 0 0 0;">
+                                                        <?php print __('Proxy Extentions');?>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <textarea size="20" class="vst-textinput" name="v_proxy_ext"><?php if (!empty($v_proxy_ext)) { echo $v_proxy_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="vst-text" style="padding: 10px 0 0 2px;">
+                                            <?php print __('SSL Support');?>
                                         </td>
                                     </tr>
                                     <tr>
                                         <td>
-                                            <input type="text" size="20" class="vst-input" name="v_stats_password" <?php if (!empty($v_stats_password)) echo "value=".$v_stats_password;  ?> id="v_password">
+                                            <input type="checkbox" size="20" class="vst-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 (empty($v_ssl)) { echo 'none';} else {echo 'block';}?>;" id="ssltable">
+                                                <tr>
+                                                    <td class="vst-text" style="padding: 9px 0 0 0;">
+                                                        <?php print __('SSL Home Directory');?>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <select class="vst-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="vst-text" style="padding: 10px 0 0 0;">
+                                                        <?php print __('SSL Certificate');?>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <textarea size="20" class="vst-textinput" name="v_ssl_crt"><?php if (!empty($v_ssl_crt)) echo $v_ssl_crt; ?></textarea>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="vst-text" style="padding: 10px 0 0 0;">
+                                                        <?php print __('SSL Key');?>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <textarea size="20" class="vst-textinput" name="v_ssl_key"><?php if (!empty($v_ssl_key)) echo $v_ssl_key; ?></textarea>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="vst-text" style="padding: 10px 0 0 0;">
+                                                        <?php print __('SSL Certificate Authority / Intermediate');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <textarea size="20" class="vst-textinput" name="v_ssl_ca"><?php if (!empty($v_ssl_ca)) echo $v_ssl_ca; ?></textarea>
+                                                    </td>
+                                                </tr>
+                                            </table>
                                         </td>
                                     </tr>
-                                </table>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                <?php print __('Additional FTP Account');?>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <input type="checkbox" size="20" class="vst-checkbox" name="v_ftp" <?php if (!empty($v_ftp)) echo "checked=yes" ?> onclick="javascript:elementHideShow('ftptable');">
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" id="ftptable" name="v_add_domain_ftp">
                                     <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 0;">
-                                            <?php print __('Username');?><br>
-                                            <span style="font-size: 10pt; color:#777;"><?php print __('Prefix will be automaticaly added to username',$user."_");?></span>
+                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                            <?php print __('Web Statistics');?>
                                         </td>
                                     </tr>
                                     <tr>
                                         <td>
-                                            <input type="text" size="20" class="vst-input" name="v_ftp_user" <?php if (!empty($v_ftp_user)) echo "value=".$v_ftp_user; ?>>
+                                            <select class="vst-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="vst-text" style="padding: 10px 0 0 2px;">
+                                            <?php print __('Statistics Authorization');?>
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 0;">
-                                            <?php print __('Password');?> <a href="javascript:FTPrandom();" class="genpass" ><?php print __('generate');?></a>
+                                        <td>
+                                            <input type="checkbox" size="20" class="vst-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('statstable');">
                                         </td>
                                     </tr>
                                     <tr>
                                         <td>
-                                            <input type="text" class="vst-input" name="v_ftp_password" <?php if (!empty($v_ftp_password)) echo "value=".$v_ftp_password; ?>>
+                                            <table style="display:<?php if (empty($v_stats_user)) { echo 'none';} else {echo 'block';}?> ;" id="statstable" name="v-add-web-domain-stats-user">
+                                                <tr>
+                                                    <td class="vst-text" style="padding: 9px 0 0 0;">
+                                                        <?php print __('Username');?>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <input type="text" size="20" class="vst-input" name="v_stats_user" <?php if (!empty($v_stats_user)) echo "value=".$v_stats_user;  ?>>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="vst-text" style="padding: 10px 0 0 0;">
+                                                        <?php print __('Password');?> <a href="javascript:WEBrandom();" class="genpass"><?php print __('generate');?></a>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <input type="text" size="20" class="vst-input" name="v_stats_password" <?php if (!empty($v_stats_password)) echo "value=".$v_stats_password;  ?> id="v_password">
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                            <?php print __('Additional FTP Account');?>
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 0;">
-                                             <?php print __('Send FTP credentials to email');?>
+                                        <td>
+                                            <input type="checkbox" size="20" class="vst-checkbox" name="v_ftp" <?php if (!empty($v_ftp)) echo "checked=yes" ?> onclick="javascript:elementHideShow('ftptable');">
                                         </td>
                                     </tr>
                                     <tr>
                                         <td>
-                                            <input type="text"  class="vst-input" name="v_ftp_email" <?php if (!empty($v_ftp_email)) echo "value=".$v_ftp_email; ?>>
+                                            <table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" id="ftptable" name="v_add_domain_ftp">
+                                                <tr>
+                                                    <td class="vst-text" style="padding: 10px 0 0 0;">
+                                                        <?php print __('Username');?><br>
+                                                        <span style="font-size: 10pt; color:#777;"><?php print __('Prefix will be automaticaly added to username',$user."_");?></span>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <input type="text" size="20" class="vst-input" name="v_ftp_user" <?php if (!empty($v_ftp_user)) echo "value=".$v_ftp_user; ?>>
+														<small class="ftp_username_hint"></small>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="vst-text" style="padding: 10px 0 0 0;">
+                                                        <?php print __('Password');?> <a href="javascript:FTPrandom();" class="genpass" ><?php print __('generate');?></a>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <input type="text" class="vst-input" name="v_ftp_password" <?php if (!empty($v_ftp_password)) echo "value=".$v_ftp_password; ?>>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="vst-text" style="padding: 10px 0 0 0;">
+                                                         <?php print __('Send FTP credentials to email');?>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <input type="text"  class="vst-input" name="v_ftp_email" <?php if (!empty($v_ftp_email)) echo "value=".$v_ftp_email; ?>>
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                </table>
+                                <table class="data-col2">
+                                    <tr>
+                                        <td style="padding: 33px 0 0 0;" width="116px">
+                                            <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
+                                        </td>
+                                        <td style="padding: 33px 0 0 0;">
+                                            <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                         </td>
                                     </tr>
                                 </table>
                             </td>
                         </tr>
                     </table>
-                    <table class="data-col2">
-                        <tr>
-                            <td style="padding: 33px 0 0 0;" width="116px">
-                                <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
-                            </td>
-                            <td style="padding: 33px 0 0 0;">
-                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
-                            </td>
-                        </tr>
-                    </table>
-                </td>
-            </tr>
-        </table>
-    </form>
-    <br>
+                </form>
+
+<script type="text/javascript" src="/js/pages/add.web.js"></script>

web/templates/user/edit_web.html

@@ -1,339 +1,343 @@
-            <?php
-                $back = $_SESSION['back'];
-                if (empty($back)) {
-                    $back = "location.href='/list/web/'";
-                } else {
-                    $back = "location.href='".$back."'";
-                }
-            ?>
+                                <?php
+                                    $back = $_SESSION['back'];
+                                    if (empty($back)) {
+                                        $back = "location.href='/list/web/'";
+                                    } else {
+                                        $back = "location.href='".$back."'";
+                                    }
+                                ?>
 
-            <table class="submenu">
-                <tr>
-                    <td style="padding: 16px 8px;" ><a class="name"><b><?php print __('Editing Domain');?></b></a>
-                        <?php
-                            if (!empty($_SESSION['error_msg'])) {
-                                echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-                            } else {
-                                if (!empty($_SESSION['ok_msg'])) {
-                                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
+                                <table class="submenu">
+                                    <tr>
+                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Editing Domain');?></b></a>
+                                            <?php
+                                                if (!empty($_SESSION['error_msg'])) {
+                                                    echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                                                } else {
+                                                    if (!empty($_SESSION['ok_msg'])) {
+                                                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
+                                                    }
+                                                }
+                                            ?>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
+
+                    <form id="vstobjects" name="v_edit_web" method="post">
+                        <script language="javascript">
+                            function WEBrandom() {
+                                var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+                                var string_length = 10;
+                                var webrandom = '';
+                                for (var i=0; i<string_length; i++) {
+                                    var rnum = Math.floor(Math.random() * chars.length);
+                                    webrandom += chars.substring(rnum,rnum+1);
                                 }
+                                document.v_edit_web.v_stats_password.value = webrandom;
                             }
-                        ?> 
-                    </td>
-                </tr>
-            </table>
-        </div>
-
-        <form id="vstobjects" name="v_edit_web" method="post">
-            <script language="javascript">
-                function WEBrandom() {
-                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                    var string_length = 10;
-                    var webrandom = '';
-                    for (var i=0; i<string_length; i++) {
-                        var rnum = Math.floor(Math.random() * chars.length);
-                        webrandom += chars.substring(rnum,rnum+1);
-                    }
-                    document.v_edit_web.v_stats_password.value = webrandom;
-                }
 
-                function FTPrandom() {
-                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                    var string_length = 10;
-                    var ftprandomstring = '';
-                    for (var i=0; i<string_length; i++) {
-                        var rnum = Math.floor(Math.random() * chars.length);
-                        ftprandomstring += chars.substring(rnum,rnum+1);
-                    }
-                    document.v_edit_web.v_ftp_password.value = ftprandomstring;
-                }
+                            function FTPrandom() {
+                                var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+                                var string_length = 10;
+                                var ftprandomstring = '';
+                                for (var i=0; i<string_length; i++) {
+                                    var rnum = Math.floor(Math.random() * chars.length);
+                                    ftprandomstring += chars.substring(rnum,rnum+1);
+                                }
+                                document.v_edit_web.v_ftp_password.value = ftprandomstring;
+                            }
 
-                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='data'>
-                <tr class="data-add">
-                    <td class="data-dotted" width="150">
-                        <table class="data-col1">
-                            <tr>
-                                <td>
-                                    <a class="data-date" ?><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                    <a class="data-date" ?><?php echo $v_time?></a>
-                                </td>
-                            </tr>
-                            <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
-                        </table>
-                    </td>
-                    <td class="data-dotted" width="830px">
-                        <table width="830px">
-                            <tr>
-                                <td></td>
-                            </tr>
-                        </table>
-                        <table class="data-col2" width="830px">
-                            <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                    <?php print __('Domain');?>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <input type="text" size="20" class="vst-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="vst-text" style="padding: 10px 0 0 2px;">
-                                    <?php print __('IP Address');?>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <select class="vst-list" name="v_ip">
-                                        <?php
-                                            foreach ($ips as $key => $value) {
-                                                $display_ip = $key;
-                                                if (!empty($value['NAT'])) $display_ip = $value['NAT'];
-                                                $skey = "'".$display_ip."'";
-                                                echo "\n\t\t\t\t\t\t\t\t\t\t\t\t<option value=\"".$display_ip."\"";
-                                                if ((!empty($v_ip)) && ( $display_ip == $v_ip ) || ( $skey == $v_ip )){
-                                                    echo ' selected';
-                                                }
-                                                echo ">".$display_ip."</option>\n";
-                                            }
-                                        ?>
-                                    </select>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                    <?php print __('Aliases');?>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <textarea size="20" class="vst-textinput" name="v_aliases"><?php if (!empty($v_aliases)) echo $v_aliases;  ?></textarea>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                    <?php print __('Proxy Support');?>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <input type="checkbox" size="20" class="vst-checkbox" name="v_proxy" <?php if (!empty($v_proxy)) echo "checked=yes" ?> onclick="javascript:elementHideShow('proxytable');">
+                            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='data'>
+                            <tr class="data-add">
+                                <td class="data-dotted" width="150">
+                                    <table class="data-col1">
+                                        <tr>
+                                            <td style="padding: 24px 0 2px 18px;">
+                                                <a class="data-date" ?><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
+                                                <a class="data-date" ?><?php echo $v_time?></a>
+                                            </td>
+                                        </tr>
+                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
+                                    </table>
                                 </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <table style="display:<?php if (empty($v_proxy)) { echo 'none';} else {echo 'block';}?> ;" id="proxytable">
+                                <td class="data-dotted" width="830px">
+                                    <table width="830px">
                                         <tr>
-                                            <td class="vst-text" style="padding: 9px 0 0 0;">
-                                                <?php print __('Proxy Extensions');?>
+                                            <td></td>
+                                        </tr>
+                                    </table>
+                                    <table class="data-col2" width="830px">
+                                        <tr>
+                                            <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                                <?php print __('Domain');?>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
-                                                <textarea size="20" class="vst-textinput" name="v_proxy_ext"><?php if (!empty($v_proxy_ext)) { echo $v_proxy_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>
+                                                <input type="text" size="20" class="vst-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>
-                                    </table>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                    <?php print __('SSL Support');?>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <input type="checkbox" size="20" class="vst-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="vst-text" style="padding: 9px 0 0 0;">
-                                                <?php print __('SSL Home Directory');?>
+                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                                <?php print __('IP Address');?>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
-                                                <select class="vst-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 class="vst-list" name="v_ip">
+                                                    <?php
+                                                        foreach ($ips as $key => $value) {
+                                                            $display_ip = $key;
+                                                            if (!empty($value['NAT'])) $display_ip = $value['NAT'];
+                                                            $skey = "'".$display_ip."'";
+                                                            echo "\n\t\t\t\t\t\t\t\t\t\t\t\t<option value=\"".$display_ip."\"";
+                                                            if ((!empty($v_ip)) && ( $display_ip == $v_ip ) || ( $skey == $v_ip )){
+                                                                echo ' selected';
+                                                            }
+                                                            echo ">".$display_ip."</option>\n";
+                                                        }
+                                                    ?>
                                                 </select>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('SSL Certificate');?>
+                                                <?php print __('Aliases');?>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
-                                                <textarea size="20" class="vst-textinput" name="v_ssl_crt"><?php if (!empty($v_ssl_crt)) echo $v_ssl_crt; ?></textarea>
+                                                <textarea size="20" class="vst-textinput" name="v_aliases"><?php if (!empty($v_aliases)) echo $v_aliases;  ?></textarea>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('SSL Key');?>
+                                                <?php print __('Proxy Support');?>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
-                                                <textarea size="20" class="vst-textinput" name="v_ssl_key"><?php if (!empty($v_ssl_key)) echo $v_ssl_key; ?></textarea>
+                                                <input type="checkbox" size="20" class="vst-checkbox" name="v_proxy" <?php if (!empty($v_proxy)) echo "checked=yes" ?> onclick="javascript:elementHideShow('proxytable');">
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('SSL Certificate Authority / Intermediate');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
+                                            <td>
+                                                <table style="display:<?php if (empty($v_proxy)) { echo 'none';} else {echo 'block';}?> ;" id="proxytable">
+                                                    <tr>
+                                                        <td class="vst-text" style="padding: 9px 0 0 0;">
+                                                            <?php print __('Proxy Extensions');?>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <textarea size="20" class="vst-textinput" name="v_proxy_ext"><?php if (!empty($v_proxy_ext)) { echo $v_proxy_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>
-                                                <textarea size="20" class="vst-textinput" name="v_ssl_ca"><?php if (!empty($v_ssl_ca)) echo $v_ssl_ca; ?></textarea>
+                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                                <?php print __('SSL Support');?>
                                             </td>
                                         </tr>
-                                    </table>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                    <?php print __('Web Statistics');?>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <select class="vst-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="vst-text" style="padding: 10px 0 0 2px;">
-                                    <?php print __('Statistics Authorization');?>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <input type="checkbox" size="20" class="vst-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('statstable');">
-                                </td>
-                            </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>
-                                            <td class="vst-text" style="padding: 9px 0 0 2px;">
-                                                <?php print __('Username');?>
+                                            <td>
+                                                <input type="checkbox" size="20" class="vst-checkbox" name="v_ssl" <?php if ($v_ssl == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');">
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input type="text" size="20" class="vst-input" name="v_stats_user" <?php if (!empty($v_stats_user)) echo "value=".$v_stats_user;  ?>>
+                                                <table style="display:<?php if ($v_ssl == 'no' ) { echo 'none';} else {echo 'block';}?> ;" id="ssltable">
+                                                    <tr>
+                                                        <td class="vst-text" style="padding: 9px 0 0 0;">
+                                                            <?php print __('SSL Home Directory');?>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <select class="vst-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="vst-text" style="padding: 10px 0 0 2px;">
+                                                            <?php print __('SSL Certificate');?>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <textarea size="20" class="vst-textinput" name="v_ssl_crt"><?php if (!empty($v_ssl_crt)) echo $v_ssl_crt; ?></textarea>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                                            <?php print __('SSL Key');?>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <textarea size="20" class="vst-textinput" name="v_ssl_key"><?php if (!empty($v_ssl_key)) echo $v_ssl_key; ?></textarea>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                                            <?php print __('SSL Certificate Authority / Intermediate');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <textarea size="20" class="vst-textinput" name="v_ssl_ca"><?php if (!empty($v_ssl_ca)) echo $v_ssl_ca; ?></textarea>
+                                                        </td>
+                                                    </tr>
+                                                </table>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Password');?> <a href="javascript:WEBrandom();" class="genpass"><?php print __('generate');?></a>
+                                                <?php print __('Web Statistics');?>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input type="text" size="20" class="vst-input" name="v_stats_password" <?php if (!empty($v_stats_password)) echo "value=".$v_stats_password;  ?> id="v_password">
+                                                <select class="vst-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 class="vst-text" style="padding: 10px 0 0 2px;">
-                                    <?php print __('Additional FTP Account');?>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <input type="checkbox" size="20" class="vst-checkbox" name="v_ftp" <?php if (!empty($v_ftp_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('ftptable');">
-                                    </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" id="ftptable" name="v_add_domain_ftp">
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                <?php print __('Username');?>
-                                                <?php if (empty($v_ftp_user)) echo '<br><span style="font-size: 10pt; color:#777;">' . __('Prefix will be automaticaly added to username',$user."_") . '</span>' ?> 
+                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                                <?php print __('Statistics Authorization');?>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input type="text" size="20" class="vst-input" name="v_ftp_user" <?php if (!empty($v_ftp_user)) echo "value=".$v_ftp_user;  ?>>
+                                                <input type="checkbox" size="20" class="vst-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('statstable');">
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                <?php print __('Password');?> <a href="javascript:FTPrandom();" class="genpass" ><?php print __('generate');?></a>
+                                            <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>
+                                                        <td class="vst-text" style="padding: 9px 0 0 2px;">
+                                                            <?php print __('Username');?>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <input type="text" size="20" class="vst-input" name="v_stats_user" <?php if (!empty($v_stats_user)) echo "value=".$v_stats_user;  ?>>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                                            <?php print __('Password');?> <a href="javascript:WEBrandom();" class="genpass"><?php print __('generate');?></a>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <input type="text" size="20" class="vst-input" name="v_stats_password" <?php if (!empty($v_stats_password)) echo "value=".$v_stats_password;  ?> id="v_password">
+                                                        </td>
+                                                    </tr>
+                                                </table>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td>
-                                                <input type="text"  class="vst-input" name="v_ftp_password" <?php if (!empty($v_ftp_password)) echo "value=".$v_ftp_password;  ?>>
+                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                                <?php print __('Additional FTP Account');?>
                                             </td>
                                         </tr>
-                                        <?php
-                                            if (empty($v_ftp_user)) {
-                                                echo '';
-                                         ?> 
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                <?php print __('Send FTP credentials to email');?>
-                                            </td>
+                                            <td>
+                                                <input type="checkbox" size="20" class="vst-checkbox" name="v_ftp" <?php if (!empty($v_ftp_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('ftptable');">
+                                                </td>
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input type="text"  class="vst-input" name="v_ftp_email" <?php if (!empty($v_ftp_email)) echo "value=".$v_ftp_email;  ?>>
+                                                <table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" id="ftptable" name="v_add_domain_ftp">
+                                                    <tr>
+                                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                                            <?php print __('Username');?>
+                                                            <?php if (empty($v_ftp_user)) echo '<br><span style="font-size: 10pt; color:#777;">' . __('Prefix will be automaticaly added to username',$user."_") . '</span>' ?> 
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <input type="text" size="20" class="vst-input" name="v_ftp_user" <?php if (!empty($v_ftp_user)) echo "value=".$v_ftp_user;  ?>>
+															<small class="ftp_username_hint"></small>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                                            <?php print __('Password');?> <a href="javascript:FTPrandom();" class="genpass" ><?php print __('generate');?></a>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <input type="text"  class="vst-input" name="v_ftp_password" <?php if (!empty($v_ftp_password)) echo "value=".$v_ftp_password;  ?>>
+                                                        </td>
+                                                    </tr>
+                                                    <?php
+                                                        if (empty($v_ftp_user)) {
+                                                            echo '';
+                                                     ?> 
+                                                    <tr>
+                                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                                            <?php print __('Send FTP credentials to email');?>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <input type="text"  class="vst-input" name="v_ftp_email" <?php if (!empty($v_ftp_email)) echo "value=".$v_ftp_email;  ?>>
+                                                        </td>
+                                                    </tr>
+                                                    <?php
+                                                        }
+                                                    ?> 
+                                                </table>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                    <table class="data-col2">
+                                        <tr>
+                                            <td style="padding: 24px 0 0 0;" width="116px">
+                                                <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
+                                            </td>
+                                            <td style="padding: 24px 0 0 0;">
+                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                             </td>
                                         </tr>
-                                        <?php
-                                            }
-                                        ?> 
                                     </table>
                                 </td>
                             </tr>
                         </table>
-                        <table class="data-col2">
-                            <tr>
-                                <td style="padding: 24px 0 0 0;" width="116px">
-                                    <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
-                                </td>
-                                <td style="padding: 24px 0 0 0;">
-                                    <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
-                                </td>
-                            </tr>
-                        </table>
-                    </td>
-                </tr>
-            </table>
-        </form>
+                    </form>
 
+<script type="text/javascript" src="/js/pages/edit.web.js"></script>