Merge pull request hestiacp#1522 from hestiacp/fix/787-allow-php-fpm-selection-user

ScIT-Raphael · web-flow · commit 03f42fc0c592 · 2020-12-31T10:15:15.000+01:00
Remove admin requirement for selecting template
diff --git a/web/add/web/index.php b/web/add/web/index.php
@@ -178,7 +178,7 @@
         $restart_web = 'yes';
     }
     // Change backend template
-    if ((!empty($_SESSION['WEB_BACKEND'])) && ( $v_backend_template != $_POST['v_backend_template']) && ( $_SESSION['user'] == 'admin') && (empty($_SESSION['error_msg']))) {
+    if ((!empty($_SESSION['WEB_BACKEND'])) && ( $v_backend_template != $_POST['v_backend_template']) && (empty($_SESSION['error_msg']))) {
         $v_backend_template = $_POST['v_backend_template'];
         exec (HESTIA_CMD."v-change-web-domain-backend-tpl ".$user." ".escapeshellarg($v_domain)." ".escapeshellarg($v_backend_template), $output, $return_var);
         check_return_code($return_var,$output);
diff --git a/web/edit/web/index.php b/web/edit/web/index.php
@@ -314,7 +314,7 @@
     }
     
     // Change backend template
-    if ((!empty($_SESSION['WEB_BACKEND'])) && ( $v_backend_template != $_POST['v_backend_template']) && ( $_SESSION['user'] == 'admin') && (empty($_SESSION['error_msg']))) {
+    if ((!empty($_SESSION['WEB_BACKEND'])) && ( $v_backend_template != $_POST['v_backend_template'])  && (empty($_SESSION['error_msg']))) {
         $v_backend_template = $_POST['v_backend_template'];
         exec (HESTIA_CMD."v-change-web-domain-backend-tpl ".$v_username." ".escapeshellarg($v_domain)." ".escapeshellarg($v_backend_template), $output, $return_var);
         check_return_code($return_var,$output);

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@`
`178`	`178`	`$restart_web = 'yes';`
`179`	`179`	`}`
`180`	`180`	`// Change backend template`
`181`		`- if ((!empty($_SESSION['WEB_BACKEND'])) && ( $v_backend_template != $_POST['v_backend_template']) && ( $_SESSION['user'] == 'admin') && (empty($_SESSION['error_msg']))) {`
	`181`	`+ if ((!empty($_SESSION['WEB_BACKEND'])) && ( $v_backend_template != $_POST['v_backend_template']) && (empty($_SESSION['error_msg']))) {`
`182`	`182`	`$v_backend_template = $_POST['v_backend_template'];`
`183`	`183`	`exec (HESTIA_CMD."v-change-web-domain-backend-tpl ".$user." ".escapeshellarg($v_domain)." ".escapeshellarg($v_backend_template), $output, $return_var);`
`184`	`184`	`check_return_code($return_var,$output);`
Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,7 @@`
`314`	`314`	`}`
`315`	`315`
`316`	`316`	`// Change backend template`
`317`		`- if ((!empty($_SESSION['WEB_BACKEND'])) && ( $v_backend_template != $_POST['v_backend_template']) && ( $_SESSION['user'] == 'admin') && (empty($_SESSION['error_msg']))) {`
	`317`	`+ if ((!empty($_SESSION['WEB_BACKEND'])) && ( $v_backend_template != $_POST['v_backend_template']) && (empty($_SESSION['error_msg']))) {`
`318`	`318`	`$v_backend_template = $_POST['v_backend_template'];`
`319`	`319`	`exec (HESTIA_CMD."v-change-web-domain-backend-tpl ".$v_username." ".escapeshellarg($v_domain)." ".escapeshellarg($v_backend_template), $output, $return_var);`
`320`	`320`	`check_return_code($return_var,$output);`