From bda7a2419ebe5f91981097f2d3ffddf4155b4e5d Mon Sep 17 00:00:00 2001
From: Christian Paminger <pam@technikum-wien.at>
Date: Fri, 8 Jun 2007 07:03:51 +0000
Subject: [PATCH]

---
 cis/private/lvplan/index.php     |  6 ++----
 cis/private/lvplan/stpl_week.php | 18 +++++++++---------
 cis/private/menu.php             |  5 +++--
 cis/topbar.html                  |  7 +++----
 4 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/cis/private/lvplan/index.php b/cis/private/lvplan/index.php
index 087257358..9d6395d8e 100644
--- a/cis/private/lvplan/index.php
+++ b/cis/private/lvplan/index.php
@@ -1,11 +1,9 @@
 <?php
 	include('../../config.inc.php');
+	include('../../../include/globals.inc.php');
 	include('../../../include/functions.inc.php');
 
-	if (isset($REMOTE_USER))
-		$uid=$REMOTE_USER;
-	else
-		$uid='tw01e061';
+	$uid=USER_UID;
 
 	// Verbindung aufbauen
 	$conn=pg_pconnect(CONN_STRING) or die ("Unable to connect to SQL-Server");
diff --git a/cis/private/lvplan/stpl_week.php b/cis/private/lvplan/stpl_week.php
index 09e548697..a04061f6d 100644
--- a/cis/private/lvplan/stpl_week.php
+++ b/cis/private/lvplan/stpl_week.php
@@ -43,14 +43,11 @@
 //$datum=1102260015;
 
 require_once('../../config.inc.php');
+require_once('../../../include/globals.inc.php');
 require_once('../../../include/functions.inc.php');
 require_once('../../../include/wochenplan.class.php');
 
-// Test Einstellungen
-//if (!isset($REMOTE_USER))
-//	$REMOTE_USER='tw01e061';
-//$uid=$REMOTE_USER;
-$uid=get_uid();
+$uid=USER_UID;
 
 
 // Deutsche Umgebung
@@ -134,9 +131,9 @@ if(!$erg_std=pg_query($conn, "SET datestyle TO ISO; SET search_path TO campus;")
 }
 
 // Authentifizierung
-if ($uid=check_student(get_uid(), $conn))
+if (check_student($uid, $conn))
 	$user='student';
-elseif ($uid=check_lektor(get_uid(), $conn))
+elseif (check_lektor($uid, $conn))
 	$user='lektor';
 else
 {
@@ -148,9 +145,12 @@ if (!isset($type))
 	$type=$user;
 if (!isset($pers_uid))
 	$pers_uid=$uid;
+
+var_dump($_POST);
 // Reservieren
-if (isset($reserve) && $uid==$user_uid)
-{
+if (isset($reserve) && $user=='lektor')
+{
+	//echo 'test';
 	if(!$erg_std=pg_query($conn, "SELECT * FROM lehre.tbl_stunde ORDER BY stunde"))
 	{
 		die(pg_last_error($conn));
diff --git a/cis/private/menu.php b/cis/private/menu.php
index 7e29f60e6..208e1b3f7 100644
--- a/cis/private/menu.php
+++ b/cis/private/menu.php
@@ -21,6 +21,7 @@
  */
 
 require_once('../config.inc.php');
+require_once('../../include/globals.inc.php');
 require_once('../../include/functions.inc.php');
 require_once('../../include/benutzerberechtigung.class.php');
 require_once('../../include/studiensemester.class.php');
@@ -31,7 +32,7 @@ require_once('../../include/lehrveranstaltung.class.php');
 if(!$db_conn = pg_pconnect(CONN_STRING))
 	die('Fehler beim oeffnen der Datenbankverbindung');
 
-$user = get_uid();
+$user=USER_UID;
 
 $rechte=new benutzerberechtigung($db_conn);
 $rechte->getBerechtigungen($user);
@@ -237,4 +238,4 @@ else
   </tr>
 </table>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/cis/topbar.html b/cis/topbar.html
index bdf15add6..b76edb907 100644
--- a/cis/topbar.html
+++ b/cis/topbar.html
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="../skin/cis.css" rel="stylesheet" type="text/css">
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<link href="../skin/cis.css" rel="stylesheet" type="text/css">
 </head>
 
 <body>
