diff --git a/cis/private/profile/zeitwunsch.php b/cis/private/profile/zeitwunsch.php
index 683ac675e..520a66324 100644
--- a/cis/private/profile/zeitwunsch.php
+++ b/cis/private/profile/zeitwunsch.php
@@ -106,6 +106,17 @@ function conf_del()
 {
 	return confirm('Wollen Sie diesen Eintrag wirklich löschen?');
 }
+
+function checkval()
+{
+	if(document.getElementById('vertretung_uid').value=='')
+	{
+		alert('Bitte zuerst eine Vertretung auswählen');
+		return false;
+	}
+	else
+		return true;
+}
 </script>
 </head>
 
@@ -378,10 +389,12 @@ if($result = pg_query($conn, $qry))
 }
 $content_form.= '</SELECT></td></tr>';
 
-$content_form.= "<tr><td>Vertretung</td><td><SELECT name='vertretung_uid'>";
+$content_form.= "<tr><td>Vertretung</td><td><SELECT name='vertretung_uid' id='vertretung_uid'>";
 //dropdown fuer vertretung
 $qry = "SELECT * FROM campus.vw_mitarbeiter WHERE uid not LIKE '\\\_%' ORDER BY nachname, vorname";
 
+$content_form.= "<OPTION value=''>-- Auswahl --</OPTION>\n";
+
 if($result = pg_query($conn, $qry))
 {
 	while($row = pg_fetch_object($result))
@@ -396,9 +409,9 @@ $content_form.= '</SELECT></td></tr>';
 $content_form.= '<tr><td>&nbsp;</td><td>';
 
 if(isset($_GET['type']) && $_GET['type']=='edit')
-	$content_form.= "<input type='submit' name='submit_zeitsperre' value='Speichern'>";
+	$content_form.= "<input type='submit' name='submit_zeitsperre' onclick='return checkval()' value='Speichern'>";
 else
-	$content_form.= "<input type='submit' name='submit_zeitsperre' value='Hinzufügen'>";
+	$content_form.= "<input type='submit' name='submit_zeitsperre' onclick='return checkval()' value='Hinzufügen'>";
 $content_form.= '</td></tr>';
 $content_form.= '</table>';
 
diff --git a/content/bild.php b/content/bild.php
new file mode 100644
index 000000000..7d5a95316
--- /dev/null
+++ b/content/bild.php
@@ -0,0 +1,58 @@
+<?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> and
+ *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
+ */
+// Holt den Hexcode eines Bildes aus der DB wandelt es in Zeichen
+// um und gibt das ein Bild zurueck.
+// Aufruf mit <img src='bild.php?src=frage&frage_id=1
+require_once('../vilesci/config.inc.php');
+
+//Hexcode in String umwandeln
+function hexstr($hex)
+{
+    $string="";
+    for ($i=0;$i<strlen($hex)-1;$i+=2)
+        $string.=chr(hexdec($hex[$i].$hex[$i+1]));
+    return $string;
+}
+
+//Connection Herstellen
+if(!$conn = pg_pconnect(CONN_STRING))
+	die('Fehler beim oeffnen der Datenbankverbindung');
+
+//Hex Dump aus der DB holen
+$qry = '';
+if(isset($_GET['src']) && $_GET['src']=='person' && isset($_GET['person_id']))
+{
+	$qry = "SELECT foto FROM public.tbl_person WHERE person_id='".addslashes($_GET['person_id'])."'";
+}
+else 
+	echo 'Unkown type';
+
+if($qry!='')
+{
+	//Header fuer Bild schicken
+	header("Content-type: image/gif");
+	$result = pg_query($conn, $qry);
+	//HEX Werte in Zeichen umwandeln und ausgeben
+	if($row = pg_fetch_object($result))	
+		echo hexstr($row->foto);
+}
+?>
\ No newline at end of file
diff --git a/content/fasoverlay.js.php b/content/fasoverlay.js.php
index 31bcb1ed1..9751caca9 100644
--- a/content/fasoverlay.js.php
+++ b/content/fasoverlay.js.php
@@ -201,7 +201,7 @@ function onVerbandSelect(event)
 	{
 		url = "<?php echo APP_ROOT; ?>rdf/student.rdf.php?"+"stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"&gruppe="+gruppe+"&"+gettimestamp();
 		var treeStudent=document.getElementById('student-tree');
-
+		
 		//Alte DS entfernen
 		var oldDatasources = treeStudent.database.GetDataSources();
 		while(oldDatasources.hasMoreElements())
@@ -216,6 +216,8 @@ function onVerbandSelect(event)
 		treeStudent.database.AddDataSource(StudentTreeDatasource);
 		StudentTreeDatasource.addXMLSinkObserver(StudentTreeSinkObserver);
 		treeStudent.builder.addListener(StudentTreeListener);
+		StudentDetailReset();
+		StudentDetailDisableFields(true);
 	}
 	catch(e)
 	{
@@ -235,8 +237,9 @@ function onVerbandSelect(event)
 			treeLV.database.RemoveDataSource(oldDatasources.getNext());
 		}
 
-		var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
-		LvTreeDatasource = rdfService.GetDataSource(url);
+		var rdfService1 = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
+
+		LvTreeDatasource = rdfService1.GetDataSource(url);
 		LvTreeDatasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
 		LvTreeDatasource.QueryInterface(Components.interfaces.nsIRDFXMLSink);
 		treeLV.database.AddDataSource(LvTreeDatasource);
diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
index 5f49d6a05..b7b9893cb 100644
--- a/content/student/studentdetailoverlay.xul.php
+++ b/content/student/studentdetailoverlay.xul.php
@@ -49,68 +49,68 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
   					</columns>
   					<rows>
     					<row>
-      						<label value="UID" />
-      						<textbox id="student-detail-textbox-uid" />
+      						<label value="UID" control="student-detail-textbox-uid"/>
+      						<textbox id="student-detail-textbox-uid" disabled="true"/>
     					</row>    					
     					<row>
-      						<label value="Anrede" />
-      						<textbox id="student-detail-textbox-anrede" />
+      						<label value="Anrede" control="student-detail-textbox-anrede"/>
+      						<textbox id="student-detail-textbox-anrede" disabled="true"/>
     					</row>
     					<row>
-      						<label value="TitelPre" />
-      						<textbox id="student-detail-textbox-titelpre" />
+      						<label value="TitelPre" control="student-detail-textbox-titelpre"/>
+      						<textbox id="student-detail-textbox-titelpre" disabled="true"/>
     					</row>
     					<row>
-      						<label value="TitelPost" />
-      						<textbox id="student-detail-textbox-titelpost" />
+      						<label value="TitelPost" control="student-detail-textbox-titelpost"/>
+      						<textbox id="student-detail-textbox-titelpost" disabled="true"/>
     					</row>
     					<row>
-      						<label value="Vorname" />
-      						<textbox id="student-detail-textbox-vorname"  />
+      						<label value="Vorname" control="student-detail-textbox-vorname"/>
+      						<textbox id="student-detail-textbox-vorname" disabled="true"/>
     					</row>
     					<row>
-      						<label value="Vornamen" />
-      						<textbox id="student-detail-textbox-vornamen"  />
+      						<label value="Vornamen" control="student-detail-textbox-vornamen"/>
+      						<textbox id="student-detail-textbox-vornamen" disabled="true" />
     					</row>
     					<row>
-      						<label value="Nachname" />
-      						<textbox id="student-detail-textbox-nachname" />
+      						<label value="Nachname" control="student-detail-textbox-nachname"/>
+      						<textbox id="student-detail-textbox-nachname" disabled="true"/>
     					</row>
     					<row>
-      						<label value="Geburtsdatum" />
-      						<textbox id="student-detail-textbox-geburtsdatum" />
+      						<label value="Geburtsdatum" control="student-detail-textbox-geburtsdatum"/>
+      						<textbox id="student-detail-textbox-geburtsdatum" disabled="true"/>
     					</row>
     					<row>
-      						<label value="Geburtsort" />
-      						<textbox id="student-detail-textbox-geburtsort" />
+      						<label value="Geburtsort" control="student-detail-textbox-geburtsort"/>
+      						<textbox id="student-detail-textbox-geburtsort" disabled="true"/>
     					</row>
     					<row>
-      						<label value="Geburtszeit" />
-      						<textbox id="student-detail-textbox-geburtszeit" />
+      						<label value="Geburtszeit" control="student-detail-textbox-geburtszeit"/>
+      						<textbox id="student-detail-textbox-geburtszeit" disabled="true"/>
     					</row>
     					<row>
       						<label value="Foto" />
-      						<label value="????" />
+      						<hbox><image src='' id="student-detail-image" width='60' height='60'/><spacer flex="1" /></hbox>
     					</row>
     					<row>
-      						<label value="Anmerkung" />
-      						<textbox id="student-detail-textbox-anmerkung"/>
+      						<label value="Anmerkung" control="student-detail-textbox-anmerkung"/>
+      						<textbox id="student-detail-textbox-anmerkung" disabled="true"/>
     					</row>
     					<row>
-      						<label value="Homepage" />
-      						<textbox id="student-detail-textbox-homepage" />
+      						<label value="Homepage" control="student-detail-textbox-homepage"/>
+      						<textbox id="student-detail-textbox-homepage" disabled="true"/>
     					</row>
     					<row>
-      						<label value="SVNR" />
-      						<textbox id="student-detail-textbox-svnr" />
+      						<label value="SVNR" control="student-detail-textbox-svnr"/>
+      						<textbox id="student-detail-textbox-svnr" disabled="true"/>
     					</row>
     					<row>
-      						<label value="Ersatzkennzeichen" />
-      						<textbox id="student-detail-textbox-ersatzkennzeichen" />
+      						<label value="Ersatzkennzeichen" control="student-detail-textbox-ersatzkennzeichen"/>
+      						<textbox id="student-detail-textbox-ersatzkennzeichen" disabled="true"/>
     					</row>
     					<row>
-      						<label value="Familienstand" />
-      						<menulist id="student-detail-menulist-familienstand" disabled="false">
+      						<label value="Familienstand" control="student-detail-menulist-familienstand"/>
+      						<menulist id="student-detail-menulist-familienstand" disabled="true">
 								<menupopup>
 										<menuitem value="g" label="geschieden"/>
 										<menuitem value="l" label="ledig"/>
@@ -120,8 +120,8 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 							</menulist>
     					</row>
     					<row>
-      						<label value="Geschlecht" />
-      						<menulist id="student-detail-menulist-geschlecht" disabled="false">
+      						<label value="Geschlecht" control="student-detail-menulist-geschlecht"/>
+      						<menulist id="student-detail-menulist-geschlecht" disabled="true">
 								<menupopup>
 										<menuitem value="m" label="maennlich"/>
 										<menuitem value="w" label="weiblich"/>
@@ -129,16 +129,16 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 							</menulist>
     					</row>
     					<row>
-      						<label value="Aktiv" />
-      						<checkbox id="student-detail-checkbox-aktiv" checked="true" />
+      						<label value="Aktiv" control="student-detail-checkbox-aktiv"/>
+      						<checkbox id="student-detail-checkbox-aktiv" checked="true" disabled="true"/>
     					</row>
     					<row>
-      						<label value="Anzahl der Kinder" />
-      						<textbox id="student-detail-textbox-anzahlderkinder"/>
+      						<label value="Anzahl der Kinder" control="student-detail-textbox-anzahlderkinder"/>
+      						<textbox id="student-detail-textbox-anzahlderkinder" disabled="true"/>
     					</row>
   						<row>
-							<label value="Staatsbuergerschaft" />
-							<menulist id="student-detail-menulist-staatsbuergerschaft" disabled="false"
+							<label value="Staatsbuergerschaft" control="student-detail-menulist-staatsbuergerschaft"/>
+							<menulist id="student-detail-menulist-staatsbuergerschaft" disabled="true"
 							          datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php" flex="1"
 						              ref="http://www.technikum-wien.at/nation/liste" >
 								<template>
@@ -151,8 +151,8 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 							</menulist>
 						</row>
 						<row>
-							<label value="Geburtsnation" />
-							<menulist id="student-detail-menulist-geburtsnation" disabled="false"
+							<label value="Geburtsnation" control="student-detail-menulist-geburtsnation"/>
+							<menulist id="student-detail-menulist-geburtsnation" disabled="true"
 							          datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php" flex="1"
 						              ref="http://www.technikum-wien.at/nation/liste" >
 								<template>
@@ -165,8 +165,8 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 							</menulist>
 						</row>
 						<row>
-							<label value="Sprache" />
-							<menulist id="student-detail-menulist-sprache" disabled="false"
+							<label value="Sprache" control="student-detail-menulist-sprache" />
+							<menulist id="student-detail-menulist-sprache" disabled="true"
 							          datasources="<?php echo APP_ROOT ?>rdf/sprache.rdf.php" flex="1"
 						              ref="http://www.technikum-wien.at/sprachen/liste" >
 								<template>
@@ -179,8 +179,8 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 							</menulist>
 						</row>
 						<row>
-      						<label value="Matrikelnummer" />
-      						<textbox id="student-detail-textbox-matrikelnummer" />
+      						<label value="Matrikelnummer" control="student-detail-textbox-matrikelnummer"/>
+      						<textbox id="student-detail-textbox-matrikelnummer" disabled="true"/>
     					</row>
 				</rows>
 			</grid>
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index 8b093bfc4..3d68cf5e9 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -193,8 +193,30 @@ function StudentDelete()
 // * Leert alle Eingabe- und Auswahlfelder
 // ****
 function StudentDetailReset()
-{
-	
+{	
+	document.getElementById('student-detail-textbox-uid').value='';
+	document.getElementById('student-detail-textbox-anrede').value='';
+	document.getElementById('student-detail-textbox-titelpre').value='';
+	document.getElementById('student-detail-textbox-titelpost').value='';
+	document.getElementById('student-detail-textbox-vorname').value='';
+	document.getElementById('student-detail-textbox-vornamen').value='';
+	document.getElementById('student-detail-textbox-nachname').value='';
+	document.getElementById('student-detail-textbox-geburtsdatum').value='';
+	document.getElementById('student-detail-textbox-geburtsort').value='';
+	document.getElementById('student-detail-textbox-geburtszeit').value='';
+	document.getElementById('student-detail-textbox-anmerkung').value='';
+	document.getElementById('student-detail-textbox-homepage').value='';
+	document.getElementById('student-detail-textbox-svnr').value='';
+	document.getElementById('student-detail-textbox-ersatzkennzeichen').value='';
+	document.getElementById('student-detail-menulist-familienstand').value='l';
+	document.getElementById('student-detail-menulist-geschlecht').value='m';
+	document.getElementById('student-detail-checkbox-aktiv').checked=true;
+	document.getElementById('student-detail-textbox-anzahlderkinder').value='';
+	document.getElementById('student-detail-menulist-staatsbuergerschaft').value='A';
+	document.getElementById('student-detail-menulist-geburtsnation').value='A';
+	document.getElementById('student-detail-menulist-sprache').value='German';
+	document.getElementById('student-detail-textbox-matrikelnummer').value='';
+	document.getElementById('student-detail-image').src='';
 }
 
 // ****
@@ -202,7 +224,28 @@ function StudentDetailReset()
 // ****
 function StudentDetailDisableFields(val)
 {
-	
+	document.getElementById('student-detail-textbox-uid').disabled=val;
+	document.getElementById('student-detail-textbox-anrede').disabled=val;
+	document.getElementById('student-detail-textbox-titelpre').disabled=val;
+	document.getElementById('student-detail-textbox-titelpost').disabled=val;
+	document.getElementById('student-detail-textbox-vorname').disabled=val;
+	document.getElementById('student-detail-textbox-vornamen').disabled=val;
+	document.getElementById('student-detail-textbox-nachname').disabled=val;
+	document.getElementById('student-detail-textbox-geburtsdatum').disabled=val;
+	document.getElementById('student-detail-textbox-geburtsort').disabled=val;
+	document.getElementById('student-detail-textbox-geburtszeit').disabled=val;
+	document.getElementById('student-detail-textbox-anmerkung').disabled=val;
+	document.getElementById('student-detail-textbox-homepage').disabled=val;
+	document.getElementById('student-detail-textbox-svnr').disabled=val;
+	document.getElementById('student-detail-textbox-ersatzkennzeichen').disabled=val;
+	document.getElementById('student-detail-menulist-familienstand').disabled=val;
+	document.getElementById('student-detail-menulist-geschlecht').disabled=val;
+	document.getElementById('student-detail-checkbox-aktiv').disabled=val;
+	document.getElementById('student-detail-textbox-anzahlderkinder').disabled=val;
+	document.getElementById('student-detail-menulist-staatsbuergerschaft').disabled=val;
+	document.getElementById('student-detail-menulist-geburtsnation').disabled=val;
+	document.getElementById('student-detail-menulist-sprache').disabled=val;
+	document.getElementById('student-detail-textbox-matrikelnummer').disabled=val;
 }
 
 // ****
@@ -211,9 +254,29 @@ function StudentDetailDisableFields(val)
 function StudentDetailSave()
 {
 	//Werte holen
-	//lvnr = document.getElementById('lehrveranstaltung-detail-textbox-lvnr').value;
-	//...
-	
+	uid = document.getElementById('student-detail-textbox-uid').value;
+	anrede = document.getElementById('student-detail-textbox-anrede').value;
+	titelpre = document.getElementById('student-detail-textbox-titelpre').value;
+	titelpost = document.getElementById('student-detail-textbox-titelpost').value;
+	vorname = document.getElementById('student-detail-textbox-vorname').value;
+	vornamen = document.getElementById('student-detail-textbox-vornamen').value;
+	nachname = document.getElementById('student-detail-textbox-nachname').value;
+	geburtsdatum = document.getElementById('student-detail-textbox-geburtsdatum').value;
+	geburtsort = document.getElementById('student-detail-textbox-geburtsort').value;
+	geburtszeit = document.getElementById('student-detail-textbox-geburtszeit').value;
+	anmerkung = document.getElementById('student-detail-textbox-anmerkung').value;
+	homepage = document.getElementById('student-detail-textbox-homepage').value;
+	svnr = document.getElementById('student-detail-textbox-svnr').value;
+	ersatzkennzeichen = document.getElementById('student-detail-textbox-ersatzkennzeichen').value;
+	familienstand = document.getElementById('student-detail-menulist-familienstand').value;
+	geschlecht = document.getElementById('student-detail-menulist-geschlecht').value;
+	aktiv = document.getElementById('student-detail-checkbox-aktiv').checked;
+	anzahlderkinder = document.getElementById('student-detail-textbox-anzahlderkinder').value;
+	staatsbuergerschaft = document.getElementById('student-detail-menulist-staatsbuergerschaft').value;
+	geburtsnation = document.getElementById('student-detail-menulist-geburtsnation').value;
+	sprache = document.getElementById('student-detail-menulist-sprache').value;
+	matrikelnummer = document.getElementById('student-detail-textbox-matrikelnummer').value;
+		
 	var req = new phpRequest('student/studentDBDML.php','','');
 	neu = document.getElementById('student-detail-checkbox-new').checked;
 
@@ -226,8 +289,30 @@ function StudentDetailSave()
 		req.add('do','update');
 	}
 	
-	req.add('type', 'student');
-	//...
+	req.add('type', 'savestudent');
+	
+	req.add('uid', uid);
+	req.add('anrede', anrede);
+	req.add('titelpre', titelpre);
+	req.add('titelpost', titelpost);
+	req.add('vorname', vorname);
+	req.add('vornamen', vornamen);
+	req.add('nachname', nachname);
+	req.add('geburtsdatum', geburtsdatum);
+	req.add('geburtsort', geburtsort);
+	req.add('geburtszeit', geburtszeit);
+	req.add('anmerkung', anmerkung);
+	req.add('homepage', homepage);
+	req.add('svnr', svnr);
+	req.add('ersatzkennzeichen', ersatzkennzeichen);
+	req.add('familienstand', familienstand);
+	req.add('geschlecht', geschlecht);
+	req.add('aktiv', aktiv);
+	req.add('anzahlderkinder', anzahlderkinder);
+	req.add('staatsbuergerschaft', staatsbuergerschaft);
+	req.add('geburtsnation', geburtsnation);
+	req.add('sprache', sprache);
+	req.add('matrikelnummer', matrikelnummer);
 	
 	var response = req.executePOST();
 
@@ -255,48 +340,29 @@ function StudentDetailSave()
 // ****
 function StudentAuswahl()
 {
-/*
+	
 	// Trick 17	(sonst gibt's ein Permission denied)
 	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-	var tree = document.getElementById('lehrveranstaltung-tree');
-
-	//Felder bei Lektorenzuordnung deaktivieren
-	LeMitarbeiterDisableFields(true);
-
-	document.getElementById('lehrveranstaltung-detail-tree-lehreinheitgruppe').hidden=false;
-	document.getElementById('lehrveranstaltung-detail-label-lehreinheitgruppe').hidden=false;
-	document.getElementById('lehrveranstaltung-tab-lektor').collapsed=false;	
+	var tree = document.getElementById('student-tree');
 
 	if (tree.currentIndex==-1) return;
+	
 	try
 	{
-		//Ausgewaehlte Lehreinheit holen
-        var col = tree.columns ? tree.columns["lehrveranstaltung-treecol-lehreinheit_id"] : "lehrveranstaltung-treecol-lehreinheit_id";
-		var lehreinheit_id=tree.view.getCellText(tree.currentIndex,col);
-		if(lehreinheit_id=='')
+		//Ausgewaehlte UID holen
+        var col = tree.columns ? tree.columns["student-treecol-uid"] : "student-treecol-uid";
+		var uid=tree.view.getCellText(tree.currentIndex,col);
+		if(uid!='')
 		{
-			//Lehrveranstaltung wurde markiert
-			//Neu Button aktivieren
-			document.getElementById('lehrveranstaltung-toolbar-neu').disabled=false;
-			document.getElementById('lehrveranstaltung-toolbar-del').disabled=true;
-
-			LeDetailDisableFields(true);
-			//Details zuruecksetzen
-			LeDetailReset();
-			return false;
+			//Student wurde markiert
+			//loeschen button aktivieren
+			document.getElementById('student-toolbar-del').disabled=false;
+			StudentDetailDisableFields(false);
 		}
 		else
 		{
-			LeDetailDisableFields(false);
-			document.getElementById('lehrveranstaltung-toolbar-neu').disabled=true;
-			document.getElementById('lehrveranstaltung-toolbar-del').disabled=false;
-		}
-
-		var col = tree.columns ? tree.columns["lehrveranstaltung-treecol-lehrveranstaltung_id"] : "lehrveranstaltung-treecol-lehrveranstaltung_id";
-		var lehrveranstaltung_id=tree.view.getCellText(tree.currentIndex,col);
-
-		if(lehrveranstaltung_id=='')
 			return false;
+		}	
 	}
 	catch(e)
 	{
@@ -304,141 +370,80 @@ function StudentAuswahl()
 		return false;
 	}
 
-	var req = new phpRequest('../rdf/lehreinheit.rdf.php','','');
-	req.add('lehreinheit_id',lehreinheit_id);
+	var url = '<?php echo APP_ROOT ?>rdf/student.rdf.php?uid='+uid;
+	
+	//hier wird GetDataSourceBlocking verwendet da sich
+	//bei der Methode mit phpRequest der Mozilla aufhaengt
+	//var req = new phpRequest(url,'','');
+	//req.add('uid',uid);
 
-	var response = req.execute();
+	//var response = req.execute();
+	
 	// Datasource holen
-	var dsource=parseRDFString(response, 'http://www.technikum-wien.at/lehreinheit/liste');
+	//var dsource=parseRDFString(response, 'http://www.technikum-wien.at/student/alle');
 
-	dsource=dsource.QueryInterface(Components.interfaces.nsIRDFDataSource);
+	//dsource=dsource.QueryInterface(Components.interfaces.nsIRDFDataSource);
 
 	var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].
                    getService(Components.interfaces.nsIRDFService);
-	var subject = rdfService.GetResource("http://www.technikum-wien.at/lehreinheit/" + lehreinheit_id);
+    
+    var dsource = rdfService.GetDataSourceBlocking(url);
+    
+	var subject = rdfService.GetResource("http://www.technikum-wien.at/student/" + uid);
 
-	var predicateNS = "http://www.technikum-wien.at/lehreinheit/rdf";
+	var predicateNS = "http://www.technikum-wien.at/student/rdf";
 
 	//Daten holen
 
-	unr = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#unr" ));
-	lvnr=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#lvnr" ));
-	sprache=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#sprache" ));
-	lehrveranstaltung=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#lehrveranstaltung_id" ));
-	lehrfach=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#lehrfach_id" ));
-	raumtyp=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#raumtyp" ));
-	raumtyp_alt=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#raumtypalternativ" ));
-	lehre=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#lehre" ));
-	stundenblockung=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#stundenblockung" ));
-	wochenrythmus=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#wochenrythmus" ));
-	start_kw=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#start_kw" ));
+	anrede = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#anrede" ));
+	titelpre=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#titelpre" ));
+	titelpost=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#titelpost" ));
+	vorname=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#vorname" ));
+	vornamen=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#vornamen" ));
+	nachname=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#nachname" ));
+	geburtsdatum=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#geburtsdatum" ));
+	geburtsort=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#gebort" ));
+	geburtszeit=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#gebzeit" ));
 	anmerkung=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#anmerkung" ));
-	studiensemester=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#studiensemester_kurzbz" ));
-	lehrform=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#lehrform_kurzbz" ));
-
-	//Lehrfach drop down setzen
-
-	//ID in globale Variable speichern
-	LeDetailLehrfach_id=lehrfach;
-	
-	lehrfachmenulist = document.getElementById('lehrveranstaltung-detail-menulist-lehrfach');
-	var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
-
-	//Entfernen der alten Datasources
-	var oldDatasources = lehrfachmenulist.database.GetDataSources();
-	while(oldDatasources.hasMoreElements())
-	{
-		lehrfachmenulist.database.RemoveDataSource(oldDatasources.getNext());
-	}
-
-	//Refresh damit die entfernten DS auch wirklich entfernt werden
-	lehrfachmenulist.builder.rebuild();
-
-	//Url zusammenbauen
-	var url = '<?php echo APP_ROOT;?>rdf/lehrfach.rdf.php?lehrveranstaltung_id='+lehrveranstaltung+'&'+gettimestamp();
-
-	//RDF holen
-	var newDs  = rdfService.GetDataSource(url);
-	lehrfachmenulist.database.AddDataSource(newDs);
-	
-	//SinkObserver hinzufuegen
-	var sink = newDs.QueryInterface(Components.interfaces.nsIRDFXMLSink);
-	sink.addXMLSinkObserver(LeDetailLehrfachSinkObserver);
+	homepage=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#homepage" ));
+	svnr=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#svnr" ));
+	ersatzkennzeichen=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#ersatzkennzeichen" ));
+	familienstand=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#familienstand" ));
+	geschlecht=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#geschlecht" ));
+	aktiv=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#aktiv" ));	
+	anzahlderkinder=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#anzahlderkinder" ));
+	staatsbuergerschaft=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#staatsbuergerschaft" ));
+	geburtsnation=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#geburtsnation" ));
+	sprache=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#sprache" ));
+	matrikelnummer=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#matrikelnummer" ));
+	person_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#person_id" ));
 	
 	//Daten den Feldern zuweisen
 
-	document.getElementById('lehrveranstaltung-detail-textbox-unr').value=unr;
-	document.getElementById('lehrveranstaltung-detail-textbox-lvnr').value=lvnr;
-	document.getElementById('lehrveranstaltung-detail-textbox-lehrveranstaltung').value=lehrveranstaltung;
-	if(lehre=='Ja')
-		document.getElementById('lehrveranstaltung-detail-checkbox-lehre').checked=true;
+	document.getElementById('student-detail-textbox-uid').value=uid;
+	document.getElementById('student-detail-textbox-anrede').value=anrede;
+	document.getElementById('student-detail-textbox-titelpre').value=titelpre;
+	document.getElementById('student-detail-textbox-titelpost').value=titelpost;
+	document.getElementById('student-detail-textbox-vorname').value=vorname;
+	document.getElementById('student-detail-textbox-vornamen').value=vornamen;
+	document.getElementById('student-detail-textbox-nachname').value=nachname;
+	document.getElementById('student-detail-textbox-geburtsdatum').value=geburtsdatum;
+	document.getElementById('student-detail-textbox-geburtsort').value=geburtsort;
+	document.getElementById('student-detail-textbox-geburtszeit').value=geburtszeit;
+	document.getElementById('student-detail-textbox-anmerkung').value=anmerkung;
+	document.getElementById('student-detail-textbox-homepage').value=homepage;
+	document.getElementById('student-detail-textbox-svnr').value=svnr;
+	document.getElementById('student-detail-textbox-ersatzkennzeichen').value=ersatzkennzeichen;
+	document.getElementById('student-detail-menulist-familienstand').value=familienstand;
+	document.getElementById('student-detail-menulist-geschlecht').value=geschlecht;
+	if(aktiv=='Ja')
+		document.getElementById('student-detail-checkbox-aktiv').checked=true;
 	else
-		document.getElementById('lehrveranstaltung-detail-checkbox-lehre').checked=false;
-	document.getElementById('lehrveranstaltung-detail-textbox-stundenblockung').value=stundenblockung;
-	document.getElementById('lehrveranstaltung-detail-textbox-wochenrythmus').value=wochenrythmus;
-	document.getElementById('lehrveranstaltung-detail-textbox-startkw').value=start_kw;
-	document.getElementById('lehrveranstaltung-detail-textbox-anmerkung').value=anmerkung;
-	document.getElementById('lehrveranstaltung-detail-menulist-sprache').value=sprache;
-	document.getElementById('lehrveranstaltung-detail-menulist-lehrfach').value=lehrfach;
-	document.getElementById('lehrveranstaltung-detail-menulist-raumtyp').value=raumtyp;
-	document.getElementById('lehrveranstaltung-detail-menulist-raumtypalternativ').value=raumtyp_alt;
-	document.getElementById('lehrveranstaltung-detail-menulist-studiensemester').value=studiensemester;
-	document.getElementById('lehrveranstaltung-detail-menulist-lehrform').value=lehrform;
-	document.getElementById('lehrveranstaltung-detail-checkbox-new').checked=false;
-	document.getElementById('lehrveranstaltung-detail-textbox-lehreinheit_id').value=lehreinheit_id;
-
-	//Lehreinheitmitarbeiter tree setzen
-	url='<?php echo APP_ROOT;?>rdf/lehreinheitmitarbeiter.rdf.php?lehreinheit_id='+lehreinheit_id+"&"+gettimestamp();
-	try
-	{
-		lektortree = document.getElementById('lehrveranstaltung-detail-tree-lehreinheitmitarbeiter');
-
-		//Alte DS entfernen
-		var oldDatasources = lektortree.database.GetDataSources();
-		while(oldDatasources.hasMoreElements())
-		{
-			lektortree.database.RemoveDataSource(oldDatasources.getNext());
-		}
-		//Refresh damit die entfernten DS auch wirklich entfernt werden
-		lektortree.builder.rebuild();
-		
-		var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
-		LeDetailLektorDatasource = rdfService.GetDataSource(url);
-		LeDetailLektorDatasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
-		LeDetailLektorDatasource.QueryInterface(Components.interfaces.nsIRDFXMLSink);
-		lektortree.database.AddDataSource(LeDetailLektorDatasource);
-		lektortree.builder.addListener(LvLektorTreeListener);
-	}
-	catch(e)
-	{
-		debug(e);
-	}
-
-	//Lehreinheitgruppe tree setzen
-	url='<?php echo APP_ROOT; ?>rdf/lehreinheitgruppe.rdf.php?lehreinheit_id='+lehreinheit_id+"&"+gettimestamp();
-
-	try
-	{
-		gruppentree = document.getElementById('lehrveranstaltung-detail-tree-lehreinheitgruppe');
-
-		//Alte DS entfernen
-		var oldDatasources = gruppentree.database.GetDataSources();
-		while(oldDatasources.hasMoreElements())
-		{
-			gruppentree.database.RemoveDataSource(oldDatasources.getNext());
-		}
-		//Refresh damit die entfernten DS auch wirklich entfernt werden
-		gruppentree.builder.rebuild();
-
-		var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
-		LeDetailGruppeDatasource = rdfService.GetDataSource(url);
-		LeDetailGruppeDatasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
-		LeDetailGruppeDatasource.QueryInterface(Components.interfaces.nsIRDFXMLSink);
-		gruppentree.database.AddDataSource(LeDetailGruppeDatasource);
-	}
-	catch(e)
-	{
-		debug(e);
-	}
-*/
+		document.getElementById('student-detail-checkbox-aktiv').checked=false;
+	document.getElementById('student-detail-textbox-anzahlderkinder').value=anzahlderkinder;
+	document.getElementById('student-detail-menulist-staatsbuergerschaft').value=staatsbuergerschaft;
+	document.getElementById('student-detail-menulist-geburtsnation').value=geburtsnation;
+	document.getElementById('student-detail-menulist-sprache').value=sprache;
+	document.getElementById('student-detail-textbox-matrikelnummer').value=matrikelnummer;
+	document.getElementById('student-detail-image').src='<?php echo APP_ROOT?>content/bild.php?src=person&person_id='+person_id;
 }
\ No newline at end of file
diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php
index 4c6388ba1..13d789a9a 100644
--- a/rdf/student.rdf.php
+++ b/rdf/student.rdf.php
@@ -8,7 +8,7 @@ header("Pragma: no-cache");
 // content type setzen
 header("Content-type: application/vnd.mozilla.xul+xml");
 // xml
-echo '<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>';
+echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 // DAO
 require_once('../vilesci/config.inc.php');
 require_once('../include/person.class.php');
@@ -43,7 +43,7 @@ if(isset($_GET['uid']))
 	$uid=$_GET['uid'];
 
 // Studenten holen
-$student=new student($conn);
+$student=new student($conn,null,true);
 if (isset($uid))
 	$student->load($uid);
 else
@@ -75,6 +75,7 @@ function drawStudent($student)
 	  <RDF:li>
       	<RDF:Description  id="<?php echo $student->uid; ?>"  about="<?php echo $rdf_url.'/'.$student->uid; ?>" >
         	<STUDENT:uid><![CDATA[<?php echo $student->uid;  ?>]]></STUDENT:uid>
+        	<STUDENT:person_id><![CDATA[<?php echo $student->person_id; ?>]]></STUDENT:person_id>
     		<STUDENT:titelpre><![CDATA[<?php echo $student->titelpre; ?>]]></STUDENT:titelpre>
     		<STUDENT:titelpost><![CDATA[<?php echo $student->titelpost; ?>]]></STUDENT:titelpost>
     		<STUDENT:vornamen><![CDATA[<?php echo $student->vornamen  ?>]]></STUDENT:vornamen>
@@ -96,6 +97,16 @@ function drawStudent($student)
     		<STUDENT:verband><![CDATA[<?php echo $student->verband;  ?>]]></STUDENT:verband>
     		<STUDENT:gruppe><![CDATA[<?php echo $student->gruppe;  ?>]]></STUDENT:gruppe>
     		<STUDENT:studiengang_kz><![CDATA[<?php echo $student->studiengang_kz; ?>]]></STUDENT:studiengang_kz>
+    		
+    		<STUDENT:anrede><![CDATA[<?php echo $student->anrede; ?>]]></STUDENT:anrede>
+    		<STUDENT:svnr><![CDATA[<?php echo $student->svnr; ?>]]></STUDENT:svnr>
+    		<STUDENT:ersatzkennzeichen><![CDATA[<?php echo $student->ersatzkennzeichen; ?>]]></STUDENT:ersatzkennzeichen>
+    		<STUDENT:familienstand><![CDATA[<?php echo $student->familienstand; ?>]]></STUDENT:familienstand>
+    		<STUDENT:geschlecht><![CDATA[<?php echo $student->geschlecht; ?>]]></STUDENT:geschlecht>
+    		<STUDENT:anzahlkinder><![CDATA[<?php echo $student->anzahlkinder; ?>]]></STUDENT:anzahlkinder>
+    		<STUDENT:staatsbuergerschaft><![CDATA[<?php echo $student->staatsbuergerschaft; ?>]]></STUDENT:staatsbuergerschaft>
+    		<STUDENT:geburtsnation><![CDATA[<?php echo $student->geburtsnation; ?>]]></STUDENT:geburtsnation>
+    		<STUDENT:sprache><![CDATA[<?php echo $student->sprache; ?>]]></STUDENT:sprache>
       	</RDF:Description>
       </RDF:li>
 <?php