diff options
Diffstat (limited to 'mayor-orig/www/include/modules/naplo/share')
| -rw-r--r-- | mayor-orig/www/include/modules/naplo/share/diak.php | 15 | ||||
| -rw-r--r-- | mayor-orig/www/include/modules/naplo/share/hirnok.php | 1 |
2 files changed, 13 insertions, 3 deletions
diff --git a/mayor-orig/www/include/modules/naplo/share/diak.php b/mayor-orig/www/include/modules/naplo/share/diak.php index 24fade39..94623979 100644 --- a/mayor-orig/www/include/modules/naplo/share/diak.php +++ b/mayor-orig/www/include/modules/naplo/share/diak.php @@ -629,9 +629,18 @@ } function getNyelvvizsgak($SET) { - if ($SET['igDt']=='') $SET['igDt'] = date('Y-m-d', strtotime('+365 days',strtotime($SET['tolDt']))); - $q = "SELECT * FROM diakNyelvvizsga WHERE vizsgaDt>='%s' AND vizsgaDt<'%s'"; - $v = array($SET['tolDt'],$SET['igDt']); + if ($SET['igDt']=='') { + $SET['igDt'] = date('Y-m-d', strtotime('+365 days',strtotime($SET['tolDt']))); + $q = "SELECT * FROM diakNyelvvizsga WHERE vizsgaDt>='%s' AND vizsgaDt<'%s'"; + $v = array($SET['tolDt'],$SET['igDt']); + } elseif ($SET['igDt']!='' && $SET['tolDt']=='') { + $q = "SELECT * FROM diakNyelvvizsga WHERE vizsgaDt<'%s'"; + $v = array($SET['igDt']); + } else { + $q = "SELECT * FROM diakNyelvvizsga"; + $v = array(); + } + return $r = db_query($q, array('fv'=>'getDiaknyelvvizsga', 'modul'=>'naplo_intezmeny','result'=>'indexed','values'=>$v)); } diff --git a/mayor-orig/www/include/modules/naplo/share/hirnok.php b/mayor-orig/www/include/modules/naplo/share/hirnok.php index f051f7c5..0607670f 100644 --- a/mayor-orig/www/include/modules/naplo/share/hirnok.php +++ b/mayor-orig/www/include/modules/naplo/share/hirnok.php @@ -241,6 +241,7 @@ global $SZEMESZTER; $_SET['filter'][] = 'dt>="'.$SET['tolDt'].'"'; $_SET['ignoreAdmin'] = true; $r = getUzenoUzenetek($_SET); + for ($i=0; $i<count($r); $i++) { // üzenő címzett/feladó kitalálós $feladoNev=$cimzettNev = ''; |