From 922892aa1210e8cb32ceee8d1211e98381122ac1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 18 Jun 2007 13:39:05 +0000
Subject: [PATCH] Kontakt Modul FAS Online

---
 content/adressedialog.js.php          |   6 +-
 content/adressedialog.xul.php         |   4 +-
 content/bankverbindungdialog.js.php   | 103 +++++++++
 content/bankverbindungdialog.xul.php  | 113 +++++++++
 content/fas.xul.php                   |   8 +-
 content/fasDBDML.php                  | 145 ++++++++++--
 content/fasoverlay.js.php             |   7 +
 content/kontakt.js.php                | 309 ++++++++++++++++++++++++-
 content/kontakt.xul.php               |  65 +++---
 content/kontaktdialog.js.php          |  95 ++++++++
 content/kontaktdialog.xul.php         | 117 ++++++++++
 content/phpRequest.js.php             |   4 +-
 content/student/studentoverlay.js.php | 315 ++++++++++++++------------
 include/bankverbindung.class.php      |  96 +++-----
 include/kontakt.class.php             | 150 ++++++------
 rdf/kontakt.rdf.php                   |   1 +
 rdf/kontakttyp.rdf.php                |  72 ++++++
 17 files changed, 1266 insertions(+), 344 deletions(-)
 create mode 100644 content/bankverbindungdialog.js.php
 create mode 100644 content/bankverbindungdialog.xul.php
 create mode 100644 content/kontaktdialog.js.php
 create mode 100644 content/kontaktdialog.xul.php
 create mode 100644 rdf/kontakttyp.rdf.php

diff --git a/content/adressedialog.js.php b/content/adressedialog.js.php
index 869fbd8a7..c89f697d2 100644
--- a/content/adressedialog.js.php
+++ b/content/adressedialog.js.php
@@ -50,7 +50,7 @@ function AdresseInit(adresse_id, person_id)
 	
 		var predicateNS = "http://www.technikum-wien.at/adresse/rdf";
 	
-		//Daten holen
+		//RDF parsen
 	
 		person_id = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#person_id" ));
 		name = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#name" ));
@@ -67,6 +67,7 @@ function AdresseInit(adresse_id, person_id)
 	}
 	else
 	{
+		//Defaultwerte bei Neuem Datensatz
 		neu = true;
 		name='';
 		strasse='';
@@ -102,6 +103,9 @@ function AdresseInit(adresse_id, person_id)
 	document.getElementById('adresse-menulist-firma').value=firma_id;
 }
 
+// ****
+// * Speichern der Daten
+// ****
 function AdresseSpeichern()
 {
 	if(window.opener.KontaktAdresseSpeichern(document))
diff --git a/content/adressedialog.xul.php b/content/adressedialog.xul.php
index cbaa016d1..5ccb5581a 100644
--- a/content/adressedialog.xul.php
+++ b/content/adressedialog.xul.php
@@ -89,14 +89,14 @@ else
 		      		</hbox>
 				</row>
 				<row>
-					<label value="Ort ??" control="adresse-textbox-ort"/>
+					<label value="Ort" control="adresse-textbox-ort"/>
 					<hbox>
 						<textbox id="adresse-textbox-ort" maxlength="256" size="30"/>
 						<spacer flex="1" />			
       				</hbox>
 				</row>
 				<row>
-					<label value="Gemeinde ??" />
+					<label value="Gemeinde" />
 					<hbox>						
 						<textbox id="adresse-textbox-gemeinde" maxlength="256" size="30" />
 						<spacer flex="1" />			
diff --git a/content/bankverbindungdialog.js.php b/content/bankverbindungdialog.js.php
new file mode 100644
index 000000000..925b13bc2
--- /dev/null
+++ b/content/bankverbindungdialog.js.php
@@ -0,0 +1,103 @@
+<?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);
+?>
+
+// ****
+// * Laedt die zu bearbeitenden Daten
+// ****
+function BankverbindungInit(bankverbindung_id, person_id)
+{
+	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+	
+	if(bankverbindung_id!='')
+	{
+		//Daten holen
+		var url = '<?php echo APP_ROOT ?>rdf/bankverbindung.rdf.php?bankverbindung_id='+bankverbindung_id+'&'+gettimestamp();
+			
+		var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].
+	                   getService(Components.interfaces.nsIRDFService);
+	    
+	    var dsource = rdfService.GetDataSourceBlocking(url);
+	    
+		var subject = rdfService.GetResource("http://www.technikum-wien.at/bankverbindung/" + bankverbindung_id);
+	
+		var predicateNS = "http://www.technikum-wien.at/bankverbindung/rdf";
+	
+		//RDF parsen
+	
+		person_id = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#person_id" ));
+		name = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#name" ));
+		anschrift = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#anschrift" ));
+		bic = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#bic" ));
+		blz = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#blz" ));
+		iban = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#iban" ));
+		kontonr = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#kontonr" ));
+		typ = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#typ" ));
+		verrechnung = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#verrechnung" ));
+		neu = false;
+	}
+	else
+	{
+		//Defaultwerte bei Neuem Datensatz
+		neu = true;
+		name='';
+		anschrift='';
+		bic='';
+		blz='';
+		iban='';
+		kontonr='';
+		typ='p';
+		verrechnung='Ja';
+	}		
+	
+	document.getElementById('bankverbindung-checkbox-neu').checked=neu;
+	document.getElementById('bankverbindung-textbox-person_id').value=person_id;
+	document.getElementById('bankverbindung-textbox-bankverbindung_id').value=bankverbindung_id;
+	document.getElementById('bankverbindung-textbox-name').value=name;
+	document.getElementById('bankverbindung-textbox-anschrift').value=anschrift;
+	document.getElementById('bankverbindung-textbox-bic').value=bic;
+	document.getElementById('bankverbindung-textbox-blz').value=blz;
+	document.getElementById('bankverbindung-textbox-iban').value=iban;
+	document.getElementById('bankverbindung-textbox-kontonr').value=kontonr;
+	document.getElementById('bankverbindung-menulist-typ').value=typ;
+	if(verrechnung=='Ja')
+		document.getElementById('bankverbindung-checkbox-verrechnung').checked=true;
+	else
+		document.getElementById('bankverbindung-checkbox-verrechnung').checked=false;	
+}
+
+// ****
+// * Speichern der Daten
+// ****
+function BankverbindungSpeichern()
+{
+	if(window.opener.KontaktBankverbindungSpeichern(document))
+		window.close();
+}
\ No newline at end of file
diff --git a/content/bankverbindungdialog.xul.php b/content/bankverbindungdialog.xul.php
new file mode 100644
index 000000000..f15d6038f
--- /dev/null
+++ b/content/bankverbindungdialog.xul.php
@@ -0,0 +1,113 @@
+<?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"?>';
+	
+if(isset($_GET['bankverbindung_id']) && is_numeric($_GET['bankverbindung_id']))
+	$bankverbindung_id=$_GET['bankverbindung_id'];
+else 
+	$bankverbindung_id='';
+	
+if(isset($_GET['person_id']) && is_numeric($_GET['person_id']))
+	$person_id=$_GET['person_id'];
+else 
+	$person_id='';
+?>
+
+<window id="bankverbindung-dialog" title="Bankverbindung"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onload="BankverbindungInit(<?php echo ($bankverbindung_id!=''?$bankverbindung_id:"''").','.($person_id!=''?$person_id:"''"); ?>)"
+        >
+
+<script type="application/x-javascript" src="<?php echo APP_ROOT; ?>content/bankverbindungdialog.js.php" />
+<script type="application/x-javascript" src="<?php echo APP_ROOT; ?>content/functions.js.php" />
+
+<vbox>
+
+<textbox id="bankverbindung-textbox-bankverbindung_id" hidden="true"/>
+<textbox id="bankverbindung-textbox-person_id" hidden="true"/>
+<checkbox id="bankverbindung-checkbox-neu" hidden="true"/>
+
+<groupbox id="bankverbindung-groupbox" flex="1">
+	<caption label="Details"/>
+		<grid id="bankverbindung-grid-detail" style="overflow:auto;margin:4px;" flex="1">
+		  	<columns  >
+				<column flex="1"/>
+				<column flex="5"/>
+			</columns>
+			<rows>
+				<row>
+					<label value="Name" control="bankverbindung-textbox-name"/>
+					<textbox id="bankverbindung-textbox-name" maxlength="64"/>
+				</row>
+				<row>
+					<label value="Anschrift" control="bankverbindung-textbox-anschrift"/>
+					<textbox id="bankverbindung-textbox-anschrift" maxlength="128"/>
+      			</row>
+				<row>
+					<label value="BIC" control="bankverbindung-textbox-bic"/>
+   					<textbox id="bankverbindung-textbox-bic" maxlength="64"/>
+				</row>				
+      			<row>
+					<label value="BLZ" control="bankverbindung-textbox-blz"/>
+   					<textbox id="bankverbindung-textbox-blz" checked="true"/>
+      			</row>
+				<row>
+					<label value="IBAN" control="bankverbindung-textbox-iban"/>
+   					<textbox id="bankverbindung-textbox-iban" checked="true"/>
+      			</row>
+				<row>
+					<label value="Kontonummer" control="bankverbindung-textbox-kontonr"/>
+   					<textbox id="bankverbindung-textbox-kontonr" checked="true"/>
+      			</row>
+      			<row>
+					<label value="Typ" control="bankverbindung-textbox-typ"/>
+   					<menulist id="bankverbindung-menulist-typ" flex="1">
+							<menupopup>
+								<menuitem value="p" label="Privatkonto"/>
+								<menuitem value="f" label="Firmenkonto"/>
+							</menupopup>
+					</menulist>
+      			</row>
+      			<row>
+					<label value="Verrechnungskonto" control="bankverbindung-textbox-verrechnung"/>
+   					<checkbox id="bankverbindung-checkbox-verrechnung" checked="true"/>
+      			</row>
+			</rows>
+	</grid>
+	<hbox>
+		<spacer flex="1" />
+		<button id="bankverbindung-button-speichern" oncommand="BankverbindungSpeichern()" label="Speichern" />
+	</hbox>
+</groupbox>
+</vbox>
+</window>
\ No newline at end of file
diff --git a/content/fas.xul.php b/content/fas.xul.php
index 42527f26a..780ea353b 100644
--- a/content/fas.xul.php
+++ b/content/fas.xul.php
@@ -21,9 +21,9 @@
  */
 header("Content-type: application/vnd.mozilla.xul+xml");
 echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
-include('../vilesci/config.inc.php');
-include('../include/functions.inc.php');
-include('../include/fas/benutzer.class.php');
+require_once('../vilesci/config.inc.php');
+require_once('../include/functions.inc.php');
+require_once('../include/fas/benutzer.class.php');
 
 // Testumgebung
 $user=get_uid();
@@ -40,7 +40,7 @@ if(!$benutzer->loadVariables($user))
 	$error_msg = $benutzer->errormsg;
 /*echo '<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>';*/
 echo '<?xml-stylesheet href="'.APP_ROOT.'skin/tempus.css" type="text/css"?>';
-echo "<?xml-stylesheet href=\"".APP_ROOT."content/bindings.css\" type=\"text/css\" ?>";
+echo '<?xml-stylesheet href="'.APP_ROOT.'content/bindings.css" type="text/css" ?>';
 echo '<?xul-overlay href="'.APP_ROOT.'content/fasoverlay.xul.php"?>';
 ?>
 <!DOCTYPE window [
diff --git a/content/fasDBDML.php b/content/fasDBDML.php
index 77db8d6eb..29e164f7d 100644
--- a/content/fasDBDML.php
+++ b/content/fasDBDML.php
@@ -21,16 +21,12 @@
  */
 
 // ****************************************
-// * Insert/Update/Delete
-// * der Lehreinheiten
-// *
 // * Script sorgt fuer den Datenbanzugriff
-// * fuer das XUL - Lehreinheiten-Modul
+// * der folgender FASonline Daten:
 // *
-// * Derzeitige Funktionen:
-// * - Lehreinheitmitarbeiter Zuteilung hinzufuegen/bearbeiten/loeschen
-// * - Lehreinheitgruppe Zutelung hinzufuegen/loeschen
-// * - Lehreinheit anlegen/bearbeiten/loeschen
+// * - Adressen
+// * - Kontakte
+// * - Bankverbindungen
 // ****************************************
 
 require_once('../vilesci/config.inc.php');
@@ -38,9 +34,11 @@ require_once('../include/functions.inc.php');
 require_once('../include/benutzerberechtigung.class.php');
 require_once('../include/log.class.php');
 require_once('../include/adresse.class.php');
+require_once('../include/kontakt.class.php');
+require_once('../include/bankverbindung.class.php');
 
 $user = get_uid();
-
+//header("Content-type: application/xhtml+xml");
 //error_reporting(0);
 
 // Datenbank Verbindung
@@ -65,7 +63,8 @@ if(!$rechte->isBerechtigt('admin'))
 
 if(!$error)
 {
-	if(isset($_POST['type']) && $_POST['type']=='adressesave')
+	//in der Variable type wird die auszufuehrende Aktion mituebergeben
+	if(isset($_POST['type']) && $_POST['type']=='adressesave') // ***** ADRESSEN ***** //
 	{
 		//Speichert die Adressdaten in die Datenbank
 		$adresse = new adresse($conn, null, true);
@@ -96,8 +95,6 @@ if(!$error)
 		$adresse->firma_id = $_POST['firma_id'];
 		$adresse->updateamum = date('Y-m-d H:i:s');
 		$adresse->updatevon = $user;
-		$adresse->insertamum = date('Y-m-d H:i:s');
-		$adresse->insertvon = $user;
 		
 		//Wenn die Nation Oesterreich ist, dann muss die Gemeinde in der Tabelle Gemeinde vorkommen
 		if($_POST['nation']=='A')
@@ -136,7 +133,7 @@ if(!$error)
 	}
 	elseif(isset($_POST['type']) && $_POST['type']=='adressedelete')
 	{
-		//Speichert die Adressdaten in die Datenbank
+		//Loescht Adressen aus der DB
 		$adresse = new adresse($conn, null, true);
 		
 		if($adresse->delete($_POST['adresse_id']))
@@ -149,6 +146,115 @@ if(!$error)
 			$errormsg = $adresse->errormsg;
 		}
 	}
+	elseif(isset($_POST['type']) && $_POST['type']=='kontaktsave') // ***** KONTAKT ***** //
+	{
+		//Speichert die Kontaktdaten in die Datenbank
+		$kontakt = new kontakt($conn, null, true);
+		
+		if($_POST['neu']=='false')
+		{
+			$kontakt->load($_POST['kontakt_id']);
+			$kontakt->new = false;
+		}
+		else 
+		{
+			$kontakt->insertamum = date('Y-m-d H:i:s');
+			$kontakt->insertvon = $user;
+			$kontakt->new = true;
+		}
+		
+		$kontakt->kontakt_id = $_POST['kontakt_id'];
+		$kontakt->person_id = $_POST['person_id'];
+		$kontakt->anmerkung = $_POST['anmerkung'];
+		$kontakt->kontakt = $_POST['kontakt'];
+		$kontakt->kontakttyp = $_POST['typ'];
+		$kontakt->zustellung = ($_POST['zustellung']=='true'?true:false);
+		$kontakt->firma_id = $_POST['firma_id'];
+		$kontakt->updateamum = date('Y-m-d H:i:s');
+		$kontakt->updatevon = $user;
+		
+		if($kontakt->save())
+		{
+			$return = true;
+			$data = $kontakt->kontakt_id;
+		}
+		else 
+		{
+			$return = false;
+			$errormsg = $kontakt->errormsg;
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='kontaktdelete')
+	{
+		//Loescht Kontaktdaten aus der Datenbank
+		$kontakt = new kontakt($conn, null, true);
+		
+		if($kontakt->delete($_POST['kontakt_id']))
+		{
+			$return = true;
+		}
+		else 
+		{
+			$return = false;
+			$errormsg = $kontakt->errormsg;
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='bankverbindungsave') // ***** BANKVERBINDUNG ***** //
+	{
+		//Speichert die Kontaktdaten in die Datenbank
+		$bankverbindung = new bankverbindung($conn, null, true);
+		
+		if($_POST['neu']=='false')
+		{
+			$bankverbindung->load($_POST['bankverbindung_id']);
+			$bankverbindung->new = false;
+		}
+		else 
+		{
+			$bankverbindung->insertamum = date('Y-m-d H:i:s');
+			$bankverbindung->insertvon = $user;
+			$bankverbindung->new = true;
+		}
+		
+		$bankverbindung->bankverbindung_id = $_POST['bankverbindung_id'];
+		$bankverbindung->person_id = $_POST['person_id'];
+		$bankverbindung->name = $_POST['name'];
+		$bankverbindung->anschrift = $_POST['anschrift'];
+		$bankverbindung->bic = $_POST['bic'];
+		$bankverbindung->blz = $_POST['blz'];
+		$bankverbindung->iban = $_POST['iban'];
+		$bankverbindung->kontonr = $_POST['kontonr'];
+		$bankverbindung->typ = $_POST['typ'];
+		$bankverbindung->verrechnung = ($_POST['verrechnung']=='true'?true:false);
+		$bankverbindung->updateamum = date('Y-m-d H:i:s');
+		$bankverbindung->updatevon = $user;
+		
+		if($bankverbindung->save())
+		{
+			$return = true;
+			$data = $bankverbindung->bankverbindung_id;
+		}
+		else 
+		{
+			$return = false;
+			$errormsg = $bankverbindung->errormsg;
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='bankverbindungdelete')
+	{
+		//Loescht Bankverbindungen aus der Datenbank
+		$bankverbindung = new bankverbindung($conn, null, true);
+		
+		if($bankverbindung->delete($_POST['bankverbindung_id']))
+		{
+			$return = true;
+		}
+		else 
+		{
+			$return = false;
+			$errormsg = $bankverbindung->errormsg;
+		}
+	}
 	else
 	{
 		$return = false;
@@ -156,8 +262,9 @@ if(!$error)
 		$data = '';
 	}
 }
-?>
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+//RDF mit den Returnwerden ausgeben
+echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <RDF:RDF
 	xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 	xmlns:NC="http://home.netscape.com/NC-rdf#"
@@ -166,10 +273,12 @@ if(!$error)
   <RDF:Seq RDF:about="http://www.technikum-wien.at/dbdml/msg">
 	<RDF:li>
     	<RDF:Description RDF:about="http://www.technikum-wien.at/dbdml/0" >
-    		<DBDML:return><?php echo ($return?'true':'false'); ?></DBDML:return>
-        	<DBDML:errormsg><![CDATA[<?php echo $errormsg; ?>]]></DBDML:errormsg>
-        	<DBDML:data><![CDATA[<?php echo $data ?>]]></DBDML:data>
+    		<DBDML:return>'.($return?'true':'false').'</DBDML:return>
+        	<DBDML:errormsg><![CDATA['.$errormsg.']]></DBDML:errormsg>
+        	<DBDML:data><![CDATA['.$data.']]></DBDML:data>
         </RDF:Description>
 	</RDF:li>
   </RDF:Seq>
 </RDF:RDF>
+';
+?>
\ No newline at end of file
diff --git a/content/fasoverlay.js.php b/content/fasoverlay.js.php
index 1abce9927..16050a40f 100644
--- a/content/fasoverlay.js.php
+++ b/content/fasoverlay.js.php
@@ -233,10 +233,17 @@ function onVerbandSelect(event)
 			treeStudent.database.AddDataSource(StudentTreeDatasource);
 			StudentTreeDatasource.addXMLSinkObserver(StudentTreeSinkObserver);
 			treeStudent.builder.addListener(StudentTreeListener);
+			
+			//Detailfelder Deaktivieren
 			StudentDetailReset();
 			StudentDetailDisableFields(true);
 			StudentPrestudentDisableFields(true);
 			StudentKontoDisableFields(true);
+			StudentAkteDisableFields(true);
+			StudentBetriebsmittelDisableFields(true);
+			StudentIODisableFields(true);
+			StudentNoteDisableFields(true);
+			document.getElementById('student-kontakt').setAttribute('src','');
 		}
 		catch(e)
 		{
diff --git a/content/kontakt.js.php b/content/kontakt.js.php
index 69d3e56e8..3ae1f9826 100644
--- a/content/kontakt.js.php
+++ b/content/kontakt.js.php
@@ -36,6 +36,7 @@ var KontaktKontaktSelectID=null; // ID des Kontaktes der nach dem Rebuild markie
 var BankverbindungTreeDatasource=''; // Datasource des Bankverbindung Trees
 var KontaktBankverbindungSelectID=null; // ID der Bankverbindung die nach dem Rebuild markiert werden soll
 var KontaktPerson_id=null;
+
 // ********** LISTENER UND OBSERVER ********** //
 
 // ****
@@ -139,7 +140,12 @@ var KontaktBankverbindungTreeListener =
       window.setTimeout(KontaktBankverbindungTreeSelectID,10);
   }
 };
+
 // ********** FUNKTIONEN ********** //
+
+// ****
+// * Laedt die Trees
+// ****
 function loadKontakte(person_id)
 {
 	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
@@ -296,11 +302,17 @@ function KontaktAdresseSpeichern(dialog)
 	}
 }
 
+// ****
+// * Neu Dialog oeffnen
+// ****
 function KontaktAdresseNeu()
 {
 	window.open("<?php echo APP_ROOT; ?>content/adressedialog.xul.php?person_id="+KontaktPerson_id,"","chrome, status=no, width=500, height=350, centerscreen, resizable");
 }
 
+// ****
+// * Bearbeiten Dialog oeffnen
+// ****
 function KontaktAdresseBearbeiten()
 {
 	tree = document.getElementById('kontakt-adressen-tree');
@@ -314,6 +326,9 @@ function KontaktAdresseBearbeiten()
 	window.open("<?php echo APP_ROOT; ?>content/adressedialog.xul.php?adresse_id="+adresse_id,"","chrome, status=no, width=500, height=350, centerscreen, resizable");
 }
 
+// ****
+// * markierten Datensatz loeschen
+// ****
 function KontaktAdresseDelete()
 {
 	tree = document.getElementById('kontakt-adressen-tree');
@@ -354,6 +369,24 @@ function KontaktAdresseDelete()
 	}
 }
 
+// ****
+// * Beim Sortieren des Trees wird der markierte Eintrag gespeichert und nach dem sortieren
+// * wieder markiert. 
+// ****
+function KontaktAdresseTreeSort()
+{
+	var i;
+	var tree=document.getElementById('kontakt-adressen-tree');
+	if(tree.currentIndex>=0)
+		i = tree.currentIndex;
+	else
+		i = 0;
+	col = tree.columns ? tree.columns["kontakt-adressen-treecol-adresse_id"] : "kontakt-adressen-treecol-adresse_id";
+	KontaktAdresseSelectID = tree.view.getCellText(i,col);
+	window.setTimeout("KontaktAdressenTreeSelectID()",10);
+}
+
+
 // ********** KONTAKTE ********** //
 
 // ****
@@ -386,6 +419,139 @@ function KontaktKontaktTreeSelectID()
 	}
 }
 
+// ****
+// * Speichert die Kontaktdaten
+// ****
+function KontaktKontaktSpeichern(dialog)
+{
+	neu = dialog.getElementById('kontakt-checkbox-neu').checked;
+	person_id = dialog.getElementById('kontakt-textbox-person_id').value;
+	kontakt_id = dialog.getElementById('kontakt-textbox-kontakt_id').value;
+	anmerkung = dialog.getElementById('kontakt-textbox-anmerkung').value;
+	kontakt = dialog.getElementById('kontakt-textbox-kontakt').value;
+	zustellung = dialog.getElementById('kontakt-checkbox-zustellung').checked;
+	typ = dialog.getElementById('kontakt-menulist-typ').value;
+	firma_id = dialog.getElementById('kontakt-menulist-firma').value;
+		
+	var url = '<?php echo APP_ROOT ?>content/fasDBDML.php';
+	var req = new phpRequest(url,'','');
+	
+	req.add('type', 'kontaktsave');
+	
+	req.add('neu', neu);
+	req.add('person_id', person_id);
+	req.add('kontakt_id', kontakt_id);
+	req.add('anmerkung', anmerkung);
+	req.add('kontakt', kontakt);
+	req.add('typ', typ);
+	req.add('zustellung', zustellung);
+	req.add('firma_id', firma_id);
+
+	var response = req.executePOST();
+
+	var val =  new ParseReturnValue(response)
+	
+	if (!val.dbdml_return)
+	{
+		if(val.dbdml_errormsg=='')
+			alert(response)
+		else
+			alert(val.dbdml_errormsg)
+		return false;
+	}
+	else
+	{
+		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+		KontaktKontaktSelectID = val.dbdml_data;
+		KontaktTreeDatasource.Refresh(false);
+		return true;
+	}
+}
+
+// ****
+// * Neu Dialog anzeigen
+// ****
+function KontaktKontaktNeu()
+{
+	window.open("<?php echo APP_ROOT; ?>content/kontaktdialog.xul.php?person_id="+KontaktPerson_id,"","chrome, status=no, width=500, height=350, centerscreen, resizable");
+}
+
+// ****
+// * Bearbeiten Dialog anzeigen
+// ****
+function KontaktKontaktBearbeiten()
+{
+	tree = document.getElementById('kontakt-kontakt-tree');
+	
+	if (tree.currentIndex==-1) return;
+	
+	//Ausgewaehlte ID holen
+    var col = tree.columns ? tree.columns["kontakt-kontakt-treecol-kontakt_id"] : "kontakt-kontakt-treecol-kontakt_id";
+	var kontakt_id=tree.view.getCellText(tree.currentIndex,col);
+	
+	window.open("<?php echo APP_ROOT; ?>content/kontaktdialog.xul.php?kontakt_id="+kontakt_id,"","chrome, status=no, width=500, height=350, centerscreen, resizable");
+}
+
+// ****
+// * markierten Datensatz loeschen
+// ****
+function KontaktKontaktDelete()
+{
+	tree = document.getElementById('kontakt-kontakt-tree');
+	
+	if (tree.currentIndex==-1) return;
+	
+	//Ausgewaehlte ID holen
+    var col = tree.columns ? tree.columns["kontakt-kontakt-treecol-kontakt_id"] : "kontakt-kontakt-treecol-kontakt_id";
+	var kontakt_id=tree.view.getCellText(tree.currentIndex,col);
+	
+	if(confirm('Diesen Kontakt wirklich loeschen?'))
+	{
+		var url = '<?php echo APP_ROOT ?>content/fasDBDML.php';
+		var req = new phpRequest(url,'','');
+		
+		req.add('type', 'kontaktdelete');
+		
+		req.add('kontakt_id', kontakt_id);
+	
+		var response = req.executePOST();
+	
+		var val =  new ParseReturnValue(response)
+		
+		if (!val.dbdml_return)
+		{
+			if(val.dbdml_errormsg=='')
+				alert(response)
+			else
+				alert(val.dbdml_errormsg)
+			return false;
+		}
+		else
+		{
+			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+			KontaktTreeDatasource.Refresh(false);
+			return true;
+		}
+	}
+}
+
+// ****
+// * Beim Sortieren des Trees wird der markierte Eintrag gespeichert und nach dem sortieren
+// * wieder markiert. 
+// ****
+function KontaktKontaktTreeSort()
+{
+	var i;
+	var tree=document.getElementById('kontakt-kontakt-tree');
+	if(tree.currentIndex>=0)
+		i = tree.currentIndex;
+	else
+		i = 0;
+	col = tree.columns ? tree.columns["kontakt-kontakt-treecol-kontakt_id"] : "kontakt-kontakt-treecol-kontakt_id";
+	KontaktKontaktSelectID = tree.view.getCellText(i,col);
+	window.setTimeout("KontaktKontaktTreeSelectID()",10);
+}
+
 // ********** BANKVERBINDUNG ********** //
 
 // ****
@@ -416,4 +582,145 @@ function KontaktBankverbindungTreeSelectID()
 			}
 	   	}
 	}
-}
\ No newline at end of file
+}
+
+
+// ****
+// * Speichert die Bankdaten
+// ****
+function KontaktBankverbindungSpeichern(dialog)
+{
+	neu = dialog.getElementById('bankverbindung-checkbox-neu').checked;
+	person_id = dialog.getElementById('bankverbindung-textbox-person_id').value;
+	bankverbindung_id = dialog.getElementById('bankverbindung-textbox-bankverbindung_id').value;
+	name = dialog.getElementById('bankverbindung-textbox-name').value;
+	anschrift = dialog.getElementById('bankverbindung-textbox-anschrift').value;
+	bic = dialog.getElementById('bankverbindung-textbox-bic').value;
+	blz = dialog.getElementById('bankverbindung-textbox-blz').value;
+	iban = dialog.getElementById('bankverbindung-textbox-iban').value;
+	kontonr = dialog.getElementById('bankverbindung-textbox-kontonr').value;
+	typ = dialog.getElementById('bankverbindung-menulist-typ').value;
+	verrechnung = dialog.getElementById('bankverbindung-checkbox-verrechnung').checked;
+		
+	var url = '<?php echo APP_ROOT ?>content/fasDBDML.php';
+	var req = new phpRequest(url,'','');
+	
+	req.add('type', 'bankverbindungsave');
+	
+	req.add('neu', neu);
+	req.add('person_id', person_id);
+	req.add('bankverbindung_id', bankverbindung_id);
+	req.add('name', name);
+	req.add('anschrift', anschrift);
+	req.add('bic', bic);
+	req.add('blz', blz);
+	req.add('iban', kontonr);
+	req.add('kontonr', kontonr);
+	req.add('typ', typ);
+	req.add('verrechnung', verrechnung);
+
+	var response = req.executePOST();
+
+	var val =  new ParseReturnValue(response)
+	
+	if (!val.dbdml_return)
+	{
+		if(val.dbdml_errormsg=='')
+			alert(response)
+		else
+			alert(val.dbdml_errormsg)
+		return false;
+	}
+	else
+	{
+		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+		KontaktBankverbindungSelectID = val.dbdml_data;
+		BankverbindungTreeDatasource.Refresh(false);
+		return true;
+	}
+}
+
+// ****
+// * Neu Dialog anzeigen
+// ****
+function KontaktBankverbindungNeu()
+{
+	window.open("<?php echo APP_ROOT; ?>content/bankverbindungdialog.xul.php?person_id="+KontaktPerson_id,"","chrome, status=no, width=500, height=350, centerscreen, resizable");
+}
+
+// ****
+// * Bearbeiten Dialog anzeigen
+// ****
+function KontaktBankverbindungBearbeiten()
+{
+	tree = document.getElementById('kontakt-bankverbindung-tree');
+	
+	if (tree.currentIndex==-1) return;
+	
+	//Ausgewaehlte ID holen
+    var col = tree.columns ? tree.columns["kontakt-bankverbindung-treecol-bankverbindung_id"] : "kontakt-bankverbindung-treecol-bankverbindung_id";
+	var bankverbindung_id=tree.view.getCellText(tree.currentIndex,col);
+	
+	window.open("<?php echo APP_ROOT; ?>content/bankverbindungdialog.xul.php?bankverbindung_id="+bankverbindung_id,"","chrome, status=no, width=500, height=350, centerscreen, resizable");
+}
+
+// ****
+// * markierten Datensatz loeschen
+// ****
+function KontaktBankverbindungDelete()
+{
+	tree = document.getElementById('kontakt-bankverbindung-tree');
+	
+	if (tree.currentIndex==-1) return;
+	
+	//Ausgewaehlte ID holen
+    var col = tree.columns ? tree.columns["kontakt-bankverbindung-treecol-bankverbindung_id"] : "kontakt-bankverbindung-treecol-bankverbindung_id";
+	var bankverbindung_id=tree.view.getCellText(tree.currentIndex,col);
+	
+	if(confirm('Diese Bankverbindung wirklich loeschen?'))
+	{
+		var url = '<?php echo APP_ROOT ?>content/fasDBDML.php';
+		var req = new phpRequest(url,'','');
+		
+		req.add('type', 'bankverbindungdelete');
+		
+		req.add('bankverbindung_id', bankverbindung_id);
+	
+		var response = req.executePOST();
+	
+		var val =  new ParseReturnValue(response)
+		
+		if (!val.dbdml_return)
+		{
+			if(val.dbdml_errormsg=='')
+				alert(response)
+			else
+				alert(val.dbdml_errormsg)
+			return false;
+		}
+		else
+		{
+			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+			BankverbindungTreeDatasource.Refresh(false);
+			return true;
+		}
+	}
+}
+
+
+// ****
+// * Beim Sortieren des Trees wird der markierte Eintrag gespeichert und nach dem sortieren
+// * wieder markiert. 
+// ****
+function KontaktBankverbindungTreeSort()
+{
+	var i;
+	var tree=document.getElementById('kontakt-bankverbindung-tree');
+	if(tree.currentIndex>=0)
+		i = tree.currentIndex;
+	else
+		i = 0;
+	col = tree.columns ? tree.columns["kontakt-bankverbindung-treecol-bankverbindung_id"] : "kontakt-bankverbindung-treecol-bankverbindung_id";
+	KontaktBankverbindungSelectID = tree.view.getCellText(i,col);
+	window.setTimeout("KontaktBankverbindungTreeSelectID()",10);
+}
diff --git a/content/kontakt.xul.php b/content/kontakt.xul.php
index 91d4ea260..2e2c05000 100644
--- a/content/kontakt.xul.php
+++ b/content/kontakt.xul.php
@@ -64,51 +64,51 @@ else
 				<treecols>
 					<treecol id="kontakt-adressen-treecol-name" label="Name" flex="1" hidden="false"
 						class="sortDirectionIndicator"
-						sort="rdf:http://www.technikum-wien.at/adresse/rdf#name" onclick="KontaktAdressenTreeSort()"/>
+						sort="rdf:http://www.technikum-wien.at/adresse/rdf#name" onclick="KontaktAdresseTreeSort()"/>
 					<splitter class="tree-splitter"/>
 					<treecol id="kontakt-adressen-treecol-strasse" label="Strasse" flex="1" hidden="false"
 						class="sortDirectionIndicator"
-						sort="rdf:http://www.technikum-wien.at/adresse/rdf#strasse" onclick="KontaktAdressenTreeSort()"/>
+						sort="rdf:http://www.technikum-wien.at/adresse/rdf#strasse" onclick="KontaktAdresseTreeSort()"/>
 					<splitter class="tree-splitter"/>
 					<treecol id="kontakt-adressen-treecol-plz" label="Plz" flex="1" hidden="false"
 						class="sortDirectionIndicator"
-						sort="rdf:http://www.technikum-wien.at/adresse/rdf#plz" onclick="KontaktAdressenTreeSort()"/>
+						sort="rdf:http://www.technikum-wien.at/adresse/rdf#plz" onclick="KontaktAdresseTreeSort()"/>
 					<splitter class="tree-splitter"/>
 					<treecol id="kontakt-adressen-treecol-ort" label="Ort" flex="1" hidden="false"
 						class="sortDirectionIndicator"
-						sort="rdf:http://www.technikum-wien.at/adresse/rdf#ort" onclick="KontaktAdressenTreeSort()"/>
+						sort="rdf:http://www.technikum-wien.at/adresse/rdf#ort" onclick="KontaktAdresseTreeSort()"/>
 					<splitter class="tree-splitter"/>
 					<treecol id="kontakt-adressen-treecol-gemeinde" label="Gemeinde" flex="1" hidden="true"
 						class="sortDirectionIndicator"
-						sort="rdf:http://www.technikum-wien.at/adresse/rdf#gemeinde" onclick="KontaktAdressenTreeSort()"/>
+						sort="rdf:http://www.technikum-wien.at/adresse/rdf#gemeinde" onclick="KontaktAdresseTreeSort()"/>
 					<splitter class="tree-splitter"/>
 					<treecol id="kontakt-adressen-treecol-nation" label="Nation" flex="1" hidden="true"
 						class="sortDirectionIndicator"
-						sort="rdf:http://www.technikum-wien.at/adresse/rdf#nation" onclick="KontaktAdressenTreeSort()"/>
+						sort="rdf:http://www.technikum-wien.at/adresse/rdf#nation" onclick="KontaktAdresseTreeSort()"/>
 					<splitter class="tree-splitter"/>
 					<treecol id="kontakt-adressen-treecol-typ" label="Typ" flex="1" hidden="true"
 						class="sortDirectionIndicator"
-						sort="rdf:http://www.technikum-wien.at/adresse/rdf#typ" onclick="KontaktAdressenTreeSort()"/>
+						sort="rdf:http://www.technikum-wien.at/adresse/rdf#typ" onclick="KontaktAdresseTreeSort()"/>
 					<splitter class="tree-splitter"/>
 					<treecol id="kontakt-adressen-treecol-heimatadresse" label="Heimatadresse" flex="1" hidden="true"
 						class="sortDirectionIndicator"
-						sort="rdf:http://www.technikum-wien.at/adresse/rdf#heimatadresse" onclick="KontaktAdressenTreeSort()"/>
+						sort="rdf:http://www.technikum-wien.at/adresse/rdf#heimatadresse" onclick="KontaktAdresseTreeSort()"/>
 					<splitter class="tree-splitter"/>
 					<treecol id="kontakt-adressen-treecol-zustelladresse" label="Zustelladresse" flex="1" hidden="true"
 						class="sortDirectionIndicator"
-						sort="rdf:http://www.technikum-wien.at/adresse/rdf#zustelladresse" onclick="KontaktAdressenTreeSort()"/>
+						sort="rdf:http://www.technikum-wien.at/adresse/rdf#zustelladresse" onclick="KontaktAdresseTreeSort()"/>
 					<splitter class="tree-splitter"/>
 					<treecol id="kontakt-adressen-treecol-firma_id" label="Firma_id" flex="1" hidden="true"
 						class="sortDirectionIndicator"
-						sort="rdf:http://www.technikum-wien.at/adresse/rdf#firma_id" onclick="KontaktAdressenTreeSort()"/>
+						sort="rdf:http://www.technikum-wien.at/adresse/rdf#firma_id" onclick="KontaktAdresseTreeSort()"/>
 					<splitter class="tree-splitter"/>
 					<treecol id="kontakt-adressen-treecol-adresse_id" label="Adresse_id" flex="1" hidden="true"
 						class="sortDirectionIndicator"
-						sort="rdf:http://www.technikum-wien.at/adresse/rdf#adresse_id" onclick="KontaktAdressenTreeSort()"/>
+						sort="rdf:http://www.technikum-wien.at/adresse/rdf#adresse_id" onclick="KontaktAdresseTreeSort()"/>
 					<splitter class="tree-splitter"/>
 					<treecol id="kontakt-adressen-treecol-person_id" label="Person_id" flex="1" hidden="true"
 						class="sortDirectionIndicator"
-						sort="rdf:http://www.technikum-wien.at/adresse/rdf#person_id" onclick="KontaktAdressenTreeSort()"/>
+						sort="rdf:http://www.technikum-wien.at/adresse/rdf#person_id" onclick="KontaktAdresseTreeSort()"/>
 					<splitter class="tree-splitter"/>
 				</treecols>
 			
@@ -148,7 +148,7 @@ else
 		<hbox>
 			<tree id="kontakt-kontakt-tree" seltype="single" hidecolumnpicker="false" flex="1"
 				datasources="rdf:null" ref="http://www.technikum-wien.at/kontakt/liste"
-				onselect="KontaktKontaktSelect();"
+				ondblclick="KontaktKontaktBearbeiten();"
 				flags="dont-build-content"
 				enableColumnDrag="true"
 				style="margin-left:10px;margin-right:10px;margin-bottom:5px;" height="100"
@@ -163,23 +163,27 @@ else
 						class="sortDirectionIndicator"
 						sort="rdf:http://www.technikum-wien.at/kontakt/rdf#kontakt" onclick="KontaktKontaktTreeSort()"/>
 					<splitter class="tree-splitter"/>
-					<treecol id="kontakt-adressen-treecol-zustellung" label="Zustellung" flex="1" hidden="false"
+					<treecol id="kontakt-kontakt-treecol-zustellung" label="Zustellung" flex="1" hidden="false"
 						class="sortDirectionIndicator"
 						sort="rdf:http://www.technikum-wien.at/kontakt/rdf#zustellung" onclick="KontaktKontaktTreeSort()"/>
 					<splitter class="tree-splitter"/>
-					<treecol id="kontakt-adressen-treecol-anmerkung" label="Anmerkung" flex="1" hidden="false"
+					<treecol id="kontakt-kontakt-treecol-anmerkung" label="Anmerkung" flex="1" hidden="false"
 						class="sortDirectionIndicator"
 						sort="rdf:http://www.technikum-wien.at/kontakt/rdf#anmerkung" onclick="KontaktKontaktTreeSort()"/>
 					<splitter class="tree-splitter"/>
-					<treecol id="kontakt-adressen-treecol-firma_id" label="Firma_id" flex="1" hidden="true"
+					<treecol id="kontakt-kontakt-treecol-firma_name" label="Firma" flex="1" hidden="true"
+						class="sortDirectionIndicator"
+						sort="rdf:http://www.technikum-wien.at/kontakt/rdf#firma_name" onclick="KontaktKontaktTreeSort()"/>
+					<splitter class="tree-splitter"/>
+					<treecol id="kontakt-kontakt-treecol-firma_id" label="Firma_id" flex="1" hidden="true"
 						class="sortDirectionIndicator"
 						sort="rdf:http://www.technikum-wien.at/kontakt/rdf#firma_id" onclick="KontaktKontaktTreeSort()"/>
 					<splitter class="tree-splitter"/>
-					<treecol id="kontakt-adressen-treecol-person_id" label="Person_id" flex="1" hidden="true"
+					<treecol id="kontakt-kontakt-treecol-person_id" label="Person_id" flex="1" hidden="true"
 						class="sortDirectionIndicator"
 						sort="rdf:http://www.technikum-wien.at/kontakt/rdf#person_id" onclick="KontaktKontaktTreeSort()"/>
 					<splitter class="tree-splitter"/>
-					<treecol id="kontakt-adressen-treecol-kontakt_id" label="Kontakt_id" flex="1" hidden="true"
+					<treecol id="kontakt-kontakt-treecol-kontakt_id" label="Kontakt_id" flex="1" hidden="true"
 						class="sortDirectionIndicator"
 						sort="rdf:http://www.technikum-wien.at/kontakt/rdf#kontakt_id" onclick="KontaktKontaktTreeSort()"/>
 					<splitter class="tree-splitter"/>
@@ -194,7 +198,8 @@ else
 									<treecell label="rdf:http://www.technikum-wien.at/kontakt/rdf#kontakt" />
 									<treecell label="rdf:http://www.technikum-wien.at/kontakt/rdf#zustellung" />
 									<treecell label="rdf:http://www.technikum-wien.at/kontakt/rdf#anmerkung" />
-									<treecell label="rdf:http://www.technikum-wien.at/kontakt/rdf#firma_is" />
+									<treecell label="rdf:http://www.technikum-wien.at/kontakt/rdf#firma_name" />
+									<treecell label="rdf:http://www.technikum-wien.at/kontakt/rdf#firma_id" />
 									<treecell label="rdf:http://www.technikum-wien.at/kontakt/rdf#person_id" />
 									<treecell label="rdf:http://www.technikum-wien.at/kontakt/rdf#kontakt_id" />
 								</treerow>
@@ -204,9 +209,9 @@ else
 				</template>
 			</tree>
 			<vbox>
-				<button id='kontakt-kontakt-neu' label='Neu' oncommand='' />
-				<button id='kontakt-kontakt-bearbeiten' label='Bearbeiten' oncommand='' />
-				<button id='kontakt-kontakt-loeschen' label='Loeschen' oncommand='' />
+				<button id="kontakt-kontakt-neu" label="Neu" oncommand="KontaktKontaktNeu()" />
+				<button id="kontakt-kontakt-bearbeiten" label="Bearbeiten" oncommand="KontaktKontaktBearbeiten()" />
+				<button id="kontakt-kontakt-loeschen" label="Loeschen" oncommand="KontaktKontaktDelete()" />
 			</vbox>
 		</hbox>
 	</groupbox>
@@ -216,7 +221,7 @@ else
 		<hbox>
 			<tree id="kontakt-bankverbindung-tree" seltype="single" hidecolumnpicker="false" flex="1"
 				datasources="rdf:null" ref="http://www.technikum-wien.at/bankverbindung/liste"
-				onselect="KontakBankverbindungSelect();"
+				ondblclick="KontaktBankverbindungBearbeiten()"
 				flags="dont-build-content"
 				enableColumnDrag="true"
 				style="margin-left:10px;margin-right:10px;margin-bottom:5px;" height="100"
@@ -288,17 +293,11 @@ else
 				</template>
 			</tree>
 			<vbox>
-				<button id='kontakt-bankverbindung-neu' label='Neu' oncommand='' />
-				<button id='kontakt-bankverbindung-bearbeiten' label='Bearbeiten' oncommand='' />
-				<button id='kontakt-bankverbindung-loeschen' label='Loeschen' oncommand='' />
+				<button id="kontakt-bankverbindung-neu" label="Neu" oncommand="KontaktBankverbindungNeu()" />
+				<button id="kontakt-bankverbindung-bearbeiten" label="Bearbeiten" oncommand="KontaktBankverbindungBearbeiten()" />
+				<button id="kontakt-bankverbindung-loeschen" label="Loeschen" oncommand="KontaktBankverbindungDelete()" />
 			</vbox>
 		</hbox>
-	</groupbox>				
-
-<!--				
-<textbox id="kontakt-textbox-adresse" value="Schulgasse" />
-<button onclick="getData();" label="Show" />
-<button onclick="alert(parent.document)" label="Show" />
--->
+	</groupbox>
 </vbox>
 </window>
\ No newline at end of file
diff --git a/content/kontaktdialog.js.php b/content/kontaktdialog.js.php
new file mode 100644
index 000000000..60a508b2a
--- /dev/null
+++ b/content/kontaktdialog.js.php
@@ -0,0 +1,95 @@
+<?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);
+?>
+
+// ****
+// * Laedt die zu bearbeitenden Daten
+// ****
+function KontaktInit(kontakt_id, person_id)
+{
+	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+	
+	if(kontakt_id!='')
+	{
+		//Daten holen
+		var url = '<?php echo APP_ROOT ?>rdf/kontakt.rdf.php?kontakt_id='+kontakt_id+'&'+gettimestamp();
+			
+		var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].
+	                   getService(Components.interfaces.nsIRDFService);
+	    
+	    var dsource = rdfService.GetDataSourceBlocking(url);
+	    
+		var subject = rdfService.GetResource("http://www.technikum-wien.at/kontakt/" + kontakt_id);
+	
+		var predicateNS = "http://www.technikum-wien.at/kontakt/rdf";
+	
+		//RDF parsen
+	
+		person_id = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#person_id" ));
+		anmerkung = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#anmerkung" ));
+		kontakt = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#kontakt" ));
+		zustellung = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zustellung" ));
+		firma_id = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#firma_id" ));
+		typ = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#kontakttyp" ));
+		neu = false;
+	}
+	else
+	{
+		//Defaultwerte bei Neuem Datensatz
+		neu = true;
+		anmerkung='';
+		kontakt='';
+		zustellung='Ja';
+		firma_id='';
+		typ='email';
+	}		
+	
+	document.getElementById('kontakt-checkbox-neu').checked=neu;
+	document.getElementById('kontakt-textbox-person_id').value=person_id;
+	document.getElementById('kontakt-textbox-kontakt_id').value=kontakt_id;
+	document.getElementById('kontakt-textbox-anmerkung').value=anmerkung;
+	document.getElementById('kontakt-textbox-kontakt').value=kontakt;
+	document.getElementById('kontakt-menulist-typ').value=typ;
+	document.getElementById('kontakt-menulist-firma').value=firma_id;
+	
+	if(zustellung=='Ja')
+		document.getElementById('kontakt-checkbox-zustellung').checked=true;
+	else
+		document.getElementById('kontakt-checkbox-zustellung').checked=false;
+}
+
+// ****
+// * Speichern der Daten
+// ****
+function KontaktSpeichern()
+{
+	if(window.opener.KontaktKontaktSpeichern(document))
+		window.close();
+}
\ No newline at end of file
diff --git a/content/kontaktdialog.xul.php b/content/kontaktdialog.xul.php
new file mode 100644
index 000000000..d554629a7
--- /dev/null
+++ b/content/kontaktdialog.xul.php
@@ -0,0 +1,117 @@
+<?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"?>';
+	
+if(isset($_GET['kontakt_id']) && is_numeric($_GET['kontakt_id']))
+	$kontakt_id=$_GET['kontakt_id'];
+else 
+	$kontakt_id='';
+	
+if(isset($_GET['person_id']) && is_numeric($_GET['person_id']))
+	$person_id=$_GET['person_id'];
+else 
+	$person_id='';
+?>
+
+<window id="kontakt-dialog" title="Kontakt"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onload="KontaktInit(<?php echo ($kontakt_id!=''?$kontakt_id:"''").','.($person_id!=''?$person_id:"''"); ?>)"
+        >
+
+<script type="application/x-javascript" src="<?php echo APP_ROOT; ?>content/kontaktdialog.js.php" />
+<script type="application/x-javascript" src="<?php echo APP_ROOT; ?>content/functions.js.php" />
+
+<vbox>
+
+<textbox id="kontakt-textbox-kontakt_id" hidden="true"/>
+<textbox id="kontakt-textbox-person_id" hidden="true"/>
+<checkbox id="kontakt-checkbox-neu" hidden="true"/>
+
+<groupbox id="kontakt-groupbox" flex="1">
+	<caption label="Details"/>
+		<grid id="kontakt-grid-detail" style="overflow:auto;margin:4px;" flex="1">
+		  	<columns  >
+				<column flex="1"/>
+				<column flex="5"/>
+			</columns>
+			<rows>
+				<row>
+					<label value="Typ" control="kontakt-menulist-typ"/>
+					<menulist id="kontakt-menulist-typ" 
+					          datasources="<?php echo APP_ROOT ?>rdf/kontakttyp.rdf.php" flex="1"
+					          ref="http://www.technikum-wien.at/kontakttyp/liste" >
+						<template>
+							<menupopup>
+								<menuitem value="rdf:http://www.technikum-wien.at/kontakttyp/rdf#kontakttyp"
+					        		      label="rdf:http://www.technikum-wien.at/kontakttyp/rdf#beschreibung"
+								  		  uri="rdf:*"/>
+								</menupopup>
+						</template>
+					</menulist>
+				</row>
+				<row>
+					<label value="Kontakt" control="kontakt-textbox-kontakt"/>
+					<textbox id="kontakt-textbox-kontakt" maxlength="128"/>
+      			</row>
+				<row>
+					<label value="Anmerkung" control="kontakt-textbox-anmerkung"/>
+   					<textbox id="kontakt-textbox-anmerkung" maxlength="64"/>
+				</row>				
+      			<row>
+					<label value="Zustellung" control="kontakt-checkbox-zustellung"/>
+   					<checkbox id="kontakt-checkbox-zustellung" checked="true"/>
+      			</row>
+				
+				<row>
+					<label value="Firma" control="kontakt-menulist-firma"/>
+					<menulist id="kontakt-menulist-firma" 
+					          datasources="<?php echo APP_ROOT ?>rdf/firma.rdf.php?optional=true" flex="1"
+					          ref="http://www.technikum-wien.at/firma/liste" >
+						<template>
+							<menupopup>
+								<menuitem value="rdf:http://www.technikum-wien.at/firma/rdf#firma_id"
+					        		      label="rdf:http://www.technikum-wien.at/firma/rdf#name"
+								  		  uri="rdf:*"/>
+								</menupopup>
+						</template>
+					</menulist>
+				</row>
+			</rows>
+	</grid>
+	<hbox>
+		<spacer flex="1" />
+		<button id="kontakt-button-speichern" oncommand="KontaktSpeichern()" label="Speichern" />
+	</hbox>
+</groupbox>
+</vbox>
+</window>
\ No newline at end of file
diff --git a/content/phpRequest.js.php b/content/phpRequest.js.php
index 42cb7880d..f8c7572cf 100644
--- a/content/phpRequest.js.php
+++ b/content/phpRequest.js.php
@@ -56,7 +56,7 @@ function phpRequestExecute()
 	try {
 		var txt = "?";
 		for(var i in this.parms) {
-			txt = txt+'&'+this.parms[i].name+'='+this.parms[i].value;
+			txt = txt+'&'+this.parms[i].name+'='+encodeURIComponent(this.parms[i].value);
 		}
 		//alert('sende '+txt);
 		//Two options here, only uncomment one of these
@@ -113,7 +113,7 @@ function phpRequestExecutePOST()
 		var txt = "";
 		for(var i in this.parms)
 		{
-			txt = txt+'&'+this.parms[i].name+'='+this.parms[i].value;
+			txt = txt+'&'+this.parms[i].name+'='+encodeURIComponent(this.parms[i].value);
 		}
 		//alert('sende '+txt);
 
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index 04c07cfa1..6d3ef5aa7 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -516,6 +516,7 @@ function StudentDetailDisableFields(val)
 	document.getElementById('student-detail-textbox-semester').disabled=val;
 	document.getElementById('student-detail-textbox-verband').disabled=val;
 	document.getElementById('student-detail-textbox-gruppe').disabled=val;
+	document.getElementById('student-detail-button-save').disabled=val;
 }
 
 // ****
@@ -663,8 +664,9 @@ function StudentAuswahl()
 			StudentPrestudentDisableFields(false);
 			StudentKontoDisableFields(false);
 			StudentBetriebsmittelDisableFields(false);
+			StudentAkteDisableFields(false);
 			StudentIODisableFields(false);
-			StudentNoteDetailDisableFields(true);
+			StudentNoteDisableFields(false);
 			document.getElementById('student-detail-button-save').disabled=false;
 		}
 		else
@@ -1118,80 +1120,103 @@ function StudentAnmeldungreihungstestHeute()
 }
 
 // ****
-// * Laedt ein Zeugnis dass in der DB gespeichert ist
+// * Einen Ab-/Unterbrecher wieder zum Studenten machen
 // ****
-function StudentZeugnisAnzeigen()
+function StudentUnterbrecherZuStudent()
 {
-	var tree = document.getElementById('student-zeugnis-tree');
+	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+	var tree = document.getElementById('student-tree');
 
 	if (tree.currentIndex==-1) return;
 	
-	try
+	if(sem = prompt('In welches Semester soll dieser Student verschoben werden?'))
 	{
-		//Ausgewaehlte ID holen
-        var col = tree.columns ? tree.columns["student-zeugnis-tree-akte_id"] : "student-zeugnis-tree-akte_id";
-		var akte_id=tree.view.getCellText(tree.currentIndex,col);
-		if(akte_id!='')
+		if(!isNaN(sem))
 		{
-			window.open('<?php echo APP_ROOT;?>content/akte.php?id='+akte_id,'File');
-			//document.location.href='<?php echo APP_ROOT;?>content/akte.php?id='+akte_id;
+			StudentAddRolle('Student', sem)
 		}
 		else
 		{
-			return false;
-		}	
-	}
-	catch(e)
-	{
-		alert(e);
-		return false;
+			alert('Semester ist ungueltig');
+		}
 	}
 }
 
 // ****
-// * Loescht ein Zeugnis
+// * Fuegt eine Rolle zu einem Studenten hinzu
 // ****
-function StudentAkteDel()
+function StudentAddRolle(rolle, semester)
 {
-
 	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-	var tree = document.getElementById('student-zeugnis-tree');
-	
-	if (tree.currentIndex==-1)
-		return;
+	var tree = document.getElementById('student-tree');
+
+	if (tree.currentIndex==-1) return;
 		
-	try
+	//Ausgewaehlte ID holen
+    var col = tree.columns ? tree.columns["student-treecol-prestudent_id"] : "student-treecol-prestudent_id";
+	var prestudent_id=tree.view.getCellText(tree.currentIndex,col);
+		
+	if(semester!='0' || confirm('Diesen Studenten zum '+rolle+' machen?'))
 	{
-		//Ausgewaehlte Akte holen
-        var col = tree.columns ? tree.columns["student-zeugnis-tree-akte_id"] : "student-zeugnis-tree-akte_id";
-		var akte_id=tree.view.getCellText(tree.currentIndex,col);
-	}
-	catch(e)
-	{
-		alert(e);
-		return false;
-	}
-
-	//Abfrage ob wirklich geloescht werden soll
-	if (confirm('Zeugnis wirklich entfernen?'))
-	{
-		//Script zum loeschen aufrufen
-		var req = new phpRequest('student/studentDBDML.php','','');
-
-		req.add('type','deleteAkte');
-		req.add('akte_id',akte_id);
+		var url = '<?php echo APP_ROOT ?>content/student/studentDBDML.php';
+		var req = new phpRequest(url,'','');
+		
+		req.add('type', 'addrolle');
 				
-		var response = req.executePOST();
-
-		var val =  new ParseReturnValue(response)
+		req.add('prestudent_id', prestudent_id);
+		req.add('rolle_kurzbz', rolle);
+		req.add('semester', semester);
 		
-		if(!val.dbdml_return)
-			alert(val.dbdml_errormsg)
-
-		StudentTreeRefresh();
+		var response = req.executePOST();
+	
+		var val =  new ParseReturnValue(response);
+		
+		if (!val.dbdml_return)
+		{
+			if(val.dbdml_errormsg=='')
+				alert(response)
+			else
+				alert(val.dbdml_errormsg)
+		}
+		else
+		{			
+			StudentTreeRefresh();
+			SetStatusBarText('Rolle hinzugefuegt');
+		}
 	}
 }
 
+// ****
+// * Druckt die Instkriptionsbestaetigung
+// ****
+function StudentPrintInskriptionsbestaetigung()
+{
+	tree = document.getElementById('student-tree');
+	//Alle markierten Studenten holen
+	var start = new Object();
+	var end = new Object();
+	var numRanges = tree.view.selection.getRangeCount();
+	var paramList= '';
+	var anzahl=0;
+	
+	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["student-treecol-uid"] : "student-treecol-uid";
+			uid = tree.view.getCellText(v,col);
+			paramList += ';'+uid;
+			anzahl = anzahl+1;
+			}
+	}
+	
+	if(anzahl>0)	
+		window.open('<?php echo APP_ROOT; ?>content/pdfExport.php?xml=student.rdf.php&xsl=Inskription&uid='+paramList,'Inskriptionsbestaetigung', 'height=200,width=350,left=0,top=0,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes');
+	else
+		alert('Bitte einen Studenten auswaehlen');
+}
+
 // **************** KONTO ******************
 
 // ****
@@ -1631,6 +1656,89 @@ function StudentCreateZeugnis()
 	window.open('<?php echo APP_ROOT; ?>content/student/zeugnis.php?uid='+uid+'&studiengang_kz='+studiengang_kz+'&semester='+semester,'Zeugnis', 'height=200,width=350,left=0,top=0,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes');
 }
 
+// ****
+// * Laedt ein Zeugnis dass in der DB gespeichert ist
+// ****
+function StudentZeugnisAnzeigen()
+{
+	var tree = document.getElementById('student-zeugnis-tree');
+
+	if (tree.currentIndex==-1) return;
+	
+	try
+	{
+		//Ausgewaehlte ID holen
+        var col = tree.columns ? tree.columns["student-zeugnis-tree-akte_id"] : "student-zeugnis-tree-akte_id";
+		var akte_id=tree.view.getCellText(tree.currentIndex,col);
+		if(akte_id!='')
+		{
+			window.open('<?php echo APP_ROOT;?>content/akte.php?id='+akte_id,'File');
+			//document.location.href='<?php echo APP_ROOT;?>content/akte.php?id='+akte_id;
+		}
+		else
+		{
+			return false;
+		}	
+	}
+	catch(e)
+	{
+		alert(e);
+		return false;
+	}
+}
+
+// ****
+// * Loescht ein Zeugnis
+// ****
+function StudentAkteDel()
+{
+
+	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+	var tree = document.getElementById('student-zeugnis-tree');
+	
+	if (tree.currentIndex==-1)
+		return;
+		
+	try
+	{
+		//Ausgewaehlte Akte holen
+        var col = tree.columns ? tree.columns["student-zeugnis-tree-akte_id"] : "student-zeugnis-tree-akte_id";
+		var akte_id=tree.view.getCellText(tree.currentIndex,col);
+	}
+	catch(e)
+	{
+		alert(e);
+		return false;
+	}
+
+	//Abfrage ob wirklich geloescht werden soll
+	if (confirm('Zeugnis wirklich entfernen?'))
+	{
+		//Script zum loeschen aufrufen
+		var req = new phpRequest('student/studentDBDML.php','','');
+
+		req.add('type','deleteAkte');
+		req.add('akte_id',akte_id);
+				
+		var response = req.executePOST();
+
+		var val =  new ParseReturnValue(response)
+		
+		if(!val.dbdml_return)
+			alert(val.dbdml_errormsg)
+
+		StudentTreeRefresh();
+	}
+}
+
+// ****
+// * Deaktiviert die Felder
+// ****
+function StudentAkteDisableFields(val)
+{
+	document.getElementById('student-zeugnis-button-archivieren').disabled=val;
+}
+
 // ********** Betriebsmittel ******************
 
 // ****
@@ -1904,103 +2012,6 @@ function StudentBetriebsmittelNeu()
 	document.getElementById('student-betriebsmittel-textbox-ausgegebenam').value=tag+'.'+monat+'.'+jahr;
 }
 
-// ****
-// * Einen Ab-/Unterbrecher wieder zum Studenten machen
-// ****
-function StudentUnterbrecherZuStudent()
-{
-	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-	var tree = document.getElementById('student-tree');
-
-	if (tree.currentIndex==-1) return;
-	
-	if(sem = prompt('In welches Semester soll dieser Student verschoben werden?'))
-	{
-		if(!isNaN(sem))
-		{
-			StudentAddRolle('Student', sem)
-		}
-		else
-		{
-			alert('Semester ist ungueltig');
-		}
-	}
-}
-
-// ****
-// * Fuegt eine Rolle zu einem Studenten hinzu
-// ****
-function StudentAddRolle(rolle, semester)
-{
-	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-	var tree = document.getElementById('student-tree');
-
-	if (tree.currentIndex==-1) return;
-		
-	//Ausgewaehlte ID holen
-    var col = tree.columns ? tree.columns["student-treecol-prestudent_id"] : "student-treecol-prestudent_id";
-	var prestudent_id=tree.view.getCellText(tree.currentIndex,col);
-		
-	if(semester!='0' || confirm('Diesen Studenten zum '+rolle+' machen?'))
-	{
-		var url = '<?php echo APP_ROOT ?>content/student/studentDBDML.php';
-		var req = new phpRequest(url,'','');
-		
-		req.add('type', 'addrolle');
-				
-		req.add('prestudent_id', prestudent_id);
-		req.add('rolle_kurzbz', rolle);
-		req.add('semester', semester);
-		
-		var response = req.executePOST();
-	
-		var val =  new ParseReturnValue(response);
-		
-		if (!val.dbdml_return)
-		{
-			if(val.dbdml_errormsg=='')
-				alert(response)
-			else
-				alert(val.dbdml_errormsg)
-		}
-		else
-		{			
-			StudentTreeRefresh();
-			SetStatusBarText('Rolle hinzugefuegt');
-		}
-	}
-}
-
-// ****
-// * Druckt die Instkriptionsbestaetigung
-// ****
-function StudentPrintInskriptionsbestaetigung()
-{
-	tree = document.getElementById('student-tree');
-	//Alle markierten Studenten holen
-	var start = new Object();
-	var end = new Object();
-	var numRanges = tree.view.selection.getRangeCount();
-	var paramList= '';
-	var anzahl=0;
-	
-	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["student-treecol-uid"] : "student-treecol-uid";
-			uid = tree.view.getCellText(v,col);
-			paramList += ';'+uid;
-			anzahl = anzahl+1;
-			}
-	}
-	
-	if(anzahl>0)	
-		window.open('<?php echo APP_ROOT; ?>content/pdfExport.php?xml=student.rdf.php&xsl=Inskription&uid='+paramList,'Inskriptionsbestaetigung', 'height=200,width=350,left=0,top=0,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes');
-	else
-		alert('Bitte einen Studenten auswaehlen');
-}
 
 // **************** Incomming/Outgoing ******************
 
@@ -2337,6 +2348,14 @@ function StudentLvGesamtNotenTreeSelectID()
 	}
 }
 
+// ***
+// * Disabled/Enabled die Nodenfelder
+// ***
+function StudentNoteDisableFields(val)
+{
+	document.getElementById('student-note-copy').disabled=val;
+}
+
 // ***
 // * Disabled/Enabled die Detailfelder
 // ***
diff --git a/include/bankverbindung.class.php b/include/bankverbindung.class.php
index 9ebc89e1e..58100501c 100644
--- a/include/bankverbindung.class.php
+++ b/include/bankverbindung.class.php
@@ -197,7 +197,6 @@ class bankverbindung
 	 */
 	function save()
 	{
-		$this->done=false;
 		//Variablen pruefen
 		if(!$this->checkvars())
 			return false;
@@ -220,7 +219,6 @@ class bankverbindung
 			      ($this->verrechnung?'true':'false').',  now(), '.
 			       $this->addslashes($this->insertvon).', now(), '.
 			       $this->addslashes($this->updatevon).');';
-			$this->done=true;
 		}
 		else
 		{
@@ -237,66 +235,36 @@ class bankverbindung
 				$this->errormsg = 'person_id muss eine gueltige Zahl sein: '.$this->person_id.'';
 				return false;
 			}
-			$qryz="SELECT * FROM public.tbl_bankverbindung WHERE bankverbindung_id='$this->bankverbindung_id';";
-			if($resultz = pg_query($this->conn, $qryz))
-			{
-				if($rowz = pg_fetch_object($resultz))
-				{
-					$update=false;
-					if($rowz->person_id!=$this->person_id) 				$update=true;
-					if($rowz->name!=$this->name)	 				$update=true;
-					if($rowz->anschrift!=$this->anschrift)				$update=true;
-					if($rowz->bic!=$this->bic)						$update=true;
-					if($rowz->blz!=$this->blz)	 					$update=true;
-					if($rowz->iban!=$this->iban) 					$update=true;
-					if($rowz->kontonr!=$this->kontonr)					$update=true;
-					if($rowz->typ!=$this->typ)	 					$update=true;
-					if($rowz->verrechnung!=$this->verrechnung)			$update=true;
-					if($rowz->ext_id!=$this->ext_id) 					$update=true;
 
-					if($update)
-					{
-						$qry='UPDATE public.tbl_bankverbindung SET '.
-						'person_id='.$this->addslashes($this->person_id).', '.
-						'name='.$this->addslashes($this->name).', '.
-		     			'anschrift='.$this->addslashes($this->anschrift).', '.
-		     			'blz='.$this->addslashes($this->blz).', '.
-		     			'bic='.$this->addslashes($this->bic).', '.
-		     			'kontonr='.$this->addslashes($this->kontonr).', '.
-		     			'iban='.$this->addslashes($this->iban).', '.
-		     			'typ='.$this->addslashes($this->typ).', '.
-		     			'verrechnung='.($this->verrechnung?'true':'false').', '.
-		     			'ext_id='.$this->addslashes($this->ext_id).' '.
-		     			'WHERE bankverbindung_id='.$this->addslashes($this->bankverbindung_id).';';
-						$this->done=true;
-					}
-				}
-			}
+			$qry='UPDATE public.tbl_bankverbindung SET '.
+			'person_id='.$this->addslashes($this->person_id).', '.
+			'name='.$this->addslashes($this->name).', '.
+ 			'anschrift='.$this->addslashes($this->anschrift).', '.
+ 			'blz='.$this->addslashes($this->blz).', '.
+ 			'bic='.$this->addslashes($this->bic).', '.
+ 			'kontonr='.$this->addslashes($this->kontonr).', '.
+ 			'iban='.$this->addslashes($this->iban).', '.
+ 			'typ='.$this->addslashes($this->typ).', '.
+ 			'verrechnung='.($this->verrechnung?'true':'false').', '.
+ 			'ext_id='.$this->addslashes($this->ext_id).', '.
+ 			'updateamum='.$this->addslashes($this->updateamum).','.
+ 			'updatevon='.$this->addslashes($this->updatevon).' '.
+ 			'WHERE bankverbindung_id='.$this->addslashes($this->bankverbindung_id).';';
 		}
-
-		if ($this->done)
+		//echo $qry."\n";
+		if(pg_query($this->conn, $qry))
 		{
-			//echo $qry."\n";
-			if(pg_query($this->conn, $qry))
+			if($this->new)
 			{
-				if($this->new)
+				//Sequence auslesen
+				$qry = "SELECT currval('public.tbl_bankverbindung_bankverbindung_id_seq') as id";
+				if($result = pg_query($this->conn, $qry))
 				{
-					//Sequence auslesen
-					$qry = "SELECT currval('public.tbl_bankverbindung_bankverbindung_id_seq') as id";
-					if($result = pg_query($this->conn, $qry))
+					if($row = pg_fetch_object($result))
 					{
-						if($row = pg_fetch_object($result))
-						{
-							$this->bankverbindung_id = $row->id;
-							pg_query($this->conn, 'COMMIT');
-							return true;
-						}
-						else 
-						{
-							$this->errormsg = 'Fehler beim Auslesen der Sequence';
-							pg_query($this->conn, 'ROLLBACK');
-							return false;
-						}
+						$this->bankverbindung_id = $row->id;
+						pg_query($this->conn, 'COMMIT');
+						return true;
 					}
 					else 
 					{
@@ -305,17 +273,19 @@ class bankverbindung
 						return false;
 					}
 				}
-				return true;
-			}
-			else
-			{
-				$this->errormsg = 'Fehler beim Speichern der Daten';
-				return false;
+				else 
+				{
+					$this->errormsg = 'Fehler beim Auslesen der Sequence';
+					pg_query($this->conn, 'ROLLBACK');
+					return false;
+				}
 			}
+			return true;
 		}
 		else
 		{
-			return true;
+			$this->errormsg = 'Fehler beim Speichern der Daten';
+			return false;
 		}
 	}
 
diff --git a/include/kontakt.class.php b/include/kontakt.class.php
index b6a4af6b7..043e4f658 100644
--- a/include/kontakt.class.php
+++ b/include/kontakt.class.php
@@ -30,7 +30,6 @@ class kontakt
 	var $new;       // @var boolean
 	var $errormsg;  // @var string
 	var $result = array(); // @var adresse Objekt
-	var $done=false;	// @var boolean
 	
 	//Tabellenspalten
 	Var $kontakt_id;	// @var integer
@@ -46,6 +45,9 @@ class kontakt
 	var $updateamum;	// @var timestamp
 	var $updatevon;	// @var bigint
 	
+	var $beschreibung;
+	var $firma_name;
+	
 	/**
 	 * Konstruktor
 	 * @param $conn      Connection
@@ -84,7 +86,7 @@ class kontakt
 			return false;
 		}
 		
-		$qry = "SELECT * FROM public.tbl_kontakt WHERE kontakt_id='$kontakt_id'";
+		$qry = "SELECT tbl_kontakt.*, tbl_firma.name as firma_name FROM public.tbl_kontakt LEFT JOIN public.tbl_firma USING(firma_id) WHERE kontakt_id='$kontakt_id'";
 		
 		if($result = pg_query($this->conn, $qry))
 		{
@@ -93,6 +95,7 @@ class kontakt
 				$this->kontakt_id = $row->kontakt_id;
 				$this->person_id = $row->person_id;
 				$this->firma_id = $row->firma_id;
+				$this->firma_name = $row->firma_name;
 				$this->kontakttyp = $row->kontakttyp;
 				$this->anmerkung = $row->anmerkung;
 				$this->kontakt = $row->kontakt;
@@ -163,7 +166,6 @@ class kontakt
 	 */
 	function save()
 	{
-		$this->done=false;
 		//Variablen pruefen
 		if(!$this->checkvars())
 			return false;
@@ -181,8 +183,7 @@ class kontakt
 			     ($this->zustellung?'true':'false').', '. 
 			     $this->addslashes($this->ext_id).',  now(), '.
 			     $this->addslashes($this->insertvon).', now(), '.
-			     $this->addslashes($this->updatevon).');';
-			     $this->done=true;			
+			     $this->addslashes($this->updatevon).');';	
 		}
 		else
 		{
@@ -194,88 +195,63 @@ class kontakt
 				$this->errormsg = 'kontakt_id muss eine gueltige Zahl sein: '.$this->kontakt_id.' ('.$this->person_id.')';
 				return false;
 			}
-			$qry="SELECT * FROM tbl_kontakt WHERE kontakt_id='$this->kontakt_id';";
-			if($resultz = pg_query($this->conn, $qry))
-			{
-				if($rowz = pg_fetch_object($resultz))
-				{
-					$update=false;			
-					if($rowz->person_id!=$this->person_id) 				$update=true;
-					if($rowz->firma_id!=$this->firma_id) 				$update=true;
-					if($rowz->kontakttyp!=$this->kontakttyp)				$update=true;
-					if($rowz->anmerkung!=$this->anmerkung)			$update=true;
-					if($rowz->kontakt!=$this->kontakt) 					$update=true;
-					if($rowz->zustellung!=$this->zustellung) 				$update=true;
-					if($rowz->ext_id!=$this->ext_id)	 				$update=true;
-				
-					if($update)
-					{
-						$qry='UPDATE tbl_kontakt SET '.
-							'person_id='.$this->addslashes($this->person_id).', '. 
-							'firma_id='.$this->addslashes($this->firma_id).', '. 
-							'kontakttyp='.$this->addslashes($this->kontakttyp).', '. 
-							'anmerkung='.$this->addslashes($this->anmerkung).', '.  
-							'kontakt='.$this->addslashes($this->kontakt).', '. 
-							'zustellung='.($this->zustellung?'true':'false').', '.
-							'ext_id='.$this->addslashes($this->ext_id).', '. 
-						     	'updateamum= now(), '.
-						     	'updatevon='.$this->addslashes($this->updatevon).' '.
-							'WHERE kontakt_id='.$this->addslashes($this->kontakt_id).';';
-							$this->done=true;
-					}
-				}
-			}
+			
+			$qry='UPDATE tbl_kontakt SET '.
+				'person_id='.$this->addslashes($this->person_id).', '. 
+				'firma_id='.$this->addslashes($this->firma_id).', '. 
+				'kontakttyp='.$this->addslashes($this->kontakttyp).', '. 
+				'anmerkung='.$this->addslashes($this->anmerkung).', '.  
+				'kontakt='.$this->addslashes($this->kontakt).', '. 
+				'zustellung='.($this->zustellung?'true':'false').', '.
+				'ext_id='.$this->addslashes($this->ext_id).', '. 
+			    'updateamum= now(), '.
+			    'updatevon='.$this->addslashes($this->updatevon).' '.
+				'WHERE kontakt_id='.$this->addslashes($this->kontakt_id).';';
 		}
-		//echo $qry;
-		if ($this->done)
+		
+		if(pg_query($this->conn, $qry))
 		{
-			if(pg_query($this->conn, $qry))
+			//Sequence auslesen um die eingefuegte ID zu ermitteln
+			if($this->new)
 			{
-				if($this->new)
+				$qry = "SELECT currval('public.tbl_kontakt_kontakt_id_seq') as id";
+				
+				if($result = pg_query($this->conn, $qry))
 				{
-					$qry = "SELECT currval('public.tbl_kontakt_kontakt_id_seq') as id";
-					
-					if($result = pg_query($this->conn, $qry))
+					if($row = pg_fetch_object($result))
 					{
-						if($row = pg_fetch_object($result))
-						{
-							$this->kontakt_id = $row->id;
-							pg_query($this->conn, 'COMMIT');
-							return true;
-						}
-						else 
-						{
-							$this->errormsg = 'Fehler beim Auslesen er Sequence';
-							pg_query($this->conn, 'ROLLBACK');
-							return false;
-						}
+						$this->kontakt_id = $row->id;
+						pg_query($this->conn, 'COMMIT');
+						return true;
 					}
 					else 
 					{
-						$this->errormsg = 'Fehler beim Auslesen der Sequence';
+						$this->errormsg = 'Fehler beim Auslesen er Sequence';
 						pg_query($this->conn, 'ROLLBACK');
 						return false;
 					}
-				}				
-				return true;		
-			}
-			else 
-			{
-				$this->errormsg = 'Fehler beim Speichern der Daten';
-				return false;
-			}
+				}
+				else 
+				{
+					$this->errormsg = 'Fehler beim Auslesen der Sequence';
+					pg_query($this->conn, 'ROLLBACK');
+					return false;
+				}
+			}				
+			return true;		
 		}
 		else 
 		{
-			return true;
+			$this->errormsg = 'Fehler beim Speichern der Daten';
+			return false;
 		}
 	}
 	
-	/**
-	 * Loescht den Datenensatz mit der ID die uebergeben wird
-	 * @param $kontakt_id ID die geloescht werden soll
-	 * @return true wenn ok, false im Fehlerfall
-	 */
+	// **
+	// * Loescht den Datenensatz mit der ID die uebergeben wird
+	// * @param $kontakt_id ID die geloescht werden soll
+	// * @return true wenn ok, false im Fehlerfall
+	// **
 	function delete($kontakt_id)
 	{
 		if(!is_numeric($kontakt_id))
@@ -306,7 +282,7 @@ class kontakt
 			return false;
 		}
 		
-		$qry = "SELECT * FROM public.tbl_kontakt WHERE person_id='$person_id'";
+		$qry = "SELECT tbl_kontakt.*, tbl_firma.name as firma_name FROM public.tbl_kontakt LEFT JOIN public.tbl_firma USING(firma_id) WHERE person_id='$person_id'";
 		
 		if($result = pg_query($this->conn, $qry))
 		{
@@ -317,10 +293,11 @@ class kontakt
 				$obj->kontakt_id = $row->kontakt_id;
 				$obj->person_id = $row->person_id;
 				$obj->firma_id = $row->firma_id;
+				$obj->firma_name = $row->firma_name;
 				$obj->kontakttyp = $row->kontakttyp;
 				$obj->anmerkung = $row->anmerkung;
 				$obj->kontakt = $row->kontakt;
-				$obj->zustellung = $row->zustellung;
+				$obj->zustellung = ($row->zustellung=='t'?true:false);
 				$obj->updateamum = $row->updateamum;
 				$obj->updatevon = $row->updatevon;
 				$obj->insertamum = $row->insertamum;
@@ -331,5 +308,34 @@ class kontakt
 			}
 		}
 	}
+	
+	// **************************
+	// * Laedt alle Kontakttypen
+	// * @return true wenn ok
+	// * false im Fehlerfall
+	// **************************
+	function getKontakttyp()
+	{
+		$qry = "SELECT * FROM public.tbl_kontakttyp ORDER BY beschreibung";
+		
+		if($result = pg_query($this->conn, $qry))
+		{
+			while($row = pg_fetch_object($result))
+			{
+				$obj = new kontakt($this->conn, null, null);
+				
+				$obj->kontakttyp = $row->kontakttyp;
+				$obj->beschreibung = $row->beschreibung;
+				
+				$this->result[] = $obj;
+			}
+			return true;
+		}
+		else 
+		{
+			$this->errormsg = 'Fehler beim Laden der Daten';
+			return false;
+		}
+	}
 }
 ?>
\ No newline at end of file
diff --git a/rdf/kontakt.rdf.php b/rdf/kontakt.rdf.php
index a67397558..798086f5f 100644
--- a/rdf/kontakt.rdf.php
+++ b/rdf/kontakt.rdf.php
@@ -84,6 +84,7 @@ function draw_rdf($row)
             <KONTAKT:kontakt_id><![CDATA['.$row->kontakt_id.']]></KONTAKT:kontakt_id>
             <KONTAKT:person_id><![CDATA['.$row->person_id.']]></KONTAKT:person_id>
             <KONTAKT:firma_id><![CDATA['.$row->firma_id.']]></KONTAKT:firma_id>
+            <KONTAKT:firma_name><![CDATA['.$row->firma_name.']]></KONTAKT:firma_name>
             <KONTAKT:kontakttyp><![CDATA['.$row->kontakttyp.']]></KONTAKT:kontakttyp>
             <KONTAKT:anmerkung><![CDATA['.$row->anmerkung.']]></KONTAKT:anmerkung>
             <KONTAKT:kontakt><![CDATA['.$row->kontakt.']]></KONTAKT:kontakt>
diff --git a/rdf/kontakttyp.rdf.php b/rdf/kontakttyp.rdf.php
new file mode 100644
index 000000000..f0a8cd0c6
--- /dev/null
+++ b/rdf/kontakttyp.rdf.php
@@ -0,0 +1,72 @@
+<?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 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/xhtml+xml");
+// xml
+echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
+// DAO
+require_once('../vilesci/config.inc.php');
+require_once('../include/kontakt.class.php');
+
+// Datenbank Verbindung
+if (!$conn = pg_pconnect(CONN_STRING))
+   	die('Es konnte keine Verbindung zum Server aufgebaut werden!');
+
+$kontakt = new kontakt($conn, null, true);
+	
+$rdf_url='http://www.technikum-wien.at/kontakttyp';
+
+echo '
+<RDF:RDF
+	xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:KONTAKTTYP="'.$rdf_url.'/rdf#"
+>
+
+   <RDF:Seq about="'.$rdf_url.'/liste">
+';
+
+if($kontakt->getKontakttyp())
+{	
+	foreach ($kontakt->result as $row)
+	{	
+		echo '
+	      <RDF:li>
+	         <RDF:Description  id="'.$row->kontakttyp.'"  about="'.$rdf_url.'/'.$row->kontakttyp.'" >
+	            <KONTAKTTYP:kontakttyp><![CDATA['.$row->kontakttyp.']]></KONTAKTTYP:kontakttyp>
+	            <KONTAKTTYP:beschreibung><![CDATA['.$row->beschreibung.']]></KONTAKTTYP:beschreibung>
+	         </RDF:Description>
+	      </RDF:li>
+	      ';
+	}
+}
+else 
+{
+	echo $kontakt->errormsg;
+}
+?>
+   </RDF:Seq>
+</RDF:RDF>
\ No newline at end of file