From 265f8940abc3ef714656167d9fd162d666ccc7da Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Thu, 25 Jun 2020 08:00:03 +0200
Subject: Rev: 4662

---
 mayor-orig/mayor-naplo/log/mayor-naplo.rev         |  2 +-
 .../www/policy/private/naplo/admin/debug-pre.php   | 28 ++++++++++++----------
 .../www/policy/private/naplo/admin/debug.php       |  4 ++++
 3 files changed, 21 insertions(+), 13 deletions(-)

(limited to 'mayor-orig/mayor-naplo')

diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index 11d5fb8a..77d471ad 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4661
+4662
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/debug-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/debug-pre.php
index 898ad00d..1eed8cb9 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/debug-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/debug-pre.php
@@ -1,22 +1,26 @@
 <?php
 
-   if (!__NAPLOADMIN) {
+if (__NAPLOADMIN!==true) {
         $_SESSION['alert'][] = 'page:insufficient_access';
-    } else {
+} else {
 
     $ADAT['debug_result']['mayor rev'] = _MAYORREV;
-    $ADAT['debug_result']['apache version'] = @apache_get_version();
-    $ADAT['debug_result']['php version'] = @phpversion();
-//    $ADAT['debug_result']['php info'] = get_loaded_extensions();
+    $ADAT['debug_result']['apache version'] = $_SERVER['SERVER_SOFTWARE'];
+    $ADAT['debug_result']['php version'] = (function_exists('phpversion') ? phpversion() : '');
     $ADAT['debug_result']['sql_server']['sql_mode']=db_query('SHOW GLOBAL variables like "%sql_%"',array('modul'=>'naplo','fb'=>'debug',result=>'indexed'));
     $ADAT['debug_result']['sql_server']['sql_version']=db_query('SELECT VERSION()',array('modul'=>'naplo','fb'=>'debug',result=>'indexed'));
-    $ADAT['debug_result']['tex_cli'] = @shell_exec('tex --version');
-    $ADAT['debug_result']['xetex_cli'] = @shell_exec('xetex --version');
-//    $ADAT['debug_result']['constants'] = @get_defined_constants();
+    $ADAT['debug_result']['tex_cli'] = (function_exists('shell_exec') ? shell_exec('tex --version') : '');
+    $ADAT['debug_result']['xetex_cli'] = (function_exists('shell_exec') ? shell_exec('xetex --version'): '');
+    //security!    $ADAT['debug_result']['constants'] = get_defined_constants();
 
-    @ini_set('xdebug.var_display_max_depth', '3');
-    @ini_set('xdebug.var_display_max_children', '4096');
-    @ini_set('xdebug.var_display_max_data', '4096');
+    ini_set('xdebug.var_display_max_depth', '3');
+    ini_set('xdebug.var_display_max_children', '4096');
+    ini_set('xdebug.var_display_max_data', '4096');
 
-    }
+    $ADAT['debug_result']['config']['backend'] = $config['backend'];
+    $ADAT['debug_result']['config']['MYSQLI_ENABLED'] = MYSQLI_ENABLED;
+    $ADAT['debug_result']['config']['__PORTAL_CODE'] = __PORTAL_CODE;
+    $ADAT['debug_result']['config']['__EMAIL_ENABLED'] = __EMAIL_ENABLED;
+
+}
 ?>
\ No newline at end of file
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/debug.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/debug.php
index f20c3e5f..ff311cd5 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/debug.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/debug.php
@@ -1,6 +1,10 @@
 <?php
 global $ADAT;
 
+    echo '<style type="text/css">
+/*	div.mayorbody { color:white; background-color: #888; padding:10px;}*/
+    </style>';
+
     if (is_array($ADAT)) {
 	foreach ($ADAT['debug_result'] as $key => $value) {
 	    echo '<h1>'.$key.'</h1>';
-- 
cgit v1.2.3