Refactor HTML code

Corrected indents, incorrect form tags, removed un-necessary comments

web/templates/admin/add_db.html

@@ -9,7 +9,6 @@
         </div>
       </div>
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center animated fadeIn">
         <?php
@@ -160,7 +159,6 @@
                                         <option value=armscii8 <?php if ((!empty($v_charset)) && ( $v_charset == 'armscii8')) echo 'selected';?> >armscii8</option>
                                         <option value=utf8 <?php if ((!empty($v_charset)) && ( $v_charset == 'utf8')) echo 'selected';?> <?php if (empty($v_charset)) echo 'selected';?> >utf8</option>
                                         <option value=utf8mb4 <?php if ((!empty($v_charset)) && ( $v_charset == 'utf8mb4')) echo 'selected';?> >utf8mb4</option>
-
                                         <option value=ucs2 <?php if ((!empty($v_charset)) && ( $v_charset == 'ucs2')) echo 'selected';?> >ucs2</option>
                                         <option value=cp866 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp866')) echo 'selected';?> >cp866</option>
                                         <option value=keybcs2 <?php if ((!empty($v_charset)) && ( $v_charset == 'keybcs2')) echo 'selected';?> >keybcs2</option>
@@ -197,6 +195,6 @@
     </div>
 
     <script>
-      GLOBAL.DB_USER_PREFIX = <?=json_encode($user.'_')?>;
-      GLOBAL.DB_DBNAME_PREFIX = <?=json_encode($user.'_')?>;
+        GLOBAL.DB_USER_PREFIX = <?=json_encode($user.'_')?>;
+        GLOBAL.DB_DBNAME_PREFIX = <?=json_encode($user.'_')?>;
     </script>

web/templates/admin/add_dns.html

@@ -10,7 +10,6 @@
       </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center animated fadeIn">
         <?php
@@ -126,66 +125,64 @@
                                                 <span class="remove-ns additional-control delete"><?=__('delete')?></span>
                                             </td>
                                         </tr>
-                            <?  if($v_ns3)
+                                <?  if($v_ns3)
                                   echo '<tr>
-                                    <td>
-                                        <input type="text" size="20" class="vst-input" name="v_ns3" value="'.htmlentities(trim($v_ns3, "'")).'">
-                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
-                                    </td>
-                                </tr>';
+                                        <td>
+                                            <input type="text" size="20" class="vst-input" name="v_ns3" value="'.htmlentities(trim($v_ns3, "'")).'">
+                                            <span class="remove-ns additional-control delete">'.__('delete').'</span>
+                                        </td>
+                                    </tr>';
 
-                                if($v_ns4)
-                                  echo '<tr>
-                                    <td>
-                                        <input type="text" size="20" class="vst-input" name="v_ns4" value="'.htmlentities(trim($v_ns4, "'")).'">
-                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
-                                    </td>
-                                </tr>';
+                                    if($v_ns4)
+                                    echo '<tr>
+                                        <td>
+                                            <input type="text" size="20" class="vst-input" name="v_ns4" value="'.htmlentities(trim($v_ns4, "'")).'">
+                                            <span class="remove-ns additional-control delete">'.__('delete').'</span>
+                                        </td>
+                                    </tr>';
 
-                                if($v_ns5)
-                                  echo '<tr>
-                                    <td>
-                                        <input type="text" size="20" class="vst-input" name="v_ns5" value="'.htmlentities(trim($v_ns5, "'")).'">
-                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
-                                    </td>
-                                </tr>';
+                                    if($v_ns5)
+                                    echo '<tr>
+                                        <td>
+                                            <input type="text" size="20" class="vst-input" name="v_ns5" value="'.htmlentities(trim($v_ns5, "'")).'">
+                                            <span class="remove-ns additional-control delete">'.__('delete').'</span>
+                                        </td>
+                                    </tr>';
 
-                                if($v_ns6)
-                                  echo '<tr>
-                                    <td>
-                                        <input type="text" size="20" class="vst-input" name="v_ns6" value="'.htmlentities(trim($v_ns6, "'")).'">
-                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
-                                    </td>
-                                </tr>';
+                                    if($v_ns6)
+                                    echo '<tr>
+                                        <td>
+                                            <input type="text" size="20" class="vst-input" name="v_ns6" value="'.htmlentities(trim($v_ns6, "'")).'">
+                                            <span class="remove-ns additional-control delete">'.__('delete').'</span>
+                                        </td>
+                                    </tr>';
 
-                                if($v_ns7)
-                                  echo '<tr>
-                                    <td>
-                                        <input type="text" size="20" class="vst-input" name="v_ns7" value="'.htmlentities(trim($v_ns7, "'")).'">
-                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
-                                    </td>
-                                </tr>';
+                                    if($v_ns7)
+                                    echo '<tr>
+                                        <td>
+                                            <input type="text" size="20" class="vst-input" name="v_ns7" value="'.htmlentities(trim($v_ns7, "'")).'">
+                                            <span class="remove-ns additional-control delete">'.__('delete').'</span>
+                                        </td>
+                                    </tr>';
 
-                                if($v_ns8)
-                                  echo '<tr>
-                                    <td>
-                                        <input type="text" size="20" class="vst-input" name="v_ns8" value="'.htmlentities(trim($v_ns8, "'")).'">
-                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
-                                    </td>
-                                </tr>';
-                            ?>
+                                    if($v_ns8)
+                                    echo '<tr>
+                                        <td>
+                                            <input type="text" size="20" class="vst-input" name="v_ns8" value="'.htmlentities(trim($v_ns8, "'")).'">
+                                            <span class="remove-ns additional-control delete">'.__('delete').'</span>
+                                        </td>
+                                    </tr>';
+                                ?>
                                 <tr class="add-ns" <? if($v_ns8) echo 'style="display:none;"'; ?> >
                                     <td class="step-top-small">
                                       <span class="add-ns-button additional-control add"><?=__('Add one more Name Server')?></span>
                                     </td>
                                 </tr>
-
                                     </table>
                                 </td>
                             </tr>
                         </table>
-                        <table class="data-col2">
-                        </table>
+                        <table class="data-col2"></table>
                     </td>
                 </tr>
             </table>

web/templates/admin/add_dns_rec.html

@@ -10,7 +10,6 @@
       </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center animated fadeIn">
 
@@ -140,5 +139,5 @@
       </div>
 
     <script>
-      GLOBAL.DNS_REC_PREFIX = <?=json_encode($_GET['domain'])?>;
+        GLOBAL.DNS_REC_PREFIX = <?=json_encode($_GET['domain'])?>;
     </script>

web/templates/admin/add_firewall.html

@@ -10,7 +10,6 @@
       </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center animated fadeIn">
         <?php
@@ -79,8 +78,6 @@
                                     </select>
                                 </td>
                             </tr>
-
-
                             <tr>
                                 <td class="vst-text input-label">
                                     <?php print __('Port');?> <span class="optional">(<?php print __('ranges are acceptable');?>)</span>
@@ -114,15 +111,12 @@
                                     <input type="text" size="20" class="vst-input" name="v_comment" maxlength="255" value="<?=htmlentities(trim($v_comment, "'"))?>">
                                 </td>
                             </tr>
-
-                        </table>
-                        <table class="data-col2">
                         </table>
+                        <table class="data-col2"></table>
                     </td>
                 </tr>
             </table>
-        </from>
-
+        </form>
     </div>
 
     <script>

web/templates/admin/add_firewall_banlist.html

@@ -10,7 +10,6 @@
       </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center animated fadeIn">
         <?php
@@ -88,5 +87,5 @@
                     </td>
                 </tr>
             </table>
-        </from>
+        </form>
       </div>

web/templates/admin/add_firewall_ipset.html

@@ -10,7 +10,6 @@
       </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center animated fadeIn">
         <?php
@@ -101,91 +100,91 @@
                                     </select>
                                 </td>
                             </tr>
-
-                        </table>
-                        <table class="data-col2">
                         </table>
+                        <table class="data-col2"></table>
                     </td>
                 </tr>
             </table>
         </form>
-
     </div>
 
     <script>
-    var country_iplists = [
-        {name: "[ipv4] Country Romania",        source:"http://ipverse.net/ipblocks/data/countries/ro.zone"},
-        {name: "[ipv4] Country Germany",        source:"http://ipverse.net/ipblocks/data/countries/de.zone"},
-        {name: "[ipv4] Country Switzerland",    source:"http://ipverse.net/ipblocks/data/countries/ch.zone"},
-        {name: "[ipv4] Country France",         source:"http://ipverse.net/ipblocks/data/countries/fr.zone"},
-        {name: "[ipv4] Country Ukraine",        source:"http://ipverse.net/ipblocks/data/countries/ua.zone"},
-        {name: "[ipv4] Country Russia",         source:"http://ipverse.net/ipblocks/data/countries/ru.zone"},
-        {name: "[ipv4] Country Spain",          source:"http://ipverse.net/ipblocks/data/countries/es.zone"},
-        {name: "[ipv4] Country United Kingdom", source:"http://ipverse.net/ipblocks/data/countries/gb.zone"},
-        {name: "[ipv4] Country United States",  source:"http://ipverse.net/ipblocks/data/countries/us.zone"},
-        {name: "[ipv4] Country China",          source:"http://ipverse.net/ipblocks/data/countries/cn.zone"},
-        {name: "[ipv4] Country India",          source:"http://ipverse.net/ipblocks/data/countries/in.zone"},
-        {name: "[ipv4] Country Canada",         source:"http://ipverse.net/ipblocks/data/countries/ca.zone"},
-        {name: "[ipv4] Country Netherlands",    source:"http://ipverse.net/ipblocks/data/countries/nl.zone"},
-        /*
-        {name: "[ipv6] Country Romania",        source:"http://ipverse.net/ipblocks/data/countries/ro-ipv6.zone"},
-        {name: "[ipv6] Country Germany",        source:"http://ipverse.net/ipblocks/data/countries/de-ipv6.zone"},
-        {name: "[ipv6] Country Switzerland",    source:"http://ipverse.net/ipblocks/data/countries/ch-ipv6.zone"},
-        {name: "[ipv6] Country France",         source:"http://ipverse.net/ipblocks/data/countries/fr-ipv6.zone"},
-        {name: "[ipv6] Country Ukraine",        source:"http://ipverse.net/ipblocks/data/countries/ua-ipv6.zone"},
-        {name: "[ipv6] Country Russia",         source:"http://ipverse.net/ipblocks/data/countries/ru-ipv6.zone"},
-        {name: "[ipv6] Country Spain",          source:"http://ipverse.net/ipblocks/data/countries/es-ipv6.zone"},
-        {name: "[ipv6] Country United Kingdom", source:"http://ipverse.net/ipblocks/data/countries/gb-ipv6.zone"},
-        {name: "[ipv6] Country United States",  source:"http://ipverse.net/ipblocks/data/countries/us-ipv6.zone"},
-        {name: "[ipv6] Country China",          source:"http://ipverse.net/ipblocks/data/countries/cn-ipv6.zone"},
-        {name: "[ipv6] Country India",          source:"http://ipverse.net/ipblocks/data/countries/in-ipv6.zone"},
-        {name: "[ipv6] Country Canada",         source:"http://ipverse.net/ipblocks/data/countries/ca-ipv6.zone"},
-        {name: "[ipv6] Country Netherlands",    source:"http://ipverse.net/ipblocks/data/countries/nl-ipv6.zone"},
-        */
-    ];
+        var country_iplists = [
+            // Define IPv4 country lists
+            {name: "[IPv4] Country - Canada",         source:"http://ipverse.net/ipblocks/data/countries/ca.zone"},
+            {name: "[IPv4] Country - China",          source:"http://ipverse.net/ipblocks/data/countries/cn.zone"},
+            {name: "[IPv4] Country - France",         source:"http://ipverse.net/ipblocks/data/countries/fr.zone"},
+            {name: "[IPv4] Country - Germany",        source:"http://ipverse.net/ipblocks/data/countries/de.zone"},
+            {name: "[IPv4] Country - India",          source:"http://ipverse.net/ipblocks/data/countries/in.zone"},
+            {name: "[IPv4] Country - Netherlands",    source:"http://ipverse.net/ipblocks/data/countries/nl.zone"},
+            {name: "[IPv4] Country - Romania",        source:"http://ipverse.net/ipblocks/data/countries/ro.zone"},
+            {name: "[IPv4] Country - Russia",         source:"http://ipverse.net/ipblocks/data/countries/ru.zone"},
+            {name: "[IPv4] Country - Spain",          source:"http://ipverse.net/ipblocks/data/countries/es.zone"},
+            {name: "[IPv4] Country - Switzerland",    source:"http://ipverse.net/ipblocks/data/countries/ch.zone"},
+            {name: "[IPv4] Country - Ukraine",        source:"http://ipverse.net/ipblocks/data/countries/ua.zone"},
+            {name: "[IPv4] Country - United Kingdom", source:"http://ipverse.net/ipblocks/data/countries/gb.zone"},
+            {name: "[IPv4] Country - United States",  source:"http://ipverse.net/ipblocks/data/countries/us.zone"},
 
-    var blacklist_iplists = [
-        {name: "[ipv4] Blacklist Script",       source:"script:/usr/local/hestia/install/deb/firewall/ipset/blacklist.sh"},
-        /*
-        {name: "[ipv6] Blacklist Script",       source:"script:/usr/local/hestia/install/deb/firewall/ipset/blacklist.ipv6.sh"},
-        */
-    ];
+            // Define IPv6 country lists
+            /*
+            {name: "[IPv6] Country - China",          source:"http://ipverse.net/ipblocks/data/countries/cn-ipv6.zone"},
+            {name: "[IPv6] Country - Canada",         source:"http://ipverse.net/ipblocks/data/countries/ca-ipv6.zone"},
+            {name: "[IPv6] Country - France",         source:"http://ipverse.net/ipblocks/data/countries/fr-ipv6.zone"},
+            {name: "[IPv6] Country - Germany",        source:"http://ipverse.net/ipblocks/data/countries/de-ipv6.zone"},
+            {name: "[IPv6] Country - India",          source:"http://ipverse.net/ipblocks/data/countries/in-ipv6.zone"},
+            {name: "[IPv6] Country - Netherlands",    source:"http://ipverse.net/ipblocks/data/countries/nl-ipv6.zone"},
+            {name: "[IPv6] Country - Romania",        source:"http://ipverse.net/ipblocks/data/countries/ro-ipv6.zone"},
+            {name: "[IPv6] Country - Russia",         source:"http://ipverse.net/ipblocks/data/countries/ru-ipv6.zone"},
+            {name: "[IPv6] Country - Spain",          source:"http://ipverse.net/ipblocks/data/countries/es-ipv6.zone"},
+            {name: "[IPv6] Country - Switzerland",    source:"http://ipverse.net/ipblocks/data/countries/ch-ipv6.zone"},
+            {name: "[IPv6] Country - Ukraine",        source:"http://ipverse.net/ipblocks/data/countries/ua-ipv6.zone"},
+            {name: "[IPv6] Country - United Kingdom", source:"http://ipverse.net/ipblocks/data/countries/gb-ipv6.zone"},
+            {name: "[IPv6] Country - United States",  source:"http://ipverse.net/ipblocks/data/countries/us-ipv6.zone"},
+            */
+        ];
 
-    country_iplists.sort(function (a, b) {
-        return a.name > b.name;
-    });
+        var blacklist_iplists = [
+            {name: "[IPv4] Block Malicious IPs",       source:"script:/usr/local/hestia/install/deb/firewall/ipset/blacklist.sh"},
+            /*
+            {name: "[IPv6] Block Malicious IPs",       source:"script:/usr/local/hestia/install/deb/firewall/ipset/blacklist.ipv6.sh"},
+            */
+        ];
 
-    blacklist_iplists.sort(function (a, b) {
-        return a.name > b.name;
-    });
+        country_iplists.sort(function (a, b) {
+            return a.name > b.name;
+        });
 
-    $(function() {
-        var targetelement = document.getElementById('datasource_list');
+        blacklist_iplists.sort(function (a, b) {
+            return a.name > b.name;
+        });
 
-        // Blacklist
-        var newEl = document.createElement("option");
-        newEl.text="<?php print __('BLACKLIST') ?>";
-        newEl.disabled=true;
-        targetelement.appendChild(newEl);
+        $(function() {
+            var targetelement = document.getElementById('datasource_list');
 
-        blacklist_iplists.forEach(iplist => {
+            // Blacklist
             var newEl = document.createElement("option");
-            newEl.text=iplist.name;
-            newEl.value=iplist.source;
+            newEl.text="<?php print __('BLACKLIST') ?>";
+            newEl.disabled=true;
             targetelement.appendChild(newEl);
-        });
 
-        // IPVERSE
-        var newEl = document.createElement("option");
-        newEl.text="<?php print __('IPVERSE') ?>";
-        newEl.disabled=true;
-        targetelement.appendChild(newEl);
+            blacklist_iplists.forEach(iplist => {
+                var newEl = document.createElement("option");
+                newEl.text=iplist.name;
+                newEl.value=iplist.source;
+                targetelement.appendChild(newEl);
+            });
 
-        country_iplists.forEach(iplist => {
+            // IPVERSE
             var newEl = document.createElement("option");
-            newEl.text=iplist.name;
-            newEl.value=iplist.source;
+            newEl.text="<?php print __('IPVERSE') ?>";
+            newEl.disabled=true;
             targetelement.appendChild(newEl);
+
+            country_iplists.forEach(iplist => {
+                var newEl = document.createElement("option");
+                newEl.text=iplist.name;
+                newEl.value=iplist.source;
+                targetelement.appendChild(newEl);
+            });
         });
-    });
     </script>

web/templates/admin/add_ip.html

@@ -10,7 +10,6 @@
       </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center animated fadeIn">
         <?php
@@ -34,7 +33,7 @@
                     </td>
                     <td class="data-dotted">
                         <table class="data-col2" width="600px">
-                        <tr>
+                            <tr>
                                 <td class="step-top">
                                     <span class="page-title"><?=__('Adding IP address')?></span>
                                 </td>
@@ -139,11 +138,8 @@
                                     <input type="text" size="20" class="vst-input" name="v_nat" value="<?=htmlentities(trim($v_nat, "'"))?>">
                                 </td>
                             </tr>
-
-
-                        </table>
-                        <table class="data-col2">
                         </table>
+                        <table class="data-col2"></table>
                     </td>
                 </tr>
             </table>

web/templates/admin/add_key.html

@@ -63,8 +63,7 @@
                                 </td>
                             </tr>
                         </table>
-                        <table class="data-col2">
-                        </table>
+                        <table class="data-col2"></table>
                     </td>
                 </tr>
             </table>

web/templates/admin/add_mail.html

@@ -77,8 +77,7 @@
                                 </td>
                             </tr>
                         </table>
-                        <table class="data-col2">
-                        </table>
+                        <table class="data-col2"></table>
                     </td>
                 </tr>
             </table>

web/templates/admin/add_mail_acc.html

@@ -10,7 +10,6 @@
       </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center animated fadeIn">
 

web/templates/admin/add_package.html

@@ -10,7 +10,6 @@
       </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center animated fadeIn">
         <?php
@@ -375,8 +374,7 @@
                                 </tr>
                             <?php } ?>
                         </table>
-                        <table class="data-col2">
-                        </table>
+                        <table class="data-col2"></table>
                     </td>
                 </tr>
             </table>

web/templates/admin/add_user.html

@@ -10,7 +10,6 @@
       </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center animated fadeIn">
         <?php
@@ -162,10 +161,8 @@
                                     <input type="text"  class="vst-input" name="v_notify" id="v_notify" value="<?=htmlentities(trim($v_notify, "'"))?>" tabindex="8" >
                                 </td>
                             </tr>
-
                         </table>
-                    <table class="data-col2">
-                    </table>
+                    <table class="data-col2"></table>
                     </td>
                 </tr>
             </table>

web/templates/admin/add_web.html

@@ -10,7 +10,6 @@
       </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center animated fadeIn">
       <?php
@@ -394,6 +393,6 @@
       </div>
 
     <script>
-      GLOBAL.FTP_USER_PREFIX  = <?=json_encode($user.'_')?>;
-      GLOBAL.FTP_USER_PREPATH = <?=json_encode($v_ftp_user_prepath)?>;
+        GLOBAL.FTP_USER_PREFIX  = <?=json_encode($user.'_')?>;
+        GLOBAL.FTP_USER_PREPATH = <?=json_encode($v_ftp_user_prepath)?>;
     </script>

web/templates/admin/edit_backup_exclusions.html

@@ -10,7 +10,6 @@
       </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center edit animated fadeIn">
       <?php
@@ -95,8 +94,7 @@
                                 </td>
                             </tr>
                         </table>
-                        <table class="data-col2">
-                        </table>
+                        <table class="data-col2"></table>
                     </td>
                 </tr>
             </table>

web/templates/admin/edit_cron.html

@@ -10,336 +10,331 @@
       </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center animated fadeIn">
-      <?php
-        $back = $_SESSION['back'];
-        if (empty($back)) {
-          $back = "location.href='/list/cron/'";
-        } else {
-          $back = "location.href='".$back."'";
-        }
-      ?>
+        <?php
+            $back = $_SESSION['back'];
+            if (empty($back)) {
+                $back = "location.href='/list/cron/'";
+            } else {
+                $back = "location.href='".$back."'";
+            }
+        ?>
 
-                                <div class="vst-text step-top helper-container">
-                                    <div id="tabs"  class="cron-helper-tabs">
-                                      <ul>
-                                        <li><a href="#tabs-1"><?=__('Minutes')?></a></li>
-                                        <li><a href="#tabs-2"><?=__('Hourly')?></a></li>
-                                        <li><a href="#tabs-3"><?=__('Daily')?></a></li>
-                                        <li><a href="#tabs-4"><?=__('Weekly')?></a></li>
-                                        <li><a href="#tabs-5"><?=__('Monthly')?></a></li>
-                                      </ul>
-                                      <div id="tabs-1">
-                                        <form>
-                                            <input type="hidden" name="h_hour" value="*" />
-                                            <input type="hidden" name="h_day" value="*" />
-                                            <input type="hidden" name="h_month" value="*" />
-                                            <input type="hidden" name="h_wday" value="*" />
-                                            <p><span class="first"><?=__('Run Command')?>:</span>
-                                                <select name="h_min" class="vst-list">
-                                                    <option value="*"  selected="selected"><?=__('every minute')?></option>
-                                                    <option value="*/2"><?=__('every two minutes')?></option>
-                                                    <option value="*/5"><?=__('every')?> 5</option>
-                                                    <option value="*/10"><?=__('every')?> 10</option>
-                                                    <option value="*/15"><?=__('every')?> 15</option>
-                                                    <option value="*/30"><?=__('every')?> 30</option>
-                                                </select>
-                                            </p>
-                                            <p class="step-top">
-                                                <input type="submit" value="<?=__('generate')?>" class="button">
-                                            </p>
-                                        </form>
-                                      </div>
+        <div class="vst-text step-top helper-container">
+            <div id="tabs"  class="cron-helper-tabs">
+                <ul>
+                    <li><a href="#tabs-1"><?=__('Minutes')?></a></li>
+                    <li><a href="#tabs-2"><?=__('Hourly')?></a></li>
+                    <li><a href="#tabs-3"><?=__('Daily')?></a></li>
+                    <li><a href="#tabs-4"><?=__('Weekly')?></a></li>
+                    <li><a href="#tabs-5"><?=__('Monthly')?></a></li>
+                </ul>
+                <div id="tabs-1">
+                    <form>
+                        <input type="hidden" name="h_hour" value="*" />
+                        <input type="hidden" name="h_day" value="*" />
+                        <input type="hidden" name="h_month" value="*" />
+                        <input type="hidden" name="h_wday" value="*" />
+                        <p><span class="first"><?=__('Run Command')?>:</span>
+                            <select name="h_min" class="vst-list">
+                                <option value="*"  selected="selected"><?=__('every minute')?></option>
+                                <option value="*/2"><?=__('every two minutes')?></option>
+                                <option value="*/5"><?=__('every')?> 5</option>
+                                <option value="*/10"><?=__('every')?> 10</option>
+                                <option value="*/15"><?=__('every')?> 15</option>
+                                <option value="*/30"><?=__('every')?> 30</option>
+                            </select>
+                        </p>
+                        <p class="step-top">
+                            <input type="submit" value="<?=__('generate')?>" class="button">
+                        </p>
+                    </form>
+                </div>
 
+                <div id="tabs-2">
+                    <form>
+                        <input type="hidden" name="h_day" value="*" />
+                        <input type="hidden" name="h_month" value="*" />
+                        <input type="hidden" name="h_wday" value="*" />
+                        <p><span class="first"><?=__('Run Command')?>:</span>
+                            <select name="h_hour" class="vst-list">
+                                <option value="*" selected="selected"><?=__('every hour')?></option>
+                                <option value="*/2"><?=__('every two hours')?></option>
+                                <option value="*/6"><?=__('every')?> 6</option>
+                                <option value="*/12"><?=__('every')?> 12</option>
+                            </select>
+                        </p>
 
-                                      <div id="tabs-2">
-                                        <form>
-                                            <input type="hidden" name="h_day" value="*" />
-                                            <input type="hidden" name="h_month" value="*" />
-                                            <input type="hidden" name="h_wday" value="*" />
-                                            <p><span class="first"><?=__('Run Command')?>:</span>
-                                                <select name="h_hour" class="vst-list">
-                                                    <option value="*" selected="selected"><?=__('every hour')?></option>
-                                                    <option value="*/2"><?=__('every two hours')?></option>
-                                                    <option value="*/6"><?=__('every')?> 6</option>
-                                                    <option value="*/12"><?=__('every')?> 12</option>
-                                                </select>
-                                            </p>
+                        <p><span class="first"><?=__('Minute')?>:</span>
+                            <select name="h_min" class="vst-list short">
+                                <option value="0" selected="selected">00</option>
+                                <option value="15">15</option>
+                                <option value="30">30</option>
+                                <option value="45">45</option>
+                            </select>
+                        </p>
 
-                                            <p><span class="first"><?=__('Minute')?>:</span>
-                                                <select name="h_min" class="vst-list short">
-                                                    <option value="0" selected="selected">00</option>
-                                                    <option value="15">15</option>
-                                                    <option value="30">30</option>
-                                                    <option value="45">45</option>
-                                                </select>
-                                            </p>
+                        <p class="step-top">
+                            <input type="submit" value="<?=__('generate')?>" class="button">
+                        </p>
+                    </form>
+                </div>
 
-                                            <p class="step-top">
-                                                <input type="submit" value="<?=__('generate')?>" class="button">
-                                            </p>
-                                        </form>
-                                      </div>
+                <div id="tabs-3">
+                    <form>
+                        <input type="hidden" name="h_month" value="*" />
+                        <input type="hidden" name="h_wday" value="*" />
+                        <p><span class="first"><?=__('Run Command')?>:</span>
+                            <select name="h_day" class="vst-list">
+                                <option value="*" selected="selected"><?=__('every day')?></option>
+                                <option value="1-31/2"><?=__('every odd day')?></option>
+                                <option value="*/2"><?=__('every even day')?></option>
+                                <option value="*/3"><?=__('every')?> 3</option>
+                                <option value="*/5"><?=__('every')?> 5</option>
+                                <option value="*/10"><?=__('every')?> 10</option>
+                                <option value="*/15"><?=__('every')?> 15</option>
+                            </select>
+                        </p>
 
+                        <p><span class="first"><?=__('Hour')?>:</span>
+                            <select name="h_hour" class="vst-list short">
+                                <option value="0">00</option>
+                                <option value="1">01</option>
+                                <option value="2">02</option>
+                                <option value="3">03</option>
+                                <option value="4">04</option>
+                                <option value="5">05</option>
+                                <option value="6">06</option>
+                                <option value="7">07</option>
+                                <option value="8">08</option>
+                                <option value="9">09</option>
+                                <option value="10">10</option>
+                                <option value="11">11</option>
+                                <option value="12"  selected="selected">12</option>
+                                <option value="13">13</option>
+                                <option value="14">14</option>
+                                <option value="15">15</option>
+                                <option value="16">16</option>
+                                <option value="17">17</option>
+                                <option value="18">18</option>
+                                <option value="19">19</option>
+                                <option value="20">20</option>
+                                <option value="21">21</option>
+                                <option value="22">22</option>
+                                <option value="23">23</option>
+                            </select>
 
-                                      <div id="tabs-3">
-                                        <form>
-                                            <input type="hidden" name="h_month" value="*" />
-                                            <input type="hidden" name="h_wday" value="*" />
-                                            <p><span class="first"><?=__('Run Command')?>:</span>
-                                                <select name="h_day" class="vst-list">
-                                                    <option value="*" selected="selected"><?=__('every day')?></option>
-                                                    <option value="1-31/2"><?=__('every odd day')?></option>
-                                                    <option value="*/2"><?=__('every even day')?></option>
-                                                    <option value="*/3"><?=__('every')?> 3</option>
-                                                    <option value="*/5"><?=__('every')?> 5</option>
-                                                    <option value="*/10"><?=__('every')?> 10</option>
-                                                    <option value="*/15"><?=__('every')?> 15</option>
-                                                </select>
-                                            </p>
+                            <span><?=__('Minute')?>:</span>
+                            <select name="h_min" class="vst-list  short">
+                                <option value="0" selected="selected">00</option>
+                                <option value="1">01</option>
+                                <option value="2">02</option>
+                                <option value="5">05</option>
+                                <option value="10">10</option>
+                                <option value="15">15</option>
+                                <option value="20">20</option>
+                                <option value="25">25</option>
+                                <option value="30">30</option>
+                                <option value="35">35</option>
+                                <option value="40">40</option>
+                                <option value="45">45</option>
+                                <option value="50">50</option>
+                                <option value="55">55</option>
+                            </select>
+                        </p>
+                        <p class="step-top">
+                            <input type="submit" value="<?=__('generate')?>" class="button">
+                        </p>
+                    </form>
+                </div>
 
-                                            <p><span class="first"><?=__('Hour')?>:</span>
-                                                <select name="h_hour" class="vst-list short">
-                                                    <option value="0">00</option>
-                                                    <option value="1">01</option>
-                                                    <option value="2">02</option>
-                                                    <option value="3">03</option>
-                                                    <option value="4">04</option>
-                                                    <option value="5">05</option>
-                                                    <option value="6">06</option>
-                                                    <option value="7">07</option>
-                                                    <option value="8">08</option>
-                                                    <option value="9">09</option>
-                                                    <option value="10">10</option>
-                                                    <option value="11">11</option>
-                                                    <option value="12"  selected="selected">12</option>
-                                                    <option value="13">13</option>
-                                                    <option value="14">14</option>
-                                                    <option value="15">15</option>
-                                                    <option value="16">16</option>
-                                                    <option value="17">17</option>
-                                                    <option value="18">18</option>
-                                                    <option value="19">19</option>
-                                                    <option value="20">20</option>
-                                                    <option value="21">21</option>
-                                                    <option value="22">22</option>
-                                                    <option value="23">23</option>
-                                                </select>
+                <div id="tabs-4">
+                    <form>
+                        <input type="hidden" name="h_month" value="*" />
+                        <input type="hidden" name="h_day" value="*" />
 
-                                                <span><?=__('Minute')?>:</span>
-                                                <select name="h_min" class="vst-list  short">
-                                                    <option value="0" selected="selected">00</option>
-                                                    <option value="1">01</option>
-                                                    <option value="2">02</option>
-                                                    <option value="5">05</option>
-                                                    <option value="10">10</option>
-                                                    <option value="15">15</option>
-                                                    <option value="20">20</option>
-                                                    <option value="25">25</option>
-                                                    <option value="30">30</option>
-                                                    <option value="35">35</option>
-                                                    <option value="40">40</option>
-                                                    <option value="45">45</option>
-                                                    <option value="50">50</option>
-                                                    <option value="55">55</option>
-                                                </select>
-                                            </p>
-                                            <p class="step-top">
-                                                <input type="submit" value="<?=__('generate')?>" class="button">
-                                            </p>
-                                        </form>
-                                      </div>
+                        <p><span class="first"><?=__('Run Command')?>:</span>
+                            <select name="h_wday" class="vst-list">
+                                <option value="*" selected="selected"><?=__('every day')?></option>
+                                <option value="1,2,3,4,5"><?=__('weekdays (5 days)')?></option>
+                                <option value="0,6"><?=__('weekend (2 days)')?></option>
+                                <option value="1"><?=__('Monday')?></option>
+                                <option value="2"><?=__('Tuesday')?></option>
+                                <option value="3"><?=__('Wednesday')?></option>
+                                <option value="4"><?=__('Thursday')?></option>
+                                <option value="5"><?=__('Friday')?></option>
+                                <option value="6"><?=__('Saturday')?></option>
+                                <option value="0"><?=__('Sunday')?></option>
+                            </select>
+                        </p>
 
-                                      <div id="tabs-4">
-                                        <form>
-                                            <input type="hidden" name="h_month" value="*" />
-                                            <input type="hidden" name="h_day" value="*" />
+                        <p><span class="first"><?=__('Hour')?>:</span>
+                            <select name="h_hour" class="vst-list short">
+                                <option value="0">00</option>
+                                <option value="1">01</option>
+                                <option value="2">02</option>
+                                <option value="3">03</option>
+                                <option value="4">04</option>
+                                <option value="5">05</option>
+                                <option value="6">06</option>
+                                <option value="7">07</option>
+                                <option value="8">08</option>
+                                <option value="9">09</option>
+                                <option value="10">10</option>
+                                <option value="11">11</option>
+                                <option value="12"  selected="selected">12</option>
+                                <option value="13">13</option>
+                                <option value="14">14</option>
+                                <option value="15">15</option>
+                                <option value="16">16</option>
+                                <option value="17">17</option>
+                                <option value="18">18</option>
+                                <option value="19">19</option>
+                                <option value="20">20</option>
+                                <option value="21">21</option>
+                                <option value="22">22</option>
+                                <option value="23">23</option>
+                            </select>
+                            
+                            <span><?=__('Minute')?>:</span>
+                            <select name="h_min" class="vst-list short">
+                                <option value="0" selected="selected">00</option>
+                                <option value="1">01</option>
+                                <option value="2">02</option>
+                                <option value="5">05</option>
+                                <option value="10">10</option>
+                                <option value="15">15</option>
+                                <option value="20">20</option>
+                                <option value="25">25</option>
+                                <option value="30">30</option>
+                                <option value="35">35</option>
+                                <option value="40">40</option>
+                                <option value="45">45</option>
+                                <option value="50">50</option>
+                                <option value="55">55</option>
+                            </select>
+                        </p>
 
-                                            <p><span class="first"><?=__('Run Command')?>:</span>
-                                                <select name="h_wday" class="vst-list">
-                                                    <option value="*" selected="selected"><?=__('every day')?></option>
-                                                    <option value="1,2,3,4,5"><?=__('weekdays (5 days)')?></option>
-                                                    <option value="0,6"><?=__('weekend (2 days)')?></option>
-                                                    <option value="1"><?=__('Monday')?></option>
-                                                    <option value="2"><?=__('Tuesday')?></option>
-                                                    <option value="3"><?=__('Wednesday')?></option>
-                                                    <option value="4"><?=__('Thursday')?></option>
-                                                    <option value="5"><?=__('Friday')?></option>
-                                                    <option value="6"><?=__('Saturday')?></option>
-                                                    <option value="0"><?=__('Sunday')?></option>
-                                                </select>
-                                            </p>
+                        <p class="step-top">
+                            <input type="submit" value="<?=__('generate')?>" class="button">
+                        </p>
+                    </form>
+                </div>
 
-                                            <p><span class="first"><?=__('Hour')?>:</span>
-                                                <select name="h_hour" class="vst-list short">
-                                                    <option value="0">00</option>
-                                                    <option value="1">01</option>
-                                                    <option value="2">02</option>
-                                                    <option value="3">03</option>
-                                                    <option value="4">04</option>
-                                                    <option value="5">05</option>
-                                                    <option value="6">06</option>
-                                                    <option value="7">07</option>
-                                                    <option value="8">08</option>
-                                                    <option value="9">09</option>
-                                                    <option value="10">10</option>
-                                                    <option value="11">11</option>
-                                                    <option value="12"  selected="selected">12</option>
-                                                    <option value="13">13</option>
-                                                    <option value="14">14</option>
-                                                    <option value="15">15</option>
-                                                    <option value="16">16</option>
-                                                    <option value="17">17</option>
-                                                    <option value="18">18</option>
-                                                    <option value="19">19</option>
-                                                    <option value="20">20</option>
-                                                    <option value="21">21</option>
-                                                    <option value="22">22</option>
-                                                    <option value="23">23</option>
-                                                </select>
-                                                <span><?=__('Minute')?>:</span>
-                                                <select name="h_min" class="vst-list short">
-                                                    <option value="0" selected="selected">00</option>
-                                                    <option value="1">01</option>
-                                                    <option value="2">02</option>
-                                                    <option value="5">05</option>
-                                                    <option value="10">10</option>
-                                                    <option value="15">15</option>
-                                                    <option value="20">20</option>
-                                                    <option value="25">25</option>
-                                                    <option value="30">30</option>
-                                                    <option value="35">35</option>
-                                                    <option value="40">40</option>
-                                                    <option value="45">45</option>
-                                                    <option value="50">50</option>
-                                                    <option value="55">55</option>
-                                                </select>
-                                            </p>
+                <div id="tabs-5">
+                    <form>
+                        <input type="hidden" name="h_wday" value="*" />
+                        <p><span class="first"><?=__('Run Command')?>:</span>
+                            <select name="h_month" class="vst-list">
+                                <option value="*" selected="selected"><?=__('every month')?></option>
+                                <option value="1-11/2"><?=__('every odd month')?></option>
+                                <option value="*/2"><?=__('every even month')?></option>
+                                <option value="*/3"><?=__('every')?> 3</option>
+                                <option value="*/6"><?=__('every')?> 6</option>
+                                <option value="1"><?=__('Jan')?></option>
+                                <option value="2"><?=__('Feb')?></option>
+                                <option value="3"><?=__('Mar')?></option>
+                                <option value="4"><?=__('Apr')?></option>
+                                <option value="5"><?=__('May')?></option>
+                                <option value="6"><?=__('Jun')?></option>
+                                <option value="7"><?=__('Jul')?></option>
+                                <option value="8"><?=__('Aug')?></option>
+                                <option value="9"><?=__('Sep')?></option>
+                                <option value="10"><?=__('Oct')?></option>
+                                <option value="11"><?=__('Nov')?></option>
+                                <option value="12"><?=__('Dec')?></option>
+                            </select>
+                        </p>
 
-                                            <p class="step-top">
-                                                <input type="submit" value="<?=__('generate')?>" class="button">
-                                            </p>
-                                        </form>
-                                      </div>
+                        <p><span class="first"><?=__('Date')?>:</span>
+                            <select name="h_day" class="vst-list short">
+                                <option value="1" selected="selected">1</option>
+                                <option value="2">2</option>
+                                <option value="3">3</option>
+                                <option value="4">4</option>
+                                <option value="5">5</option>
+                                <option value="6">6</option>
+                                <option value="7">7</option>
+                                <option value="8">8</option>
+                                <option value="9">9</option>
+                                <option value="10">10</option>
+                                <option value="11">11</option>
+                                <option value="12">12</option>
+                                <option value="13">13</option>
+                                <option value="14">14</option>
+                                <option value="15">15</option>
+                                <option value="16">16</option>
+                                <option value="17">17</option>
+                                <option value="18">18</option>
+                                <option value="19">19</option>
+                                <option value="20">20</option>
+                                <option value="21">21</option>
+                                <option value="22">22</option>
+                                <option value="23">23</option>
+                                <option value="24">24</option>
+                                <option value="25">25</option>
+                                <option value="26">26</option>
+                                <option value="27">27</option>
+                                <option value="28">28</option>
+                                <option value="29">29</option>
+                                <option value="30">30</option>
+                                <option value="31">31</option>
+                            </select>
 
+                            <span><?=__('Hour')?>:</span>
+                            <select name="h_hour" class="vst-list short">
+                                <option value="0">00</option>
+                                <option value="1">01</option>
+                                <option value="2">02</option>
+                                <option value="3">03</option>
+                                <option value="4">04</option>
+                                <option value="5">05</option>
+                                <option value="6">06</option>
+                                <option value="7">07</option>
+                                <option value="8">08</option>
+                                <option value="9">09</option>
+                                <option value="10">10</option>
+                                <option value="11">11</option>
+                                <option value="12"  selected="selected">12</option>
+                                <option value="13">13</option>
+                                <option value="14">14</option>
+                                <option value="15">15</option>
+                                <option value="16">16</option>
+                                <option value="17">17</option>
+                                <option value="18">18</option>
+                                <option value="19">19</option>
+                                <option value="20">20</option>
+                                <option value="21">21</option>
+                                <option value="22">22</option>
+                                <option value="23">23</option>
+                            </select>
 
-                                      <div id="tabs-5">
-                                        <form>
-                                            <input type="hidden" name="h_wday" value="*" />
-
-                                            <p><span class="first"><?=__('Run Command')?>:</span>
-                                                <select name="h_month" class="vst-list">
-                                                    <option value="*" selected="selected"><?=__('every month')?></option>
-                                                    <option value="1-11/2"><?=__('every odd month')?></option>
-                                                    <option value="*/2"><?=__('every even month')?></option>
-                                                    <option value="*/3"><?=__('every')?> 3</option>
-                                                    <option value="*/6"><?=__('every')?> 6</option>
-                                                    <option value="1"><?=__('Jan')?></option>
-                                                    <option value="2"><?=__('Feb')?></option>
-                                                    <option value="3"><?=__('Mar')?></option>
-                                                    <option value="4"><?=__('Apr')?></option>
-                                                    <option value="5"><?=__('May')?></option>
-                                                    <option value="6"><?=__('Jun')?></option>
-                                                    <option value="7"><?=__('Jul')?></option>
-                                                    <option value="8"><?=__('Aug')?></option>
-                                                    <option value="9"><?=__('Sep')?></option>
-                                                    <option value="10"><?=__('Oct')?></option>
-                                                    <option value="11"><?=__('Nov')?></option>
-                                                    <option value="12"><?=__('Dec')?></option>
-                                                </select>
-                                            </p>
-
-                                            <p><span class="first"><?=__('Date')?>:</span>
-                                                <select name="h_day" class="vst-list short">
-                                                    <option value="1" selected="selected">1</option>
-                                                    <option value="2">2</option>
-                                                    <option value="3">3</option>
-                                                    <option value="4">4</option>
-                                                    <option value="5">5</option>
-                                                    <option value="6">6</option>
-                                                    <option value="7">7</option>
-                                                    <option value="8">8</option>
-                                                    <option value="9">9</option>
-                                                    <option value="10">10</option>
-                                                    <option value="11">11</option>
-                                                    <option value="12">12</option>
-                                                    <option value="13">13</option>
-                                                    <option value="14">14</option>
-                                                    <option value="15">15</option>
-                                                    <option value="16">16</option>
-                                                    <option value="17">17</option>
-                                                    <option value="18">18</option>
-                                                    <option value="19">19</option>
-                                                    <option value="20">20</option>
-                                                    <option value="21">21</option>
-                                                    <option value="22">22</option>
-                                                    <option value="23">23</option>
-                                                    <option value="24">24</option>
-                                                    <option value="25">25</option>
-                                                    <option value="26">26</option>
-                                                    <option value="27">27</option>
-                                                    <option value="28">28</option>
-                                                    <option value="29">29</option>
-                                                    <option value="30">30</option>
-                                                    <option value="31">31</option>
-                                                </select>
-
-                                                <span><?=__('Hour')?>:</span>
-                                                <select name="h_hour" class="vst-list short">
-                                                    <option value="0">00</option>
-                                                    <option value="1">01</option>
-                                                    <option value="2">02</option>
-                                                    <option value="3">03</option>
-                                                    <option value="4">04</option>
-                                                    <option value="5">05</option>
-                                                    <option value="6">06</option>
-                                                    <option value="7">07</option>
-                                                    <option value="8">08</option>
-                                                    <option value="9">09</option>
-                                                    <option value="10">10</option>
-                                                    <option value="11">11</option>
-                                                    <option value="12"  selected="selected">12</option>
-                                                    <option value="13">13</option>
-                                                    <option value="14">14</option>
-                                                    <option value="15">15</option>
-                                                    <option value="16">16</option>
-                                                    <option value="17">17</option>
-                                                    <option value="18">18</option>
-                                                    <option value="19">19</option>
-                                                    <option value="20">20</option>
-                                                    <option value="21">21</option>
-                                                    <option value="22">22</option>
-                                                    <option value="23">23</option>
-                                                </select>
-
-                                                <span><?=__('Minute')?>:</span>
-                                                <select name="h_min" class="vst-list short">
-                                                    <option value="0" selected="selected">00</option>
-                                                    <option value="1">01</option>
-                                                    <option value="2">02</option>
-                                                    <option value="5">05</option>
-                                                    <option value="10">10</option>
-                                                    <option value="15">15</option>
-                                                    <option value="20">20</option>
-                                                    <option value="25">25</option>
-                                                    <option value="30">30</option>
-                                                    <option value="35">35</option>
-                                                    <option value="40">40</option>
-                                                    <option value="45">45</option>
-                                                    <option value="50">50</option>
-                                                    <option value="55">55</option>
-                                                </select>
-                                            </p>
-                                            <p class="step-top">
-                                                <input type="submit" value="<?=__('generate')?>" class="button">
-                                            </p>
-                                        </form>
-                                      </div>
-                                    </div>
-                                </div>
-
+                            <span><?=__('Minute')?>:</span>
+                            <select name="h_min" class="vst-list short">
+                                <option value="0" selected="selected">00</option>
+                                <option value="1">01</option>
+                                <option value="2">02</option>
+                                <option value="5">05</option>
+                                <option value="10">10</option>
+                                <option value="15">15</option>
+                                <option value="20">20</option>
+                                <option value="25">25</option>
+                                <option value="30">30</option>
+                                <option value="35">35</option>
+                                <option value="40">40</option>
+                                <option value="45">45</option>
+                                <option value="50">50</option>
+                                <option value="55">55</option>
+                            </select>
+                        </p>
+                        <p class="step-top">
+                            <input type="submit" value="<?=__('generate')?>" class="button">
+                        </p>
+                    </form>
+                </div>
+            </div>
+        </div>
 
         <form id="vstobjects" name="v_edit_cron" method="post"  class="<?=$v_status?>">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -436,8 +431,7 @@
                                 </td>
                             </tr>
                         </table>
-                        <table class="data-col2">
-                        </table>
+                        <table class="data-col2"></table>
                     </td>
                 </tr>
             </table>

web/templates/admin/edit_db.html

@@ -9,24 +9,22 @@
         </div>
       </div>
 
-
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center animated fadeIn">
-      <?php
-        $back = $_SESSION['back'];
-        if (empty($back)) {
-          $back = "location.href='/list/db/'";
-        } else {
-          $back = "location.href='".$back."'";
-        }
-      ?>
+        <?php
+            $back = $_SESSION['back'];
+            if (empty($back)) {
+                $back = "location.href='/list/db/'";
+            } else {
+                $back = "location.href='".$back."'";
+            }
+        ?>
         <form id="vstobjects" name="v_edit_db" method="post"  class="<?=$v_status?>">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="save" value="save" />
 
-           <table class='data'>
+            <table class='data'>
                 <tr class="data-add">
                     <td class="data-dotted">
                         <table class="data-col1">
@@ -119,8 +117,7 @@
                                 </td>
                             </tr>
                         </table>
-                        <table class="data-col2">
-                        </table>
+                        <table class="data-col2"></table>
                     </td>
                 </tr>
             </table>
@@ -128,6 +125,6 @@
     </div>
 
     <script>
-      GLOBAL.DB_USER_PREFIX = <?=json_encode($user.'_')?>;
-      GLOBAL.DB_DBNAME_PREFIX = <?=json_encode($user.'_')?>;
+        GLOBAL.DB_USER_PREFIX = <?=json_encode($user.'_')?>;
+        GLOBAL.DB_DBNAME_PREFIX = <?=json_encode($user.'_')?>;
     </script>

web/templates/admin/edit_dns.html

@@ -10,17 +10,16 @@
       </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center animated fadeIn">
-      <?php
-        $back = $_SESSION['back'];
-        if (empty($back)) {
-          $back = "location.href='/list/dns/'";
-        } else {
-          $back = "location.href='".$back."'";
-        }
-      ?>
+        <?php
+            $back = $_SESSION['back'];
+            if (empty($back)) {
+                $back = "location.href='/list/dns/'";
+            } else {
+                $back = "location.href='".$back."'";
+            }
+        ?>
         <form id="vstobjects" name="v_edit_dns" method="post"  class="<?=$v_status?>">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="save" value="save" />
@@ -137,8 +136,7 @@
                                 </td>
                             </tr>
                         </table>
-                        <table class="data-col2">
-                        </table>
+                        <table class="data-col2"></table>
                     </td>
                 </tr>
             </table>

web/templates/admin/edit_dns_rec.html

@@ -10,17 +10,16 @@
       </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center animated fadeIn">
-      <?php
-        $back = $_SESSION['back'];
-        if (empty($back)) {
-          $back = "location.href='/list/dns/?domain=".htmlentities($_GET['domain'])."'";
-        } else {
-          $back = "location.href='".$back."'";
-        }
-      ?>
+        <?php
+            $back = $_SESSION['back'];
+            if (empty($back)) {
+                $back = "location.href='/list/dns/?domain=".htmlentities($_GET['domain'])."'";
+            } else {
+                $back = "location.href='".$back."'";
+            }
+        ?>
         <form id="vstobjects" name="v_edit_dns_rec" method="post"  class="<?=$v_status?>">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="save" value="save" />
@@ -150,11 +149,8 @@
                                     <input type="text" size="20" class="vst-input" name="v_record_id" value="<?=htmlentities(trim($v_record_id, "'"))?>">
                                 </td>
                             </tr>
-
-                        </table>
-                        <table class="data-col2">
                         </table>
-
+                        <table class="data-col2"></table>
                     </td>
                 </tr>
             </table>

web/templates/admin/edit_firewall.html

@@ -10,17 +10,16 @@
       </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center animated fadeIn">
-      <?php
-        $back = $_SESSION['back'];
-        if (empty($back)) {
-          $back = "location.href='/list/firewall/'";
-        } else {
-          $back = "location.href='".$back."'";
-        }
-      ?>
+        <?php
+            $back = $_SESSION['back'];
+            if (empty($back)) {
+                $back = "location.href='/list/firewall/'";
+            } else {
+                $back = "location.href='".$back."'";
+            }
+        ?>
         <form id="vstobjects" name="v_edit_firewall" method="post"  class="<?=$v_status?>">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="save" value="save" />

web/templates/admin/edit_ip.html

@@ -10,17 +10,16 @@
       </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center animated fadeIn">
-      <?php
-        $back = $_SESSION['back'];
-        if (empty($back)) {
-          $back = "location.href='/list/ip/'";
-        } else {
-          $back = "location.href='".$back."'";
-        }
-      ?>
+        <?php
+            $back = $_SESSION['back'];
+            if (empty($back)) {
+                $back = "location.href='/list/ip/'";
+            } else {
+                $back = "location.href='".$back."'";
+            }
+        ?>
         <form id="vstobjects" name="v_edit_ip" method="post"  class="<?=$v_status?>">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="save" value="save" />
@@ -135,10 +134,8 @@
                                     <input type="text" size="20" class="vst-input" name="v_nat" value="<?=htmlentities(trim($v_nat, "'"))?>">
                                 </td>
                             </tr>
-
-                        </table>
-                        <table class="data-col2">
                         </table>
+                        <table class="data-col2"></table>
                     </td>
                 </tr>
             </table>

web/templates/admin/edit_mail.html

@@ -10,17 +10,16 @@
       </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center animated fadeIn">
-      <?php
-        $back = $_SESSION['back'];
-        if (empty($back)) {
-          $back = "location.href='/list/mail/'";
-        } else {
-          $back = "location.href='".$back."'";
-        }
-      ?>
+        <?php
+            $back = $_SESSION['back'];
+            if (empty($back)) {
+                $back = "location.href='/list/mail/'";
+            } else {
+                $back = "location.href='".$back."'";
+            }
+        ?>
         <form id="vstobjects" name="v_edit_mail" method="post" class="<?=$v_status?>">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="save" value="save" />
@@ -213,8 +212,7 @@
                                 </td>
                             </tr>
                         </table>
-                        <table class="data-col2">
-                        </table>
+                        <table class="data-col2"></table>
                     </td>
                 </tr>
             </table>

web/templates/admin/edit_mail_acc.html

@@ -10,15 +10,14 @@
       </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center animated fadeIn">
       <?php
         $back = $_SESSION['back'];
         if (empty($back)) {
-          $back = "location.href='/list/mail/?domain=".$_GET['domain']."'";
+            $back = "location.href='/list/mail/?domain=".$_GET['domain']."'";
         } else {
-          $back = "location.href='".$back."'";
+            $back = "location.href='".$back."'";
         }
       ?>
       <form id="vstobjects" name="v_edit_mail_acc" method="post"  class="<?=$v_status?>">
@@ -149,67 +148,67 @@
                     <table class="data-col2">
                     </table>
                 </td>
-            <td class="mail-infoblock-td">
-                <div class="mail-infoblock">
-                    <table>
-                    <?php $uname_arr=posix_uname(); $hostname=$uname_arr['nodename']; ?>
-                        <tr>
-                            <td colspan="2">
-                                <select id="mail_configuration" class="vst-list flat">
-                                    <option v_type="hostname" domain="<?=$v_domain?>"><?=__('Use domain hostname')?></option>
-                                    <option v_type="starttls"><?=__('Use STARTTLS')?></option>
-                                    <option v_type="ssl"><?=__('Use SSL / TLS')?></option>
-                                    <option v_type="no_encryption" domain="<?=htmlentities(trim($v_domain, "'"))?>" no_encryption="<?=__('No encryption')?>"><?=__('No encryption')?></option>
-                                </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><?=__('Username')?>:</td>
-                            <td><div><span id="v_account">example</span>@<?=htmlentities(trim($v_domain, "'"))?></div></td>
-                        </tr>
-                        <tr>
-                            <td><?=__('Password')?>:</td>
-                            <td><div id="v_password">******</div></td>
-                        </tr>
-                        <tr>
-                            <td><?=__('IMAP hostname')?>:</td>
-                            <td><div id="td_imap_hostname">mail.<?=$v_domain?></div></td>
-                        </tr>
-                        <tr>
-                            <td><?=__('IMAP port')?>:</td>
-                            <td><div id="td_imap_port">143</div></td>
-                        </tr>
-                        <tr>
-                            <td><?=__('IMAP security')?>:</td>
-                            <td><div id="td_imap_encryption"><?=__('STARTTLS')?></div></td>
-                        </tr>
-                        <tr>
-                            <td><?=__('IMAP auth method')?>:</td>
-                            <td><div><?=__('Normal password')?></div></td>
-                        </tr>
-                        <tr>
-                            <td><?=__('SMTP hostname')?>:</td>
-                            <td><div id="td_smtp_hostname">mail.<?=$v_domain?></div></td>
-                        </tr>
-                        <tr>
-                            <td><?=__('SMTP port')?>:</td>
-                            <td><div id="td_smtp_port">587</div></td>
-                        </tr>
-                        <tr>
-                            <td><?=__('SMTP security')?>:</td>
-                            <td><div id="td_smtp_encryption"><?=__('STARTTLS')?></div></td>
-                        </tr>
-                        <tr>
-                            <td><?=__('SMTP auth method')?>:</td>
-                            <td><div><?=__('Normal password')?></div></td>
-                        </tr>
-                        <tr>
-                            <td><?=__('Webmail URL')?>:</td>
-                            <td><div><a class="vst" href="http://<?=$v_webmail_alias?>" target="_blank">http://<?=$v_webmail_alias?> <i></i></a></div></td>
-                        </tr>
-                    </table>
-                </div>
-            </td>
+                <td class="mail-infoblock-td">
+                    <div class="mail-infoblock">
+                        <table>
+                        <?php $uname_arr=posix_uname(); $hostname=$uname_arr['nodename']; ?>
+                            <tr>
+                                <td colspan="2">
+                                    <select id="mail_configuration" class="vst-list flat">
+                                        <option v_type="hostname" domain="<?=$v_domain?>"><?=__('Use domain hostname')?></option>
+                                        <option v_type="starttls"><?=__('Use STARTTLS')?></option>
+                                        <option v_type="ssl"><?=__('Use SSL / TLS')?></option>
+                                        <option v_type="no_encryption" domain="<?=htmlentities(trim($v_domain, "'"))?>" no_encryption="<?=__('No encryption')?>"><?=__('No encryption')?></option>
+                                    </select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><?=__('Username')?>:</td>
+                                <td><div><span id="v_account">example</span>@<?=htmlentities(trim($v_domain, "'"))?></div></td>
+                            </tr>
+                            <tr>
+                                <td><?=__('Password')?>:</td>
+                                <td><div id="v_password">******</div></td>
+                            </tr>
+                            <tr>
+                                <td><?=__('IMAP hostname')?>:</td>
+                                <td><div id="td_imap_hostname">mail.<?=$v_domain?></div></td>
+                            </tr>
+                            <tr>
+                                <td><?=__('IMAP port')?>:</td>
+                                <td><div id="td_imap_port">143</div></td>
+                            </tr>
+                            <tr>
+                                <td><?=__('IMAP security')?>:</td>
+                                <td><div id="td_imap_encryption"><?=__('STARTTLS')?></div></td>
+                            </tr>
+                            <tr>
+                                <td><?=__('IMAP auth method')?>:</td>
+                                <td><div><?=__('Normal password')?></div></td>
+                            </tr>
+                            <tr>
+                                <td><?=__('SMTP hostname')?>:</td>
+                                <td><div id="td_smtp_hostname">mail.<?=$v_domain?></div></td>
+                            </tr>
+                            <tr>
+                                <td><?=__('SMTP port')?>:</td>
+                                <td><div id="td_smtp_port">587</div></td>
+                            </tr>
+                            <tr>
+                                <td><?=__('SMTP security')?>:</td>
+                                <td><div id="td_smtp_encryption"><?=__('STARTTLS')?></div></td>
+                            </tr>
+                            <tr>
+                                <td><?=__('SMTP auth method')?>:</td>
+                                <td><div><?=__('Normal password')?></div></td>
+                            </tr>
+                            <tr>
+                                <td><?=__('Webmail URL')?>:</td>
+                                <td><div><a class="vst" href="http://<?=$v_webmail_alias?>" target="_blank">http://<?=$v_webmail_alias?> <i></i></a></div></td>
+                            </tr>
+                        </table>
+                    </div>
+                </td>
             </tr>
         </table>
     </form>

web/templates/admin/edit_package.html

@@ -10,12 +10,11 @@
       </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
-
+ 
     <div class="l-center animated fadeIn">
-      <?php
-        $back = "location.href='/list/package/'";
-      ?>
+        <?php
+            $back = "location.href='/list/package/'";
+        ?>
         <form id="vstobjects" name="v_edit_package" method="post"  class="<?=$v_status?>">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="save" value="save" />
@@ -317,7 +316,6 @@
                                     <span class="remove-ns additional-control delete"><?=__('delete')?></span>
                                 </td>
                             </tr>
-
                             <?  if($v_ns3)
                                   echo '<tr>
                                     <td>
@@ -374,8 +372,7 @@
                                 </tr>
                             <?php } ?>
                         </table>
-                        <table class="data-col2">
-                        </table>
+                        <table class="data-col2"></table>
                     </td>
                 </tr>
             </table>

web/templates/admin/edit_server.html

@@ -10,17 +10,16 @@
       </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center animated fadeIn">
-      <?php
-        $back = $_SESSION['back'];
-        if (empty($back)) {
-          $back = "location.href='/list/server/'";
-        } else {
-          $back = "location.href='".$back."'";
-        }
-      ?>
+        <?php
+            $back = $_SESSION['back'];
+            if (empty($back)) {
+                $back = "location.href='/list/server/'";
+            } else {
+                $back = "location.href='".$back."'";
+            }
+        ?>
 
         <form id="vstobjects" name="v_configure_server" method="post">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -853,10 +852,7 @@
                                 </td>
                             </tr>
                         </table>
-
-
-                        <table class="data-col2">
-                        </table>
+                        <table class="data-col2"></table>
                     </td>
                 </tr>
             </table>

web/templates/admin/edit_server_bind9.html

@@ -10,19 +10,16 @@
     </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
-
 
     <div class="l-center animated fadeIn">
-      <?php
-        $back = $_SESSION['back'];
-        if (empty($back)) {
-          $back = "location.href='/list/server/'";
-        } else {
-          $back = "location.href='".$back."'";
-        }
-      ?>
-
+        <?php
+            $back = $_SESSION['back'];
+            if (empty($back)) {
+                $back = "location.href='/list/server/'";
+            } else {
+                $back = "location.href='".$back."'";
+            }
+        ?>
         <form id="vstobjects" name="v_configure_server" method="post">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="save" value="save" />
@@ -78,9 +75,7 @@
                                 <label><input type="checkbox" size="20" class="vst-checkbox" name="v_restart" checked="yes"> <?php print __('restart');?></label>
                             </td>
                         </table>
-
-                        <table class="data-col2">
-                        </table>
+                        <table class="data-col2"></table>
                     </td>
                 </tr>
             </table>

web/templates/admin/edit_server_dovecot.html

@@ -10,19 +10,16 @@
     </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
-
-
+  
     <div class="l-center animated fadeIn">
-      <?php
-        $back = $_SESSION['back'];
-        if (empty($back)) {
-          $back = "location.href='/list/server/'";
-        } else {
-          $back = "location.href='".$back."'";
-        }
-      ?>
-
+        <?php
+            $back = $_SESSION['back'];
+            if (empty($back)) {
+                $back = "location.href='/list/server/'";
+            } else {
+                $back = "location.href='".$back."'";
+            }
+        ?>
         <form id="vstobjects" name="v_configure_server" method="post">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="save" value="save" />
@@ -66,7 +63,6 @@
                             </tr>
                             <?php if (!empty($v_config_path1)) {
                             ?>
-
                             <tr>
                                 <td class="vst-text step-top">
                                     <?=$v_config_path1 ?>
@@ -149,18 +145,13 @@
                                     <textarea class="vst-textinput console" name="v_config8"><?=$v_config8?></textarea>
                                 </td>
                             </tr>
-
                             <?php } ?>
-
-
+                            
                             <td class="vst-text input-label" style="text-transform: capitalize;">
                                 <label><input type="checkbox" size="20" class="vst-checkbox" name="v_restart" checked="yes"> <?php print __('restart');?></label>
                             </td>
                         </table>
-
-
-                        <table class="data-col2">
-                        </table>
+                        <table class="data-col2"></table>
                     </td>
                 </tr>
             </table>

web/templates/admin/edit_server_httpd.html

@@ -11,19 +11,16 @@
     </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
-
-
+  
     <div class="l-center animated fadeIn">
-      <?php
-        $back = $_SESSION['back'];
-        if (empty($back)) {
-          $back = "location.href='/list/server/'";
-        } else {
-          $back = "location.href='".$back."'";
-        }
-      ?>
-
+        <?php
+            $back = $_SESSION['back'];
+            if (empty($back)) {
+                $back = "location.href='/list/server/'";
+            } else {
+                $back = "location.href='".$back."'";
+            }
+        ?>
         <form id="vstobjects" name="v_configure_server" method="post">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="save" value="save" />
@@ -70,12 +67,8 @@
                                     <label><input type="checkbox" size="20" class="vst-checkbox" name="v_restart" checked="yes"> <?php print __('restart');?></label>
                                 </td>
                             </tr>
-
-                        </table>
-
-
-                        <table class="data-col2">
                         </table>
+                        <table class="data-col2"></table>
                     </td>
                 </tr>
             </table>

web/templates/admin/edit_server_mysql.html

@@ -10,19 +10,16 @@
     </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
-
 
     <div class="l-center animated fadeIn">
-      <?php
-        $back = $_SESSION['back'];
-        if (empty($back)) {
-          $back = "location.href='/list/server/'";
-        } else {
-          $back = "location.href='".$back."'";
-        }
-      ?>
-
+        <?php
+            $back = $_SESSION['back'];
+            if (empty($back)) {
+                $back = "location.href='/list/server/'";
+            } else {
+                $back = "location.href='".$back."'";
+            }
+        ?>
         <form id="vstobjects" name="v_configure_server" method="post">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="save" value="save" />
@@ -117,14 +114,12 @@
                                 </td>
                             </tr>
                         </table>
-
                         <table class="data-col2" width="600px" style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advanced-options">
                             <tr>
                                 <td class="vst-text input-label">
                                     <a href="javascript:toggleOptions();" class="vst-advanced"><?=__('Basic options')?></a>
                                 </td>
                             </tr>
-
                             <tr>
                                 <td class="vst-text step-top">
                                     <?=$v_config_path?>
@@ -141,10 +136,7 @@
                                 </td>
                             </tr>
                         </table>
-
-
-                        <table class="data-col2">
-                        </table>
+                        <table class="data-col2"></table>
                     </td>
                 </tr>
             </table>

web/templates/admin/edit_server_nginx.html

@@ -11,19 +11,16 @@
     </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
-
 
     <div class="l-center animated fadeIn">
-      <?php
-        $back = $_SESSION['back'];
-        if (empty($back)) {
-          $back = "location.href='/list/server/'";
-        } else {
-          $back = "location.href='".$back."'";
-        }
-      ?>
-
+        <?php
+            $back = $_SESSION['back'];
+            if (empty($back)) {
+                $back = "location.href='/list/server/'";
+            } else {
+                $back = "location.href='".$back."'";
+            }
+        ?>
         <form id="vstobjects" name="v_configure_server" method="post">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="save" value="save" />
@@ -166,8 +163,6 @@
                                     <br><br>
                                 </td>
                             </tr>
-
-
                             <tr>
                                 <td class="vst-text input-label">
                                     <a href="javascript:toggleOptions();" class="vst-advanced"><?php print __('Advanced options');?>&nbsp;<i class="fas fa-arrow-circle-right"></i></a>
@@ -197,12 +192,9 @@
                                     <label><input type="checkbox" size="20" class="vst-checkbox" name="v_restart" checked="yes"> <?php print __('restart');?></label>
                                 </td>
                             </tr>
-
                         </table>
 
-
-                        <table class="data-col2">
-                        </table>
+                        <table class="data-col2"></table>
                     </td>
                 </tr>
             </table>

web/templates/admin/edit_server_pgsql.html

@@ -10,19 +10,16 @@
     </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
-
 
     <div class="l-center animated fadeIn">
-      <?php
-        $back = $_SESSION['back'];
-        if (empty($back)) {
-          $back = "location.href='/list/server/'";
-        } else {
-          $back = "location.href='".$back."'";
-        }
-      ?>
-
+        <?php
+            $back = $_SESSION['back'];
+            if (empty($back)) {
+                $back = "location.href='/list/server/'";
+            } else {
+                $back = "location.href='".$back."'";
+            }
+        ?>
         <form id="vstobjects" name="v_configure_server" method="post">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="save" value="save" />
@@ -79,9 +76,7 @@
                             </td>
                         </table>
 
-
-                        <table class="data-col2">
-                        </table>
+                        <table class="data-col2"></table>
                     </td>
                 </tr>
             </table>

web/templates/admin/edit_server_php.html

@@ -10,19 +10,16 @@
     </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
-
 
     <div class="l-center animated fadeIn">
-      <?php
-        $back = $_SESSION['back'];
-        if (empty($back)) {
-          $back = "location.href='/list/server/'";
-        } else {
-          $back = "location.href='".$back."'";
-        }
-      ?>
-
+        <?php
+            $back = $_SESSION['back'];
+            if (empty($back)) {
+                $back = "location.href='/list/server/'";
+            } else {
+                $back = "location.href='".$back."'";
+            }
+        ?>
         <form id="vstobjects" name="v_configure_server" method="post">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="save" value="save" />
@@ -139,7 +136,6 @@
                                 </td>
                             </tr>
                         </table>
-
                         <table class="data-col2" width="600px" style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advanced-options">
                             <tr>
                                 <td class="vst-text input-label">
@@ -161,9 +157,7 @@
                                 <label><input type="checkbox" size="20" class="vst-checkbox" name="v_restart" checked="yes"> <?php print __('restart');?></label>
                             </td>
                         </table>
-
-                        <table class="data-col2">
-                        </table>
+                        <table class="data-col2"></table>
                     </td>
                 </tr>
             </table>

web/templates/admin/edit_server_service.html

@@ -10,18 +10,16 @@
     </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
-
 
     <div class="l-center animated fadeIn">
-      <?php
-        $back = $_SESSION['back'];
-        if (empty($back)) {
-          $back = "location.href='/list/server/'";
-        } else {
-          $back = "location.href='".$back."'";
-        }
-      ?>
+        <?php
+            $back = $_SESSION['back'];
+            if (empty($back)) {
+                $back = "location.href='/list/server/'";
+            } else {
+                $back = "location.href='".$back."'";
+            }
+        ?>
 
         <form id="vstobjects" name="v_configure_server" method="post">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -70,10 +68,7 @@
                                 </td>
                             </tr>
                         </table>
-
-
-                        <table class="data-col2">
-                        </table>
+                        <table class="data-col2"></table>
                     </td>
                 </tr>
             </table>

web/templates/admin/edit_user.html

@@ -11,17 +11,16 @@
       </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center animated fadeIn">
-      <?php
-        $back = $_SESSION['back'];
-        if (empty($back)) {
-          $back = "location.href='/list/user/'";
-        } else {
-          $back = "location.href='".$back."'";
-        }
-      ?>
+        <?php
+            $back = $_SESSION['back'];
+            if (empty($back)) {
+                $back = "location.href='/list/user/'";
+            } else {
+                $back = "location.href='".$back."'";
+            }
+        ?>
         <form id="vstobjects" method="post" name="v_edit_user" class="<?=$v_status?>">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="save" value="save" />
@@ -282,8 +281,7 @@
                                 </tr>
                             <?php } ?>
                         </table>
-                        <table class="data-col2">
-                        </table>
+                        <table class="data-col2"></table>
                     </td>
                 </tr>
             </table>

web/templates/admin/edit_web.html

@@ -1,30 +1,28 @@
 <div class="l-center edit">
-        <div class="l-sort clearfix">
-          <div class="l-unit-toolbar__buttonstrip">
+    <div class="l-sort clearfix">
+        <div class="l-unit-toolbar__buttonstrip">
             <a class="ui-button cancel" id="btn-back" href="/list/web/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
-          </div>
-          <div class="l-unit-toolbar__buttonstrip float-right">
+        </div>
+        <div class="l-unit-toolbar__buttonstrip float-right">
             <a href="/add/webapp/?domain=<?=$v_domain?>" class="ui-button cancel">
                 <i class="fas fa-magic status-icon blue"></i> <?=__('Quick Install App')?>
             </a>
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>
-          </div>
         </div>
-      </div>
-
+    </div>
+    </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center animated fadeIn">
-      <?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."'";
+            }
+        ?>
         <form id="vstobjects" name="v_edit_web" method="post"  class="<?=$v_status?>">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="save" value="save" />

web/templates/admin/generate_ssl.html

@@ -1,15 +1,15 @@
     <div class="l-center">
       <div class="l-sort clearfix">
         <div class="l-sort-toolbar clearfix float-left">
-                  <?php
-                    if (!empty($_SESSION['error_msg'])) {
-                      echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
-                    } else {
-                      if (!empty($_SESSION['ok_msg'])) {
-                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                      }
+            <?php
+                if (!empty($_SESSION['error_msg'])) {
+                    echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
+                } else {
+                    if (!empty($_SESSION['ok_msg'])) {
+                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
                     }
-                  ?>
+                }
+            ?>
         </div>
       </div>
     </div>
@@ -17,14 +17,14 @@
     <div class="l-separator"></div>
 
     <div class="l-center animated fadeIn">
-      <?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."'";
+            }
+        ?>
         <form id="vstobjects" name="v_generate_csr" method="post">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="generate" value="generate" />

web/templates/admin/list_cron.html

@@ -51,20 +51,20 @@
     <div class="l-separator"></div>
 
     <div class="l-center units animated fadeIn">
-        <div class="header table-header">
-            <div class="l-unit__col l-unit__col--right">
-                  <div class="clearfix l-unit__stat-col--left super-compact">
-                      <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
-                  </div>
-                  <div class="clearfix l-unit__stat-col--left wide-5"><b><?php print __('Cron Job');?></b></div>
-                  <div class="clearfix l-unit__stat-col--left compact-2 text-right"><b>&nbsp;</b></div>
-                  <div class="clearfix l-unit__stat-col--left compact-3 text-center"><b><?=__('Min')?></b></div>
-                  <div class="clearfix l-unit__stat-col--left compact-3 text-center"><b><?=__('Hour')?></b></div>
-                  <div class="clearfix l-unit__stat-col--left compact-3 text-center"><b><?=__('Day')?></b></div>
-                  <div class="clearfix l-unit__stat-col--left compact-3 text-center"><b><?=__('Month')?></b></div>
-                  <div class="clearfix l-unit__stat-col--left compact-3 text-center"><b><?=__('Day of week')?></b></div>
-             </div>
+      <div class="header table-header">
+        <div class="l-unit__col l-unit__col--right">
+          <div class="clearfix l-unit__stat-col--left super-compact">
+            <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
           </div>
+          <div class="clearfix l-unit__stat-col--left wide-5"><b><?php print __('Cron Job');?></b></div>
+          <div class="clearfix l-unit__stat-col--left compact-2 text-right"><b>&nbsp;</b></div>
+          <div class="clearfix l-unit__stat-col--left compact-3 text-center"><b><?=__('Min')?></b></div>
+          <div class="clearfix l-unit__stat-col--left compact-3 text-center"><b><?=__('Hour')?></b></div>
+          <div class="clearfix l-unit__stat-col--left compact-3 text-center"><b><?=__('Day')?></b></div>
+          <div class="clearfix l-unit__stat-col--left compact-3 text-center"><b><?=__('Month')?></b></div>
+          <div class="clearfix l-unit__stat-col--left compact-3 text-center"><b><?=__('Day of week')?></b></div>
+        </div>
+      </div>
       <?
         foreach ($data as $key => $value) {
           ++$i;

web/templates/admin/list_db.html

@@ -6,7 +6,6 @@
             $mysql = 0;
             $pgsql = 0;
 
-
             list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
 
             foreach ($data as $key => $value) {

web/templates/admin/list_dns.html

@@ -86,7 +86,6 @@ sort-expire="<?=strtotime($data[$key]['EXP'])?>" sort-records="<?=(int)$data[$ke
               </div>
               <div class="clearfix l-unit__stat-col--left wide-3">
                 <b><a href="/list/dns/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=__('DNS records')?>"><?=$key?></a></b>
-                <!-- <?=empty($data[$key]['SRC']) ? '' : '<br/>⇢ <span style="font-size:11px;">' . htmlspecialchars($data[$key]['SRC'], ENT_QUOTES) . '</span>'; ?> -->
                 <?=empty($data[$key]['SRC'])? '' : '<br/>⇢ <span style="font-size:11px;">' . htmlspecialchars($data[$key]['SRC'], ENT_QUOTES) . '</span>'; ?>
               </div>
               <!-- START QUICK ACTION TOOLBAR AREA -->

web/templates/admin/list_dns_rec.html

@@ -94,7 +94,6 @@ v_unit_id="<?=$key?>" v_section="dns_rec">
             <div class="clearfix l-unit__stat-col--left compact text-center"><b><?=$data[$key]['TYPE']?></b></div>
             <div class="clearfix l-unit__stat-col--left compact"><?=$data[$key]['PRIORITY']?>&nbsp;</div>
             <div class="clearfix l-unit__stat-col--left compact"><?php if($data[$key]['TTL'] == ''){ echo __('Default'); }else{ echo $data[$key]['TTL'];} ?></div>
-            
             <div class="clearfix l-unit__stat-col--left wide-6"><?=htmlspecialchars($data[$key]['VALUE'], ENT_QUOTES, 'UTF-8')?></div>
           </div>
         </div>

web/templates/admin/list_firewall.html

@@ -36,11 +36,9 @@
           </table>
         </div>
       </div>
-      <!-- /.l-sort -->
     </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center units compact animated fadeIn">         
           <div class="header table-header">     

web/templates/admin/list_key.html

@@ -1,10 +1,10 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <div class="l-unit-toolbar__buttonstrip">
-            <a class="ui-button cancel" id="btn-back" href="javascript:history.back();"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
-        <?php
-        	 echo '<a href="/add/key/" id="btn-create" class="ui-button cancel" title="'.__('Add SSH Key').'"><i class="fas fa-plus-circle status-icon green"></i>'.__('Add SSH Key').'</a>';
-        ?>
+          <a class="ui-button cancel" id="btn-back" href="javascript:history.back();"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
+          <?php
+            echo '<a href="/add/key/" id="btn-create" class="ui-button cancel" title="'.__('Add SSH Key').'"><i class="fas fa-plus-circle status-icon green"></i>'.__('Add SSH Key').'</a>';
+          ?>
       </div>
      </div>
     </div>
@@ -27,24 +27,24 @@
     foreach ($data as $key => $value) {
     ++$i;
   ?>
-    <div class="l-unit header">
-      <div class="l-unit__col l-unit__col--right">
-        <div class="clearfix l-unit__stat-col--left wide-3"><b><?=$data[$key]['ID'];?></b></div>
-            <div class="clearfix l-unit__stat-col--left text-left compact-2">
-                <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
-                    <div class="actions-panel clearfix">
-                        <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-                            <a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?=__('delete')?>">
-                                <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
-                                <input type="hidden" name="delete_url" value="/delete/key/?key=<?=$key?>&token=<?=$_SESSION['token']?>" />
-                                <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
-                                    <p class="confirmation"><?=__('DELETE_KEY_CONFIRM',$key)?></p>
-                                </div>
-                            </a>
-                        </div>
+  <div class="l-unit header">
+    <div class="l-unit__col l-unit__col--right">
+      <div class="clearfix l-unit__stat-col--left wide-3"><b><?=$data[$key]['ID'];?></b></div>
+          <div class="clearfix l-unit__stat-col--left text-left compact-2">
+            <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
+              <div class="actions-panel clearfix">
+                <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
+                  <a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?=__('delete')?>">
+                    <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
+                    <input type="hidden" name="delete_url" value="/delete/key/?key=<?=$key?>&token=<?=$_SESSION['token']?>" />
+                    <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
+                      <p class="confirmation"><?=__('DELETE_KEY_CONFIRM',$key)?></p>
                     </div>
+                  </a>
                 </div>
+              </div>
             </div>
+          </div>
         <div class="clearfix l-unit__stat-col--left wide-7"><b><?=htmlspecialchars($data[$key]['KEY'], ENT_QUOTES);?></b></div>
       </div>
     </div>
@@ -58,11 +58,11 @@
                 <table class='data'></table>
                 <div class="data-count l-unit__col l-unit__col--right clearfix">
                 <?php if ( $i == 1) {
-                    echo __('1 SSH Key');
-                } else {
-                    echo __('%s SSH Keys',$i);
-                }
-        ?>
+                      echo __('1 SSH Key');
+                  } else {
+                      echo __('%s SSH Keys',$i);
+                  }
+                ?>
       </div>
     </div>
   </div>

web/templates/admin/list_log.html

@@ -21,6 +21,7 @@
 <div class="l-separator"></div>
 
 <div class="l-center units animated fadeIn">
+
   <div class="header table-header">     
     <div class="l-unit__col l-unit__col--right">
       <div class="clearfix l-unit__stat-col--left super-compact">
@@ -32,20 +33,20 @@
     </div>
   </div>
 
- <?php
-    foreach ($data as $key => $value) {
-    ++$i;
-  ?>
-    <div class="l-unit header">
-      <div class="l-unit__col l-unit__col--right">
-        <div class="clearfix l-unit__stat-col--left super-compact">
-          <i class="fas fa-info-circle status-icon dim"></i>
+  <?php
+      foreach ($data as $key => $value) {
+        ++$i;
+      ?>
+      <div class="l-unit header">
+        <div class="l-unit__col l-unit__col--right">
+          <div class="clearfix l-unit__stat-col--left super-compact">
+            <i class="fas fa-info-circle status-icon dim"></i>
+          </div>
+          <div class="clearfix l-unit__stat-col--left small"><b><?=translate_date($data[$key]['DATE'])?></b></div>
+          <div class="clearfix l-unit__stat-col--left compact"><b><?=$data[$key]['TIME']?></b></div>
+          <div class="clearfix l-unit__stat-col--left wide-7"><?=$data[$key]['CMD']?></div>
         </div>
-        <div class="clearfix l-unit__stat-col--left small"><b><?=translate_date($data[$key]['DATE'])?></b></div>
-        <div class="clearfix l-unit__stat-col--left compact"><b><?=$data[$key]['TIME']?></b></div>
-        <div class="clearfix l-unit__stat-col--left wide-7"><?=$data[$key]['CMD']?></div>
       </div>
-    </div>
   <?}?>
 </div>
 

web/templates/admin/list_server_info.html

@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
   <link rel="icon" href="/images/favicon.ico" type="image/x-icon">
-  <title><?php echo $_SERVER['HTTP_HOST']; ?> - <?=__($TAB)?> - Hestia Task Viewer</title>
+  <title><?php echo $_SERVER['HTTP_HOST']; ?> - <?=__($TAB)?> - <?=__('Hestia Control Panel');?></title>
   <link rel="stylesheet" href="/css/styles.min.css?1446554103">
   <link rel="stylesheet" href="/css/active-theme.css?1446554103">
   <link type="text/css" href="/css/animate.css?1446554103" rel="stylesheet" />
@@ -22,7 +22,6 @@
   <div class="l-header">
     <div class="l-center">
       <a href="/list/web/" class="l-logo"></a>
-      <!-- /.l-logo -->
       <div class="l-menu clearfix">
         <div class="l-menu__item"><a href="/list/rrd/"><i class="fas fa-arrow-alt-circle-left"></i></a></div>
         <div class="l-menu__item <?php if(isset($_GET['cpu'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?cpu"><i class="fas fa-microchip"></i>&nbsp;&nbsp;&nbsp;<?=__('CPU')?></a></div>
@@ -33,17 +32,13 @@
         <?php if ((isset($_SESSION['DNS_SYSTEM'])) && (!empty($_SESSION['DNS_SYSTEM']))) {?><div class="l-menu__item <?php if(isset($_GET['dns'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?dns"><i class="fas fa-atlas"></i>&nbsp;&nbsp;&nbsp;<?=__('DNS')?></a></div><?php }?>
         <?php if ((isset($_SESSION['MAIL_SYSTEM'])) && (!empty($_SESSION['MAIL_SYSTEM']))) {?><div class="l-menu__item <?php if(isset($_GET['mail'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?mail"><i class="fas fa-mail-bulk"></i>&nbsp;&nbsp;&nbsp;<?=__('Mail')?></a></div><?php }?>
         <?php if ((isset($_SESSION['DB_SYSTEM'])) && (!empty($_SESSION['DB_SYSTEM']))) {?><div class="l-menu__item <?php if(isset($_GET['db'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?db"><i class="fas fa-database"></i>&nbsp;&nbsp;&nbsp;<?=__('DB')?></a></div><?php }?>
-        
       </div>
-      <!-- /.l-menu -->
       <div class="l-profile noselect">
         <div class="l-menu__item"><a href="javascript:location.reload();"><i class="fas fa-redo"></i></a></div>
         <div class="l-menu__item"><a href="/logout/" alt="<?=__('Log out')?>" class="l-profile__logout"><i class="fas fa-sign-out-alt"></i></a></div>
       </div>
-      <!-- /.l-profile -->
     </div>
   </div>
-  <!-- /.l-header -->
 
   <div class="server-info-output">.</div><div class="l-center">
   <pre class="console-output animated fadeIn">

web/templates/admin/list_ssl.html

@@ -7,7 +7,6 @@
     </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center animated fadeIn">
       <?php

web/templates/admin/list_webapps.html

@@ -9,7 +9,6 @@
       </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center animated fadeIn" style="padding-top:240px;">
         <?php

web/templates/admin/list_weblog.html

@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
   <link rel="icon" href="/images/favicon.ico" type="image/x-icon">
-  <title>Hestia - <?=__('Web Log Manager')?> </title>
+  <title><?=__('Web Log Manager')?> - <?=__('Hestia Control Panel');?></title>
   <link rel="stylesheet" href="/css/styles.min.css?1446554103">
   <link rel="stylesheet" href="/css/active-theme.css?1446554103">
   <link type="text/css" href="/css/animate.css?1446554103" rel="stylesheet" />
@@ -22,23 +22,18 @@
   <div class="l-header">
     <div class="l-center">
       <a href="/" class="l-logo"></a>
-      <!-- /.l-logo -->
       <div class="l-menu clearfix">
         <div class="l-menu__item"><a href="/list/web/"><i class="fas fa-arrow-alt-circle-left"></i>&nbsp;&nbsp;&nbsp;<?=__('Back')?></a></div>
         <div class="l-menu__item <?php if($_GET['type'] == 'access') echo 'l-menu__item--active' ?>"><a href="/list/web-log/?domain=<?=htmlentities($_GET['domain'])?>&type=access"><i class="fas fa-eye"></i>&nbsp;&nbsp;&nbsp;<?=__('AccessLog')?></a><a href="/download/web-log/?domain=<?=htmlentities($_GET['domain'])?>&type=access"><i class="fas fa-download"></i></a></div>
         <div class="l-menu__item <?php if($_GET['type'] == 'error') echo 'l-menu__item--active' ?>"><a href="/list/web-log/?domain=<?=htmlentities($_GET['domain'])?>&type=error"><i class="fas fa-exclamation-circle"></i>&nbsp;&nbsp;&nbsp;<?=__('ErrorLog')?></a><a href="/download/web-log/?domain=<?=htmlentities($_GET['domain'])?>&type=error"><i class="fas fa-download"></i></a></div>
-
       </div>
-      <!-- /.l-menu -->
       <div class="l-profile">
         <div class="l-menu__item"><a href="javascript:location.reload();"><i class="fas fa-redo"></i></a></div>
         <div class="l-menu__item"><a href="/edit/user/?user=<?php echo $user; ?>" alt="<?=$user?>" class="l-profile__username"><i class="fas fa-user-circle"></i></a></div>
 			  <div class="l-menu__item"><a href="/logout/" alt="<?=__('Log out')?>" class="l-profile__logout"><i class="fas fa-sign-out-alt"></i></a></div>
       </div>
-      <!-- /.l-profile -->
     </div>
   </div>
-  <!-- /.l-header -->
 
   <div style="color: #cc3366; padding: 10px 0 20px 20px; background: #fff; "><?php echo __('Last 70 lines of %s.%s.log',htmlentities($_GET['domain']),htmlentities($_GET['type'])) ;?></div>
   <pre class="console-output">

web/templates/admin/panel.html

@@ -9,14 +9,12 @@
 <div class="l-header">
 	<div class="l-center">
 		<a href="/list/user/" class="l-logo"></a>
-		<!-- /.l-logo -->
 		<div class="l-menu clearfix noselect">
 			<div class="l-menu__item <?php if($TAB == 'WEB' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'DNS' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'MAIL' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'DB' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'BACKUP' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'CRON' ) echo 'l-menu__item--active' ?><?php if($TAB == 'PACKAGE' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'USER' ) echo 'l-menu__item--active' ?>"><a href="/list/user/"><i class="fas fa-tasks panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=__('Records')?></a></div>
 			<div class="l-menu__item <?php if($TAB == 'FM' ) echo 'l-menu__item--active' ?>"><a href="/fm/"><i class="fas fa-folder-open panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=__('Fm')?></a></div>
 			<div class="l-menu__item <?php if($TAB == 'LOG' ) echo 'l-menu__item--active' ?>"><a href="/list/log/"><i class="fas fa-history panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=__('Log')?></a></div>
 			<div class="l-menu__item <?php if($TAB == 'STATS' ) echo 'l-menu__item--active' ?>"><a href="/list/stats/"><i class="fas fa-chart-line panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=__('Statistics')?></a></div>
 		</div>
-		<!-- /.l-menu -->
 		<div class="l-profile noselect">
 			<div class="l-menu__item">
 				<span class="pill usage"> 
@@ -36,13 +34,10 @@
 			<div class="l-menu__item"><a href="https://docs.hestiacp.com/" alt="<?=__('Help')?>" class="l-profile__help" target="_blank"><i class="fas fa-question-circle"></i></a></div>
 			<div class="l-menu__item"><a href="/logout/" alt="<?=__('Log out')?>" class="l-profile__logout"><i class="fas fa-sign-out-alt"></i></a></div>
 		</div>
-		<!-- /.l-profile -->
 	</div>
 </div>
 <ul class="notification-container hidden animated fadeIn"></ul>
 
-<!-- /.l-header -->
-
 <div class="l-content">
 	<div class="l-center">
 		<div class="l-stat">
@@ -136,7 +131,6 @@
 		<?php } ?>
 	<?php } ?>
 		</div>
-		<!-- /.l-stats -->
 	</div>
 	<div class="l-separator"></div>
-	<!-- /.l-separator -->
+	

web/templates/admin/setup_webapp.html

@@ -19,7 +19,6 @@
       </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center animated fadeIn" style="padding-top:240px;">
         <?php

web/templates/user/edit_dns.html

@@ -10,17 +10,16 @@
       </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center animated fadeIn">
-      <?php
-        $back = $_SESSION['back'];
-        if (empty($back)) {
-          $back = "location.href='/list/dns/'";
-        } else {
-          $back = "location.href='".$back."'";
-        }
-      ?>
+        <?php
+            $back = $_SESSION['back'];
+            if (empty($back)) {
+                $back = "location.href='/list/dns/'";
+            } else {
+                $back = "location.href='".$back."'";
+            }
+        ?>
         <form id="vstobjects" name="v_edit_dns" method="post"  class="<?=$v_status?>">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="save" value="save" />
@@ -137,8 +136,7 @@
                                 </td>
                             </tr>
                         </table>
-                        <table class="data-col2">
-                        </table>
+                        <table class="data-col2"></table>
                     </td>
                 </tr>
             </table>

web/templates/user/edit_user.html

@@ -11,17 +11,16 @@
       </div>
 
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center animated fadeIn">
-      <?php
-        $back = $_SESSION['back'];
-        if (empty($back)) {
-          $back = "location.href='/list/user/'";
-        } else {
-          $back = "location.href='".$back."'";
-        }
-      ?>
+        <?php
+            $back = $_SESSION['back'];
+            if (empty($back)) {
+                $back = "location.href='/list/user/'";
+            } else {
+                $back = "location.href='".$back."'";
+            }
+        ?>
         <form id="vstobjects" method="post" name="v_edit_user" class="<?=$v_status?>">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="save" value="save" />
@@ -206,17 +205,13 @@
                                     </td>
                                 </tr>';
                             ?>
-
                                 <tr class="add-ns" <? if($v_ns8) echo 'style="display:none;"'; ?> >
                                     <td class="step-top-small">
                                       <span class="add-ns-button additional-control add"><?=__('Add one more Name Server')?></span>
                                     </td>
                                 </tr>
-
-
-                        </table>
-                        <table class="data-col2">
                         </table>
+                        <table class="data-col2"></table>
                     </td>
                 </tr>
             </table>

web/templates/user/edit_web.html

@@ -12,9 +12,7 @@
         </div>
       </div>
 
-
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
 
     <div class="l-center animated fadeIn">
       <?php
@@ -546,5 +544,5 @@
         </div>
     </div>
     <script>
-      GLOBAL.FTP_USER_PREFIX = <?=json_encode($user.'_')?>;
+        GLOBAL.FTP_USER_PREFIX = <?=json_encode($user.'_')?>;
     </script>

web/templates/user/list_search.html

@@ -27,8 +27,6 @@
     </div>
   </div>
     <div class="l-separator"></div>
-    <!-- /.l-separator -->
-
 
     <div class="l-center units animated fadeIn">
         <div class="header table-header">     

web/templates/user/panel.html

@@ -9,14 +9,12 @@
 <div class="l-header">
 	<div class="l-center">
 		<a href="/list/web/" class="l-logo"></a>
-		<!-- /.l-logo -->
 		<div class="l-menu clearfix noselect">
 			<div class="l-menu__item <?php if($TAB == 'WEB' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'DNS' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'MAIL' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'DB' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'BACKUP' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'CRON' ) echo 'l-menu__item--active' ?>"><a href="/list/web/"><i class="fas fa-tasks panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=__('Records')?></a></div>
 			<div class="l-menu__item <?php if($TAB == 'FM' ) echo 'l-menu__item--active' ?>"><a href="/fm/"><i class="fas fa-folder-open panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=__('Fm')?></a></div>
 			<div class="l-menu__item <?php if($TAB == 'LOG' ) echo 'l-menu__item--active' ?>"><a href="/list/log/"><i class="fas fa-history panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=__('Log')?></a></div>
 			<div class="l-menu__item <?php if($TAB == 'STATS' ) echo 'l-menu__item--active' ?>"><a href="/list/stats/"><i class="fas fa-chart-line panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=__('Statistics')?></a></div>
 		</div>
-		<!-- /.l-menu -->
 		<div class="l-profile noselect">
 			<div class="l-menu__item">
 				<span class="pill usage">
@@ -31,13 +29,10 @@
 			<div class="l-menu__item"><a href="https://docs.hestiacp.com/" alt="<?=__('Help')?>" class="l-profile__help" target="_blank"><i class="fas fa-question-circle"></i></a></div>
 			<div class="l-menu__item"><a href="/logout/" alt="<?=__('Log out')?>" class="l-profile__logout"><i class="fas fa-sign-out-alt"></i></a></div>
 		</div>
-		<!-- /.l-profile -->
 	</div>
 </div>
 <ul class="notification-container hidden animated fadeIn"></ul>
 
-<!-- /.l-header -->
-
 <div class="l-content">
 	<div class="l-center">
 		<div class="l-stat">
@@ -122,7 +117,5 @@
 		<?php } ?>
 	<?php } ?>
 		</div>
-		<!-- /.l-stats -->
 	</div>
 	<div class="l-separator"></div>
-	<!-- /.l-separator -->