Rev: 4662rev4662

16 files changed, 46 insertions, 38 deletions

diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index 11d5fb8a..77d471ad 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4661
+4662
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index 11d5fb8a..77d471ad 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4661
+4662
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index 11d5fb8a..77d471ad 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4661
+4662
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index 11d5fb8a..77d471ad 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4661
+4662
diff --git a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
index 11d5fb8a..77d471ad 100644
--- a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
+++ b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
@@ -1 +1 @@
-4661
+4662
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index 11d5fb8a..77d471ad 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4661
+4662
diff --git a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
index 11d5fb8a..77d471ad 100644
--- a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
+++ b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
@@ -1 +1 @@
-4661
+4662
diff --git a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
index 11d5fb8a..77d471ad 100644
--- a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
+++ b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
@@ -1 +1 @@
-4661
+4662
diff --git a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
index 11d5fb8a..77d471ad 100644
--- a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
+++ b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
@@ -1 +1 @@
-4661
+4662
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>';
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index 11d5fb8a..77d471ad 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4661
+4662
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index 11d5fb8a..77d471ad 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4661
+4662
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 03e9388d..178fc892 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4661
-524729cd5e3f29b396a3c097c3d7f3bb  mayor-fenntarto-rev4661.tgz
-b12556e7d71634b8e5fdb08e3be0e123  mayor-installer-sulix-rev4661.tgz
-f048d7ded5c4591362e44a52aa508428  mayor-wiki-rev4661.tgz
-2a2a80640025cc349125e7852e690d7e  mayor-installer-rev4661.tgz
-7c2b8998abb8852d4be0904da3f82ab6  mayor-portal-rev4661.tgz
-3dbc614ff808a23e9d87c6914b34b0e8  mayor-felveteli-rev4661.tgz
-05a160fae381776e66e133308d69a4c3  mayor-jatek-rev4661.tgz
-5749a07fa106f6e2e6d68fafcbb89eac  mayor-locales-jp_JP-rev4661.tgz
-66cba3e3c8d4b1648e1a7038e879e0e4  mayor-locales-de_DE-rev4661.tgz
-aead2734205231e10ccb372f8e8a2b56  mayor-locales-en_US-rev4661.tgz
-5cb816d9bc7eaa8e929f181847bacf80  mayor-naplo-rev4661.tgz
-8470602a40453db3c6ebc4c115fa9f12  mayor-base-rev4661.tgz
+Revision 4662
+16f19a03456945794c7a3732c3f45e85  mayor-fenntarto-rev4662.tgz
+b8888636d3b0ce845a3ab4374119104c  mayor-installer-sulix-rev4662.tgz
+2e9fee04642585b4df5318a889f44631  mayor-wiki-rev4662.tgz
+24817553149afb37f5cc06acbca38fd0  mayor-installer-rev4662.tgz
+98bb3a9ee191ee581cc667e5f9fb3662  mayor-portal-rev4662.tgz
+9eb8bd5ef250ad7be669c7dbab4a108d  mayor-felveteli-rev4662.tgz
+c080d8a56becb70b76f685043520e0be  mayor-jatek-rev4662.tgz
+270773107a2aa5572a42e638da8c862f  mayor-locales-jp_JP-rev4662.tgz
+ee154940a3082ff097d390498dd239cf  mayor-locales-de_DE-rev4662.tgz
+74e23df2e564f89d719354b58d194e07  mayor-locales-en_US-rev4662.tgz
+7489a5e84ba16bca115cfe8965ff0b0e  mayor-naplo-rev4662.tgz
+833d60d1a5b32ff7ad2dffee8070c063  mayor-base-rev4662.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index 11d5fb8a..77d471ad 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4661
+4662