diff options
18 files changed, 36 insertions, 32 deletions
diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index 13133865..1031aed8 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4536 +4538 diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index 13133865..1031aed8 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4536 +4538 diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index 3b2c109f..1031aed8 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4537 +4538 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index 3b2c109f..1031aed8 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4537 +4538 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 3b2c109f..1031aed8 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 @@ -4537 +4538 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index 13133865..1031aed8 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4536 +4538 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 13133865..1031aed8 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 @@ -4536 +4538 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 13133865..1031aed8 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 @@ -4536 +4538 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 13133865..1031aed8 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 @@ -4536 +4538 diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index 13133865..1031aed8 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4536 +4538 diff --git a/mayor-orig/mayor-naplo/update/pre004532-1-intezmeny.sql b/mayor-orig/mayor-naplo/update/pre004532-1-intezmeny.sql index 9e5370ba..d8a4ec87 100644 --- a/mayor-orig/mayor-naplo/update/pre004532-1-intezmeny.sql +++ b/mayor-orig/mayor-naplo/update/pre004532-1-intezmeny.sql @@ -1 +1 @@ --- CALL upgrade_database_4531(); +CALL upgrade_database_4531(); diff --git a/mayor-orig/mayor-naplo/update/pre004532-2-naplo.sql b/mayor-orig/mayor-naplo/update/pre004532-2-naplo.sql index 177d2d30..d19581ef 100644 --- a/mayor-orig/mayor-naplo/update/pre004532-2-naplo.sql +++ b/mayor-orig/mayor-naplo/update/pre004532-2-naplo.sql @@ -1 +1 @@ --- CALL upgrade_database_4531_2(); +CALL upgrade_database_4531_2(); diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/pluszora-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/pluszora-pre.php index 55914d4a..544b9b23 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/pluszora-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/pluszora-pre.php @@ -17,7 +17,7 @@ $tankorId = readVariable($_POST['tankorId'], 'id', null); $blokkId = readVariable($_POST['tankorBlokkId'], 'id', null); $teremId = readVariable($_POST['teremId'], 'id', null); - $SzabadOrak = ''; + $SzabadOrak = array(); require_once('include/modules/naplo/share/tanar.php'); require_once('include/modules/naplo/share/osztaly.php'); @@ -76,12 +76,16 @@ // tanar Napi órái $Orak = getTanarNapiOrak($tanarId, $dt); // Szabad Órák - for ($i = $napiMinOra; $i <= $napiMaxOra; $i++) if (!is_array($Orak[$i])) $SzabadOrak[] = $i; + for ($i = $napiMinOra; $i <= $napiMaxOra; $i++) + if (!is_array($Orak[$i])) + array_push($SzabadOrak,$i); } elseif (isset($osztalyId)) { // osztalyNapiOrai $Orak = getOsztalyNapiOrak($osztalyId, $dt); // Szabad Órák - for ($i = $napiMinOra; $i <= $napiMaxOra; $i++) if (!is_array($Orak[$i][0])) $SzabadOrak[] = $i; + for ($i = $napiMinOra; $i <= $napiMaxOra; $i++) + if (!is_array($Orak[$i][0])) + array_push($SzabadOrak[],$i); } if (isset($ora)) { $Termek = getSzabadTermek(array('dt' => $dt, 'ora' => $ora)); diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index 3b2c109f..1031aed8 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4537 +4538 diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index 3b2c109f..1031aed8 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4537 +4538 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index 97350d7a..07ff4aa6 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4537 -af9df2c3b38b416c97cd92c82fe2e3ed mayor-fenntarto-rev4537.tgz -ec07cc8aa2f8c56689f24e15bfe65fc5 mayor-installer-sulix-rev4537.tgz -ad56e4f876b39dd776dc4875bc31b187 mayor-wiki-rev4537.tgz -3e34657ab81a75a6e708644cc13a78b5 mayor-installer-rev4537.tgz -c5c39997bb7070f821f83d6eba1b5cc1 mayor-portal-rev4537.tgz -d31bfffe3d780121420c57056654f18b mayor-felveteli-rev4536.tgz -78fa3f998d0bb7dddac91e52d5e686f4 mayor-jatek-rev4536.tgz -d706e0e1185098e72256a33d6b9986ff mayor-locales-jp_JP-rev4536.tgz -166befa58927a39432f59883f738af7a mayor-locales-de_DE-rev4536.tgz -997ba310d388712e5e813ff15aa1526e mayor-locales-en_US-rev4536.tgz -ab5bd12caf1c1a410f9e46a3a6891e72 mayor-naplo-rev4536.tgz -fca8bad1384087eaee09df942f76a415 mayor-base-rev4536.tgz +Revision 4538 +3d51063b0bf075c922cc806831223250 mayor-fenntarto-rev4538.tgz +e72dc8670dab128a40ff73a174909719 mayor-installer-sulix-rev4538.tgz +4f927ee35c20bac422888e2eaa0b736b mayor-wiki-rev4538.tgz +cc19b72227d53e56db6b026d131c7d5c mayor-installer-rev4538.tgz +31d4ff5a48eb4c6fa42e3f0b23ee0b34 mayor-portal-rev4538.tgz +8a258140ab9fc490248e16ed9e5ba946 mayor-felveteli-rev4538.tgz +c122eb2280d8183dff74c4519084040d mayor-jatek-rev4538.tgz +1a72d843a07c9d068b86ff2af4ada0e3 mayor-locales-jp_JP-rev4538.tgz +360151469952fb263599a2e7e6e29fb8 mayor-locales-de_DE-rev4538.tgz +a87de8fff0f1db49f598233f6cf2aa70 mayor-locales-en_US-rev4538.tgz +bb9905d9fb083f6a50a8bf7276c0efaa mayor-naplo-rev4538.tgz +e10a42dd16a4e77b70f1170a3a367758 mayor-base-rev4538.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index 3b2c109f..1031aed8 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4537 +4538 @@ -1 +1 @@ -4537 +4538 |