Connected web interface with vesta.conf

web/add/db/index.php

@@ -64,17 +64,14 @@ if (!empty($_POST['ok'])) {
 
     // Get database manager url
     if (empty($_SESSION['error_msg'])) {
-        exec (VESTA_CMD."v-list-sys-config json", $output, $return_var);
-        $sys = json_decode(implode('', $output), true);
-        unset($output);
         list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"] . ":");
         if ($_POST['v_host'] != 'localhost' ) $http_host = $_POST['v_host'];
         if ($_POST['v_type'] == 'mysql') $db_admin = "phpMyAdmin";
         if ($_POST['v_type'] == 'mysql') $db_admin_link = "http://".$http_host."/phpmyadmin/";
-        if (($_POST['v_type'] == 'mysql') && (!empty($sys['config']['DB_PMA_URL']))) $db_admin_link = $sys['config']['DB_PMA_URL'];
+        if (($_POST['v_type'] == 'mysql') && (!empty($_SESSION['DB_PMA_URL']))) $db_admin_link = $_SESSION['DB_PMA_URL'];
         if ($_POST['v_type'] == 'pgsql') $db_admin = "phpPgAdmin";
         if ($_POST['v_type'] == 'pgsql') $db_admin_link = "http://".$http_host."/phppgadmin/";
-        if (($_POST['v_type'] == 'pgsql') && (!empty($sys['config']['DB_PGA_URL']))) $db_admin_link = $sys['config']['DB_PGA_URL'];
+        if (($_POST['v_type'] == 'pgsql') && (!empty($_SESSION['DB_PGA_URL']))) $db_admin_link = $_SESSION['DB_PGA_URL'];
     }
 
     // Email login credentials
@@ -109,9 +106,7 @@ top_panel($user,$TAB);
 $v_db_email = $panel[$user]['CONTACT'];
 
 // List avaiable database types
-exec (VESTA_CMD."v-list-database-types 'json'", $output, $return_var);
-$db_types = json_decode(implode('', $output), true);
-unset($output);
+$db_types = split(",",$_SESSION['DB_SYSTEM']);
 
 // List available database servers
 $db_hosts = array();

web/add/mail/index.php

@@ -144,12 +144,9 @@ if (!empty($_POST['ok_acc'])) {
 
     // Get webmail url
     if (empty($_SESSION['error_msg'])) {
-        exec (VESTA_CMD."v-list-sys-config json", $output, $return_var);
-        $sys = json_decode(implode('', $output), true);
-        unset($output);
         list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
         $webmail = "http://".$http_host."/webmail/";
-        if (!empty($sys['config']['MAIL_URL'])) $webmail = $sys['config']['MAIL_URL'];
+        if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
     }
 
     // Flush field values on success

web/inc/main.php

@@ -1,5 +1,12 @@
 <?php
 
+// Check system settiongs
+if ((!isset($_SESSION['VERSION'])) && (!defined('NO_AUTH_REQUIRED'))) {
+    session_destroy();
+    header("Location: /login/");
+    exit;
+}
+
 // Check user session
 if ((!isset($_SESSION['user'])) && (!defined('NO_AUTH_REQUIRED'))) {
     $_SESSION['request_uri'] = $_SERVER['REQUEST_URI'];

web/list/db/index.php

@@ -11,11 +11,6 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
 // Panel
 top_panel($user,$TAB);
 
-// SYS
-exec (VESTA_CMD."v-list-sys-config json", $output, $return_var);
-$sys = json_decode(implode('', $output), true);
-unset($output);
-
 // Data
 exec (VESTA_CMD."v-list-databases $user json", $output, $return_var);
 $data = json_decode(implode('', $output), true);

web/list/mail/index.php

@@ -13,12 +13,6 @@ top_panel($user,$TAB);
 
 // Data
 if (empty($_GET['domain'])){
-
-    // SYS
-    exec (VESTA_CMD."v-list-sys-config json", $output, $return_var);
-    $sys = json_decode(implode('', $output), true);
-    unset($output);
-
     exec (VESTA_CMD."v-list-mail-domains $user json", $output, $return_var);
     $data = json_decode(implode('', $output), true);
     $data = array_reverse($data, true);

web/login/index.php

@@ -26,6 +26,18 @@ if (isset($_SESSION['user'])) {
     exit;
 }
 
+// Check system configuration
+exec (VESTA_CMD . "v-list-sys-config json", $output, $return_var);
+$data = json_decode(implode('', $output), true);
+$sys_arr = $data['config'];
+foreach ($sys_arr as $key => $value) {
+    $_SESSION[$key] = $value;
+}
+
+// Set default language
+if (empty($_SESSION['language'])) $_SESSION['language']=$_SESSION['LANGUAGE'];
+if (empty($_SESSION['language'])) $_SESSION['language']='en';
+
 // Auth
 if (isset($_POST['user']) && isset($_POST['password'])) {
     $v_user = escapeshellarg($_POST['user']);
@@ -33,17 +45,6 @@ if (isset($_POST['user']) && isset($_POST['password'])) {
     exec(VESTA_CMD ."v-check-user-password ".$v_user." ".$v_password." '".$_SERVER["REMOTE_ADDR"]."'",  $output, $return_var);
     if ( $return_var > 0 ) {
         $ERROR = "<a class=\"error\">".__('Invalid username or password')."</a>";
-
-        // Set system language
-        unset($output);
-        exec (VESTA_CMD . "v-list-sys-config json", $output, $return_var);
-        $data = json_decode(implode('', $output), true);
-        if (!empty( $data['config']['LANGUAGE'])) {
-            $_SESSION['language'] = $data['config']['LANGUAGE'];
-        } else {
-            $_SESSION['language'] = 'en';
-        }
-
         require_once($_SERVER['DOCUMENT_ROOT'].'/inc/i18n/'.$_SESSION['language'].'.php');
         require_once('../templates/header.html');
         require_once('../templates/login.html');
@@ -65,15 +66,6 @@ if (isset($_POST['user']) && isset($_POST['password'])) {
         }
     }
 } else {
-    // Set system language
-    exec (VESTA_CMD . "v-list-sys-config json", $output, $return_var);
-    $data = json_decode(implode('', $output), true);
-    if (!empty( $data['config']['LANGUAGE'])) {
-        $_SESSION['language'] = $data['config']['LANGUAGE'];
-    } else {
-        $_SESSION['language'] = 'en';
-    }
-
     require_once($_SERVER['DOCUMENT_ROOT'].'/inc/i18n/'.$_SESSION['language'].'.php');
     require_once('../templates/header.html');
     require_once('../templates/login.html');

web/reset/index.php

@@ -70,27 +70,19 @@ if ((!empty($_POST['user'])) && (!empty($_POST['code'])) && (!empty($_POST['pass
     }
 }
 
+// Set system language
+exec (VESTA_CMD . "v-list-sys-config json", $output, $return_var);
+$data = json_decode(implode('', $output), true);
+if (!empty( $data['config']['LANGUAGE'])) {
+    $_SESSION['language'] = $data['config']['LANGUAGE'];
+} else {
+    $_SESSION['language'] = 'en';
+}
 
 if (empty($_GET['action'])) {
-    // Set system language
-    exec (VESTA_CMD . "v-list-sys-config json", $output, $return_var);
-    $data = json_decode(implode('', $output), true);
-    if (!empty( $data['config']['LANGUAGE'])) {
-        $_SESSION['language'] = $data['config']['LANGUAGE'];
-    } else {
-        $_SESSION['language'] = 'en';
-    }
     require_once '../templates/header.html';
     require_once '../templates/reset_1.html';
 } else {
-    // Set system language
-    exec (VESTA_CMD . "v-list-sys-config json", $output, $return_var);
-    $data = json_decode(implode('', $output), true);
-    if (!empty( $data['config']['LANGUAGE'])) {
-        $_SESSION['language'] = $data['config']['LANGUAGE'];
-    } else {
-        $_SESSION['language'] = 'en';
-    }
     require_once '../templates/header.html';
     if ($_GET['action'] == 'code' ) {
         require_once '../templates/reset_2.html';

web/templates/admin/add_cron.html

@@ -24,7 +24,7 @@
         </div>
 
         <form id="vstobjects" name="v_add_cron" method="post">
-            <table class='data'>
+            <table class="data mode-add">
                 <tr class="data-add">
                     <td class="data-dotted">
                         <table class="data-col1">

web/templates/admin/add_db.html

@@ -44,7 +44,7 @@
                     document.v_add_db.v_password.value = randomstring;
                 }
             </script>
-            <table class='data'>
+            <table class="data mode-add">
                 <tr class="data-add">
                     <td class="data-dotted">
                         <table class="data-col1">
@@ -54,7 +54,7 @@
                     <td class="data-dotted">
                         <table class="data-col2" width="600px">
                             <tr>
-                                <td class="step-top" style="color:#777;" >
+                                <td class="step-top hint" style="color:#777;" >
                                     <?php print __('Prefix will be automaticaly added to database name and database user',$user."_");?>
                                 </td>
                             </tr>

web/templates/admin/add_dns.html

@@ -35,7 +35,7 @@
                 }
             </script>
 
-            <table class="data">
+            <table class="data mode-add">
                 <tr class="data-add">
                     <td class="data-dotted">
                         <table class="data-col1">

web/templates/admin/add_dns_rec.html

@@ -24,7 +24,7 @@
         </div>
 
         <form id="vstobjects" name="v_add_dns_rec" method="post">
-            <table class='data'>
+            <table class="data mode-add">
                 <tr class="data-add">
                     <td class="data-dotted">
                         <table class="data-col1">

web/templates/admin/add_firewall.html

@@ -35,7 +35,7 @@
                 }
             </script>
 
-            <table class='data'>
+            <table class="data mode-add">
                 <tr class="data-add">
                     <td class="data-dotted">
                         <table class="data-col1">

web/templates/admin/add_ip.html

@@ -35,7 +35,7 @@
                 }
             </script>
 
-            <table class='data'>
+            <table class="data mode-add">
                 <tr class="data-add">
                     <td class="data-dotted">
                         <table class="data-col1">

web/templates/admin/add_mail.html

@@ -24,7 +24,7 @@
         </div>
 
         <form id="vstobjects" name="v_add_mail" method="post">
-            <table class='data'>
+            <table class="data mode-add">
                 <tr class="data-add">
                     <td class="data-dotted">
                         <table class="data-col1">

web/templates/admin/add_mail_acc.html

@@ -45,7 +45,7 @@
                   }
             </script>
 
-            <table class='data'>
+            <table class="data mode-add">
             <tr class="data-add">
                 <td class="data-dotted">
                     <table class="data-col1">

web/templates/admin/add_package.html

@@ -25,7 +25,7 @@
         </div>
 
         <form id="vstobjects" name="v_add_package" method="post">
-            <table class='data'>
+            <table class="data mode-add">
                 <tr class="data-add">
                     <td class="data-dotted">
                         <table class="data-col1">

web/templates/admin/add_user.html

@@ -43,7 +43,7 @@
                 }
             </script>
 
-            <table class="data">
+            <table class="data mode-add">
                 <tr class="data-add">
                     <td class="data-dotted">
                         <table class="data-col1">

web/templates/admin/add_web.html

@@ -63,7 +63,7 @@
                 }
             </script>
 
-            <table class='data'>
+            <table class="data mode-add">
                 <tr class="data-add">
                 <td class="data-dotted">
                     <table class="data-col1">
@@ -284,7 +284,7 @@
                                     <table <?php echo (!empty($v_ftp)) ? "style='display: block'" : "style='display:none;'"  ?> class="ftptable ftptable-nrm" name="v_add_domain_ftp">
                                         <tr>
                                             <td class="vst-text input-label">
-                                                <?php print __('FTP') ?> #<span class="ftp-user-number"><?php print $i + 1; ?></span> <a class="ftp-remove-user additional-control" onCLick="App.Actions.WEB.remove_ftp_user(this)">(<?php print __('remove') ?>)</a>
+                                                <?php print __('FTP') ?> #<span class="ftp-user-number"><?php print $i + 1; ?></span> <a class="ftp-remove-user additional-control do_delete" onCLick="App.Actions.WEB.remove_ftp_user(this)">(<?php print __('remove') ?>)</a>
                                                 <input type="hidden" class="v-ftp-user-deleted" name="v_ftp_user[<?php print $i ?>][delete]" value="0" />
                                                 <input type="hidden" class="v-ftp-user-is-new" name="v_ftp_user[<?php print $i ?>][is_new]" value="<?php print $ftp_user['is_new'] ?>" />
                                             </td>
@@ -365,7 +365,7 @@
             <table class="ftptable ftptable-nrm" name="v_add_domain_ftp">
                 <tr>
                     <td class="vst-text input-label">
-                        <?php print __('FTP') ?> #<span class="ftp-user-number"></span> <a class="ftp-remove-user additional-control" onCLick="App.Actions.WEB.remove_ftp_user(this)">(<?php print __('remove') ?>)</a>
+                        <?php print __('FTP') ?> #<span class="ftp-user-number"></span> <a class="ftp-remove-user additional-control do_delete" onCLick="App.Actions.WEB.remove_ftp_user(this)">(<?php print __('remove') ?>)</a>
                         <input type="hidden"  class="v-ftp-user-deleted" name="v_ftp_user[%INDEX%][delete]" value="0" />
                         <input type="hidden" class="v-ftp-user-is-new" name="v_ftp_user[%INDEX%][is_new]" value="1" />
                     </td>

web/templates/admin/edit_web.html

@@ -316,7 +316,7 @@
                                     <table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" class="ftptable ftptable-nrm" name="v_add_domain_ftp">
                                         <tr>
                                             <td class="vst-text input-label">
-                                                <?php print __('FTP') ?> #<span class="ftp-user-number"><?php print $i + 1; ?></span> <a class="ftp-remove-user additional-control" onCLick="App.Actions.WEB.remove_ftp_user(this)">(<?php print __('remove') ?>)</a>
+                                                <?php print __('FTP') ?> #<span class="ftp-user-number"><?php print $i + 1; ?></span> <a class="ftp-remove-user additional-control do_delete" onCLick="App.Actions.WEB.remove_ftp_user(this)">(<?php print __('remove') ?>)</a>
                                                 <input type="hidden" class="v-ftp-user-deleted" name="v_ftp_user[<?php print $i ?>][delete]" value="0" />
                                                 <input type="hidden" class="v-ftp-user-is-new" name="v_ftp_user[<?php print $i ?>][is_new]" value="<?php print $ftp_user['is_new'] ?>" />
                                             </td>
@@ -398,7 +398,7 @@
             <table class="ftptable ftptable-nrm" name="v_add_domain_ftp">
                 <tr> 
                     <td class="vst-text input-label">
-                        <?php print __('FTP') ?> #<span class="ftp-user-number"></span> <a class="ftp-remove-user additional-control" onCLick="App.Actions.WEB.remove_ftp_user(this)">(<?php print __('remove') ?>)</a>
+                        <?php print __('FTP') ?> #<span class="ftp-user-number"></span> <a class="ftp-remove-user additional-control do_delete" onCLick="App.Actions.WEB.remove_ftp_user(this)">(<?php print __('remove') ?>)</a>
                         <input type="hidden"  class="v-ftp-user-deleted" name="v_ftp_user[%INDEX%][delete]" value="0" />
                         <input type="hidden" class="v-ftp-user-is-new" name="v_ftp_user[%INDEX%][is_new]" value="1" />
                     </td>

web/templates/admin/list_db.html

@@ -45,10 +45,10 @@
                         if ($data[$key]['HOST'] != 'localhost' ) $http_host = $data[$key]['HOST'];
                         if ($data[$key]['TYPE'] == 'mysql') $db_admin = "phpMyAdmin";
                         if ($data[$key]['TYPE'] == 'mysql') $db_admin_link = "http://".$http_host."/phpmyadmin/";
-                        if (($data[$key]['TYPE'] == 'mysql') && (!empty($sys['config']['DB_PMA_URL']))) $db_admin_link = $sys['config']['DB_PMA_URL'];
+                        if (($data[$key]['TYPE'] == 'mysql') && (!empty($_SESSION['DB_PMA_URL']))) $db_admin_link = $_SESSION['DB_PMA_URL'];
                         if ($data[$key]['TYPE'] == 'pgsql') $db_admin = "phpPgAdmin";
                         if ($data[$key]['TYPE'] == 'pgsql') $db_admin_link = "http://".$http_host."/phppgadmin/";
-                        if (($data[$key]['TYPE'] == 'pgsql') && (!empty($sys['config']['DB_PGA_URL']))) $db_admin_link = $sys['config']['DB_PGA_URL'];
+                        if (($data[$key]['TYPE'] == 'pgsql') && (!empty($_SESSION['DB_PGA_URL']))) $db_admin_link = $_SESSION['DB_PGA_URL'];
                 ?> 
                 <tr class="data-row <? if($status == 'suspended') echo 'suspended';?>">
                     <td class="data-dotted">

web/templates/admin/list_mail.html

@@ -32,7 +32,7 @@
                 <?php
                     list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
                     $webmail = "http://".$http_host."/webmail/";
-                    if (!empty($sys['config']['MAIL_URL'])) $webmail = $sys['config']['MAIL_URL'];
+                    if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
 
                     foreach ($data as $key => $value) {
                         ++$i;

web/templates/admin/panel.html

@@ -8,7 +8,9 @@
                     <a class="top-<?php if($TAB == 'STATS' ) echo 'selected-' ?>link" href="/list/stats/"> <?php print __('Statistics') ?> </a>
                     <a class="top-<?php if($TAB == 'LOG' ) echo 'selected-' ?>link" href="/list/log/"> <?php print __('Log') ?> </a>
                     <a class="top-<?php if($TAB == 'SERVICES' ) echo 'selected-' ?>link" href="/list/services/"> <?php print __('Services') ?>  </a>
+                    <?php if(!empty($_SESSION['FIREWALL_SYSTEM'])) { ?> 
                     <a class="top-<?php if($TAB == 'FIREWALL' ) echo 'selected-' ?>link" href="/list/firewall/"> <?php print __('Firewall') ?> </a>
+                    <?php } ?> 
                     <a class="top-<?php if($TAB == 'UPDATES' ) echo 'selected-' ?>link" href="/list/updates/"> <?php print __('Updates') ?> </a>
                 </span>
                 <span style="float:right;">

web/templates/user/list_db.html

@@ -43,10 +43,10 @@
                         if ($data[$key]['HOST'] != 'localhost' ) $http_host = $data[$key]['HOST'];
                         if ($data[$key]['TYPE'] == 'mysql') $db_admin = "phpMyAdmin";
                         if ($data[$key]['TYPE'] == 'mysql') $db_admin_link = "http://".$http_host."/phpmyadmin/";
-                        if (($data[$key]['TYPE'] == 'mysql') && (!empty($sys['config']['DB_PMA_URL']))) $db_admin_link = $sys['config']['DB_PMA_URL'];
+                        if (($data[$key]['TYPE'] == 'mysql') && (!empty($_SESSION['DB_PMA_URL']))) $db_admin_link = $_SESSION['DB_PMA_URL'];
                         if ($data[$key]['TYPE'] == 'pgsql') $db_admin = "phpPgAdmin";
                         if ($data[$key]['TYPE'] == 'pgsql') $db_admin_link = "http://".$http_host."/phppgadmin/";
-                        if (($data[$key]['TYPE'] == 'pgsql') && (!empty($sys['config']['DB_PGA_URL']))) $db_admin_link = $sys['config']['DB_PGA_URL'];
+                        if (($data[$key]['TYPE'] == 'pgsql') && (!empty($_SESSION['DB_PGA_URL']))) $db_admin_link = $_SESSION['DB_PGA_URL'];
                 ?> 
                 <tr class="data-row <? if($status == 'suspended') echo 'suspended';?>">
                     <td class="data-dotted">

web/templates/user/list_mail.html

@@ -30,7 +30,7 @@
                 <?php
                     list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
                     $webmail = "http://".$http_host."/webmail/";
-                    if (!empty($sys['config']['MAIL_URL'])) $webmail = $sys['config']['MAIL_URL'];
+                    if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
 
                     foreach ($data as $key => $value) {
                         ++$i;