Rev: 4660rev4660

19 files changed, 62 insertions, 28 deletions

diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index 092b8f17..6af0687a 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4658
+4660
diff --git a/mayor-orig/mayor-base/www/lang/hu_HU/base/base.php b/mayor-orig/mayor-base/www/lang/hu_HU/base/base.php
index 7396952b..c95d417b 100644
--- a/mayor-orig/mayor-base/www/lang/hu_HU/base/base.php
+++ b/mayor-orig/mayor-base/www/lang/hu_HU/base/base.php
@@ -8,7 +8,7 @@
 */
 
 define('_MAIN_TITLE','MaYoR');
-define('_MAIN_FOOTER','<a href="http://www.mayor.hu./">MaYoR</a> - 2002-2019 &copy; <a href="LICENSE.txt">GPL</a>');
+define('_MAIN_FOOTER','<a href="http://www.mayor.hu./">MaYoR</a> - 2002-2020 &copy; <a href="LICENSE.txt">GPL</a>');
 
 define('_TANAR','tanár');
 define('_DIAK','diák');
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index 092b8f17..6af0687a 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4658
+4660
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index 092b8f17..6af0687a 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4658
+4660
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index 092b8f17..6af0687a 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4658
+4660
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 092b8f17..6af0687a 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 @@
-4658
+4660
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index 092b8f17..6af0687a 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4658
+4660
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 092b8f17..6af0687a 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 @@
-4658
+4660
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 092b8f17..6af0687a 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 @@
-4658
+4660
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 092b8f17..6af0687a 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 @@
-4658
+4660
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index 092b8f17..6af0687a 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4658
+4660
diff --git a/mayor-orig/mayor-naplo/www/include/menu/private/hu_HU/module-naplo.php b/mayor-orig/mayor-naplo/www/include/menu/private/hu_HU/module-naplo.php
index 5d998779..25907716 100644
--- a/mayor-orig/mayor-naplo/www/include/menu/private/hu_HU/module-naplo.php
+++ b/mayor-orig/mayor-naplo/www/include/menu/private/hu_HU/module-naplo.php
@@ -570,6 +570,7 @@
 		'szuloiAzonositok' => array(array('txt' => 'Szülői azonosítók generálása','icon'=>'icon-adult')),
 		'rpcPrivilege' => array(array('txt' => 'RPC jogosultságok')),
 		'kréta magic' => array(array('txt' => 'Kréta 2 MaYoR', 'icon'=>'icon-asterisk', 'url'=>'index.php?page=naplo&sub=import&f=tantargyFelosztas')),
+		'debug' => array(array('txt' => 'Rendszerinformáció', 'icon'=>'icon-cog')),
 	);
 	$MENU['modules']['naplo']['sub']['hirnok'] =  array(
 	    'hirnok' =>array(array('txt' => 'Hírnök', 'icon'=>'icon-bullhorn')),
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
new file mode 100644
index 00000000..de0924bd
--- /dev/null
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/debug-pre.php
@@ -0,0 +1,22 @@
+<?php
+
+   if (!__NAPLOADMIN) {
+        $_SESSION['alert'][] = 'page:insufficient_access';
+    } 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']['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();
+
+    @ini_set('xdebug.var_display_max_depth', '3');
+    @ini_set('xdebug.var_display_max_children', '4096');
+    @ini_set('xdebug.var_display_max_data', '4096');
+
+    }
+?>
\ 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
new file mode 100644
index 00000000..f20c3e5f
--- /dev/null
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/debug.php
@@ -0,0 +1,11 @@
+<?php
+global $ADAT;
+
+    if (is_array($ADAT)) {
+	foreach ($ADAT['debug_result'] as $key => $value) {
+	    echo '<h1>'.$key.'</h1>';
+	    dump($value);
+	}
+    }
+
+?>
\ No newline at end of file
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index 092b8f17..6af0687a 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4658
+4660
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index 092b8f17..6af0687a 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4658
+4660
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 9eddb589..dc64590a 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4658
-eb8303fbe2d6df5296de8fe1427e8471  mayor-fenntarto-rev4658.tgz
-f028b5585e2c9d7f4cd2cbf295121825  mayor-installer-sulix-rev4658.tgz
-0ca29a7c184fe30de01f9ecbcdfc7440  mayor-wiki-rev4658.tgz
-ee6e666f057d5733cd2536291839787e  mayor-installer-rev4658.tgz
-20cb4509767f48152ed8dc2b49ae7b34  mayor-portal-rev4658.tgz
-bc7d31801c0cd61628b66f80623b9e6c  mayor-felveteli-rev4658.tgz
-6fa00ff10d58db07bf0facefffdc6b9c  mayor-jatek-rev4658.tgz
-5e3138daafbb66937258c951200a1629  mayor-locales-jp_JP-rev4658.tgz
-eb0b0ce174232e30172db361adc8e297  mayor-locales-de_DE-rev4658.tgz
-d17d2a59b0c5d701d3aea7e35826b76a  mayor-locales-en_US-rev4658.tgz
-ecfa9254ef98a464c9c32be4d4facb6c  mayor-naplo-rev4658.tgz
-7b31a085f148940b7cce9f53a74ba85e  mayor-base-rev4658.tgz
+Revision 4660
+3fb1cdf9f21b5acd0ddf429303963f4e  mayor-fenntarto-rev4660.tgz
+6c66d7cf698aa1bb9c53f388097dfb3b  mayor-installer-sulix-rev4660.tgz
+ca817e0a9222d1e664a9c382d58e3806  mayor-wiki-rev4660.tgz
+66323ee780bdf9e363bfa50ce994a205  mayor-installer-rev4660.tgz
+a8c663bc330e90c15bfc72ecee3c1e5c  mayor-portal-rev4660.tgz
+0f3733a980653d0f2e90636c5da12245  mayor-felveteli-rev4660.tgz
+d0885a7f82bace4d1a248736cb431fcc  mayor-jatek-rev4660.tgz
+e7fae76f9a0f82b3d5cf98350a02dffc  mayor-locales-jp_JP-rev4660.tgz
+ec4704f190a283a75f877a5e25341dcd  mayor-locales-de_DE-rev4660.tgz
+357d540099d2703e9e8b30406baa2c40  mayor-locales-en_US-rev4660.tgz
+c3e3f289f2eebc7925813e8ce00b6a60  mayor-naplo-rev4660.tgz
+d782770c9993183399610b8b4ddf69bb  mayor-base-rev4660.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index 092b8f17..6af0687a 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4658
+4660
diff --git a/rev.txt b/rev.txt
index 092b8f17..6af0687a 100644
--- a/rev.txt
+++ b/rev.txt
@@ -1 +1 @@
-4658
+4660