diff --git a/vilesci/personen/resturlaub.php b/vilesci/personen/resturlaub.php
index 08a03aebb..38a23b511 100644
--- a/vilesci/personen/resturlaub.php
+++ b/vilesci/personen/resturlaub.php
@@ -26,6 +26,7 @@ require_once('../../include/benutzer.class.php');
 require_once('../../include/mitarbeiter.class.php');
 require_once('../../include/studiengang.class.php');
 require_once('../../include/resturlaub.class.php');
+require_once('../../include/benutzerberechtigung.class.php');
 
 if(!$conn=pg_pconnect(CONN_STRING))
 	die("Fehler beim Connecten zur Datenbank");
@@ -53,9 +54,16 @@ function gesamt()
 
 $user = get_uid();
 
-
 if(isset($_GET['type']) && $_GET['type']=='edit' && isset($_GET['uid']))
 {
+	if(isset($_GET['del']) && isset($_GET['zeitsperre_id']))
+	{
+		$qry="DELETE FROM campus.tbl_zeitsperre WHERE mitarbeiter_uid='".$_GET['uid']."' AND zeitsperre_id='".$_GET['zeitsperre_id']."' ;";
+		if(!pg_query($conn, $qry))
+		{
+			die("Zeitsperren konnte nicht gelo¨scht werden!");
+		}
+	}
 	$ma = new mitarbeiter($conn);
 	$ma->load($_GET['uid']);
 	
@@ -87,6 +95,56 @@ if(isset($_GET['type']) && $_GET['type']=='edit' && isset($_GET['uid']))
 				</tr>
 			</table>
 		  </form>';
+	$rechte = new benutzerberechtigung($conn);
+	$rechte->getBerechtigungen($user);
+	if($rechte->isBerechtigt('admin', '0', 'suid'))
+	{
+		echo "<input type='button' onclick='parent.lv_detail.location=\"resturlaub_details.php?neu=true&uid=$uid\"' value='Neu'/>";
+		echo"<table class='liste table-autosort:5 table-stripeclass:alternate table-autostripe'>
+		<thead>
+		<tr class='liste'>";
+		echo "<th>&nbsp;</th>
+			<th>&nbsp;</th>
+			<th class='table-sortable:default'>ID</th>
+			  <th class='table-sortable:default'>Kurzbz</th>
+			  <th class='table-sortable:default'>Bezeichnung</th>
+			  <th class='table-sortable:default'>Von-Datum</th>
+			  <th class='table-sortable:default'>Von-Stunde</th>
+			  <th class='table-sortable:default'>Bis-Datum</th>
+			  <th class='table-sortable:default'>Bis-Stunde</th>
+			  <th class='table-sortable:default'>Vertretung</th>
+			  <th class='table-sortable:default'>Erreichbarkeit</th>
+			  <th class='table-sortable:default'>Freigabe</th>
+			  <th class='table-sortable:default'>Freigabedatum</th>\n";
+		echo "</tr></thead>";
+		echo "<tbody>";
+		$qry="SELECT * FROM campus.tbl_zeitsperre WHERE mitarbeiter_uid='".$uid."' ORDER BY vondatum DESC";
+		if(!$result_urlaub = pg_query($conn, $qry))
+			die("Zeitsperren nicht gefunden!");
+		$num_rows=pg_num_rows($result_urlaub);
+		if ($result_urlaub!=0)
+		{
+			for($i=0;$i<$num_rows;$i++)
+			{
+				$row_urlaub=pg_fetch_object($result_urlaub);
+				echo "<tr>";
+				echo "<td><a href='resturlaub_details.php?zeitsperre_id=$row_urlaub->zeitsperre_id' target='lv_detail'>edit</a></td>";
+				echo "<td><a href='".$_SERVER['PHP_SELF']."?type=edit&del=true&uid=$uid&zeitsperre_id=$row_urlaub->zeitsperre_id' target='uebersicht'>delete</a></td>";
+				echo "<td>".$row_urlaub->zeitsperre_id."</td>";
+				echo "<td>".$row_urlaub->zeitsperretyp_kurzbz."</td>";
+				echo "<td>".$row_urlaub->bezeichnung."</td>";
+				echo "<td>".$row_urlaub->vondatum."</td>";
+				echo "<td>".$row_urlaub->vonstunde."</td>";
+				echo "<td>".$row_urlaub->bisdatum."</td>";
+				echo "<td>".$row_urlaub->bisstunde."</td>";
+				echo "<td>".$row_urlaub->vertretung_uid."</td>";
+				echo "<td>".$row_urlaub->erreichbarkeit_kurzbz."</td>";
+				echo "<td>".$row_urlaub->freigabevon."</td>";
+				echo "<td>".$row_urlaub->freigabeamum."</td>";
+				echo "</td>";
+			}
+		}
+	}
 	exit;
 }
 
diff --git a/vilesci/personen/resturlaub_details.php b/vilesci/personen/resturlaub_details.php
new file mode 100644
index 000000000..d9a1a014f
--- /dev/null
+++ b/vilesci/personen/resturlaub_details.php
@@ -0,0 +1,248 @@
+<?php
+/* Copyright (C) 2006 Technikum-Wien
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
+ *          Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>,
+ *          Rudolf Hangl <rudolf.hangl@technikum-wien.at> and
+ *          Gerald Raab <gerald.raab@technikum-wien.at>.
+ */
+	require_once('../config.inc.php');
+	require_once('../../include/functions.inc.php');
+	require_once('../../include/person.class.php');
+	require_once('../../include/benutzer.class.php');
+	require_once('../../include/mitarbeiter.class.php');
+	require_once('../../include/studiengang.class.php');
+	require_once('../../include/resturlaub.class.php');
+	require_once('../../include/zeitsperre.class.php');
+
+
+	if (!$conn = pg_pconnect(CONN_STRING))
+		die('Es konnte keine Verbindung zum Server aufgebaut werden.');
+
+	$user = get_uid();
+	$reloadstr = "";  // neuladen der liste im oberen frame
+	$errorstr='';
+	$htmlstr='';
+
+	$zeitsperre_arr=array();
+	$vertretung_arr=array();
+	$erreichbarkeit_arr=array();
+	$freigabe_arr=array();
+
+
+	if(isset($_POST["schick"]) && $_POST['uid']!='')
+	{
+		$zs = new zeitsperre($conn);
+		
+		if(isset($_POST['zeitsperre_id']) && $_POST['zeitsperre_id']!='')
+		{
+			if($zs->load($_POST['zeitsperre_id']))
+			{
+				$zs->new=false;
+			}
+		}
+		else
+		{
+			$zs->new=true;
+			$zs->insertamum=date('Y-m-d H:i:s');
+			$zs->insertvon = $user;
+		}
+		$zs->zeitsperretyp_kurzbz = $_POST['zeitsperretyp_kurzbz'];
+		$zs->bezeichnung = $_POST['bezeichnung'];
+		$zs->mitarbeiter_uid = $_POST['uid'];
+		$zs->vondatum = $_POST['vondatum'];
+		$zs->vonstunde = $_POST['vonstunde'];
+		$zs->bisdatum = $_POST['bisdatum'];
+		$zs->bisstunde = $_POST['bisstunde'];
+		$zs->vertretung_uid  = $_POST['vertretung_uid'];
+		$zs->erreichbarkeit_kurzbz = $_POST['erreichbarkeit_kurzbz'];
+		$zs->freigabeamum = $_POST['freigabeamum'];
+		$zs->freigabevon = $_POST['freigabevon'];
+		$zs->updateamum = date('Y-m-d H:i:s');
+		$zs->updatevon = $user;
+		if(!$zs->save())
+		
+			$errorstr = "Fehler beim Speichern der Daten: $zs->errormsg";
+		else
+		{
+			$reloadstr .= "<script type='text/javascript'>\n";
+			$reloadstr .= "parent.uebersicht.location.href='resturlaub.php?type=edit&uid=$zs->mitarbeiter_uid';";
+			$reloadstr .= " window.location.href='".$_SERVER['PHP_SELF']."?zeitsperre_id=$zs->zeitsperre_id&neu=true';";
+			$reloadstr .= "</script>\n";
+		}
+		
+	}
+		
+
+
+	$qry = "SELECT * FROM campus.tbl_zeitsperretyp ORDER BY zeitsperretyp_kurzbz";
+	if($result = pg_query($conn, $qry))
+	{
+		while($row = pg_fetch_object($result))
+		{
+			$zeitsperre_arr[] = $row->zeitsperretyp_kurzbz;
+		}
+	}
+
+	$qry = "SELECT * FROM campus.vw_mitarbeiter WHERE uid not LIKE '\\\_%' ORDER BY nachname, vorname";
+	if($result = pg_query($conn, $qry))
+	{
+		while($row = pg_fetch_object($result))
+		{
+			$vertretung_arr[] = $row->uid;
+		}
+	}
+	
+	$qry = "SELECT * FROM campus.tbl_erreichbarkeit ORDER BY erreichbarkeit_kurzbz";
+	if($result = pg_query($conn, $qry))
+	{
+		while($row = pg_fetch_object($result))
+		{
+			$erreichbarkeit_arr[] = $row->erreichbarkeit_kurzbz;
+		}
+	}
+
+	$qry = "SELECT * FROM campus.vw_mitarbeiter WHERE uid not LIKE '\\\_%' ORDER BY nachname, vorname";
+	if($result = pg_query($conn, $qry))
+	{
+		while($row = pg_fetch_object($result))
+		{
+			$freigabe_arr[] = $row->uid;
+		}
+	}
+	
+	if (isset($_REQUEST['zeitsperre_id']) || isset($_REQUEST['neu']))
+	{
+		$zs = new zeitsperre($conn);
+		if (isset($_REQUEST['zeitsperre_id']))
+		{
+			$zsid = $_REQUEST['zeitsperre_id'];
+			if (!$zs->load($zsid))
+				$htmlstr .= "<br><div class='kopf'>Zeitsperre <b>".$zsid."</b> existiert nicht</div>";
+		}
+		else 
+		{
+			$zs->mitarbeiter_uid=$_REQUEST['uid'];
+		}
+		$htmlstr .= "<br><div class='kopf'>Zeitsperre ".(!isset($zs->zeitsperre_id)?'':$zs->zeitsperre_id)."</div>\n";
+		$htmlstr .= "<form action='resturlaub_details.php' method='POST'>\n";
+		$htmlstr .= "<input type='hidden' name='zeitsperre_id' value='".$zs->zeitsperre_id."'>\n";
+		$htmlstr .= "<input type='hidden' name='uid' value='".$zs->mitarbeiter_uid."'>\n";
+		$htmlstr .= "<table class='detail' style='padding-top:10px;'>\n";
+		$htmlstr .= "<tr></tr>\n";
+
+		$htmlstr .= "	<tr>\n";
+		$htmlstr .= "		<td>Typ</td>";
+		$htmlstr .= "		<td><select name='zeitsperretyp_kurzbz'>\n";
+		$htmlstr .= "<option value=''>---ausw&auml;hlen---</option>";
+		foreach ($zeitsperre_arr as $zeitsperre)
+		{
+			if ($zs->zeitsperretyp_kurzbz == $zeitsperre)
+				$sel = " selected";
+			else
+				$sel = "";
+			$htmlstr .= "	<option value='".$zeitsperre."' ".$sel.">".$zeitsperre."</option>";
+		}
+		$htmlstr .= "		</select></td>";
+		$htmlstr .= "		<td>Bezeichnung</td>";
+		$htmlstr .= "		<td colspan='3'><input type='text' name='bezeichnung' value='".htmlentities($zs->bezeichnung, ENT_QUOTES)."' size='32' maxlength='32'></td>\n";
+		$htmlstr .= "	</select></td>";
+		$htmlstr .= "</tr>";
+		$htmlstr .= "<tr>";
+		$htmlstr .= "		<td>Vertretung</td>";
+		$htmlstr .= "		<td><select name='vertretung_uid'>\n";
+		$htmlstr .= "<option value=''>---ausw&auml;hlen---</option>";
+		foreach ($vertretung_arr as $vertretung)
+		{
+			if ($zs->vertretung_uid == $vertretung)
+				$sel = " selected";
+			else
+				$sel = "";
+			$htmlstr .= "	<option value='".$vertretung."' ".$sel.">".$vertretung."</option>";
+		}
+		$htmlstr .= "	</select></td>";
+		$htmlstr .= "		<td>Erreichbarkeit</td>";
+		$htmlstr .= "		<td><select name='erreichbarkeit_kurzbz'>\n";
+		$htmlstr .= "<option value=''>---ausw&auml;hlen---</option>";
+		foreach ($erreichbarkeit_arr as $erreichbarkeit)
+		{
+			if ($zs->erreichbarkeit_kurzbz == $erreichbarkeit)
+				$sel = " selected";
+			else
+				$sel = "";
+			$htmlstr .= "	<option value='".$erreichbarkeit."' ".$sel.">".$erreichbarkeit."</option>";
+		}
+		$htmlstr .= "	</select></td>";
+		$htmlstr .= "</tr>";
+		$htmlstr .= "<tr>";
+		$htmlstr .= "	<td>Von-Datum</td>";
+		$htmlstr .= "	<td><input type='text' name='vondatum' value='$zs->vondatum' maxlength='11'></td>";
+		$htmlstr .= "	<td>Von-Stunde</td>";
+		$htmlstr .= "	<td><input type='text' name='vonstunde' value='$zs->vonstunde' maxlength='5'></td>";
+		$htmlstr .= "</tr><tr>";
+		$htmlstr .= "	<td>Bis-Datum</td>";
+		$htmlstr .= "	<td><input type='text' name='bisdatum' value='$zs->bisdatum' maxlength='11'></td>";
+		$htmlstr .= "	<td>Bis-Stunde</td>";
+		$htmlstr .= "	<td><input type='text' name='bisstunde' value='$zs->bisstunde' maxlength='5'></td>";
+		$htmlstr .= "</tr>";
+		$htmlstr .= "<tr><td>Freigabedatum</td>";
+		$htmlstr .= "	<td><input type='text' name='freigabeamum' value='$zs->freigabeamum' maxlength='15'></td>";
+		$htmlstr .= "		<td>Freigabe</td>";
+		$htmlstr .= "		<td><select name='freigabevon'>\n";
+		$htmlstr .= "<option value=''>---ausw&auml;hlen---</option>";
+		foreach ($freigabe_arr as $freigabe)
+		{
+			if ($zs->freigabevon == $freigabe)
+				$sel = " selected";
+			else
+				$sel = "";
+			$htmlstr .= "	<option value='".$freigabe."' ".$sel.">".$freigabe."</option>";
+		}
+		$htmlstr .= "	</select></td>";
+		$htmlstr .= "</tr><tr>";		
+		$htmlstr .= "	<td></td>";
+		$htmlstr .= "	<td><input type='submit' value='Speichern' name='schick'></td>";
+
+		$htmlstr .= "	</tr>\n";
+		$htmlstr .= "</table>\n";
+		$htmlstr .= "<br>\n";
+		$htmlstr .= "</form>\n";
+
+	}
+	$htmlstr .= "<div class='inserterror'>".$errorstr."</div>\n";
+?>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<title>Zeitsperren - Details</title>
+<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
+<script src="../../include/js/mailcheck.js"></script>
+<script src="../../include/js/datecheck.js"></script>
+<script type="text/javascript">
+
+</script>
+</head>
+<body style="background-color:#eeeeee;">
+
+<?php
+	echo $htmlstr;
+	echo $reloadstr;
+?>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/vilesci/personen/resturlaub_frameset.html b/vilesci/personen/resturlaub_frameset.html
new file mode 100644
index 000000000..8381d003f
--- /dev/null
+++ b/vilesci/personen/resturlaub_frameset.html
@@ -0,0 +1,21 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN">
+<html lang="de_AT">
+
+<head>
+	<title>VileSci</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+	<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css" />
+</head>
+
+<frameset rows="400,*">
+  	<frame src="resturlaub.php" id="uebersicht" name="uebersicht" frameborder="0" />
+  	<frame src="resturlaub_details.php" id="lv_detail" name="lv_detail" frameborder="0" />
+	<noframes>
+		<body bgcolor="#FFFFFF">
+			This application works only with a frames-enabled browser.<br />
+			<a href="main.php">Use without frames</a>
+		</body>
+	</noframes>
+</frameset>
+
+</html>
\ No newline at end of file