Merge pull request #602 from Lupul/dev-1005

Dev 1005

CHANGELOG.md

@@ -41,6 +41,7 @@ All notable changes to this project will be documented in this file.
 - Fixed nameserver validation on add new user packages.
 - Implement additional debug informations for LE validation, thanks to @shakaran.
 - Do not notify user if the backups are triggered from cronjob.
+- Fixed issue with suspending resources when logged directly as a normal user.
 
 ## [1.0.6] - 2019-09-24 - Hotfix
 ### Bugfixes

bin/v-rebuild-web-domains

@@ -67,6 +67,17 @@ if [ ! -z "$PROXY_SYSTEM" ]; then
     fi
 fi
 
+# Create dummy php-fpm configs if missing
+for php_folder in /etc/php/*; do
+    [ ! -d "${php_folder}/fpm/pool.d/" ] && continue
+
+    v_php="$(basename $php_folder)"
+    if [ ! -f "/etc/php/${v_php}/fpm/pool.d/dummy.conf" ]; then
+        cp -f "$HESTIA_INSTALL_DIR/php-fpm/dummy.conf" "/etc/php/${v_php}/fpm/pool.d/"
+        sed -i "s/9999/99${v_php//.}/g" "/etc/php/${v_php}/fpm/pool.d/dummy.conf"
+    fi
+done
+
 # Deleting backend configs
 if [ ! -z "$WEB_BACKEND" ]; then
     if [ "$WEB_BACKEND_POOL" = 'user' ]; then

web/suspend/cron/index.php

@@ -11,21 +11,13 @@ if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) {
     exit();
 }
 
-// Check user
-if ($_SESSION['user'] != 'admin') {
-    header("Location: /list/user");
-    exit;
-}
-if (!empty($_GET['user'])) {
-    $user=$_GET['user'];
-}
 if (!empty($_GET['job'])) {
     $v_username = escapeshellarg($user);
     $v_job = escapeshellarg($_GET['job']);
     exec (HESTIA_CMD."v-suspend-cron-job ".$v_username." ".$v_job, $output, $return_var);
+    check_return_code($return_var,$output);
+    unset($output);
 }
-check_return_code($return_var,$output);
-unset($output);
 
 $back = $_SESSION['back'];
 if (!empty($back)) {

web/suspend/db/index.php

@@ -11,23 +11,13 @@ if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) {
     exit();
 }
 
-// Check user
-if ($_SESSION['user'] != 'admin') {
-    header("Location: /list/user");
-    exit;
-}
-
-if (!empty($_GET['user'])) {
-    $user=$_GET['user'];
-}
-
 if (!empty($_GET['database'])) {
     $v_username = escapeshellarg($user);
     $v_database = escapeshellarg($_GET['database']);
     exec (HESTIA_CMD."v-suspend-database ".$v_username." ".$v_database, $output, $return_var);
+    check_return_code($return_var,$output);
+    unset($output);
 }
-check_return_code($return_var,$output);
-unset($output);
 
 $back = $_SESSION['back'];
 if (!empty($back)) {

web/suspend/dns/index.php

@@ -11,16 +11,6 @@ if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) {
     exit();
 }
 
-// Check user
-if ($_SESSION['user'] != 'admin') {
-    header("Location: /list/user");
-    exit;
-}
-
-if (!empty($_GET['user'])) {
-    $user=$_GET['user'];
-}
-
 // DNS domain
 if ((!empty($_GET['domain'])) && (empty($_GET['record_id'])))  {
     $v_username = escapeshellarg($user);

web/suspend/mail/index.php

@@ -11,16 +11,6 @@ if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) {
     exit();
 }
 
-// Check user
-if ($_SESSION['user'] != 'admin') {
-    header("Location: /list/user");
-    exit;
-}
-
-if (!empty($_GET['user'])) {
-    $user=$_GET['user'];
-}
-
 // Mail domain
 if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
     $v_username = escapeshellarg($user);

web/suspend/web/index.php

@@ -11,17 +11,6 @@ if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) {
     exit();
 }
 
-// Check user
-if ($_SESSION['user'] != 'admin') {
-    header("Location: /list/user");
-    exit;
-}
-
-if (!empty($_GET['user'])) {
-    $user=$_GET['user'];
-}
-
-
 if (!empty($_GET['domain'])) {
     $v_username = escapeshellarg($user);
     $v_domain = escapeshellarg($_GET['domain']);

web/unsuspend/cron/index.php

@@ -12,23 +12,13 @@ if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) {
     exit();
 }
 
-// Check user
-if ($_SESSION['user'] != 'admin') {
-    header("Location: /list/user");
-    exit;
-}
-
-if (!empty($_GET['user'])) {
-    $user=$_GET['user'];
-}
-
 if (!empty($_GET['job'])) {
     $v_username = escapeshellarg($user);
     $v_job = escapeshellarg($_GET['job']);
     exec (HESTIA_CMD."v-unsuspend-cron-job ".$v_username." ".$v_job, $output, $return_var);
+    check_return_code($return_var,$output);
+    unset($output);
 }
-check_return_code($return_var,$output);
-unset($output);
 
 $back=getenv("HTTP_REFERER");
 if (!empty($back)) {

web/unsuspend/db/index.php

@@ -12,15 +12,6 @@ if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) {
     exit();
 }
 
-// Check user
-if ($_SESSION['user'] != 'admin') {
-    header("Location: /list/user");
-    exit;
-}
-
-if (!empty($_GET['user'])) {
-    $user=$_GET['user'];
-}
 if (!empty($_GET['database'])) {
     $v_username = escapeshellarg($user);
     $v_database = escapeshellarg($_GET['database']);

web/unsuspend/dns/index.php

@@ -11,16 +11,6 @@ if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) {
     exit();
 }
 
-// Check user
-if ($_SESSION['user'] != 'admin') {
-    header("Location: /list/user");
-    exit;
-}
-
-if (!empty($_GET['user'])) {
-    $user=$_GET['user'];
-}
-
 // DNS domain
 if ((!empty($_GET['domain'])) && (empty($_GET['record_id'])))  {
     $v_username = escapeshellarg($user);

web/unsuspend/mail/index.php

@@ -11,16 +11,6 @@ if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) {
     exit();
 }
 
-// Check user
-if ($_SESSION['user'] != 'admin') {
-    header("Location: /list/user");
-    exit;
-}
-
-if (!empty($_GET['user'])) {
-    $user=$_GET['user'];
-}
-
 // Mail domain
 if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
     $v_username = escapeshellarg($user);

web/unsuspend/web/index.php

@@ -11,21 +11,14 @@ if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) {
     exit();
 }
 
-// Check user
-if ($_SESSION['user'] != 'admin') {
-    header("Location: /list/user");
-    exit;
-}
-if (!empty($_GET['user'])) {
-    $user=$_GET['user'];
-}
 if (!empty($_GET['domain'])) {
     $v_username = escapeshellarg($user);
     $v_domain = escapeshellarg($_GET['domain']);
     exec (HESTIA_CMD."v-unsuspend-domain ".$v_username." ".$v_domain, $output, $return_var);
+    check_return_code($return_var,$output);
+    unset($output);
 }
-check_return_code($return_var,$output);
-unset($output);
+
 
 $back=getenv("HTTP_REFERER");
 if (!empty($back)) {