Rev: 4675rev4675

17 files changed, 32 insertions, 28 deletions

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