Change VESTA_CMD to HESTIA_CMD.

web/add/cron/autoupdate/index.php

@@ -6,7 +6,7 @@ session_start();
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
 if ($_SESSION['user'] == 'admin') {
-    exec (VESTA_CMD."v-add-cron-hestia-autoupdate", $output, $return_var);
+    exec (HESTIA_CMD."v-add-cron-hestia-autoupdate", $output, $return_var);
     $_SESSION['error_msg'] = __('Autoupdate has been successfully enabled');
     unset($output);
 }

web/add/cron/index.php

@@ -43,7 +43,7 @@ if (!empty($_POST['ok'])) {
 
     // Add cron job
     if (empty($_SESSION['error_msg'])) {
-        exec (VESTA_CMD."v-add-cron-job ".$user." ".$v_min." ".$v_hour." ".$v_day." ".$v_month." ".$v_wday." ".$v_cmd, $output, $return_var);
+        exec (HESTIA_CMD."v-add-cron-job ".$user." ".$v_min." ".$v_hour." ".$v_day." ".$v_month." ".$v_wday." ".$v_cmd, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
     }

web/add/cron/reports/index.php

@@ -5,7 +5,7 @@ ob_start();
 session_start();
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-exec (VESTA_CMD."v-add-cron-reports ".$user, $output, $return_var);
+exec (HESTIA_CMD."v-add-cron-reports ".$user, $output, $return_var);
 $_SESSION['error_msg'] = __('Cronjob email reporting has been successfully enabled');
 unset($output);
 

web/add/db/index.php

@@ -63,7 +63,7 @@ if (!empty($_POST['ok'])) {
         $fp = fopen($v_password, "w");
         fwrite($fp, $_POST['v_password']."\n");
         fclose($fp);
-        exec (VESTA_CMD."v-add-database ".$user." ".$v_database." ".$v_dbuser." ".$v_password." ".$v_type." ".$v_host." ".$v_charset, $output, $return_var);
+        exec (HESTIA_CMD."v-add-database ".$user." ".$v_database." ".$v_dbuser." ".$v_password." ".$v_type." ".$v_host." ".$v_charset, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($v_password);
@@ -114,7 +114,7 @@ $v_db_email = $panel[$user]['CONTACT'];
 $db_types = explode(',', $_SESSION['DB_SYSTEM']);
 
 // List available database servers
-exec (VESTA_CMD."v-list-database-hosts json", $output, $return_var);
+exec (HESTIA_CMD."v-list-database-hosts json", $output, $return_var);
 $db_hosts_tmp1 = json_decode(implode('', $output), true);
 $db_hosts_tmp2 = array_map(function($host){return $host['HOST'];}, $db_hosts_tmp1);
 $db_hosts = array_values(array_unique($db_hosts_tmp2));

web/add/dns/index.php

@@ -45,7 +45,7 @@ if (!empty($_POST['ok'])) {
 
     // Add dns domain
     if (empty($_SESSION['error_msg'])) {
-        exec (VESTA_CMD."v-add-dns-domain ".$user." ".$v_domain." ".$v_ip." ".$v_ns1." ".$v_ns2." ".$v_ns3." ".$v_ns4." ".$v_ns5."  ".$v_ns6."  ".$v_ns7." ".$v_ns8." no", $output, $return_var);
+        exec (HESTIA_CMD."v-add-dns-domain ".$user." ".$v_domain." ".$v_ip." ".$v_ns1." ".$v_ns2." ".$v_ns3." ".$v_ns4." ".$v_ns5."  ".$v_ns6."  ".$v_ns7." ".$v_ns8." no", $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
     }
@@ -55,7 +55,7 @@ if (!empty($_POST['ok'])) {
     if (empty($_SESSION['error_msg'])) {
         if ((!empty($_POST['v_exp'])) && ($_POST['v_exp'] != date('Y-m-d', strtotime('+1 year')))) {
             $v_exp = escapeshellarg($_POST['v_exp']);
-            exec (VESTA_CMD."v-change-dns-domain-exp ".$user." ".$v_domain." ".$v_exp." no", $output, $return_var);
+            exec (HESTIA_CMD."v-change-dns-domain-exp ".$user." ".$v_domain." ".$v_exp." no", $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
         }
@@ -65,7 +65,7 @@ if (!empty($_POST['ok'])) {
     if (empty($_SESSION['error_msg'])) {
         if ((!empty($_POST['v_ttl'])) && ($_POST['v_ttl'] != '14400') && (empty($_SESSION['error_msg']))) {
             $v_ttl = escapeshellarg($_POST['v_ttl']);
-            exec (VESTA_CMD."v-change-dns-domain-ttl ".$user." ".$v_domain." ".$v_ttl." no", $output, $return_var);
+            exec (HESTIA_CMD."v-change-dns-domain-ttl ".$user." ".$v_domain." ".$v_ttl." no", $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
         }
@@ -73,7 +73,7 @@ if (!empty($_POST['ok'])) {
 
     // Restart dns server
     if (empty($_SESSION['error_msg'])) {
-        exec (VESTA_CMD."v-restart-dns", $output, $return_var);
+        exec (HESTIA_CMD."v-restart-dns", $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
     }
@@ -120,7 +120,7 @@ if (!empty($_POST['ok_rec'])) {
 
     // Add dns record
     if (empty($_SESSION['error_msg'])) {
-        exec (VESTA_CMD."v-add-dns-record ".$user." ".$v_domain." ".$v_rec." ".$v_type." ".$v_val." ".$v_priority, $output, $return_var);
+        exec (HESTIA_CMD."v-add-dns-record ".$user." ".$v_domain." ".$v_rec." ".$v_type." ".$v_val." ".$v_priority, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         $v_type = $_POST['v_type'];
@@ -153,7 +153,7 @@ if (empty($_GET['domain'])) {
     if (empty($v_ttl)) $v_ttl = 14400;
     if (empty($v_exp)) $v_exp = date('Y-m-d', strtotime('+1 year'));
     if (empty($v_ns1)) {
-        exec (VESTA_CMD."v-list-user-ns ".$user." json", $output, $return_var);
+        exec (HESTIA_CMD."v-list-user-ns ".$user." json", $output, $return_var);
         $nameservers = json_decode(implode('', $output), true);
         $v_ns1 = str_replace("'", "", $nameservers[0]);
         $v_ns2 = str_replace("'", "", $nameservers[1]);

web/add/favorite/index.php

@@ -18,6 +18,6 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
     $_SESSION['favourites'][strtoupper($_REQUEST['v_section'])][$_REQUEST['v_unit_id']] = 1;
 
-    exec (VESTA_CMD."v-add-user-favourites ".$_SESSION['user']." ".$v_section." ".$v_unit_id, $output, $return_var);
+    exec (HESTIA_CMD."v-add-user-favourites ".$_SESSION['user']." ".$v_section." ".$v_unit_id, $output, $return_var);
 //    check_return_code($return_var,$output);
 ?>

web/add/firewall/banlist/index.php

@@ -35,7 +35,7 @@ if (!empty($_POST['ok'])) {
 
     // Add firewall ban
     if (empty($_SESSION['error_msg'])) {
-        exec (VESTA_CMD."v-add-firewall-ban ".$v_ip." ".$v_chain, $output, $return_var);
+        exec (HESTIA_CMD."v-add-firewall-ban ".$v_ip." ".$v_chain, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
     }

web/add/firewall/index.php

@@ -49,7 +49,7 @@ if (!empty($_POST['ok'])) {
 
     // Add firewall rule
     if (empty($_SESSION['error_msg'])) {
-        exec (VESTA_CMD."v-add-firewall-rule ".$v_action." ".$v_ip." ".$v_port." ".$v_protocol." ".$v_comment, $output, $return_var);
+        exec (HESTIA_CMD."v-add-firewall-rule ".$v_action." ".$v_ip." ".$v_port." ".$v_protocol." ".$v_comment, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
     }

web/add/ip/index.php

@@ -57,7 +57,7 @@ if (!empty($_POST['ok'])) {
 
     // Add IP
     if (empty($_SESSION['error_msg'])) {
-        exec (VESTA_CMD."v-add-sys-ip ".$v_ip." ".$v_netmask." ".$v_interface."  ".$v_owner." '".$ip_status."' ".$v_name." ".$v_nat, $output, $return_var);
+        exec (HESTIA_CMD."v-add-sys-ip ".$v_ip." ".$v_netmask." ".$v_interface."  ".$v_owner." '".$ip_status."' ".$v_name." ".$v_nat, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         $v_owner = $_POST['v_owner'];
@@ -75,12 +75,12 @@ if (!empty($_POST['ok'])) {
 }
 
 // List network interfaces
-exec (VESTA_CMD."v-list-sys-interfaces 'json'", $output, $return_var);
+exec (HESTIA_CMD."v-list-sys-interfaces 'json'", $output, $return_var);
 $interfaces = json_decode(implode('', $output), true);
 unset($output);
 
 // List users
-exec (VESTA_CMD."v-list-sys-users 'json'", $output, $return_var);
+exec (HESTIA_CMD."v-list-sys-users 'json'", $output, $return_var);
 $users = json_decode(implode('', $output), true);
 unset($output);
 

web/add/mail/index.php

@@ -57,7 +57,7 @@ if (!empty($_POST['ok'])) {
 
     // Add mail domain
     if (empty($_SESSION['error_msg'])) {
-        exec (VESTA_CMD."v-add-mail-domain ".$user." ".$v_domain." ".$v_antispam." ".$v_antivirus." ".$v_dkim, $output, $return_var);
+        exec (HESTIA_CMD."v-add-mail-domain ".$user." ".$v_domain." ".$v_antispam." ".$v_antivirus." ".$v_dkim, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
     }
@@ -119,7 +119,7 @@ if (!empty($_POST['ok_acc'])) {
         $fp = fopen($v_password, "w");
         fwrite($fp, $_POST['v_password']."\n");
         fclose($fp);
-        exec (VESTA_CMD."v-add-mail-account ".$user." ".$v_domain." ".$v_account." ".$v_password." ".$v_quota, $output, $return_var);
+        exec (HESTIA_CMD."v-add-mail-account ".$user." ".$v_domain." ".$v_account." ".$v_password." ".$v_quota, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($v_password);
@@ -136,7 +136,7 @@ if (!empty($_POST['ok_acc'])) {
         foreach ($aliases as $alias) {
             $alias = escapeshellarg($alias);
             if (empty($_SESSION['error_msg'])) {
-                exec (VESTA_CMD."v-add-mail-account-alias ".$user." ".$v_domain." ".$v_account." ".$alias, $output, $return_var);
+                exec (HESTIA_CMD."v-add-mail-account-alias ".$user." ".$v_domain." ".$v_account." ".$alias, $output, $return_var);
                 check_return_code($return_var,$output);
                 unset($output);
             }
@@ -153,7 +153,7 @@ if (!empty($_POST['ok_acc'])) {
         foreach ($fwd as $forward) {
             $forward = escapeshellarg($forward);
             if (empty($_SESSION['error_msg'])) {
-                exec (VESTA_CMD."v-add-mail-account-forward ".$user." ".$v_domain." ".$v_account." ".$forward, $output, $return_var);
+                exec (HESTIA_CMD."v-add-mail-account-forward ".$user." ".$v_domain." ".$v_account." ".$forward, $output, $return_var);
                 check_return_code($return_var,$output);
                 unset($output);
             }
@@ -162,7 +162,7 @@ if (!empty($_POST['ok_acc'])) {
 
     // Add fwd_only flag
     if ((!empty($_POST['v_fwd_only'])) && (empty($_SESSION['error_msg']))) {
-        exec (VESTA_CMD."v-add-mail-account-fwd-only ".$user." ".$v_domain." ".$v_account, $output, $return_var);
+        exec (HESTIA_CMD."v-add-mail-account-fwd-only ".$user." ".$v_domain." ".$v_account, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
     }

web/add/package/index.php

@@ -134,7 +134,7 @@ if (!empty($_POST['ok'])) {
 
     // Add new package
     if (empty($_SESSION['error_msg'])) {
-        exec (VESTA_CMD."v-add-user-package ".$tmpdir." ".$v_package, $output, $return_var);
+        exec (HESTIA_CMD."v-add-user-package ".$tmpdir." ".$v_package, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
     }
@@ -153,31 +153,31 @@ if (!empty($_POST['ok'])) {
 
 
 // List web temmplates
-exec (VESTA_CMD."v-list-web-templates json", $output, $return_var);
+exec (HESTIA_CMD."v-list-web-templates json", $output, $return_var);
 $web_templates = json_decode(implode('', $output), true);
 unset($output);
 
 // List web templates for backend
 if (!empty($_SESSION['WEB_BACKEND'])) {
-    exec (VESTA_CMD."v-list-web-templates-backend json", $output, $return_var);
+    exec (HESTIA_CMD."v-list-web-templates-backend json", $output, $return_var);
     $backend_templates = json_decode(implode('', $output), true);
     unset($output);
 }
 
 // List web templates for proxy
 if (!empty($_SESSION['PROXY_SYSTEM'])) {
-    exec (VESTA_CMD."v-list-web-templates-proxy json", $output, $return_var);
+    exec (HESTIA_CMD."v-list-web-templates-proxy json", $output, $return_var);
     $proxy_templates = json_decode(implode('', $output), true);
     unset($output);
 }
 
 // List DNS templates
-exec (VESTA_CMD."v-list-dns-templates json", $output, $return_var);
+exec (HESTIA_CMD."v-list-dns-templates json", $output, $return_var);
 $dns_templates = json_decode(implode('', $output), true);
 unset($output);
 
 // List system shells
-exec (VESTA_CMD."v-list-sys-shells json", $output, $return_var);
+exec (HESTIA_CMD."v-list-sys-shells json", $output, $return_var);
 $shells = json_decode(implode('', $output), true);
 unset($output);
 

web/add/user/index.php

@@ -66,7 +66,7 @@ if (!empty($_POST['ok'])) {
         $fp = fopen($v_password, "w");
         fwrite($fp, $_POST['v_password']."\n");
         fclose($fp);
-        exec (VESTA_CMD."v-add-user ".$v_username." ".$v_password." ".$v_email." ".$v_package." ".$v_fname." ".$v_lname, $output, $return_var);
+        exec (HESTIA_CMD."v-add-user ".$v_username." ".$v_password." ".$v_email." ".$v_package." ".$v_fname." ".$v_lname, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($v_password);
@@ -75,7 +75,7 @@ if (!empty($_POST['ok'])) {
 
     // Set language
     if (empty($_SESSION['error_msg'])) {
-        exec (VESTA_CMD."v-change-user-language ".$v_username." ".$v_language, $output, $return_var);
+        exec (HESTIA_CMD."v-change-user-language ".$v_username." ".$v_language, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
     }
@@ -111,13 +111,13 @@ if (!empty($_POST['ok'])) {
 
 
 // List hosting packages
-exec (VESTA_CMD."v-list-user-packages json", $output, $return_var);
+exec (HESTIA_CMD."v-list-user-packages json", $output, $return_var);
 check_error($return_var);
 $data = json_decode(implode('', $output), true);
 unset($output);
 
 // List languages
-exec (VESTA_CMD."v-list-sys-languages json", $output, $return_var);
+exec (HESTIA_CMD."v-list-sys-languages json", $output, $return_var);
 $languages = json_decode(implode('', $output), true);
 unset($output);
 

web/add/web/index.php

@@ -51,7 +51,7 @@ if (!empty($_POST['ok'])) {
     // Gets public IP from 'v-list-user-ips' command (that reads /vesta/data/ips/ip), precisely from 'NAT' field
     $v_public_ip = $v_ip;
     $v_clean_ip = $_POST['v_ip'];  // clean_ip = IP without quotas
-    exec (VESTA_CMD."v-list-user-ips ".$user." json", $output, $return_var);
+    exec (HESTIA_CMD."v-list-user-ips ".$user." json", $output, $return_var);
     $ips = json_decode(implode('', $output), true);
     unset($output);
     if (isset($ips[$v_clean_ip]) && isset($ips[$v_clean_ip]['NAT']) && trim($ips[$v_clean_ip]['NAT'])!='') {
@@ -118,7 +118,7 @@ if (!empty($_POST['ok'])) {
 
     // Add web domain
     if (empty($_SESSION['error_msg'])) {
-        exec (VESTA_CMD."v-add-web-domain ".$user." ".$v_domain." ".$v_ip." 'no' ".$aliases." ".$proxy_ext, $output, $return_var);
+        exec (HESTIA_CMD."v-add-web-domain ".$user." ".$v_domain." ".$v_ip." 'no' ".$aliases." ".$proxy_ext, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         $domain_added = empty($_SESSION['error_msg']);
@@ -126,7 +126,7 @@ if (!empty($_POST['ok'])) {
 
     // Add DNS domain
     if (($_POST['v_dns'] == 'on') && (empty($_SESSION['error_msg']))) {
-        exec (VESTA_CMD."v-add-dns-domain ".$user." ".$v_domain." ".$v_public_ip." '' '' '' '' '' '' '' '' 'no'", $output, $return_var);
+        exec (HESTIA_CMD."v-add-dns-domain ".$user." ".$v_domain." ".$v_public_ip." '' '' '' '' '' '' '' '' 'no'", $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
     }
@@ -136,7 +136,7 @@ if (!empty($_POST['ok'])) {
         foreach ($aliases_arr as $alias) {
             if ($alias != "www.".$_POST['v_domain']) {
                 $alias = escapeshellarg($alias);
-                exec (VESTA_CMD."v-add-dns-on-web-alias ".$user." ".$alias." ".$v_ip." 'no'", $output, $return_var);
+                exec (HESTIA_CMD."v-add-dns-on-web-alias ".$user." ".$alias." ".$v_ip." 'no'", $output, $return_var);
                 check_return_code($return_var,$output);
                 unset($output);
             }
@@ -145,7 +145,7 @@ if (!empty($_POST['ok'])) {
 
     // Add mail domain
     if (($_POST['v_mail'] == 'on') && (empty($_SESSION['error_msg']))) {
-        exec (VESTA_CMD."v-add-mail-domain ".$user." ".$v_domain, $output, $return_var);
+        exec (HESTIA_CMD."v-add-mail-domain ".$user." ".$v_domain, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
     }
@@ -153,14 +153,14 @@ if (!empty($_POST['ok'])) {
     // Delete proxy support
     if ((!empty($_SESSION['PROXY_SYSTEM'])) && ($_POST['v_proxy'] == 'off')  && (empty($_SESSION['error_msg']))) {
         $ext = escapeshellarg($ext);
-        exec (VESTA_CMD."v-delete-web-domain-proxy ".$user." ".$v_domain." 'no'", $output, $return_var);
+        exec (HESTIA_CMD."v-delete-web-domain-proxy ".$user." ".$v_domain." 'no'", $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
     }
 
     // Add Lets Encrypt support
      if ((!empty($_POST['v_letsencrypt'])) && (empty($_SESSION['error_msg']))) {
-        exec (VESTA_CMD."v-schedule-letsencrypt-domain ".$user." ".$v_domain, $output, $return_var);
+        exec (HESTIA_CMD."v-schedule-letsencrypt-domain ".$user." ".$v_domain, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
      } else {
@@ -195,7 +195,7 @@ if (!empty($_POST['ok'])) {
              }
 
              $v_ssl_home = escapeshellarg($_POST['v_ssl_home']);
-             exec (VESTA_CMD."v-add-web-domain-ssl ".$user." ".$v_domain." ".$tmpdir." ".$v_ssl_home." 'no'", $output, $return_var);
+             exec (HESTIA_CMD."v-add-web-domain-ssl ".$user." ".$v_domain." ".$tmpdir." ".$v_ssl_home." 'no'", $output, $return_var);
              check_return_code($return_var,$output);
              unset($output);
          }
@@ -204,7 +204,7 @@ if (!empty($_POST['ok'])) {
     // Add web stats
     if ((!empty($_POST['v_stats'])) && ($_POST['v_stats'] != 'none' ) && (empty($_SESSION['error_msg']))) {
         $v_stats = escapeshellarg($_POST['v_stats']);
-        exec (VESTA_CMD."v-add-web-domain-stats ".$user." ".$v_domain." ".$v_stats, $output, $return_var);
+        exec (HESTIA_CMD."v-add-web-domain-stats ".$user." ".$v_domain." ".$v_stats, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
     }
@@ -216,7 +216,7 @@ if (!empty($_POST['ok'])) {
         $fp = fopen($v_stats_password, "w");
         fwrite($fp, $_POST['v_stats_password']."\n");
         fclose($fp);
-        exec (VESTA_CMD."v-add-web-domain-stats-user ".$user." ".$v_domain." ".$v_stats_user." ".$v_stats_password, $output, $return_var);
+        exec (HESTIA_CMD."v-add-web-domain-stats-user ".$user." ".$v_domain." ".$v_stats_user." ".$v_stats_password, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($v_stats_password);
@@ -225,21 +225,21 @@ if (!empty($_POST['ok'])) {
 
     // Restart DNS server
     if (($_POST['v_dns'] == 'on') && (empty($_SESSION['error_msg']))) {
-        exec (VESTA_CMD."v-restart-dns", $output, $return_var);
+        exec (HESTIA_CMD."v-restart-dns", $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
     }
 
     // Restart web server
     if (empty($_SESSION['error_msg'])) {
-        exec (VESTA_CMD."v-restart-web", $output, $return_var);
+        exec (HESTIA_CMD."v-restart-web", $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
     }
 
     // Restart proxy server
     if ((!empty($_SESSION['PROXY_SYSTEM'])) && ($_POST['v_proxy'] == 'on') && (empty($_SESSION['error_msg']))) {
-        exec (VESTA_CMD."v-restart-proxy", $output, $return_var);
+        exec (HESTIA_CMD."v-restart-proxy", $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
     }
@@ -286,7 +286,7 @@ if (!empty($_POST['ok'])) {
                     $fp = fopen($v_ftp_password, "w");
                     fwrite($fp, $v_ftp_user_data['v_ftp_password']."\n");
                     fclose($fp);
-                    exec (VESTA_CMD."v-add-web-domain-ftp ".$user." ".$v_domain." ".$v_ftp_user." ".$v_ftp_password . " " . $v_ftp_path, $output, $return_var);
+                    exec (HESTIA_CMD."v-add-web-domain-ftp ".$user." ".$v_domain." ".$v_ftp_user." ".$v_ftp_password . " " . $v_ftp_path, $output, $return_var);
                     check_return_code($return_var,$output);
                     unset($output);
                     unlink($v_ftp_password);
@@ -351,12 +351,12 @@ $v_ftp_user_prepath = $panel[$user]['HOME'] . "/web";
 $v_ftp_email = $panel[$user]['CONTACT'];
 
 // List IP addresses
-exec (VESTA_CMD."v-list-user-ips ".$user." json", $output, $return_var);
+exec (HESTIA_CMD."v-list-user-ips ".$user." json", $output, $return_var);
 $ips = json_decode(implode('', $output), true);
 unset($output);
 
 // List web stat engines
-exec (VESTA_CMD."v-list-web-stats json", $output, $return_var);
+exec (HESTIA_CMD."v-list-web-stats json", $output, $return_var);
 $stats = json_decode(implode('', $output), true);
 unset($output);
 

web/api/index.php

@@ -1,5 +1,5 @@
 <?php
-define('VESTA_CMD', '/usr/bin/sudo /usr/local/hestia/bin/');
+define('HESTIA_CMD', '/usr/bin/sudo /usr/local/hestia/bin/');
 define('HESTIA_CMD', '/usr/bin/sudo /usr/local/hestia/bin/');
 exit;
 if (isset($_POST['user']) || isset($_POST['hash'])) {
@@ -14,7 +14,7 @@ if (isset($_POST['user']) || isset($_POST['hash'])) {
         $password = $_POST['password'];
         $v_ip = escapeshellarg($_SERVER['REMOTE_ADDR']);
         $output = '';
-        exec (VESTA_CMD."v-get-user-salt admin ".$v_ip." json" , $output, $return_var);
+        exec (HESTIA_CMD."v-get-user-salt admin ".$v_ip." json" , $output, $return_var);
         $pam = json_decode(implode('', $output), true);
         $salt = $pam['admin']['SALT'];
         $method = $pam['admin']['METHOD'];
@@ -37,7 +37,7 @@ if (isset($_POST['user']) || isset($_POST['hash'])) {
         fclose($fp);
 
         // Check user hash
-        exec(VESTA_CMD ."v-check-user-hash admin ".$v_hash." ".$v_ip,  $output, $return_var);
+        exec(HESTIA_CMD ."v-check-user-hash admin ".$v_hash." ".$v_ip,  $output, $return_var);
         unset($output);
 
         // Remove tmp file
@@ -51,7 +51,7 @@ if (isset($_POST['user']) || isset($_POST['hash'])) {
     } else {
         $key = '/usr/local/hestia/data/keys/' . basename($_POST['hash']);
         if (file_exists($key) && is_file($key)) {
-            exec(VESTA_CMD ."v-check-api-key ".escapeshellarg($key)." ".$v_ip,  $output, $return_var);
+            exec(HESTIA_CMD ."v-check-api-key ".escapeshellarg($key)." ".$v_ip,  $output, $return_var);
             unset($output);
 
             // Check API answer
@@ -82,7 +82,7 @@ if (isset($_POST['user']) || isset($_POST['hash'])) {
     if (isset($_POST['arg9'])) $arg9 = escapeshellarg($_POST['arg9']);
 
     // Build query
-    $cmdquery = VESTA_CMD.$cmd." ";
+    $cmdquery = HESTIA_CMD.$cmd." ";
     if(!empty($arg1)){
          $cmdquery = $cmdquery.$arg1." "; }
     if(!empty($arg2)){

web/bulk/backup/exclusions/index.php

@@ -17,7 +17,7 @@ switch ($action) {
 
 foreach ($backup as $value) {
     $value = escapeshellarg($value);
-    exec (VESTA_CMD.$cmd." ".$user." ".$value, $output, $return_var);
+    exec (HESTIA_CMD.$cmd." ".$user." ".$value, $output, $return_var);
 }
 
 header("Location: /list/backup/exclusions");

web/bulk/backup/index.php

@@ -23,7 +23,7 @@ switch ($action) {
 
 foreach ($backup as $value) {
     $value = escapeshellarg($value);
-    exec (VESTA_CMD.$cmd." ".$user." ".$value, $output, $return_var);
+    exec (HESTIA_CMD.$cmd." ".$user." ".$value, $output, $return_var);
 }
 
 header("Location: /list/backup/");

web/bulk/cron/index.php

@@ -24,14 +24,14 @@ if ($_SESSION['user'] == 'admin') {
         case 'unsuspend': $cmd='v-unsuspend-cron-job';
             break;
         case 'delete-cron-reports': $cmd='v-delete-cron-reports';
-            exec (VESTA_CMD.$cmd." ".$user, $output, $return_var);
+            exec (HESTIA_CMD.$cmd." ".$user, $output, $return_var);
             $_SESSION['error_msg'] = __('Cronjob email reporting has been successfully diabled');
             unset($output);
             header("Location: /list/cron/");
             exit;
             break;
         case 'add-cron-reports': $cmd='v-add-cron-reports';
-            exec (VESTA_CMD.$cmd." ".$user, $output, $return_var);
+            exec (HESTIA_CMD.$cmd." ".$user, $output, $return_var);
             $_SESSION['error_msg'] = __('Cronjob email reporting has been successfully enabled');
             unset($output);
             header("Location: /list/cron/");
@@ -44,14 +44,14 @@ if ($_SESSION['user'] == 'admin') {
         case 'delete': $cmd='v-delete-cron-job';
             break;
         case 'delete-cron-reports': $cmd='v-delete-cron-reports';
-            exec (VESTA_CMD.$cmd." ".$user, $output, $return_var);
+            exec (HESTIA_CMD.$cmd." ".$user, $output, $return_var);
             $_SESSION['error_msg'] = __('Cronjob email reporting has been successfully diabled');
             unset($output);
             header("Location: /list/cron/");
             exit;
             break;
         case 'add-cron-reports': $cmd='v-add-cron-reports';
-            exec (VESTA_CMD.$cmd." ".$user, $output, $return_var);
+            exec (HESTIA_CMD.$cmd." ".$user, $output, $return_var);
             $_SESSION['error_msg'] = __('Cronjob email reporting has been successfully enabled');
             unset($output);
             header("Location: /list/cron/");
@@ -63,12 +63,12 @@ if ($_SESSION['user'] == 'admin') {
 
 foreach ($job as $value) {
     $value = escapeshellarg($value);
-    exec (VESTA_CMD.$cmd." ".$user." ".$value." no", $output, $return_var);
+    exec (HESTIA_CMD.$cmd." ".$user." ".$value." no", $output, $return_var);
     $restart = 'yes';
 }
 
 if (!empty($restart)) {
-    exec (VESTA_CMD."v-restart-cron", $output, $return_var);
+    exec (HESTIA_CMD."v-restart-cron", $output, $return_var);
 }
 
 header("Location: /list/cron/");

web/bulk/db/index.php

@@ -35,7 +35,7 @@ if ($_SESSION['user'] == 'admin') {
 
 foreach ($database as $value) {
     $value = escapeshellarg($value);
-    exec (VESTA_CMD.$cmd." ".$user." ".$value, $output, $return_var);
+    exec (HESTIA_CMD.$cmd." ".$user." ".$value, $output, $return_var);
 }
 
 header("Location: /list/db/");

web/bulk/dns/index.php

@@ -59,7 +59,7 @@ if (empty($record)) {
     foreach ($domain as $value) {
         // DNS
         $value = escapeshellarg($value);
-        exec (VESTA_CMD.$cmd." ".$user." ".$value." no", $output, $return_var);
+        exec (HESTIA_CMD.$cmd." ".$user." ".$value." no", $output, $return_var);
         $restart = 'yes';
     }
 } else {
@@ -67,13 +67,13 @@ if (empty($record)) {
         // DNS Record
         $value = escapeshellarg($value);
         $dom = escapeshellarg($domain);
-        exec (VESTA_CMD.$cmd." ".$user." ".$dom." ".$value." no", $output, $return_var);
+        exec (HESTIA_CMD.$cmd." ".$user." ".$dom." ".$value." no", $output, $return_var);
         $restart = 'yes';
     }
 }
 
 if (!empty($restart)) {
-    exec (VESTA_CMD."v-restart-dns", $output, $return_var);
+    exec (HESTIA_CMD."v-restart-dns", $output, $return_var);
 }
 
 if (empty($record)) { 

web/bulk/firewall/banlist/index.php

@@ -32,7 +32,7 @@ foreach ($ipchain as $value) {
     list($ip,$chain) = explode(":",$value);
     $v_ip    = escapeshellarg($ip);
     $v_chain = escapeshellarg($chain);
-    exec (VESTA_CMD.$cmd." ".$v_ip." ".$v_chain, $output, $return_var);
+    exec (HESTIA_CMD.$cmd." ".$v_ip." ".$v_chain, $output, $return_var);
 }
 
 header("Location: /list/firewall/banlist");

web/bulk/firewall/index.php

@@ -35,7 +35,7 @@ switch ($action) {
 
 foreach ($rule as $value) {
     $value = escapeshellarg($value);
-    exec (VESTA_CMD.$cmd." ".$value, $output, $return_var);
+    exec (HESTIA_CMD.$cmd." ".$value, $output, $return_var);
     $restart = 'yes';
 }
 

web/bulk/ip/index.php

@@ -17,7 +17,7 @@ $action = $_POST['action'];
 
 if ($_SESSION['user'] == 'admin') {
     switch ($action) {
-        case 'reread IP': exec(VESTA_CMD."v-update-sys-ip", $output, $return_var);
+        case 'reread IP': exec(HESTIA_CMD."v-update-sys-ip", $output, $return_var);
                 header("Location: /list/ip/");
                 exit;
             break;
@@ -32,7 +32,7 @@ if ($_SESSION['user'] == 'admin') {
 
 foreach ($ip as $value) {
     $value = escapeshellarg($value);
-    exec (VESTA_CMD.$cmd." ".$value, $output, $return_var);
+    exec (HESTIA_CMD.$cmd." ".$value, $output, $return_var);
 }
 
 header("Location: /list/ip/");

web/bulk/mail/index.php

@@ -59,7 +59,7 @@ if (empty($account)) {
     foreach ($domain as $value) {
         // Mail
         $value = escapeshellarg($value);
-        exec (VESTA_CMD.$cmd." ".$user." ".$value, $output, $return_var);
+        exec (HESTIA_CMD.$cmd." ".$user." ".$value, $output, $return_var);
         $restart = 'yes';
     }
 } else {
@@ -67,7 +67,7 @@ if (empty($account)) {
         // Mail Account
         $value = escapeshellarg($value);
         $dom = escapeshellarg($domain);
-        exec (VESTA_CMD.$cmd." ".$user." ".$dom." ".$value, $output, $return_var);
+        exec (HESTIA_CMD.$cmd." ".$user." ".$dom." ".$value, $output, $return_var);
         $restart = 'yes';
     }
 }

web/bulk/package/index.php

@@ -28,7 +28,7 @@ if ($_SESSION['user'] == 'admin') {
 
 foreach ($package as $value) {
     $value = escapeshellarg($value);
-    exec (VESTA_CMD.$cmd." ".$value, $output, $return_var);
+    exec (HESTIA_CMD.$cmd." ".$value, $output, $return_var);
     $restart = 'yes';
 }
 

web/bulk/restore/index.php

@@ -30,7 +30,7 @@ if (!empty($_POST['cron'])) $cron = 'yes';
 if (!empty($_POST['udir'])) $udir = escapeshellarg(implode(",",$_POST['udir']));
 
 if ($action == 'restore') {
-    exec (VESTA_CMD."v-schedule-user-restore ".$user." ".$backup." ".$web." ".$dns." ".$mail." ".$db." ".$cron." ".$udir, $output, $return_var);
+    exec (HESTIA_CMD."v-schedule-user-restore ".$user." ".$backup." ".$web." ".$dns." ".$mail." ".$db." ".$cron." ".$udir, $output, $return_var);
     if ($return_var == 0) {
         $_SESSION['error_msg'] = __('RESTORE_SCHEDULED');
     } else {

web/bulk/service/index.php

@@ -27,7 +27,7 @@ if ($_SESSION['user'] == 'admin') {
     }
 
     if ((!empty($_POST['system'])) && ($action == 'restart')) {
-        exec (VESTA_CMD."v-restart-system yes", $output, $return_var);
+        exec (HESTIA_CMD."v-restart-system yes", $output, $return_var);
         $_SESSION['error_srv'] = 'The system is going down for reboot NOW!';
         unset($output);
         header("Location: /list/server/");
@@ -36,7 +36,7 @@ if ($_SESSION['user'] == 'admin') {
 
     foreach ($service as $value) {
         $value = escapeshellarg($value);
-        exec (VESTA_CMD.$cmd." ".$value, $output, $return_var);
+        exec (HESTIA_CMD.$cmd." ".$value, $output, $return_var);
     }
 }
 

web/bulk/user/index.php

@@ -49,14 +49,14 @@ if ($_SESSION['user'] == 'admin') {
 
 foreach ($user as $value) {
     $value = escapeshellarg($value);
-    exec (VESTA_CMD.$cmd." ".$value." ".$restart, $output, $return_var);
+    exec (HESTIA_CMD.$cmd." ".$value." ".$restart, $output, $return_var);
     $changes = 'yes';
 }
 
 if ((!empty($restart)) && (!empty($changes))) {
-    exec (VESTA_CMD."v-restart-web", $output, $return_var);
-    exec (VESTA_CMD."v-restart-dns", $output, $return_var);
-    exec (VESTA_CMD."v-restart-cron", $output, $return_var);
+    exec (HESTIA_CMD."v-restart-web", $output, $return_var);
+    exec (HESTIA_CMD."v-restart-dns", $output, $return_var);
+    exec (HESTIA_CMD."v-restart-cron", $output, $return_var);
 }
 
 header("Location: /list/user/");

web/bulk/vesta/index.php

@@ -24,7 +24,7 @@ if ($_SESSION['user'] == 'admin') {
     }
     foreach ($pkg as $value) {
         $value = escapeshellarg($value);
-        exec (VESTA_CMD.$cmd." ".$value, $output, $return_var);
+        exec (HESTIA_CMD.$cmd." ".$value, $output, $return_var);
     }
 }
 

web/bulk/web/index.php

@@ -35,14 +35,14 @@ if ($_SESSION['user'] == 'admin') {
 
 foreach ($domain as $value) {
     $value = escapeshellarg($value);
-    exec (VESTA_CMD.$cmd." ".$user." ".$value." no", $output, $return_var);
+    exec (HESTIA_CMD.$cmd." ".$user." ".$value." no", $output, $return_var);
     $restart='yes';
 }
 
 if (isset($restart)) {
-    exec (VESTA_CMD."v-restart-web", $output, $return_var);
-    exec (VESTA_CMD."v-restart-proxy", $output, $return_var);
-    exec (VESTA_CMD."v-restart-dns", $output, $return_var);
+    exec (HESTIA_CMD."v-restart-web", $output, $return_var);
+    exec (HESTIA_CMD."v-restart-proxy", $output, $return_var);
+    exec (HESTIA_CMD."v-restart-dns", $output, $return_var);
 }
 
 header("Location: /list/web/");

web/delete/backup/exclusion/index.php

@@ -12,7 +12,7 @@ if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
 if (!empty($_GET['system'])) {
     $v_username = escapeshellarg($user);
     $v_system = escapeshellarg($_GET['system']);
-    exec (VESTA_CMD."v-delete-user-backup-exclusions ".$v_username." ".$v_system, $output, $return_var);
+    exec (HESTIA_CMD."v-delete-user-backup-exclusions ".$v_username." ".$v_system, $output, $return_var);
 }
 check_return_code($return_var,$output);
 unset($output);

web/delete/backup/index.php

@@ -18,7 +18,7 @@ if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) {
 if (!empty($_GET['backup'])) {
     $v_username = escapeshellarg($user);
     $v_backup = escapeshellarg($_GET['backup']);
-    exec (VESTA_CMD."v-delete-user-backup ".$v_username." ".$v_backup, $output, $return_var);
+    exec (HESTIA_CMD."v-delete-user-backup ".$v_username." ".$v_backup, $output, $return_var);
 }
 check_return_code($return_var,$output);
 unset($output);

web/delete/cron/autoupdate/index.php

@@ -6,7 +6,7 @@ session_start();
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
 if ($_SESSION['user'] == 'admin') {
-    exec (VESTA_CMD."v-delete-cron-hestia-autoupdate", $output, $return_var);
+    exec (HESTIA_CMD."v-delete-cron-hestia-autoupdate", $output, $return_var);
     $_SESSION['error_msg'] = __('Autoupdate has been successfully disabled');
     unset($output);
 }

web/delete/cron/index.php

@@ -18,7 +18,7 @@ if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) {
 if (!empty($_GET['job'])) {
     $v_username = escapeshellarg($user);
     $v_job = escapeshellarg($_GET['job']);
-    exec (VESTA_CMD."v-delete-cron-job ".$v_username." ".$v_job, $output, $return_var);
+    exec (HESTIA_CMD."v-delete-cron-job ".$v_username." ".$v_job, $output, $return_var);
 }
 check_return_code($return_var,$output);
 unset($output);

web/delete/cron/reports/index.php

@@ -5,7 +5,7 @@ ob_start();
 session_start();
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-exec (VESTA_CMD."v-delete-cron-reports ".$user, $output, $return_var);
+exec (HESTIA_CMD."v-delete-cron-reports ".$user, $output, $return_var);
 $_SESSION['error_msg'] = __('Cronjob email reporting has been successfully disabled');
 unset($output);
 

web/delete/db/index.php

@@ -18,7 +18,7 @@ if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) {
 if (!empty($_GET['database'])) {
     $v_username = escapeshellarg($user);
     $v_database = escapeshellarg($_GET['database']);
-    exec (VESTA_CMD."v-delete-database ".$v_username." ".$v_database, $output, $return_var);
+    exec (HESTIA_CMD."v-delete-database ".$v_username." ".$v_database, $output, $return_var);
 }
 check_return_code($return_var,$output);
 unset($output);

web/delete/dns/index.php

@@ -20,7 +20,7 @@ if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) {
 if ((!empty($_GET['domain'])) && (empty($_GET['record_id'])))  {
     $v_username = escapeshellarg($user);
     $v_domain = escapeshellarg($_GET['domain']);
-    exec (VESTA_CMD."v-delete-dns-domain ".$v_username." ".$v_domain, $output, $return_var);
+    exec (HESTIA_CMD."v-delete-dns-domain ".$v_username." ".$v_domain, $output, $return_var);
     check_return_code($return_var,$output);
     unset($output);
 
@@ -38,7 +38,7 @@ if ((!empty($_GET['domain'])) && (!empty($_GET['record_id'])))  {
     $v_username = escapeshellarg($user);
     $v_domain = escapeshellarg($_GET['domain']);
     $v_record_id = escapeshellarg($_GET['record_id']);
-    exec (VESTA_CMD."v-delete-dns-record ".$v_username." ".$v_domain." ".$v_record_id, $output, $return_var);
+    exec (HESTIA_CMD."v-delete-dns-record ".$v_username." ".$v_domain." ".$v_record_id, $output, $return_var);
     check_return_code($return_var,$output);
     unset($output);
     $back = $_SESSION['back'];

web/delete/favorite/index.php

@@ -10,6 +10,6 @@
     $v_section = escapeshellarg($_REQUEST['v_section']);
     $v_unit_id = escapeshellarg($_REQUEST['v_unit_id']);
 
-    exec (VESTA_CMD."v-delete-user-favourites ".$_SESSION['user']." ".$v_section." ".$v_unit_id, $output, $return_var);
+    exec (HESTIA_CMD."v-delete-user-favourites ".$_SESSION['user']." ".$v_section." ".$v_unit_id, $output, $return_var);
 //    check_return_code($return_var,$output);
 ?>

web/delete/firewall/banlist/index.php

@@ -22,7 +22,7 @@ if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) {
 if ((!empty($_GET['ip'])) && (!empty($_GET['chain']))) {
     $v_ip = escapeshellarg($_GET['ip']);
     $v_chain = escapeshellarg($_GET['chain']);
-    exec (VESTA_CMD."v-delete-firewall-ban ".$v_ip." ".$v_chain, $output, $return_var);
+    exec (HESTIA_CMD."v-delete-firewall-ban ".$v_ip." ".$v_chain, $output, $return_var);
 }
 check_return_code($return_var,$output);
 unset($output);

web/delete/firewall/index.php

@@ -21,7 +21,7 @@ if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) {
 
 if (!empty($_GET['rule'])) {
     $v_rule = escapeshellarg($_GET['rule']);
-    exec (VESTA_CMD."v-delete-firewall-rule ".$v_rule, $output, $return_var);
+    exec (HESTIA_CMD."v-delete-firewall-rule ".$v_rule, $output, $return_var);
 }
 check_return_code($return_var,$output);
 unset($output);

web/delete/ip/index.php

@@ -14,7 +14,7 @@ if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) {
 if ($_SESSION['user'] == 'admin') {
     if (!empty($_GET['ip'])) {
         $v_ip = escapeshellarg($_GET['ip']);
-        exec (VESTA_CMD."v-delete-sys-ip ".$v_ip, $output, $return_var);
+        exec (HESTIA_CMD."v-delete-sys-ip ".$v_ip, $output, $return_var);
     }
     check_return_code($return_var,$output);
     unset($output);

web/delete/mail/index.php

@@ -20,7 +20,7 @@ if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) {
 if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
     $v_username = escapeshellarg($user);
     $v_domain = escapeshellarg($_GET['domain']);
-    exec (VESTA_CMD."v-delete-mail-domain ".$v_username." ".$v_domain, $output, $return_var);
+    exec (HESTIA_CMD."v-delete-mail-domain ".$v_username." ".$v_domain, $output, $return_var);
     check_return_code($return_var,$output);
     unset($output);
     $back = $_SESSION['back'];
@@ -37,7 +37,7 @@ if ((!empty($_GET['domain'])) && (!empty($_GET['account'])))  {
     $v_username = escapeshellarg($user);
     $v_domain = escapeshellarg($_GET['domain']);
     $v_account = escapeshellarg($_GET['account']);
-    exec (VESTA_CMD."v-delete-mail-account ".$v_username." ".$v_domain." ".$v_account, $output, $return_var);
+    exec (HESTIA_CMD."v-delete-mail-account ".$v_username." ".$v_domain." ".$v_account, $output, $return_var);
     check_return_code($return_var,$output);
     unset($output);
     $back = $_SESSION['back'];

web/delete/notification/index.php

@@ -15,13 +15,13 @@ if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) {
 if($_GET['delete'] == 1){
     $v_username = escapeshellarg($user);
     $v_id = escapeshellarg((int)$_GET['notification_id']);
-    exec (VESTA_CMD."v-delete-user-notification ".$v_username." ".$v_id, $output, $return_var);
+    exec (HESTIA_CMD."v-delete-user-notification ".$v_username." ".$v_id, $output, $return_var);
     check_return_code($return_var,$output);
     unset($output);
 } else {
     $v_username = escapeshellarg($user);
     $v_id = escapeshellarg((int)$_GET['notification_id']);
-    exec (VESTA_CMD."v-acknowledge-user-notification ".$v_username." ".$v_id, $output, $return_var);
+    exec (HESTIA_CMD."v-acknowledge-user-notification ".$v_username." ".$v_id, $output, $return_var);
     check_return_code($return_var,$output);
     unset($output);
 }

web/delete/package/index.php

@@ -14,7 +14,7 @@ if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) {
 if ($_SESSION['user'] == 'admin') {
     if (!empty($_GET['package'])) {
         $v_package = escapeshellarg($_GET['package']);
-        exec (VESTA_CMD."v-delete-user-package ".$v_package, $output, $return_var);
+        exec (HESTIA_CMD."v-delete-user-package ".$v_package, $output, $return_var);
     }
     check_return_code($return_var,$output);
     unset($output);

web/delete/user/index.php

@@ -14,7 +14,7 @@ if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) {
 if ($_SESSION['user'] == 'admin') {
     if (!empty($_GET['user'])) {
         $v_username = escapeshellarg($_GET['user']);
-        exec (VESTA_CMD."v-delete-user ".$v_username, $output, $return_var);
+        exec (HESTIA_CMD."v-delete-user ".$v_username, $output, $return_var);
     }
     check_return_code($return_var,$output);
     unset($_SESSION['look']);

web/delete/web/index.php

@@ -19,7 +19,7 @@ if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
 if (!empty($_GET['domain'])) {
     $v_username = escapeshellarg($user);
     $v_domain = escapeshellarg($_GET['domain']);
-    exec (VESTA_CMD."v-delete-domain ".$v_username." ".$v_domain, $output, $return_var);
+    exec (HESTIA_CMD."v-delete-domain ".$v_username." ".$v_domain, $output, $return_var);
     check_return_code($return_var,$output);
     unset($output);
 }

web/download/file/index.php

@@ -21,7 +21,7 @@ if (!empty($path)) {
     header("Content-Transfer-Encoding: binary");
     header("Content-disposition: attachment;filename=".basename($path));
 	$output = '';
-	exec(VESTA_CMD . "v-check-fs-permission " . $user . " " . escapeshellarg($path), $output, $return_var);
+	exec(HESTIA_CMD . "v-check-fs-permission " . $user . " " . escapeshellarg($path), $output, $return_var);
 	if ($return_var != 0) {
 	  print 'Error while opening file'; // todo: handle this more styled
 	  exit;

web/download/web-log/index.php

@@ -18,7 +18,7 @@ $v_domain = escapeshellarg($_GET['domain']);
 if ($_GET['type'] == 'access') $type = 'access';
 if ($_GET['type'] == 'error') $type = 'error';
 
-exec (VESTA_CMD."v-list-web-domain-".$type."log $user ".$v_domain." 5000", $output, $return_var);
+exec (HESTIA_CMD."v-list-web-domain-".$type."log $user ".$v_domain." 5000", $output, $return_var);
 if ($return_var == 0 ) {
     foreach($output as $file) {
         echo $file . "\n";

web/edit/backup/exclusions/index.php

@@ -12,7 +12,7 @@ if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
 }
 
 // List backup exclustions
-exec (VESTA_CMD."v-list-user-backup-exclusions ".$user." 'json'", $output, $return_var);
+exec (HESTIA_CMD."v-list-user-backup-exclusions ".$user." 'json'", $output, $return_var);
 check_return_code($return_var,$output);
 $data = json_decode(implode('', $output), true);
 unset($output);
@@ -111,7 +111,7 @@ if (!empty($_POST['save'])) {
     unset($mktemp_output);
 
     // Save changes
-    exec (VESTA_CMD."v-update-user-backup-exclusions ".$user." ".$tmp, $output, $return_var);
+    exec (HESTIA_CMD."v-update-user-backup-exclusions ".$user." ".$tmp, $output, $return_var);
     check_return_code($return_var,$output);
     unset($output);
 

web/edit/cron/index.php

@@ -20,7 +20,7 @@ if (empty($_GET['job'])) {
 
 // List cron job
 $v_job = escapeshellarg($_GET['job']);
-exec (VESTA_CMD."v-list-cron-job ".$user." ".$v_job." 'json'", $output, $return_var);
+exec (HESTIA_CMD."v-list-cron-job ".$user." ".$v_job." 'json'", $output, $return_var);
 check_return_code($return_var,$output);
 
 $data = json_decode(implode('', str_replace("\\", "\\\\", $output)), true);
@@ -63,7 +63,7 @@ if (!empty($_POST['save'])) {
     $v_cmd = escapeshellarg($_POST['v_cmd']);
 
     // Save changes
-    exec (VESTA_CMD."v-change-cron-job ".$v_username." ".$v_job." ".$v_min." ".$v_hour." ".$v_day." ".$v_month." ".$v_wday." ".$v_cmd, $output, $return_var);
+    exec (HESTIA_CMD."v-change-cron-job ".$v_username." ".$v_job." ".$v_min." ".$v_hour." ".$v_day." ".$v_month." ".$v_wday." ".$v_cmd, $output, $return_var);
     check_return_code($return_var,$output);
     unset($output);
 

web/edit/db/index.php

@@ -20,7 +20,7 @@ if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
 
 // List datbase
 $v_database = escapeshellarg($_GET['database']);
-exec (VESTA_CMD."v-list-database ".$user." ".$v_database." 'json'", $output, $return_var);
+exec (HESTIA_CMD."v-list-database ".$user." ".$v_database." 'json'", $output, $return_var);
 check_return_code($return_var,$output);
 $data = json_decode(implode('', $output), true);
 unset($output);
@@ -56,7 +56,7 @@ if (!empty($_POST['save'])) {
     if (($v_dbuser != $_POST['v_dbuser']) && (empty($_SESSION['error_msg']))) {
         $v_dbuser = preg_replace("/^".$user."_/", "", $_POST['v_dbuser']);
         $v_dbuser = escapeshellarg($v_dbuser);
-        exec (VESTA_CMD."v-change-database-user ".$v_username." ".$v_database." ".$v_dbuser, $output, $return_var);
+        exec (HESTIA_CMD."v-change-database-user ".$v_username." ".$v_database." ".$v_dbuser, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         $v_dbuser = $user."_".preg_replace("/^".$user."_/", "", $_POST['v_dbuser']);
@@ -68,7 +68,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($v_password, "w");
         fwrite($fp, $_POST['v_password']."\n");
         fclose($fp);
-        exec (VESTA_CMD."v-change-database-password ".$v_username." ".$v_database." ".$v_password, $output, $return_var);
+        exec (HESTIA_CMD."v-change-database-password ".$v_username." ".$v_database." ".$v_password, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($v_password);

web/edit/dns/index.php

@@ -20,7 +20,7 @@ if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
 // List dns domain
 if ((!empty($_GET['domain'])) && (empty($_GET['record_id'])))  {
     $v_domain = escapeshellarg($_GET['domain']);
-    exec (VESTA_CMD."v-list-dns-domain ".$user." ".$v_domain." json", $output, $return_var);
+    exec (HESTIA_CMD."v-list-dns-domain ".$user." ".$v_domain." json", $output, $return_var);
     check_return_code($return_var,$output);
     $data = json_decode(implode('', $output), true);
     unset($output);
@@ -43,7 +43,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id'])))  {
     }
 
     // List dns templates
-    exec (VESTA_CMD."v-list-dns-templates json", $output, $return_var);
+    exec (HESTIA_CMD."v-list-dns-templates json", $output, $return_var);
     $templates = json_decode(implode('', $output), true);
     unset($output);
 }
@@ -52,7 +52,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id'])))  {
 if ((!empty($_GET['domain'])) && (!empty($_GET['record_id'])))  {
     $v_domain = escapeshellarg($_GET['domain']);
     $v_record_id = escapeshellarg($_GET['record_id']);
-    exec (VESTA_CMD."v-list-dns-records ".$user." ".$v_domain." 'json'", $output, $return_var);
+    exec (HESTIA_CMD."v-list-dns-records ".$user." ".$v_domain." 'json'", $output, $return_var);
     check_return_code($return_var,$output);
     $data = json_decode(implode('', $output), true);
     unset($output);
@@ -88,7 +88,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (empty($_GET['recor
     // Change domain IP
     if (($v_ip != $_POST['v_ip']) && (empty($_SESSION['error_msg']))) {
         $v_ip = escapeshellarg($_POST['v_ip']);
-        exec (VESTA_CMD."v-change-dns-domain-ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var);
+        exec (HESTIA_CMD."v-change-dns-domain-ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var);
         check_return_code($return_var,$output);
         $restart_dns = 'yes';
         unset($output);
@@ -97,7 +97,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (empty($_GET['recor
     // Change domain template
     if (($v_template != $_POST['v_template']) && (empty($_SESSION['error_msg']))) {
         $v_template = escapeshellarg($_POST['v_template']);
-        exec (VESTA_CMD."v-change-dns-domain-tpl ".$v_username." ".$v_domain." ".$v_template." 'no'", $output, $return_var);
+        exec (HESTIA_CMD."v-change-dns-domain-tpl ".$v_username." ".$v_domain." ".$v_template." 'no'", $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         $restart_dns = 'yes';
@@ -106,7 +106,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (empty($_GET['recor
     // Change SOA record
     if (($v_soa != $_POST['v_soa']) && (empty($_SESSION['error_msg']))) {
         $v_soa = escapeshellarg($_POST['v_soa']);
-        exec (VESTA_CMD."v-change-dns-domain-soa ".$v_username." ".$v_domain." ".$v_soa." 'no'", $output, $return_var);
+        exec (HESTIA_CMD."v-change-dns-domain-soa ".$v_username." ".$v_domain." ".$v_soa." 'no'", $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         $restart_dns = 'yes';
@@ -115,7 +115,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (empty($_GET['recor
     // Change expiriation date
     if (($v_exp != $_POST['v_exp']) && (empty($_SESSION['error_msg']))) {
         $v_exp = escapeshellarg($_POST['v_exp']);
-        exec (VESTA_CMD."v-change-dns-domain-exp ".$v_username." ".$v_domain." ".$v_exp." 'no'", $output, $return_var);
+        exec (HESTIA_CMD."v-change-dns-domain-exp ".$v_username." ".$v_domain." ".$v_exp." 'no'", $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
     }
@@ -123,7 +123,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (empty($_GET['recor
     // Change domain ttl
     if (($v_ttl != $_POST['v_ttl']) && (empty($_SESSION['error_msg']))) {
         $v_ttl = escapeshellarg($_POST['v_ttl']);
-        exec (VESTA_CMD."v-change-dns-domain-ttl ".$v_username." ".$v_domain." ".$v_ttl." 'no'", $output, $return_var);
+        exec (HESTIA_CMD."v-change-dns-domain-ttl ".$v_username." ".$v_domain." ".$v_ttl." 'no'", $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         $restart_dns = 'yes';
@@ -131,7 +131,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (empty($_GET['recor
 
     // Restart dns server
     if (!empty($restart_dns) && (empty($_SESSION['error_msg']))) {
-        exec (VESTA_CMD."v-restart-dns", $output, $return_var);
+        exec (HESTIA_CMD."v-restart-dns", $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
     }
@@ -159,7 +159,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['reco
     if (($v_val != $_POST['v_val']) || ($v_priority != $_POST['v_priority']) && (empty($_SESSION['error_msg']))) {
         $v_val = escapeshellarg($_POST['v_val']);
         $v_priority = escapeshellarg($_POST['v_priority']);
-        exec (VESTA_CMD."v-change-dns-record ".$v_username." ".$v_domain." ".$v_record_id." ".$v_val." ".$v_priority, $output, $return_var);
+        exec (HESTIA_CMD."v-change-dns-record ".$v_username." ".$v_domain." ".$v_record_id." ".$v_val." ".$v_priority, $output, $return_var);
         check_return_code($return_var,$output);
         $v_val = $_POST['v_val'];
         unset($output);
@@ -169,7 +169,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['reco
     // Change dns record id
     if (($_GET['record_id'] != $_POST['v_record_id']) && (empty($_SESSION['error_msg']))) {
         $v_old_record_id = escapeshellarg($_GET['record_id']);
-        exec (VESTA_CMD."v-change-dns-record-id ".$v_username." ".$v_domain." ".$v_old_record_id." ".$v_record_id, $output, $return_var);
+        exec (HESTIA_CMD."v-change-dns-record-id ".$v_username." ".$v_domain." ".$v_old_record_id." ".$v_record_id, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         $restart_dns = 'yes';
@@ -177,7 +177,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['reco
 
     // Restart dns server
     if (!empty($restart_dns) && (empty($_SESSION['error_msg']))) {
-        exec (VESTA_CMD."v-restart-dns", $output, $return_var);
+        exec (HESTIA_CMD."v-restart-dns", $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
     }

web/edit/file/index.php

@@ -47,7 +47,7 @@ if (($_SESSION['user'] == 'admin') && (!empty($_SESSION['look']))) {
                 chmod($fn, 0644);
 
                 if ($f) {
-                    exec (VESTA_CMD . "v-copy-fs-file {$user} {$fn} ".escapeshellarg($path), $output, $return_var);
+                    exec (HESTIA_CMD . "v-copy-fs-file {$user} {$fn} ".escapeshellarg($path), $output, $return_var);
                     $error = check_return_code($return_var, $output);
                     if ($return_var != 0) {
                         print('<p style="color: white">Error while saving file</p>');
@@ -58,7 +58,7 @@ if (($_SESSION['user'] == 'admin') && (!empty($_SESSION['look']))) {
             }
         }
 
-        exec (VESTA_CMD . "v-open-fs-file {$user} ".escapeshellarg($path), $content, $return_var);
+        exec (HESTIA_CMD . "v-open-fs-file {$user} ".escapeshellarg($path), $content, $return_var);
         if ($return_var != 0) {
             print 'Error while opening file'; // todo: handle this more styled
             exit;

web/edit/firewall/index.php

@@ -20,7 +20,7 @@ if (empty($_GET['rule'])) {
 
 // List rule
 $v_rule = escapeshellarg($_GET['rule']);
-exec (VESTA_CMD."v-list-firewall-rule ".$v_rule." 'json'", $output, $return_var);
+exec (HESTIA_CMD."v-list-firewall-rule ".$v_rule." 'json'", $output, $return_var);
 check_return_code($return_var,$output);
 $data = json_decode(implode('', $output), true);
 unset($output);
@@ -61,7 +61,7 @@ if (!empty($_POST['save'])) {
     $v_comment = escapeshellarg($_POST['v_comment']);
 
     // Change Status
-    exec (VESTA_CMD."v-change-firewall-rule ".$v_rule." ".$v_action." ".$v_ip."  ".$v_port." ".$v_protocol." ".$v_comment, $output, $return_var);
+    exec (HESTIA_CMD."v-change-firewall-rule ".$v_rule." ".$v_action." ".$v_ip."  ".$v_port." ".$v_protocol." ".$v_comment, $output, $return_var);
     check_return_code($return_var,$output);
     unset($output);
 

web/edit/ip/index.php

@@ -20,7 +20,7 @@ if (empty($_GET['ip'])) {
 
 // List ip
 $v_ip = escapeshellarg($_GET['ip']);
-exec (VESTA_CMD."v-list-sys-ip ".$v_ip." 'json'", $output, $return_var);
+exec (HESTIA_CMD."v-list-sys-ip ".$v_ip." 'json'", $output, $return_var);
 check_return_code($return_var,$output);
 $data = json_decode(implode('', $output), true);
 unset($output);
@@ -45,7 +45,7 @@ if ( $v_suspended == 'yes' ) {
 }
 
 // List users
-exec (VESTA_CMD."v-list-sys-users 'json'", $output, $return_var);
+exec (HESTIA_CMD."v-list-sys-users 'json'", $output, $return_var);
 $users = json_decode(implode('', $output), true);
 unset($output);
 
@@ -55,13 +55,13 @@ if (!empty($_POST['save'])) {
 
     // Change Status
     if (($v_ipstatus == 'shared') && (empty($_POST['v_shared'])) && (empty($_SESSION['error_msg']))) {
-        exec (VESTA_CMD."v-change-sys-ip-status ".$v_ip." 'dedicated'", $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-ip-status ".$v_ip." 'dedicated'", $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         $v_dedicated = 'yes';
     }
     if (($v_ipstatus == 'dedicated') && (!empty($_POST['v_shared'])) && (empty($_SESSION['error_msg']))) {
-        exec (VESTA_CMD."v-change-sys-ip-status ".$v_ip." 'shared'", $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-ip-status ".$v_ip." 'shared'", $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unset($v_dedicated);
@@ -70,7 +70,7 @@ if (!empty($_POST['save'])) {
     // Change owner
     if (($v_owner != $_POST['v_owner']) && (empty($_SESSION['error_msg']))) {
         $v_owner = escapeshellarg($_POST['v_owner']);
-        exec (VESTA_CMD."v-change-sys-ip-owner ".$v_ip." ".$v_owner, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-ip-owner ".$v_ip." ".$v_owner, $output, $return_var);
         check_return_code($return_var,$output);
         $v_owner = $_POST['v_owner'];
         unset($output);
@@ -79,7 +79,7 @@ if (!empty($_POST['save'])) {
     // Change associated domain
     if (($v_name != $_POST['v_name']) && (empty($_SESSION['error_msg']))) {
         $v_name = escapeshellarg($_POST['v_name']);
-        exec (VESTA_CMD."v-change-sys-ip-name ".$v_ip." ".$v_name, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-ip-name ".$v_ip." ".$v_name, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
     }
@@ -87,7 +87,7 @@ if (!empty($_POST['save'])) {
     // Change NAT address
     if (($v_nat != $_POST['v_nat']) && (empty($_SESSION['error_msg']))) {
         $v_nat = escapeshellarg($_POST['v_nat']);
-        exec (VESTA_CMD."v-change-sys-ip-nat ".$v_ip." ".$v_nat, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-ip-nat ".$v_ip." ".$v_nat, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
     }

web/edit/mail/index.php

@@ -21,7 +21,7 @@ $v_username = $user;
 // List mail domain
 if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
     $v_domain = escapeshellarg($_GET['domain']);
-    exec (VESTA_CMD."v-list-mail-domain ".$user." ".$v_domain." json", $output, $return_var);
+    exec (HESTIA_CMD."v-list-mail-domain ".$user." ".$v_domain." json", $output, $return_var);
     $data = json_decode(implode('', $output), true);
     unset($output);
 
@@ -45,7 +45,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
 if ((!empty($_GET['domain'])) && (!empty($_GET['account'])))  {
     $v_domain = escapeshellarg($_GET['domain']);
     $v_account = escapeshellarg($_GET['account']);
-    exec (VESTA_CMD."v-list-mail-account ".$user." ".$v_domain." ".$v_account." 'json'", $output, $return_var);
+    exec (HESTIA_CMD."v-list-mail-account ".$user." ".$v_domain." ".$v_account." 'json'", $output, $return_var);
     $data = json_decode(implode('', $output), true);
     unset($output);
 
@@ -72,7 +72,7 @@ if ((!empty($_GET['domain'])) && (!empty($_GET['account'])))  {
 
     // Parse autoreply
     if ( $v_autoreply == 'yes' ) {
-        exec (VESTA_CMD."v-list-mail-account-autoreply ".$user." '".$v_domain."' '".$v_account."' json", $output, $return_var);
+        exec (HESTIA_CMD."v-list-mail-account-autoreply ".$user." '".$v_domain."' '".$v_account."' json", $output, $return_var);
         $autoreply_str = json_decode(implode('', $output), true);
         unset($output);
         $v_autoreply_message = $autoreply_str[$v_account]['MSG'];
@@ -93,7 +93,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (empty($_GET['accou
 
     // Delete antispam
     if (($v_antispam == 'yes') && (empty($_POST['v_antispam'])) && (empty($_SESSION['error_msg']))) {
-        exec (VESTA_CMD."v-delete-mail-domain-antispam ".$v_username." ".$v_domain, $output, $return_var);
+        exec (HESTIA_CMD."v-delete-mail-domain-antispam ".$v_username." ".$v_domain, $output, $return_var);
         check_return_code($return_var,$output);
         $v_antispam = 'no';
         unset($output);
@@ -101,7 +101,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (empty($_GET['accou
 
     // Add antispam
     if (($v_antispam == 'no') && (!empty($_POST['v_antispam'])) && (empty($_SESSION['error_msg']))) {
-        exec (VESTA_CMD."v-add-mail-domain-antispam ".$v_username." ".$v_domain, $output, $return_var);
+        exec (HESTIA_CMD."v-add-mail-domain-antispam ".$v_username." ".$v_domain, $output, $return_var);
         check_return_code($return_var,$output);
         $v_antispam = 'yes';
         unset($output);
@@ -109,7 +109,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (empty($_GET['accou
 
     // Delete antivirus
     if (($v_antivirus == 'yes') && (empty($_POST['v_antivirus'])) && (empty($_SESSION['error_msg']))) {
-        exec (VESTA_CMD."v-delete-mail-domain-antivirus ".$v_username." ".$v_domain, $output, $return_var);
+        exec (HESTIA_CMD."v-delete-mail-domain-antivirus ".$v_username." ".$v_domain, $output, $return_var);
         check_return_code($return_var,$output);
         $v_antivirus = 'no';
         unset($output);
@@ -117,7 +117,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (empty($_GET['accou
 
     // Add antivirs
     if (($v_antivirus == 'no') && (!empty($_POST['v_antivirus'])) && (empty($_SESSION['error_msg']))) {
-        exec (VESTA_CMD."v-add-mail-domain-antivirus ".$v_username." ".$v_domain, $output, $return_var);
+        exec (HESTIA_CMD."v-add-mail-domain-antivirus ".$v_username." ".$v_domain, $output, $return_var);
         check_return_code($return_var,$output);
         $v_antivirus = 'yes';
         unset($output);
@@ -125,7 +125,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (empty($_GET['accou
 
     // Delete DKIM
     if (($v_dkim == 'yes') && (empty($_POST['v_dkim'])) && (empty($_SESSION['error_msg']))) {
-        exec (VESTA_CMD."v-delete-mail-domain-dkim ".$v_username." ".$v_domain, $output, $return_var);
+        exec (HESTIA_CMD."v-delete-mail-domain-dkim ".$v_username." ".$v_domain, $output, $return_var);
         check_return_code($return_var,$output);
         $v_dkim = 'no';
         unset($output);
@@ -133,7 +133,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (empty($_GET['accou
 
     // Add DKIM
     if (($v_dkim == 'no') && (!empty($_POST['v_dkim'])) && (empty($_SESSION['error_msg']))) {
-        exec (VESTA_CMD."v-add-mail-domain-dkim ".$v_username." ".$v_domain, $output, $return_var);
+        exec (HESTIA_CMD."v-add-mail-domain-dkim ".$v_username." ".$v_domain, $output, $return_var);
         check_return_code($return_var,$output);
         $v_dkim = 'yes';
         unset($output);
@@ -141,7 +141,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (empty($_GET['accou
 
     // Delete catchall
     if ((!empty($v_catchall)) && (empty($_POST['v_catchall'])) && (empty($_SESSION['error_msg']))) {
-        exec (VESTA_CMD."v-delete-mail-domain-catchall ".$v_username." ".$v_domain, $output, $return_var);
+        exec (HESTIA_CMD."v-delete-mail-domain-catchall ".$v_username." ".$v_domain, $output, $return_var);
         check_return_code($return_var,$output);
         $v_catchall = '';
         unset($output);
@@ -151,7 +151,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (empty($_GET['accou
     if ((!empty($v_catchall)) && (!empty($_POST['v_catchall'])) && (empty($_SESSION['error_msg']))) {
         if ($v_catchall != $_POST['v_catchall']) {
             $v_catchall = escapeshellarg($_POST['v_catchall']);
-            exec (VESTA_CMD."v-change-mail-domain-catchall ".$v_username." ".$v_domain." ".$v_catchall, $output, $return_var);
+            exec (HESTIA_CMD."v-change-mail-domain-catchall ".$v_username." ".$v_domain." ".$v_catchall, $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
         }
@@ -160,7 +160,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (empty($_GET['accou
     // Add catchall
     if ((empty($v_catchall)) && (!empty($_POST['v_catchall'])) && (empty($_SESSION['error_msg']))) {
         $v_catchall = escapeshellarg($_POST['v_catchall']);
-        exec (VESTA_CMD."v-add-mail-domain-catchall ".$v_username." ".$v_domain." ".$v_catchall, $output, $return_var);
+        exec (HESTIA_CMD."v-add-mail-domain-catchall ".$v_username." ".$v_domain." ".$v_catchall, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
     }
@@ -198,7 +198,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['acco
         $fp = fopen($v_password, "w");
         fwrite($fp, $_POST['v_password']."\n");
         fclose($fp);
-        exec (VESTA_CMD."v-change-mail-account-password ".$v_username." ".$v_domain." ".$v_account." ".$v_password, $output, $return_var);
+        exec (HESTIA_CMD."v-change-mail-account-password ".$v_username." ".$v_domain." ".$v_account." ".$v_password, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($v_password);
@@ -212,7 +212,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['acco
         } else {
             $v_quota = escapeshellarg($_POST['v_quota']);
         }
-        exec (VESTA_CMD."v-change-mail-account-quota ".$v_username." ".$v_domain." ".$v_account." ".$v_quota, $output, $return_var);
+        exec (HESTIA_CMD."v-change-mail-account-quota ".$v_username." ".$v_domain." ".$v_account." ".$v_quota, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
     }
@@ -228,7 +228,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['acco
         $result = array_diff($valiases, $aliases);
         foreach ($result as $alias) {
             if ((empty($_SESSION['error_msg'])) && (!empty($alias))) {
-                exec (VESTA_CMD."v-delete-mail-account-alias ".$v_username." ".$v_domain." ".$v_account." '".$alias."'", $output, $return_var);
+                exec (HESTIA_CMD."v-delete-mail-account-alias ".$v_username." ".$v_domain." ".$v_account." '".$alias."'", $output, $return_var);
                 check_return_code($return_var,$output);
                 unset($output);
             }
@@ -236,7 +236,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['acco
         $result = array_diff($aliases, $valiases);
         foreach ($result as $alias) {
             if ((empty($_SESSION['error_msg'])) && (!empty($alias))) {
-                exec (VESTA_CMD."v-add-mail-account-alias ".$v_username." ".$v_domain." ".$v_account." ".escapeshellarg($alias), $output, $return_var);
+                exec (HESTIA_CMD."v-add-mail-account-alias ".$v_username." ".$v_domain." ".$v_account." ".escapeshellarg($alias), $output, $return_var);
                 check_return_code($return_var,$output);
                 unset($output);
             }
@@ -254,7 +254,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['acco
         $result = array_diff($vfwd, $fwd);
         foreach ($result as $forward) {
             if ((empty($_SESSION['error_msg'])) && (!empty($forward))) {
-                exec (VESTA_CMD."v-delete-mail-account-forward ".$v_username." ".$v_domain." ".$v_account." '".$forward."'", $output, $return_var);
+                exec (HESTIA_CMD."v-delete-mail-account-forward ".$v_username." ".$v_domain." ".$v_account." '".$forward."'", $output, $return_var);
                 check_return_code($return_var,$output);
                 unset($output);
             }
@@ -262,7 +262,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['acco
         $result = array_diff($fwd, $vfwd);
         foreach ($result as $forward) {
             if ((empty($_SESSION['error_msg'])) && (!empty($forward))) {
-                exec (VESTA_CMD."v-add-mail-account-forward ".$v_username." ".$v_domain." ".$v_account." ".escapeshellarg($forward), $output, $return_var);
+                exec (HESTIA_CMD."v-add-mail-account-forward ".$v_username." ".$v_domain." ".$v_account." ".escapeshellarg($forward), $output, $return_var);
                 check_return_code($return_var,$output);
                 unset($output);
             }
@@ -271,7 +271,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['acco
 
     // Delete FWD_ONLY flag
     if (($v_fwd_only == 'yes') && (empty($_POST['v_fwd_only'])) && (empty($_SESSION['error_msg']))) {
-        exec (VESTA_CMD."v-delete-mail-account-fwd-only ".$v_username." ".$v_domain." ".$v_account, $output, $return_var);
+        exec (HESTIA_CMD."v-delete-mail-account-fwd-only ".$v_username." ".$v_domain." ".$v_account, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         $v_fwd_only = '';
@@ -279,7 +279,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['acco
 
     // Add FWD_ONLY flag
     if (($v_fwd_only != 'yes') && (!empty($_POST['v_fwd_only'])) && (empty($_SESSION['error_msg']))) {
-        exec (VESTA_CMD."v-add-mail-account-fwd-only ".$v_username." ".$v_domain." ".$v_account, $output, $return_var);
+        exec (HESTIA_CMD."v-add-mail-account-fwd-only ".$v_username." ".$v_domain." ".$v_account, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         $v_fwd_only = 'yes';
@@ -287,7 +287,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['acco
 
     // Delete autoreply
     if (($v_autoreply == 'yes') && (empty($_POST['v_autoreply'])) && (empty($_SESSION['error_msg']))) {
-        exec (VESTA_CMD."v-delete-mail-account-autoreply ".$v_username." ".$v_domain." ".$v_account, $output, $return_var);
+        exec (HESTIA_CMD."v-delete-mail-account-autoreply ".$v_username." ".$v_domain." ".$v_account, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         $v_autoreply = 'no';
@@ -299,7 +299,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['acco
         if ( $v_autoreply_message != str_replace("\r\n", "\n", $_POST['v_autoreply_message'])) {
             $v_autoreply_message = str_replace("\r\n", "\n", $_POST['v_autoreply_message']);
             $v_autoreply_message = escapeshellarg($v_autoreply_message);
-            exec (VESTA_CMD."v-add-mail-account-autoreply ".$v_username." ".$v_domain." ".$v_account." ".$v_autoreply_message, $output, $return_var);
+            exec (HESTIA_CMD."v-add-mail-account-autoreply ".$v_username." ".$v_domain." ".$v_account." ".$v_autoreply_message, $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
             $v_autoreply = 'yes';

web/edit/package/index.php

@@ -22,7 +22,7 @@ if (empty($_GET['package'])) {
 
 // List package
 $v_package = escapeshellarg($_GET['package']);
-exec (VESTA_CMD."v-list-user-package ".$v_package." 'json'", $output, $return_var);
+exec (HESTIA_CMD."v-list-user-package ".$v_package." 'json'", $output, $return_var);
 $data = json_decode(implode('', $output), true);
 unset($output);
 
@@ -59,32 +59,32 @@ $v_time = $data[$v_package]['TIME'];
 $v_status =  'active';
 
 // List web templates
-exec (VESTA_CMD."v-list-web-templates json", $output, $return_var);
+exec (HESTIA_CMD."v-list-web-templates json", $output, $return_var);
 $web_templates = json_decode(implode('', $output), true);
 unset($output);
 
 // List backend templates
 if (!empty($_SESSION['WEB_BACKEND'])) {
-    exec (VESTA_CMD."v-list-web-templates-backend json", $output, $return_var);
+    exec (HESTIA_CMD."v-list-web-templates-backend json", $output, $return_var);
     $backend_templates = json_decode(implode('', $output), true);
     unset($output);
 }
 
 // List proxy templates
 if (!empty($_SESSION['PROXY_SYSTEM'])) {
-    exec (VESTA_CMD."v-list-web-templates-proxy json", $output, $return_var);
+    exec (HESTIA_CMD."v-list-web-templates-proxy json", $output, $return_var);
     $proxy_templates = json_decode(implode('', $output), true);
     unset($output);
 }
 
 
 // List dns templates
-exec (VESTA_CMD."v-list-dns-templates json", $output, $return_var);
+exec (HESTIA_CMD."v-list-dns-templates json", $output, $return_var);
 $dns_templates = json_decode(implode('', $output), true);
 unset($output);
 
 // List shels
-exec (VESTA_CMD."v-list-sys-shells json", $output, $return_var);
+exec (HESTIA_CMD."v-list-sys-shells json", $output, $return_var);
 $shells = json_decode(implode('', $output), true);
 unset($output);
 
@@ -203,7 +203,7 @@ if (!empty($_POST['save'])) {
     fclose($fp);
 
     // Save changes
-    exec (VESTA_CMD."v-add-user-package ".$tmpdir." ".$v_package." 'yes'", $output, $return_var);
+    exec (HESTIA_CMD."v-add-user-package ".$tmpdir." ".$v_package." 'yes'", $output, $return_var);
     check_return_code($return_var,$output);
     unset($output);
 
@@ -212,7 +212,7 @@ if (!empty($_POST['save'])) {
     unset($output);
 
     // Propogate new package
-    exec (VESTA_CMD."v-update-user-package ".$v_package." 'json'", $output, $return_var);
+    exec (HESTIA_CMD."v-update-user-package ".$v_package." 'json'", $output, $return_var);
     check_return_code($return_var,$output);
     unset($output);
 

web/edit/server/apache2/index.php

@@ -31,7 +31,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_config']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." apache2 ".$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." apache2 ".$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -48,7 +48,7 @@ $v_config_path = '/etc/apache2/apache2.conf';
 $v_service_name = strtoupper('apache2');
 
 // Read config
-$v_config = shell_exec(VESTA_CMD."v-open-fs-config ".$v_config_path);
+$v_config = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_config_path);
 
 // Render page
 render_page($user, $TAB, 'edit_server_httpd');

web/edit/server/bind9/index.php

@@ -31,7 +31,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_options']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." bind9-opt ".$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." bind9-opt ".$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -44,7 +44,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_config']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." bind9 ".$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." bind9 ".$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -62,8 +62,8 @@ $v_config_path = '/etc/bind/named.conf';
 $v_service_name = strtoupper('bind9');
 
 // Read config
-$v_options = shell_exec(VESTA_CMD."v-open-fs-config ".$v_options_path);
-$v_config = shell_exec(VESTA_CMD."v-open-fs-config ".$v_config_path);
+$v_options = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_options_path);
+$v_config = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_config_path);
 
 // Render page
 render_page($user, $TAB, 'edit_server_bind9');

web/edit/server/clamd/index.php

@@ -31,7 +31,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_config']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." clamd ".$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." clamd ".$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -44,11 +44,11 @@ if (!empty($_POST['save'])) {
 
 }
 
-$v_config_path = shell_exec(VESTA_CMD.'v-list-sys-clamd-config plain');
+$v_config_path = shell_exec(HESTIA_CMD.'v-list-sys-clamd-config plain');
 $v_service_name = strtoupper('clamav');
 
 // Read config
-$v_config = shell_exec(VESTA_CMD."v-open-fs-config ".$v_config_path);
+$v_config = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_config_path);
 
 // Render page
 render_page($user, $TAB, 'edit_server_service');

web/edit/server/cron/index.php

@@ -31,7 +31,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_config']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." cron ".$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." cron ".$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -48,7 +48,7 @@ $v_config_path = '/etc/crontab';
 $v_service_name = strtoupper('cron');
 
 // Read config
-$v_config = shell_exec(VESTA_CMD."v-open-fs-config ".$v_config_path);
+$v_config = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_config_path);
 
 // Render page
 render_page($user, $TAB, 'edit_server_service');

web/edit/server/crond/index.php

@@ -31,7 +31,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_config']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." crond ".$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." crond ".$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -48,7 +48,7 @@ $v_config_path = '/etc/crontab';
 $v_service_name = strtoupper('cron');
 
 // Read config
-$v_config = shell_exec(VESTA_CMD."v-open-fs-config ".$v_config_path);
+$v_config = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_config_path);
 
 // Render page
 render_page($user, $TAB, 'edit_server_service');

web/edit/server/dovecot/index.php

@@ -31,7 +31,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_config']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." dovecot ".$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." dovecot ".$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -44,7 +44,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_config1']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." dovecot-1 " .$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." dovecot-1 " .$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -57,7 +57,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_config2']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." dovecot-2 " .$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." dovecot-2 " .$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -70,7 +70,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_config3']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." dovecot-3 " .$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." dovecot-3 " .$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -83,7 +83,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_config4']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." dovecot-4 " .$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." dovecot-4 " .$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -96,7 +96,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_config5']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." dovecot-5 " .$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." dovecot-5 " .$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -109,7 +109,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_config6']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." dovecot-6 " .$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." dovecot-6 " .$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -122,7 +122,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_config7']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." dovecot-7 " .$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." dovecot-7 " .$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -135,7 +135,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_config8']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." dovecot-8 " .$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." dovecot-8 " .$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -149,7 +149,7 @@ if (!empty($_POST['save'])) {
 }
 
 // List config
-exec (VESTA_CMD."v-list-sys-dovecot-config json", $output, $return_var);
+exec (HESTIA_CMD."v-list-sys-dovecot-config json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
 unset($output);
 
@@ -165,15 +165,15 @@ $v_config_path8 = $data['CONFIG']['config_path8'];
 $v_service_name = strtoupper('dovecot');
 
 // Read config
-$v_config = shell_exec(VESTA_CMD."v-open-fs-config ".$v_config_path);
-if (!empty($v_config_path1)) $v_config1 = shell_exec(VESTA_CMD."v-open-fs-config ".$v_config_path1);
-if (!empty($v_config_path2)) $v_config2 = shell_exec(VESTA_CMD."v-open-fs-config ".$v_config_path2);
-if (!empty($v_config_path3)) $v_config3 = shell_exec(VESTA_CMD."v-open-fs-config ".$v_config_path3);
-if (!empty($v_config_path4)) $v_config4 = shell_exec(VESTA_CMD."v-open-fs-config ".$v_config_path4);
-if (!empty($v_config_path5)) $v_config5 = shell_exec(VESTA_CMD."v-open-fs-config ".$v_config_path5);
-if (!empty($v_config_path6)) $v_config6 = shell_exec(VESTA_CMD."v-open-fs-config ".$v_config_path6);
-if (!empty($v_config_path7)) $v_config7 = shell_exec(VESTA_CMD."v-open-fs-config ".$v_config_path7);
-if (!empty($v_config_path8)) $v_config8 = shell_exec(VESTA_CMD."v-open-fs-config ".$v_config_path8);
+$v_config = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_config_path);
+if (!empty($v_config_path1)) $v_config1 = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_config_path1);
+if (!empty($v_config_path2)) $v_config2 = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_config_path2);
+if (!empty($v_config_path3)) $v_config3 = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_config_path3);
+if (!empty($v_config_path4)) $v_config4 = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_config_path4);
+if (!empty($v_config_path5)) $v_config5 = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_config_path5);
+if (!empty($v_config_path6)) $v_config6 = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_config_path6);
+if (!empty($v_config_path7)) $v_config7 = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_config_path7);
+if (!empty($v_config_path8)) $v_config8 = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_config_path8);
 
 // Render page
 render_page($user, $TAB, 'edit_server_dovecot');

web/edit/server/exim/index.php

@@ -31,7 +31,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_config']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." exim ".$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." exim ".$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -48,7 +48,7 @@ $v_config_path = '/etc/exim/exim.conf';
 $v_service_name = strtoupper('exim');
 
 // Read config
-$v_config = shell_exec(VESTA_CMD."v-open-fs-config ".$v_config_path);
+$v_config = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_config_path);
 
 // Render page
 render_page($user, $TAB, 'edit_server_service');

web/edit/server/exim4/index.php

@@ -31,7 +31,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_config']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." exim4 ".$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." exim4 ".$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -48,7 +48,7 @@ $v_config_path = '/etc/exim4/exim4.conf.template';
 $v_service_name = strtoupper('exim');
 
 // Read config
-$v_config = shell_exec(VESTA_CMD."v-open-fs-config ".$v_config_path);
+$v_config = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_config_path);
 
 // Render page
 render_page($user, $TAB, 'edit_server_service');

web/edit/server/fail2ban/index.php

@@ -31,7 +31,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_config']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." fail2ban ".$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." fail2ban ".$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -48,7 +48,7 @@ $v_config_path = '/etc/fail2ban/jail.local';
 $v_service_name = strtoupper('fail2ban');
 
 // Read config
-$v_config = shell_exec(VESTA_CMD."v-open-fs-config ".$v_config_path);
+$v_config = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_config_path);
 
 // Render page
 render_page($user, $TAB, 'edit_server_service');

web/edit/server/httpd/index.php

@@ -31,7 +31,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_config']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." httpd ".$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." httpd ".$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -48,7 +48,7 @@ $v_config_path = '/etc/httpd/conf/httpd.conf';
 $v_service_name = strtoupper('httpd');
 
 // Read config
-$v_config = shell_exec(VESTA_CMD."v-open-fs-config ".$v_config_path);
+$v_config = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_config_path);
 
 // Render page
 render_page($user, $TAB, 'edit_server_httpd');

web/edit/server/index.php

@@ -16,7 +16,7 @@ $v_hostname = exec('hostname');
 
 // List available timezones and get current one
 $v_timezones = list_timezones();
-exec (VESTA_CMD."v-get-sys-timezone", $output, $return_var);
+exec (HESTIA_CMD."v-get-sys-timezone", $output, $return_var);
 $v_timezone = $output[0];
 unset($output);
 if ($v_timezone == 'Etc/UTC' ) $v_timezone = 'UTC';
@@ -34,12 +34,12 @@ if ($v_timezone == 'America/Puerto_Rico' ) $v_timezone = 'AST';
 if ($v_timezone == 'America/Halifax' ) $v_timezone = 'ADT';
 
 // List supported languages
-exec (VESTA_CMD."v-list-sys-languages json", $output, $return_var);
+exec (HESTIA_CMD."v-list-sys-languages json", $output, $return_var);
 $languages = json_decode(implode('', $output), true);
 unset($output);
 
 // List dns cluster hosts
-exec (VESTA_CMD."v-list-remote-dns-hosts json", $output, $return_var);
+exec (HESTIA_CMD."v-list-remote-dns-hosts json", $output, $return_var);
 $dns_cluster = json_decode(implode('', $output), true);
 unset($output);
 foreach ($dns_cluster as $key => $value) {
@@ -47,7 +47,7 @@ foreach ($dns_cluster as $key => $value) {
 }
 
 // List Database hosts
-exec (VESTA_CMD."v-list-database-hosts json", $output, $return_var);
+exec (HESTIA_CMD."v-list-database-hosts json", $output, $return_var);
 $db_hosts = json_decode(implode('', $output), true);
 unset($output);
 $v_mysql_hosts = array_values(array_filter($db_hosts, function($host){return $host['TYPE'] === 'mysql';}));
@@ -66,7 +66,7 @@ foreach ($backup_types as $backup_type) {
     if ($backup_type == 'local') {
         $v_backup = 'yes';
     } else {
-        exec (VESTA_CMD."v-list-backup-host ".$backup_type. " json", $output, $return_var);
+        exec (HESTIA_CMD."v-list-backup-host ".$backup_type. " json", $output, $return_var);
         $v_remote_backup = json_decode(implode('', $output), true);
         unset($output);
         $v_backup_host = $v_remote_backup[$backup_type]['HOST'];
@@ -79,7 +79,7 @@ foreach ($backup_types as $backup_type) {
 }
 
 // List ssl certificate info
-exec (VESTA_CMD."v-list-sys-vesta-ssl json", $output, $return_var);
+exec (HESTIA_CMD."v-list-sys-vesta-ssl json", $output, $return_var);
 $ssl_str = json_decode(implode('', $output), true);
 unset($output);
 $v_ssl_crt = $ssl_str['VESTA']['CRT'];
@@ -104,7 +104,7 @@ if (!empty($_POST['save'])) {
 
     // Change hostname
     if ((!empty($_POST['v_hostname'])) && ($v_hostname != $_POST['v_hostname'])) {
-        exec (VESTA_CMD."v-change-sys-hostname ".escapeshellarg($_POST['v_hostname']), $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-hostname ".escapeshellarg($_POST['v_hostname']), $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         $v_hostname = $_POST['v_hostname'];
@@ -129,7 +129,7 @@ if (!empty($_POST['save'])) {
             if ($v_tz == 'ADT' ) $v_tz = 'America/Halifax';
 
             if ($v_timezone != $v_tz) {
-                exec (VESTA_CMD."v-change-sys-timezone ".escapeshellarg($v_tz), $output, $return_var);
+                exec (HESTIA_CMD."v-change-sys-timezone ".escapeshellarg($v_tz), $output, $return_var);
                 check_return_code($return_var,$output);
                 $v_timezone = $v_tz;
                 unset($output);
@@ -140,7 +140,7 @@ if (!empty($_POST['save'])) {
     // Change default language
     if (empty($_SESSION['error_msg'])) {
         if ((!empty($_POST['v_language'])) && ($_SESSION['LANGUAGE'] != $_POST['v_language'])) {
-            exec (VESTA_CMD."v-change-sys-language ".escapeshellarg($_POST['v_language']), $output, $return_var);
+            exec (HESTIA_CMD."v-change-sys-language ".escapeshellarg($_POST['v_language']), $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
             if (empty($_SESSION['error_msg'])) $_SESSION['LANGUAGE'] = $_POST['v_language'];
@@ -151,12 +151,12 @@ if (!empty($_POST['save'])) {
     if (empty($_SESSION['error_msg'])) {
         if ((!empty($_POST['v_quota'])) && ($_SESSION['DISK_QUOTA'] != $_POST['v_quota'])) {
             if($_POST['v_quota'] == 'yes') {
-                exec (VESTA_CMD."v-add-sys-quota", $output, $return_var);
+                exec (HESTIA_CMD."v-add-sys-quota", $output, $return_var);
                 check_return_code($return_var,$output);
                 unset($output);
                 if (empty($_SESSION['error_msg'])) $_SESSION['DISK_QUOTA'] = 'yes';
             } else {
-                exec (VESTA_CMD."v-delete-sys-quota", $output, $return_var);
+                exec (HESTIA_CMD."v-delete-sys-quota", $output, $return_var);
                 check_return_code($return_var,$output);
                 unset($output);
                 if (empty($_SESSION['error_msg'])) $_SESSION['DISK_QUOTA'] = 'no';
@@ -170,12 +170,12 @@ if (!empty($_POST['save'])) {
         if ($_SESSION['FIREWALL_SYSTEM'] != 'iptables') $v_firewall = 'no';
         if ((!empty($_POST['v_firewall'])) && ($v_firewall != $_POST['v_firewall'])) {
             if($_POST['v_firewall'] == 'yes') {
-                exec (VESTA_CMD."v-add-sys-firewall", $output, $return_var);
+                exec (HESTIA_CMD."v-add-sys-firewall", $output, $return_var);
                 check_return_code($return_var,$output);
                 unset($output);
                 if (empty($_SESSION['error_msg'])) $_SESSION['FIREWALL_SYSTEM'] = 'iptables';
             } else {
-                exec (VESTA_CMD."v-delete-sys-firewall", $output, $return_var);
+                exec (HESTIA_CMD."v-delete-sys-firewall", $output, $return_var);
                 check_return_code($return_var,$output);
                 unset($output);
                 if (empty($_SESSION['error_msg'])) $_SESSION['FIREWALL_SYSTEM'] = '';
@@ -186,7 +186,7 @@ if (!empty($_POST['save'])) {
     // Update mysql pasword
     if (empty($_SESSION['error_msg'])) {
         if (!empty($_POST['v_mysql_password'])) {
-            exec (VESTA_CMD."v-change-database-host-password mysql localhost root '".escapeshellarg($_POST['v_mysql_password'])."'", $output, $return_var);
+            exec (HESTIA_CMD."v-change-database-host-password mysql localhost root '".escapeshellarg($_POST['v_mysql_password'])."'", $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
             $v_db_adv = 'yes';
@@ -196,7 +196,7 @@ if (!empty($_POST['save'])) {
     // Update webmail url
     if (empty($_SESSION['error_msg'])) {
         if ($_POST['v_mail_url'] != $_SESSION['MAIL_URL']) {
-            exec (VESTA_CMD."v-change-sys-config-value MAIL_URL '".escapeshellarg($_POST['v_mail_url'])."'", $output, $return_var);
+            exec (HESTIA_CMD."v-change-sys-config-value MAIL_URL '".escapeshellarg($_POST['v_mail_url'])."'", $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
             $v_mail_adv = 'yes';
@@ -206,7 +206,7 @@ if (!empty($_POST['save'])) {
     // Update phpMyAdmin url
     if (empty($_SESSION['error_msg'])) {
         if ($_POST['v_mysql_url'] != $_SESSION['DB_PMA_URL']) {
-            exec (VESTA_CMD."v-change-sys-config-value DB_PMA_URL '".escapeshellarg($_POST['v_mysql_url'])."'", $output, $return_var);
+            exec (HESTIA_CMD."v-change-sys-config-value DB_PMA_URL '".escapeshellarg($_POST['v_mysql_url'])."'", $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
             $v_db_adv = 'yes';
@@ -216,7 +216,7 @@ if (!empty($_POST['save'])) {
     // Update phpPgAdmin url
     if (empty($_SESSION['error_msg'])) {
         if ($_POST['v_pgsql_url'] != $_SESSION['DB_PGA_URL']) {
-            exec (VESTA_CMD."v-change-sys-config-value DB_PGA_URL '".escapeshellarg($_POST['v_pgsql_url'])."'", $output, $return_var);
+            exec (HESTIA_CMD."v-change-sys-config-value DB_PGA_URL '".escapeshellarg($_POST['v_pgsql_url'])."'", $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
             $v_db_adv = 'yes';
@@ -226,7 +226,7 @@ if (!empty($_POST['save'])) {
     // Disable local backup
     if (empty($_SESSION['error_msg'])) {
         if (($_POST['v_backup'] == 'no') && ($v_backup == 'yes' )) {
-            exec (VESTA_CMD."v-delete-backup-host local", $output, $return_var);
+            exec (HESTIA_CMD."v-delete-backup-host local", $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
             if (empty($_SESSION['error_msg'])) $v_backup = 'no';
@@ -237,7 +237,7 @@ if (!empty($_POST['save'])) {
     // Enable local backups
     if (empty($_SESSION['error_msg'])) {
         if (($_POST['v_backup'] == 'yes') && ($v_backup != 'yes' )) {
-            exec (VESTA_CMD."v-add-backup-host local", $output, $return_var);
+            exec (HESTIA_CMD."v-add-backup-host local", $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
             if (empty($_SESSION['error_msg'])) $v_backup = 'yes';
@@ -248,7 +248,7 @@ if (!empty($_POST['save'])) {
     // Change backup gzip level
     if (empty($_SESSION['error_msg'])) {
         if ($_POST['v_backup_gzip'] != $v_backup_gzip ) {
-            exec (VESTA_CMD."v-change-sys-config-value BACKUP_GZIP ".escapeshellarg($_POST['v_backup_gzip']), $output, $return_var);
+            exec (HESTIA_CMD."v-change-sys-config-value BACKUP_GZIP ".escapeshellarg($_POST['v_backup_gzip']), $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
             if (empty($_SESSION['error_msg'])) $v_backup_gzip = $_POST['v_backup_gzip'];
@@ -259,7 +259,7 @@ if (!empty($_POST['save'])) {
     // Change backup path
     if (empty($_SESSION['error_msg'])) {
         if ($_POST['v_backup_dir'] != $v_backup_dir ) {
-            exec (VESTA_CMD."v-change-sys-config-value BACKUP ".escapeshellarg($_POST['v_backup_dir']), $output, $return_var);
+            exec (HESTIA_CMD."v-change-sys-config-value BACKUP ".escapeshellarg($_POST['v_backup_dir']), $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
             if (empty($_SESSION['error_msg'])) $v_backup_dir = $_POST['v_backup_dir'];
@@ -275,7 +275,7 @@ if (!empty($_POST['save'])) {
             $v_backup_username = escapeshellarg($_POST['v_backup_username']);
             $v_backup_password = escapeshellarg($_POST['v_backup_password']);
             $v_backup_bpath = escapeshellarg($_POST['v_backup_bpath']);
-            exec (VESTA_CMD."v-add-backup-host '". $v_backup_type ."' '". $v_backup_host ."' '". $v_backup_username ."' '". $v_backup_password ."' '". $v_backup_bpath ."'", $output, $return_var);
+            exec (HESTIA_CMD."v-add-backup-host '". $v_backup_type ."' '". $v_backup_host ."' '". $v_backup_username ."' '". $v_backup_password ."' '". $v_backup_bpath ."'", $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
             if (empty($_SESSION['error_msg'])) $v_backup_host = $_POST['v_backup_host'];
@@ -292,7 +292,7 @@ if (!empty($_POST['save'])) {
     // Change remote backup host type
     if (empty($_SESSION['error_msg'])) {
         if ((!empty($_POST['v_backup_host'])) && ($_POST['v_backup_type'] != $v_backup_type)) {
-            exec (VESTA_CMD."v-delete-backup-host '". $v_backup_type ."'", $output, $return_var);
+            exec (HESTIA_CMD."v-delete-backup-host '". $v_backup_type ."'", $output, $return_var);
             unset($output);
 
             $v_backup_host = escapeshellarg($_POST['v_backup_host']);
@@ -300,7 +300,7 @@ if (!empty($_POST['save'])) {
             $v_backup_username = escapeshellarg($_POST['v_backup_username']);
             $v_backup_password = escapeshellarg($_POST['v_backup_password']);
             $v_backup_bpath = escapeshellarg($_POST['v_backup_bpath']);
-            exec (VESTA_CMD."v-add-backup-host '". $v_backup_type ."' '". $v_backup_host ."' '". $v_backup_username ."' '". $v_backup_password ."' '". $v_backup_bpath ."'", $output, $return_var);
+            exec (HESTIA_CMD."v-add-backup-host '". $v_backup_type ."' '". $v_backup_host ."' '". $v_backup_username ."' '". $v_backup_password ."' '". $v_backup_bpath ."'", $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
             if (empty($_SESSION['error_msg'])) $v_backup_host = $_POST['v_backup_host'];
@@ -322,7 +322,7 @@ if (!empty($_POST['save'])) {
                 $v_backup_username = escapeshellarg($_POST['v_backup_username']);
                 $v_backup_password = escapeshellarg($_POST['v_backup_password']);
                 $v_backup_bpath = escapeshellarg($_POST['v_backup_bpath']);
-                exec (VESTA_CMD."v-add-backup-host '". $v_backup_type ."' '". $v_backup_host ."' '". $v_backup_username ."' '". $v_backup_password ."' '". $v_backup_bpath ."'", $output, $return_var);
+                exec (HESTIA_CMD."v-add-backup-host '". $v_backup_type ."' '". $v_backup_host ."' '". $v_backup_username ."' '". $v_backup_password ."' '". $v_backup_bpath ."'", $output, $return_var);
                 check_return_code($return_var,$output);
                 unset($output);
                 if (empty($_SESSION['error_msg'])) $v_backup_host = $_POST['v_backup_host'];
@@ -339,7 +339,7 @@ if (!empty($_POST['save'])) {
     // Delete remote backup host
     if (empty($_SESSION['error_msg'])) {
         if ((empty($_POST['v_backup_host'])) && (!empty($v_backup_host))) {
-            exec (VESTA_CMD."v-delete-backup-host '". $v_backup_type ."'", $output, $return_var);
+            exec (HESTIA_CMD."v-delete-backup-host '". $v_backup_type ."'", $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
             if (empty($_SESSION['error_msg'])) $v_backup_host = '';
@@ -374,12 +374,12 @@ if (!empty($_POST['save'])) {
                 fclose($fp);
             }
 
-            exec (VESTA_CMD."v-change-sys-vesta-ssl ".$tmpdir, $output, $return_var);
+            exec (HESTIA_CMD."v-change-sys-vesta-ssl ".$tmpdir, $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
 
             // List ssl certificate info
-            exec (VESTA_CMD."v-list-sys-vesta-ssl json", $output, $return_var);
+            exec (HESTIA_CMD."v-list-sys-vesta-ssl json", $output, $return_var);
             $ssl_str = json_decode(implode('', $output), true);
             unset($output);
             $v_ssl_crt = $ssl_str['VESTA']['CRT'];
@@ -405,7 +405,7 @@ if (!empty($_POST['save'])) {
         if($_SESSION['SFTPJAIL_KEY'] != $_POST['v_sftp_licence'] && $_POST['v_sftp'] == 'yes'){
             $module = 'sftpjail';
             $licence_key = escapeshellarg($_POST['v_sftp_licence']);
-            exec (VESTA_CMD."v-activate-vesta-license ".$module." ".$licence_key, $output, $return_var);
+            exec (HESTIA_CMD."v-activate-vesta-license ".$module." ".$licence_key, $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
             if (empty($_SESSION['error_msg'])) {
@@ -420,7 +420,7 @@ if (!empty($_POST['save'])) {
         if($_POST['v_sftp'] == 'cancel' && $_SESSION['SFTPJAIL_KEY']){
             $module = 'sftpjail';
             $licence_key = escapeshellarg($_SESSION['SFTPJAIL_KEY']);
-            exec (VESTA_CMD."v-deactivate-vesta-license ".$module." ".$licence_key, $output, $return_var);
+            exec (HESTIA_CMD."v-deactivate-vesta-license ".$module." ".$licence_key, $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
             if (empty($_SESSION['error_msg'])) {
@@ -435,7 +435,7 @@ if (!empty($_POST['save'])) {
         if($_SESSION['FILEMANAGER_KEY'] != $_POST['v_filemanager_licence'] && $_POST['v_filemanager'] == 'yes'){
             $module = 'filemanager';
             $licence_key = escapeshellarg($_POST['v_filemanager_licence']);
-            exec (VESTA_CMD."v-activate-vesta-license ".$module." ".$licence_key, $output, $return_var);
+            exec (HESTIA_CMD."v-activate-vesta-license ".$module." ".$licence_key, $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
             if (empty($_SESSION['error_msg'])) {
@@ -450,7 +450,7 @@ if (!empty($_POST['save'])) {
         if($_POST['v_filemanager'] == 'cancel' && $_SESSION['FILEMANAGER_KEY']){
             $module = 'filemanager';
             $licence_key = escapeshellarg($_SESSION['FILEMANAGER_KEY']);
-            exec (VESTA_CMD."v-deactivate-vesta-license ".$module." ".$licence_key, $output, $return_var);
+            exec (HESTIA_CMD."v-deactivate-vesta-license ".$module." ".$licence_key, $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
             if (empty($_SESSION['error_msg'])) {
@@ -463,7 +463,7 @@ if (!empty($_POST['save'])) {
     // activating softaculous
     if (empty($_SESSION['error_msg'])) {
         if($_SESSION['SOFTACULOUS'] != $_POST['v_softaculous'] && $_POST['v_softaculous'] == 'yes'){
-            exec (VESTA_CMD."v-add-vesta-softaculous WEB", $output, $return_var);
+            exec (HESTIA_CMD."v-add-vesta-softaculous WEB", $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
             if (empty($_SESSION['error_msg'])) {
@@ -476,7 +476,7 @@ if (!empty($_POST['save'])) {
     // disable softaculous
     if (empty($_SESSION['error_msg'])) {
         if($_SESSION['SOFTACULOUS'] != $_POST['v_softaculous'] && $_POST['v_softaculous'] == 'no'){
-            exec (VESTA_CMD."v-delete-vesta-softaculous", $output, $return_var);
+            exec (HESTIA_CMD."v-delete-vesta-softaculous", $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
             if (empty($_SESSION['error_msg'])) {
@@ -489,7 +489,7 @@ if (!empty($_POST['save'])) {
 }
 
 // Check system configuration
-exec (VESTA_CMD . "v-list-sys-config json", $output, $return_var);
+exec (HESTIA_CMD . "v-list-sys-config json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
 unset($output);
 

web/edit/server/mariadb/index.php

@@ -31,7 +31,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_config']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." mariadb ".$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." mariadb ".$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -45,7 +45,7 @@ if (!empty($_POST['save'])) {
 }
 
 // List config
-exec (VESTA_CMD."v-list-sys-mysql-config json", $output, $return_var);
+exec (HESTIA_CMD."v-list-sys-mysql-config json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
 unset($output);
 $v_max_user_connections = $data['CONFIG']['max_user_connections'];
@@ -57,7 +57,7 @@ $v_config_path = $data['CONFIG']['config_path'];
 $v_service_name = strtoupper('mariadb');
 
 # Read config
-$v_config = shell_exec(VESTA_CMD."v-open-fs-config ".$v_config_path);
+$v_config = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_config_path);
 
 // Render page
 render_page($user, $TAB, 'edit_server_mysql');

web/edit/server/mysql/index.php

@@ -31,7 +31,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_config']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." mysql ".$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." mysql ".$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -45,7 +45,7 @@ if (!empty($_POST['save'])) {
 }
 
 // List config
-exec (VESTA_CMD."v-list-sys-mysql-config json", $output, $return_var);
+exec (HESTIA_CMD."v-list-sys-mysql-config json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
 unset($output);
 $v_max_user_connections = $data['CONFIG']['max_user_connections'];
@@ -57,7 +57,7 @@ $v_config_path = $data['CONFIG']['config_path'];
 $v_service_name = strtoupper('mysql');
 
 # Read config
-$v_config = shell_exec(VESTA_CMD."v-open-fs-config ".$v_config_path);
+$v_config = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_config_path);
 
 // Render page
 render_page($user, $TAB, 'edit_server_mysql');

web/edit/server/mysqld/index.php

@@ -31,7 +31,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_config']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." mysqld ".$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." mysqld ".$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -45,7 +45,7 @@ if (!empty($_POST['save'])) {
 }
 
 // List config
-exec (VESTA_CMD."v-list-sys-mysql-config json", $output, $return_var);
+exec (HESTIA_CMD."v-list-sys-mysql-config json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
 unset($output);
 $v_max_user_connections = $data['CONFIG']['max_user_connections'];
@@ -57,7 +57,7 @@ $v_config_path = $data['CONFIG']['config_path'];
 $v_service_name = strtoupper('mysql');
 
 # Read config
-$v_config = shell_exec(VESTA_CMD."v-open-fs-config ".$v_config_path);
+$v_config = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_config_path);
 
 // Render page
 render_page($user, $TAB, 'edit_server_mysql');

web/edit/server/named/index.php

@@ -31,7 +31,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_config']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." named ".$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." named ".$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -48,7 +48,7 @@ $v_config_path = '/etc/named.conf';
 $v_service_name = strtoupper('named');
 
 // Read config
-$v_config = shell_exec(VESTA_CMD."v-open-fs-config ".$v_config_path);
+$v_config = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_config_path);
 
 // Render page
 render_page($user, $TAB, 'edit_server_service');

web/edit/server/nginx/index.php

@@ -31,7 +31,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_config']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." nginx ".$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." nginx ".$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -45,7 +45,7 @@ if (!empty($_POST['save'])) {
 }
 
 // List config
-exec (VESTA_CMD."v-list-sys-nginx-config json", $output, $return_var);
+exec (HESTIA_CMD."v-list-sys-nginx-config json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
 unset($output);
 $v_worker_processes = $data['CONFIG']['worker_processes'];
@@ -62,7 +62,7 @@ $v_config_path = $data['CONFIG']['config_path'];
 $v_service_name = strtoupper('nginx');
 
 // Read config
-$v_config = shell_exec(VESTA_CMD."v-open-fs-config ".$v_config_path);
+$v_config = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_config_path);
 
 // Render page
 render_page($user, $TAB, 'edit_server_nginx');

web/edit/server/php-fpm/index.php

@@ -31,7 +31,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_config']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." php ".$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." php ".$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -45,7 +45,7 @@ if (!empty($_POST['save'])) {
 }
 
 // List config
-exec (VESTA_CMD."v-list-sys-php-config json", $output, $return_var);
+exec (HESTIA_CMD."v-list-sys-php-config json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
 unset($output);
 $v_memory_limit = $data['CONFIG']['memory_limit'];
@@ -58,7 +58,7 @@ $v_error_reporting = $data['CONFIG']['error_reporting'];
 $v_config_path = $data['CONFIG']['config_path'];
 
 # Read config
-$v_config = shell_exec(VESTA_CMD."v-open-fs-config ".$v_config_path);
+$v_config = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_config_path);
 
 // Render page
 render_page($user, $TAB, 'edit_server_php');

web/edit/server/php/index.php

@@ -31,7 +31,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_config']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." php ".$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." php ".$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -45,7 +45,7 @@ if (!empty($_POST['save'])) {
 }
 
 // List config
-exec (VESTA_CMD."v-list-sys-php-config json", $output, $return_var);
+exec (HESTIA_CMD."v-list-sys-php-config json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
 unset($output);
 $v_memory_limit = $data['CONFIG']['memory_limit'];
@@ -58,7 +58,7 @@ $v_error_reporting = $data['CONFIG']['error_reporting'];
 $v_config_path = $data['CONFIG']['config_path'];
 
 # Read config
-$v_config = shell_exec(VESTA_CMD."v-open-fs-config ".$v_config_path);
+$v_config = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_config_path);
 
 // Render page
 render_page($user, $TAB, 'edit_server_php');

web/edit/server/php5-fpm/index.php

@@ -31,7 +31,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_config']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." php ".$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." php ".$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -45,7 +45,7 @@ if (!empty($_POST['save'])) {
 }
 
 // List config
-exec (VESTA_CMD."v-list-sys-php-config json", $output, $return_var);
+exec (HESTIA_CMD."v-list-sys-php-config json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
 unset($output);
 $v_memory_limit = $data['CONFIG']['memory_limit'];
@@ -58,7 +58,7 @@ $v_error_reporting = $data['CONFIG']['error_reporting'];
 $v_config_path = $data['CONFIG']['config_path'];
 
 # Read config
-$v_config = shell_exec(VESTA_CMD."v-open-fs-config ".$v_config_path);
+$v_config = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_config_path);
 
 // Render page
 render_page($user, $TAB, 'edit_server_php');

web/edit/server/postgresql/index.php

@@ -31,7 +31,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_options']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." postgresql-hba ".$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." postgresql-hba ".$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -44,7 +44,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_config']));
         fclose($new_conf);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." postgresql " .$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." postgresql " .$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -58,7 +58,7 @@ if (!empty($_POST['save'])) {
 }
 
 // List config
-exec (VESTA_CMD."v-list-sys-pgsql-config json", $output, $return_var);
+exec (HESTIA_CMD."v-list-sys-pgsql-config json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
 unset($output);
 
@@ -67,8 +67,8 @@ $v_config_path = $data['CONFIG']['config_path'];
 $v_service_name = strtoupper('postgresql');
 
 // Read config
-$v_options = shell_exec(VESTA_CMD."v-open-fs-config ".$v_options_path);
-$v_config = shell_exec(VESTA_CMD."v-open-fs-config ".$v_config_path);
+$v_options = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_options_path);
+$v_config = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_config_path);
 
 // Render page
 render_page($user, $TAB, 'edit_server_pgsql');

web/edit/server/proftpd/index.php

@@ -31,7 +31,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_config']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." proftpd ".$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." proftpd ".$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -44,11 +44,11 @@ if (!empty($_POST['save'])) {
 
 }
 
-$v_config_path = shell_exec(VESTA_CMD.'v-list-sys-proftpd-config plain');
+$v_config_path = shell_exec(HESTIA_CMD.'v-list-sys-proftpd-config plain');
 $v_service_name = strtoupper('proftpd');
 
 // Read config
-$v_config = shell_exec(VESTA_CMD."v-open-fs-config ".$v_config_path);
+$v_config = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_config_path);
 
 // Render page
 render_page($user, $TAB, 'edit_server_service');

web/edit/server/spamassassin/index.php

@@ -31,7 +31,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_config']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." spamassassin ".$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." spamassassin ".$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -44,11 +44,11 @@ if (!empty($_POST['save'])) {
 
 }
 
-$v_config_path = shell_exec(VESTA_CMD.'v-list-sys-spamd-config plain');
+$v_config_path = shell_exec(HESTIA_CMD.'v-list-sys-spamd-config plain');
 $v_service_name = strtoupper('spamassassin');
 
 // Read config
-$v_config = shell_exec(VESTA_CMD."v-open-fs-config ".$v_config_path);
+$v_config = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_config_path);
 
 // Render page
 render_page($user, $TAB, 'edit_server_service');

web/edit/server/spamd/index.php

@@ -31,7 +31,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_config']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." spamd ".$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." spamd ".$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -44,11 +44,11 @@ if (!empty($_POST['save'])) {
 
 }
 
-$v_config_path = shell_exec(VESTA_CMD.'v-list-sys-spamd-config plain');
+$v_config_path = shell_exec(HESTIA_CMD.'v-list-sys-spamd-config plain');
 $v_service_name = strtoupper('spamassassin');
 
 // Read config
-$v_config = shell_exec(VESTA_CMD."v-open-fs-config ".$v_config_path);
+$v_config = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_config_path);
 
 // Render page
 render_page($user, $TAB, 'edit_server_service');

web/edit/server/vsftpd/index.php

@@ -31,7 +31,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($new_conf, 'w');
         fwrite($fp, str_replace("\r\n", "\n",  $_POST['v_config']));
         fclose($fp);
-        exec (VESTA_CMD."v-change-sys-service-config ".$new_conf." vsftpd ".$v_restart, $output, $return_var);
+        exec (HESTIA_CMD."v-change-sys-service-config ".$new_conf." vsftpd ".$v_restart, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($new_conf);
@@ -44,11 +44,11 @@ if (!empty($_POST['save'])) {
 
 }
 
-$v_config_path = shell_exec(VESTA_CMD.'v-list-sys-vsftpd-config plain');
+$v_config_path = shell_exec(HESTIA_CMD.'v-list-sys-vsftpd-config plain');
 $v_service_name = strtoupper('vsftpd');
 
 // Read config
-$v_config = shell_exec(VESTA_CMD."v-open-fs-config ".$v_config_path);
+$v_config = shell_exec(HESTIA_CMD."v-open-fs-config ".$v_config_path);
 
 // Render page
 render_page($user, $TAB, 'edit_server_service');

web/edit/user/index.php

@@ -23,7 +23,7 @@ if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
 }
 
 // List user
-exec (VESTA_CMD."v-list-user ".escapeshellarg($v_username)." json", $output, $return_var);
+exec (HESTIA_CMD."v-list-user ".escapeshellarg($v_username)." json", $output, $return_var);
 check_return_code($return_var,$output);
 $data = json_decode(implode('', $output), true);
 unset($output);
@@ -57,17 +57,17 @@ $v_time = $data[$v_username]['TIME'];
 $v_date = $data[$v_username]['DATE'];
 
 // List packages
-exec (VESTA_CMD."v-list-user-packages json", $output, $return_var);
+exec (HESTIA_CMD."v-list-user-packages json", $output, $return_var);
 $packages = json_decode(implode('', $output), true);
 unset($output);
 
 // List languages
-exec (VESTA_CMD."v-list-sys-languages json", $output, $return_var);
+exec (HESTIA_CMD."v-list-sys-languages json", $output, $return_var);
 $languages = json_decode(implode('', $output), true);
 unset($output);
 
 // List shells
-exec (VESTA_CMD."v-list-sys-shells json", $output, $return_var);
+exec (HESTIA_CMD."v-list-sys-shells json", $output, $return_var);
 $shells = json_decode(implode('', $output), true);
 unset($output);
 
@@ -88,7 +88,7 @@ if (!empty($_POST['save'])) {
         $fp = fopen($v_password, "w");
         fwrite($fp, $_POST['v_password']."\n");
         fclose($fp);
-        exec (VESTA_CMD."v-change-user-password ".escapeshellarg($v_username)." ".$v_password, $output, $return_var);
+        exec (HESTIA_CMD."v-change-user-password ".escapeshellarg($v_username)." ".$v_password, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($v_password);
@@ -98,7 +98,7 @@ if (!empty($_POST['save'])) {
     // Change package (admin only)
     if (($v_package != $_POST['v_package']) && ($_SESSION['user'] == 'admin') && (empty($_SESSION['error_msg']))) {
         $v_package = escapeshellarg($_POST['v_package']);
-        exec (VESTA_CMD."v-change-user-package ".escapeshellarg($v_username)." ".$v_package, $output, $return_var);
+        exec (HESTIA_CMD."v-change-user-package ".escapeshellarg($v_username)." ".$v_package, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
     }
@@ -106,7 +106,7 @@ if (!empty($_POST['save'])) {
     // Change language
     if (($v_language != $_POST['v_language']) && (empty($_SESSION['error_msg']))) {
         $v_language = escapeshellarg($_POST['v_language']);
-        exec (VESTA_CMD."v-change-user-language ".escapeshellarg($v_username)." ".$v_language, $output, $return_var);
+        exec (HESTIA_CMD."v-change-user-language ".escapeshellarg($v_username)." ".$v_language, $output, $return_var);
         check_return_code($return_var,$output);
         if (empty($_SESSION['error_msg'])) {
              if ((empty($_GET['user'])) || ($_GET['user'] == $_SESSION['user'])) $_SESSION['language'] = $_POST['v_language'];
@@ -117,7 +117,7 @@ if (!empty($_POST['save'])) {
     // Change shell (admin only)
     if (($v_shell != $_POST['v_shell']) && ($_SESSION['user'] == 'admin') && (empty($_SESSION['error_msg']))) {
         $v_shell = escapeshellarg($_POST['v_shell']);
-        exec (VESTA_CMD."v-change-user-shell ".escapeshellarg($v_username)." ".$v_shell, $output, $return_var);
+        exec (HESTIA_CMD."v-change-user-shell ".escapeshellarg($v_username)." ".$v_shell, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
     }
@@ -128,7 +128,7 @@ if (!empty($_POST['save'])) {
             $_SESSION['error_msg'] = __('Please enter valid email address.');
         } else {
             $v_email = escapeshellarg($_POST['v_email']);
-            exec (VESTA_CMD."v-change-user-contact ".escapeshellarg($v_username)." ".$v_email, $output, $return_var);
+            exec (HESTIA_CMD."v-change-user-contact ".escapeshellarg($v_username)." ".$v_email, $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
         }
@@ -138,7 +138,7 @@ if (!empty($_POST['save'])) {
     if (($v_fname != $_POST['v_fname']) || ($v_lname != $_POST['v_lname']) && (empty($_SESSION['error_msg']))) {
         $v_fname = escapeshellarg($_POST['v_fname']);
         $v_lname = escapeshellarg($_POST['v_lname']);
-        exec (VESTA_CMD."v-change-user-name ".escapeshellarg($v_username)." ".$v_fname." ".$v_lname, $output, $return_var);
+        exec (HESTIA_CMD."v-change-user-name ".escapeshellarg($v_username)." ".$v_fname." ".$v_lname, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         $v_fname = $_POST['v_fname'];
@@ -156,7 +156,7 @@ if (!empty($_POST['save'])) {
         $v_ns6 = escapeshellarg($_POST['v_ns6']);
         $v_ns7 = escapeshellarg($_POST['v_ns7']);
         $v_ns8 = escapeshellarg($_POST['v_ns8']);
-        $ns_cmd = VESTA_CMD."v-change-user-ns ".escapeshellarg($v_username)." ".$v_ns1." ".$v_ns2;
+        $ns_cmd = HESTIA_CMD."v-change-user-ns ".escapeshellarg($v_username)." ".$v_ns1." ".$v_ns2;
         if (!empty($_POST['v_ns3'])) $ns_cmd = $ns_cmd." ".$v_ns3;
         if (!empty($_POST['v_ns4'])) $ns_cmd = $ns_cmd." ".$v_ns4;
         if (!empty($_POST['v_ns5'])) $ns_cmd = $ns_cmd." ".$v_ns5;

web/edit/web/index.php

@@ -20,7 +20,7 @@ if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
 
 // List domain
 $v_domain = escapeshellarg($_GET['domain']);
-exec (VESTA_CMD."v-list-web-domain ".$user." ".$v_domain." json", $output, $return_var);
+exec (HESTIA_CMD."v-list-web-domain ".$user." ".$v_domain." json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
 unset($output);
 
@@ -36,7 +36,7 @@ $v_cgi = $data[$v_domain]['CGI'];
 $v_elog = $data[$v_domain]['ELOG'];
 $v_ssl = $data[$v_domain]['SSL'];
 if (!empty($v_ssl)) {
-    exec (VESTA_CMD."v-list-web-domain-ssl ".$user." '".$v_domain."' json", $output, $return_var);
+    exec (HESTIA_CMD."v-list-web-domain-ssl ".$user." '".$v_domain."' json", $output, $return_var);
     $ssl_str = json_decode(implode('', $output), true);
     unset($output);
     $v_ssl_crt = $ssl_str[$v_domain]['CRT'];
@@ -76,31 +76,31 @@ $v_time = $data[$v_domain]['TIME'];
 $v_date = $data[$v_domain]['DATE'];
 
 // List ip addresses
-exec (VESTA_CMD."v-list-user-ips ".$user." json", $output, $return_var);
+exec (HESTIA_CMD."v-list-user-ips ".$user." json", $output, $return_var);
 $ips = json_decode(implode('', $output), true);
 unset($output);
 
 // List web templates
-exec (VESTA_CMD."v-list-web-templates json", $output, $return_var);
+exec (HESTIA_CMD."v-list-web-templates json", $output, $return_var);
 $templates = json_decode(implode('', $output), true);
 unset($output);
 
 // List backend templates
 if (!empty($_SESSION['WEB_BACKEND'])) {
-    exec (VESTA_CMD."v-list-web-templates-backend json", $output, $return_var);
+    exec (HESTIA_CMD."v-list-web-templates-backend json", $output, $return_var);
     $backend_templates = json_decode(implode('', $output), true);
     unset($output);
 }
 
 // List proxy templates
 if (!empty($_SESSION['PROXY_SYSTEM'])) {
-    exec (VESTA_CMD."v-list-web-templates-proxy json", $output, $return_var);
+    exec (HESTIA_CMD."v-list-web-templates-proxy json", $output, $return_var);
     $proxy_templates = json_decode(implode('', $output), true);
     unset($output);
 }
 
 // List web stat engines
-exec (VESTA_CMD."v-list-web-stats json", $output, $return_var);
+exec (HESTIA_CMD."v-list-web-stats json", $output, $return_var);
 $stats = json_decode(implode('', $output), true);
 unset($output);
 
@@ -117,7 +117,7 @@ if (!empty($_POST['save'])) {
     // Change web domain IP
     if (($v_ip != $_POST['v_ip']) && (empty($_SESSION['error_msg']))) {
         $v_ip = escapeshellarg($_POST['v_ip']);
-        exec (VESTA_CMD."v-change-web-domain-ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var);
+        exec (HESTIA_CMD."v-change-web-domain-ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var);
         check_return_code($return_var,$output);
         $restart_web = 'yes';
         $restart_proxy = 'yes';
@@ -126,10 +126,10 @@ if (!empty($_POST['save'])) {
 
     // Chane dns domain IP
     if (($v_ip != $_POST['v_ip']) && (empty($_SESSION['error_msg'])))  {
-        exec (VESTA_CMD."v-list-dns-domain ".$v_username." ".$v_domain." json", $output, $return_var);
+        exec (HESTIA_CMD."v-list-dns-domain ".$v_username." ".$v_domain." json", $output, $return_var);
         unset($output);
         if ($return_var == 0 ) {
-            exec (VESTA_CMD."v-change-dns-domain-ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var);
+            exec (HESTIA_CMD."v-change-dns-domain-ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
             $restart_dns = 'yes';
@@ -139,10 +139,10 @@ if (!empty($_POST['save'])) {
     // Change dns ip for each alias
     if (($v_ip != $_POST['v_ip']) && (empty($_SESSION['error_msg']))) {
         foreach($valiases as $v_alias ){
-            exec (VESTA_CMD."v-list-dns-domain ".$v_username." '".$v_alias."' json", $output, $return_var);
+            exec (HESTIA_CMD."v-list-dns-domain ".$v_username." '".$v_alias."' json", $output, $return_var);
             unset($output);
             if ($return_var == 0 ) {
-                exec (VESTA_CMD."v-change-dns-domain-ip ".$v_username." '".$v_alias."' ".$v_ip, $output, $return_var);
+                exec (HESTIA_CMD."v-change-dns-domain-ip ".$v_username." '".$v_alias."' ".$v_ip, $output, $return_var);
                 check_return_code($return_var,$output);
                 unset($output);
                 $restart_dns = 'yes';
@@ -153,7 +153,7 @@ if (!empty($_POST['save'])) {
     // Change template
     if (($v_template != $_POST['v_template']) && (empty($_SESSION['error_msg']))) {
         $v_template = escapeshellarg($_POST['v_template']);
-        exec (VESTA_CMD."v-change-web-domain-tpl ".$v_username." ".$v_domain." ".$v_template." 'no'", $output, $return_var);
+        exec (HESTIA_CMD."v-change-web-domain-tpl ".$v_username." ".$v_domain." ".$v_template." 'no'", $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         $restart_web = 'yes';
@@ -173,15 +173,15 @@ if (!empty($_POST['save'])) {
                 $restart_web = 'yes';
                 $restart_proxy = 'yes';
                 $v_template = escapeshellarg($_POST['v_template']);
-                exec (VESTA_CMD."v-delete-web-domain-alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var);
+                exec (HESTIA_CMD."v-delete-web-domain-alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var);
                 check_return_code($return_var,$output);
                 unset($output);
 
                 if (empty($_SESSION['error_msg'])) {
-                    exec (VESTA_CMD."v-list-dns-domain ".$v_username." ".$v_domain, $output, $return_var);
+                    exec (HESTIA_CMD."v-list-dns-domain ".$v_username." ".$v_domain, $output, $return_var);
                     unset($output);
                     if ($return_var == 0) {
-                        exec (VESTA_CMD."v-delete-dns-on-web-alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var);
+                        exec (HESTIA_CMD."v-delete-dns-on-web-alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var);
                         check_return_code($return_var,$output);
                         unset($output);
                         $restart_dns = 'yes';
@@ -196,14 +196,14 @@ if (!empty($_POST['save'])) {
                 $restart_web = 'yes';
                 $restart_proxy = 'yes';
                 $v_template = escapeshellarg($_POST['v_template']);
-                exec (VESTA_CMD."v-add-web-domain-alias ".$v_username." ".$v_domain." ".escapeshellarg($alias)." 'no'", $output, $return_var);
+                exec (HESTIA_CMD."v-add-web-domain-alias ".$v_username." ".$v_domain." ".escapeshellarg($alias)." 'no'", $output, $return_var);
                 check_return_code($return_var,$output);
                 unset($output);
                 if (empty($_SESSION['error_msg'])) {
-                    exec (VESTA_CMD."v-list-dns-domain ".$v_username." ".$v_domain, $output, $return_var);
+                    exec (HESTIA_CMD."v-list-dns-domain ".$v_username." ".$v_domain, $output, $return_var);
                     unset($output);
                     if ($return_var == 0) {
-                        exec (VESTA_CMD."v-add-dns-on-web-alias ".$v_username." ".escapeshellarg($alias)." ".$v_ip." no", $output, $return_var);
+                        exec (HESTIA_CMD."v-add-dns-on-web-alias ".$v_username." ".escapeshellarg($alias)." ".$v_ip." no", $output, $return_var);
                         check_return_code($return_var,$output);
                     unset($output);
                         $restart_dns = 'yes';
@@ -216,14 +216,14 @@ if (!empty($_POST['save'])) {
     // Change backend template
     if ((!empty($_SESSION['WEB_BACKEND'])) && ( $v_backend_template != $_POST['v_backend_template']) && ( $_SESSION['user'] == 'admin') && (empty($_SESSION['error_msg']))) {
         $v_backend_template = $_POST['v_backend_template'];
-        exec (VESTA_CMD."v-change-web-domain-backend-tpl ".$v_username." ".$v_domain." ".escapeshellarg($v_backend_template), $output, $return_var);
+        exec (HESTIA_CMD."v-change-web-domain-backend-tpl ".$v_username." ".$v_domain." ".escapeshellarg($v_backend_template), $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
     }
 
     // Delete proxy support
     if ((!empty($_SESSION['PROXY_SYSTEM'])) && (!empty($v_proxy)) && (empty($_POST['v_proxy'])) && (empty($_SESSION['error_msg']))) {
-        exec (VESTA_CMD."v-delete-web-domain-proxy ".$v_username." ".$v_domain." 'no'", $output, $return_var);
+        exec (HESTIA_CMD."v-delete-web-domain-proxy ".$v_username." ".$v_domain." 'no'", $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unset($v_proxy);
@@ -240,7 +240,7 @@ if (!empty($_POST['save'])) {
         if (( $v_proxy_template != $_POST['v_proxy_template']) || ($v_proxy_ext != $ext)) {
             $ext = str_replace(', ', ",", $ext);
             if (!empty($_POST['v_proxy_template'])) $v_proxy_template = $_POST['v_proxy_template'];
-            exec (VESTA_CMD."v-change-web-domain-proxy-tpl ".$v_username." ".$v_domain." ".escapeshellarg($v_proxy_template)." ".escapeshellarg($ext)." 'no'", $output, $return_var);
+            exec (HESTIA_CMD."v-change-web-domain-proxy-tpl ".$v_username." ".$v_domain." ".escapeshellarg($v_proxy_template)." ".escapeshellarg($ext)." 'no'", $output, $return_var);
             check_return_code($return_var,$output);
             $v_proxy_ext = str_replace(',', ', ', $ext);
             unset($output);
@@ -259,7 +259,7 @@ if (!empty($_POST['save'])) {
             $ext = str_replace(' ', ",", $ext);
             $v_proxy_ext = str_replace(',', ', ', $ext);
         }
-        exec (VESTA_CMD."v-add-web-domain-proxy ".$v_username." ".$v_domain." ".escapeshellarg($v_proxy_template)." ".escapeshellarg($ext)." 'no'", $output, $return_var);
+        exec (HESTIA_CMD."v-add-web-domain-proxy ".$v_username." ".$v_domain." ".escapeshellarg($v_proxy_template)." ".escapeshellarg($ext)." 'no'", $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         $restart_proxy = 'yes';
@@ -269,7 +269,7 @@ if (!empty($_POST['save'])) {
     if (( $v_ssl == 'yes') && (!empty($_POST['v_ssl'])) && (empty($_SESSION['error_msg']))) {
         if ( $v_ssl_home != $_POST['v_ssl_home'] ) {
             $v_ssl_home = escapeshellarg($_POST['v_ssl_home']);
-            exec (VESTA_CMD."v-change-web-domain-sslhome ".$user." ".$v_domain." ".$v_ssl_home." 'no'", $output, $return_var);
+            exec (HESTIA_CMD."v-change-web-domain-sslhome ".$user." ".$v_domain." ".$v_ssl_home." 'no'", $output, $return_var);
             check_return_code($return_var,$output);
             $v_ssl_home = $_POST['v_ssl_home'];
             $restart_web = 'yes';
@@ -308,13 +308,13 @@ if (!empty($_POST['save'])) {
                 fclose($fp);
             }
 
-            exec (VESTA_CMD."v-change-web-domain-sslcert ".$user." ".$v_domain." ".$tmpdir." 'no'", $output, $return_var);
+            exec (HESTIA_CMD."v-change-web-domain-sslcert ".$user." ".$v_domain." ".$tmpdir." 'no'", $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
             $restart_web = 'yes';
             $restart_proxy = 'yes';
 
-            exec (VESTA_CMD."v-list-web-domain-ssl ".$user." '".$v_domain."' json", $output, $return_var);
+            exec (HESTIA_CMD."v-list-web-domain-ssl ".$user." '".$v_domain."' json", $output, $return_var);
             $ssl_str = json_decode(implode('', $output), true);
             unset($output);
             $v_ssl_crt = $ssl_str[$v_domain]['CRT'];
@@ -338,7 +338,7 @@ if (!empty($_POST['save'])) {
 
     // Delete Lets Encrypt support
     if (( $v_letsencrypt == 'yes' ) && (empty($_POST['v_letsencrypt'])) && (empty($_SESSION['error_msg']))) {
-        exec (VESTA_CMD."v-delete-letsencrypt-domain ".$user." ".$v_domain." 'no'", $output, $return_var);
+        exec (HESTIA_CMD."v-delete-letsencrypt-domain ".$user." ".$v_domain." 'no'", $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         $v_ssl_crt = '';
@@ -353,7 +353,7 @@ if (!empty($_POST['save'])) {
 
     // Delete SSL certificate
     if (( $v_ssl == 'yes' ) && (empty($_POST['v_ssl'])) && (empty($_SESSION['error_msg']))) {
-        exec (VESTA_CMD."v-delete-web-domain-ssl ".$v_username." ".$v_domain." 'no'", $output, $return_var);
+        exec (HESTIA_CMD."v-delete-web-domain-ssl ".$v_username." ".$v_domain." 'no'", $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         $v_ssl_crt = '';
@@ -367,7 +367,7 @@ if (!empty($_POST['save'])) {
     // Add Lets Encrypt support
     if ((!empty($_POST['v_ssl'])) && ( $v_letsencrypt == 'no' ) && (!empty($_POST['v_letsencrypt'])) && empty($_SESSION['error_msg'])) {
         $l_aliases = str_replace("\n", ',', $v_aliases);
-        exec (VESTA_CMD."v-add-letsencrypt-domain ".$user." ".$v_domain." '".$l_aliases."' 'no'", $output, $return_var);
+        exec (HESTIA_CMD."v-add-letsencrypt-domain ".$user." ".$v_domain." '".$l_aliases."' 'no'", $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         $v_letsencrypt = 'yes';
@@ -415,14 +415,14 @@ if (!empty($_POST['save'])) {
                 fwrite($fp, str_replace("\r\n", "\n", $_POST['v_ssl_ca']));
                 fclose($fp);
             }
-            exec (VESTA_CMD."v-add-web-domain-ssl ".$user." ".$v_domain." ".$tmpdir." ".$v_ssl_home." 'no'", $output, $return_var);
+            exec (HESTIA_CMD."v-add-web-domain-ssl ".$user." ".$v_domain." ".$tmpdir." ".$v_ssl_home." 'no'", $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
             $v_ssl = 'yes';
             $restart_web = 'yes';
             $restart_proxy = 'yes';
 
-            exec (VESTA_CMD."v-list-web-domain-ssl ".$user." '".$v_domain."' json", $output, $return_var);
+            exec (HESTIA_CMD."v-list-web-domain-ssl ".$user." '".$v_domain."' json", $output, $return_var);
             $ssl_str = json_decode(implode('', $output), true);
             unset($output);
             $v_ssl_crt = $ssl_str[$_POST['v_domain']]['CRT'];
@@ -448,7 +448,7 @@ if (!empty($_POST['save'])) {
 
     // Delete web stats
     if ((!empty($v_stats)) && ($_POST['v_stats'] == 'none') && (empty($_SESSION['error_msg']))) {
-        exec (VESTA_CMD."v-delete-web-domain-stats ".$v_username." ".$v_domain, $output, $return_var);
+        exec (HESTIA_CMD."v-delete-web-domain-stats ".$v_username." ".$v_domain, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         $v_stats = '';
@@ -457,7 +457,7 @@ if (!empty($_POST['save'])) {
     // Change web stats engine
     if ((!empty($v_stats)) && ($_POST['v_stats'] != $v_stats) && (empty($_SESSION['error_msg']))) {
         $v_stats = escapeshellarg($_POST['v_stats']);
-        exec (VESTA_CMD."v-change-web-domain-stats ".$v_username." ".$v_domain." ".$v_stats, $output, $return_var);
+        exec (HESTIA_CMD."v-change-web-domain-stats ".$v_username." ".$v_domain." ".$v_stats, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
     }
@@ -465,14 +465,14 @@ if (!empty($_POST['save'])) {
     // Add web stats
     if ((empty($v_stats)) && ($_POST['v_stats'] != 'none') && (empty($_SESSION['error_msg']))) {
         $v_stats = escapeshellarg($_POST['v_stats']);
-        exec (VESTA_CMD."v-add-web-domain-stats ".$v_username." ".$v_domain." ".$v_stats, $output, $return_var);
+        exec (HESTIA_CMD."v-add-web-domain-stats ".$v_username." ".$v_domain." ".$v_stats, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
     }
 
     // Delete web stats authorization
     if ((!empty($v_stats_user)) && (empty($_POST['v_stats_auth'])) && (empty($_SESSION['error_msg']))) {
-        exec (VESTA_CMD."v-delete-web-domain-stats-user ".$v_username." ".$v_domain, $output, $return_var);
+        exec (HESTIA_CMD."v-delete-web-domain-stats-user ".$v_username." ".$v_domain, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         $v_stats_user = '';
@@ -497,7 +497,7 @@ if (!empty($_POST['save'])) {
             $fp = fopen($v_stats_password, "w");
             fwrite($fp, $_POST['v_stats_password']."\n");
             fclose($fp);
-            exec (VESTA_CMD."v-add-web-domain-stats-user ".$v_username." ".$v_domain." ".$v_stats_user." ".$v_stats_password, $output, $return_var);
+            exec (HESTIA_CMD."v-add-web-domain-stats-user ".$v_username." ".$v_domain." ".$v_stats_user." ".$v_stats_password, $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
             unlink($v_stats_password);
@@ -524,7 +524,7 @@ if (!empty($_POST['save'])) {
             $fp = fopen($v_stats_password, "w");
             fwrite($fp, $_POST['v_stats_password']."\n");
             fclose($fp);
-            exec (VESTA_CMD."v-add-web-domain-stats-user ".$v_username." ".$v_domain." ".$v_stats_user." ".$v_stats_password, $output, $return_var);
+            exec (HESTIA_CMD."v-add-web-domain-stats-user ".$v_username." ".$v_domain." ".$v_stats_user." ".$v_stats_password, $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
             unlink($v_stats_password);
@@ -565,7 +565,7 @@ if (!empty($_POST['save'])) {
                     $fp = fopen($v_ftp_password, "w");
                     fwrite($fp, $v_ftp_user_data['v_ftp_password']."\n");
                     fclose($fp);
-                    exec (VESTA_CMD."v-add-web-domain-ftp ".$v_username." ".$v_domain." ".$v_ftp_user." ".$v_ftp_password . " " . $v_ftp_path, $output, $return_var);
+                    exec (HESTIA_CMD."v-add-web-domain-ftp ".$v_username." ".$v_domain." ".$v_ftp_user." ".$v_ftp_password . " " . $v_ftp_path, $output, $return_var);
                     check_return_code($return_var,$output);
                     if ((!empty($v_ftp_user_data['v_ftp_email'])) && (empty($_SESSION['error_msg']))) {
                         $to = $v_ftp_user_data['v_ftp_email'];
@@ -604,7 +604,7 @@ if (!empty($_POST['save'])) {
             // Delete FTP account
             if ($v_ftp_user_data['delete'] == 1) {
                 $v_ftp_username = $user . '_' . $v_ftp_user_data['v_ftp_user'];
-                exec (VESTA_CMD."v-delete-web-domain-ftp ".$v_username." ".$v_domain." ".$v_ftp_username, $output, $return_var);
+                exec (HESTIA_CMD."v-delete-web-domain-ftp ".$v_username." ".$v_domain." ".$v_ftp_username, $output, $return_var);
                 check_return_code($return_var,$output);
                 unset($output);
 
@@ -630,7 +630,7 @@ if (!empty($_POST['save'])) {
                 $v_ftp_username = escapeshellarg($v_ftp_username);
                     $v_ftp_path = escapeshellarg(trim($v_ftp_user_data['v_ftp_path']));
                     if(escapeshellarg(trim($v_ftp_user_data['v_ftp_path_prev'])) != $v_ftp_path) {
-                        exec (VESTA_CMD."v-change-web-domain-ftp-path ".$v_username." ".$v_domain." ".$v_ftp_username." ".$v_ftp_path, $output, $return_var);
+                        exec (HESTIA_CMD."v-change-web-domain-ftp-path ".$v_username." ".$v_domain." ".$v_ftp_username." ".$v_ftp_path, $output, $return_var);
                     }
 
                 // Change FTP account password
@@ -639,7 +639,7 @@ if (!empty($_POST['save'])) {
                     $fp = fopen($v_ftp_password, "w");
                     fwrite($fp, $v_ftp_user_data['v_ftp_password']."\n");
                     fclose($fp);
-                    exec (VESTA_CMD."v-change-web-domain-ftp-password ".$v_username." ".$v_domain." ".$v_ftp_username." ".$v_ftp_password, $output, $return_var);
+                    exec (HESTIA_CMD."v-change-web-domain-ftp-password ".$v_username." ".$v_domain." ".$v_ftp_username." ".$v_ftp_password, $output, $return_var);
                     unlink($v_ftp_password);
 
                     $to = $v_ftp_user_data['v_ftp_email'];
@@ -667,21 +667,21 @@ if (!empty($_POST['save'])) {
 
     // Restart web server
     if (!empty($restart_web) && (empty($_SESSION['error_msg']))) {
-        exec (VESTA_CMD."v-restart-web", $output, $return_var);
+        exec (HESTIA_CMD."v-restart-web", $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
     }
 
     // Restart proxy server
     if ((!empty($_SESSION['PROXY_SYSTEM'])) && !empty($restart_proxy) && (empty($_SESSION['error_msg']))) {
-        exec (VESTA_CMD."v-restart-proxy", $output, $return_var);
+        exec (HESTIA_CMD."v-restart-proxy", $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
     }
 
     // Restart dns server
     if (!empty($restart_dns) && (empty($_SESSION['error_msg']))) {
-        exec (VESTA_CMD."v-restart-dns", $output, $return_var);
+        exec (HESTIA_CMD."v-restart-dns", $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
     }

web/file_manager/fm_api.php

@@ -10,7 +10,7 @@ include($_SERVER['DOCUMENT_ROOT']."/file_manager/fm_core.php");
 
 // todo: set in session?
 if (empty($panel)) {
-    $command = VESTA_CMD."v-list-user '".$user."' 'json'";
+    $command = HESTIA_CMD."v-list-user '".$user."' 'json'";
     exec ($command, $output, $return_var);
     if ( $return_var > 0 ) {
         header("Location: /error/");

web/file_manager/fm_core.php

@@ -31,7 +31,7 @@ class FileManager {
     public function checkFileType($dir) {
         $dir = $this->formatFullPath($dir);
 
-        exec(VESTA_CMD . "v-get-fs-file-type {$this->user} {$dir}", $output, $return_var);
+        exec(HESTIA_CMD . "v-get-fs-file-type {$this->user} {$dir}", $output, $return_var);
 
         $error = self::check_return_code($return_var, $output);
         if (empty($error)) {
@@ -62,7 +62,7 @@ class FileManager {
 
     function deleteItem($dir, $item) {
         $dir = $this->formatFullPath($item);
-        exec (VESTA_CMD . "v-delete-fs-directory {$this->user} {$dir}", $output, $return_var);
+        exec (HESTIA_CMD . "v-delete-fs-directory {$this->user} {$dir}", $output, $return_var);
 
         $error = self::check_return_code($return_var, $output);
 
@@ -83,7 +83,7 @@ class FileManager {
         $src = $this->formatFullPath($item);
         $dst = $this->formatFullPath($target_dir);
 
-        exec (VESTA_CMD . "v-copy-fs-file {$this->user} {$src} {$dst}", $output, $return_var);
+        exec (HESTIA_CMD . "v-copy-fs-file {$this->user} {$src} {$dst}", $output, $return_var);
 
         $error = self::check_return_code($return_var, $output);
 
@@ -104,7 +104,7 @@ class FileManager {
         $src = $this->formatFullPath($item);
         $dst = $this->formatFullPath($target_dir);
 
-        exec (VESTA_CMD . "v-copy-fs-directory {$this->user} {$src} {$dst}", $output, $return_var);
+        exec (HESTIA_CMD . "v-copy-fs-directory {$this->user} {$src} {$dst}", $output, $return_var);
 
         $error = self::check_return_code($return_var, $output);
 
@@ -133,7 +133,7 @@ class FileManager {
     function createFile($dir, $filename) {
         $dir = $this->formatFullPath($dir . '/' . $filename);
 
-        exec (VESTA_CMD . "v-add-fs-file {$this->user} {$dir}", $output, $return_var);
+        exec (HESTIA_CMD . "v-add-fs-file {$this->user} {$dir}", $output, $return_var);
 
         $error = self::check_return_code($return_var, $output);
 
@@ -159,7 +159,7 @@ class FileManager {
 
         $dst_item = $this->formatFullPath($dst_item);
 
-        exec (VESTA_CMD . "v-add-fs-archive {$this->user} {$dst_item} {$items}", $output, $return_var);
+        exec (HESTIA_CMD . "v-add-fs-archive {$this->user} {$dst_item} {$items}", $output, $return_var);
 
         $error = self::check_return_code($return_var, $output);
 
@@ -183,7 +183,7 @@ class FileManager {
 
         $dst_item = $this->formatFullPath($dst_item_name);
 
-        exec (VESTA_CMD . "v-copy-fs-file {$this->user} {$src_item} {$dst_item}", $output, $return_var);
+        exec (HESTIA_CMD . "v-copy-fs-file {$this->user} {$src_item} {$dst_item}", $output, $return_var);
 
         $error = self::check_return_code($return_var, $output);
 
@@ -219,7 +219,7 @@ class FileManager {
         $item     = $this->formatFullPath($item);
         $dst_item = $this->formatFullPath($target_dir);
 
-        exec (VESTA_CMD . "v-extract-fs-archive {$this->user} {$item} {$dst_item}", $output, $return_var);
+        exec (HESTIA_CMD . "v-extract-fs-archive {$this->user} {$item} {$dst_item}", $output, $return_var);
 
         $error = self::check_return_code($return_var, $output);
 
@@ -240,7 +240,7 @@ class FileManager {
         $item     = $this->formatFullPath($item);
         $dst_item = $this->formatFullPath($target_name);
 
-        exec (VESTA_CMD . "v-move-fs-file {$this->user} {$item} {$dst_item}", $output, $return_var);
+        exec (HESTIA_CMD . "v-move-fs-file {$this->user} {$item} {$dst_item}", $output, $return_var);
 
         $error = self::check_return_code($return_var, $output);
 
@@ -267,7 +267,7 @@ class FileManager {
             );
         }
 
-        exec (VESTA_CMD . "v-move-fs-directory {$this->user} {$item} {$dst_item}", $output, $return_var);
+        exec (HESTIA_CMD . "v-move-fs-directory {$this->user} {$item} {$dst_item}", $output, $return_var);
 
         $error = self::check_return_code($return_var, $output);
 
@@ -287,7 +287,7 @@ class FileManager {
     function createDir($dir, $dirname) {
         $dir = $this->formatFullPath($dir . '/' . $dirname);
 
-        exec (VESTA_CMD . "v-add-fs-directory {$this->user} {$dir}", $output, $return_var);
+        exec (HESTIA_CMD . "v-add-fs-directory {$this->user} {$dir}", $output, $return_var);
 
         $error = self::check_return_code($return_var, $output);
 
@@ -308,7 +308,7 @@ class FileManager {
         $item       = $this->formatFullPath($dir . $item);
         $permissions = escapeshellarg($permissions);
 
-        exec (VESTA_CMD . "v-change-fs-file-permission {$this->user} {$item} {$permissions}", $output, $return_var);
+        exec (HESTIA_CMD . "v-change-fs-file-permission {$this->user} {$item} {$permissions}", $output, $return_var);
 
         $error = self::check_return_code($return_var, $output);
 
@@ -328,7 +328,7 @@ class FileManager {
     function getDirectoryListing($dir = '') {
         $dir = $this->formatFullPath($dir);
 
-        exec (VESTA_CMD . "v-list-fs-directory {$this->user} {$dir}", $output, $return_var);
+        exec (HESTIA_CMD . "v-list-fs-directory {$this->user} {$dir}", $output, $return_var);
 
         return $this->parseListing($output);
     }

web/generate/ssl/index.php

@@ -64,7 +64,7 @@ $v_state = escapeshellarg($_POST['v_state']);
 $v_locality = escapeshellarg($_POST['v_locality']);
 $v_org = escapeshellarg($_POST['v_org']);
 
-exec (VESTA_CMD."v-generate-ssl-cert ".$v_domain." ".$v_email." ".$v_country." ".$v_state." ".$v_locality." ".$v_org." IT '' json", $output, $return_var);
+exec (HESTIA_CMD."v-generate-ssl-cert ".$v_domain." ".$v_email." ".$v_country." ".$v_state." ".$v_locality." ".$v_org." IT '' json", $output, $return_var);
 
 // Revert to raw values
 $v_domain = $_POST['v_domain'];

web/inc/i18n.php

@@ -92,7 +92,7 @@ function detect_user_language($fallback='en') {
     arsort($accept_langs_sorted);
 
     // List languages
-    exec (VESTA_CMD."v-list-sys-languages json", $output, $return_var);
+    exec (HESTIA_CMD."v-list-sys-languages json", $output, $return_var);
     $languages = json_decode(implode('', $output), true);
     unset($output);
 

web/inc/main.php

@@ -2,7 +2,6 @@
 
 session_start();
 
-define('VESTA_CMD', '/usr/bin/sudo /usr/local/hestia/bin/');
 define('HESTIA_CMD', '/usr/bin/sudo /usr/local/hestia/bin/');
 define('JS_LATEST_UPDATE', '1491697868');
 
@@ -97,7 +96,7 @@ if (isset($_SESSION['look']) && ( $_SESSION['look'] != 'admin' )) {
 }
 
 function get_favourites(){
-    exec (VESTA_CMD."v-list-user-favourites ".$_SESSION['user']." json", $output, $return_var);
+    exec (HESTIA_CMD."v-list-user-favourites ".$_SESSION['user']." json", $output, $return_var);
 //    $data = json_decode(implode('', $output).'}', true);
     $data = json_decode(implode('', $output), true);
     $data = array_reverse($data,true);
@@ -172,7 +171,7 @@ function render_page($user, $TAB, $page) {
 
 function top_panel($user, $TAB) {
     global $panel;
-    $command = VESTA_CMD."v-list-user '".$user."' 'json'";
+    $command = HESTIA_CMD."v-list-user '".$user."' 'json'";
     exec ($command, $output, $return_var);
     if ( $return_var > 0 ) {
         header("Location: /error/");
@@ -183,7 +182,7 @@ function top_panel($user, $TAB) {
 
 
     // getting notifications
-    $command = VESTA_CMD."v-list-user-notifications '".$user."' 'json'";
+    $command = HESTIA_CMD."v-list-user-notifications '".$user."' 'json'";
     exec ($command, $output, $return_var);
     $notifications = json_decode(implode('', $output), true);
     foreach($notifications as $message){
@@ -378,7 +377,7 @@ function list_timezones() {
  * @return string
  */
 function is_it_mysql_or_mariadb() {
-    exec (VESTA_CMD."v-list-sys-services json", $output, $return_var);
+    exec (HESTIA_CMD."v-list-sys-services json", $output, $return_var);
     $data = json_decode(implode('', $output), true);
     unset($output);
     $mysqltype='mysql';

web/list/backup/exclusions/index.php

@@ -6,7 +6,7 @@ $TAB = 'BACKUP';
 include($_SERVER['DOCUMENT_ROOT'].'/inc/main.php');
 
 // Data
-exec (VESTA_CMD."v-list-user-backup-exclusions $user json", $output, $return_var);
+exec (HESTIA_CMD."v-list-user-backup-exclusions $user json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
 unset($output);
 

web/list/backup/index.php

@@ -7,14 +7,14 @@ include($_SERVER['DOCUMENT_ROOT'].'/inc/main.php');
 
 // Data & Render page
 if (empty($_GET['backup'])){
-    exec (VESTA_CMD."v-list-user-backups $user json", $output, $return_var);
+    exec (HESTIA_CMD."v-list-user-backups $user json", $output, $return_var);
     $data = json_decode(implode('', $output), true);
     $data = array_reverse($data,true);
     unset($output);
 
     render_page($user, $TAB, 'list_backup');
 } else {
-    exec (VESTA_CMD."v-list-user-backup $user ".escapeshellarg($_GET['backup'])." json", $output, $return_var);
+    exec (HESTIA_CMD."v-list-user-backup $user ".escapeshellarg($_GET['backup'])." json", $output, $return_var);
     $data = json_decode(implode('', $output), true);
     $data = array_reverse($data,true);
     unset($output);

web/list/cron/index.php

@@ -6,7 +6,7 @@ $TAB = 'CRON';
 include($_SERVER['DOCUMENT_ROOT'].'/inc/main.php');
 
 // Data
-exec (VESTA_CMD."v-list-cron-jobs $user json", $output, $return_var);
+exec (HESTIA_CMD."v-list-cron-jobs $user json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
 $data = array_reverse($data,true);
 unset($output);

web/list/db/index.php

@@ -6,7 +6,7 @@ $TAB = 'DB';
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
 // Data
-exec (VESTA_CMD."v-list-databases $user json", $output, $return_var);
+exec (HESTIA_CMD."v-list-databases $user json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
 $data = array_reverse($data, true);
 unset($output);

web/list/directory/index.php

@@ -15,7 +15,7 @@ if (($_SESSION['user'] == 'admin') && (!empty($_SESSION['look']))) {
 }
 
 if (empty($panel)) {
-    $command = VESTA_CMD."v-list-user '".$user."' 'json'";
+    $command = HESTIA_CMD."v-list-user '".$user."' 'json'";
     exec ($command, $output, $return_var);
     if ( $return_var > 0 ) {
         header("Location: /error/");

web/list/dns/index.php

@@ -7,14 +7,14 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
 // Data & Render page
 if (empty($_GET['domain'])){
-    exec (VESTA_CMD."v-list-dns-domains $user json", $output, $return_var);
+    exec (HESTIA_CMD."v-list-dns-domains $user json", $output, $return_var);
     $data = json_decode(implode('', $output), true);
     $data = array_reverse($data, true);
     unset($output);
 
     render_page($user, $TAB, 'list_dns');
 } else {
-    exec (VESTA_CMD."v-list-dns-records '".$user."' '".escapeshellarg($_GET['domain'])."' 'json'", $output, $return_var);
+    exec (HESTIA_CMD."v-list-dns-records '".$user."' '".escapeshellarg($_GET['domain'])."' 'json'", $output, $return_var);
     $data = json_decode(implode('', $output), true);
     $data = array_reverse($data, true);
     unset($output);

web/list/favorites/index.php

@@ -5,7 +5,7 @@ error_reporting(NULL);
     echo '<br> Favorites: <br>';
 
     // Data
-    exec (VESTA_CMD."v-list-user-favourites ".$_SESSION['user']." json", $output, $return_var);
+    exec (HESTIA_CMD."v-list-user-favourites ".$_SESSION['user']." json", $output, $return_var);
 
 
 //    print_r(implode('', $output));

web/list/firewall/banlist/index.php

@@ -12,7 +12,7 @@ if ($_SESSION['user'] != 'admin') {
 }
 
 // Data
-exec (VESTA_CMD."v-list-firewall-ban json", $output, $return_var);
+exec (HESTIA_CMD."v-list-firewall-ban json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
 $data = array_reverse($data, true);
 unset($output);

web/list/firewall/index.php

@@ -12,7 +12,7 @@ if ($_SESSION['user'] != 'admin') {
 }
 
 // Data
-exec (VESTA_CMD."v-list-firewall json", $output, $return_var);
+exec (HESTIA_CMD."v-list-firewall json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
 $data = array_reverse($data, true);
 unset($output);

web/list/ip/index.php

@@ -13,7 +13,7 @@ if ($_SESSION['user'] != 'admin') {
 }
 
 // Data
-exec (VESTA_CMD."v-list-sys-ips json", $output, $return_var);
+exec (HESTIA_CMD."v-list-sys-ips json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
 $data = array_reverse($data, true);
 unset($output);

web/list/log/index.php

@@ -6,7 +6,7 @@ $TAB = 'LOG';
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
 // Data
-exec (VESTA_CMD."v-list-user-log $user json", $output, $return_var);
+exec (HESTIA_CMD."v-list-user-log $user json", $output, $return_var);
 check_error($return_var);
 $data = json_decode(implode('', $output), true);
 $data = array_reverse($data);

web/list/mail/index.php

@@ -7,14 +7,14 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
 // Data & Render page
 if (empty($_GET['domain'])){
-    exec (VESTA_CMD."v-list-mail-domains $user json", $output, $return_var);
+    exec (HESTIA_CMD."v-list-mail-domains $user json", $output, $return_var);
     $data = json_decode(implode('', $output), true);
     $data = array_reverse($data, true);
     unset($output);
 
     render_page($user, $TAB, 'list_mail');
 } else {
-    exec (VESTA_CMD."v-list-mail-accounts '".$user."' '".escapeshellarg($_GET['domain'])."' json", $output, $return_var);
+    exec (HESTIA_CMD."v-list-mail-accounts '".$user."' '".escapeshellarg($_GET['domain'])."' json", $output, $return_var);
     $data = json_decode(implode('', $output), true);
     $data = array_reverse($data, true);
     unset($output);

web/list/notifications/index.php

@@ -7,7 +7,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
 if($_REQUEST['ajax'] == 1){
     // Data
-    exec (VESTA_CMD."v-list-user-notifications $user json", $output, $return_var);
+    exec (HESTIA_CMD."v-list-user-notifications $user json", $output, $return_var);
     $data = json_decode(implode('', $output), true);
     $data = array_reverse($data,true);
     foreach($data as $key => $note){
@@ -23,7 +23,7 @@ if($_REQUEST['ajax'] == 1){
 $TAB = 'NOTIFICATIONS';
 
 // Data
-exec (VESTA_CMD."v-list-user-notifications $user json", $output, $return_var);
+exec (HESTIA_CMD."v-list-user-notifications $user json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
 $data = array_reverse($data,true);