Merge pull request #2451 from jaapmarcus/fix/php-fpm-check-missing

Fix bug where v-add-web-php ran on mod-php servers
hestiacp · Mar 3, 2022 · 5c4ce71 · 5c4ce71
2 parents faad587 + f4a9913
commit 5c4ce71
Showing 1 changed file with 38 additions and 37 deletions.
diff --git a/web/edit/server/index.php b/web/edit/server/index.php
@@ -242,47 +242,48 @@
         unset($output);
         $v_hostname = $_POST['v_hostname'];
     }
-
-    // Install/remove php versions
-    if (empty($_SESSION['error_msg'])) {
-        if (!empty($v_php_versions)) {
-            $post_php = $_POST['v_php_versions'];
-            if(empty($post_php)){
-                $post_php = array();
-            }
-
-            array_map(function ($php_version) use ($post_php) {
-                if (array_key_exists($php_version->tpl, $post_php)) {
-                    if (!$php_version->installed) {
-                        exec(HESTIA_CMD . "v-add-web-php " . escapeshellarg($php_version->version), $output, $return_var);
-                        check_return_code($return_var, $output);
-                        unset($output);
-                        if (empty($_SESSION['error_msg'])) {
-                            $php_version->installed = true;
+
+    if($_SESSION['WEB_BACKEND'] == "php-fpm"){
+        // Install/remove php versions
+        if (empty($_SESSION['error_msg'])) {
+            if (!empty($v_php_versions)) {
+                $post_php = $_POST['v_php_versions'];
+                if(empty($post_php)){
+                    $post_php = array();
+                }
+                array_map(function ($php_version) use ($post_php) {
+                    if (array_key_exists($php_version->tpl, $post_php)) {
+                        if (!$php_version->installed) {
+                            exec(HESTIA_CMD . "v-add-web-php " . escapeshellarg($php_version->version), $output, $return_var);
+                            check_return_code($return_var, $output);
+                            unset($output);
+                            if (empty($_SESSION['error_msg'])) {
+                                $php_version->installed = true;
+                            }
                         }
-                    }
-                } else {
-                    if ($php_version->installed && !$php_version->protected) {
-                        exec(HESTIA_CMD . "v-delete-web-php " . escapeshellarg($php_version->version), $output, $return_var);
-                        check_return_code($return_var, $output);
-                        unset($output);
-                        if (empty($_SESSION['error_msg'])) {
-                            $php_version->installed = false;
+                    } else {
+                        if ($php_version->installed && !$php_version->protected) {
+                            exec(HESTIA_CMD . "v-delete-web-php " . escapeshellarg($php_version->version), $output, $return_var);
+                            check_return_code($return_var, $output);
+                            unset($output);
+                            if (empty($_SESSION['error_msg'])) {
+                                $php_version->installed = false;
+                            }
                         }
                     }
-                }
-
-                return $php_version;
-            }, $v_php_versions);
-        }
-    }
 
-    if (empty($_SESSION['error_msg'])) {
-        if($_POST['v_php_default_version'] != DEFAULT_PHP_VERSION) {
-            exec(HESTIA_CMD . "v-change-sys-php " . escapeshellarg($_POST['v_php_default_version']), $output, $return_var);
-            check_return_code($return_var, $output);
-            unset($output);
-        }   
+                    return $php_version;
+                }, $v_php_versions);
+            }
+        }
+
+        if (empty($_SESSION['error_msg'])) {
+            if($_POST['v_php_default_version'] != DEFAULT_PHP_VERSION) {
+                exec(HESTIA_CMD . "v-change-sys-php " . escapeshellarg($_POST['v_php_default_version']), $output, $return_var);
+                check_return_code($return_var, $output);
+                unset($output);
+            }   
+        }
     }
 
     // Change timezone