diff --git a/include/globals.inc.php b/include/globals.inc.php index c76491edc..2ba9205da 100644 --- a/include/globals.inc.php +++ b/include/globals.inc.php @@ -65,9 +65,9 @@ // Studiengaenge die keine Alias Email Adressen erhalten $noalias=array(); - $noalias[0]='330'; - $noalias[1]='331'; - $noalias[2]='204'; + //$noalias[0]='330'; + //$noalias[1]='331'; + //$noalias[2]='204'; ?> diff --git a/system/mlists/mlists_create.php b/system/mlists/mlists_create.php index 7a777c051..d073ccc4d 100644 --- a/system/mlists/mlists_create.php +++ b/system/mlists/mlists_create.php @@ -103,9 +103,11 @@ //$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) - AND (tbl_benutzer.aktiv OR + alias<>''"; + if($noalias_kz!='') + $qry.=" AND (studiengang_kz NOT IN($noalias_kz) OR studiengang_kz is null)"; + + $qry.=" AND (tbl_benutzer.aktiv OR (tbl_benutzer.aktiv=false AND updateaktivam >= now()-(SELECT CASE public.get_rolle_prestudent (prestudent_id,null) WHEN 'Abbrecher' THEN '".DEL_ABBRECHER_WEEKS." weeks'::interval