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

www/dbq/dbq.php
---

diff --git a/www/dbq/dbq.php b/www/dbq/dbq.php
index 4c80c8c8..36e8e704 100644
--- a/www/dbq/dbq.php
+++ b/www/dbq/dbq.php
@@ -1287,44 +1287,14 @@ EOF;
     elseif ($sapi === 'apache2handler') $dir = 'apache2';
 
     ob_start();
-    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);'");
+    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);'");
+    #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();
+		#$phpinfo = preg_replace('/(\'' . $this->hide_keys_exp . '\') => (.*)$/', '$1 => '.$this->hide_keys_value, $phpinfo);
     return $phpinfo;
   }
 
-	private function phpinfoText2() {
-  	echo "PHP Info\n";
-  	echo "_______________________________\n";
-
-  	// General Information
-  	echo "PHP Version: " . PHP_VERSION . "\n";
-  	echo "PHP OS: " . PHP_OS . "\n";
-  	echo "Server API: " . php_sapi_name() . "\n";
-  	echo "_______________________________\n";
-
-  	// Loaded Extensions
-  	echo "Loaded Extensions:\n";
-  	foreach (get_loaded_extensions() as $ext) {
-    	echo "  - " . $ext . "\n";
-  	}
-  	echo "_______________________________\n";
-
-  	// Configuration
-  	echo "Configuration:\n";
-  	echo "Memory Limit: " . ini_get('memory_limit') . "\n";
-  	echo "Max Execution Time: " . ini_get('max_execution_time') . "\n";
-  	echo "Display Errors: " . (ini_get('display_errors') ? 'On' : 'Off') . "\n";
-  	echo "_______________________________\n";
-
-  	// Environment Variables
-  	echo "Environment Variables:\n";
-  	foreach ($_SERVER as $key => $value) {
-    	echo "  $key: $value\n";
-  	}
-  	echo "_______________________________\n";
-	}
-
   private function phpinfo2() {
   	# See: https://www.php.net/manual/en/reserved.constants.php
 
@@ -1357,18 +1327,19 @@ EOF;
   	#$data['General']['Zend Extension Build'] = zend_version();
   	#$data['General']['PHP Extension Build'] = PHP_OS . (PHP_ZTS ? ', ZTS' : ', NTS');
 
-  	$data['General']['Debug Build'] = ( defined('ZEND_DEBUG_BUILD') and ZEND_DEBUG_BUILD ) ? 'yes' : 'no';
+  	$data['General']['Debug Build'] = ( defined('PHP_DEBUG') and PHP_DEBUG ) ? 'yes' : 'no';
   	$data['General']['Thread Safety'] = ( defined('PHP_ZTS') and PHP_ZTS ) ? 'enabled' : 'disabled';
   	$data['General']['IPv6 Support'] = ( defined('AF_INET6') and AF_INET6 ) ? 'enabled' : 'disabled';
 
   	#$data['General']['Zend Memory Manager'] = function_exists('zend_mem_usage') ? 'enabled' : 'disabled';
   	#$data['General']['Zend Signal Handling'] = function_exists('zend_signal') ? 'enabled' : 'disabled';
+  	#$data['General']['Zend Signal Handling'] = (function_exists('pcntl_async_signals') and pcntl_async_signals()) ? 'enabled' : 'disabled';
   	#$data['General']['DTrace Support'] = ?
 
   	#$data['General'][''] = 
   	$data['General']['Registered PHP Streams'] = implode(', ', stream_get_wrappers());
-		$data["Registered Stream Socket Transports"] = implode(', ', stream_get_transports());
-		$data["Registered Stream Filters"] = implode(', ', stream_get_filters());
+		$data['General']["Registered Stream Socket Transports"] = implode(', ', stream_get_transports());
+		$data['General']["Registered Stream Filters"] = implode(', ', stream_get_filters());
   	debug($data);
 
   
@@ -1444,6 +1415,19 @@ EOF;
     	}
 
 		}
+		foreach (['_REQUEST','_SERVER'] as $action) {
+			foreach ($GLOBALS[$action] as $k=>$v) {
+				if (preg_match('/^(' . $this->hide_keys_exp . ')/', $k)) $v = $this->hide_keys_value;
+				$rows[] = [
+    				# NB 23.11.24 'section' => 'Configuration',
+    				# NB 23.11.24 'sub' => 'PHP Variables',
+    			'section' => 'PHP Variables',
+    			'sub' => $action,
+					'key' => $k,
+					'value' => ( is_scalar($v) ? $v : json_encode($v) ),
+				];
+			}
+		}
 
 		return $rows;
 	} // phpinfo()