diff --git a/include/mitarbeiter.class.php b/include/mitarbeiter.class.php index 188945409..aaffe3933 100644 --- a/include/mitarbeiter.class.php +++ b/include/mitarbeiter.class.php @@ -750,7 +750,7 @@ class mitarbeiter extends benutzer */ public function getMitarbeiterFilter($filter) { - $qry = "SELECT * FROM campus.vw_mitarbeiter WHERE nachname ~* ".$this->db_add_param($filter)." OR uid ~* ".$this->db_add_param($filter).';'; + $qry = "SELECT * FROM campus.vw_mitarbeiter WHERE lower(nachname) ~* lower(".$this->db_add_param($filter)." OR uid ~* ".$this->db_add_param($filter).');'; if($this->db_query($qry)) { while($row = $this->db_fetch_object()) @@ -836,8 +836,8 @@ class mitarbeiter extends benutzer distinct on(mitarbeiter_uid) *, tbl_benutzer.aktiv as aktiv, tbl_mitarbeiter.insertamum, tbl_mitarbeiter.insertvon, tbl_mitarbeiter.updateamum, tbl_mitarbeiter.updatevon, tbl_person.svnr FROM ((public.tbl_mitarbeiter JOIN public.tbl_benutzer ON(mitarbeiter_uid=uid)) JOIN public.tbl_person USING(person_id)) LEFT JOIN campus.tbl_resturlaub USING(mitarbeiter_uid) - WHERE nachname||' '||vorname ~* ".$this->db_add_param($filter)." OR - vorname||' '||nachname ~* ".$this->db_add_param($filter)." OR + WHERE lower(COALESCE(nachname,'') ||' '|| COALESCE(vorname,'')) ~* lower(".$this->db_add_param($filter).") OR + lower(COALESCE(vorname,'') ||' '|| COALESCE(nachname,'')) ~* lower(".$this->db_add_param($filter).") OR uid ~* ".$this->db_add_param($filter)." "; if(is_numeric($filter)) $qry.="OR personalnummer = ".$this->db_add_param($filter)." OR svnr = ".$this->db_add_param($filter).";"; diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php index 3f912cf04..6571ec48d 100644 --- a/rdf/student.rdf.php +++ b/rdf/student.rdf.php @@ -526,11 +526,11 @@ if($xmlformat=='rdf') FROM public.tbl_person JOIN tbl_prestudent USING (person_id) LEFT JOIN tbl_student using(prestudent_id) WHERE - nachname||' '||vorname ~* '".addslashes($filter)."' OR - vorname||' '||nachname ~* '".addslashes($filter)."' OR - student_uid ~* '".addslashes($filter)."' OR - matrikelnr = '".addslashes($filter)."' OR - svnr = '".addslashes($filter)."';"; + lower(COALESCE(nachname,'') ||' '|| COALESCE(vorname,'')) ~* lower(".$db->db_add_param($filter).") OR + lower(COALESCE(vorname,'') ||' '|| COALESCE(nachname,'')) ~* lower(".$db->db_add_param($filter).") OR + student_uid ~* ".$db->db_add_param($filter)." OR + matrikelnr = ".$db->db_add_param($filter)." OR + svnr = ".$db->db_add_param($filter).";"; if($db->db_query($qry)) { while($row = $db->db_fetch_object())