From 8f9f5621a2863279307fb96b1eba086c43594a6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 29 Aug 2011 08:16:13 +0000
Subject: [PATCH] =?UTF-8?q?-=20Urlaubs-Addon=20nur=20sichtbar=20wenn=20Unt?=
 =?UTF-8?q?ergebene=20eingetragen=20-=20LV-Addon=20w=C3=A4hlt=20bei=20Stud?=
 =?UTF-8?q?enten=20automatisch=20das=20richtige=20Semester=20an=20-=20Glob?=
 =?UTF-8?q?ale=20Links=20korrigiert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cms/menu/menu_addon_lehrveranstaltungen.inc.php | 8 +++++++-
 cms/menu/menu_addon_urlaub.inc.php              | 2 ++
 include/tw/cis_menu_global.inc.php              | 4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/cms/menu/menu_addon_lehrveranstaltungen.inc.php b/cms/menu/menu_addon_lehrveranstaltungen.inc.php
index b6730b20c..78ea7787f 100755
--- a/cms/menu/menu_addon_lehrveranstaltungen.inc.php
+++ b/cms/menu/menu_addon_lehrveranstaltungen.inc.php
@@ -51,7 +51,10 @@ class menu_addon_lehrveranstaltungen extends menu_addon
 		$user = get_uid();
 		$student = new student();
 		if($student->load($user))
+		{
 			$studiengang_kz=$student->studiengang_kz;
+			$semester=$student->semester;
+		}
 			
 		$p = new phrasen($sprache);
 		
@@ -87,7 +90,10 @@ class menu_addon_lehrveranstaltungen extends menu_addon
 		if(isset($params['semester']) && is_numeric($params['semester']))
 			$semester=$params['semester'];
 		else
-			$semester=1;
+		{
+			if(!isset($semester))
+				$semester=1;
+		}
 		
 		$sel_kurzbzlang='';
 		foreach($stg_obj->result as $row)
diff --git a/cms/menu/menu_addon_urlaub.inc.php b/cms/menu/menu_addon_urlaub.inc.php
index d1dbcba5c..bc942cb85 100755
--- a/cms/menu/menu_addon_urlaub.inc.php
+++ b/cms/menu/menu_addon_urlaub.inc.php
@@ -82,6 +82,8 @@ class menu_addon_urlaub extends menu_addon
 				}
 			}
 		}
+		else
+			$this->link=false;
 		
 		$this->output();
 	}
diff --git a/include/tw/cis_menu_global.inc.php b/include/tw/cis_menu_global.inc.php
index f2cf3c2a9..015199655 100644
--- a/include/tw/cis_menu_global.inc.php
+++ b/include/tw/cis_menu_global.inc.php
@@ -31,8 +31,8 @@ $p = new phrasen($sprache);
 ?>
 <div id="GlobalMenu">
 	[ <a class='Item' href="index.html" target="_top"><?php echo $p->t('profil/home');?></a>
-	| <a class='Item' href="private/menu.php?content_id=173" target="menu"><?php echo $p->t('profil/meinCis');?></a>
-	| <a class='Item' href="private/lehre/menu.php?content_id=166" target="menu"><?php echo $p->t('lvaliste/lehrveranstaltungen');?></a>
+	| <a class='Item' href="menu.php?content_id=173" target="menu"><?php echo $p->t('profil/meinCis');?></a>
+	| <a class='Item' href="menu.php?content_id=166" target="menu"><?php echo $p->t('lvaliste/lehrveranstaltungen');?></a>
 	<?php
 	if(CHOOSE_LAYOUT)
 		echo '| <a class="Item" href="../layouts.php" target="content">Layouts</a>';