diff --git a/cis/private/profile/index.php b/cis/private/profile/index.php index 0ada54965..6961ddf11 100644 --- a/cis/private/profile/index.php +++ b/cis/private/profile/index.php @@ -230,6 +230,7 @@ echo ''; echo ' '.($type=="student"?$p->t("profil/student"):$p->t('profil/mitarbeiter')).'

'.$p->t('global/username').': '.$user->uid.'
+ '.$p->t('global/anrede').': '.$user->anrede.'
'.$p->t('global/titel').': '.$user->titelpre.'
'; if(!$ansicht) diff --git a/cis/private/tools/suche.php b/cis/private/tools/suche.php index 89d3030fb..b262ea01c 100644 --- a/cis/private/tools/suche.php +++ b/cis/private/tools/suche.php @@ -82,7 +82,6 @@ $searchItems = explode(' ',TRIM(str_replace(',', '', $search),'!.?')); // Leerzeichen und Whitespaces entfernen $searchItems = preg_replace("/\s/", '', $searchItems); - // Leere Strings aus Array entfernen while ($array_key = array_search("", $searchItems)) unset ($searchItems[$array_key]); @@ -139,6 +138,7 @@ function searchPerson($searchItems) echo ' + @@ -161,6 +161,7 @@ function searchPerson($searchItems) echo ''; //echo ''; + echo ''; echo ''; echo '
',$p->t('global/anrede'),' ',$p->t('global/vorname'),' ',$p->t('global/nachname'),' ',$p->t('global/studiengang'),'
',$row->titelpre,'',$row->anrede,'',$row->vorname,'',$row->nachname,''; if($row->aktiv==false) diff --git a/include/benutzer.class.php b/include/benutzer.class.php index 999f19da8..7025044b3 100644 --- a/include/benutzer.class.php +++ b/include/benutzer.class.php @@ -304,7 +304,7 @@ class benutzer extends person { $qry = "SELECT * FROM ( SELECT - distinct on (uid) vorname, nachname, uid, mitarbeiter_uid, titelpre, titelpost, lektor, fixangestellt, alias, tbl_benutzer.aktiv, + distinct on (uid) vorname, nachname, uid, mitarbeiter_uid, titelpre, titelpost, lektor, fixangestellt, alias, tbl_benutzer.aktiv, anrede, (SELECT UPPER (tbl_studiengang.typ || tbl_studiengang.kurzbz) FROM public.tbl_student @@ -371,6 +371,7 @@ class benutzer extends person $obj->lektor = $row->lektor; $obj->fixangestellt = $row->fixangestellt; $obj->aktiv = $this->db_parse_bool($row->aktiv); + $obj->anrede = $row->anrede; $this->result[] = $obj; } diff --git a/locale/de-AT/global.php b/locale/de-AT/global.php index ca75ca7c4..318e7e5f6 100644 --- a/locale/de-AT/global.php +++ b/locale/de-AT/global.php @@ -65,6 +65,7 @@ $this->phrasen['global/oder']='oder'; $this->phrasen['global/username']='Username'; $this->phrasen['global/vorname']='Vorname'; $this->phrasen['global/nachname']='Nachname'; +$this->phrasen['global/anrede']='Anrede'; $this->phrasen['global/name']='Name'; $this->phrasen['global/uid']='UID'; $this->phrasen['global/postnomen']='Postnomen'; diff --git a/locale/en-US/global.php b/locale/en-US/global.php index 1ff736473..0fa50791b 100644 --- a/locale/en-US/global.php +++ b/locale/en-US/global.php @@ -64,6 +64,7 @@ $this->phrasen['global/oder']='or'; $this->phrasen['global/username']='Username'; $this->phrasen['global/vorname']='First Name'; $this->phrasen['global/nachname']='Last Name'; +$this->phrasen['global/anrede']='Title'; $this->phrasen['global/name']='Name'; $this->phrasen['global/uid']='UID'; $this->phrasen['global/postnomen']='Postnomen';