diff options
Diffstat (limited to 'mayor-orig')
16 files changed, 29 insertions, 29 deletions
diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index ecdf4f5b..b2b76036 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4592 +4593 diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index ecdf4f5b..b2b76036 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4592 +4593 diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index ecdf4f5b..b2b76036 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4592 +4593 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index ecdf4f5b..b2b76036 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4592 +4593 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 ecdf4f5b..b2b76036 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 @@ -4592 +4593 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index ecdf4f5b..b2b76036 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4592 +4593 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 ecdf4f5b..b2b76036 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 @@ -4592 +4593 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 ecdf4f5b..b2b76036 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 @@ -4592 +4593 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 ecdf4f5b..b2b76036 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 @@ -4592 +4593 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); diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index ecdf4f5b..b2b76036 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4592 +4593 diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index ecdf4f5b..b2b76036 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4592 +4593 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index c3af7e67..9f54acde 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4592 -41ffecc8ad8f08806ea3a52028987282 mayor-fenntarto-rev4592.tgz -048210b7fbc3317d6707ff65942d5b1b mayor-installer-sulix-rev4592.tgz -77bc99e03c19c5c3c653a2a538e58c81 mayor-wiki-rev4592.tgz -cc9fd89f53ca3a608b6e8d1abf10eccd mayor-installer-rev4592.tgz -eca03721e2d055631f2ed55e7cd0d629 mayor-portal-rev4592.tgz -2966951d512293a38133a2f7bf923742 mayor-felveteli-rev4592.tgz -11e7912432df9c3220bf01771d0fbecf mayor-jatek-rev4592.tgz -209c6bea1ed99dc77dfffa1cd702f3b0 mayor-locales-jp_JP-rev4592.tgz -da0c9466c9d24d23d4607a5e8811070e mayor-locales-de_DE-rev4592.tgz -d0b0cf9b62020bfc0eb7637351a64518 mayor-locales-en_US-rev4592.tgz -f8ced24c3be550f1d693a5b5951e9dc1 mayor-naplo-rev4592.tgz -f3d8553181c533ceb03286995d36fa40 mayor-base-rev4592.tgz +Revision 4593 +61e2b1ec4514fa02270a629b7c3ed087 mayor-fenntarto-rev4593.tgz +fb724d369c4ad255fff0d47d34224b73 mayor-installer-sulix-rev4593.tgz +ecb84aeb338c3aa6ccf6b49754db833a mayor-wiki-rev4593.tgz +01a72a7186f474c5aa3688140254fb75 mayor-installer-rev4593.tgz +f4e73b9244beb65c50c48a8a70121047 mayor-portal-rev4593.tgz +1f4febe05ec2ffa802aaa0218a68c5a5 mayor-felveteli-rev4593.tgz +8d787c25d0bc55712483c77948ff87f9 mayor-jatek-rev4593.tgz +4ab8c764519735f8a4a96c3954e7cac0 mayor-locales-jp_JP-rev4593.tgz +f6d70bd890a5449d9d291de645d702be mayor-locales-de_DE-rev4593.tgz +bc198272d29a072887fa82de0d94cc26 mayor-locales-en_US-rev4593.tgz +4b9f35afa511c7f0290ac8acab5b613d mayor-naplo-rev4593.tgz +43ffcae2d576c85bb48dbe66b01b7513 mayor-base-rev4593.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index ecdf4f5b..b2b76036 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4592 +4593 |