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-naplo/www/include/modules/naplo/tanev/targyBontas.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mayor-orig/mayor-naplo/www/include/modules') 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, -- cgit v1.2.3 From 3dcf762b20c16850cff7c61ac74e4bf0850ffa42 Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Wed, 26 Aug 2020 14:20:03 +0200 Subject: Rev: 4672 --- mayor-orig/mayor-base/log/mayor-base.rev | 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 +- .../install/module-naplo/mysql/intezmeny.sql | 2 +- mayor-orig/mayor-naplo/log/mayor-naplo.rev | 2 +- .../mayor-naplo/update/pre004671-1-intezmeny.sql | 14 +++++ .../include/menu/private/hu_HU/module-naplo.php | 2 + .../include/modules/naplo/export/kretaOrarend.php | 70 ++++++++++++++++++++++ .../hu_HU/module-naplo/export/kretaOrarend.php | 8 +++ .../private/naplo/export/kretaOrarend-pre.php | 53 ++++++++++++++++ .../policy/private/naplo/export/kretaOrarend.php | 12 ++++ .../module-naplo/html/export/kretaOrarend.phtml | 66 ++++++++++++++++++++ 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, 253 insertions(+), 28 deletions(-) create mode 100644 mayor-orig/mayor-naplo/update/pre004671-1-intezmeny.sql create mode 100644 mayor-orig/mayor-naplo/www/include/modules/naplo/export/kretaOrarend.php create mode 100644 mayor-orig/mayor-naplo/www/lang/hu_HU/module-naplo/export/kretaOrarend.php create mode 100644 mayor-orig/mayor-naplo/www/policy/private/naplo/export/kretaOrarend-pre.php create mode 100644 mayor-orig/mayor-naplo/www/policy/private/naplo/export/kretaOrarend.php create mode 100644 mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/export/kretaOrarend.phtml (limited to 'mayor-orig/mayor-naplo/www/include/modules') diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index ae6d0645..add7598c 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4670 +4672 diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index ae6d0645..add7598c 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4670 +4672 diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index ae6d0645..add7598c 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4670 +4672 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index ae6d0645..add7598c 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4670 +4672 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 ae6d0645..add7598c 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 @@ -4670 +4672 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index ae6d0645..add7598c 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4670 +4672 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 ae6d0645..add7598c 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 @@ -4670 +4672 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 ae6d0645..add7598c 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 @@ -4670 +4672 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 ae6d0645..add7598c 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 @@ -4670 +4672 diff --git a/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql b/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql index bb15985a..1912a862 100644 --- a/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql +++ b/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql @@ -263,7 +263,7 @@ CREATE TABLE `tanar` ( `oId` bigint(20) unsigned DEFAULT NULL, `beDt` date DEFAULT NULL, `kiDt` date DEFAULT NULL, - `viseltNevElotag` varchar(8) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '', + `viseltNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT NULL, `viseltCsaladinev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '', `viseltUtonev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '', `szuletesiHely` varchar(16) COLLATE utf8_hungarian_ci DEFAULT NULL, diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index ae6d0645..add7598c 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4670 +4672 diff --git a/mayor-orig/mayor-naplo/update/pre004671-1-intezmeny.sql b/mayor-orig/mayor-naplo/update/pre004671-1-intezmeny.sql new file mode 100644 index 00000000..6fc53da7 --- /dev/null +++ b/mayor-orig/mayor-naplo/update/pre004671-1-intezmeny.sql @@ -0,0 +1,14 @@ +DELIMITER $$ +DROP PROCEDURE IF EXISTS upgrade_database_4671 $$ + +CREATE PROCEDURE upgrade_database_4671() +BEGIN +SET NAMES utf8 COLLATE utf8_hungarian_ci; + +IF EXISTS (SELECT * FROM information_schema.COLUMNS WHERE TABLE_SCHEMA=DATABASE() and TABLE_NAME='tanar' and COLUMN_NAME='viseltNevElotag') THEN + ALTER TABLE `tanar` MODIFY `viseltNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT NULL; +END IF; + +END $$ +DELIMITER ; +CALL upgrade_database_4671(); 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 25907716..fa205518 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 @@ -348,6 +348,7 @@ 'diakExport' => array(array('txt' => 'Diak adatok')), 'tantargyFelosztas' => array(array('txt' => 'Tantárgyfelosztás export')), 'kreta' => array(array('txt' => 'KRÉTA export')), + 'kretaOrarend' => array(array('txt' => 'KRÉTA órarend export')), ); @@ -529,6 +530,7 @@ 'tantargyFelosztas' => array(array('txt' => 'Tantárgyfelosztás export')), 'sulix' => array(array('txt' => 'Együttműködés SuliXerverrel')), 'kreta' => array(array('txt' => 'KRÉTA export')), + 'kretaOrarend' => array(array('txt' => 'KRÉTA órarend export')), 'tanarOsztalyOraszam' => array(array('txt' => 'Tanár-Osztály óraszámok')), ); $MENU['modules']['naplo']['sub']['intezmeny'] = array( 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 new file mode 100644 index 00000000..86e0835d --- /dev/null +++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/export/kretaOrarend.php @@ -0,0 +1,70 @@ + 'getOrarendAdat', 'result'=>'indexed','value'=>$v), $lr); + $q = "SELECT tankorId, tankorNev, targyNev, kretaTargyNev, csoportNev FROM ".__INTEZMENYDBNEV.".tankor + LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter USING (tankorId) + LEFT JOIN ".__INTEZMENYDBNEV.".targy USING (targyId) + LEFT JOIN tankorCsoport USING (tankorId) + LEFT JOIN csoport USING (csoportId) + WHERE tanev=".__TANEV." AND szemeszter=1"; + + $v = array(); + $ADAT['tankor'] = db_query($q, array('fv' => 'getOrarendAdat/tankor', 'result'=>'assoc','keyfield'=>'tankorId','value'=>$v), $lr); + foreach ($ADAT['tankor'] as $_tankorId => $T) { + $M = explode(' ', $T['csoportNev']); + + + if (strpos($T['csoportNev'],',') !== false) $ADAT['t2osztaly'][$_tankorId] = ''; + else $ADAT['t2osztaly'][$_tankorId] = $M[0]; + + if (strpos($T['csoportNev'],' ') === false && strpos($T['csoportNev'],'_') === false) $ADAT['t2csoport'][$_tankorId] = ''; + else $ADAT['t2csoport'][$_tankorId] = $T['csoportNev']; + } + + + db_close($lr); + $ADAT['export'][] = array( + 'Hetirend','Nap','Óra (adott napon belül)','Osztály','Csoport','Tantárgy','Tanár','Helyiség' + ); + foreach ($ADAT['orak'] as $index => $O) { + list($helyseg,$_nev) = explode(" - ",$O['leiras']); + $ADAT['export'][] = array( + $kretaHETIREND[ $O['het'] ], // Hetirend + $aHetNapjai[ $O['nap'] ], // Nap + $O['ora'], // Óra + $ADAT['t2osztaly'][ $O['tankorId'] ], // Osztály + $ADAT['t2csoport'][ $O['tankorId'] ], // Csoport + $ADAT['tankor'][ $O['tankorId'] ]['kretaTargyNev'], // Tantárgy + $ADAT['tanar'][ $O['tanarId'] ]['tanarNev'], // Tanár + $helyseg // Helyiség + ); + } + + return $ADAT['export']; + + } + + function exportKretaOrarend($file, $ADAT) { + + $T = $ADAT['export']; + + if ($ADAT['formatum'] == 'xml') return generateXLS("$file.${ADAT['formatum']}", $T, 'kreta_ETTF_simple'); + elseif ($ADAT['formatum'] == 'csv') return generateCSV("$file.${ADAT['formatum']}", $T, ''); + elseif ($ADAT['formatum'] == 'ods') return generateODS("$file.${ADAT['formatum']}", $T, 'kreta_ETTF_simple'); + else return false; + + } + + +?> \ No newline at end of file diff --git a/mayor-orig/mayor-naplo/www/lang/hu_HU/module-naplo/export/kretaOrarend.php b/mayor-orig/mayor-naplo/www/lang/hu_HU/module-naplo/export/kretaOrarend.php new file mode 100644 index 00000000..eafb4bf3 --- /dev/null +++ b/mayor-orig/mayor-naplo/www/lang/hu_HU/module-naplo/export/kretaOrarend.php @@ -0,0 +1,8 @@ + diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/export/kretaOrarend-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/export/kretaOrarend-pre.php new file mode 100644 index 00000000..65b52e40 --- /dev/null +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/export/kretaOrarend-pre.php @@ -0,0 +1,53 @@ + Kréta "Hetirend" típusú adatszótárának elemeit + - Minden tárgynál be van írva a kretaTargyNev + - Feltételezzük, hogy minden tankör pontosan egy csoportba tartozik bele, s a csoportok a Kréta csoportoknak/osztályoknak megfelelők + - A csoportok elnevezésében feltételezések: + - egész osztályos - csak az osztályjel alkotja a csoportnevet (nincs szóköz és aláhúzás karakter) Pl: 11.a + - több osztályos - az érintett osztályok vesszővel felsoroltak (van benne vessző) Pl: 9.a, 9.b tsf + - osztálybontás - osztályjel után szóközzel elválasztot csoportjel (van benne szóköz) Pl: 7.a csop1 + - A terem leirasa a Krétabeli "Helyiség név" mezővel kezdődik, " - " után követheti bármi Pl: 120Fi - Fizika előadó + - A tanár neve a Krétabelivel pontosan egyező +*/ +if (_RIGHTS_OK !== true) die(); +if (!__NAPLOADMIN && !__VEZETOSEG) { + $_SESSION['alert'] = 'page:insufficient_access'; +} else { + require_once('include/modules/naplo/share/osztaly.php'); + require_once('include/modules/naplo/share/munkakozosseg.php'); + require_once('include/modules/naplo/share/tanar.php'); + require_once('include/modules/naplo/share/targy.php'); + require_once('include/modules/naplo/share/file.php'); + + if ($action == "kretaOrarendExport") { + $ADAT['tanar'] = getTanarok(array('result'=>'assoc')); + $ADAT['export'] = getOrarendAdat($ADAT); + + + $ADAT['formatum'] = readVariable($_POST['formatum'], 'enum', null, array('csv','ods','xml')); + if ($ADAT['formatum'] == 'xml') $ADAT['mime'] = 'application/vnd.ms-excel'; + if (isset($ADAT['formatum'])) { + $file = _DOWNLOADDIR.'/private/naplo/export/kretaOrarend_'.date('Ymd'); + if (exportKretaOrarend($file, $ADAT)) { + header('Location: '.location('index.php?page=session&f=download&download=true&dir=naplo/export/&file='.$file.'.'.$ADAT['formatum'].'&mimetype='.$ADAT['mime'])); + } + } + + } + + + +} diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/export/kretaOrarend.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/export/kretaOrarend.php new file mode 100644 index 00000000..ecc722e0 --- /dev/null +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/export/kretaOrarend.php @@ -0,0 +1,12 @@ +'; + putKretaOrarendForm($ADAT); + + + +?> \ No newline at end of file diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/export/kretaOrarend.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/export/kretaOrarend.phtml new file mode 100644 index 00000000..7ffeccad --- /dev/null +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/export/kretaOrarend.phtml @@ -0,0 +1,66 @@ +href('index.php?page=naplo&sub=export&f=kretaOrarend'), 'class'=>"export")); + echo ''."\n"; + + echo '
Kréta - Órarend export'."\n"; + echo ''."\n"; + + echo ''."\n"; + echo ''."\n"; + echo ''; + echo ''; + echo ''; + + echo ''; + + + echo ''; + echo ''."\n"; + echo ''."\n"; + + echo ''; + echo ''; + echo ''; + + echo '
Tudnivalók
'; + echo '

Az elkészült órarendet a Krétába való importálásra alkalmas formátumban exportáljuk ki +(ld Kréta tudásbázis/Órarend importálása). +

+A funkció működéséhez sok előfeltételnek kell megfelelni, hogy a két rendszer adatai jól megfeleltetetők legyenek egymással: +

+
    +
  • A configban a $kretaHETIREND vektorba fel kell venni a Kráta adatszótárának "Hetirend" típusú elemeit. +
  • A tanárneveknek pontosan egyeznie kell a két rendszerben +
  • A tárgyaknál fel kell venni a kretaTargyNev mezőbe a Krétában használt tárgynevet +
  • Minden tankörnek bele kell tartoznia pontosan egy csoportba, mely egy Kréta csoportot vagy osztályt jelöl meg +
  • ... +
+'; + echo '
Formátum kiválasztása
'; + echo '
    '; + echo '
  • '; + echo ''."\n"; + echo ''."\n"; + echo '
    • '; + echo '
  • '; + echo ''."\n"; + echo ''."\n"; + echo '
    • '; + echo '
  • '; + echo ''."\n"; + echo ''."\n"; + echo '
'; + echo '
'; + echo ''."\n"; + echo '
'."\n"; + echo '
'; + formEnd(); + + + + } + +?> \ 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 ae6d0645..add7598c 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4670 +4672 diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index ae6d0645..add7598c 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4670 +4672 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index b78cc000..3865264a 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4670 -cba1147e897c76e7c16d45dbe47d1182 mayor-fenntarto-rev4670.tgz -fd708eb082977562764f1b1825e29f67 mayor-installer-sulix-rev4670.tgz -a721fb2bfbd2839c3cba735b1c4caab8 mayor-wiki-rev4670.tgz -c8b3a9922b7b5cd9dedba587bd15c4f1 mayor-installer-rev4670.tgz -61204f6f2312a735247d998c397de7fa mayor-portal-rev4670.tgz -8093da7931507cde6c2aaad259ceda4d mayor-felveteli-rev4670.tgz -3c08d033790423f67349f0ec352246d0 mayor-jatek-rev4670.tgz -3bbb4da1261cc77507793fdb7ff0256a mayor-locales-jp_JP-rev4670.tgz -a6456f0d911fce770b9e8840fbf87833 mayor-locales-de_DE-rev4670.tgz -f6b1df395dc6d411fa682916058279c3 mayor-locales-en_US-rev4670.tgz -b8b5c925ecfcc25da36bb202564f0e1e mayor-naplo-rev4670.tgz -024478761bf99fd4af52cd6d06814946 mayor-base-rev4670.tgz +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 diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index ae6d0645..add7598c 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4670 +4672 diff --git a/rev.txt b/rev.txt index ae6d0645..add7598c 100644 --- a/rev.txt +++ b/rev.txt @@ -1 +1 @@ -4670 +4672 -- 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-naplo/www/include/modules') 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