diff --git a/content/fasoverlay.js.php b/content/fasoverlay.js.php
index 2b644ccbb..31bcb1ed1 100644
--- a/content/fasoverlay.js.php
+++ b/content/fasoverlay.js.php
@@ -6,6 +6,7 @@ var currentAuswahl=new auswahlValues();
 var LvTreeDatasource;
 var LektorTreeDatasource;
 var LektorTreeOpenStudiengang;
+var StudentTreeDatasource;
 
 // ****
 // * initialisiert den Lektor Tree
@@ -154,6 +155,8 @@ function auswahlValues()
 
 function onVerbandSelect(event)
 {
+	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+	
 	var contentFrame=document.getElementById('iframeTimeTableWeek');
 	var tree=document.getElementById('tree-verband');
 	//Wenn nichts markiert wurde -> beenden
@@ -186,58 +189,40 @@ function onVerbandSelect(event)
 	var grp=tree.view.getCellText(tree.currentIndex,col);
 	col = tree.columns ? tree.columns["gruppe"] : "gruppe";
 	var gruppe=tree.view.getCellText(tree.currentIndex,col);
-	//var daten=window.TimeTableWeek.document.getElementById('TimeTableWeekData');
-	//var datum=parseInt(daten.getAttribute("datum"));
-	//var attributes="&stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"&gruppe="+gruppe;
-	//var url = "<?php echo APP_ROOT; ?>content/lvplanung/timetable-week.xul.php";
-	//if (gruppe!=null && gruppe!=0 &gruppe!='')
-	//	var type="?type=gruppe";
-	//else
-	//	var type="?type=verband";
-	//url+=type+attributes+"&datum="+datum;
-	//if (url)
-	//{
-	//	//alert(url);
-	//	contentFrame.setAttribute('src', url);
-	//}
-
+	
 	currentAuswahl.stg_kz=stg_kz;
 	currentAuswahl.sem=sem;
 	currentAuswahl.ver=ver;
 	currentAuswahl.grp=grp;
 	currentAuswahl.gruppe=gruppe;
 
-	// Semesterplan
-	//var semesterplan=document.getElementById('tabpanels-main');
-	//var panelIndex=semesterplan.getAttribute("selectedIndex");
-	//if (panelIndex==1)
-	//{
-	//	alert (url);
-	//	var contentFrame=document.getElementById('iframeTimeTableSemester');
-	//	var url = "<?php echo APP_ROOT; ?>content/lvplanung/timetable-week.xul.php";
-	//	if (gruppe!=null && gruppe!=0 &gruppe!='')
-	//		var type="?type=gruppe";
-	//	else
-	//		var type="?type=verband";
-	//	url+=type+attributes+"&semesterplan=true";
-	//	if (url)
-	//		contentFrame.setAttribute('src', url);
-	//}
-
-
-	// LVAs
-	//var vboxLehrveranstalungPlanung=document.getElementById('vboxLehrveranstalungPlanung');
-	//var attribute='../rdf/lehreinheit-lvplan.rdf.php'+type+"&stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"&gruppe="+gruppe;
-	//vboxLehrveranstalungPlanung.setAttribute('datasources',attribute);
-
 	// Studenten
-	var treeStudenten=document.getElementById('treeStudenten');
-	attribute="<?php echo APP_ROOT; ?>rdf/student.rdf.php?"+"stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"&gruppe="+gruppe;
-	treeStudenten.setAttribute('datasources',attribute);
+	try
+	{
+		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())
+		{
+			treeStudent.database.RemoveDataSource(oldDatasources.getNext());
+		}
+
+		var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
+		StudentTreeDatasource = rdfService.GetDataSource(url);
+		StudentTreeDatasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
+		StudentTreeDatasource.QueryInterface(Components.interfaces.nsIRDFXMLSink);
+		treeStudent.database.AddDataSource(StudentTreeDatasource);
+		StudentTreeDatasource.addXMLSinkObserver(StudentTreeSinkObserver);
+		treeStudent.builder.addListener(StudentTreeListener);
+	}
+	catch(e)
+	{
+		debug(e);
+	}
 
 	// Lehrveranstaltung
-	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 	try
 	{
 		url = '<?php echo APP_ROOT; ?>rdf/lehrveranstaltung_einheiten.rdf.php?stg_kz='+stg_kz+'&sem='+sem+'&ver='+ver+'&grp='+grp+'&gruppe='+gruppe+'&'+gettimestamp();
diff --git a/content/fasoverlay.xul.php b/content/fasoverlay.xul.php
index 3c9266509..540639247 100644
--- a/content/fasoverlay.xul.php
+++ b/content/fasoverlay.xul.php
@@ -4,7 +4,7 @@ echo '<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>';
 
 include('../vilesci/config.inc.php');
 
-echo '<?xul-overlay href="'.APP_ROOT.'content/studentenoverlay.xul.php"?>';
+echo '<?xul-overlay href="'.APP_ROOT.'content/student/studentenoverlay.xul.php"?>';
 echo '<?xul-overlay href="'.APP_ROOT.'content/lvplanung/lehrveranstaltungoverlay.xul.php"?>';
 /*echo '<?xul-overlay href="'.APP_ROOT.'content/lvplanung/stpl-week-overlay.xul.php"?>';
 echo '<?xul-overlay href="'.APP_ROOT.'content/lvplanung/stpl-semester-overlay.xul.php"?>';
diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
new file mode 100644
index 000000000..5f49d6a05
--- /dev/null
+++ b/content/student/studentdetailoverlay.xul.php
@@ -0,0 +1,189 @@
+<?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>.
+ */
+
+header("Cache-Control: no-cache");
+header("Cache-Control: post-check=0, pre-check=0",false);
+header("Expires Mon, 26 Jul 1997 05:00:00 GMT");
+header("Pragma: no-cache");
+header("Content-type: application/vnd.mozilla.xul+xml");
+require_once('../../vilesci/config.inc.php');
+echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
+
+?>
+
+<overlay id="StudentDetailOverlay"
+	xmlns:html="http://www.w3.org/1999/xhtml"
+	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+	>
+<vbox id="student-detail" style="margin:0px;">
+		<hbox style="background:#eeeeee;margin:0px;padding:2px">
+			<label value="Details" style="font-size:12pt;font-weight:bold;margin-top:5px;"  flex="1" />
+			<spacer flex="1" />
+			<button id="student-detail-button-save" label="Speichern" oncommand="StudentDetailSave();" disabled="true"/>
+		</hbox>
+		<hbox flex="1">
+			<grid id="student-detail-grid" style="overflow:auto;margin:4px;" flex="1">
+				  	<columns  >
+    					<column flex="1"/>
+    					<column flex="5"/>
+    					<column flex="3"/>
+  					</columns>
+  					<rows>
+    					<row>
+      						<label value="UID" />
+      						<textbox id="student-detail-textbox-uid" />
+    					</row>    					
+    					<row>
+      						<label value="Anrede" />
+      						<textbox id="student-detail-textbox-anrede" />
+    					</row>
+    					<row>
+      						<label value="TitelPre" />
+      						<textbox id="student-detail-textbox-titelpre" />
+    					</row>
+    					<row>
+      						<label value="TitelPost" />
+      						<textbox id="student-detail-textbox-titelpost" />
+    					</row>
+    					<row>
+      						<label value="Vorname" />
+      						<textbox id="student-detail-textbox-vorname"  />
+    					</row>
+    					<row>
+      						<label value="Vornamen" />
+      						<textbox id="student-detail-textbox-vornamen"  />
+    					</row>
+    					<row>
+      						<label value="Nachname" />
+      						<textbox id="student-detail-textbox-nachname" />
+    					</row>
+    					<row>
+      						<label value="Geburtsdatum" />
+      						<textbox id="student-detail-textbox-geburtsdatum" />
+    					</row>
+    					<row>
+      						<label value="Geburtsort" />
+      						<textbox id="student-detail-textbox-geburtsort" />
+    					</row>
+    					<row>
+      						<label value="Geburtszeit" />
+      						<textbox id="student-detail-textbox-geburtszeit" />
+    					</row>
+    					<row>
+      						<label value="Foto" />
+      						<label value="????" />
+    					</row>
+    					<row>
+      						<label value="Anmerkung" />
+      						<textbox id="student-detail-textbox-anmerkung"/>
+    					</row>
+    					<row>
+      						<label value="Homepage" />
+      						<textbox id="student-detail-textbox-homepage" />
+    					</row>
+    					<row>
+      						<label value="SVNR" />
+      						<textbox id="student-detail-textbox-svnr" />
+    					</row>
+    					<row>
+      						<label value="Ersatzkennzeichen" />
+      						<textbox id="student-detail-textbox-ersatzkennzeichen" />
+    					</row>
+    					<row>
+      						<label value="Familienstand" />
+      						<menulist id="student-detail-menulist-familienstand" disabled="false">
+								<menupopup>
+										<menuitem value="g" label="geschieden"/>
+										<menuitem value="l" label="ledig"/>
+										<menuitem value="v" label="verheiratet"/>
+										<menuitem value="w" label="verwittwet"/>
+								</menupopup>								
+							</menulist>
+    					</row>
+    					<row>
+      						<label value="Geschlecht" />
+      						<menulist id="student-detail-menulist-geschlecht" disabled="false">
+								<menupopup>
+										<menuitem value="m" label="maennlich"/>
+										<menuitem value="w" label="weiblich"/>
+								</menupopup>								
+							</menulist>
+    					</row>
+    					<row>
+      						<label value="Aktiv" />
+      						<checkbox id="student-detail-checkbox-aktiv" checked="true" />
+    					</row>
+    					<row>
+      						<label value="Anzahl der Kinder" />
+      						<textbox id="student-detail-textbox-anzahlderkinder"/>
+    					</row>
+  						<row>
+							<label value="Staatsbuergerschaft" />
+							<menulist id="student-detail-menulist-staatsbuergerschaft" disabled="false"
+							          datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php" flex="1"
+						              ref="http://www.technikum-wien.at/nation/liste" >
+								<template>
+									<menupopup>
+										<menuitem value="rdf:http://www.technikum-wien.at/nation/rdf#nation_code"
+							        		      label="rdf:http://www.technikum-wien.at/nation/rdf#kurztext"
+										  		  uri="rdf:*"/>
+										</menupopup>
+								</template>
+							</menulist>
+						</row>
+						<row>
+							<label value="Geburtsnation" />
+							<menulist id="student-detail-menulist-geburtsnation" disabled="false"
+							          datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php" flex="1"
+						              ref="http://www.technikum-wien.at/nation/liste" >
+								<template>
+									<menupopup>
+										<menuitem value="rdf:http://www.technikum-wien.at/nation/rdf#nation_code"
+							        		      label="rdf:http://www.technikum-wien.at/nation/rdf#kurztext"
+										  		  uri="rdf:*"/>
+										</menupopup>
+								</template>
+							</menulist>
+						</row>
+						<row>
+							<label value="Sprache" />
+							<menulist id="student-detail-menulist-sprache" disabled="false"
+							          datasources="<?php echo APP_ROOT ?>rdf/sprache.rdf.php" flex="1"
+						              ref="http://www.technikum-wien.at/sprachen/liste" >
+								<template>
+									<menupopup>
+										<menuitem value="rdf:http://www.technikum-wien.at/sprachen/rdf#bezeichnung"
+							        		      label="rdf:http://www.technikum-wien.at/sprachen/rdf#bezeichnung"
+										  		  uri="rdf:*"/>
+										</menupopup>
+								</template>
+							</menulist>
+						</row>
+						<row>
+      						<label value="Matrikelnummer" />
+      						<textbox id="student-detail-textbox-matrikelnummer" />
+    					</row>
+				</rows>
+			</grid>
+		</hbox>
+</vbox>
+</overlay>
\ No newline at end of file
diff --git a/content/student/studentenoverlay.xul.php b/content/student/studentenoverlay.xul.php
new file mode 100644
index 000000000..cbe453d64
--- /dev/null
+++ b/content/student/studentenoverlay.xul.php
@@ -0,0 +1,172 @@
+<?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>.
+ */
+
+header("Cache-Control: no-cache");
+header("Cache-Control: post-check=0, pre-check=0",false);
+header("Expires Mon, 26 Jul 1997 05:00:00 GMT");
+header("Pragma: no-cache");
+header("Content-type: application/vnd.mozilla.xul+xml");
+
+require_once('../../vilesci/config.inc.php');
+echo '<?xml version="1.0" encoding="ISO-8859-15" standalone="yes" ?>';
+
+echo '<?xul-overlay href="'.APP_ROOT.'content/student/studentdetailoverlay.xul.php"?>';
+?>
+<!DOCTYPE overlay >
+
+<overlay id="StudentenOverlay"
+	xmlns:html="http://www.w3.org/1999/xhtml"
+	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+	>
+
+<script type="application/x-javascript" src="<?php echo APP_ROOT; ?>content/student/studentoverlay.js.php" />
+
+			<!-- *************** -->
+			<!-- *  Studenten  * -->
+			<!-- *************** -->
+			<vbox id="studentenEditor">
+				<hbox>
+					<toolbox flex="1">
+						<toolbar id="nav-toolbar">
+						<toolbarbutton id="student-toolbar-neu" label="Neue Lehreinheit" oncommand="StudentNeu();" disabled="true" image="../skin/images/NeuDokument.png" tooltiptext="Student neu anlegen" />
+						<toolbarbutton id="student-toolbar-del" label="Löschen" oncommand="StudentDelete();" disabled="true" image="../skin/images/DeleteIcon.png" tooltiptext="Student löschen"/>
+						<toolbarbutton id="student-toolbar-refresh" label="Neu laden" oncommand="StudentTreeRefresh()" disabled="false" image="../skin/images/refresh.png" tooltiptext="Liste neu laden"/>
+						<spacer flex="1"/>
+						<label id="student-toolbar-label-anzahl"/>
+						</toolbar>
+					</toolbox>
+				</hbox>
+
+				<!-- ************* -->
+				<!-- *  Auswahl  * -->
+				<!-- ************* -->
+				<tree id="student-tree" seltype="single" hidecolumnpicker="false" flex="1"
+						datasources="rdf:null" ref="http://www.technikum-wien.at/student/alle"
+						onselect="StudentAuswahl();"
+						flags="dont-build-content"
+						enableColumnDrag="true"
+						style="margin:0px;"
+						persist="hidden"
+				>
+					<treecols>
+	    				<treecol id="student-treecol-uid" label="UID" flex="1" primary="false"
+	    					class="sortDirectionIndicator"
+	    					sortActive="true"
+	    					sortDirection="ascending"
+	    					sort="rdf:http://www.technikum-wien.at/student/rdf#uid"  />
+	    				<splitter class="tree-splitter"/>
+	    				<treecol id="student-treecol-titelpre" label="TitelPre" flex="1" hidden="false"
+	    					class="sortDirectionIndicator"
+	    					sort="rdf:http://www.technikum-wien.at/student/rdf#titelpre"/>
+	    				<splitter class="tree-splitter"/>
+	    				<treecol id="student-treecol-vorname" label="Vorname" flex="1" hidden="false"
+	    					class="sortDirectionIndicator"
+	    					sort="rdf:http://www.technikum-wien.at/student/rdf#vorname" />
+	    				<splitter class="tree-splitter"/>
+	    				<treecol id="student-treecol-vornamen" label="Vornamen" flex="1" hidden="true"
+	    					class="sortDirectionIndicator"
+	    					sort="rdf:http://www.technikum-wien.at/student/rdf#vornamen" />
+	    				<splitter class="tree-splitter"/>
+	    				<treecol id="student-treecol-nachname" label="Nachname" flex="1" hidden="false"
+	    					class="sortDirectionIndicator"
+	    					sort="rdf:http://www.technikum-wien.at/student/rdf#nachname" />
+	    				<splitter class="tree-splitter"/>
+	    				<treecol id="student-treecol-titelpost" label="TitelPost" flex="1" hidden="false"
+	    					class="sortDirectionIndicator"
+	    					sort="rdf:http://www.technikum-wien.at/student/rdf#titelpost"/>
+	    				<splitter class="tree-splitter"/>
+	    				<treecol id="student-treecol-geburtsdatum" label="Geburtsdatum" flex="1" hidden="false"
+	    					class="sortDirectionIndicator"
+	    					sort="rdf:http://www.technikum-wien.at/student/rdf#geburtsdatum" />
+	    				<splitter class="tree-splitter"/>
+	    				<treecol id="student-treecol-semester" label="Sem." flex="1" hidden="false"
+	    					class="sortDirectionIndicator"
+	    					sort="rdf:http://www.technikum-wien.at/student/rdf#semester" />
+	    				<splitter class="tree-splitter"/>
+	    				<treecol id="student-treecol-verband" label="Verb." flex="1" hidden="false"
+	    					class="sortDirectionIndicator"
+	    					sort="rdf:http://www.technikum-wien.at/student/rdf#verband" />
+	    				<splitter class="tree-splitter"/>
+	    				<treecol id="student-treecol-gruppe" label="Grp." flex="1" hidden="false"
+	    					class="sortDirectionIndicator"
+	    					sort="rdf:http://www.technikum-wien.at/student/rdf#gruppe" />
+	    				<splitter class="tree-splitter"/>
+	    				<treecol id="student-treecol-studiengang_kz" label="StudiengangKz" flex="1" hidden="true"
+	    					class="sortDirectionIndicator"
+	    					sort="rdf:http://www.technikum-wien.at/student/rdf#studiengang_kz" />
+	    				<splitter class="tree-splitter"/>
+						<treecol id="student-treecol-matrikelnummer" label="Matrikelnummer" flex="1" hidden="false"
+	    					class="sortDirectionIndicator"
+	    					sort="rdf:http://www.technikum-wien.at/student/rdf#matrikelnummer" />
+	    				<treecol id="student-treecol-prestudent_id" label="PreStudentID" flex="1" hidden="true"
+	    					class="sortDirectionIndicator"
+	    					sort="rdf:http://www.technikum-wien.at/student/rdf#prestudent_id" />
+	    				<treecol id="student-treecol-person_id" label="PersonID" flex="1" hidden="true"
+	    					class="sortDirectionIndicator"
+	    					sort="rdf:http://www.technikum-wien.at/student/rdf#person_id" />
+					</treecols>
+
+					<template>
+						<rule>
+	      					<treechildren>
+	       						<treeitem uri="rdf:*">
+	         						<treerow>
+	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#uid"   />
+	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#titelpre" />
+	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#vorname" />
+	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#vornamen" />
+	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#nachname" />
+	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#titelpost" />
+	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#geburtsdatum" />
+	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#semester" />
+	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#verband" />
+	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#gruppe" />
+	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#studiengang_kz" />
+	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#matrikelnummer" />
+	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#prestudent_id" />
+	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#person_id" />
+	         						</treerow>
+	       						</treeitem>
+	      					</treechildren>
+	      				</rule>
+  					</template>
+				</tree>
+
+				<splitter collapse="after" persist="state">
+					<grippy />
+				</splitter>
+
+				<!-- ************ -->
+				<!-- *  Detail  * -->
+				<!-- ************ -->
+				<vbox flex="1"  style="overflow:auto;margin:0px;">
+					<tabbox id="student-tabbox" flex="3" orient="vertical">
+						<tabs orient="horizontal" id="lehrveranstaltung-tabs">
+							<tab id="student-tab-detail" label="Details" />
+						</tabs>
+						<tabpanels id="student-tabpanels-main" flex="1">
+							<vbox id="student-detail"  style="margin-top:10px;" />
+						</tabpanels>
+					</tabbox>				
+				</vbox>
+			</vbox>
+</overlay>
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
new file mode 100644
index 000000000..8b093bfc4
--- /dev/null
+++ b/content/student/studentoverlay.js.php
@@ -0,0 +1,444 @@
+<?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>.
+ */
+
+require_once('../../vilesci/config.inc.php');
+require_once('../../include/functions.inc.php');
+
+$conn = pg_pconnect(CONN_STRING);
+
+$user = get_uid();
+loadVariables($conn, $user);
+?>
+// *********** Globale Variablen *****************//
+var StudentSelectUid=null; //Student der nach dem Refresh markiert werden soll
+
+// ********** Observer und Listener ************* //
+
+// ****
+// * Observer fuer Studenten Tree
+// * startet Rebuild nachdem das Refresh
+// * der datasource fertig ist
+// ****
+var StudentTreeSinkObserver =
+{
+	onBeginLoad : function(pSink) {},
+	onInterrupt : function(pSink) {},
+	onResume : function(pSink) {},
+	onError : function(pSink, pStatus, pError) {},
+	onEndLoad : function(pSink)
+	{
+		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+		document.getElementById('student-tree').builder.rebuild();
+	}
+};
+
+// ****
+// * Nach dem Rebuild wird der Student wieder
+// * markiert
+// ****
+var StudentTreeListener =
+{
+  willRebuild : function(builder) {  },
+  didRebuild : function(builder)
+  {
+  	  //timeout nur bei Mozilla notwendig da sonst die rows
+  	  //noch keine values haben. Ab Seamonkey funktionierts auch
+  	  //ohne dem setTimeout
+      window.setTimeout(StudentTreeSelectStudent,10);
+  }
+};
+
+// ***************** KEY Events ************************* //
+
+// ****
+// * Wird ausgefuehrt wenn eine Taste gedrueckt wird und der Focus
+// * im Lehrveranstaltungs-tree ist
+// * Beim Druecken von ENTF wird der markierte Student geloescht
+// * Beim Druecken von F5 wird der Studententree aktualisiert
+// ****
+function StudentTreeKeyPress(event)
+{
+	if(event.keyCode==46) // Entf
+		StudentDelete();
+	else if(event.keyCode==116) // F5
+		StudentTreeRefresh();
+}
+
+// ****************** FUNKTIONEN ************************** //
+
+// ****
+// * Asynchroner (Nicht blockierender) Refresh des StudentenTrees
+// ****
+function StudentTreeRefresh()
+{
+	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+
+	//markierten Studenten global speichern damit dieser Student nach dem
+	//refresh wieder markiert werden kann.
+	var tree = document.getElementById('student-tree');
+	var col = tree.columns ? tree.columns["student-treecol-uid"] : "student-treecol-uid";
+	try
+	{
+		StudentSelectUid=tree.view.getCellText(tree.currentIndex,col);
+		StudentTreeDatasource.Refresh(false); //non blocking
+	}
+	catch(e)
+	{}
+}
+
+// ****
+// * neuen Studenten anlegen
+// ****
+function StudentNeu()
+{
+	
+}
+
+// ****
+// * Selectiert den Studenten nachdem der Tree
+// * rebuildet wurde.
+// ****
+function StudentTreeSelectStudent()
+{
+	var tree=document.getElementById('student-tree');
+	var items = tree.view.rowCount; //Anzahl der Zeilen ermitteln
+
+	//In der globalen Variable ist der zu selektierende Student gespeichert
+	if(StudentSelectUid!=null)
+	{		
+	   	for(var i=0;i<items;i++)
+	   	{
+	   		//Uid der row holen
+			col = tree.columns ? tree.columns["student-treecol-uid"] : "student-treecol-uid";
+			uid=tree.view.getCellText(i,col);
+						
+			if(uid == StudentSelectUid)
+			{
+				//Zeile markieren
+				tree.view.selection.select(i);
+				//Sicherstellen, dass die Zeile im sichtbaren Bereich liegt
+				tree.treeBoxObject.ensureRowIsVisible(i);
+				return true;
+			}
+	   	}
+	}
+	document.getElementById('student-toolbar-label-anzahl').value='Anzahl: '+items;
+}
+
+// ****
+// * Student loeschen
+// ****
+function StudentDelete()
+{
+	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+	var tree = document.getElementById('student-tree');
+
+	if (tree.currentIndex==-1)
+		return;
+
+	try
+	{
+		//Ausgewaehlte Lehreinheit holen
+        var col = tree.columns ? tree.columns["student-treecol-uid"] : "student-treecol-uid";
+		var uid=tree.view.getCellText(tree.currentIndex,col);
+		if(uid=='')
+			return false
+	}
+	catch(e)
+	{
+		alert(e);
+		return false;
+	}
+
+	//Abfrage ob wirklich geloescht werden soll
+	if (confirm('Wollen Sie diesen Studenten wirklich löschen?'))
+	{
+		//Script zum loeschen der Lehreinheit aufrufen
+		var req = new phpRequest('student/studentDBDML.php','','');
+
+		req.add('type','student');
+		req.add('do','delete');
+		req.add('uid',uid);
+		var response = req.executePOST();
+
+		var val =  new ParseReturnValue(response)
+		if(!val.dbdml_return)
+			alert(val.dbdml_errormsg)
+
+		StudentTreeRefresh();
+		StudentDetailReset();
+	}
+}
+
+// ****
+// * Leert alle Eingabe- und Auswahlfelder
+// ****
+function StudentDetailReset()
+{
+	
+}
+
+// ****
+// * Deaktiviert alle Eingabe- und Auswahlfelder
+// ****
+function StudentDetailDisableFields(val)
+{
+	
+}
+
+// ****
+// * Speichert die Details
+// ****
+function StudentDetailSave()
+{
+	//Werte holen
+	//lvnr = document.getElementById('lehrveranstaltung-detail-textbox-lvnr').value;
+	//...
+	
+	var req = new phpRequest('student/studentDBDML.php','','');
+	neu = document.getElementById('student-detail-checkbox-new').checked;
+
+	if (neu)
+	{
+		req.add('do','create');
+	}
+	else
+	{
+		req.add('do','update');
+	}
+	
+	req.add('type', 'student');
+	//...
+	
+	var response = req.executePOST();
+
+	var val =  new ParseReturnValue(response)
+
+	if (!val.dbdml_return)
+	{
+		alert(val.dbdml_errormsg)
+	}
+	else
+	{
+		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+		document.getElementById('student-detail-checkbox-new').checked=false;
+		
+		StudentSelectUid=val.dbdml_data;
+		StudentTreeDatasource.Refresh(false); //non blocking
+		SetStatusBarText('Daten wurden gespeichert');
+	}
+}
+
+// ****
+// * Auswahl eines Studenten
+// * bei Auswahl eines Studenten wird dieser geladen
+// * und die Daten unten angezeigt
+// ****
+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;	
+
+	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=='')
+		{
+			//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;
+		}
+		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)
+	{
+		alert(e);
+		return false;
+	}
+
+	var req = new phpRequest('../rdf/lehreinheit.rdf.php','','');
+	req.add('lehreinheit_id',lehreinheit_id);
+
+	var response = req.execute();
+	// Datasource holen
+	var dsource=parseRDFString(response, 'http://www.technikum-wien.at/lehreinheit/liste');
+
+	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 predicateNS = "http://www.technikum-wien.at/lehreinheit/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" ));
+	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);
+	
+	//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;
+	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);
+	}
+*/
+}
\ No newline at end of file
diff --git a/content/studentenoverlay.xul.php b/content/studentenoverlay.xul.php
deleted file mode 100644
index b98d7c29d..000000000
--- a/content/studentenoverlay.xul.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-header("Cache-Control: no-cache");
-header("Cache-Control: post-check=0, pre-check=0",false);
-header("Expires Mon, 26 Jul 1997 05:00:00 GMT");
-header("Pragma: no-cache");
-header("Content-type: application/vnd.mozilla.xul+xml");
-
-include('../vilesci/config.inc.php');
-echo '<?xml version="1.0" encoding="ISO-8859-1" standalone="yes" ?>';
-echo "<?xml-stylesheet href=\"".APP_ROOT."content/lvplanung/lehrveranstaltung.css\" type=\"text/css\" ?>";
-
-
-?>
-
-<!DOCTYPE overlay >
-
-<overlay id="StudentenOverlay"
-	xmlns:html="http://www.w3.org/1999/xhtml"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	>
-
-
-<script type="application/x-javascript" src="<?php echo APP_ROOT; ?>content/studenten.js" />
-
-
-
-			<!-- *************** -->
-			<!-- *  Studenten  * -->
-			<!-- *************** -->
-			<vbox id="studentenEditor">
-				<hbox>
-					<toolbox>
-	  					<toolbar id="studentenToolbar">
-	    					<toolbarbutton label="Neu"/>
-							<toolbarbutton label="Speichern"/>
-	    					<toolbarbutton label="Löschen"/>
-						</toolbar>
-					</toolbox>
-					<spacer flex="1"/>
-					<label id="std-label-anzahl" />
-				</hbox>
-
-				<!-- ************* -->
-				<!-- *  Auswahl  * -->
-				<!-- ************* -->
-				<tree id="treeStudenten" seltype="single" hidecolumnpicker="false" flex="1"
-						datasources="rdf:null" ref="http://www.technikum-wien.at/student/alle"
-						onselect="studentAuswahl();"
-						flags="dont-build-content"
-						enableColumnDrag="true"
-						style="margin:0px;"
-				>
-					<treecols>
-	    				<treecol id="uid" label="UID" flex="1" primary="false"
-	    					class="sortDirectionIndicator"
-	    					sortActive="true"
-	    					sortDirection="ascending"
-	    					sort="rdf:http://www.technikum-wien.at/student/rdf#uid"  />
-	    				<splitter class="tree-splitter"/>
-	    				<treecol id="titel" label="Titel" flex="1" hidden="false"
-	    					class="sortDirectionIndicator"
-	    					sort="rdf:http://www.technikum-wien.at/student/rdf#titel"				/>
-	    				<splitter class="tree-splitter"/>
-	    				<treecol id="vornamen" label="Vornamen" flex="1" hidden="false"
-	    					class="sortDirectionIndicator"
-	    					sort="rdf:http://www.technikum-wien.at/student/rdf#vornamen" />
-	    				<splitter class="tree-splitter"/>
-	    				<treecol id="nachname" label="Nachname" flex="1" hidden="false"
-	    					class="sortDirectionIndicator"
-	    					sort="rdf:http://www.technikum-wien.at/student/rdf#nachname" />
-	    				<splitter class="tree-splitter"/>
-	    				<treecol id="geburtsdatum" label="Geburtsdatum" flex="1" hidden="false"
-	    					class="sortDirectionIndicator"
-	    					sort="rdf:http://www.technikum-wien.at/student/rdf#geburtsdatum" />
-	    				<splitter class="tree-splitter"/>
-	    				<treecol id="semester" label="Sem." flex="1" hidden="false"
-	    					class="sortDirectionIndicator"
-	    					sort="rdf:http://www.technikum-wien.at/student/rdf#semester" />
-	    				<splitter class="tree-splitter"/>
-	    				<treecol id="verband" label="Verb." flex="1" hidden="false"
-	    					class="sortDirectionIndicator"
-	    					sort="rdf:http://www.technikum-wien.at/student/rdf#verband" />
-	    				<splitter class="tree-splitter"/>
-	    				<treecol id="gruppe" label="Grp." flex="1" hidden="false"
-	    					class="sortDirectionIndicator"
-	    					sort="rdf:http://www.technikum-wien.at/student/rdf#gruppe" />
-	    				<splitter class="tree-splitter"/>
-	    				<treecol id="stg_bezeichnung" label="Studiengang" flex="1" hidden="true"
-	    					class="sortDirectionIndicator"
-	    					sort="rdf:http://www.technikum-wien.at/student/rdf#studiengang_kz" />
-	    				<splitter class="tree-splitter"/>
-						<treecol id="matrikelnummer" label="Matrikelnummer" flex="1" hidden="false"
-	    					class="sortDirectionIndicator"
-	    					sort="rdf:http://www.technikum-wien.at/student/rdf#matrikelnummer" />
-					</treecols>
-
-					<template>
-						<rule>
-	      					<treechildren>
-	       						<treeitem uri="rdf:*">
-	         						<treerow>
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#uid"   />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#titel" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#vornamen" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#nachname" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#geburtsdatum" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#semester" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#verband" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#gruppe" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#studiengang_kz" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#matrikelnummer" />
-	         						</treerow>
-	       						</treeitem>
-	      					</treechildren>
-	      				</rule>
-  					</template>
-
-<!--
-					<template>
-						<rule>
-							<conditions>
-								<content uri="?uri" />
-								<member container="?uri" child="?student" />
-							</conditions>
-							<bindings>
-								<binding subject="?student" predicate="http://www.technikum-wien.at/tempus/studenten/rdf#uid" object="?uid" />
-								<binding subject="?student" predicate="http://www.technikum-wien.at/tempus/studenten/rdf#titel" object="?titel" />
-								<binding subject="?student" predicate="http://www.technikum-wien.at/tempus/studenten/rdf#vornamen" object="?vornamen" />
-								<binding subject="?student" predicate="http://www.technikum-wien.at/tempus/studenten/rdf#nachname" object="?nachname" />
-								<binding subject="?student" predicate="http://www.technikum-wien.at/tempus/studenten/rdf#geburtsdatum" object="?geburtsdatum" />
-								<binding subject="?student" predicate="http://www.technikum-wien.at/tempus/studenten/rdf#aktiv" object="?aktiv" />
-							</bindings>
-							<action>
-								<treechildren>
-	       							<treeitem uri="?student">
-	         							<treerow>
-	           								<treecell label="?uid"   />
-	           								<treecell label="?titel" />
-	           								<treecell label="?vornamen" />
-	           								<treecell label="?nachname" />
-	           								<treecell label="?geburtsdatum" />
-	           								<treecell label="?aktiv" />
-	         							</treerow>
-	       							</treeitem>
-	      						</treechildren>
-							</action>
-	      				</rule>
-  					</template>
--->
-
-				</tree>
-
-				<splitter collapse="after" persist="state">
-					<grippy />
-				</splitter>
-
-				<!-- ************ -->
-				<!-- *  Detail  * -->
-				<!-- ************ -->
-				<vbox flex="1"  style="overflow:auto;margin:0px;">
-					<label value="Details" style="font-size:12pt;font-weight:bold;background:#eeeeee;margin:0px;padding:5px;" />
-
-					<box class="studentDetail"  style="margin-top:10px;" />
-				</vbox>
-			</vbox>
-</overlay>
diff --git a/content/tempusoverlay.js.php b/content/tempusoverlay.js.php
index 887a66364..5bfb17115 100644
--- a/content/tempusoverlay.js.php
+++ b/content/tempusoverlay.js.php
@@ -4,6 +4,7 @@ include('../vilesci/config.inc.php');
 
 var currentAuswahl=new auswahlValues();
 var LvTreeDatasource;
+var StudentTreeDatasource;
 
 function auswahlValues()
 {
@@ -17,6 +18,7 @@ function auswahlValues()
 
 function onVerbandSelect()
 {
+	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 	var contentFrame=document.getElementById('iframeTimeTableWeek');
 	var tree=document.getElementById('tree-verband');
 	if(tree.currentIndex==-1)
@@ -71,13 +73,37 @@ function onVerbandSelect()
 	vboxLehrveranstalungPlanung.setAttribute('datasources',attribute);
 
 	// Studenten
-	var treeStudenten=document.getElementById('treeStudenten');
-	attribute="<?php echo APP_ROOT; ?>rdf/student.rdf.php?"+"stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"&gruppe="+gruppe;
-	treeStudenten.setAttribute('datasources',attribute);
+	//var treeStudenten=document.getElementById('treeStudenten');
+	//attribute="<?php echo APP_ROOT; ?>rdf/student.rdf.php?"+"stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"&gruppe="+gruppe;
+	//treeStudenten.setAttribute('datasources',attribute);
+	
+	// Studenten
+	try
+	{
+		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())
+		{
+			treeStudent.database.RemoveDataSource(oldDatasources.getNext());
+		}
+
+		var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
+		StudentTreeDatasource = rdfService.GetDataSource(url);
+		StudentTreeDatasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
+		StudentTreeDatasource.QueryInterface(Components.interfaces.nsIRDFXMLSink);
+		treeStudent.database.AddDataSource(StudentTreeDatasource);
+		StudentTreeDatasource.addXMLSinkObserver(StudentTreeSinkObserver);
+		treeStudent.builder.addListener(StudentTreeListener);
+	}
+	catch(e)
+	{
+		debug(e);
+	}
 
 	// Lehrveranstaltung
-	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 	try
 	{
 		url = '<?php echo APP_ROOT; ?>rdf/lehrveranstaltung_einheiten.rdf.php?stg_kz='+stg_kz+'&sem='+sem+'&ver='+ver+'&grp='+grp+'&gruppe='+gruppe+'&'+gettimestamp();
diff --git a/content/tempusoverlay.xul.php b/content/tempusoverlay.xul.php
index d1b93f10b..1702ac3ad 100644
--- a/content/tempusoverlay.xul.php
+++ b/content/tempusoverlay.xul.php
@@ -4,7 +4,7 @@ echo '<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>';
 
 include('../vilesci/config.inc.php');
 
-echo '<?xul-overlay href="'.APP_ROOT.'content/studentenoverlay.xul.php"?>';
+echo '<?xul-overlay href="'.APP_ROOT.'content/student/studentenoverlay.xul.php"?>';
 echo '<?xul-overlay href="'.APP_ROOT.'content/lvplanung/lehrveranstaltungoverlay.xul.php"?>';
 echo '<?xul-overlay href="'.APP_ROOT.'content/lvplanung/stpl-week-overlay.xul.php"?>';
 echo '<?xul-overlay href="'.APP_ROOT.'content/lvplanung/stpl-semester-overlay.xul.php"?>';
@@ -102,7 +102,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/lvplanung/stpl-semester-overlay.xu
 	seltype="single" hidecolumnpicker="false" flex="1"
 	enableColumnDrag="true"
     ondraggesture="nsDragAndDrop.startDrag(event,mitarbeiterDDObserver);"
-	datasources="../rdf/mitarbeiter.rdf.php" ref="http://www.technikum-wien.at/mitarbeiter/alle">
+	datasources="../rdf/mitarbeiter.rdf.php" ref="http://www.technikum-wien.at/mitarbeiter/_alle">
 	<treecols>
 	    <treecol id="kurzbz" label="Kuerzel" flex="2" primary="true" />
 	    <splitter class="tree-splitter"/>
@@ -132,38 +132,6 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/lvplanung/stpl-semester-overlay.xu
   	</template>
 </tree>
 
-<!-- testing - Verschachtelte Mitarbeiter Ansicht-->
-<tree id="tree-lektor_verschachtelt" onselect="onLektorSelect();"
-	seltype="single" hidecolumnpicker="false" flex="1"
-	enableColumnDrag="true"
-    ondraggesture="nsDragAndDrop.startDrag(event,mitarbeiterDDObserver);"
-	datasources="../rdf/mitarbeiter_verschachtelt.rdf.php" ref="http://www.technikum-wien.at/ma/liste">
-	<treecols>
-	    <treecol id="bezeichnung" label="Kuerzel" flex="2" primary="true" />
-	    <splitter class="tree-splitter"/>
-	    <treecol id="nachname" label="Nachname" flex="2" hidden="true"/>
-	    <splitter class="tree-splitter"/>
-	    <treecol id="vorname" label="Vornamen" flex="2" hidden="true"/>
-	    <splitter class="tree-splitter"/>
-	    <treecol id="uid" label="UID" flex="1" hidden="true"/>
-	</treecols>
-
-	<template>
-		<rule>
-		<treechildren>
-	       	<treeitem uri="rdf:*">
-	         	<treerow>
-	           		<treecell label="rdf:http://www.technikum-wien.at/ma/rdf#bezeichnung"/>
-	           		<treecell label="rdf:http://www.technikum-wien.at/ma/rdf#nachname"/>
-	           		<treecell label="rdf:http://www.technikum-wien.at/ma/rdf#vorname"/>
-	           		<treecell label="rdf:http://www.technikum-wien.at/ma/rdf#uid"/>
-	         	</treerow>
-	    	</treeitem>
-	    </treechildren>
-	    </rule>
-  	</template>
-</tree>
-
 <vbox id="vbox-main">
 	<tabbox id="tabbox-main" flex="3" orient="vertical">
 		<tabs orient="horizontal">
diff --git a/include/nation.class.php b/include/nation.class.php
index 5b7b6ea53..856961920 100644
--- a/include/nation.class.php
+++ b/include/nation.class.php
@@ -89,9 +89,9 @@ class nation
 		//Lesen der Daten aus der Datenbank
 		$qry = "SELECT * FROM bis.tbl_nation";
 		if($ohnesperre)
-			$qry .= " where sperre='N'";
+			$qry .= " WHERE sperre is null";
 			
-		$qry .=" order by kurztext";
+		$qry .=" ORDER BY kurztext";
 		
 		if(!$res = pg_query($this->conn,$qry))
 		{
@@ -103,12 +103,12 @@ class nation
 		{
 			$nation = new nation($this->conn);
 		
-			$nation->code = $row->code;
-			$nation->sperre = $row->sperre; 
-	        		$nation->kontinent = $row->sperre;
-	  		$nation->entwland = $row->entwland;
-	        		$nation->euflag = $row->euflag;
-	 		$nation->ewrflag = $row->ewrflag;
+			$nation->code = $row->nation_code;
+			$nation->sperre = ($row->sperre=='t'?true:false); 
+			$nation->kontinent = $row->kontinent;
+			$nation->entwicklungsstand = $row->entwicklungsstand;
+			$nation->eu = ($row->eu=='t'?true:false);
+			$nation->ewr = ($row->ewr=='t'?true:false);
 			$nation->kurztext = $row->kurztext;
 			$nation->langtext = $row->langtext;
 			$nation->engltext = $row->engltext;
diff --git a/include/student.class.php b/include/student.class.php
index f731167c9..cbe95f91f 100644
--- a/include/student.class.php
+++ b/include/student.class.php
@@ -260,7 +260,7 @@ class student extends benutzer
 			$this->errormsg=pg_errormessage($this->conn);
 			return false;
 		}
-		$num_rows=pg_numrows($erg);
+		$num_rows=pg_num_rows($erg);
 		$result=array();
 		for($i=0;$i<$num_rows;$i++)
 		{
@@ -271,6 +271,7 @@ class student extends benutzer
 			$l->titelpre=$row->titelpre;
 			$l->titelpost=$row->titelpost;
 			$l->vornamen=$row->vornamen;
+			$l->vorname=$row->vorname;
 			$l->nachname=$row->nachname;
 			$l->gebdatum=$row->gebdatum;
 			$l->gebort=$row->gebort;
diff --git a/rdf/nation.rdf.php b/rdf/nation.rdf.php
new file mode 100644
index 000000000..703698cbd
--- /dev/null
+++ b/rdf/nation.rdf.php
@@ -0,0 +1,59 @@
+<?php
+/*
+ * Created on 02.12.2004
+ *
+ * To change the template for this generated file go to
+ * Window - Preferences - PHPeclipse - PHP - Code Templates
+ */
+// header für no cache
+header("Cache-Control: no-cache");
+header("Cache-Control: post-check=0, pre-check=0",false);
+header("Expires Mon, 26 Jul 1997 05:00:00 GMT");
+header("Pragma: no-cache");
+// content type setzen
+header("Content-type: application/vnd.mozilla.xul+xml");
+// xml
+echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
+// DAO
+require_once('../vilesci/config.inc.php');
+require_once('../include/nation.class.php');
+
+// Datenbank Verbindung
+if (!$conn = @pg_pconnect(CONN_STRING))
+   	$error_msg='Es konnte keine Verbindung zum Server aufgebaut werden!';
+
+// studiensemester holen
+$nation = new nation($conn, null, true);
+$nation->getAll();
+
+$rdf_url='http://www.technikum-wien.at/nation';
+
+?>
+
+<RDF:RDF
+	xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:NATION="<?php echo $rdf_url; ?>/rdf#"
+>
+   <RDF:Seq about="<?php echo $rdf_url ?>/liste">
+<?php
+foreach ($nation->nation as $row)
+{
+	?>
+      <RDF:li>
+         <RDF:Description  id="<?php echo $row->code; ?>"  about="<?php echo $rdf_url.'/'.$row->code; ?>" >
+            <NATION:nation_code><![CDATA[<?php echo $row->code ?>]]></NATION:nation_code>
+            <NATION:entwicklungsstand><![CDATA[<?php echo $row->entwicklungsstand ?>]]></NATION:entwicklungsstand>
+            <NATION:eu><![CDATA[<?php echo ($row->eu?'true':'false') ?>]]></NATION:eu>
+            <NATION:ewr><![CDATA[<?php echo ($row->ewr?'true':'false') ?>]]></NATION:ewr>
+            <NATION:kontinent><![CDATA[<?php echo $row->kontinent ?>]]></NATION:kontinent>
+            <NATION:kurztext><![CDATA[<?php echo $row->kurztext ?>]]></NATION:kurztext>
+            <NATION:langtext><![CDATA[<?php echo $row->langtext ?>]]></NATION:langtext>
+            <NATION:engltext><![CDATA[<?php echo $row->engltext ?>]]></NATION:engltext>
+            <NATION:sperre><![CDATA[<?php echo ($row->sperre?'true':'false') ?>]]></NATION:sperre>
+         </RDF:Description>
+      </RDF:li>
+<?php
+}
+?>
+   </RDF:Seq>
+</RDF:RDF>
diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php
index b9efb7e94..4c6388ba1 100644
--- a/rdf/student.rdf.php
+++ b/rdf/student.rdf.php
@@ -45,7 +45,7 @@ if(isset($_GET['uid']))
 // Studenten holen
 $student=new student($conn);
 if (isset($uid))
-	$studenten=$student->load($uid);
+	$student->load($uid);
 else
 	$studenten=$student->getStudents($stg_kz,$sem,$ver,$grp,$gruppe);
 
@@ -62,32 +62,40 @@ $rdf_url='http://www.technikum-wien.at/student';
   <RDF:Seq about="<?php echo $rdf_url ?>/alle">
 
 <?php
-foreach ($studenten as $student)
+if(isset($uid))
+	drawStudent($student);
+else 
+	foreach ($studenten as $student)
+		drawStudent($student);
+
+function drawStudent($student)
 {
+	global $rdf_url;
 	?>
 	  <RDF:li>
       	<RDF:Description  id="<?php echo $student->uid; ?>"  about="<?php echo $rdf_url.'/'.$student->uid; ?>" >
-        	<STUDENT:uid><?php echo $student->uid;  ?></STUDENT:uid>
-    		<STUDENT:titelpre><?php echo $student->titelpre; ?></STUDENT:titelpre>
-    		<STUDENT:titelpost><?php echo $student->titelpost; ?></STUDENT:titelpost>
-    		<STUDENT:vornamen><?php echo $student->vornamen  ?></STUDENT:vornamen>
-    		<STUDENT:nachname><?php echo $student->nachname  ?></STUDENT:nachname>
-    		<STUDENT:matrikelnummer><?php echo $student->matrikelnr  ?></STUDENT:matrikelnummer>
-    		<STUDENT:geburtsdatum><?php echo $student->gebdatum  ?></STUDENT:geburtsdatum>
-    		<STUDENT:geburtsdatum_iso><?php echo $student->gebdatum;  ?></STUDENT:geburtsdatum_iso>
-    		<STUDENT:alias><?php echo $student->alias  ?></STUDENT:alias>
-    		<STUDENT:homepage><?php echo $student->homepage  ?></STUDENT:homepage>
-    		<STUDENT:aktiv><?php echo ($student->aktiv?'True':'False')  ?></STUDENT:aktiv>
-    		<STUDENT:gebort><?php echo $student->gebort;  ?></STUDENT:gebort>
-    		<STUDENT:gebzeit><?php echo $student->gebzeit;  ?></STUDENT:gebzeit>
-    		<STUDENT:foto><?php echo $student->foto;  ?></STUDENT:foto>
-    		<STUDENT:anmerkungen><?php echo $student->anmerkungen;  ?></STUDENT:anmerkungen>
-    		<STUDENT:updateamum><?php echo $student->updateamum;  ?></STUDENT:updateamum>
-    		<STUDENT:updatevon><?php echo $student->updatevon;  ?></STUDENT:updatevon>
-    		<STUDENT:semester><?php echo $student->semester;  ?></STUDENT:semester>
-    		<STUDENT:verband><?php echo $student->verband;  ?></STUDENT:verband>
-    		<STUDENT:gruppe><?php echo $student->gruppe;  ?></STUDENT:gruppe>
-    		<STUDENT:studiengang_kz><?php echo $student->studiengang_kz; ?></STUDENT:studiengang_kz>
+        	<STUDENT:uid><![CDATA[<?php echo $student->uid;  ?>]]></STUDENT:uid>
+    		<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>
+    		<STUDENT:vorname><![CDATA[<?php echo $student->vorname  ?>]]></STUDENT:vorname>
+    		<STUDENT:nachname><![CDATA[<?php echo $student->nachname  ?>]]></STUDENT:nachname>
+    		<STUDENT:matrikelnummer><![CDATA[<?php echo $student->matrikelnr  ?>]]></STUDENT:matrikelnummer>
+    		<STUDENT:geburtsdatum><![CDATA[<?php echo $student->gebdatum  ?>]]></STUDENT:geburtsdatum>
+    		<STUDENT:geburtsdatum_iso><![CDATA[<?php echo $student->gebdatum;  ?>]]></STUDENT:geburtsdatum_iso>
+    		<STUDENT:alias><![CDATA[<?php echo $student->alias  ?>]]></STUDENT:alias>
+    		<STUDENT:homepage><![CDATA[<?php echo $student->homepage  ?>]]></STUDENT:homepage>
+    		<STUDENT:aktiv><![CDATA[<?php echo ($student->aktiv?'True':'False')  ?>]]></STUDENT:aktiv>
+    		<STUDENT:gebort><![CDATA[<?php echo $student->gebort;  ?>]]></STUDENT:gebort>
+    		<STUDENT:gebzeit><![CDATA[<?php echo $student->gebzeit;  ?>]]></STUDENT:gebzeit>
+    		<STUDENT:foto><![CDATA[<?php echo $student->foto;  ?>]]></STUDENT:foto>
+    		<STUDENT:anmerkungen><![CDATA[<?php echo $student->anmerkungen;  ?>]]></STUDENT:anmerkungen>
+    		<STUDENT:updateamum><![CDATA[<?php echo $student->updateamum;  ?>]]></STUDENT:updateamum>
+    		<STUDENT:updatevon><![CDATA[<?php echo $student->updatevon;  ?>]]></STUDENT:updatevon>
+    		<STUDENT:semester><![CDATA[<?php echo $student->semester;  ?>]]></STUDENT:semester>
+    		<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>
       	</RDF:Description>
       </RDF:li>
 <?php