From 99481ab82a386c30d970592c5b8804e5c8e6df6e Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Thu, 4 Jun 2020 14:25:03 +0200 Subject: Rev: 4653 --- .../mayor-naplo/www/policy/private/naplo/osztalyozo/stat-pre.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mayor-orig/mayor-naplo/www/policy/private') diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/osztalyozo/stat-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/osztalyozo/stat-pre.php index 994956de..7fc0a8de 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/osztalyozo/stat-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/osztalyozo/stat-pre.php @@ -256,8 +256,10 @@ // záradékhoz (2015) $ADAT['diakAdat'][$diakId]['bukottTargy'][] = $ADAT['targyAdat'][$targyId]['targyNev']; } - if (isset($jegyAdat['megjegyzes']) && $zaraskorTag) { - $ADAT['stat'][ $jegyAdat['megjegyzes'] ]++; + if ($zaraskorTag) { + if (isset($jegyAdat['megjegyzes'])) { + $ADAT['stat'][ $jegyAdat['megjegyzes'] ]++; + } if (in_array($jegyAdat['jegyTipus'],array('jegy','féljegy'))) { $ADAT['jegyEloszlas'][$targyId][$jegyAdat['jegy']]++; if (!in_array($targyId,array_merge($ADAT['szorgalomTargyIdk'],$ADAT['magatartasTargyIdk'])) && $zaraskorTag) $ADAT['jegyEloszlas']['osszes'][$jegyAdat['jegy']]++; -- cgit v1.2.3 From 6359761e029be169a9f0ea2b1e3410408c373ec4 Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Tue, 9 Jun 2020 23:40:04 +0200 Subject: Rev: 4656 --- mayor-orig/mayor-base/log/mayor-base.rev | 2 +- .../lang/hu_HU/module-password/changePassword.php | 1 + .../module-password/html/changePassword.phtml | 9 ++++++ .../javascript/changePassword.jquery.min.js | 32 ++++++++++++++++++++++ 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 +- .../policy/private/naplo/osztalyozo/stat-pre.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 +- 19 files changed, 70 insertions(+), 28 deletions(-) create mode 100644 mayor-orig/mayor-base/www/skin/classic/module-password/javascript/changePassword.jquery.min.js (limited to 'mayor-orig/mayor-naplo/www/policy/private') diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index b5859656..4a14f368 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4653 +4656 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 ''."\n"; echo ''."\n"; echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo _PWGEN; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo '
'; + echo ''."\n"; + echo ''."\n"; echo ''."\n"; echo ''."\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; +} diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index b5859656..4a14f368 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4653 +4656 diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index b5859656..4a14f368 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4653 +4656 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index b5859656..4a14f368 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4653 +4656 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 b5859656..4a14f368 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 @@ -4653 +4656 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index b5859656..4a14f368 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4653 +4656 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 b5859656..4a14f368 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 @@ -4653 +4656 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 b5859656..4a14f368 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 @@ -4653 +4656 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 b5859656..4a14f368 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 @@ -4653 +4656 diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index b5859656..4a14f368 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4653 +4656 diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/osztalyozo/stat-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/osztalyozo/stat-pre.php index 7fc0a8de..1ede4ff2 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/osztalyozo/stat-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/osztalyozo/stat-pre.php @@ -126,7 +126,7 @@ list($_diakId, $_zaradekIndex, $zaradekId, $csereStr) = explode('/', $zAdat); // --TODO per jel hibás lehet! if ($zaradekId == '') $zaradekId = null; if (in_array($_zaradekIndex, array_values($ZaradekIndex['konferencia bukás']))) $csere = array('%évfolyam%' => $ADAT['evfolyamJel']."."); - else $csere = array('%évfolyam%' => ($ADAT['kovetkezoEvfolyamJel']).".", '%évfolyam betűvel%' => ($_EVFOLYAMJEL_BETUVEL[ $ADAT['kovetkezoEvfolyamJel'] ])."."); + else $csere = array('%évfolyam%' => ($ADAT['kovetkezoEvfolyamJel']).".", '%évfolyam betűvel%' => $_EVFOLYAMJEL_BETUVEL[ $ADAT['kovetkezoEvfolyamJel'] ]); $csere['%tantárgy%'] = str_replace('=',', ',$csereStr); // TODO, és-re cserélhetjük vessző helyett zaradekRogzites(array('diakId'=>$_diakId, 'zaradekId' => $zaradekId, 'zaradekIndex'=>$_zaradekIndex, 'dt'=>$ADAT['utolsoTanitasiNap'], 'csere' => $csere)); } diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index b5859656..4a14f368 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4653 +4656 diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index b5859656..4a14f368 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4653 +4656 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index 51d75cf9..9701a43c 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4653 -e1da81dde355c3b2a27222f55485f4d7 mayor-fenntarto-rev4653.tgz -7db82c9dea4c9474dc0ea43570549b82 mayor-installer-sulix-rev4653.tgz -b6b523a7a97959c3043191e971546d5f mayor-wiki-rev4653.tgz -2177a02b73ee7fa9e04bfadecb0d9bb4 mayor-installer-rev4653.tgz -48775a1f9977e4bd131d42b20a682975 mayor-portal-rev4653.tgz -5d31067b8865d927aa735830910b1fd4 mayor-felveteli-rev4653.tgz -b422baa7722e322c8242f10231b24014 mayor-jatek-rev4653.tgz -c1c3eeb0593c686c9eb72fe3a2eba342 mayor-locales-jp_JP-rev4653.tgz -b9915bed4c51e5c0f7eea228477c8325 mayor-locales-de_DE-rev4653.tgz -5bc43b6037d8e63b2c4743d6a7233dd3 mayor-locales-en_US-rev4653.tgz -0d9fd05779684646dee6cbd04f203136 mayor-naplo-rev4653.tgz -2911fe7c85c52c67b64341248eba9d7d mayor-base-rev4653.tgz +Revision 4656 +0426dbe90ba92e5cdd8757572cf3b78f mayor-fenntarto-rev4656.tgz +62b428ce652aaee4f7634fe06f4cb255 mayor-installer-sulix-rev4656.tgz +8b7c6fbf3a10477a6626aba3766fcba1 mayor-wiki-rev4656.tgz +e0a6ad5568813b1b1f36a2641e51fd58 mayor-installer-rev4656.tgz +5fa3a5aa03af5d74807110d68682dd6f mayor-portal-rev4656.tgz +ec76de46b35d2aeec1c85047b1406522 mayor-felveteli-rev4656.tgz +8ea55339b8fa77e2667a53342ac73f91 mayor-jatek-rev4656.tgz +8b83fef861919c37d53e39db923272a6 mayor-locales-jp_JP-rev4656.tgz +1f4ad456e2ba9d6983af5bc65705873b mayor-locales-de_DE-rev4656.tgz +93183a616d018cd65304e68eebefa773 mayor-locales-en_US-rev4656.tgz +200a00e5e4f9313b117b19868bce830c mayor-naplo-rev4656.tgz +ddf4cff2eccd8ac99bbeec9ba440988a mayor-base-rev4656.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index b5859656..4a14f368 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4653 +4656 diff --git a/rev.txt b/rev.txt index b5859656..4a14f368 100644 --- a/rev.txt +++ b/rev.txt @@ -1 +1 @@ -4653 +4656 -- 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-naplo/www/policy/private') 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','MaYoR - 2002-2019 © GPL'); +define('_MAIN_FOOTER','MaYoR - 2002-2020 © GPL'); 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 @@ +'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 @@ + $value) { + echo '

'.$key.'

'; + 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 a632d0dcaea1a45581df57bf4571d28e87ec7ebd Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Wed, 24 Jun 2020 16:10:04 +0200 Subject: Rev: 4661 --- 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 +- mayor-orig/mayor-naplo/log/mayor-naplo.rev | 2 +- .../www/policy/private/naplo/admin/debug-pre.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 +- 16 files changed, 28 insertions(+), 28 deletions(-) (limited to 'mayor-orig/mayor-naplo/www/policy/private') diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index 6af0687a..11d5fb8a 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4660 +4661 diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index 6af0687a..11d5fb8a 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4660 +4661 diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index 6af0687a..11d5fb8a 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4660 +4661 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index 6af0687a..11d5fb8a 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4660 +4661 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 6af0687a..11d5fb8a 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 @@ -4660 +4661 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index 6af0687a..11d5fb8a 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4660 +4661 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 6af0687a..11d5fb8a 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 @@ -4660 +4661 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 6af0687a..11d5fb8a 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 @@ -4660 +4661 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 6af0687a..11d5fb8a 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 @@ -4660 +4661 diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index 6af0687a..11d5fb8a 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4660 +4661 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 index de0924bd..898ad00d 100644 --- 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 @@ -12,7 +12,7 @@ $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(); +// $ADAT['debug_result']['constants'] = @get_defined_constants(); @ini_set('xdebug.var_display_max_depth', '3'); @ini_set('xdebug.var_display_max_children', '4096'); diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index 6af0687a..11d5fb8a 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4660 +4661 diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index 6af0687a..11d5fb8a 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4660 +4661 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index dc64590a..03e9388d 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -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 +Revision 4661 +524729cd5e3f29b396a3c097c3d7f3bb mayor-fenntarto-rev4661.tgz +b12556e7d71634b8e5fdb08e3be0e123 mayor-installer-sulix-rev4661.tgz +f048d7ded5c4591362e44a52aa508428 mayor-wiki-rev4661.tgz +2a2a80640025cc349125e7852e690d7e mayor-installer-rev4661.tgz +7c2b8998abb8852d4be0904da3f82ab6 mayor-portal-rev4661.tgz +3dbc614ff808a23e9d87c6914b34b0e8 mayor-felveteli-rev4661.tgz +05a160fae381776e66e133308d69a4c3 mayor-jatek-rev4661.tgz +5749a07fa106f6e2e6d68fafcbb89eac mayor-locales-jp_JP-rev4661.tgz +66cba3e3c8d4b1648e1a7038e879e0e4 mayor-locales-de_DE-rev4661.tgz +aead2734205231e10ccb372f8e8a2b56 mayor-locales-en_US-rev4661.tgz +5cb816d9bc7eaa8e929f181847bacf80 mayor-naplo-rev4661.tgz +8470602a40453db3c6ebc4c115fa9f12 mayor-base-rev4661.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index 6af0687a..11d5fb8a 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4660 +4661 diff --git a/rev.txt b/rev.txt index 6af0687a..11d5fb8a 100644 --- a/rev.txt +++ b/rev.txt @@ -1 +1 @@ -4660 +4661 -- cgit v1.2.3 From 265f8940abc3ef714656167d9fd162d666ccc7da Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Thu, 25 Jun 2020 08:00:03 +0200 Subject: Rev: 4662 --- 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 +- mayor-orig/mayor-naplo/log/mayor-naplo.rev | 2 +- .../www/policy/private/naplo/admin/debug-pre.php | 28 ++++++++++++---------- .../www/policy/private/naplo/admin/debug.php | 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, 47 insertions(+), 39 deletions(-) (limited to 'mayor-orig/mayor-naplo/www/policy/private') diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index 11d5fb8a..77d471ad 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4661 +4662 diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index 11d5fb8a..77d471ad 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4661 +4662 diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index 11d5fb8a..77d471ad 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4661 +4662 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index 11d5fb8a..77d471ad 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4661 +4662 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 11d5fb8a..77d471ad 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 @@ -4661 +4662 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index 11d5fb8a..77d471ad 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4661 +4662 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 11d5fb8a..77d471ad 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 @@ -4661 +4662 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 11d5fb8a..77d471ad 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 @@ -4661 +4662 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 11d5fb8a..77d471ad 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 @@ -4661 +4662 diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index 11d5fb8a..77d471ad 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4661 +4662 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 index 898ad00d..1eed8cb9 100644 --- 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 @@ -1,22 +1,26 @@ '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(); + $ADAT['debug_result']['tex_cli'] = (function_exists('shell_exec') ? shell_exec('tex --version') : ''); + $ADAT['debug_result']['xetex_cli'] = (function_exists('shell_exec') ? shell_exec('xetex --version'): ''); + //security! $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'); + ini_set('xdebug.var_display_max_depth', '3'); + ini_set('xdebug.var_display_max_children', '4096'); + ini_set('xdebug.var_display_max_data', '4096'); - } + $ADAT['debug_result']['config']['backend'] = $config['backend']; + $ADAT['debug_result']['config']['MYSQLI_ENABLED'] = MYSQLI_ENABLED; + $ADAT['debug_result']['config']['__PORTAL_CODE'] = __PORTAL_CODE; + $ADAT['debug_result']['config']['__EMAIL_ENABLED'] = __EMAIL_ENABLED; + +} ?> \ 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 index f20c3e5f..ff311cd5 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/debug.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/debug.php @@ -1,6 +1,10 @@ +/* div.mayorbody { color:white; background-color: #888; padding:10px;}*/ + '; + if (is_array($ADAT)) { foreach ($ADAT['debug_result'] as $key => $value) { echo '

'.$key.'

'; diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index 11d5fb8a..77d471ad 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4661 +4662 diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index 11d5fb8a..77d471ad 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4661 +4662 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index 03e9388d..178fc892 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4661 -524729cd5e3f29b396a3c097c3d7f3bb mayor-fenntarto-rev4661.tgz -b12556e7d71634b8e5fdb08e3be0e123 mayor-installer-sulix-rev4661.tgz -f048d7ded5c4591362e44a52aa508428 mayor-wiki-rev4661.tgz -2a2a80640025cc349125e7852e690d7e mayor-installer-rev4661.tgz -7c2b8998abb8852d4be0904da3f82ab6 mayor-portal-rev4661.tgz -3dbc614ff808a23e9d87c6914b34b0e8 mayor-felveteli-rev4661.tgz -05a160fae381776e66e133308d69a4c3 mayor-jatek-rev4661.tgz -5749a07fa106f6e2e6d68fafcbb89eac mayor-locales-jp_JP-rev4661.tgz -66cba3e3c8d4b1648e1a7038e879e0e4 mayor-locales-de_DE-rev4661.tgz -aead2734205231e10ccb372f8e8a2b56 mayor-locales-en_US-rev4661.tgz -5cb816d9bc7eaa8e929f181847bacf80 mayor-naplo-rev4661.tgz -8470602a40453db3c6ebc4c115fa9f12 mayor-base-rev4661.tgz +Revision 4662 +16f19a03456945794c7a3732c3f45e85 mayor-fenntarto-rev4662.tgz +b8888636d3b0ce845a3ab4374119104c mayor-installer-sulix-rev4662.tgz +2e9fee04642585b4df5318a889f44631 mayor-wiki-rev4662.tgz +24817553149afb37f5cc06acbca38fd0 mayor-installer-rev4662.tgz +98bb3a9ee191ee581cc667e5f9fb3662 mayor-portal-rev4662.tgz +9eb8bd5ef250ad7be669c7dbab4a108d mayor-felveteli-rev4662.tgz +c080d8a56becb70b76f685043520e0be mayor-jatek-rev4662.tgz +270773107a2aa5572a42e638da8c862f mayor-locales-jp_JP-rev4662.tgz +ee154940a3082ff097d390498dd239cf mayor-locales-de_DE-rev4662.tgz +74e23df2e564f89d719354b58d194e07 mayor-locales-en_US-rev4662.tgz +7489a5e84ba16bca115cfe8965ff0b0e mayor-naplo-rev4662.tgz +833d60d1a5b32ff7ad2dffee8070c063 mayor-base-rev4662.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index 11d5fb8a..77d471ad 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4661 +4662 diff --git a/rev.txt b/rev.txt index 11d5fb8a..77d471ad 100644 --- a/rev.txt +++ b/rev.txt @@ -1 +1 @@ -4661 +4662 -- 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-naplo/www/policy/private') 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 < $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 37d424aa0d36fdb47e931340f7920a92870e3c34 Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Thu, 13 Aug 2020 14:50:04 +0200 Subject: Rev: 4668 --- 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 +- mayor-orig/mayor-naplo/log/mayor-naplo.rev | 2 +- .../private/naplo/import/tantargyFelosztas-pre.php | 58 +++++++++++----------- .../policy/private/naplo/intezmeny/tankor-pre.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 +- 17 files changed, 67 insertions(+), 56 deletions(-) (limited to 'mayor-orig/mayor-naplo/www/policy/private') diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index ed3cdf9c..1144753c 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4667 +4668 diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index ed3cdf9c..1144753c 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4667 +4668 diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index ed3cdf9c..1144753c 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4667 +4668 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index ed3cdf9c..1144753c 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4667 +4668 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 ed3cdf9c..1144753c 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 @@ -4667 +4668 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index ed3cdf9c..1144753c 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4667 +4668 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 ed3cdf9c..1144753c 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 @@ -4667 +4668 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 ed3cdf9c..1144753c 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 @@ -4667 +4668 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 ed3cdf9c..1144753c 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 @@ -4667 +4668 diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index ed3cdf9c..1144753c 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4667 +4668 diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/import/tantargyFelosztas-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/import/tantargyFelosztas-pre.php index 097c6960..8497ec46 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/import/tantargyFelosztas-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/import/tantargyFelosztas-pre.php @@ -31,7 +31,7 @@ 10.2.n.djpr német nyelv 4,00 Dobrosi-Jelinek Piroska Rita Nem 12.2.n.djpr német nyelv 3,00 Dobrosi-Jelinek Piroska Rita Nem 11.D dráma 1,00 Dobrosi-Jelinek Piroska Rita Nem - + 4. e-Napló, Tanórák Listája, Excel Export (jobb oldali gomb) _DATADIR.'/'."orarendiOra.tsv @@ -45,7 +45,7 @@ $IMPORT_FILES = array( 'csoportba_jaro_tanulok' => _DATADIR.'/'."csoportba_jaro_tanulok.tsv", 'osztalyba_jaro_tanulok' => _DATADIR.'/'."osztalyba_jaro_tanulok.tsv", - 'tantargyfelosztas' => _DATADIR.'/'."ttfimport.tsvx", + 'tantargyfelosztas' => _DATADIR.'/'."ttfimport.tsv", 'orarendiOra' => _DATADIR.'/'."orarendiOra.tsv", 'helyettesitett_tanorak' => _DATADIR.'/'."helyettesitett_tanorak.tsv", // 'elmaradt_tanorak' => _DATADIR.'/'."helyettesitett_tanorak.tsv", @@ -144,33 +144,33 @@ '12.E' => 99, ); } elseif (__INTEZMENY==='MZSG') { - $ADAT['kulcsertektar']['osztalyjel2id'] = $OSZTALYJEL2ID = array( - '7.a' => 72, - '7.b' => 73, - '8.a' => 74, - '8.b' => 75, - '9.ny' => 71, - '9.a' => 60, - '9.b' => 61, - '9.c' => 68, - '9.d' => 69, - '9.e' => 70, - '10.a' => 57, - '10.b' => 58, - '10.c' => 66, - '10.d' => 67, - '10.e' => 64, - '11.a' => 50, - '11.b' => 51, - '11.c' => 62, - '11.d' => 63, - '11.e' => 59, - '12.a' => 45, - '12.b' => 46, - '12.c' => 55, - '12.d' => 56, - '12.e' => 53, - ); + $ADAT['kulcsertektar']['osztalyjel2id'] = $OSZTALYJEL2ID = array( + '7.a' => 76, + '7.b' => 77, + '8.a' => 72, + '8.b' => 73, + '9.ny' => 78, + '9.a' => 74, + '9.b' => 75, + '9.c' => 79, + '9.d' => 80, + '9.e' => 71, + '10.a' => 60, + '10.b' => 61, + '10.c' => 68, + '10.d' => 69, + '10.e' => 70, + '11.a' => 57, + '11.b' => 58, + '11.c' => 66, + '11.d' => 67, + '11.e' => 64, + '12.a' => 50, + '12.b' => 51, + '12.c' => 62, + '12.d' => 63, + '12.e' => 59, + ); } else { $_SESSION['alert'][] = 'page:nincs_osztalyjel2id'; } diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/tankor-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/tankor-pre.php index 3cd8dbcb..c759a2c6 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/tankor-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/tankor-pre.php @@ -31,6 +31,17 @@ //$_TA = getTanevAdat($tanev); //$_TA['statusz']; + // A tankörcsoportok felvétele az Elnevezés ($TANKOR_TIPUS) mezőben kiválasztható listába) + $q = "select distinct csoportNev from csoport"; + $lr = db_connect('naplo'); + $r = db_query($q, array('fv'=>'AddCsoportToTankorTipus','v'=>array(),'result'=>'idonly'), $lr); + db_close($lr); + foreach ($r as $cs) { + if(strlen($cs) > 30) $cs = substr($cs, 0, 28).'...'; + $TANKOR_TIPUS[$cs] = "($cs)"; + } + // $TANKOR_TIPUS bővítés + if (__NAPLOADMIN || __VEZETOSEG) { switch ($action) { case 'ujTankor': // VAGY MÓDOSÍTÁS!!! diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index ed3cdf9c..1144753c 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4667 +4668 diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index ed3cdf9c..1144753c 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4667 +4668 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index 1fa15f3e..ae45fb75 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -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 +Revision 4668 +d31c2e99f5971da280de226d58efb1fe mayor-fenntarto-rev4668.tgz +8c5aad6ff460483f39cf322c684f7ae5 mayor-installer-sulix-rev4668.tgz +144adb4ed5747b3fdd2bcb5f968166c1 mayor-wiki-rev4668.tgz +3ade4f8cb094f846c33fda6ff728cd42 mayor-installer-rev4668.tgz +d21f84d601d41b4dceeb0279b9045437 mayor-portal-rev4668.tgz +ac2517fa941fefad37f7200b0ed2a4f6 mayor-felveteli-rev4668.tgz +0b8529f409d21c8f029fa86eb6d1b272 mayor-jatek-rev4668.tgz +123950373ab1b5fa1b2920927c4e95b0 mayor-locales-jp_JP-rev4668.tgz +a54261cd74ed2b410e4453d6d9360c43 mayor-locales-de_DE-rev4668.tgz +a934d21e116794142150a48e38fb9ae3 mayor-locales-en_US-rev4668.tgz +91d52124b4e62d7744462c4fc53c98b4 mayor-naplo-rev4668.tgz +8894910d63f85409e7dacf5b6c4a5200 mayor-base-rev4668.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index ed3cdf9c..1144753c 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4667 +4668 diff --git a/rev.txt b/rev.txt index ed3cdf9c..1144753c 100644 --- a/rev.txt +++ b/rev.txt @@ -1 +1 @@ -4667 +4668 -- cgit v1.2.3 From e22bbedcf69ea347a103d04d194136b8f3a761c8 Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Mon, 24 Aug 2020 13:05:03 +0200 Subject: Rev: 4670 --- 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 +- mayor-orig/mayor-naplo/log/mayor-naplo.rev | 2 +- mayor-orig/mayor-naplo/update/pre004669-1.sh | 13 +++++++++++ .../private/naplo/import/tantargyFelosztas-pre.php | 12 +++++----- .../private/naplo/import/tantargyFelosztas.php | 19 +++++++++++----- .../policy/private/naplo/intezmeny/osztaly-pre.php | 25 ++++++++++++++++++--- .../html/import/tantargyFelosztas.phtml | 16 ++++++++++--- .../classic/module-naplo/html/share/file.phtml | 8 ++++--- 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 +- 21 files changed, 100 insertions(+), 47 deletions(-) create mode 100644 mayor-orig/mayor-naplo/update/pre004669-1.sh (limited to 'mayor-orig/mayor-naplo/www/policy/private') diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index 1144753c..ae6d0645 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4668 +4670 diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index 1144753c..ae6d0645 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4668 +4670 diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index 1144753c..ae6d0645 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4668 +4670 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index 1144753c..ae6d0645 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4668 +4670 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 1144753c..ae6d0645 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 @@ -4668 +4670 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index 1144753c..ae6d0645 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4668 +4670 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 1144753c..ae6d0645 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 @@ -4668 +4670 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 1144753c..ae6d0645 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 @@ -4668 +4670 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 1144753c..ae6d0645 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 @@ -4668 +4670 diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index 1144753c..ae6d0645 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4668 +4670 diff --git a/mayor-orig/mayor-naplo/update/pre004669-1.sh b/mayor-orig/mayor-naplo/update/pre004669-1.sh new file mode 100644 index 00000000..4ca6ff0a --- /dev/null +++ b/mayor-orig/mayor-naplo/update/pre004669-1.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +#BASEDIR="/var/mayor" + +DIR="$BASEDIR/download/private/naplo/nyomtatas/torzslap/" +mkdir -p $DIR +chown -R www-data $DIR +echo "$DIR Kész." + +DIR="$BASEDIR/download/private/naplo/upload/" +mkdir -p $DIR +chown -R www-data $DIR +echo "$DIR Kész." diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/import/tantargyFelosztas-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/import/tantargyFelosztas-pre.php index 8497ec46..fe445355 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/import/tantargyFelosztas-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/import/tantargyFelosztas-pre.php @@ -94,7 +94,7 @@ if ($DIAKOK[$i]['oId']!='') { $OID2ID[$DIAKOK[$i]['oId']] = intval($DIAKOK[$i]['diakId']); } else { - $ADAT['bug']['diak'][] = $DIAKOK[$i]['oId']; + $ADAT['bug']['diak'][] = $DIAKOK[$i]['oId'].serialize($DIAKOK[$i]); } } // TÁRGYAK @@ -527,7 +527,7 @@ $_D = $ADAT['ttf'][$i]; $q = "select *,tankorSzemeszter.tankorId AS tankorId from tankorSzemeszter LEFT JOIN tankor USING (tankorId) -LEFT JOIN tankorTanar ON (tankorTanar.tankorId=tankor.tankorId AND beDt<=NOW() AND (kiDt is null or kiDt>=NOW())) +LEFT JOIN tankorTanar ON (tankorTanar.tankorId=tankor.tankorId AND beDt<='2020-09-01' AND (kiDt is null or kiDt>='2020-09-01')) LEFT JOIN ".__TANEVDBNEV.".tankorCsoport ON (tankor.tankorId = tankorCsoport.tankorId) LEFT JOIN ".__TANEVDBNEV.".csoport USING (csoportId) WHERE tanev=%u AND szemeszter=%u AND targyId=%u AND oraszam=%f AND tanarId=%u @@ -551,7 +551,7 @@ GROUP BY tankor.tankorId"; // Belerakjuk azon tanköröket is, ahol vélhetően csak a csoport hozzárendelés hiányzik $q = "select *,tankorSzemeszter.tankorId AS tankorId from tankorSzemeszter LEFT JOIN tankor USING (tankorId) -LEFT JOIN tankorTanar ON (tankorTanar.tankorId=tankor.tankorId AND beDt<=NOW() AND (kiDt is null or kiDt>=NOW())) +LEFT JOIN tankorTanar ON (tankorTanar.tankorId=tankor.tankorId AND beDt<='2020-09-01' AND (kiDt is null or kiDt>='2020-09-01')) LEFT JOIN ".__TANEVDBNEV.".tankorCsoport ON (tankor.tankorId = tankorCsoport.tankorId) LEFT JOIN ".__TANEVDBNEV.".csoport USING (csoportId) WHERE tanev=%u AND szemeszter=%u AND targyId=%u AND oraszam=%f AND tanarId=%u @@ -591,7 +591,7 @@ GROUP BY tankor.tankorId"; } $q = "select *,tankorSzemeszter.tankorId AS tankorId from tankorSzemeszter LEFT JOIN tankor USING (tankorId) -LEFT JOIN tankorTanar ON (tankorTanar.tankorId=tankor.tankorId AND beDt<=NOW() AND (kiDt is null or kiDt>=NOW())) +LEFT JOIN tankorTanar ON (tankorTanar.tankorId=tankor.tankorId AND beDt<='2020-09-01' AND (kiDt is null or kiDt>='2020-09-01')) LEFT JOIN tankorOsztaly ON (tankor.tankorId = tankorOsztaly.tankorId) WHERE tanev=%u AND szemeszter=%u AND targyId=%u AND oraszam=%f @@ -611,7 +611,7 @@ GROUP BY tankor.tankorId ORDER BY tankorNev"; } else { $q = "select *,tankorSzemeszter.tankorId AS tankorId from tankorSzemeszter LEFT JOIN tankor USING (tankorId) -LEFT JOIN tankorTanar ON (tankorTanar.tankorId=tankor.tankorId AND beDt<=NOW() AND (kiDt is null or kiDt>=NOW())) +LEFT JOIN tankorTanar ON (tankorTanar.tankorId=tankor.tankorId AND beDt<='2020-09-01' AND (kiDt is null or kiDt>='2020-09-01')) WHERE tanev=%u AND szemeszter=%u AND targyId=%u AND oraszam>=%f AND tanarId IS NULL @@ -662,7 +662,7 @@ GROUP BY tankor.tankorId ORDER BY tankorNev"; // MaYoR: csoportId+targyId+tanarId => tankorId; $lr_naplo = db_connect('naplo'); - $q = "select csoportId, targyId, tanarId, tankor.tankorId FROM tankorCsoport LEFT JOIN csoport USING (csoportId) LEFT JOIN ".__INTEZMENYDBNEV.".tankor USING (tankorId) LEFT JOIN ".__INTEZMENYDBNEV.".tankorTanar ON (tankor.tankorId = tankorTanar.tankorId AND beDt>='2019-09-01' AND (kiDt IS NULL or kiDt>=NOW()))"; + $q = "select csoportId, targyId, tanarId, tankor.tankorId FROM tankorCsoport LEFT JOIN csoport USING (csoportId) LEFT JOIN ".__INTEZMENYDBNEV.".tankor USING (tankorId) LEFT JOIN ".__INTEZMENYDBNEV.".tankorTanar ON (tankor.tankorId = tankorTanar.tankorId AND beDt>='2019-09-01' AND (kiDt IS NULL or kiDt>='2020-09-01'))"; $r = db_query($q, array('fv' => 'pre', 'modul' => 'naplo', 'values' => $v, 'result'=>'indexed'),$lr_naplo); for ($i=0; $i0) + if (count($ADAT['bug']['targy'])>0) { + echo '

Hibás tárgyak

'; + echo '
';
 	var_dump($ADAT['bug']['targy']);
+	echo '
'; + } - if (count($ADAT['bug']['diak'])>0) + if (count($ADAT['bug']['diak'])>0) { + echo '

Hibás diákok

'; + echo '
';
 	var_dump($ADAT['bug']['diak']);
+	echo '
'; + } - echo 'Használt kulcs érték párok:'; - var_dump($ADAT['kulcsertektar']['osztalyjel2id']); - + echo 'Használt kulcs-érték párok (osztályJel-osztályId):'; + echo '
';
+	var_dump($ADAT['kulcsertektar']['osztalyjel2id']);
+    echo '
'; diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/osztaly-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/osztaly-pre.php index 5097037f..9222a0c8 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/osztaly-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/osztaly-pre.php @@ -19,7 +19,9 @@ require_once('include/modules/naplo/share/tankorDiakModifier.php'); require_once('include/modules/naplo/share/hianyzasModifier.php'); require_once('include/modules/naplo/share/jegyModifier.php'); require_once('include/modules/naplo/share/jegy.php'); +require_once('include/share/net/upload.php'); +define('FILE_UPLOAD_DIR',_DOWNLOADDIR.'/private/naplo/upload/'); if (defined('__INTEZMENY') and __INTEZMENY != '') { $ADAT['tanevek'] = getTanevek(true); @@ -40,11 +42,28 @@ else $TA = $_TANEV; /* -------- */ // Adatok frissítése adatállományból -if (__NAPLOADMIN && isset($_POST['fileName']) && $_POST['fileName'] != '') { +if (__NAPLOADMIN===true && + ( + (isset($_POST['fileName']) && $_POST['fileName'] != '') + or + (is_array($_FILES) && $_FILES['upfile']['name']!='') + ) + ) { + define('_SKIP_ON_DUP',readVariable($_POST['skipOnDup'],'bool')); + if (is_array($_FILES) && $_FILES['upfile']['name']!='') { // távoli feltöltés + try { + $_F = array('subdir'=>FILE_UPLOAD_DIR, 'filename'=>uniqid()); // move ide + $sikeresFeltoltes = mayorFileUpload($_F, false); + $fileName = FILE_UPLOAD_DIR.$_F['filename']; + } catch (Exception $e) { + dump($e); + } + } else { // helyi beolvasás + // $fileName = fileNameNormal($_POST['fileName']); + $fileName = ($_POST['fileName']); // TODO + } $mezo_elvalaszto = ' '; // "\t" -// $fileName = fileNameNormal($_POST['fileName']); - $fileName = ($_POST['fileName']); // TODO $ADATOK = array(); if (file_exists($fileName)) { diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/import/tantargyFelosztas.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/import/tantargyFelosztas.phtml index 5fe6435a..2980672b 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/import/tantargyFelosztas.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/import/tantargyFelosztas.phtml @@ -29,7 +29,8 @@ table.ttf tr.createTankor td { background-color: magenta;} table.ttf tr.done td { background-color: lightgreen;} - table.ttf tr td {padding:4px;} + table.ttf tr td {padding:4px; border-bottom: solid 1px #ccc;} + table.ttf tr td:hover {outline: solid 2px cornflowerblue;} table.ttf tr td div.tankorLista span:hover { color: white; } '; @@ -104,7 +105,7 @@ echo ''; for ($j=0; $j'.$D['displayTankor'][$j]['tankorNev'].''; + echo ''; } echo ''; echo '
'; @@ -124,7 +125,16 @@ echo '
'; // ha ezt összehasonlítom a mayorban rögzített névsorral, akkor eldönhető lehet, hogy melyik a jó választás! echo ' Új tankör:'; - echo ''; + if (count($_osztalyok)>0) { + echo ''; + } else { + echo ''; + } } elseif ($D['action'] == 'createTankor') { echo 'Új tankör létrehozása: '; } else { diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/share/file.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/share/file.phtml index 7720f2ba..a1ac34d4 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/share/file.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/share/file.phtml @@ -2,7 +2,7 @@ function putFileSelectForm($dbtable, $post = array()) { - formBegin(array('class'=>'updateTable')); + formBegin(array('class'=>'updateTable', 'enctype'=>'multipart/form-data')); // A form címe if (defined('_FILESELECTTITLE')) echo '

'._FILESELECTTITLE.'

'; // A továbbadandó POST adatok @@ -12,8 +12,10 @@ } echo ''."\n"; echo ' Meglevő rekord találatkor kihagyjuk a rekord frissítést'; - echo ''."\n"; - echo ''."\n"; + echo '

'."\n"; + echo '

'."\n"; + echo '

Vagy feltöltés:'; + echo '

'; echo ''."\n"; formEnd(); diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index 1144753c..ae6d0645 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4668 +4670 diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index 1144753c..ae6d0645 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4668 +4670 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index ae45fb75..b78cc000 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4668 -d31c2e99f5971da280de226d58efb1fe mayor-fenntarto-rev4668.tgz -8c5aad6ff460483f39cf322c684f7ae5 mayor-installer-sulix-rev4668.tgz -144adb4ed5747b3fdd2bcb5f968166c1 mayor-wiki-rev4668.tgz -3ade4f8cb094f846c33fda6ff728cd42 mayor-installer-rev4668.tgz -d21f84d601d41b4dceeb0279b9045437 mayor-portal-rev4668.tgz -ac2517fa941fefad37f7200b0ed2a4f6 mayor-felveteli-rev4668.tgz -0b8529f409d21c8f029fa86eb6d1b272 mayor-jatek-rev4668.tgz -123950373ab1b5fa1b2920927c4e95b0 mayor-locales-jp_JP-rev4668.tgz -a54261cd74ed2b410e4453d6d9360c43 mayor-locales-de_DE-rev4668.tgz -a934d21e116794142150a48e38fb9ae3 mayor-locales-en_US-rev4668.tgz -91d52124b4e62d7744462c4fc53c98b4 mayor-naplo-rev4668.tgz -8894910d63f85409e7dacf5b6c4a5200 mayor-base-rev4668.tgz +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 diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index 1144753c..ae6d0645 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4668 +4670 diff --git a/rev.txt b/rev.txt index 1144753c..ae6d0645 100644 --- a/rev.txt +++ b/rev.txt @@ -1 +1 @@ -4668 +4670 -- 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/policy/private') 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