From 0e1ba25ed4e298ea56d86c358ffa657d4e0c0bcf Mon Sep 17 00:00:00 2001 From: phl0 Date: Tue, 30 Jul 2024 01:51:01 +0200 Subject: [PATCH] Add curl to installer required modules --- install/includes/install_config/install_lib.php | 12 ++++++++++++ install/index.php | 6 +++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/install/includes/install_config/install_lib.php b/install/includes/install_config/install_lib.php index f2555fc29..9d6fc8293 100644 --- a/install/includes/install_config/install_lib.php +++ b/install/includes/install_config/install_lib.php @@ -133,3 +133,15 @@ function detect_nginx_php_setting($http_scheme) { curl_close($ch); return $code; } + +function installer_required_modules() { + $installer_required_modules = array("mbstring", "curl"); + $not_found_modules = array(); + foreach ($installer_required_modules as $module) { + if (!extension_loaded($module)) { + //unset($installer_required_modules[$module]); + array_push($not_found_modules, 'php-'.$module); + } + } + return $not_found_modules; +} diff --git a/install/index.php b/install/index.php index 0404b0924..785e87ba0 100644 --- a/install/index.php +++ b/install/index.php @@ -16,7 +16,7 @@ if (!file_exists('.lock')) { // php-mbstring has to be installed for the installer to work properly!! // The other prechecks can be run within the installer. - if ($required_php_modules['php-mbstring']['condition']) { ?> + if ($required_php_modules['php-mbstring']['condition'] && $required_php_modules['php-curl']['condition']) { ?> @@ -1897,9 +1897,9 @@ if (!file_exists('.lock')) {

danger_triangle -

php-mbstring"); ?>

+

".implode(',', installer_required_modules()).""; ?>

-

php-mbstring"); ?>

+