Rev: 4622rev4622

18 files changed, 36 insertions, 30 deletions

diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index a28d2964..25199c9d 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4620
+4622
diff --git a/mayor-orig/mayor-base/update/linkme.sh b/mayor-orig/mayor-base/update/linkme.sh
index 60a70424..c0e1be88 100644
--- a/mayor-orig/mayor-base/update/linkme.sh
+++ b/mayor-orig/mayor-base/update/linkme.sh
@@ -4,7 +4,7 @@ parentLink="naplo/hibabejelento/hibabejelento naplo//szulinap naplo/haladasi/hal
 naplo/osztalyozo/jegy naplo/osztalyozo/dolgozat naplo/osztalyozo/bizonyitvany naplo/osztalyozo/stat
 naplo/bejegyzesek/bejegyzesek naplo/bejegyzesek/info naplo/tanev/fogadoOra naplo/orarend/helyettesites naplo/tanev/munkaterv naplo/orarend/orarend
 naplo/intezmeny/valtas naplo/intezmeny/diak naplo/intezmeny/diakSzulo naplo/hianyzas/diak naplo/hianyzas/diakLista naplo/hianyzas/nap naplo/uzeno/uzeno naplo/ertekeles/ertekeles
-naplo/uzeno/postas naplo//error
+naplo/uzeno/postas naplo//error naplo/haladasi/hazifeladat
 portal/hirek/egyhir
 session/download"
 publicLink="naplo/orarend/orarend naplo/orarend/szabadTerem naplo/orarend/helyettesites naplo//error"
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index a28d2964..25199c9d 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4620
+4622
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index a28d2964..25199c9d 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4620
+4622
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index a28d2964..25199c9d 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4620
+4622
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 a28d2964..25199c9d 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 @@
-4620
+4622
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index a28d2964..25199c9d 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4620
+4622
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 a28d2964..25199c9d 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 @@
-4620
+4622
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 a28d2964..25199c9d 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 @@
-4620
+4622
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 a28d2964..25199c9d 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 @@
-4620
+4622
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index a28d2964..25199c9d 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4620
+4622
diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/base/rights.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/base/rights.php
index fd538da0..a0377a17 100644
--- a/mayor-orig/mayor-naplo/www/include/modules/naplo/base/rights.php
+++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/base/rights.php
@@ -434,6 +434,7 @@ if (__NAPLO_INSTALLED === true) {
 	    } elseif (defined('__PARENTDIAKID')) {
 		define('__USERDIAKID',__PARENTDIAKID);
 		define('__USERSZULOID', getSzuloIdByUserAccount(("$page/$sub/$f" != 'naplo//diakValaszto')));
+//	    } elseif (_POLICY === 'parent') {
 	    } elseif ("$page/$sub/$f" != 'naplo//diakValaszto') {
 		header('Location: '.location('index.php?page=naplo&f=diakValaszto'));
 	    } else {
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/haladasi-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/haladasi-pre.php
index 31511d7b..79d49bd0 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/haladasi-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/haladasi-pre.php
@@ -110,6 +110,7 @@ if ( $skin == 'ajax'
 	    // set defaults ++
 //	    if (strtotime($igDt) > strtotime($_TANEV['zarasDt'])) $igDt = $_TANEV['zarasDt'];
 	    $maxIgDt = date('Y-m-d', strtotime('next Saturday', strtotime($_TANEV['kovetkezoKezdesDt'])));
+
 	    if (strtotime($igDt) > strtotime($maxIgDt)) $igDt = $maxIgDt;
 	    elseif (strtotime($igDt) < strtotime($_TANEV['kezdesDt'])) $igDt = $_TANEV['kezdesDt'];
 	    if (date('w', strtotime($igDt)) == 0) $igDt = date('Y-m-d',strtotime('-1 days',strtotime($igDt))); // Hogy vasárnap még a múltheti látszódjon
@@ -269,10 +270,10 @@ if ( $skin == 'ajax'
 	) && (__NAPLOADMIN || __VEZETOSEG)) {
 	$_NAPOK = _genNapok($tolDt,$igDt);
 	for ($i=0; $i<count($_NAPOK); $i++) {
-		checkNaplo($_NAPOK[$i]);
+	    checkNaplo($_NAPOK[$i]);
 	}
-
     }
+
     /* ------------------------------------------------- */
 
 // Ezt nem használja a getHaladási...
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js
index 251155a1..2337a13e 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js
@@ -385,11 +385,15 @@ ajaxGetZaroJegyAdat = function(zaroJegyId) {
 
 
 ajaxGetOraAdat = function(oraId) {
+    var policy = $('body').data('policy');
+    if (policy=='parent') { // workaround a szuloknek
+        window.location.replace("index.php?page=naplo&sub=haladasi&f=hazifeladat&policy="+policy+"&sessionID="+$('body').data('sessionid')+"&oraId="+oraId);
+    }
     mayorLoaderStart();
     postData = { 'oraId':oraId, 'mayorToken': ($('body').data('mayortoken')) }
     $.ajax({
                     type: "POST",
-                    url: "index.php?page=naplo&sub=tools&f=getOraAdat&policy=private&skin=ajax&sessionID="+$('body').data('sessionid'),
+                    url: "index.php?page=naplo&sub=tools&f=getOraAdat&policy="+policy+"&skin=ajax&sessionID="+$('body').data('sessionid'),
                     data: postData,
                     dataType: 'json'
     }).done(function( msg, status, jqXHR ) {
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index a28d2964..25199c9d 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4620
+4622
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index a28d2964..25199c9d 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4620
+4622
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 0edf8168..7bec2863 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4620
-a7050bfe3ad7da519f16d9e6b45ab09e  mayor-fenntarto-rev4620.tgz
-5ec3faa1b2d8015f722c3aecc318ca5c  mayor-installer-sulix-rev4620.tgz
-db84cf60e0922dfefd55d54a1e5947b8  mayor-wiki-rev4620.tgz
-a37fb46ecbd07afcc8f56c25523f277a  mayor-installer-rev4620.tgz
-0ccf4b6ddc415d1d5aecc01361533c3a  mayor-portal-rev4620.tgz
-c4438be853a0c809259607610faff18c  mayor-felveteli-rev4620.tgz
-1268b2331e8b5c4b15efd80d296f63db  mayor-jatek-rev4620.tgz
-f2a7ed4ccb5a3e5fd83d141aead01372  mayor-locales-jp_JP-rev4620.tgz
-c4b12b07414cd32c31a4fc0eaf3cdb2b  mayor-locales-de_DE-rev4620.tgz
-343e3ecb45051417cbefddd38f7fd381  mayor-locales-en_US-rev4620.tgz
-52187c43b0564fc2d84172c210b17fc9  mayor-naplo-rev4620.tgz
-1f2fa00c5ad41834745fbd22d88b882e  mayor-base-rev4620.tgz
+Revision 4622
+77fc988ba83363c16c6738ddbd308380  mayor-fenntarto-rev4622.tgz
+7ebcf17a8eac7e76f1f12141cd0f2e96  mayor-installer-sulix-rev4622.tgz
+ce69839e26be6d241b42a6f809086bd1  mayor-wiki-rev4622.tgz
+b3eb3145bc34c87c54fab8249f0047ba  mayor-installer-rev4622.tgz
+9e9cb66a0f1c39865fc98fb34406b9e5  mayor-portal-rev4622.tgz
+05f674da0d20fa113e967e954d282474  mayor-felveteli-rev4622.tgz
+4408ca2ac4f652f6951c2bb8a9338e91  mayor-jatek-rev4622.tgz
+15ce11f2a3a787e2dbe4bac92af19ce9  mayor-locales-jp_JP-rev4622.tgz
+5dfa8019872de879f6ca9118c5168982  mayor-locales-de_DE-rev4622.tgz
+d8796bed93ce7b37b6ccd3e47ebe66ad  mayor-locales-en_US-rev4622.tgz
+baeb25079baf4adbca9b16c15ce476fe  mayor-naplo-rev4622.tgz
+05b13b23fa3969fcd7568650c5cdbed6  mayor-base-rev4622.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index a28d2964..25199c9d 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4620
+4622