diff --git a/system/mlists/mlists_create.php b/system/mlists/mlists_create.php index 5e9e61b56..933d5e7f0 100644 --- a/system/mlists/mlists_create.php +++ b/system/mlists/mlists_create.php @@ -50,7 +50,7 @@ 'FROM campus.vw_benutzer, public.tbl_benutzergruppe '. 'WHERE vw_benutzer.uid=tbl_benutzergruppe.uid AND '. "UPPER(gruppe_kurzbz)=UPPER('$mg_kurzbz') AND tbl_benutzergruppe.uid NOT LIKE '\\\\_%' ". - "AND (studiensemester_kurzbz IS NULL OR studiensemester_kurzbz='$ss_nearest') ORDER BY nachname;"; + "AND (studiensemester_kurzbz IS NULL OR studiensemester_kurzbz='$ss_nearest') AND aktiv ORDER BY nachname;"; //echo $sql_query; if(!($result_person=pg_query($conn, $sql_query))) die(pg_errormessage($conn)); @@ -85,7 +85,7 @@ //$qry = "SELECT vornamen, nachname, uid, alias FROM tbl_person where alias<>'' ORDER BY nachname, vornamen"; $qry = "SELECT vorname, nachname, uid, alias FROM (public.tbl_person JOIN public.tbl_benutzer USING(person_id)) LEFT JOIN public.tbl_student on(uid=student_uid) WHERE alias<>'' AND (studiengang_kz NOT IN($noalias_kz) OR studiengang_kz is null) - ORDER BY nachname, vorname"; + tbl_benutzer.aktiv ORDER BY nachname, vorname"; if($result = pg_query($conn, $qry)) { diff --git a/system/mlists/student_lists_create.php b/system/mlists/student_lists_create.php index a463208c2..70315bbef 100644 --- a/system/mlists/student_lists_create.php +++ b/system/mlists/student_lists_create.php @@ -108,9 +108,9 @@ if ($grp=='' || $grp==' ' || is_null($grp)) $grp='1'; if ($grp=='1') - $sql_query='SELECT uid, nachname, vorname FROM campus.vw_student WHERE studiengang_kz='.$stgid.' AND semester='.$sem." AND (verband='".strtoupper($ver)."' OR verband='' OR verband=' ') AND (gruppe='".$grp."' OR gruppe='' OR gruppe=' ') AND uid NOT LIKE '\\\\_%' ORDER BY nachname"; + $sql_query='SELECT uid, nachname, vorname FROM campus.vw_student WHERE aktiv AND studiengang_kz='.$stgid.' AND semester='.$sem." AND (verband='".strtoupper($ver)."' OR verband='' OR verband=' ') AND (gruppe='".$grp."' OR gruppe='' OR gruppe=' ') AND uid NOT LIKE '\\\\_%' ORDER BY nachname"; else - $sql_query='SELECT uid, nachname, vorname FROM campus.vw_student WHERE studiengang_kz='.$stgid.' AND semester='.$sem.' AND verband=\''.strtoupper($ver).'\' AND gruppe='.$grp." AND uid NOT LIKE '\\\\_%' ORDER BY nachname"; + $sql_query='SELECT uid, nachname, vorname FROM campus.vw_student WHERE aktiv AND studiengang_kz='.$stgid.' AND semester='.$sem.' AND verband=\''.strtoupper($ver).'\' AND gruppe='.$grp." AND uid NOT LIKE '\\\\_%' ORDER BY nachname"; //echo $sql_query; if(!($result_student=pg_query($conn, $sql_query))) die(pg_errormessage($conn));