Rev: 4674rev4674

17 files changed, 32 insertions, 29 deletions

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