diff options
Diffstat (limited to 'mayor-orig')
22 files changed, 61 insertions, 42 deletions
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 <<EOF > $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 |