blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 20:29:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Personensuche und Profil berücksichtigt jetzt Studiengänge die keine Alias Adressen bekommen

Browse Source
This commit is contained in:
Andreas Österreicher
2012-05-21 14:58:16 +00:00
parent c289755726
commit d9c2779a6f
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/private/profile/index.php
+1 -1
View File
@@ -169,7 +169,7 @@ echo '
<b>'.$p->t('profil/email').'</b><br>
'.$p->t('profil/intern').': <a class="Item" href="mailto:'.$user->uid.'@'.DOMAIN.'">'.$user->uid.'@'.DOMAIN.'</a><br>';
if($user->alias!='' && !in_array($stg,$noalias))
if($user->alias!='' && (!isset($user->studiengang_kz) || !in_array($user->studiengang_kz,$noalias)))
{
echo $p->t('profil/alias').": <a class='Item' href='mailto:$user->alias@".DOMAIN."'>$user->alias@".DOMAIN."</a>";
}
cis/private/tools/suche.php
+4 -3
View File
@@ -25,6 +25,7 @@ require_once('../../../include/functions.inc.php');
require_once('../../../include/phrasen.class.php');
require_once('../../../include/content.class.php');
require_once('../../../include/benutzer.class.php');
require_once('../../../include/globals.inc.php');
$uid = get_uid();
$db = new basis_db();
@@ -36,7 +37,7 @@ echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="../../../skin/tablesort.css" type="text/css"/>
<link href="../../../skin/style.css.php" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="../../../skin/style.css.php" type="text/css">
<script type="text/javascript" src="../../../include/js/jquery.js"></script>
<title>Globale Suche</title>
</head>
@@ -63,7 +64,7 @@ searchContent($searchItems);
function searchPerson($searchItems)
{
global $db, $p;
global $db, $p, $noalias;
$bn = new benutzer();
$bn->search($searchItems);
@@ -105,7 +106,7 @@ function searchPerson($searchItems)
echo '<td>',$row->titelpost,'</td>';
echo '<td>',$row->studiengang,'</td>';
echo '<td>',$row->telefonklappe,'</td>';
if($row->alias!='')
if($row->alias!='' && !in_array($row->studiengang_kz, $noalias))
$mail = $row->alias.'@'.DOMAIN;
else
$mail = $row->uid.'@'.DOMAIN;
include/benutzer.class.php
+4 -1
View File
@@ -263,9 +263,11 @@ class benutzer extends person
{
$qry = "SELECT * FROM (SELECT
distinct on (uid) vorname, nachname, uid, titelpre, titelpost,alias,
(SELECT UPPER(tbl_studiengang.typ || tbl_studiengang.kurzbz)
(SELECT UPPER(tbl_studiengang.typ || tbl_studiengang.kurzbz)
FROM public.tbl_student JOIN public.tbl_studiengang USING(studiengang_kz)
WHERE student_uid=tbl_benutzer.uid) as studiengang,
(SELECT studiengang_kz FROM public.tbl_student
WHERE student_uid=tbl_benutzer.uid) as studiengang_kz,
(SELECT tbl_kontakt.kontakt || ' - ' ||telefonklappe
FROM public.tbl_mitarbeiter
LEFT JOIN public.tbl_kontakt USING(standort_id)
@@ -302,6 +304,7 @@ class benutzer extends person
$obj->titelpost = $row->titelpost;
$obj->uid = $row->uid;
$obj->studiengang = $row->studiengang;
$obj->studiengang_kz = $row->studiengang_kz;
$obj->telefonklappe = $row->klappe;
$obj->alias = $row->alias;