diff --git a/content/bindings.xml.php b/content/bindings.xml.php
index f67959b8f..5f22544d6 100644
--- a/content/bindings.xml.php
+++ b/content/bindings.xml.php
@@ -107,17 +107,24 @@
 			//Wenn das Datum stimmt, dann wird der Hintergrund auf Weiss gesetzt und
 			//das Datum im Datepicker gesetzt
 			//Wenn das Datum falsch ist, dann wird der Hintergrund auf Rot gesetzt
-			if(CheckDatum(datum))
-			{	
-				parts = datum.split('.');
-
-				dat = new Date(parts[2],parts[1]-1,parts[0]);
-				picker.view.setDate(dat);		
-				picker.selection.setDate(dat);
+			if(datum=='')
+			{
 				menulist.style.backgroundColor="#FFFFFF";
 			}
 			else
-				menulist.style.backgroundColor="#F46B6B";
+			{
+				if(CheckDatum(datum))
+				{	
+					parts = datum.split('.');
+	
+					dat = new Date(parts[2],parts[1]-1,parts[0]);
+					picker.view.setDate(dat);		
+					picker.selection.setDate(dat);
+					menulist.style.backgroundColor="#FFFFFF";
+				}
+				else
+					menulist.style.backgroundColor="#F46B6B";
+			}
 			
 			 ]]>
 		</handler>
diff --git a/content/fasoverlay.xul.php b/content/fasoverlay.xul.php
index 9a00b9bb7..7bf360d9b 100644
--- a/content/fasoverlay.xul.php
+++ b/content/fasoverlay.xul.php
@@ -36,7 +36,7 @@ $rechte->getBerechtigungen($user);
 
 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/student/interessentenoverlay.xul.php"?>';
+/*echo '<?xul-overlay href="'.APP_ROOT.'content/student/interessentenoverlay.xul.php"?>';*/
 echo '<?xul-overlay href="'.APP_ROOT.'content/mitarbeiter/mitarbeiteroverlay.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/interessentdetailoverlay.xul.php b/content/student/interessentdetailoverlay.xul.php
deleted file mode 100644
index f35035b5e..000000000
--- a/content/student/interessentdetailoverlay.xul.php
+++ /dev/null
@@ -1,433 +0,0 @@
-<?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="interessentDetailOverlay"
-	xmlns:html="http://www.w3.org/1999/xhtml"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	>
-<!-- Interessent DETAILS -->
-<vbox id="interessent-detail" style="overflow:auto; margin:0px;" flex="1">
-		<vbox hidden="true">
-			<label value="Neu"/>
-			<checkbox id="interessent-detail-checkbox-new" checked="true" />      	
-			<label value="Person_id"/>
-      		<textbox id="interessent-detail-textbox-person_id" disabled="true"/>					
-      		<label value="Prestudent_id"/>
-      		<textbox id="interessent-detail-textbox-prestudent_id" disabled="true"/>					
-		</vbox>
-		<vbox flex="1">
-		<groupbox id="interessent-detail-groupbox-person">
-			<caption label="Person" />
-			<grid id="interessent-detail-grid-person" style="margin:4px;" flex="1">
-				  	<columns  >
-    					<column flex="1"/>
-    					<column flex="5"/>
-    					<column flex="1"/>
-    					<column flex="5"/>
-    					<column flex="1"/>
-    					<column flex="5"/>
-  					</columns>
-  					<rows>
-    					<row>
-      						<label value="Anrede" control="interessent-detail-textbox-anrede"/>
-      						<hbox><textbox id="interessent-detail-textbox-anrede" disabled="true" maxlength="16" size="16"/></hbox>
-      						<label value="TitelPre" control="interessent-detail-textbox-titelpre"/>
-      						<textbox id="interessent-detail-textbox-titelpre" disabled="true" maxlength="64"/>
-      						<label value="TitelPost" control="interessent-detail-textbox-titelpost"/>
-      						<textbox id="interessent-detail-textbox-titelpost" disabled="true" maxlength="32"/>
-    					</row>
-    					<row>
-    						<label value="Nachname" control="interessent-detail-textbox-nachname"/>
-      						<textbox id="interessent-detail-textbox-nachname" disabled="true" maxlength="64"/>
-      						<label value="Vorname" control="interessent-detail-textbox-vorname"/>
-      						<textbox id="interessent-detail-textbox-vorname" disabled="true" maxlength="32"/>
-      						<label value="Vornamen" control="interessent-detail-textbox-vornamen"/>
-      						<textbox id="interessent-detail-textbox-vornamen" disabled="true" maxlength="128"/>
-    					</row>
-    					<row>
-      						<label value="Geburtsdatum" control="interessent-detail-textbox-geburtsdatum"/>
-      						<hbox>
-      							<box class="Datum" id="interessent-detail-textbox-geburtsdatum" disabled="true"/>
-      							<!--<textbox id="interessent-detail-textbox-geburtsdatum" disabled="true" maxlength="10" size="10" tooltiptext="Format: JJJJ-MM-DD Beispiel: 1970-01-31"/>-->
-      						</hbox>
-      						<label value="Geburtsort" control="interessent-detail-textbox-geburtsort"/>
-      						<textbox id="interessent-detail-textbox-geburtsort" disabled="true" maxlength="128"/>
-      						<label value="Geburtszeit" control="interessent-detail-textbox-geburtszeit"/>
-      						<hbox><textbox id="interessent-detail-textbox-geburtszeit" disabled="true" maxlength="5" size="5" tooltiptext="Format: hh:mm Beispiel: 10:30"/></hbox>
-    					</row>
-    					<row>
-      						<label value="SVNR" control="interessent-detail-textbox-svnr"/>
-      						<hbox><textbox id="interessent-detail-textbox-svnr" disabled="true" maxlength="10" size="10"/></hbox>
-      						<label value="Ersatzkennzeichen" control="interessent-detail-textbox-ersatzkennzeichen"/>
-      						<hbox><textbox id="interessent-detail-textbox-ersatzkennzeichen" disabled="true" maxlength="10" size="10"/></hbox>
-      						<label value="Aktiv" control="interessent-detail-checkbox-aktiv"/>
-      						<checkbox id="interessent-detail-checkbox-aktiv" checked="true" disabled="true"/>
-    					</row>
-    					<row>
-							<label value="Staatsbuergerschaft" control="interessent-detail-menulist-staatsbuergerschaft"/>
-							<menulist id="interessent-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>
-									<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>
-							<label value="Geburtsnation" control="interessent-detail-menulist-geburtsnation"/>
-							<menulist id="interessent-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>
-									<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>
-							<label value="Sprache" control="interessent-detail-menulist-sprache" />
-							<menulist id="interessent-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>
-									<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="Geschlecht" control="interessent-detail-menulist-geschlecht"/>
-      						<menulist id="interessent-detail-menulist-geschlecht" disabled="true">
-								<menupopup>
-										<menuitem value="m" label="maennlich"/>
-										<menuitem value="w" label="weiblich"/>
-								</menupopup>								
-							</menulist>
-							<label value="Familienstand" control="interessent-detail-menulist-familienstand"/>
-      						<menulist id="interessent-detail-menulist-familienstand" disabled="true">
-								<menupopup>
-										<menuitem value="g" label="geschieden"/>
-										<menuitem value="l" label="ledig"/>
-										<menuitem value="v" label="verheiratet"/>
-										<menuitem value="w" label="verwittwet"/>
-								</menupopup>								
-							</menulist>
-							<label value="Anzahl der Kinder" control="interessent-detail-textbox-anzahlderkinder"/>
-      						<textbox id="interessent-detail-textbox-anzahlderkinder" disabled="true" maxlength="2"/>
-    					</row>
-    					<row>
-      						<vbox>
-      							<label value="Foto" />
-      							<hbox>
-      								<button id="interessent-detail-button-image-upload" label="Upload" oncommand="InteressentImageUpload(event);" disabled="true"/>
-      								<spacer flex="1" />
-      							</hbox>
-      						</vbox>
-   							<hbox>
-   								<image src='' id="interessent-detail-image" width="60" height="60" style="margin-left:5px;"/>
-   								<spacer flex="1"/>
-   							</hbox>
-      						<label value="Anmerkung" control="interessent-detail-textbox-anmerkung"/>
-      						<textbox id="interessent-detail-textbox-anmerkung" disabled="true" multiline="true"/>
-      						<label value="Homepage" control="interessent-detail-textbox-homepage"/>
-      						<vbox><textbox id="interessent-detail-textbox-homepage" disabled="true" maxlength="256"/></vbox>
-    					</row>
-				</rows>
-			</grid>
-			</groupbox>
-    		<hbox>
-    			<spacer flex="1" />
-    			<button id="interessent-detail-button-save" label="Speichern" oncommand="InteressentDetailSave();" disabled="true"/>
-    		</hbox>
-		</vbox>
-</vbox>
-
-<!-- interessent PREStudent -->
-<vbox id="interessent-prestudent" style="overflow:auto; margin:0px;" flex="1">
-		
-		<vbox hidden="true">
-			<label value="Neu"/>
-			<checkbox id="interessent-prestudent-checkbox-new" checked="false" />      	
-			<label value="Person_id"/>
-      		<textbox id="interessent-prestudent-textbox-person_id" disabled="true"/>
-      		<label value="Prestudent_id"/>
-      		<textbox id="interessent-prestudent-textbox-prestudent_id" disabled="true"/>
-      		<label value="studiengang_kz"/>
-      		<textbox id="interessent-prestudent-textbox-studiengang_kz" disabled="true"/>
-		</vbox>
-		<groupbox id="interessent-detail-groupbox-prestudent">
-		<caption label="Prestudent" />
-		<grid id="interessent-prestudent-grid-prestudent" style="margin:4px;" flex="1">
-				  	<columns  >
-    					<column flex="1"/>
-    					<column flex="5"/>
-    					<column flex="1"/>
-    					<column flex="5"/>
-    					<column flex="1"/>
-    					<column flex="5"/>    					
-  					</columns>
-  					<rows>
-  						<row>
-      						<label value="Aufmerksam durch" control="interessent-prestudent-menulist-aufmerksamdurch"/>
-      						<menulist id="interessent-prestudent-menulist-aufmerksamdurch" disabled="true"
-							          datasources="<?php echo APP_ROOT ?>rdf/aufmerksamdurch.rdf.php" flex="1"
-						              ref="http://www.technikum-wien.at/aufmerksamdurch/alle" >
-								<template>
-									<menupopup>
-										<menuitem value="rdf:http://www.technikum-wien.at/aufmerksamdurch/rdf#aufmerksamdurch_kurzbz"
-							        		      label="rdf:http://www.technikum-wien.at/aufmerksamdurch/rdf#aufmerksamdurch_kurzbz"
-										  		  uri="rdf:*"/>
-										</menupopup>
-								</template>
-							</menulist>
-							<label value="Berufstaetigkeit" control="interessent-prestudent-menulist-berufstaetigkeit"/>
-      						<menulist id="interessent-prestudent-menulist-berufstaetigkeit" disabled="true"
-							          datasources="<?php echo APP_ROOT ?>rdf/berufstaetigkeit.rdf.php?optional=true" flex="1"
-						              ref="http://www.technikum-wien.at/berufstaetigkeit/alle" >
-								<template>
-									<menupopup>
-										<menuitem value="rdf:http://www.technikum-wien.at/berufstaetigkeit/rdf#code"
-							        		      label="rdf:http://www.technikum-wien.at/berufstaetigkeit/rdf#bezeichnung"
-										  		  uri="rdf:*"/>
-										</menupopup>
-								</template>
-							</menulist>
-							<label value="Ausbildung" control="interessent-prestudent-menulist-ausbildung"/>
-      						<menulist id="interessent-prestudent-menulist-ausbildung" disabled="true"
-							          datasources="<?php echo APP_ROOT ?>rdf/ausbildung.rdf.php?optional=true" flex="1"
-						              ref="http://www.technikum-wien.at/ausbildung/alle" >
-								<template>
-									<menupopup>
-										<menuitem value="rdf:http://www.technikum-wien.at/ausbildung/rdf#code"
-							        		      label="rdf:http://www.technikum-wien.at/ausbildung/rdf#bezeichnung"
-										  		  uri="rdf:*"/>
-										</menupopup>
-								</template>
-							</menulist>
-    					</row>
-    					<row>
-      						<label value="Aufnahmeschluessel" control="interessent-prestudent-menulist-aufnahmeschluessel"/>
-      						<menulist id="interessent-prestudent-menulist-aufnahmeschluessel" disabled="true"
-							          datasources="<?php echo APP_ROOT ?>rdf/aufnahmeschluessel.rdf.php?optional=true" flex="1"
-						              ref="http://www.technikum-wien.at/aufnahmeschluessel/alle" >
-								<template>
-									<menupopup>
-										<menuitem value="rdf:http://www.technikum-wien.at/aufnahmeschluessel/rdf#aufnahmeschluessel"
-							        		      label="rdf:http://www.technikum-wien.at/aufnahmeschluessel/rdf#bezeichnung"
-										  		  uri="rdf:*"/>
-										</menupopup>
-								</template>
-							</menulist>
-							<label value="Studiengang" control="interessent-prestudent-menulist-studiengang_kz"/>
-							<menulist id="interessent-prestudent-menulist-studiengang_kz" disabled="true"
-							          datasources="<?php echo APP_ROOT ?>rdf/studiengang.rdf.php" flex="1"
-						              ref="http://www.technikum-wien.at/studiengang/liste" >
-								<template>
-									<menupopup>
-										<menuitem value="rdf:http://www.technikum-wien.at/studiengang/rdf#studiengang_kz"
-							        		      label="rdf:http://www.technikum-wien.at/studiengang/rdf#kuerzel - rdf:http://www.technikum-wien.at/studiengang/rdf#bezeichnung"
-										  		  uri="rdf:*"/>
-										</menupopup>
-								</template>
-							</menulist>
-						</row>
-						<row>
-							<vbox>
-								<label value="Anmerkung" control="interessent-prestudent-textbox-anmerkung"/>
-								<spacer flex="1" />
-      						</vbox>
-							<textbox id="interessent-prestudent-textbox-anmerkung" multiline="true" disabled="true"/>
-							<label value="Facheinschlaegig berufstaetig" control="interessent-prestudent-checkbox-facheinschlberuf"/>
-							<vbox>	
-      							<checkbox id="interessent-prestudent-checkbox-facheinschlberuf" checked="true" disabled="true"/>
-      							<spacer flex="1"/>
-							</vbox>
-      						<label value="Bismelden" control="interessent-prestudent-checkbox-bismelden"/>
-      						<vbox>	
-      							<checkbox id="interessent-prestudent-checkbox-bismelden" checked="true" disabled="true"/>
-      							<spacer flex="1"/>
-							</vbox>
-    					</row>
-    				</rows>
-    			</grid>
-    		</groupbox>
-   			<groupbox id="interessent-detail-groupbox-zgv">
-			<caption label="Zugangsvoraussetzung" />
-				<grid id="interessent-prestudent-grid-zgv" style="overflow:auto;margin:4px;" flex="1">
-				  	<columns  >
-    					<column flex="1"/>
-    					<column flex="5"/>
-    					<column flex="1"/>
-    					<column flex="5"/>
-    					<column flex="1"/>
-    					<column flex="5"/>    					
-  					</columns>
-  					<rows>
-    					<row>
-      						<label value="ZGV" control="interessent-prestudent-menulist-zgvcode"/>
-      						<menulist id="interessent-prestudent-menulist-zgvcode" disabled="true"
-							          datasources="<?php echo APP_ROOT ?>rdf/zgv.rdf.php?optional=true" flex="1"
-						              ref="http://www.technikum-wien.at/zgv/alle" >
-								<template>
-									<menupopup>
-										<menuitem value="rdf:http://www.technikum-wien.at/zgv/rdf#code"
-							        		      label="rdf:http://www.technikum-wien.at/zgv/rdf#kurzbz"
-										  		  uri="rdf:*"/>
-										</menupopup>
-								</template>
-							</menulist>
-							<label value="ZGV Ort" control="interessent-prestudent-textbox-zgvort"/>
-      						<textbox id="interessent-prestudent-textbox-zgvort" disabled="true" maxlength="64"/>
-      						<label value="ZGV Datum" control="interessent-prestudent-textbox-zgvdatum"/>
-      						<hbox>
-      							<box class="Datum" id="interessent-prestudent-textbox-zgvdatum" disabled="true"/>
-      							<!--<textbox id="interessent-prestudent-textbox-zgvdatum" disabled="true" maxlength="10" size="10" tooltiptext="Format: JJJJ-MM-DD Beispiel: 1970-01-31"/>-->
-      						</hbox>
-    					</row>
-    					<row>
-      						<label value="ZGV Master" control="interessent-prestudent-menulist-zgvmastercode"/>
-      						<menulist id="interessent-prestudent-menulist-zgvmastercode" disabled="true"
-							          datasources="<?php echo APP_ROOT ?>rdf/zgvmaster.rdf.php?optional=true" flex="1"
-						              ref="http://www.technikum-wien.at/zgvmaster/alle" >
-								<template>
-									<menupopup>
-										<menuitem value="rdf:http://www.technikum-wien.at/zgvmaster/rdf#code"
-							        		      label="rdf:http://www.technikum-wien.at/zgvmaster/rdf#kurzbz"
-										  		  uri="rdf:*"/>
-										</menupopup>
-								</template>
-							</menulist>
-							<label value="ZGV Master Ort" control="interessent-prestudent-textbox-zgvmasterort"/>
-      						<textbox id="interessent-prestudent-textbox-zgvmasterort" disabled="true" maxlength="64"/>
-      						<label value="ZGV Master Datum" control="interessent-prestudent-textbox-zgvmasterdatum"/>
-      						<hbox>
-      							<box class="Datum" id="interessent-prestudent-textbox-zgvmasterdatum" disabled="true"/>
-      							<!--<textbox id="interessent-prestudent-textbox-zgvmasterdatum" disabled="true" maxlength="10" size="10" tooltiptext="Format: JJJJ-MM-DD Beispiel: 1970-01-31"/>-->
-      						</hbox>
-    					</row>
-    				</rows>
-    			</grid>
-    		</groupbox>
-    		<groupbox id="interessent-detail-groupbox-reihungstest">
-			<caption label="Reihungstest" />
-				<grid id="interessent-prestudent-grid-reihungstest" style="overflow:auto;margin:4px;" flex="1">
-				  	<columns  >
-    					<column flex="1"/>
-    					<column flex="5"/>
-    					<column flex="1"/>
-    					<column flex="5"/>
-    					<column flex="1"/>
-    					<column flex="5"/>    					
-  					</columns>
-  					<rows>
-    					<row>
-    						<label value="Anmeldung zum Reihungstest am" control="interessent-prestudent-textbox-anmeldungreihungstest"/>
-      						<hbox>
-      							<box class="Datum" id="interessent-prestudent-textbox-anmeldungreihungstest" disabled="true" />
-      							<!--<textbox id="interessent-prestudent-textbox-anmeldungreihungstest" disabled="true" maxlength="10" size="10" tooltiptext="Format: JJJJ-MM-DD Beispiel: 1970-01-31"/>-->
-      							<button id="interessent-prestudent-button-anmeldungreihungstest-heute" label="Heute" oncommand="InteressentAnmeldungreihungstestHeute()" disabled="true" style="margin:0px;"/>
-      						</hbox>
-      						<label value="Reihungstest" control="interessent-prestudent-menulist-reihungstest"/>
-      						<menulist id="interessent-prestudent-menulist-reihungstest" disabled="true"
-							          datasources="<?php echo APP_ROOT ?>rdf/reihungstest.rdf.php?optional=true" flex="1"
-						              ref="http://www.technikum-wien.at/reihungstest/alle" >
-								<template>
-									<menupopup>
-										<menuitem value="rdf:http://www.technikum-wien.at/reihungstest/rdf#reihungstest_id"
-							        		      label="rdf:http://www.technikum-wien.at/reihungstest/rdf#bezeichnung"
-										  		  uri="rdf:*"/>
-										</menupopup>
-								</template>
-							</menulist>
-    					</row>
-    					<row>
-      						<label value="Zum Reihungstest angetreten" control="interessent-prestudent-checkbox-reihungstestangetreten"/>
-      						<checkbox id="interessent-prestudent-checkbox-reihungstestangetreten" checked="true" disabled="true"/>
-      						<label value="Reihungstestpunkte" control="interessent-prestudent-textbox-punkte"/>
-      						<hbox><textbox id="interessent-prestudent-textbox-punkte" disabled="true" maxlength="9" size="9"/></hbox>
-    					</row>
-    				</rows>
-    			</grid>
-    		</groupbox>
-    		<groupbox id="interessent-detail-groupbox-rollen">
-			<caption label="Status" />
-					<tree id="interessent-prestudent-tree-rolle" seltype="single" hidecolumnpicker="false" flex="1"
-							datasources="rdf:null" ref="http://www.technikum-wien.at/prestudentrolle/liste"
-							style="margin-left:10px;margin-right:10px;margin-bottom:5px;" height="100px" enableColumnDrag="true"
-							flags="dont-build-content"
-					>
-						<treecols>
-							<treecol id="interessent-prestudent-tree-rolle-rolle_kurzbz" label="Kurzbz" flex="2" hidden="false" primary="true"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#rolle_kurzbz"/>
-							<splitter class="tree-splitter"/>
-							<treecol id="interessent-prestudent-tree-rolle-studiensemester_kurzbz" label="StSem" flex="5" hidden="false"
-							   class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studiensemester_kurzbz"/>
-							<splitter class="tree-splitter"/>
-							<treecol id="interessent-prestudent-tree-rolle-ausbildungssemester" label="Semester" flex="2" hidden="false"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#ausbildungssemester" />
-							<splitter class="tree-splitter"/>
-							<treecol id="interessent-prestudent-tree-rolle-datum" label="Datum" flex="2" hidden="false"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#datum" />									
-							<splitter class="tree-splitter"/>
-						</treecols>
-			
-						<template>
-							<treechildren flex="1" >
-			   					<treeitem uri="rdf:*">
-									<treerow>
-										<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#rolle_kurzbz"/>
-										<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studiensemester_kurzbz"/>
-										<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#ausbildungssemester"/>
-										<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#datum"/>
-									</treerow>
-								</treeitem>
-							</treechildren>
-						</template>
-					</tree>
-			</groupbox>
-			<hbox>
-				<spacer flex="1" />
-				<button id="interessent-prestudent-button-save" label="Speichern" oncommand="InteressentPrestudentSave();" disabled="true"/>
-			</hbox>
-</vbox>
-
-</overlay>
\ No newline at end of file
diff --git a/content/student/interessentenoverlay.xul.php b/content/student/interessentenoverlay.xul.php
deleted file mode 100644
index c5d6071ea..000000000
--- a/content/student/interessentenoverlay.xul.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?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/interessentdetailoverlay.xul.php"?>';
-echo '<?xul-overlay href="'.APP_ROOT.'content/student/interessentdokumenteoverlay.xul.php"?>';
-echo '<?xul-overlay href="'.APP_ROOT.'content/student/interessentkontooverlay.xul.php"?>';
-?>
-<!DOCTYPE overlay >
-
-<overlay id="InteressentenOverlay"
-	xmlns:html="http://www.w3.org/1999/xhtml"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	>
-</overlay>
-<?php
-/*
-<script type="application/x-javascript" src="<?php echo APP_ROOT; ?>content/student/interessentoverlay.js.php" />
-
-			<!-- ******************* -->
-			<!-- *  Interessenten  * -->
-			<!-- ******************* -->
-			<vbox id="InteressentenEditor" persist="height">
-				<hbox>
-					<toolbox flex="1">
-						<toolbar id="interessent-nav-toolbar">
-						<toolbarbutton id="interessent-toolbar-neu" label="Neu" oncommand="InteressentNeu()" disabled="false" image="../skin/images/NeuDokument.png" tooltiptext="Interessent neu anlegen" />
-						<toolbarbutton id="interessent-toolbar-zubewerber" label="-> Bewerber" oncommand="InteressentzuBewerber()" disabled="false" tooltiptext="Interessent zum Bewerber machen" />
-						<toolbarbutton id="interessent-toolbar-zustudent" label="-> Student" oncommand="InteressentzuStudent()" disabled="false" tooltiptext="Bewerber zu Studenten machen" />
-						<toolbarbutton id="interessent-toolbar-aufgenommener" label="-> Aufgenommener" oncommand="InteressentAddRolle('Aufgenommener')" disabled="false" tooltiptext="Interessent zum Aufgenommenen machen"/>
-						<toolbarbutton id="interessent-toolbar-warteliste" label="-> Warteliste" oncommand="InteressentAddRolle('Wartender')" disabled="false" tooltiptext="Interessent zum Wartenden machen"/>
-						<toolbarbutton id="interessent-toolbar-absage" label="-> Absage" oncommand="InteressentAddRolle('Abgewiesener')" disabled="false" tooltiptext="Interessent zum Absager machen"/>
-						<toolbarbutton id="interessent-toolbar-buchung" label="Neue Buchung" oncommand="InteressentKontoNeu()" disabled="false" tooltiptext="neue Buchung anlegen"/>
-						<toolbarbutton id="interessent-toolbar-refresh" label="Aktualisieren" oncommand="InteressentTreeRefresh()" disabled="false" image="../skin/images/refresh.png" tooltiptext="Liste neu laden"/>
-
-						<spacer flex="1"/>
-						<label id="interessent-toolbar-label-anzahl"/>
-						</toolbar>
-					</toolbox>
-				</hbox>
-
-				<!-- ************* -->
-				<!-- *  Auswahl  * -->
-				<!-- ************* -->
-				<tree id="interessent-tree" seltype="multi" hidecolumnpicker="false" flex="1"
-						datasources="rdf:null" ref="http://www.technikum-wien.at/interessent/alle"
-						onselect="InteressentAuswahl();"
-						flags="dont-build-content"
-						enableColumnDrag="true"
-						style="margin:0px;"
-						persist="hidden, height"
-				>
-					<treecols>
-	    				<treecol id="interessent-treecol-titelpre" label="TitelPre" flex="1" hidden="false" persist="width"
-	    					class="sortDirectionIndicator"
-	    					sort="rdf:http://www.technikum-wien.at/interessent/rdf#titelpre" onclick="InteressentTreeSort()"/>
-	    				<splitter class="tree-splitter"/>
-	    				<treecol id="interessent-treecol-anrede" label="Anrede" flex="1" hidden="false" persist="width"
-	    					class="sortDirectionIndicator"
-	    					sort="rdf:http://www.technikum-wien.at/interessent/rdf#anrede" onclick="InteressentTreeSort()"/>
-	    				<splitter class="tree-splitter"/>
-	    				<treecol id="interessent-treecol-vorname" label="Vorname" flex="1" hidden="false" persist="width"
-	    					class="sortDirectionIndicator"
-	    					sort="rdf:http://www.technikum-wien.at/interessent/rdf#vorname" onclick="InteressentTreeSort()"/>
-	    				<splitter class="tree-splitter"/>
-	    				<treecol id="interessent-treecol-vornamen" label="Vornamen" flex="1" hidden="true" persist="width"
-	    					class="sortDirectionIndicator"
-	    					sort="rdf:http://www.technikum-wien.at/interessent/rdf#vornamen" onclick="InteressentTreeSort()"/>
-	    				<splitter class="tree-splitter"/>
-	    				<treecol id="interessent-treecol-nachname" label="Nachname" flex="2" hidden="false" primary="true" persist="width"
-	    					sortActive="true"
-	    					sortDirection="ascending"
-	    					class="sortDirectionIndicator"
-	    					sort="rdf:http://www.technikum-wien.at/interessent/rdf#nachname" onclick="InteressentTreeSort()"/>
-	    				<splitter class="tree-splitter"/>
-	    				<treecol id="interessent-treecol-titelpost" label="TitelPost" flex="1" hidden="false" persist="width"
-	    					class="sortDirectionIndicator"
-	    					sort="rdf:http://www.technikum-wien.at/interessent/rdf#titelpost" onclick="InteressentTreeSort()"/>
-	    				<splitter class="tree-splitter"/>
-	    				<treecol id="interessent-treecol-geburtsdatum" label="Geburtsdatum" flex="1" hidden="false" persist="width"
-	    					class="sortDirectionIndicator"
-	    					sort="rdf:http://www.technikum-wien.at/interessent/rdf#geburtsdatum_iso" onclick="InteressentTreeSort()"/>
-	    				<splitter class="tree-splitter"/>
-	    				<treecol id="interessent-treecol-svnr" label="SVNR" flex="1" hidden="false" persist="width"
-	    					class="sortDirectionIndicator"
-	    					sort="rdf:http://www.technikum-wien.at/interessent/rdf#svnr" onclick="InteressentTreeSort()"/>
-	    				<splitter class="tree-splitter"/>
-	    				<treecol id="interessent-treecol-ersatzkennzeichen" label="ErsatzKz" flex="1" hidden="false" persist="width"
-	    					class="sortDirectionIndicator"
-	    					sort="rdf:http://www.technikum-wien.at/interessent/rdf#ersazkennzeichen" onclick="InteressentTreeSort()"/>
-	    				<splitter class="tree-splitter"/>
-	    				<treecol id="interessent-treecol-geschlecht" label="Geschlecht" flex="1" hidden="true" persist="width"
-	    					class="sortDirectionIndicator"
-	    					sort="rdf:http://www.technikum-wien.at/interessent/rdf#geschlecht"  onclick="InteressentTreeSort()"/>
-	    				<splitter class="tree-splitter"/>
-	    				<treecol id="interessent-treecol-status" label="Status" flex="1" hidden="false" persist="width"
-	    					class="sortDirectionIndicator"
-	    					sort="rdf:http://www.technikum-wien.at/interessent/rdf#status"  onclick="InteressentTreeSort()"/>
-	    				<splitter class="tree-splitter"/>
-	    				<treecol id="interessent-treecol-studiengang_kz" label="StudiengangKz" flex="1" hidden="true" persist="width"
-	    					class="sortDirectionIndicator"
-	    					sort="rdf:http://www.technikum-wien.at/interessent/rdf#studiengang_kz"  onclick="InteressentTreeSort()"/>
-	    				<splitter class="tree-splitter"/>
-	    				<treecol id="interessent-treecol-prestudent_id" label="PreStudentID" flex="1" hidden="true" persist="width"
-	    					class="sortDirectionIndicator"
-	    					sort="rdf:http://www.technikum-wien.at/interessent/rdf#prestudent_id"  onclick="InteressentTreeSort()"/>
-	    				<splitter class="tree-splitter"/>
-	    				<treecol id="interessent-treecol-person_id" label="PersonID" flex="1" hidden="true" persist="width"
-	    					class="sortDirectionIndicator"
-	    					sort="rdf:http://www.technikum-wien.at/interessent/rdf#person_id"  onclick="InteressentTreeSort()"/>
-					</treecols>
-
-					<template>
-						<rule>
-	      					<treechildren>
-	       						<treeitem uri="rdf:*">
-	         						<treerow>
-	           							<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#titelpre" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#anrede" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#vorname" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#vornamen" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#nachname" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#titelpost" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#geburtsdatum" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#svnr" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#ersatzkennzeichen" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#geschlecht" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#status" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#studiengang_kz" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#prestudent_id" />
-	           							<treecell label="rdf:http://www.technikum-wien.at/interessent/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;" persist="height">
-					<tabbox id="interessent-tabbox" flex="3" orient="vertical">
-						<tabs orient="horizontal" id="interessent-tabs">
-							<tab id="interessent-tab-detail" label="Details" />
-							<tab id="interessent-tab-prestudent" label="PreStudent" />
-							<tab id="interessent-tab-dokumente" label="Dokumente" />
-							<tab id="interessent-tab-konto" label="Konto" />
-							<tab id="interessent-tab-kontakt" label="Kontakt" />
-						</tabs>
-						<tabpanels id="interessent-tabpanels-main" flex="1">
-							<vbox id="interessent-detail"  style="margin-top:10px;" />
-							<vbox id="interessent-prestudent"  style="margin-top:10px;" />
-							<vbox id="interessent-dokumente"  style="margin-top:10px;" />
-							<vbox id="interessent-konto"  style="margin-top:10px;" />
-							<iframe id="interessent-kontakt" src="" style="margin-top:10px;"/>
-						</tabpanels>
-					</tabbox>				
-				</vbox>
-			</vbox>
-</overlay>
-*/?>
\ No newline at end of file
diff --git a/content/student/interessentkontoneudialog.js.php b/content/student/interessentkontoneudialog.js.php
deleted file mode 100644
index c6cf36980..000000000
--- a/content/student/interessentkontoneudialog.js.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?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);
-?>
-var studiengang_kz=''; // enthaelt die Studiengangskennzahl
-var person_ids=''; // enthaelt eine durch ';' getrennte Liste an Personen_ids
-
-// ****
-// * Ermittelt die markierten Personen und den aktuellen Studiengang
-// ****
-function InteressentKontoNeuInit()
-{
-	var tree = window.opener.document.getElementById('interessent-tree')
-    
-	var start = new Object();
-	var end = new Object();
-	var numRanges = tree.view.selection.getRangeCount();
-	var paramList= '';
-	var anzahl=0;
-	
-	//alle markierten personen holen
-	for (var t = 0; t < numRanges; t++)
-	{
-  		tree.view.selection.getRangeAt(t,start,end);
-			for (var v = start.value; v <= end.value; v++)
-			{
-			col = tree.columns ? tree.columns["interessent-treecol-person_id"] : "interessent-treecol-person_id";
-			id = tree.view.getCellText(v,col);
-			paramList += ';'+id;
-			anzahl +=1;
-			}
-	}
-
-	//Studiengang holen
-	var tree=window.opener.document.getElementById('tree-verband');
-	
-	col = tree.columns ? tree.columns["stg_kz"] : "stg_kz";
-	studiengang_kz=tree.view.getCellText(tree.currentIndex,col);
-	
-	person_ids = paramList;
-	
-	if(anzahl>1)
-		document.getElementById('interessent-konto-neu-label').value='Anzahl Personen: '+anzahl;
-}
-
-// ****
-// * Speichern der Buchung
-// * Hierzu wird eine Funktion vom Aufrufenden Fenster gestartet weil
-// * es dann nicht zu Problemen mit den Zugriffen auf die anderen Fkt
-// * kommt.
-// ****
-function InteressentKontoNeuSpeichern()
-{
-	if(window.opener.InteressentKontoNeuSpeichern(document, person_ids, studiengang_kz))
-		window.close();
-}
\ No newline at end of file
diff --git a/content/student/interessentkontoneudialog.xul.php b/content/student/interessentkontoneudialog.xul.php
deleted file mode 100644
index 93a4a4511..000000000
--- a/content/student/interessentkontoneudialog.xul.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?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");
-
-include('../../vilesci/config.inc.php');
-echo '<?xml version="1.0" encoding="UTF-8"?>'."\n";
-
-echo '<?xml-stylesheet href="'.APP_ROOT.'skin/tempus.css" type="text/css"?>';
-echo '<?xml-stylesheet href="'.APP_ROOT.'content/bindings.css" type="text/css"?>';
-?>
-
-<window id="interessent-konto-neu-dialog" title="Neu"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="InteressentKontoNeuInit()"
-        >
-
-<script type="application/x-javascript" src="<?php echo APP_ROOT; ?>content/student/interessentkontoneudialog.js.php" />
-<script type="application/x-javascript" src="<?php echo APP_ROOT; ?>content/functions.js.php" />
-
-<vbox>
-<groupbox id="interessent-konto-neu-groupbox" flex="1">
-	<caption label="Details"/>
-		<label id="interessent-konto-neu-label"/>
-		<grid id="interessent-konto-neu-grid-detail" style="overflow:auto;margin:4px;" flex="1">
-		  	<columns  >
-				<column flex="1"/>
-				<column flex="5"/>
-			</columns>
-			<rows>
-				<row>
-					<label value="Betrag" control="interessent-konto-neu-textbox-betrag"/>
-					<hbox>
-      					<textbox id="interessent-konto-neu-textbox-betrag" value="-0.0" maxlength="9" size="9"/>
-      					<spacer flex="1" />			
-      				</hbox>
-				</row>
-				<row>
-					<label value="Buchungsdatum" control="interessent-konto-neu-textbox-buchungsdatum"/>
-					<hbox>
-						<box class="Datum" id="interessent-konto-neu-textbox-buchungsdatum" value="<?php echo date('d.m.Y');?>" />
-      					<!--<textbox id="interessent-konto-neu-textbox-buchungsdatum" value="<?php echo date('Y-m-d');?>" maxlength="10" size="10"/>-->
-      					<spacer flex="1" />			
-      				</hbox>
-      			</row>
-      			<row>
-      				<label value="Buchungstext" control="interessent-konto-neu-textbox-buchungstext"/>
-		      		<textbox id="interessent-konto-neu-textbox-buchungstext"  maxlength="256"/>
-				</row>
-				<row>
-					<label value="Mahnspanne" control="interessent-konto-neu-textbox-mahnspanne"/>
-					<hbox>
-						<textbox id="interessent-konto-neu-textbox-mahnspanne" value="30" maxlength="4" size="4"/>
-						<spacer flex="1" />			
-      				</hbox>
-				</row>
-				<row>
-					<label value="Typ" control="interessent-konto-neu-menulist-buchungstyp"/>
-					<menulist id="interessent-konto-neu-menulist-buchungstyp" 
-					          datasources="<?php echo APP_ROOT ?>rdf/buchungstyp.rdf.php" flex="1"
-					          ref="http://www.technikum-wien.at/buchungstyp/liste" >
-						<template>
-							<menupopup>
-								<menuitem value="rdf:http://www.technikum-wien.at/buchungstyp/rdf#buchungstyp_kurzbz"
-					        		      label="rdf:http://www.technikum-wien.at/buchungstyp/rdf#beschreibung"
-								  		  uri="rdf:*"/>
-								</menupopup>
-						</template>
-					</menulist>
-				</row>
-			</rows>
-	</grid>
-	<hbox>
-		<spacer flex="1" />
-		<button id="interessent-konto-neu-button-speichern" oncommand="InteressentKontoNeuSpeichern()" label="Speichern" />
-	</hbox>
-</groupbox>
-</vbox>
-</window>
\ No newline at end of file
diff --git a/content/student/interessentkontooverlay.xul.php b/content/student/interessentkontooverlay.xul.php
deleted file mode 100644
index 90f243790..000000000
--- a/content/student/interessentkontooverlay.xul.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?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="InteressentKonto"
-	xmlns:html="http://www.w3.org/1999/xhtml"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	>
-<!-- Zeugnis Overlay -->
-<vbox id="interessent-konto" style="overflow:auto; margin:0px;" flex="1">
-<popupset>
-	<popup id="interessent-konto-tree-popup">
-		<menuitem label="Entfernen" oncommand="InteressentKontoDelete();" id="interessent-konto-tree-popup-kontodel" hidden="false"/>
-	</popup>
-</popupset>
-<hbox flex="1">
-<grid id="interessent-konto-grid-detail" style="margin:4px;" flex="1">
-		  	<columns  >
-				<column flex="1"/>
-				<column flex="1"/>
-			</columns>
-			<rows>
-				<row>	
-					<hbox>
-						<spacer flex="1" />
-						<button id="interessent-konto-button-filter" value="alle" oncommand="InteressentKontoFilter()" label="offene" disabled="true"/>
-					</hbox>
-					<spacer />
-				</row>
-				
-				<row>
-					<tree id="interessent-konto-tree" seltype="multi" hidecolumnpicker="false" flex="1"
-						datasources="rdf:null" ref="http://www.technikum-wien.at/konto/liste"
-						style="margin-left:10px;margin-right:10px;margin-bottom:5px;margin-top: 10px;" height="100px" enableColumnDrag="true"
-						onselect="InteressentKontoAuswahl()"
-						context="interessent-konto-tree-popup"
-						flags="dont-build-content"
-					>
-					
-						<treecols>
-							<treecol id="interessent-konto-tree-buchungsdatum" label="Buchungsdatum" flex="2" hidden="false" primary="true"
-								class="sortDirectionIndicator"
-								sortActive="true"
-								sortDirection="ascending"
-								sort="rdf:http://www.technikum-wien.at/konto/rdf#buchungsdatum_iso"/>
-							<splitter class="tree-splitter"/>
-							<treecol id="interessent-konto-tree-buchungstext" label="Buchungstext" flex="5" hidden="false"
-							   class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/konto/rdf#buchungstext"/>
-							<splitter class="tree-splitter"/>
-							<treecol id="interessent-konto-tree-betrag" label="Betrag" flex="2" hidden="false"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/konto/rdf#betrag" />
-							<splitter class="tree-splitter"/>
-							<treecol id="interessent-konto-tree-studiensemester_kurzbz" label="StSem" flex="2" hidden="false"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/konto/rdf#studiensemester_kurzbz" />
-							<splitter class="tree-splitter"/>
-							<treecol id="interessent-konto-tree-buchungstyp_kurzbz" label="Typ" flex="2" hidden="true"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/konto/rdf#buchungstyp_kurzbz" />
-							<splitter class="tree-splitter"/>
-							<treecol id="interessent-konto-tree-buchungsnr" label="buchungs_nr" flex="2" hidden="true"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/konto/rdf#buchungsnr" />
-							<splitter class="tree-splitter"/>
-						</treecols>
-					
-						<template>
-							<treechildren flex="1" >
-									<treeitem uri="rdf:*">
-									<treerow>
-										<treecell label="rdf:http://www.technikum-wien.at/konto/rdf#buchungsdatum"/>
-										<treecell label="rdf:http://www.technikum-wien.at/konto/rdf#buchungstext"/>
-										<treecell label="rdf:http://www.technikum-wien.at/konto/rdf#betrag"/>
-										<treecell label="rdf:http://www.technikum-wien.at/konto/rdf#studiensemester_kurzbz"/>
-										<treecell label="rdf:http://www.technikum-wien.at/konto/rdf#buchungstyp_kurzbz"/>
-										<treecell label="rdf:http://www.technikum-wien.at/konto/rdf#buchungsnr"/>
-									</treerow>
-								</treeitem>
-							</treechildren>
-						</template>
-					</tree>
-					<vbox>
-						<hbox>
-							<button id="interessent-konto-button-neu" label="Neu" oncommand="InteressentKontoNeu();" disabled="true"/>
-							<button id="interessent-konto-button-gegenbuchung" label="Gegenbuchung" oncommand="InteressentKontoGegenbuchung();" disabled="true"/>
-							<button id="interessent-konto-button-loeschen" label="Loeschen" oncommand="InteressentKontoDelete();" disabled="true"/>
-							<spacer flex="1"/>
-							<button id="interessent-konto-button-zahlungsbestaetigung" label="Zahlungsbestaetigung drucken" oncommand="InteressentKontoZahlungsbestaetigung();" disabled="true"/>
-						</hbox>
-						<vbox hidden="true">
-							<label value="Buchungsnr" control="interessent-konto-textbox-buchungsnr"/>
-							<textbox id="interessent-konto-textbox-buchungsnr" disabled="true"/>
-						</vbox>
-						<groupbox id="interessent-konto-groupbox" flex="1">
-						<caption label="Details"/>
-							<grid id="interessent-konto-grid-detail" style="overflow:auto;margin:4px;" flex="1">
-							  	<columns  >
-									<column flex="1"/>
-									<column flex="5"/>
-								</columns>
-								<rows>
-									<row>
-										<label value="Betrag" control="interessent-konto-textbox-betrag"/>
-										<hbox>
-					      					<textbox id="interessent-konto-textbox-betrag" disabled="true" maxlength="9" size="9"/>
-					      					<spacer flex="1" />			
-					      				</hbox>
-									</row>
-									<row>
-										<label value="Buchungsdatum" control="interessent-konto-textbox-buchungsdatum"/>
-										<hbox>
-											<box class="Datum" id="interessent-konto-textbox-buchungsdatum" disabled="true"/>
-					      					<!--<textbox id="interessent-konto-textbox-buchungsdatum" disabled="true" maxlength="10" size="10"/>-->
-					      					<spacer flex="1" />			
-					      				</hbox>
-					      			</row>
-					      			<row>
-					      				<label value="Buchungstext" control="interessent-konto-textbox-buchungstext"/>
-							      		<textbox id="interessent-konto-textbox-buchungstext" disabled="true" maxlength="256"/>
-									</row>
-									<row>
-										<label value="Mahnspanne" control="interessent-konto-textbox-mahnspanne"/>
-										<hbox>
-											<textbox id="interessent-konto-textbox-mahnspanne" disabled="true" maxlength="4" size="4"/>
-											<spacer flex="1" />			
-					      				</hbox>
-									</row>
-									<row>
-										<label value="Typ" control="interessent-konto-menulist-buchungstyp"/>
-										<menulist id="interessent-konto-menulist-buchungstyp" disabled="true"
-										          datasources="<?php echo APP_ROOT ?>rdf/buchungstyp.rdf.php" flex="1"
-										          ref="http://www.technikum-wien.at/buchungstyp/liste" >
-											<template>
-												<menupopup>
-													<menuitem value="rdf:http://www.technikum-wien.at/buchungstyp/rdf#buchungstyp_kurzbz"
-										        		      label="rdf:http://www.technikum-wien.at/buchungstyp/rdf#beschreibung"
-													  		  uri="rdf:*"/>
-													</menupopup>
-											</template>
-										</menulist>
-									</row>
-								</rows>
-							</grid>
-							<hbox>
-								<spacer flex="1" />
-								<button id="interessent-konto-button-speichern" oncommand="InteressentKontoDetailSpeichern()" label="Speichern" disabled="true"/>
-							</hbox>
-						</groupbox>
-					</vbox>
-				</row>
-		</rows>
-</grid>
-</hbox>
-<spacer flex="1" />
-</vbox>
-</overlay>
\ No newline at end of file
diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
index 969d39649..9647ab0c7 100644
--- a/content/student/studentdetailoverlay.xul.php
+++ b/content/student/studentdetailoverlay.xul.php
@@ -331,7 +331,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
     		</groupbox>
    			<groupbox id="student-detail-groupbox-zgv">
 			<caption label="Zugangsvoraussetzung" />
-				<grid id="student-prestudent-grid-zgv" style="overflow:auto;margin:4px;" flex="1">
+				<grid id="student-prestudent-grid-zgv" style="margin:4px;" flex="1">
 				  	<columns  >
     					<column flex="1"/>
     					<column flex="5"/>
@@ -388,7 +388,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
     		</groupbox>
     		<groupbox id="student-detail-groupbox-reihungstest">
 			<caption label="Reihungstest" />
-				<grid id="student-prestudent-grid-reihungstest" style="overflow:auto;margin:4px;" flex="1">
+				<grid id="student-prestudent-grid-reihungstest" style="margin:4px;" flex="1">
 				  	<columns  >
     					<column flex="1"/>
     					<column flex="5"/>
diff --git a/content/student/studentenoverlay.xul.php b/content/student/studentenoverlay.xul.php
index ca2592fba..859c7fb78 100644
--- a/content/student/studentenoverlay.xul.php
+++ b/content/student/studentenoverlay.xul.php
@@ -38,6 +38,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/student/studentnotenoverlay.xul.ph
 echo '<?xul-overlay href="'.APP_ROOT.'content/student/studentpruefungoverlay.xul.php"?>';
 echo '<?xul-overlay href="'.APP_ROOT.'content/student/studentabschlusspruefungoverlay.xul.php"?>';
 echo '<?xul-overlay href="'.APP_ROOT.'content/student/studentprojektarbeitoverlay.xul.php"?>';
+echo '<?xul-overlay href="'.APP_ROOT.'content/student/interessentdokumenteoverlay.xul.php"?>';
 ?>
 <!DOCTYPE overlay >
 
@@ -140,9 +141,9 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/student/studentprojektarbeitoverla
 	    					class="sortDirectionIndicator"
 	    					sort="rdf:http://www.technikum-wien.at/student/rdf#gruppe" onclick="StudentTreeSort()"/>
 	    				<splitter class="tree-splitter"/>
-	    				<treecol id="student-treecol-studiengang_kz" label="StudiengangKz" flex="1" hidden="true"
+	    				<treecol id="student-treecol-studiengang" label="Studiengang" flex="1" hidden="true"
 	    					class="sortDirectionIndicator"
-	    					sort="rdf:http://www.technikum-wien.at/student/rdf#studiengang_kz" onclick="StudentTreeSort()"/>
+	    					sort="rdf:http://www.technikum-wien.at/student/rdf#studiengang" onclick="StudentTreeSort()"/>
 	    				<splitter class="tree-splitter"/>
 						<treecol id="student-treecol-matrikelnummer" label="Matrikelnummer" flex="1" hidden="false"
 	    					class="sortDirectionIndicator"
@@ -177,7 +178,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/student/studentprojektarbeitoverla
 	           							<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#studiengang" />
 	           							<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" />
@@ -198,7 +199,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/student/studentprojektarbeitoverla
 				<!-- ************ -->
 				<vbox flex="1"  style="overflow:auto;margin:0px;" persist="height">
 					<tabbox id="student-tabbox" flex="3" orient="vertical">
-						<tabs orient="horizontal" id="lehrveranstaltung-tabs">
+						<tabs orient="horizontal" id="student-content-tabs">
 							<tab id="student-tab-detail" label="Details" />
 							<tab id="student-tab-prestudent" label="PreStudent" />
 							<tab id="student-tab-dokumente" label="Dokumente" />
diff --git a/content/student/studentkontoneudialog.js.php b/content/student/studentkontoneudialog.js.php
index 210499b70..74adf1e69 100644
--- a/content/student/studentkontoneudialog.js.php
+++ b/content/student/studentkontoneudialog.js.php
@@ -51,22 +51,24 @@ function StudentKontoNeuInit()
 			for (var v = start.value; v <= end.value; v++)
 			{
 			col = tree.columns ? tree.columns["student-treecol-person_id"] : "student-treecol-person_id";
-			uid = tree.view.getCellText(v,col);
-			paramList += ';'+uid;
-			anzahl +=1;
+			person_id = tree.view.getCellText(v,col);
+			paramList += ';'+person_id;
+			anzahl = anzahl +1;
 			}
 	}
-
-	//Studiengang holen
-	try
-	{
-		studiengang_kz = document.getElementById('student-detail-menulist-studiengang_kz').value;
-	}
-	catch(e) 
-	{}
 	
-	if(studiengang_kz=='')
-		studiengang_kz = document.getElementById('student-prestudent-menulist-studiengang_kz').value;
+	tree_vb=window.opener.document.getElementById('tree-verband');
+
+	//Wenn nichts markiert wurde -> beenden
+	if(tree_vb.currentIndex==-1)
+	{
+		alert('Es muss ein Studiengang markiert sein!');
+		window.close();
+		return;
+	}
+		
+	col = tree_vb.columns ? tree_vb.columns["stg_kz"] : "stg_kz";
+	var stg_kz=tree_vb.view.getCellText(tree_vb.currentIndex,col);
 		
 	person_ids = paramList;
 	
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index 8ca7a12d7..0e0008639 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -436,6 +436,7 @@ function StudentGruppeDel()
 	var numRanges = tree.view.selection.getRangeCount();
 	var paramList= '';
 	var anzahl=0;
+	var uids='';
 	for (var t = 0; t < numRanges; t++)
 	{
   		tree.view.selection.getRangeAt(t,start,end);
@@ -443,7 +444,7 @@ function StudentGruppeDel()
 		{
 			col = tree.columns ? tree.columns["student-treecol-uid"] : "student-treecol-uid";
 			uid = ';'+tree.view.getCellText(v,col);
-			uids += uid;
+			uids = uids + uid;
 			anzahl++;
 		}
 	}
@@ -451,8 +452,15 @@ function StudentGruppeDel()
 	try
 	{
 		//Ausgewaehlte Gruppe holen
-        var col = tree_vb.columns ? tree_vb.columns["gruppe"] : "gruppe";
-		var gruppe_kurzbz=tree_vb.view.getCellText(tree_vb.currentIndex,col);
+		var gruppe_kurzbz = '';
+		try
+		{
+        	var col = tree_vb.columns ? tree_vb.columns["gruppe"] : "gruppe";
+			var gruppe_kurzbz=tree_vb.view.getCellText(tree_vb.currentIndex,col);
+		}
+		catch(e)
+		{}
+		
 		if(gruppe_kurzbz=='')
 		{
 			alert('Studenten koennen nur aus Spezialgruppen entfernt werden');
@@ -758,7 +766,7 @@ function StudentAuswahl()
 	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" ));
-	studiengang_kz=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#studiengang_kz" ));
+	studiengang_kz_student=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#studiengang_kz_student" ));
 	semester=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#semester" ));
 	verband=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#verband" ));
 	gruppe=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#gruppe" ));
@@ -793,7 +801,7 @@ function StudentAuswahl()
 	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+'&'+gettimestamp();
 	document.getElementById('student-detail-textbox-person_id').value=person_id;
-	document.getElementById('student-detail-menulist-studiengang_kz').value=studiengang_kz;
+	document.getElementById('student-detail-menulist-studiengang_kz').value=studiengang_kz_student;
 	document.getElementById('student-detail-textbox-semester').value=semester;
 	document.getElementById('student-detail-textbox-verband').value=verband;
 	document.getElementById('student-detail-textbox-gruppe').value=gruppe;
@@ -802,7 +810,7 @@ function StudentAuswahl()
 	//PreStudent Daten holen
 
 	aufmerksamdurch_kurzbz = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#aufmerksamdurch_kurzbz" ));
-	studiengang_kz = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#studiengang_kz" ));
+	studiengang_kz_prestudent = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#studiengang_kz_prestudent" ));
 	berufstaetigkeit_code = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#berufstaetigkeit_code" ));
 	ausbildungcode = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#ausbildungcode" ));
 	zgv_code = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgv_code" ));
@@ -850,7 +858,7 @@ function StudentAuswahl()
 	document.getElementById('student-prestudent-textbox-person_id').value=person_id;
 	document.getElementById('student-prestudent-textbox-prestudent_id').value=prestudent_id;
 	document.getElementById('student-prestudent-checkbox-new').checked=false;
-	document.getElementById('student-prestudent-menulist-studiengang_kz').value=studiengang_kz;
+	document.getElementById('student-prestudent-menulist-studiengang_kz').value=studiengang_kz_prestudent;
 	document.getElementById('student-prestudent-textbox-anmerkung').value=anmerkung;
 
 
@@ -899,6 +907,12 @@ function StudentAuswahl()
 		document.getElementById('interessent-toolbar-warteliste').hidden=false;
 		document.getElementById('interessent-toolbar-absage').hidden=false;
 		
+		//Wenn ein Tab markiert ist der nun ausgeblendet wurde, 
+		//dann wird der Detail Tab markiert
+		if(document.getElementById('student-content-tabs').selectedItem.collapsed)
+		{
+			document.getElementById('student-content-tabs').selectedItem=document.getElementById('student-tab-detail');
+		}
 	}
 	else
 	{
@@ -927,7 +941,7 @@ function StudentAuswahl()
 	//Dokumente
 	//linker Tree
 	doctree = document.getElementById('interessent-dokumente-tree-nichtabgegeben');
-	url='<?php echo APP_ROOT;?>rdf/dokument.rdf.php?studiengang_kz='+studiengang_kz+'&prestudent_id='+prestudent_id+"&"+gettimestamp();
+	url='<?php echo APP_ROOT;?>rdf/dokument.rdf.php?studiengang_kz='+studiengang_kz_prestudent+'&prestudent_id='+prestudent_id+"&"+gettimestamp();
 
 	//Alte DS entfernen
 	var oldDatasources = doctree.database.GetDataSources();
@@ -2984,16 +2998,26 @@ function StudentPruefungNeu()
 {
 	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 	StudentPruefungDetailDisableFields(false);
-
-	var verband_tree=document.getElementById('tree-verband');
-
+	
 	document.getElementById('student-pruefung-checkbox-neu').checked=true;
 
-	var col = verband_tree.columns ? verband_tree.columns["stg_kz"] : "stg_kz";
-	var stg_kz=verband_tree.view.getCellText(verband_tree.currentIndex,col);
-	col = verband_tree.columns ? verband_tree.columns["sem"] : "sem";
-	var sem=verband_tree.view.getCellText(verband_tree.currentIndex,col);
-
+	try
+	{
+		//Wenn nach dem Personen gesucht wurde, ist es moeglich, dass kein Studiengang gewaehlt ist.
+		//Dann wird der Studiengang/Semester des Studenten genommen
+		var verband_tree=document.getElementById('tree-verband');
+		var col = verband_tree.columns ? verband_tree.columns["stg_kz"] : "stg_kz";
+		var stg_kz=verband_tree.view.getCellText(verband_tree.currentIndex,col);
+		
+		col = verband_tree.columns ? verband_tree.columns["sem"] : "sem";
+		var sem=verband_tree.view.getCellText(verband_tree.currentIndex,col);
+	}
+	catch(e)
+	{	
+		var stg_kz = document.getElementById('student-detail-menulist-studiengang_kz').value;	
+		var sem = document.getElementById('student-detail-textbox-semester').value;
+	}
+	
 	//Lehrveranstaltung Drop Down laden
 	var LVDropDown = document.getElementById('student-pruefung-menulist-lehrveranstaltung');
 	url='<?php echo APP_ROOT;?>rdf/lehrveranstaltung.rdf.php?stg_kz='+stg_kz+"&sem="+sem+"&"+gettimestamp();
@@ -3163,12 +3187,22 @@ function StudentPruefungAuswahl()
 	anmerkung = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#anmerkung" ));
 	studiensemester_kurzbz = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#studiensemester_kurzbz" ));
 
-	var verband_tree=document.getElementById('tree-verband');
-
-	var col = verband_tree.columns ? verband_tree.columns["stg_kz"] : "stg_kz";
-	var stg_kz=verband_tree.view.getCellText(verband_tree.currentIndex,col);
-	col = verband_tree.columns ? verband_tree.columns["sem"] : "sem";
-	var sem=verband_tree.view.getCellText(verband_tree.currentIndex,col);
+	try
+	{
+		//Wenn nach dem Personen gesucht wurde, ist es moeglich, dass kein Studiengang gewaehlt ist.
+		//Dann wird der Studiengang/Semester des Studenten genommen
+		var verband_tree=document.getElementById('tree-verband');
+		var col = verband_tree.columns ? verband_tree.columns["stg_kz"] : "stg_kz";
+		var stg_kz=verband_tree.view.getCellText(verband_tree.currentIndex,col);
+		
+		col = verband_tree.columns ? verband_tree.columns["sem"] : "sem";
+		var sem=verband_tree.view.getCellText(verband_tree.currentIndex,col);
+	}
+	catch(e)
+	{	
+		var stg_kz = document.getElementById('student-detail-menulist-studiengang_kz').value;	
+		var sem = document.getElementById('student-detail-textbox-semester').value;
+	}
 
 	//Lehrveranstaltung Drop Down laden
 	var LVDropDown = document.getElementById('student-pruefung-menulist-lehrveranstaltung');
@@ -3244,13 +3278,22 @@ function StudentPruefungAuswahl()
 	document.getElementById('student-pruefung-textbox-pruefung_id').value=pruefung_id;
 }
 
+// ****
+// * Startet die Personensuche
+// ****
 function StudentSuche()
 {
 	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 	filter = document.getElementById('student-toolbar-textbox-suche').value;
 	
+	//Wenn mehr als 2 Zeichen eingegeben wurden, die Personensuche starten
 	if(filter.length>2)
 	{
+		//Bei der Suche wird die Markierung vom Verband Tree entfernt da
+		//es sonst zu Problemen kommen kann
+		document.getElementById('tree-verband').view.selection.clearSelection();
+
+		//Datasource setzten und Felder deaktivieren
 		url = "<?php echo APP_ROOT; ?>rdf/student.rdf.php?filter="+encodeURIComponent(filter)+"&"+gettimestamp();
 		
 		var treeStudent=document.getElementById('student-tree');
@@ -3293,12 +3336,18 @@ function StudentSuche()
 		alert('Es muessen mindestens 3 Zeichen eingegeben werden');		
 }
 
+// ****
+// * Wenn im Suchfeld Enter gedrueckt wird, dann die Suchfunktion starten
+// ****
 function StudentSearchFieldKeyPress(event)
 {
 	if(event.keyCode==13) //Enter
 		StudentSuche();
 }
 
+// ****
+// * Email an die markierten Studenten versenden
+// ****
 function StudentSendMail()
 {
 	mailempfaenger='';
diff --git a/include/prestudent.class.php b/include/prestudent.class.php
index 3cb8f305b..22ef2eb20 100644
--- a/include/prestudent.class.php
+++ b/include/prestudent.class.php
@@ -701,7 +701,7 @@ class prestudent extends person
 		
 	function getLastStatus($prestudent_id)
 	{
-		$qry = "SELECT * FROM public.tbl_prestudentrolle WHERE prestudent_id='$prestudent_id' ORDER BY datum DESC LIMIT 1";
+		$qry = "SELECT * FROM public.tbl_prestudentrolle WHERE prestudent_id='$prestudent_id' ORDER BY datum DESC, insertamum DESC LIMIT 1";
 		if($result = pg_query($this->conn, $qry))
 		{
 			if($row = pg_fetch_object($result))
diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php
index 90b4fbd01..cdf76290f 100644
--- a/rdf/student.rdf.php
+++ b/rdf/student.rdf.php
@@ -22,6 +22,7 @@ require_once('../include/studiengang.class.php');
 require_once('../include/datum.class.php');
 require_once('../include/studiensemester.class.php');
 require_once('../include/prestudent.class.php');
+require_once('../include/studiengang.class.php');
 
 // Datenbank Verbindung
 if (!$conn = pg_pconnect(CONN_STRING))
@@ -38,6 +39,7 @@ if(isset($_SERVER['REMOTE_USER']))
 	$user = get_uid();
 	loadVariables($conn, $user);
 }
+
 $gruppe_kurzbz=(isset($_GET['gruppe_kurzbz'])?$_GET['gruppe_kurzbz']:null);
 $gruppe=(isset($_GET['gruppe'])?$_GET['gruppe']:null);
 $verband=(isset($_GET['verband'])?$_GET['verband']:null);
@@ -48,6 +50,7 @@ $uid = (isset($_GET['uid'])?$_GET['uid']:null);
 $typ = (isset($_GET['typ'])?$_GET['typ']:null);
 $prestudent_id = (isset($_GET['prestudent_id'])?$_GET['prestudent_id']:null);
 $filter = (isset($_GET['filter'])?$_GET['filter']:null);
+$ss = (isset($_GET['ss'])?$_GET['ss']:null);
 
 if($studiensemester_kurzbz=='aktuelles')
 	$studiensemester_kurzbz = $semester_aktuell;
@@ -61,6 +64,12 @@ $datum_obj = new datum();
 
 if($xmlformat=='rdf')
 {	
+	$stg_arr = array();
+	$stg_obj = new studiengang($conn, null, null);
+	$stg_obj->getAll(null, false);
+	foreach ($stg_obj->result as $row) 
+		$stg_arr[$row->studiengang_kz]=$row->kuerzel;
+	
 	$rdf_url='http://www.technikum-wien.at/student';
 	echo '	
 	<RDF:RDF
@@ -119,14 +128,14 @@ if($xmlformat=='rdf')
 	}
 	function draw_prestudent($row)
 	{
-		global $rdf_url, $datum_obj;
+		global $rdf_url, $datum_obj, $stg_arr;
 		if($row->prestudent_id!='')
 		{
 		echo '	
 				<STUDENT:prestudent_id><![CDATA['.$row->prestudent_id.']]></STUDENT:prestudent_id>
 	    		<STUDENT:studiengang_kz_prestudent><![CDATA['.$row->studiengang_kz.']]></STUDENT:studiengang_kz_prestudent>
 				<STUDENT:aufmerksamdurch_kurzbz><![CDATA['.$row->aufmerksamdurch_kurzbz.']]></STUDENT:aufmerksamdurch_kurzbz>
-				<STUDENT:studiengang_kz><![CDATA['.$row->studiengang_kz.']]></STUDENT:studiengang_kz>
+				<STUDENT:studiengang><![CDATA['.$stg_arr[$row->studiengang_kz].']]></STUDENT:studiengang>
 				<STUDENT:berufstaetigkeit_code><![CDATA['.$row->berufstaetigkeit_code.']]></STUDENT:berufstaetigkeit_code>
 				<STUDENT:ausbildungcode><![CDATA['.$row->ausbildungcode.']]></STUDENT:ausbildungcode>
 				<STUDENT:zgv_code><![CDATA['.$row->zgv_code.']]></STUDENT:zgv_code>
diff --git a/rdf/studiengang.rdf.php b/rdf/studiengang.rdf.php
index 9e08eeb06..99a95590c 100644
--- a/rdf/studiengang.rdf.php
+++ b/rdf/studiengang.rdf.php
@@ -24,7 +24,7 @@ if (!$conn = @pg_pconnect(CONN_STRING))
 
 // raumtypen holen
 $studiengangDAO=new studiengang($conn);
-$studiengangDAO->getAll('typ, kurzbz');
+$studiengangDAO->getAll('typ, kurzbz', false);
 
 $rdf_url='http://www.technikum-wien.at/studiengang';