diff options
author | M.Gergo | 2021-10-29 16:30:05 +0200 |
---|---|---|
committer | M.Gergo | 2021-10-29 16:30:05 +0200 |
commit | 933d9a5ad9b7a134148a1a931fb0cab5c782a245 (patch) | |
tree | 5546352cf5ddbcaf13a4b244a312a3ae64d70b09 | |
parent | 3a1c1811413c635c5ee6e40cb7d497de7313dbe1 (diff) | |
download | mayor-933d9a5ad9b7a134148a1a931fb0cab5c782a245.tar.gz mayor-933d9a5ad9b7a134148a1a931fb0cab5c782a245.zip |
Rev: 4821rev4821
-rw-r--r-- | mayor-orig/mayor-base/log/mayor-base.rev | 2 | ||||
-rw-r--r-- | mayor-orig/mayor-felveteli/log/mayor-felveteli.rev | 2 | ||||
-rw-r--r-- | mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev | 2 | ||||
-rw-r--r-- | mayor-orig/mayor-installer-orig/log/mayor-installer.rev | 2 | ||||
-rw-r--r-- | mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev | 2 | ||||
-rw-r--r-- | mayor-orig/mayor-jatek/log/mayor-jatek.rev | 2 | ||||
-rw-r--r-- | mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev | 2 | ||||
-rw-r--r-- | mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev | 2 | ||||
-rw-r--r-- | mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev | 2 | ||||
-rw-r--r-- | mayor-orig/mayor-naplo/log/mayor-naplo.rev | 2 | ||||
-rw-r--r-- | mayor-orig/mayor-naplo/www/policy/private/naplo/szulinap.php | 6 | ||||
-rw-r--r-- | mayor-orig/mayor-portal/log/mayor-portal.rev | 2 | ||||
-rw-r--r-- | mayor-orig/mayor-wiki/log/mayor-wiki.rev | 2 | ||||
-rw-r--r-- | mayor-orig/md5sum | 26 | ||||
-rw-r--r-- | mayor-orig/rev.txt | 2 | ||||
-rw-r--r-- | rev.txt | 2 |
16 files changed, 31 insertions, 29 deletions
diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index cfa99b3a..50551e07 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4820 +4821 diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index cfa99b3a..50551e07 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4820 +4821 diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index cfa99b3a..50551e07 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4820 +4821 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index cfa99b3a..50551e07 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4820 +4821 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 cfa99b3a..50551e07 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 @@ -4820 +4821 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index cfa99b3a..50551e07 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4820 +4821 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 cfa99b3a..50551e07 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 @@ -4820 +4821 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 cfa99b3a..50551e07 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 @@ -4820 +4821 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 cfa99b3a..50551e07 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 @@ -4820 +4821 diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index cfa99b3a..50551e07 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4820 +4821 diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/szulinap.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/szulinap.php index 390733b8..deca5915 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/szulinap.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/szulinap.php @@ -35,13 +35,15 @@ echo '<ul class="szulinap" style="list-style-type: none;">'; for ($i=0; $i<count($ADAT['heti'][$n]['diakok']['diak']); $i++) { $_D = $ADAT['heti'][$n]['diakok']['diak'][$i]; + $_diakId= $_D['diakId']; + $_diakOsztalyId = $ADAT['heti'][$n]['diakok']['diakOsztaly'][$_diakId][0]; echo '<li class="diakAdat diakNev" data-diakid="'.$_D['diakId'].'">'; echo $ADAT['heti'][$n]['diakok']['diak'][$i]['viseltNevElotag'].' '; echo $ADAT['heti'][$n]['diakok']['diak'][$i]['viseltCsaladinev'].' '; echo $ADAT['heti'][$n]['diakok']['diak'][$i]['viseltUtonev']; if ($ADAT['heti'][$n]['diakok']['diak'][$i]['diakEletkor']<=20) echo '<span class="eletkor">'.$ADAT['heti'][$n]['diakok']['diak'][$i]['diakEletkor'].'</span>'; - if ($ADAT['heti'][$n]['diakok']['diak'][$i]['osztaly'][0]['osztalyJel']!='') { - echo ' ('.$ADAT['heti'][$n]['diakok']['diak'][$i]['osztaly'][0]['osztalyJel'].')'; + if ($ADAT['osztaly'][$_diakOsztalyId]['osztalyJel']!='') { + echo ' ('.($ADAT['osztaly'][$_diakOsztalyId]['osztalyJel']).')'; } echo '</li>'; } diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index cfa99b3a..50551e07 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4820 +4821 diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index cfa99b3a..50551e07 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4820 +4821 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index ee818168..42d113b3 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4820 -3642732bb544e213ea84756ec2153df8 mayor-fenntarto-rev4820.tgz -b63f1583b0d167860ed30b83e432d47f mayor-installer-sulix-rev4820.tgz -c77d99f7d2d42c2dd7e4110298a5de41 mayor-wiki-rev4820.tgz -af9bc28a803c60747da5faadd98be8a8 mayor-installer-rev4820.tgz -a1c0406e50282133749df47c33d57907 mayor-portal-rev4820.tgz -ba1eb1ee092298bd31e4d088633a0b7b mayor-felveteli-rev4820.tgz -d7f4f38c0d043d38b675b46217582fb0 mayor-jatek-rev4820.tgz -7e4c67649a9c3e2ca5229419fa991221 mayor-locales-jp_JP-rev4820.tgz -b6c5879157fb4b1ad2ab311c93020e57 mayor-locales-de_DE-rev4820.tgz -c44cf9c157b1b410835a5b896871bac1 mayor-locales-en_US-rev4820.tgz -94e5b8476344314fda90505c8c08bfa2 mayor-naplo-rev4820.tgz -f77a145cac296b7e3db22baeebbe0ada mayor-base-rev4820.tgz +Revision 4821 +89dba52516000c42537d0be1acba8d9e mayor-fenntarto-rev4821.tgz +7e67bfe6bb90009ce2bb86b7f610d255 mayor-installer-sulix-rev4821.tgz +0d3a94da32faacc2e98784a0b1d92a1a mayor-wiki-rev4821.tgz +d32bad0a962287393cd8cce6201c2ecf mayor-installer-rev4821.tgz +f1ebce64b772658f566c8b8407153770 mayor-portal-rev4821.tgz +dea5f0d076c4b826f0e7586022eb9436 mayor-felveteli-rev4821.tgz +56581afae8c2cc9d6577f41352dc3504 mayor-jatek-rev4821.tgz +a96137b85036019e77e0d086ef972c68 mayor-locales-jp_JP-rev4821.tgz +263ea8ff46fa3aa674a1d3d3502a7ed0 mayor-locales-de_DE-rev4821.tgz +1fc4f7d0e8cc547785ba374c4e68dceb mayor-locales-en_US-rev4821.tgz +901b4a13b63e2132d426bf381e12cfb9 mayor-naplo-rev4821.tgz +9df0bda6365d9a01f0797635aa5ba341 mayor-base-rev4821.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index cfa99b3a..50551e07 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4820 +4821 @@ -1 +1 @@ -4820 +4821 |