From 6359761e029be169a9f0ea2b1e3410408c373ec4 Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Tue, 9 Jun 2020 23:40:04 +0200
Subject: Rev: 4656

---
 .../lang/hu_HU/module-password/changePassword.php  |  1 +
 .../module-password/html/changePassword.phtml      |  9 ++++++
 .../javascript/changePassword.jquery.min.js        | 32 ++++++++++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 mayor-orig/mayor-base/www/skin/classic/module-password/javascript/changePassword.jquery.min.js

(limited to 'mayor-orig/mayor-base/www')

diff --git a/mayor-orig/mayor-base/www/lang/hu_HU/module-password/changePassword.php b/mayor-orig/mayor-base/www/lang/hu_HU/module-password/changePassword.php
index 9c56a329..94007ff8 100644
--- a/mayor-orig/mayor-base/www/lang/hu_HU/module-password/changePassword.php
+++ b/mayor-orig/mayor-base/www/lang/hu_HU/module-password/changePassword.php
@@ -12,5 +12,6 @@ define('_USERNAME','Felhasználói név');
 define('_NEW_PASSWORD','Új jelszó');
 define('_VERIFICATION','Megerősítés');
 define('_OK','OK');
+define('_PWGEN','Ajánlott jelszó');
 
 ?>
diff --git a/mayor-orig/mayor-base/www/skin/classic/module-password/html/changePassword.phtml b/mayor-orig/mayor-base/www/skin/classic/module-password/html/changePassword.phtml
index 59dab0ea..295f6eeb 100644
--- a/mayor-orig/mayor-base/www/skin/classic/module-password/html/changePassword.phtml
+++ b/mayor-orig/mayor-base/www/skin/classic/module-password/html/changePassword.phtml
@@ -31,6 +31,15 @@
 	    echo '</tr>'."\n";
 	echo '</tfoot>'."\n";
 	echo '<tbody>'."\n";
+    	    echo '<tr>'."\n";
+        	echo '<td>'."\n";
+            	    echo _PWGEN;
+        	echo '</td>'."\n";
+        	echo '<td>'."\n";
+            	    echo '<input id="txtPwgen" type="text" value="" maxlength="32" />'."\n";
+		    echo '<div id="btnPwgen" class="icon-fork" style="cursor: pointer"></div>';
+        	echo '</td>'."\n";
+    	    echo '</tr>'."\n";
     	    echo '<tr>'."\n";
         	echo '<td>'."\n";
             	    echo _USERNAME;
diff --git a/mayor-orig/mayor-base/www/skin/classic/module-password/javascript/changePassword.jquery.min.js b/mayor-orig/mayor-base/www/skin/classic/module-password/javascript/changePassword.jquery.min.js
new file mode 100644
index 00000000..221c2f98
--- /dev/null
+++ b/mayor-orig/mayor-base/www/skin/classic/module-password/javascript/changePassword.jquery.min.js
@@ -0,0 +1,32 @@
+$(function() {
+
+    var str = randString($('#newpassword'));
+    $("#btnPwgen").click(function() {
+	$('#newPassword').val(str);
+	$('#verification').val(str);
+    });
+    $('#txtPwgen').val(str);
+
+});
+
+function randString(id){
+  var dataSet = 'a-z,A-Z,0-9'.split(',');  
+  var possible = '';
+  if($.inArray('a-z', dataSet) >= 0){
+    possible += 'abcdefghijklmnopqrstuvwxyz';
+  }
+  if($.inArray('A-Z', dataSet) >= 0){
+    possible += 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+  }
+  if($.inArray('0-9', dataSet) >= 0){
+    possible += '0123456789';
+  }
+  if($.inArray('#', dataSet) >= 0){
+    possible += '![]{}()%&*$#^<>~@|';
+  }
+  var text = '';
+  for(var i=0; i < 10; i++) {
+    text += possible.charAt(Math.floor(Math.random() * possible.length));
+  }
+  return text;
+}
-- 
cgit v1.2.3


From 3f797e7e6a2378f665ef2b7e3b414c48a0671375 Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Tue, 23 Jun 2020 11:45:03 +0200
Subject: Rev: 4658

---
 mayor-orig/mayor-base/log/mayor-base.rev           |  2 +-
 mayor-orig/mayor-base/www/include/base/mysql.php   |  2 ++
 mayor-orig/mayor-felveteli/log/mayor-felveteli.rev |  2 +-
 mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev |  2 +-
 .../mayor-installer-orig/log/mayor-installer.rev   |  2 +-
 .../log/mayor-installer-sulix.rev                  |  2 +-
 mayor-orig/mayor-jatek/log/mayor-jatek.rev         |  2 +-
 .../log/mayor-locales-de_DE.rev                    |  2 +-
 .../log/mayor-locales-en_US.rev                    |  2 +-
 .../log/mayor-locales-jp_JP.rev                    |  2 +-
 mayor-orig/mayor-naplo/log/mayor-naplo.rev         |  2 +-
 mayor-orig/mayor-portal/log/mayor-portal.rev       |  2 +-
 mayor-orig/mayor-wiki/log/mayor-wiki.rev           |  2 +-
 mayor-orig/md5sum                                  | 26 +++++++++++-----------
 mayor-orig/rev.txt                                 |  2 +-
 rev.txt                                            |  2 +-
 16 files changed, 29 insertions(+), 27 deletions(-)

(limited to 'mayor-orig/mayor-base/www')

diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index b314bdf3..092b8f17 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4657
+4658
diff --git a/mayor-orig/mayor-base/www/include/base/mysql.php b/mayor-orig/mayor-base/www/include/base/mysql.php
index 12aeb771..819fdcd0 100644
--- a/mayor-orig/mayor-base/www/include/base/mysql.php
+++ b/mayor-orig/mayor-base/www/include/base/mysql.php
@@ -91,9 +91,11 @@
 			mysqli_set_charset($lr, "utf8");
 			mysqli_query($lr, "SET NAMES utf8");
 			mysqli_query($lr, "SET collation_connection='utf8_hungarian_ci'");
+			mysqli_query($lr, "SET SESSION sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''))");
 		    } else {
 			mysql_query("SET NAMES utf8", $lr);
 			mysql_query("SET collation_connection='utf8_hungarian_ci'", $lr);
+                        mysql_query("SET SESSION sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''))", $lr);
 		    }
 		} else {
 		    $_SESSION['alert'][] = "message:sql_select_db_failure:db_connect/${SET['fv']}:$modul:".$MYSQL_DATA[$modul]['db'];
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index b314bdf3..092b8f17 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4657
+4658
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index b314bdf3..092b8f17 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4657
+4658
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index b314bdf3..092b8f17 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4657
+4658
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 b314bdf3..092b8f17 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 @@
-4657
+4658
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index b314bdf3..092b8f17 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4657
+4658
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 b314bdf3..092b8f17 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 @@
-4657
+4658
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 b314bdf3..092b8f17 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 @@
-4657
+4658
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 b314bdf3..092b8f17 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 @@
-4657
+4658
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index b314bdf3..092b8f17 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4657
+4658
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index b314bdf3..092b8f17 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4657
+4658
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index b314bdf3..092b8f17 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4657
+4658
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index adeadc9c..9eddb589 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4657
-566806facc3e8f38db33a8e88df169a0  mayor-fenntarto-rev4657.tgz
-5817ec0727aadc2304b1c1dc2dc3278e  mayor-installer-sulix-rev4657.tgz
-5d42fac0c489fd48164c0d32e3e7203b  mayor-wiki-rev4657.tgz
-fd10e83f0291649d7c494a71258ac91b  mayor-installer-rev4657.tgz
-02e9a08e66c1cb58f96d80e7d27edbb7  mayor-portal-rev4657.tgz
-b30966cebeb70859a4390ca2fb5c73fd  mayor-felveteli-rev4657.tgz
-68e1857d1ffa543ed7e8c5f3c05ab40e  mayor-jatek-rev4657.tgz
-fee49f20cf785a98138864c0079bf53e  mayor-locales-jp_JP-rev4657.tgz
-ab98bd07d64979c4ab1aa9d5ff52626b  mayor-locales-de_DE-rev4657.tgz
-8330cdb816692e338593462c3e751b50  mayor-locales-en_US-rev4657.tgz
-b3be149c0cdffc863463c35104594625  mayor-naplo-rev4657.tgz
-b05672b41f19499adee891107f0bd2d8  mayor-base-rev4657.tgz
+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
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index b314bdf3..092b8f17 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4657
+4658
diff --git a/rev.txt b/rev.txt
index b314bdf3..092b8f17 100644
--- a/rev.txt
+++ b/rev.txt
@@ -1 +1 @@
-4657
+4658
-- 
cgit v1.2.3


From 9071d0579197c0e79d6c74230c1bab850a5306a5 Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Wed, 24 Jun 2020 16:05:03 +0200
Subject: Rev: 4660

---
 mayor-orig/mayor-base/log/mayor-base.rev           |  2 +-
 mayor-orig/mayor-base/www/lang/hu_HU/base/base.php |  2 +-
 mayor-orig/mayor-felveteli/log/mayor-felveteli.rev |  2 +-
 mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev |  2 +-
 .../mayor-installer-orig/log/mayor-installer.rev   |  2 +-
 .../log/mayor-installer-sulix.rev                  |  2 +-
 mayor-orig/mayor-jatek/log/mayor-jatek.rev         |  2 +-
 .../log/mayor-locales-de_DE.rev                    |  2 +-
 .../log/mayor-locales-en_US.rev                    |  2 +-
 .../log/mayor-locales-jp_JP.rev                    |  2 +-
 mayor-orig/mayor-naplo/log/mayor-naplo.rev         |  2 +-
 .../include/menu/private/hu_HU/module-naplo.php    |  1 +
 .../www/policy/private/naplo/admin/debug-pre.php   | 22 ++++++++++++++++++
 .../www/policy/private/naplo/admin/debug.php       | 11 +++++++++
 mayor-orig/mayor-portal/log/mayor-portal.rev       |  2 +-
 mayor-orig/mayor-wiki/log/mayor-wiki.rev           |  2 +-
 mayor-orig/md5sum                                  | 26 +++++++++++-----------
 mayor-orig/rev.txt                                 |  2 +-
 rev.txt                                            |  2 +-
 19 files changed, 62 insertions(+), 28 deletions(-)
 create mode 100644 mayor-orig/mayor-naplo/www/policy/private/naplo/admin/debug-pre.php
 create mode 100644 mayor-orig/mayor-naplo/www/policy/private/naplo/admin/debug.php

(limited to 'mayor-orig/mayor-base/www')

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
-- 
cgit v1.2.3


From 10e44ace4c377167ed163b4d673c266ac2358155 Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Sun, 2 Aug 2020 09:15:03 +0200
Subject: Rev: 4667

---
 mayor-orig/mayor-base/log/mayor-base.rev           |  2 +-
 .../classic/base/javascript/base.jquery.min.js     |  1 +
 mayor-orig/mayor-felveteli/log/mayor-felveteli.rev |  2 +-
 mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev |  2 +-
 .../mayor-installer-orig/log/mayor-installer.rev   |  2 +-
 .../log/mayor-installer-sulix.rev                  |  2 +-
 mayor-orig/mayor-jatek/log/mayor-jatek.rev         |  2 +-
 .../log/mayor-locales-de_DE.rev                    |  2 +-
 .../log/mayor-locales-en_US.rev                    |  2 +-
 .../log/mayor-locales-jp_JP.rev                    |  2 +-
 mayor-orig/mayor-naplo/bin/xetex2pdf.sh            |  4 +--
 mayor-orig/mayor-naplo/log/mayor-naplo.rev         |  2 +-
 .../include/modules/naplo/tanev/targyBontas.php    |  2 +-
 .../policy/private/naplo/tanev/targyBontas-pre.php |  1 +
 .../javascript/intezmeny/kepesitesek.jquery.min.js |  6 +++--
 .../tankorTanarHozzarendeles.jquery.min.js         |  3 ++-
 .../intezmeny/tovabbkepzes.jquery.min.js           |  3 ++-
 .../javascript/tanev/targyBontas.jquery.min.js     | 31 +++++++++++++++-------
 mayor-orig/mayor-portal/log/mayor-portal.rev       |  2 +-
 mayor-orig/mayor-wiki/log/mayor-wiki.rev           |  2 +-
 mayor-orig/md5sum                                  | 26 +++++++++---------
 mayor-orig/rev.txt                                 |  2 +-
 rev.txt                                            |  2 +-
 23 files changed, 62 insertions(+), 43 deletions(-)

(limited to 'mayor-orig/mayor-base/www')

diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index e8f0acdd..ed3cdf9c 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4666
+4667
diff --git a/mayor-orig/mayor-base/www/skin/classic/base/javascript/base.jquery.min.js b/mayor-orig/mayor-base/www/skin/classic/base/javascript/base.jquery.min.js
index f4b27b06..003422ac 100644
--- a/mayor-orig/mayor-base/www/skin/classic/base/javascript/base.jquery.min.js
+++ b/mayor-orig/mayor-base/www/skin/classic/base/javascript/base.jquery.min.js
@@ -1,3 +1,4 @@
+
 var debug = false;
 function _debug(str) {
     if (debug) console.log(str);
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index e8f0acdd..ed3cdf9c 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4666
+4667
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index e8f0acdd..ed3cdf9c 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4666
+4667
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index e8f0acdd..ed3cdf9c 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4666
+4667
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 e8f0acdd..ed3cdf9c 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 @@
-4666
+4667
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index e8f0acdd..ed3cdf9c 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4666
+4667
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 e8f0acdd..ed3cdf9c 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 @@
-4666
+4667
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 e8f0acdd..ed3cdf9c 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 @@
-4666
+4667
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 e8f0acdd..ed3cdf9c 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 @@
-4666
+4667
diff --git a/mayor-orig/mayor-naplo/bin/xetex2pdf.sh b/mayor-orig/mayor-naplo/bin/xetex2pdf.sh
index a4f7bf3f..d7a880c7 100644
--- a/mayor-orig/mayor-naplo/bin/xetex2pdf.sh
+++ b/mayor-orig/mayor-naplo/bin/xetex2pdf.sh
@@ -12,8 +12,8 @@ HOME="/tmp"
 export HOME
 
 # Make sure this exists
-# cd $BASEDIR/print/module-naplo/tex/
-# fmtutil-sys --cnffile $BASEDIR/print/module-naplo/tex/mayor.cnf --fmtdir $BASEDIR/print/module-naplo/ --byfmt mayor
+# cd $BASEDIR/print/module-naplo/xetex/
+# fmtutil-sys --cnffile $BASEDIR/print/module-naplo/xetex/mayor-xetex.cnf --fmtdir $BASEDIR/print/module-naplo/ --byfmt mayor-xetex
         
 cat <<EOF > $1.tex
 %\font\kicsi=ecrm0500
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index e8f0acdd..ed3cdf9c 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4666
+4667
diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/tanev/targyBontas.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/tanev/targyBontas.php
index 5b31bdec..625e0482 100644
--- a/mayor-orig/mayor-naplo/www/include/modules/naplo/tanev/targyBontas.php
+++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/tanev/targyBontas.php
@@ -74,7 +74,7 @@
 	$bontasId = db_query($q, array('fv'=>'addBontas/insert','modul'=>'naplo','result'=>'insert','values'=>array($osztalyId,$kepzesOratervId,$targyId)), $lr);
 
 	// is_resource mysqli esetán nem jó (object)
-	if (!$olr) db_close();
+	if (!$olr) db_close($lr);
 
 	return array(
 	    'targyId' => $targyId,
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/tanev/targyBontas-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/tanev/targyBontas-pre.php
index c9aaf91b..2b9ad588 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/tanev/targyBontas-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/tanev/targyBontas-pre.php
@@ -18,6 +18,7 @@
 	if ($ADAT['targyBontasStatus']===false && $action=='targyBontasInit') {
 	    $ADAT['targyBontasStatus'] = initFromLastYear();
 	}
+dump($ADAT);
 	// telephely - csak szűréshez kell
 	$ADAT['telephelyId'] = $telephelyId = readVariable($_POST['telephelyId'], 'id');
 	// kötelező szűrési opció
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/intezmeny/kepesitesek.jquery.min.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/intezmeny/kepesitesek.jquery.min.js
index 75cd36c3..a57f781b 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/intezmeny/kepesitesek.jquery.min.js
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/intezmeny/kepesitesek.jquery.min.js
@@ -20,7 +20,8 @@ $(function() {
 	    targyId = element.data('targyid');
 	    kepesitesId = element.data('kepesitesid');
 
-            	    postData = { 'action':'delTargy', 'targyId':targyId, 'kepesitesId':kepesitesId }
+            	    // postData = { 'action':'delTargy', 'targyId':targyId, 'kepesitesId':kepesitesId }
+                    postData = { 'action':'delTargy', 'targyId':targyId, 'kepesitesId':kepesitesId, 'mayorToken': ($('body').data('mayortoken')) }
                     saltName = $('#kepesitesForm input.salt').prop('name');
                     saltValue = $('#kepesitesForm input.salt').val();
                     postData[saltName] = saltValue;
@@ -40,7 +41,8 @@ $(function() {
 	    tanarId = element.data('tanarid');
 	    kepesitesId = element.data('kepesitesid');
 
-            	    postData = { 'action':'delTanar', 'tanarId':tanarId, 'kepesitesId':kepesitesId }
+            	    // postData = { 'action':'delTanar', 'tanarId':tanarId, 'kepesitesId':kepesitesId }
+                    postData = { 'action':'delTanar', 'tanarId':tanarId, 'kepesitesId':kepesitesId, 'mayorToken': ($('body').data('mayortoken')) }
                     saltName = $('#kepesitesForm input.salt').prop('name');
                     saltValue = $('#kepesitesForm input.salt').val();
                     postData[saltName] = saltValue;
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/intezmeny/tankorTanarHozzarendeles.jquery.min.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/intezmeny/tankorTanarHozzarendeles.jquery.min.js
index 3a5df16f..2e975f4e 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/intezmeny/tankorTanarHozzarendeles.jquery.min.js
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/intezmeny/tankorTanarHozzarendeles.jquery.min.js
@@ -299,7 +299,8 @@ $(function() {
 	    element.next('input#tankorNevExtra').show();
 	    element.hide();
 	} else if (element.hasClass('tankorModosit')) {
-	    postData = { 'tankorId':$('#updateWindowSide').data('target').data('tankorid'),'osztalyIds': [], 'tankorSzemeszter': [], 'tankorNevExtra': $('#updateWindowSide input#tankorNevExtra').val() }
+	    // postData = { 'tankorId':$('#updateWindowSide').data('target').data('tankorid'),'osztalyIds': [], 'tankorSzemeszter': [], 'tankorNevExtra': $('#updateWindowSide input#tankorNevExtra').val() }
+	    postData = { 'tankorId':$('#updateWindowSide').data('target').data('tankorid'),'osztalyIds': [], 'tankorSzemeszter': [], 'tankorNevExtra': $('#updateWindowSide input#tankorNevExtra').val(), 'mayorToken': ($('body').data('mayortoken')) }
 	    $('#updateWindowSide ul#tankorOsztaly input:checked').each(function(index){postData.osztalyIds.push($(this).val());})
 	    $('#updateWindowSide ul#tankorSzemeszter input[type=text]').each(function(index){  
 		if ($(this).val() != '') {
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/intezmeny/tovabbkepzes.jquery.min.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/intezmeny/tovabbkepzes.jquery.min.js
index db9f0830..cc4a0426 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/intezmeny/tovabbkepzes.jquery.min.js
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/intezmeny/tovabbkepzes.jquery.min.js
@@ -182,7 +182,8 @@ ajaxSetTanarAdat = function(tanarId,forduloDt,salt_name,salt_value) {
     postData = {'tanarId':tanarId, 
 		'forduloDt':forduloDt,
 		'sessionID': $('body').data('sessionid'), 
-		'action':'modTanarTovabbkepzesForduloDt' }
+		'action':'modTanarTovabbkepzesForduloDt', 
+		'mayorToken': ($('body').data('mayortoken')) }
     postData[salt_name] = salt_value;
     $.ajax({
                     type: "POST",
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/tanev/targyBontas.jquery.min.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/tanev/targyBontas.jquery.min.js
index fd03b778..3b3e5ac3 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/tanev/targyBontas.jquery.min.js
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/tanev/targyBontas.jquery.min.js
@@ -17,7 +17,8 @@
     }
 
 	ajaxGetTankorAdat = function(tankorId) {
-	    postData = { 'tankorId':tankorId }
+	    // postData = { 'tankorId':tankorId }
+	    postData = { 'tankorId':tankorId, 'mayorToken': ($('body').data('mayortoken')) }
 
 	    $.ajax({
 		    type: "POST",
@@ -552,8 +553,8 @@ $(function() {
 		} else if (element.hasClass('slideDown')) {
 		    slideDown(element);
 		} else if (element.hasClass('addBontas')) {
-		    
-		    postData = { 'action':'addBontas', 'keys':element.closest('tr').data('keys')}
+//		    postData = { 'action':'addBontas', 'keys':element.closest('tr').data('keys') }
+		    postData = { 'action':'addBontas', 'keys':element.closest('tr').data('keys'), 'mayorToken': ($('body').data('mayortoken')) }
 		    saltName = $('#bontasForm input.salt').prop('name');
 		    saltValue = $('#bontasForm input.salt').val();
 		    postData[saltName] = saltValue;
@@ -566,6 +567,11 @@ $(function() {
 		    }).done(function( msg, status, jqXHR ) {
 				updateSalt(jqXHR.getResponseHeader('Etag'));
 				processJSONAddBontas(msg);
+
+		    }).fail(function( jqXHR, textStatus, errorThrown ) {
+				//console.log('fail');
+				//console.log(jqXHR);
+
 		    });
 		    
 		} else if (element.hasClass('addBontasTargy')) {
@@ -582,7 +588,8 @@ $(function() {
 		    $('#targyak').show().focus();
 		} else if (element.hasClass('selectTargy')) {
 		    
-		    postData = { 'action':'addBontasTargy', 'keys':$('div#targyak').data('keys'), 'targyId':element.data('targyid') }
+		    // postData = { 'action':'addBontasTargy', 'keys':$('div#targyak').data('keys'), 'targyId':element.data('targyid') }
+		    postData = { 'action':'addBontasTargy', 'keys':$('div#targyak').data('keys'), 'targyId':element.data('targyid'), 'mayorToken': ($('body').data('mayortoken')) }
 		    saltName = $('#bontasForm input.salt').prop('name');
 		    saltValue = $('#bontasForm input.salt').val();
 		    postData[saltName] = saltValue;
@@ -599,7 +606,8 @@ $(function() {
 	
 		} else if (element.hasClass('delBontas')) {
 	
-		    postData = { 'action':'delBontas', 'keys':element.closest('div.bontas').data('keys')}
+		    // postData = { 'action':'delBontas', 'keys':element.closest('div.bontas').data('keys') }
+		    postData = { 'action':'delBontas', 'keys':element.closest('div.bontas').data('keys'), 'mayorToken': ($('body').data('mayortoken')) }
 		    saltName = $('#bontasForm input.salt').prop('name');
 		    saltValue = $('#bontasForm input.salt').val();
 		    postData[saltName] = saltValue;
@@ -622,7 +630,8 @@ $(function() {
 				alert('Hiba! A bontás összóraszáma nagyobb a képzés-óratervben megadottnál!');
 		    }  {
 		
-				postData = { 'targyId':element.data('targyid'), 'bontasIds':element.data('keys').toString().split(',') }
+				// postData = { 'targyId':element.data('targyid'), 'bontasIds':element.data('keys').toString().split(',') }
+				postData = { 'targyId':element.data('targyid'), 'bontasIds':element.data('keys').toString().split(','), 'mayorToken': ($('body').data('mayortoken')) }
 		
 				$.ajax({
 				    type: "POST",
@@ -640,8 +649,10 @@ $(function() {
 		} else if (element.hasClass('tankorBontas') && !element.hasClass('tiltott')) {
 	
 			
+			    // postData = { 'action':'bontasTankor', 'keys':$('#updateWindowSide').data('target').data('keys'), 
+			    //		 'tankorId': element.data('tankorId'), 'hetiOraszam':element.data('hetiOraszam') }
 			    postData = { 'action':'bontasTankor', 'keys':$('#updateWindowSide').data('target').data('keys'), 
-							 'tankorId': element.data('tankorId'), 'hetiOraszam':element.data('hetiOraszam') }
+					 'tankorId': element.data('tankorId'), 'hetiOraszam':element.data('hetiOraszam'), 'mayorToken': ($('body').data('mayortoken')) }
 			    saltName = $('#bontasForm input.salt').prop('name');
 			    saltValue = $('#bontasForm input.salt').val();
 			    postData[saltName] = saltValue;
@@ -678,7 +689,8 @@ $(function() {
 		    }
 		} else if (element.attr('id') == 'addTankor') {
 
-		    postData = { 'action':'ujTankor', 'bontasIds':$('#updateWindowSide').data('target').data('keys').toString().split(',') }
+		    // postData = { 'action':'ujTankor', 'bontasIds':$('#updateWindowSide').data('target').data('keys').toString().split(',') }
+		    postData = { 'action':'ujTankor', 'bontasIds':$('#updateWindowSide').data('target').data('keys').toString().split(','), 'mayorToken': ($('body').data('mayortoken')) }
 	
 		    $.ajax({
 			    type: "POST",
@@ -699,7 +711,8 @@ $(function() {
 			ajaxGetTankorAdat(element.data('tankorid'));
 		} else if (element.hasClass('tankorModosit')) {
 			
-		    postData = { 'tankorId':$('#updateWindowSide').data('target').data('tankorid'),'osztalyIds': [], 'tankorSzemeszter': [], 'tankorNevExtra': $('#updateWindowSide input#tankorNevExtra').val() }
+		    // postData = { 'tankorId':$('#updateWindowSide').data('target').data('tankorid'),'osztalyIds': [], 'tankorSzemeszter': [], 'tankorNevExtra': $('#updateWindowSide input#tankorNevExtra').val() }
+		    postData = { 'tankorId':$('#updateWindowSide').data('target').data('tankorid'),'osztalyIds': [], 'tankorSzemeszter': [], 'tankorNevExtra': $('#updateWindowSide input#tankorNevExtra').val(), 'mayorToken': ($('body').data('mayortoken')) }
 			$('#updateWindowSide ul#tankorOsztaly input:checked').each(function(index){postData.osztalyIds.push($(this).val());})
 			$('#updateWindowSide ul#tankorSzemeszter input[type=text]').each(function(index){  
 				if ($(this).val() != '') {
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index e8f0acdd..ed3cdf9c 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4666
+4667
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index e8f0acdd..ed3cdf9c 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4666
+4667
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 94455b85..1fa15f3e 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4666
-e99bb3fe3353e592b085eb6b0e942fe1  mayor-fenntarto-rev4666.tgz
-4796e189a5b07b9267eee3d43a261daf  mayor-installer-sulix-rev4666.tgz
-11dec0cd5dc52fd4eee503ff62a39c30  mayor-wiki-rev4666.tgz
-ee8577c049f2da3e965abab2cf532f05  mayor-installer-rev4666.tgz
-03e23eb86bdd9cf00ad475a3e07f1d65  mayor-portal-rev4666.tgz
-b9b8d38509bf6e2a0aa7f3c56e46cd9e  mayor-felveteli-rev4666.tgz
-1e74b0ca8f1b8b68adb3b699393a1472  mayor-jatek-rev4666.tgz
-b02845450d4c94d4c8988b5d8fe49459  mayor-locales-jp_JP-rev4666.tgz
-b898de6f4e387e33f8c2680f27185096  mayor-locales-de_DE-rev4666.tgz
-dedc7c77ac6cbc22af917bdce909a145  mayor-locales-en_US-rev4666.tgz
-d779e272ae945b2afe14d229b10c7b17  mayor-naplo-rev4666.tgz
-7545098d488c9221d763ce679913825d  mayor-base-rev4666.tgz
+Revision 4667
+12421905b927411d792ce05fa6839c19  mayor-fenntarto-rev4667.tgz
+db2b2dcf41d7963595bbe3f89b628eb5  mayor-installer-sulix-rev4667.tgz
+1b5aea4fa9dbcd8cd7a1322806d0cad6  mayor-wiki-rev4667.tgz
+f5596230af831f567090cd6289a951b0  mayor-installer-rev4667.tgz
+dc9121b7acd0524b15ed197317922dfc  mayor-portal-rev4667.tgz
+adef1f1a9ad2377c4fc1f015e80bb967  mayor-felveteli-rev4667.tgz
+0803506dbba98804bbccb8b304ee5d54  mayor-jatek-rev4667.tgz
+6301ed4fe064156a99b374f60a3bf1e3  mayor-locales-jp_JP-rev4667.tgz
+473c695c9c5b7644a8f36f144fcc2b1e  mayor-locales-de_DE-rev4667.tgz
+7e0c26710e7de18159463230e1ae410b  mayor-locales-en_US-rev4667.tgz
+c9ef30a83faef3ec9b68551100fad925  mayor-naplo-rev4667.tgz
+85bf87666c11a43ad77d477e02307fe8  mayor-base-rev4667.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index e8f0acdd..ed3cdf9c 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4666
+4667
diff --git a/rev.txt b/rev.txt
index e8f0acdd..ed3cdf9c 100644
--- a/rev.txt
+++ b/rev.txt
@@ -1 +1 @@
-4666
+4667
-- 
cgit v1.2.3


From 0c50e985f6f59a4239e0b992ebdf515fb963e028 Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Thu, 27 Aug 2020 11:20:03 +0200
Subject: Rev: 4674

---
 mayor-orig/mayor-base/log/mayor-base.rev           |  2 +-
 mayor-orig/mayor-base/www/include/base/rights.php  |  5 ++++-
 mayor-orig/mayor-felveteli/log/mayor-felveteli.rev |  2 +-
 mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev |  2 +-
 .../mayor-installer-orig/install.d/05checkdeb.sh   |  2 +-
 .../mayor-installer-orig/log/mayor-installer.rev   |  2 +-
 .../log/mayor-installer-sulix.rev                  |  2 +-
 mayor-orig/mayor-jatek/log/mayor-jatek.rev         |  2 +-
 .../log/mayor-locales-de_DE.rev                    |  2 +-
 .../log/mayor-locales-en_US.rev                    |  2 +-
 .../log/mayor-locales-jp_JP.rev                    |  2 +-
 mayor-orig/mayor-naplo/log/mayor-naplo.rev         |  2 +-
 .../include/modules/naplo/export/kretaOrarend.php  |  2 +-
 mayor-orig/mayor-portal/log/mayor-portal.rev       |  2 +-
 mayor-orig/mayor-wiki/log/mayor-wiki.rev           |  2 +-
 mayor-orig/md5sum                                  | 26 +++++++++++-----------
 mayor-orig/rev.txt                                 |  2 +-
 rev.txt                                            |  2 +-
 18 files changed, 33 insertions(+), 30 deletions(-)

(limited to 'mayor-orig/mayor-base/www')

diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index add7598c..23d66a57 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4672
+4674
diff --git a/mayor-orig/mayor-base/www/include/base/rights.php b/mayor-orig/mayor-base/www/include/base/rights.php
index dc6b7aa7..89d36f7c 100644
--- a/mayor-orig/mayor-base/www/include/base/rights.php
+++ b/mayor-orig/mayor-base/www/include/base/rights.php
@@ -250,17 +250,20 @@ function validUser($sessionID,$policy,$skin='',$lang='') {
     }
     if (count($_POST)>0) {
 	if (!empty($_POST['mayorToken'])) {
+	    if ($page=='naplo'&&$sub=='tanev'&&$f=='targyBontas') {
+		//skip check :( TODO!!!!
 	    if (hash_equals($_SESSION['mayorToken'], $_POST['mayorToken'])) {
 		// OK, token regenerálás + visszakuldjuk az ETAG-ben
 		$_SESSION['mayorToken'] = pseudoTokenGenerator();
 	    } else {
 		if ($_POST['action']!='') { /* Ha nincs action formváltozó, nincs szükség hibaüzenetre, a form nem módosít, de most... */
-		    $_SESSION['alert'][] = 'message:not_valid_form:pnu2'; 
+		    $_SESSION['alert'][] = 'message:not_valid_form:pnu2'.$page.$sub.$f; 
 		    $_JSON['result'] = false;
 		}
 		unset($_POST['action']);
 		unset($action);
 	    }
+	    }
 	} else { // klasszikus ellenőrzés, fallback
 	    echo 'FATAL ERROR 696';
 	    die();
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index add7598c..23d66a57 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4672
+4674
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index add7598c..23d66a57 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4672
+4674
diff --git a/mayor-orig/mayor-installer-orig/install.d/05checkdeb.sh b/mayor-orig/mayor-installer-orig/install.d/05checkdeb.sh
index 07a2f6f3..dbdb49b3 100755
--- a/mayor-orig/mayor-installer-orig/install.d/05checkdeb.sh
+++ b/mayor-orig/mayor-installer-orig/install.d/05checkdeb.sh
@@ -46,7 +46,7 @@ then
 elif [[ "x${RELEASE}" =~ ^x10.* ]]
 then
     ## PHP 7.2-től php-mcrypt deprecated --> kivettük, de a kódban még van...
-    PKGS="apache2 php php-json php-mysql php-ldap php-mbstring php-curl php-bcmath mariadb-server-10.3 recode texlive texlive-fonts-extra texlive-latex-extra texlive-binaries texlive-xetex ntp wget ssl-cert ssh pwgen texlive-lang-european"
+    PKGS="apache2 php php-json php-mysql php-ldap php-mbstring php-curl php-bcmath mariadb-server-10.3 recode texlive texlive-fonts-extra texlive-latex-extra texlive-binaries texlive-xetex ntp wget ssl-cert ssh pwgen texlive-lang-european ghostscript"
 else
     PKGS="apache2 php5 php5-json php5-mysqlnd php5-ldap php5-mcrypt php5-curl mysql-server recode texlive texlive-fonts-extra texlive-latex-extra texlive-binaries texlive-xetex ttf-mscorefonts-installer ntp wget ssl-cert ssh pwgen texlive-lang-european texlive-lang-hungarian"
 fi
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index add7598c..23d66a57 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4672
+4674
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 add7598c..23d66a57 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 @@
-4672
+4674
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index add7598c..23d66a57 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4672
+4674
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 add7598c..23d66a57 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 @@
-4672
+4674
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 add7598c..23d66a57 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 @@
-4672
+4674
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 add7598c..23d66a57 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 @@
-4672
+4674
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index add7598c..23d66a57 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4672
+4674
diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/export/kretaOrarend.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/export/kretaOrarend.php
index 86e0835d..48cf5f52 100644
--- a/mayor-orig/mayor-naplo/www/include/modules/naplo/export/kretaOrarend.php
+++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/export/kretaOrarend.php
@@ -41,7 +41,7 @@
 	    list($helyseg,$_nev) = explode(" - ",$O['leiras']);
 	    $ADAT['export'][] = array(
 		$kretaHETIREND[ $O['het'] ],				// Hetirend
-		$aHetNapjai[ $O['nap'] ],				// Nap
+		$aHetNapjai[ $O['nap']-1 ],				// Nap
 		$O['ora'],						// Óra
 		$ADAT['t2osztaly'][ $O['tankorId'] ],			// Osztály
 		$ADAT['t2csoport'][ $O['tankorId'] ],			// Csoport
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index add7598c..23d66a57 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4672
+4674
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index add7598c..23d66a57 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4672
+4674
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 3865264a..33914967 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4672
-fa3a2cfc4dcb15d3bc2d724c57fddb05  mayor-fenntarto-rev4672.tgz
-d6234cb9976883ace2d7554a564668e9  mayor-installer-sulix-rev4672.tgz
-01ce30cf2bedbb47578303501111276f  mayor-wiki-rev4672.tgz
-6339984a2216b9d18d47888f16dd3fea  mayor-installer-rev4672.tgz
-00e9cae74d0b7d46dffc42f27ac634ca  mayor-portal-rev4672.tgz
-6250ecdc903a4b409b76e2eb7d4bfa2d  mayor-felveteli-rev4672.tgz
-c3342f79c92249a8229532b74698527d  mayor-jatek-rev4672.tgz
-00f8c4fe37e08bc4e809d85520095571  mayor-locales-jp_JP-rev4672.tgz
-16ca20a346f389ed558517cd431ff1f4  mayor-locales-de_DE-rev4672.tgz
-80a3e9e94de834c28f7cb485ca616b35  mayor-locales-en_US-rev4672.tgz
-59d50884d02e195b650666648d85428e  mayor-naplo-rev4672.tgz
-92b950464027b4659b34ffa46f71f7be  mayor-base-rev4672.tgz
+Revision 4674
+9df1268d9f2f7cd0cf988fb7950836f8  mayor-fenntarto-rev4674.tgz
+8c0fe6e57b31772c646d4b88fcb46384  mayor-installer-sulix-rev4674.tgz
+9edef6eeb7c9188e6d516955ea3a859b  mayor-wiki-rev4674.tgz
+5ed2181210aec93a1e1592935faf311d  mayor-installer-rev4674.tgz
+7371aef93db1cf1589fbeb10e5976702  mayor-portal-rev4674.tgz
+7174be36246c7ca6506c007d3d06c7f7  mayor-felveteli-rev4674.tgz
+ea54e535cd637bcc77404ab25bdc4a5d  mayor-jatek-rev4674.tgz
+31099f8800c4ffde40016985e8c0014d  mayor-locales-jp_JP-rev4674.tgz
+245c41d24d45a402a3e51e7fedf269d6  mayor-locales-de_DE-rev4674.tgz
+b6f62b78cb0864e9bf08d4264b438ca0  mayor-locales-en_US-rev4674.tgz
+c634fb81a1f2b52f090341dd4a112115  mayor-naplo-rev4674.tgz
+98dfad411e7fc4e1576fd4183730c2a4  mayor-base-rev4674.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index add7598c..23d66a57 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4672
+4674
diff --git a/rev.txt b/rev.txt
index add7598c..23d66a57 100644
--- a/rev.txt
+++ b/rev.txt
@@ -1 +1 @@
-4672
+4674
-- 
cgit v1.2.3


From 9044c44af70eff76d875137de553d5904e475f6d Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Thu, 27 Aug 2020 12:00:04 +0200
Subject: Rev: 4675

---
 mayor-orig/mayor-base/log/mayor-base.rev           |  2 +-
 mayor-orig/mayor-base/www/include/base/rights.php  |  2 +-
 mayor-orig/mayor-felveteli/log/mayor-felveteli.rev |  2 +-
 mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev |  2 +-
 .../mayor-installer-orig/log/mayor-installer.rev   |  2 +-
 .../log/mayor-installer-sulix.rev                  |  2 +-
 mayor-orig/mayor-jatek/log/mayor-jatek.rev         |  2 +-
 .../log/mayor-locales-de_DE.rev                    |  2 +-
 .../log/mayor-locales-en_US.rev                    |  2 +-
 .../log/mayor-locales-jp_JP.rev                    |  2 +-
 mayor-orig/mayor-naplo/log/mayor-naplo.rev         |  2 +-
 .../javascript/tanev/targyBontas.jquery.min.js     |  4 ++++
 mayor-orig/mayor-portal/log/mayor-portal.rev       |  2 +-
 mayor-orig/mayor-wiki/log/mayor-wiki.rev           |  2 +-
 mayor-orig/md5sum                                  | 26 +++++++++++-----------
 mayor-orig/rev.txt                                 |  2 +-
 rev.txt                                            |  2 +-
 17 files changed, 32 insertions(+), 28 deletions(-)

(limited to 'mayor-orig/mayor-base/www')

diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index 23d66a57..d197bb6d 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4674
+4675
diff --git a/mayor-orig/mayor-base/www/include/base/rights.php b/mayor-orig/mayor-base/www/include/base/rights.php
index 89d36f7c..c30a927d 100644
--- a/mayor-orig/mayor-base/www/include/base/rights.php
+++ b/mayor-orig/mayor-base/www/include/base/rights.php
@@ -250,7 +250,7 @@ function validUser($sessionID,$policy,$skin='',$lang='') {
     }
     if (count($_POST)>0) {
 	if (!empty($_POST['mayorToken'])) {
-	    if ($page=='naplo'&&$sub=='tanev'&&$f=='targyBontas') {
+	    if ($page=='naplo'&&$sub=='tanev'&&$f=='targyBontasX') {
 		//skip check :( TODO!!!!
 	    if (hash_equals($_SESSION['mayorToken'], $_POST['mayorToken'])) {
 		// OK, token regenerálás + visszakuldjuk az ETAG-ben
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index 23d66a57..d197bb6d 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4674
+4675
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index 23d66a57..d197bb6d 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4674
+4675
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index 23d66a57..d197bb6d 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4674
+4675
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 23d66a57..d197bb6d 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 @@
-4674
+4675
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index 23d66a57..d197bb6d 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4674
+4675
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 23d66a57..d197bb6d 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 @@
-4674
+4675
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 23d66a57..d197bb6d 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 @@
-4674
+4675
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 23d66a57..d197bb6d 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 @@
-4674
+4675
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index 23d66a57..d197bb6d 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4674
+4675
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/tanev/targyBontas.jquery.min.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/tanev/targyBontas.jquery.min.js
index 3b3e5ac3..36dc7a33 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/tanev/targyBontas.jquery.min.js
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/tanev/targyBontas.jquery.min.js
@@ -26,6 +26,7 @@
 		    data: postData,
 		    dataType: 'json'
 	    }).done(function( msg, status, jqXHR ) {
+		    updateSalt(jqXHR.getResponseHeader('Etag'));
 		    processJSONTankorAdat(msg);
 	    }).fail(function( jqXHR, textStatus, errorThrown ) {
 		    //console.log('fail');
@@ -639,6 +640,7 @@ $(function() {
 				    data: postData,
 				    dataType: 'json'
 				}).done(function( msg, status, jqXHR ) {
+				    updateSalt(jqXHR.getResponseHeader('Etag'));
 				    processJSONTankorLista(msg, element);
 				}).fail(function( jqXHR, textStatus, errorThrown ) {
 				    //console.log('fail');
@@ -699,6 +701,7 @@ $(function() {
 			    dataType: 'json'
 		    }).done(function( msg, status, jqXHR ) {
 			    //console.log('ok');
+			    updateSalt(jqXHR.getResponseHeader('Etag'));
 			    processJSONUjTankor(msg);
 		    }).fail(function( jqXHR, textStatus, errorThrown ) {
 			    //console.log('fail');
@@ -729,6 +732,7 @@ $(function() {
 			    data: postData,
 			    dataType: 'json'
 		    }).done(function( msg, status, jqXHR ) {
+			    updateSalt(jqXHR.getResponseHeader('Etag'));
 			    processJSONTankorMod(msg);
 		    }).fail(function( jqXHR, textStatus, errorThrown ) {
 			    //console.log('fail');
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index 23d66a57..d197bb6d 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4674
+4675
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index 23d66a57..d197bb6d 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4674
+4675
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 33914967..247c88cd 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4674
-9df1268d9f2f7cd0cf988fb7950836f8  mayor-fenntarto-rev4674.tgz
-8c0fe6e57b31772c646d4b88fcb46384  mayor-installer-sulix-rev4674.tgz
-9edef6eeb7c9188e6d516955ea3a859b  mayor-wiki-rev4674.tgz
-5ed2181210aec93a1e1592935faf311d  mayor-installer-rev4674.tgz
-7371aef93db1cf1589fbeb10e5976702  mayor-portal-rev4674.tgz
-7174be36246c7ca6506c007d3d06c7f7  mayor-felveteli-rev4674.tgz
-ea54e535cd637bcc77404ab25bdc4a5d  mayor-jatek-rev4674.tgz
-31099f8800c4ffde40016985e8c0014d  mayor-locales-jp_JP-rev4674.tgz
-245c41d24d45a402a3e51e7fedf269d6  mayor-locales-de_DE-rev4674.tgz
-b6f62b78cb0864e9bf08d4264b438ca0  mayor-locales-en_US-rev4674.tgz
-c634fb81a1f2b52f090341dd4a112115  mayor-naplo-rev4674.tgz
-98dfad411e7fc4e1576fd4183730c2a4  mayor-base-rev4674.tgz
+Revision 4675
+443fba38b8b1c4ff6408bd0e3665e12c  mayor-fenntarto-rev4675.tgz
+0b32e36aacda0b14b87fe55bce5294c7  mayor-installer-sulix-rev4675.tgz
+f4c8499c2792b24ada5c44ea2282cf57  mayor-wiki-rev4675.tgz
+f74fd05a167bea6ccc15f3ef500a59e8  mayor-installer-rev4675.tgz
+8c685cbdfc12344d3abe3e3a0d7cd248  mayor-portal-rev4675.tgz
+ae5ec7cfa8a2c64182717796aa034124  mayor-felveteli-rev4675.tgz
+99137f734125a76b92372855bbcb755c  mayor-jatek-rev4675.tgz
+761efab4d1e78176625bcfc1781bd675  mayor-locales-jp_JP-rev4675.tgz
+d9d6dbbfc617fe7ac17e3eb4f547476d  mayor-locales-de_DE-rev4675.tgz
+fefca256d0fcb93b5a1281881a824730  mayor-locales-en_US-rev4675.tgz
+e778d007c77fe9b68c2bbeadfc36c805  mayor-naplo-rev4675.tgz
+cf933bc85930cdee356d8675dee61fa8  mayor-base-rev4675.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index 23d66a57..d197bb6d 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4674
+4675
diff --git a/rev.txt b/rev.txt
index 23d66a57..d197bb6d 100644
--- a/rev.txt
+++ b/rev.txt
@@ -1 +1 @@
-4674
+4675
-- 
cgit v1.2.3