From 1ff1a450d7481080f6387b5f485a468abdf709e7 Mon Sep 17 00:00:00 2001
From: Christian Paminger <pam@technikum-wien.at>
Date: Fri, 19 Jan 2007 16:53:59 +0000
Subject: [PATCH]

---
 include/lehrstunde.class.php | 14 ++++++++------
 include/wochenplan.class.php |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/include/lehrstunde.class.php b/include/lehrstunde.class.php
index 006721d41..9ad1eef75 100644
--- a/include/lehrstunde.class.php
+++ b/include/lehrstunde.class.php
@@ -210,6 +210,7 @@ class lehrstunde
 		// Bezeichnung der Stundenplan-Tabelle und des Keys
 		$stpl_id=$stpl_view.TABLE_ID;
 		$stpl_view=VIEW_BEGIN.$stpl_view;
+		$num_rows_einheit=0;
 		// Datum im Format YYYY-MM-TT ?
 		if (!ereg("([0-9]{4})-([0-9]{1,2})-([0-9]{1,2})",$datum_von) )
 		{
@@ -246,9 +247,9 @@ class lehrstunde
 		if ($type=='student')
 		{
 			// Lehrverband ermitteln
-			$sql_query="SELECT studiengang_kz, semester, verband, gruppe FROM tbl_student WHERE uid='$uid'";
+			$sql_query="SELECT studiengang_kz, semester, verband, gruppe FROM public.tbl_student WHERE student_uid='$uid'";
 			//echo $sql_query;
-			if (! $result=@pg_query($this->conn, $sql_query) )
+			if (! $result=pg_query($this->conn, $sql_query) )
 			{
 				$this->errormsg=pg_last_error($this->conn);
 				return -2;
@@ -267,14 +268,15 @@ class lehrstunde
 			$grp=$row->gruppe;
 
 			// Einheiten ermitteln
-			$sql_query="SELECT gruppe_kurzbz FROM tbl_einheitstudent WHERE uid='$uid'";
+			$sql_query="SELECT gruppe_kurzbz FROM public.tbl_benutzergruppe WHERE uid='$uid'";
 			//echo $sql_query;
-			if (! $result_einheit=@pg_query($this->conn, $sql_query) )
+			if (! $result_einheit=pg_query($this->conn, $sql_query) )
 			{
 				$this->errormsg=pg_last_error($this->conn);
-				return -2;
+				return false;
 			}
-			$num_rows_einheit=pg_num_rows($result_einheit);
+			else
+				$num_rows_einheit=pg_num_rows($result_einheit);
 		}
 
 		///////////////////////////////////////////////////////////////////////
diff --git a/include/wochenplan.class.php b/include/wochenplan.class.php
index cd4f2f37c..5e3d96b1f 100644
--- a/include/wochenplan.class.php
+++ b/include/wochenplan.class.php
@@ -207,12 +207,12 @@ class wochenplan
 		// Studiengangsdaten ermitteln
 		if ($this->type=='student' || $this->type=='verband')
 		{
-			$sql_query="SELECT bezeichnung, kurzbz, kurzbzlang FROM tbl_studiengang WHERE studiengang_kz=$this->stg_kz";
+			$sql_query="SELECT bezeichnung, kurzbz, kurzbzlang, typ FROM public.tbl_studiengang WHERE studiengang_kz=$this->stg_kz";
 			//echo $sql_query;
 			if(!($result=pg_exec($this->conn, $sql_query)))
 				die(pg_last_error($this->conn));
 			$this->stg_bez=pg_result($result,0,'"bezeichnung"');
-			$this->stg_kurzbz=pg_result($result,0,'"kurzbz"');
+			$this->stg_kurzbz=pg_result($result,0,'"typ"').pg_result($result,0,'"kurzbz"');
 			$this->stg_kurzbzlang=pg_result($result,0,'"kurzbzlang"');
 		}