From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Sat, 23 Nov 2024 11:21:32 +0000 (+0000)
Subject: www/dbq/dbq.php
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=8d32ef1281f075b5f49cce62d77ded2e4325bbdb;p=nb.git

www/dbq/dbq.php
---

diff --git a/www/dbq/dbq.php b/www/dbq/dbq.php
index 7c679257..049e6648 100644
--- a/www/dbq/dbq.php
+++ b/www/dbq/dbq.php
@@ -1276,9 +1276,14 @@ EOF;
 
   private function phpinfoText() {
     $version = PHP_MAJOR_VERSION . '.' . PHP_MINOR_VERSION;
+
+    $sapi = php_sapi_name();
+    $dir = 'cli';
+    if ($sapi === 'fpm-fcgi') $dir = 'fpm';
+    elseif ($sapi === 'apache2handler') $dir = 'apache2';
+
     ob_start();
-    #system("env PHPRC=/etc/php/$version/fpm PHP_INI_SCAN_DIR=/etc/php/$version/fpm php -r 'phpinfo(INFO_GENERAL + INFO_CONFIGURATION + INFO_MODULES + INFO_ENVIRONMENT + INFO_VARIABLES);'");
-    system("env PHPRC=/etc/php/$version/fpm PHP_INI_SCAN_DIR=/etc/php/$version/fpm/conf.d php -r 'phpinfo(INFO_GENERAL + INFO_CONFIGURATION + INFO_MODULES + INFO_ENVIRONMENT + INFO_VARIABLES);'");
+    system("env PHPRC=/etc/php/$version/$dir PHP_INI_SCAN_DIR=/etc/php/$version/$dir/conf.d php -r 'phpinfo(INFO_GENERAL + INFO_CONFIGURATION + INFO_MODULES + INFO_ENVIRONMENT + INFO_VARIABLES);'");
     $phpinfo = ob_get_contents();
     ob_end_clean();
     return $phpinfo;