diff options
Diffstat (limited to 'mayor-orig/mayor-naplo')
3 files changed, 4 insertions, 4 deletions
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index ecdf4f5b..b2b76036 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4592 +4593 diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/orarend.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/orarend.php index 5dae295a..45d8754c 100644 --- a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/orarend.php +++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/orarend.php @@ -425,7 +425,7 @@ } function getUtolsoorak() { - $q = "SELECT *,getOraTolTime(ora.oraId) AS tolTime, getOraIgTime(ora.oraId) AS igTime + $q = "SELECT * -- ,getOraTolTime(ora.oraId) AS tolTime, getOraIgTime(ora.oraId) AS igTime FROM (SELECT dt,max(ora) AS utolsooraateremben,teremId,terem.leiras AS teremNev FROM ora LEFT JOIN ".__INTEZMENYDBNEV.".terem USING (teremId) WHERE teremId IS NOT NULL GROUP BY dt,teremId) AS x LEFT JOIN ora ON (ora.dt = x.dt AND x.utolsooraateremben = ora.ora AND x.teremId = ora.teremId)"; $r = db_query($q, array('fv'=>'getUtolsoorak','modul'=>'naplo','result'=>'indexed')); diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/osztalyozo/tankor-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/osztalyozo/tankor-pre.php index 742b4b5d..7e2480c9 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/osztalyozo/tankor-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/osztalyozo/tankor-pre.php @@ -231,7 +231,7 @@ if (!__NAPLOADMIN && !__VEZETOSEG && !__TANAR && !__DIAK && !__TITKARSAG) { //------ if ($action == 'jegyBeiras' && (isset($_POST['bizBeiroGomb']) || $_POST['bizBeiroGomb2']!='')) $action = 'jegyLezaras'; - if (__EVKOZI_JEGYET_ADHAT) { + if (__EVKOZI_JEGYET_ADHAT === true) { if ($action == 'jegyBeiras') { $actionId = readVariable($_POST['actionId'],'strictstring'); @@ -268,7 +268,7 @@ if (!__NAPLOADMIN && !__VEZETOSEG && !__TANAR && !__DIAK && !__TITKARSAG) { } // Nem csak súlyozást változtat } } - if (__ZAROJEGYET_ADHAT) { + if (__ZAROJEGYET_ADHAT === true) { if ($action == 'jegyLezaras') { $zaroJegyek = $_POST['zaroJegy']; $tankorAdat = getTankorById($tankorId); |