www/dbq/dbq.php

diff --git a/www/dbq/dbq.php b/www/dbq/dbq.php
index 7c67925771175994f62f624bb547bf71ecaa9be6..049e66483853a48df123b05b5bb6aaa74492679e 100644 (file)
--- 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;