From facd1a91e499a5e81782881b365de39499611468 Mon Sep 17 00:00:00 2001
From: Manfred Kindl <kindlm@technikum-wien.at>
Date: Mon, 9 Sep 2013 19:18:27 +0000
Subject: [PATCH] =?UTF-8?q?Studiengangsinformationen=20zeigen=20nun=20die?=
 =?UTF-8?q?=20Alias-Adressen=20wenn=20vorhanden=20und=20ein=20Klick=20auf?=
 =?UTF-8?q?=20den=20Namen=20der=20Person=20linkt=20jetzt=20zum=20pers?=
 =?UTF-8?q?=C3=B6nlichen=20Profil.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cms/news.php                          | 33 +++++++++++++++++++++++----
 system/templates/news_xslt_xhtml.xslt | 16 ++++++-------
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/cms/news.php b/cms/news.php
index 4e5983aa0..e55f36554 100755
--- a/cms/news.php
+++ b/cms/news.php
@@ -43,6 +43,7 @@ require_once('../include/mitarbeiter.class.php');
 require_once('../include/datum.class.php');
 require_once('../include/phrasen.class.php');
 require_once('../include/student.class.php');
+require_once('../include/benutzer.class.php');
 
 $sprache = getSprache();
 
@@ -188,7 +189,13 @@ function getStgContent($studiengang_kz, $semester, $sprache)
 		    
 			if(isset($row_course_leader) && $row_course_leader->uid != "")
 			{
-				$xml.='<email><![CDATA['.$row_course_leader->uid.'@'.DOMAIN.']]></email>';
+				$alias = new benutzer();
+				$alias->load($uid);
+				if($alias->alias!='')
+					$xml.='<email><![CDATA['.$alias->alias.'@'.DOMAIN.']]></email>';
+				else
+					$xml.='<email><![CDATA['.$row_course_leader->uid.'@'.DOMAIN.']]></email>';
+				$xml.='<uid><![CDATA['.$row_course_leader->uid.']]></uid>';
 			}		
 		
 		  	if(isset($row_course_leader) && $row_course_leader->telefonklappe != "")
@@ -222,7 +229,13 @@ function getStgContent($studiengang_kz, $semester, $sprache)
 			$xml.='<gf_ltg>';
 			
 			$xml.='<name><![CDATA['.$ma->titelpre.' '.$ma->vorname.' '.$ma->nachname.' '.$ma->titelpost.']]></name>';
-			$xml.='<email><![CDATA['.$ma->uid.'@'.DOMAIN.']]></email>';
+			$alias = new benutzer();
+			$alias->load($ma->uid);
+			if($alias->alias!='')
+				$xml.='<email><![CDATA['.$alias->alias.'@'.DOMAIN.']]></email>';
+			else 
+				$xml.='<email><![CDATA['.$ma->uid.'@'.DOMAIN.']]></email>';
+			$xml.='<uid><![CDATA['.$ma->uid.']]></uid>';
 			
 			if($ma->telefonklappe != '')
 			{
@@ -253,7 +266,13 @@ function getStgContent($studiengang_kz, $semester, $sprache)
 			$xml.='<stv_ltg>';
 			
 			$xml.='<name><![CDATA['.$ma->titelpre.' '.$ma->vorname.' '.$ma->nachname.' '.$ma->titelpost.']]></name>';
-			$xml.='<email><![CDATA['.$ma->uid.'@'.DOMAIN.']]></email>';
+			$alias = new benutzer();
+			$alias->load($ma->uid);
+			if($alias->alias!='')
+				$xml.='<email><![CDATA['.$alias->alias.'@'.DOMAIN.']]></email>';
+			else 
+				$xml.='<email><![CDATA['.$ma->uid.'@'.DOMAIN.']]></email>';
+			$xml.='<uid><![CDATA['.$ma->uid.']]></uid>';
 			
 			if($ma->telefonklappe != '')
 			{
@@ -284,7 +303,13 @@ function getStgContent($studiengang_kz, $semester, $sprache)
 			$xml.='<ass>';
 			
 			$xml.='<name><![CDATA['.$ma->titelpre.' '.$ma->vorname.' '.$ma->nachname.' '.$ma->titelpost.']]></name>';
-			$xml.='<email><![CDATA['.$ma->uid.'@'.DOMAIN.']]></email>';
+			$alias = new benutzer();
+			$alias->load($ma->uid);
+			if($alias->alias!='')
+				$xml.='<email><![CDATA['.$alias->alias.'@'.DOMAIN.']]></email>';
+			else 
+				$xml.='<email><![CDATA['.$ma->uid.'@'.DOMAIN.']]></email>';
+			$xml.='<uid><![CDATA['.$ma->uid.']]></uid>';
 			
 			if($ma->telefonklappe != '')
 			{
diff --git a/system/templates/news_xslt_xhtml.xslt b/system/templates/news_xslt_xhtml.xslt
index 09acc8d5a..f16e8f127 100755
--- a/system/templates/news_xslt_xhtml.xslt
+++ b/system/templates/news_xslt_xhtml.xslt
@@ -106,29 +106,29 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 	</xsl:template>
 
 	<xsl:template match="stg_ltg">
-			<xsl:variable name="mailname" select="email"></xsl:variable>
-			<p><a href="mailto:{$mailname}"><xsl:value-of select="name" /></a><br />			
+			<xsl:variable name="uid" select="uid"></xsl:variable>
+			<p><a href="../cis/private/profile/index.php?uid={$uid}"><xsl:value-of select="name" /></a><br />			
 			T: <xsl:value-of select="telefon" /><br />
 			E: <xsl:variable name="mail" select="email"></xsl:variable>
 			<a href="mailto:{$mail}"><xsl:value-of select="email" /></a></p>
 	</xsl:template>
 	<xsl:template match="gf_ltg">
-			<xsl:variable name="mailname" select="email"></xsl:variable>
-			<p><a href="mailto:{$mailname}"><xsl:value-of select="name" /></a><br />			
+			<xsl:variable name="uid" select="uid"></xsl:variable>
+			<p><a href="../cis/private/profile/index.php?uid={$uid}"><xsl:value-of select="name" /></a><br />			
 			T: <xsl:value-of select="telefon" /><br />
 			E: <xsl:variable name="mail" select="email"></xsl:variable>
 			<a href="mailto:{$mail}"><xsl:value-of select="email" /></a></p>
 	</xsl:template>
 	<xsl:template match="stv_ltg">
-			<xsl:variable name="mailname" select="email"></xsl:variable>
-			<p><a href="mailto:{$mailname}"><xsl:value-of select="name" /></a><br />			
+			<xsl:variable name="uid" select="uid"></xsl:variable>
+			<p><a href="../cis/private/profile/index.php?uid={$uid}"><xsl:value-of select="name" /></a><br />			
 			T: <xsl:value-of select="telefon" /><br />
 			E: <xsl:variable name="mail" select="email"></xsl:variable>
 			<a href="mailto:{$mail}"><xsl:value-of select="email" /></a></p>
 	</xsl:template>
 	<xsl:template match="ass">
-			<xsl:variable name="mailname" select="email"></xsl:variable>
-			<p><a href="mailto:{$mailname}"><xsl:value-of select="name" /></a><br />			
+			<xsl:variable name="uid" select="uid"></xsl:variable>
+			<p><a href="../cis/private/profile/index.php?uid={$uid}"><xsl:value-of select="name" /></a><br />			
 			T: <xsl:value-of select="telefon" /><br />
 			E: <xsl:variable name="mail" select="email"></xsl:variable>
 			<a href="mailto:{$mail}"><xsl:value-of select="email" /></a></p>