From 550e34ccc9e6d5355780c8973373e15b8b6bdce8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 14 Nov 2011 15:46:54 +0000
Subject: [PATCH] =?UTF-8?q?-=20Diplomasupplement=20-=20Anpassung=20f=C3=BC?=
 =?UTF-8?q?r=202=20Auslandssemester=20-=20News=20-=20EMail=20Links=20bei?=
 =?UTF-8?q?=20Studiengangsdetails=20gefixt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locale/de-AT/global.php                |  2 +-
 rdf/diplomasupplement.xml.php          |  9 +++++++--
 system/templates/news_xslt_xhtml.xslt  | 10 +++++-----
 system/xsl/diploma_supplement_0_v1.xsl |  4 ++--
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/locale/de-AT/global.php b/locale/de-AT/global.php
index 162afe281..646fb1a13 100755
--- a/locale/de-AT/global.php
+++ b/locale/de-AT/global.php
@@ -14,7 +14,7 @@ $this->phrasen['global/studiengangsmanagement']='Studiengangsmanagement';
 $this->phrasen['global/geschaeftsfuehrendeltg']='geschäftsf. Leitung';
 $this->phrasen['global/stellvertreter']='Stellvertreter';
 $this->phrasen['global/sekretariat']='Sekretariat';
-$this->phrasen['global/studentenvertreter']='Studentenvertreter';
+$this->phrasen['global/studentenvertreter']='Studierendenvertreter';
 
 $this->phrasen['global/lehrziele']='Lehrziele';
 $this->phrasen['global/allgemeinerdownload']='Allgemeiner Download';
diff --git a/rdf/diplomasupplement.xml.php b/rdf/diplomasupplement.xml.php
index 090d12f52..abadf8a25 100644
--- a/rdf/diplomasupplement.xml.php
+++ b/rdf/diplomasupplement.xml.php
@@ -209,9 +209,14 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		$qry = "SELECT von, bis FROM bis.tbl_bisio WHERE student_uid='".$uid_arr[$i]."'";
 		if($db->db_query($qry))
 		{
-			if($row1 = $db->db_fetch_object())
+			if($db->db_num_rows()>0)
 			{
-				echo "		<auslandssemester>Auslandssemester/International semester ".$datum->convertISODate($row1->von)." - ".$datum->convertISODate($row1->bis)."</auslandssemester>";
+				echo "		<auslandssemester>";
+				while($row1 = $db->db_fetch_object())
+				{
+					echo "Auslandssemester/International semester ".$datum->convertISODate($row1->von)." - ".$datum->convertISODate($row1->bis)."\n";
+				}
+				echo "</auslandssemester>";
 			}
 		}
 		$stg_oe_obj = new studiengang($row->studiengang_kz);
diff --git a/system/templates/news_xslt_xhtml.xslt b/system/templates/news_xslt_xhtml.xslt
index 256474726..16d286a5c 100755
--- a/system/templates/news_xslt_xhtml.xslt
+++ b/system/templates/news_xslt_xhtml.xslt
@@ -100,34 +100,34 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 	<xsl:template match="stg_ltg">
 			<b><xsl:value-of select="name" /></b><br />
 			<xsl:variable name="mail" select="email"></xsl:variable>
-			<a href="mailto:{mail}"><xsl:value-of select="email" /></a><br />
+			<a href="mailto:{$mail}"><xsl:value-of select="email" /></a><br />
 			Tel.:<xsl:value-of select="telefon" />
 			<br />
 	</xsl:template>
 	<xsl:template match="gf_ltg">
 			<b><xsl:value-of select="name" /></b><br />
 			<xsl:variable name="mail" select="email"></xsl:variable>
-			<a href="mailto:{mail}"><xsl:value-of select="email" /></a><br />
+			<a href="mailto:{$mail}"><xsl:value-of select="email" /></a><br />
 			Tel.:<xsl:value-of select="telefon" />
 			<br />
 	</xsl:template>
 	<xsl:template match="stv_ltg">
 			<b><xsl:value-of select="name" /></b><br />
 			<xsl:variable name="mail" select="email"></xsl:variable>
-			<a href="mailto:{mail}"><xsl:value-of select="email" /></a><br />
+			<a href="mailto:{$mail}"><xsl:value-of select="email" /></a><br />
 			Tel.:<xsl:value-of select="telefon" />
 			<br />
 	</xsl:template>
 	<xsl:template match="ass">
 			<b><xsl:value-of select="name" /></b><br />
 			<xsl:variable name="mail" select="email"></xsl:variable>
-			<a href="mailto:{mail}"><xsl:value-of select="email" /></a><br />
+			<a href="mailto:{$mail}"><xsl:value-of select="email" /></a><br />
 			Tel.:<xsl:value-of select="telefon" />
 			<br />
 	</xsl:template>
 	<xsl:template match="stdv">
 			<xsl:variable name="mail" select="email"></xsl:variable>
-			<a href="mailto:{mail}"><xsl:value-of select="name" /></a><br />
+			<a href="mailto:{$mail}"><xsl:value-of select="name" /></a><br />
 	</xsl:template>
 	<xsl:template match="cis_ext_menu">
 			<xsl:variable name="kurzbz" select="kurzbz"></xsl:variable>
diff --git a/system/xsl/diploma_supplement_0_v1.xsl b/system/xsl/diploma_supplement_0_v1.xsl
index 4a6d2dfe4..cce38f587 100644
--- a/system/xsl/diploma_supplement_0_v1.xsl
+++ b/system/xsl/diploma_supplement_0_v1.xsl
@@ -336,7 +336,7 @@
 							<fo:table-row  line-height="10pt">
 								<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="8pt"> 6.1 \n</fo:block></fo:table-cell>
 								<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="8pt"> Weitere Angaben \n Additional information</fo:block></fo:table-cell>
-								<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="8pt"><xsl:value-of select="praktikum" />\n<xsl:value-of select="auslandssemester" /></fo:block></fo:table-cell>
+								<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="8pt"><xsl:value-of select="praktikum" /><xsl:text> </xsl:text><xsl:value-of select="auslandssemester" /></fo:block></fo:table-cell>
 							</fo:table-row>
 							<fo:table-row  line-height="10pt">
 								<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="8pt"> 6.2 \n</fo:block></fo:table-cell>
@@ -454,4 +454,4 @@
 			</fo:flow>
 	    </fo:page-sequence>
 	</xsl:template>
-</xsl:stylesheet >
\ No newline at end of file
+</xsl:stylesheet >