Merge branch 'master' of https://github.com/FH-Complete/FHC-Core

content/mitarbeiter/mitarbeiteroverlay.js.php

@@ -623,7 +623,7 @@ function MitarbeiterAuswahl()
 		// ***** Termine *****
 		document.getElementById('mitarbeiter-termine').setAttribute('src','termine.xul.php?mitarbeiter_uid='+uid);
 	}
-	
+
 	// ***** UDF *****
 	if (document.getElementById('mitarbeiter-tabs').selectedItem == document.getElementById('mitarbeiter-tab-udf'))
 	{
@@ -915,56 +915,48 @@ function MitarbeiterNeu()
 }
 
 // ****
-// * Exportiert die Daten in ein Excel File
+// * Excel Export der Mitarbeiter
 // ****
 function MitarbeiterExport()
 {
-	var treeMitarbeiter=document.getElementById('mitarbeiter-tree');
-	var treeMitarbeiterMenu=document.getElementById('tree-menu-mitarbeiter');
-	var col = treeMitarbeiterMenu.columns ? treeMitarbeiterMenu.columns["tree-menu-mitarbeiter-col-filter"] : "tree-menu-mitarbeiter-col-filter";
-	var filter=treeMitarbeiterMenu.view.getCellText(treeMitarbeiterMenu.currentIndex,col);
-	cols = treeMitarbeiter.getElementsByTagName('treecol');
-
-	var url = "<?php echo APP_ROOT; ?>content/statistik/mitarbeiterexport.xls.php";
-	var attributes="?type=mitarbeiter";
-	if (filter=="Studiengangsleiter")
-			attributes+="&stgl=true";
-		if (filter=="Fachbereichsleiter")
-			attributes+="&fbl=true";
-		if (filter=="Alle")
-			attributes+="&alle=true";
-		if (filter=="Aktive")
-			attributes+="&aktiv=true";
-		if (filter=="FixAngestellte")
-			attributes+="&fix=true&aktiv=true";
-		if (filter=="FixAngestellteAlle")
-			attributes+="&fix=true";
-		if (filter=="Inaktive")
-			attributes+="&aktiv=false";
-		if (filter=="Karenziert")
-			attributes+="&karenziert=true";
-		if (filter=="Ausgeschieden")
-			attributes+="&ausgeschieden=true";
-		if (filter=="FreiAngestellte")
-			attributes+="&fix=false&aktiv=true";
-		if (filter=="FreiAngestellteAlle")
-			attributes+="&fix=false";
-
-	url+=attributes;
-	spalte=0;
-	for(i in cols)
+	var tree = document.getElementById('mitarbeiter-tree');
+	var data='';
+	//Wenn nichts markiert wurde -> alle exportieren
+	if(tree.currentIndex==-1)
 	{
-		if(cols[i].hidden==false)
+		if(tree.view)
+			var items = tree.view.rowCount; //Anzahl der Zeilen ermitteln
+		else
+			return false;
+
+		for (var v=0; v < items; v++)
 		{
-			url += "&spalte"+spalte+"="+MitarbeiterDetailgetSpaltenname(cols[i].id);
-			spalte=spalte+1;
+			var mitarbeiter_uid = getTreeCellText(tree, 'mitarbeiter-treecol-uid', v);
+			data = data+';'+mitarbeiter_uid;
 		}
 	}
-	//url+='&spalte0=titelpre&spalte1=vorname&spalte2=vornamen&spalte3=familienname&spalte4=uid';
+	else
+	{
+		var start = new Object();
+		var end = new Object();
+		var numRanges = tree.view.selection.getRangeCount();
+		var paramList= '';
+		var anzahl=0;
 
-	//alert(url);
-	//window.open(url,"","chrome,status=no, modal, width=400, height=250, centerscreen, resizable");
-	window.location.href=url;
+		//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++)
+			{
+				mitarbeiter_uid = getTreeCellText(tree, 'mitarbeiter-treecol-uid', v);
+				data = data+';'+mitarbeiter_uid;
+			}
+		}
+	}
+
+	action = '<?php echo APP_ROOT; ?>content/statistik/mitarbeiterexport.xls.php';
+	OpenWindowPost(action, data);
 }
 
 // ****
@@ -1992,9 +1984,9 @@ function MitarbeiterUDFIFrameLoad()
 	{
 		//Ausgewaehlte person_id holen
 		var person_id = getTreeCellText(tree, 'mitarbeiter-treecol-person_id', tree.currentIndex);
-		
+
 		url = 'udf.xul.php?person_id='+person_id;
 		document.getElementById('mitarbeiter-udf').setAttribute('src', url);
 	}
 	catch(e) {}
-}
+}

content/mitarbeiter/mitarbeiteroverlay.xul.php

@@ -66,7 +66,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/mitarbeiter/mitarbeitervertragover
 		<toolbox flex="1">
 			<toolbar id="mitarbeiter-nav-toolbar">
 			<toolbarbutton id="mitarbeiter-toolbar-neu" label="Neu" oncommand="MitarbeiterNeu()" disabled="false" image="../skin/images/NeuDokument.png" tooltiptext="Neuen Mitarbeiter anlegen"/>
-			<toolbarbutton id="mitarbeiter-toolbar-export" label="Export" oncommand="MitarbeiterExport()" disabled="false" image="../skin/images/ExcelIcon.png" tooltiptext="Daten ins Excel Exportieren"/>
+			<toolbarbutton id="mitarbeiter-toolbar-export" label="Export" oncommand="MitarbeiterExport()" disabled="false" image="../skin/images/ExcelIcon.png" tooltiptext="Daten ins Excel exportieren"/>
 			<toolbarbutton id="mitarbeiter-toolbar-refresh" label="Aktualisieren" oncommand="MitarbeiterTreeRefresh()" disabled="false" image="../skin/images/refresh.png" tooltiptext="Liste neu laden"/>
 			<textbox id="mitarbeiter-toolbar-textbox-suche" control="mitarbeiter-toolbar-button-search" onkeypress="MitarbeiterSearchFieldKeyPress(event)" />
 			<button id="mitarbeiter-toolbar-button-search" oncommand="MitarbeiterSuche()" label="Suchen"/>

content/statistik/mitarbeiterexport.xls.php

@@ -36,59 +36,13 @@ $db = new basis_db();
 $user = get_uid();
 loadVariables($user);
 
-//Parameter holen
-
-if (isset($_GET['fix']))
-	$fix = $_GET['fix'];
-else
-	$fix=null;
-
-if (isset($_GET['stgl']))
-	$stgl = ($_GET['stgl'] == 'true' ? true : false);
-else
-	$stgl=null;
-
-if (isset($_GET['fbl']))
-	$fbl = $_GET['fbl'];
-else
-	$fbl=null;
-
-if (isset($_GET['aktiv']))
-	$aktiv = $_GET['aktiv'];
-else
-	$aktiv=null;
-
-if (isset($_GET['karenziert']))
-	$karenziert = $_GET['karenziert'];
-else
-	$karenziert=null;
-
-if (isset($_GET['ausgeschieden']))
-	$ausgeschieden = $_GET['ausgeschieden'];
-else
-	$ausgeschieden=null;
-
-if (isset($_GET['zustelladresse']))
-	$zustelladresse = $_GET['zustelladresse'];
-else
-	$zustelladresse = null;
-
-// Die Spalten die Exportiert werden sollen, werden per GET uebergeben
-// spalte1=nachname, spalte2=vorname, spalte3=gebdatum, ...
-$anzSpalten = 0;
-$varname = 'spalte'.(string)$anzSpalten;
-while (isset($_GET[$varname]))
-{
-	$spalte[$anzSpalten] = $_GET[$varname];
-	$anzSpalten++;
-	$varname = 'spalte'.(string)$anzSpalten;
-}
-
-$zustelladresse = true;
+$data = $_POST['data'];
+$uids= explode(';',$data);
 
 // Mitarbeiter holen
 $mitarbeiterDAO = new mitarbeiter();
-$mitarbeiterDAO->getPersonal($fix, $stgl, $fbl, $aktiv, $karenziert, $ausgeschieden, $semester_aktuell);
+//$mitarbeiterDAO->getPersonal($fix, $stgl, $fbl, $aktiv, $karenziert, $ausgeschieden, $semester_aktuell);
+$mitarbeiterDAO->getMitarbeiterArray($uids);
 
 //Sortieren der Eintraege nach Nachname, Vorname
 //Umlaute werden ersetzt damit diese nicht unten angereiht werden
@@ -106,6 +60,10 @@ foreach ($mitarbeiterDAO->result as $key => $foo)
 
 array_multisort($nachname, SORT_ASC, $vorname, SORT_ASC, $mitarbeiterDAO->result);
 
+$spalte = array('titelpre', 'vorname', 'vornamen', 'nachname', 'titelpost','gebdatum','svnr','ersatzkennzeichen',
+	'aktiv','personalnummer', 'kurzbz','fixangestellt','lektor');
+$anzSpalten = count($spalte);
+
 // Creating a workbook
 $workbook = new Spreadsheet_Excel_Writer();
 $workbook->setVersion(8);
@@ -193,7 +151,7 @@ foreach ($mitarbeiterDAO->result as $mitarbeiter)
 			if (mb_strlen($row->ort) > $maxlength[$col])
 				$maxlength[$col] = mb_strlen($row->ort);
 			$worksheet->write($zeile, $col, $row->ort);
-			
+
 			$col++;
 			if ($row->firma_id != '')
 			{
@@ -210,38 +168,26 @@ foreach ($mitarbeiterDAO->result as $mitarbeiter)
 			}
 		}
 	}
-	
+
 	$col++;
-	
+
 	// UDF
 	if (isset($mitarbeiter->p_udf_values))
 	{
 		$udfPerson = json_decode($mitarbeiter->p_udf_values);
 		if (is_object($udfPerson)) $udfPerson = (array)$udfPerson;
-		
+
 		foreach($udfTitlesPerson as $udfTitle)
 		{
-			if (isset($udfPerson[$udfTitle['name']]))
+			$toWrite = $udf->encodeToString($udfPerson, $udfTitle);
+
+			if (mb_strlen($toWrite) > $maxlength[$col])
 			{
-				if (is_string($udfPerson[$udfTitle['name']]) || is_numeric($udfPerson[$udfTitle['name']]))
-				{
-					if (mb_strlen($udfPerson[$udfTitle['name']]) > $maxlength[$col])
-					{
-						$maxlength[$col] = mb_strlen($udfPerson[$udfTitle['name']]);
-					}
-					$worksheet->write($zeile, $col, $udfPerson[$udfTitle['name']]);
-				}
-				else if(is_array($udfPerson[$udfTitle['name']]) && isset($udfTitle['enum']))
-				{
-					$toWrite = $udf->dropdownListValuesToString($udfPerson[$udfTitle['name']], $udfTitle['enum']);
-					
-					if (mb_strlen($toWrite) > $maxlength[$col])
-					{
-						$maxlength[$col] = mb_strlen($toWrite);
-					}
-					$worksheet->write($zeile, $col, $toWrite);
-				}
+				$maxlength[$col] = mb_strlen($toWrite);
 			}
+
+			$worksheet->write($zeile, $col, $toWrite);
+
 			$col++;
 		}
 	}
@@ -263,4 +209,4 @@ $worksheet->setColumn($col, $col, $maxlength[$col] + 2);
 
 $workbook->close();
 
-?>
+?>

content/statistik/studentenexportextended.xls.php

@@ -22,7 +22,7 @@
  */
 /**
  * Exportiert die Daten von Prestudenten und Studenten in ein Excel File.
- * 
+ *
  * Parameter:
  * GET:
  * studiensemester_kurzbz ... Studiensemester
@@ -43,7 +43,7 @@ $user = get_uid();
 $datum_obj = new datum();
 $db = new basis_db();
 loadVariables($user);
-	
+
 //Parameter holen
 $data = $_REQUEST['data'];
 $studiensemester_kurzbz = $_GET['studiensemester_kurzbz'];
@@ -108,6 +108,18 @@ $worksheet->write($zeile, ++$i, "TITELPOST", $format_bold);
 $maxlength[$i] = 9;
 $worksheet->write($zeile, ++$i, "EMail Privat", $format_bold);
 $maxlength[$i] = 12;
+$worksheet->write($zeile,++$i,"STRASSE", $format_bold);
+$maxlength[$i]=7;
+$worksheet->write($zeile-1,$i,"Zustelladresse", $format_bold);
+$maxlength[$i]=14;
+$worksheet->write($zeile,++$i,"PLZ", $format_bold);
+$maxlength[$i]=3;
+$worksheet->write($zeile,++$i,"ORT", $format_bold);
+$maxlength[$i]=3;
+$worksheet->write($zeile,++$i,"GEMEINDE", $format_bold);
+$maxlength[$i]=9;
+$worksheet->write($zeile,++$i,"NATION", $format_bold);
+$maxlength[$i] = 6;
 $worksheet->write($zeile, ++$i, "GEBURTSDATUM", $format_bold);
 $maxlength[$i] = 12;
 $worksheet->write($zeile, ++$i, "PERSONENKENNZEICHEN", $format_bold);
@@ -189,13 +201,13 @@ $zeile++;
 $ids = explode(';',$data);
 $prestudent_ids = '';
 
-foreach ($ids as $id) 
+foreach ($ids as $id)
 {
 	if ($id!='')
 	{
 		if ($prestudent_ids!='')
 			$prestudent_ids .= ',';
-		$prestudent_ids .= "'".addslashes($id)."'";
+		$prestudent_ids .= "'".$db->db_escape($id)."'";
 	}
 }
 
@@ -203,7 +215,7 @@ if ($prestudent_ids!='')
 {
 	// Student holen
 	$qry = "SELECT *,";
-	
+
 	if ($udf->personHasUDF())
 	{
 		$qry .= " p.udf_values AS p_udf_values,";
@@ -212,7 +224,7 @@ if ($prestudent_ids!='')
 	{
 		$qry .= " ps.udf_values AS ps_udf_values,";
 	}
-	
+
 	$qry .= "		ps.studiengang_kz AS prestgkz,
 					(
 						SELECT UPPER(typ || kurzbz)
@@ -243,66 +255,121 @@ function draw_content($row)
 	global $studiensemester_kurzbz;
 	global $udfTitlesPerson, $udfTitlesPrestudent, $udf;
 	$db = new basis_db();
-	
+
 	$prestudent = new prestudent();
 	$prestudent->getLastStatus($row->prestudent_id);
 	$status = $prestudent->status_kurzbz;
 	$orgform = $prestudent->orgform_kurzbz;
-		
+
 	$i = 0;
-	
+
 	//Anrede
 	if (mb_strlen($row->anrede) > $maxlength[$i])
 		$maxlength[$i] = mb_strlen($row->anrede);
 	$worksheet->write($zeile, $i, $row->anrede);
 	$i++;
-	
+
 	//Titelpre
 	if (mb_strlen($row->titelpre) > $maxlength[$i])
 		$maxlength[$i] = mb_strlen($row->titelpre);
 	$worksheet->write($zeile, $i, $row->titelpre);
 	$i++;
-	
+
 	//Nachname
 	if (mb_strlen($row->nachname) > $maxlength[$i])
 		$maxlength[$i] = mb_strlen($row->nachname);
 	$worksheet->write($zeile, $i, $row->nachname);
 	$i++;
-	
+
 	//Vorname
 	if (mb_strlen($row->vorname) > $maxlength[$i])
 		$maxlength[$i] = mb_strlen($row->vorname);
 	$worksheet->write($zeile, $i, $row->vorname);
 	$i++;
-	
+
 	//Titelpost
 	if (mb_strlen($row->titelpost) > $maxlength[$i])
 		$maxlength[$i] = mb_strlen($row->titelpost);
 	$worksheet->write($zeile, $i, $row->titelpost);
 	$i++;
-	
+
 	//Email Privat
 	//ZustellEmailAdresse aus der Datenbank holen und dazuhaengen
-	$qry_1 = "SELECT kontakt FROM public.tbl_kontakt 
-				WHERE kontakttyp='email' AND person_id='".addslashes($row->person_id)."' AND zustellung=true 
-				ORDER BY kontakt_id DESC LIMIT 1";
+	$qry_1 = "
+		SELECT
+			kontakt
+		FROM
+			public.tbl_kontakt
+		WHERE
+			kontakttyp='email'
+			AND person_id=".$db->db_add_param($row->person_id)."
+			AND zustellung=true
+		ORDER BY kontakt_id DESC
+		LIMIT 1";
+
 	if ($db->db_query($qry_1))
 	{
 		if ($row_1 = $db->db_fetch_object())
-		{	
+		{
 			if (mb_strlen($row_1->kontakt) > $maxlength[$i])
 				$maxlength[$i] = mb_strlen($row_1->kontakt);
 			$worksheet->write($zeile, $i, $row_1->kontakt);
 		}
 	}
 	$i++;
-					
+
+	//Zustelladresse
+	//Zustelladresse aus der Datenbank holen und dazuhaengen
+	$qry_1 = "
+		SELECT
+			*
+		FROM
+			public.tbl_adresse
+		WHERE
+			person_id=".$db->db_add_param($row->person_id)."
+	 		AND zustelladresse=true LIMIT 1";
+
+	if($result_1 = $db->db_query($qry_1))
+	{
+		if($row_1 = $db->db_fetch_object($result_1))
+		{
+			if(mb_strlen($row_1->strasse)>$maxlength[$i])
+				$maxlength[$i]=mb_strlen($row_1->strasse);
+			$worksheet->write($zeile,$i, $row_1->strasse);
+			$i++;
+
+			if(mb_strlen($row_1->plz)>$maxlength[$i])
+				$maxlength[$i]=mb_strlen($row_1->plz);
+			$worksheet->writeString($zeile,$i, $row_1->plz);
+			$i++;
+
+			if(mb_strlen($row_1->ort)>$maxlength[$i])
+				$maxlength[$i]=mb_strlen($row_1->ort);
+			$worksheet->write($zeile,$i, $row_1->ort);
+			$i++;
+
+			if(mb_strlen($row_1->gemeinde)>$maxlength[$i])
+				$maxlength[$i]=mb_strlen($row_1->gemeinde);
+			$worksheet->write($zeile,$i, $row_1->gemeinde);
+			$i++;
+
+			if(mb_strlen($row_1->nation)>$maxlength[$i])
+				$maxlength[$i]=mb_strlen($row_1->nation);
+			$worksheet->write($zeile,$i, $row_1->nation);
+			$i++;
+		}
+		else
+			$i+=5;
+	}
+	else
+		$i+=5;
+
 	//Geburtsdatum
 	if (mb_strlen($row->gebdatum) > $maxlength[$i])
 		$maxlength[$i] = mb_strlen($row->gebdatum);
 	$worksheet->write($zeile, $i, $datum_obj->convertISODate($row->gebdatum));
 	$i++;
-	
+
 	//Personenkennzeichen
 	if (isset($row->matrikelnr))
 	{
@@ -311,40 +378,49 @@ function draw_content($row)
 		$worksheet->writeString($zeile, $i, $row->matrikelnr);
 	}
 	$i++;
-	
+
 	//Staatsbuergerschaft
 	if (mb_strlen($row->staatsbuergerschaft) > $maxlength[$i])
 		$maxlength[$i] = mb_strlen($row->staatsbuergerschaft);
 	$worksheet->write($zeile, $i, $row->staatsbuergerschaft);
 	$i++;
-	
+
 	//SVNR
 	if (mb_strlen($row->svnr) > $maxlength[$i])
 		$maxlength[$i] = mb_strlen($row->svnr);
 	$worksheet->write($zeile, $i, $row->svnr);
 	$i++;
-	
+
 	//Ersatzkennzeichen
 	if (mb_strlen($row->ersatzkennzeichen) > $maxlength[$i])
 		$maxlength[$i] = mb_strlen($row->ersatzkennzeichen);
 	$worksheet->write($zeile, $i, $row->ersatzkennzeichen);
 	$i++;
-	
+
 	//Geschlecht
 	if (mb_strlen($row->geschlecht) > $maxlength[$i])
 		$maxlength[$i] = mb_strlen($row->geschlecht);
 	$worksheet->write($zeile, $i, $row->geschlecht);
 	$i++;
-	
+
 	//Studiengang
 	if (mb_strlen($row->stgbez) > $maxlength[$i])
 		$maxlength[$i] = mb_strlen($row->stgbez);
 	$worksheet->write($zeile, $i, $row->stgbez);
 	$i++;
-	
-	$qry = "SELECT tbl_studentlehrverband.semester AS semester_studiensemester, tbl_student.semester AS semester_aktuell,* FROM public.tbl_studentlehrverband JOIN public.tbl_student USING(student_uid) 
-			WHERE prestudent_id='".addslashes($row->prestudent_id)."' 
-			AND studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."'";
+
+	$qry = "
+	SELECT
+		tbl_studentlehrverband.semester AS semester_studiensemester,
+		tbl_student.semester AS semester_aktuell,
+		*
+	FROM
+		public.tbl_studentlehrverband
+		JOIN public.tbl_student USING(student_uid)
+	WHERE
+		prestudent_id=".$db->db_add_param($row->prestudent_id)."
+		AND studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz);
+
 	if ($db->db_query($qry))
 	{
 		if ($row_sem = $db->db_fetch_object())
@@ -354,14 +430,14 @@ function draw_content($row)
 			$verband = $row_sem->verband;
 			$gruppe = $row_sem->gruppe;
 		}
-		else 
+		else
 		{
 			$semester_aktuell = '';
 			$verband = '';
 			$gruppe = '';
 		}
 	}
-	//Semester im eingestellten Studiensemester		
+	//Semester im eingestellten Studiensemester
 	if (isset($semester_studiensemester))
 	{
 		if (mb_strlen($semester_studiensemester) > $maxlength[$i])
@@ -369,7 +445,7 @@ function draw_content($row)
 		$worksheet->write($zeile, $i, $semester_studiensemester);
 	}
 	$i++;
-	
+
 	//Semester aktuell
 	if (isset($semester_aktuell))
 	{
@@ -378,7 +454,7 @@ function draw_content($row)
 		$worksheet->write($zeile, $i, $semester_aktuell);
 	}
 	$i++;
-	
+
 	//Verband
 	if (isset($verband))
 	{
@@ -387,7 +463,7 @@ function draw_content($row)
 		$worksheet->write($zeile, $i, $verband);
 	}
 	$i++;
-	
+
 	//Gruppe
 	if (isset($gruppe))
 	{
@@ -396,8 +472,8 @@ function draw_content($row)
 		$worksheet->write($zeile, $i, $gruppe);
 	}
 	$i++;
-	
-	//ZGV		
+
+	//ZGV
 	if ($row->zgv_code!='' && isset($zgv_arr[$row->zgv_code]))
 	{
 		if (mb_strlen($zgv_arr[$row->zgv_code]) > $maxlength[$i])
@@ -405,19 +481,19 @@ function draw_content($row)
 		$worksheet->write($zeile, $i, $zgv_arr[$row->zgv_code]);
 	}
 	$i++;
-	
+
 	//ZGV Ort
 	if (mb_strlen($row->zgvort) > $maxlength[$i])
 		$maxlength[$i] = mb_strlen($row->zgvort);
 	$worksheet->write($zeile, $i, $row->zgvort);
 	$i++;
-	
+
 	//ZGV Datum
 	if (mb_strlen($row->zgvdatum) > $maxlength[$i])
 		$maxlength[$i] = mb_strlen($row->zgvdatum);
 	$worksheet->write($zeile, $i, $row->zgvdatum);
 	$i++;
-	
+
 	//ZGV Master
 	if ($row->zgvmas_code!='' && isset($zgvmas_arr[$row->zgvmas_code]))
 	{
@@ -426,31 +502,38 @@ function draw_content($row)
 		$worksheet->write($zeile, $i, $zgvmas_arr[$row->zgvmas_code]);
 	}
 	$i++;
-	
+
 	//ZGV Master Ort
 	if (mb_strlen($row->zgvmaort) > $maxlength[$i])
 		$maxlength[$i] = mb_strlen($row->zgvmaort);
 	$worksheet->write($zeile, $i, $row->zgvmaort);
 	$i++;
-	
+
 	//ZGV Master Datum
 	if (mb_strlen($row->zgvmadatum) > $maxlength[$i])
 		$maxlength[$i] = mb_strlen($row->zgvmadatum);
 	$worksheet->write($zeile, $i, $row->zgvmadatum);
 	$i++;
-	
+
 	//Status
 	if (mb_strlen($status) > $maxlength[$i])
 		$maxlength[$i] = mb_strlen($status);
 	$worksheet->write($zeile, $i, $status);
 	$i++;
-	
+
 	//Stati in anderen Studiengaengen
 	$stati='';
-	$qry_1 = "SELECT UPPER(typ::varchar(1) || kurzbz) as stg, get_rolle_prestudent(prestudent_id, null) as status FROM
-			public.tbl_prestudent JOIN public.tbl_studiengang USING(studiengang_kz) 
-			WHERE person_id='".addslashes($row->person_id)."' AND tbl_prestudent.studiengang_kz<>'".addslashes($row->prestgkz)."'";
-	
+	$qry_1 = "
+		SELECT
+			UPPER(typ::varchar(1) || kurzbz) as stg,
+			get_rolle_prestudent(prestudent_id, null) as status
+		FROM
+			public.tbl_prestudent
+			JOIN public.tbl_studiengang USING(studiengang_kz)
+		WHERE
+			person_id=".$db->db_add_param($row->person_id)."
+			AND tbl_prestudent.studiengang_kz<>".$db->db_add_param($row->prestgkz);
+
 	if ($db->db_query($qry_1))
 	{
 		while($row_1 = $db->db_fetch_object())
@@ -464,7 +547,7 @@ function draw_content($row)
 		$maxlength[$i] = mb_strlen($stati);
 	$worksheet->write($zeile, $i, $stati);
 	$i++;
-	
+
 	//Email Intern
 	if (isset($row->student_uid))
 	{
@@ -473,10 +556,19 @@ function draw_content($row)
 		$worksheet->write($zeile, $i, $row->student_uid.'@'.DOMAIN);
 	}
 	$i++;
-			
+
 	//Telefon
-	$qry_1 = "SELECT kontakt FROM public.tbl_kontakt 
-				WHERE kontakttyp in('mobil','telefon','so.tel') AND person_id='".addslashes($row->person_id)."' AND zustellung=true LIMIT 1";
+	$qry_1 = "
+		SELECT
+			kontakt
+		FROM
+			public.tbl_kontakt
+		WHERE
+			kontakttyp in('mobil','telefon','so.tel')
+			AND person_id=".$db->db_add_param($row->person_id)."
+			AND zustellung=true
+		LIMIT 1";
+
 	if ($db->db_query($qry_1))
 	{
 		if ($row_1 = $db->db_fetch_object())
@@ -487,19 +579,26 @@ function draw_content($row)
 		}
 	}
 	$i++;
-	
+
 	//Spezialgruppen
 	$grps='';
-	$qry_1 = "SELECT gruppe_kurzbz FROM public.tbl_student JOIN public.tbl_benutzergruppe ON (student_uid=uid) 
-				WHERE tbl_student.prestudent_id='".addslashes($row->prestudent_id)."' 
-				AND tbl_benutzergruppe.studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."'";
+	$qry_1 = "
+		SELECT
+			gruppe_kurzbz
+		FROM
+			public.tbl_student
+			JOIN public.tbl_benutzergruppe ON (student_uid=uid)
+		WHERE
+			tbl_student.prestudent_id=".$db->db_add_param($row->prestudent_id)."
+			AND tbl_benutzergruppe.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz);
+
 	if ($db->db_query($qry_1))
 	{
 		while($row_1 = $db->db_fetch_object())
 		{
 			if ($grps!='')
 				$grps.=',';
-			
+
 			$grps.=$row_1->gruppe_kurzbz;
 		}
 	}
@@ -507,7 +606,7 @@ function draw_content($row)
 		$maxlength[$i] = mb_strlen($grps);
 	$worksheet->write($zeile, $i, $grps);
 	$i++;
-	
+
 	//UID
 	if (isset($row->student_uid))
 	{
@@ -516,99 +615,75 @@ function draw_content($row)
 		$worksheet->write($zeile, $i, $row->student_uid);
 	}
 	$i++;
-	
+
 	//Orgform
 	if (mb_strlen($orgform) > $maxlength[$i])
 		$maxlength[$i] = mb_strlen($orgform);
 	$worksheet->write($zeile, $i, $orgform);
 	$i++;
-	
+
 	//Vornamen
 	if (mb_strlen($row->vornamen) > $maxlength[$i])
 		$maxlength[$i] = mb_strlen($row->vornamen);
 	$worksheet->write($zeile, $i, $row->vornamen);
 	$i++;
-	
-	
+
+
 	//RT_Punkte1
 	if (mb_strlen($row->rt_punkte1) > $maxlength[$i])
 		$maxlength[$i] = mb_strlen($row->rt_punkte1);
 	$worksheet->write($zeile, $i, $row->rt_punkte1);
 	$i++;
-	
+
 	//RT_Punkte2
 	if (mb_strlen($row->rt_punkte2) > $maxlength[$i])
 		$maxlength[$i] = mb_strlen($row->rt_punkte2);
 	$worksheet->write($zeile, $i, $row->rt_punkte2);
 	$i++;
-	
+
 	//RT_Gesamtpunkte
 	if (mb_strlen($row->rt_gesamtpunkte) > $maxlength[$i])
 		$maxlength[$i] = mb_strlen($row->rt_gesamtpunkte);
 	$worksheet->write($zeile, $i, $row->rt_gesamtpunkte);
 	$i++;
-	
+
 	// UDF
 	if (isset($row->p_udf_values))
 	{
 		$udfPerson = json_decode($row->p_udf_values);
 		if (is_object($udfPerson)) $udfPerson = (array)$udfPerson;
-		
-		foreach($udfTitlesPerson as $udfTitle)
+
+		foreach ($udfTitlesPerson as $udfTitle)
 		{
-			if (isset($udfPerson[$udfTitle['name']]))
+			$toWrite = $udf->encodeToString($udfPerson, $udfTitle);
+
+			if (mb_strlen($toWrite) > $maxlength[$i])
 			{
-				if (is_string($udfPerson[$udfTitle['name']]) || is_numeric($udfPerson[$udfTitle['name']]))
-				{
-					if (mb_strlen($udfPerson[$udfTitle['name']]) > $maxlength[$i])
-					{
-						$maxlength[$i] = mb_strlen($udfPerson[$udfTitle['name']]);
-					}
-					$worksheet->write($zeile, $i, $udfPerson[$udfTitle['name']]);
-				}
-				else if(is_array($udfPerson[$udfTitle['name']]) && isset($udfTitle['enum']))
-				{
-					$toWrite = $udf->dropdownListValuesToString($udfPerson[$udfTitle['name']], $udfTitle['enum']);
-					
-					if (mb_strlen($toWrite) > $maxlength[$i])
-					{
-						$maxlength[$i] = mb_strlen($toWrite);
-					}
-					$worksheet->write($zeile, $i, $toWrite);
-				}
+				$maxlength[$i] = mb_strlen($toWrite);
 			}
+
+			$worksheet->write($zeile, $i, $toWrite);
+
 			$i++;
 		}
 	}
-	
+
 	if (isset($row->ps_udf_values))
 	{
 		$udfPrestudent = json_decode($row->ps_udf_values);
 		if (is_object($udfPrestudent)) $udfPrestudent = (array)$udfPrestudent;
-		
-		foreach($udfTitlesPrestudent as $udfTitle)
+
+		foreach ($udfTitlesPrestudent as $udfTitle)
 		{
-			if (isset($udfPrestudent[$udfTitle['name']]))
+			$toWrite = $udf->encodeToString($udfPrestudent, $udfTitle);
+
+			if (mb_strlen($toWrite) > $maxlength[$i])
 			{
-				if (is_string($udfPrestudent[$udfTitle['name']]) || is_numeric($udfPrestudent[$udfTitle['name']]))
-				{
-					if (mb_strlen($udfPrestudent[$udfTitle['name']]) > $maxlength[$i])
-					{
-						$maxlength[$i] = mb_strlen($udfPrestudent[$udfTitle['name']]);
-					}
-					$worksheet->write($zeile, $i, $udfPrestudent[$udfTitle['name']]);
-				}
-				else if(is_array($udfPrestudent[$udfTitle['name']]) && isset($udfTitle['enum']))
-				{
-					$toWrite = $udf->dropdownListValuesToString($udfPrestudent[$udfTitle['name']], $udfTitle['enum']);
-					
-					if (mb_strlen($toWrite) > $maxlength[$i])
-					{
-						$maxlength[$i] = mb_strlen($toWrite);
-					}
-					$worksheet->write($zeile, $i, $toWrite);
-				}
+				$maxlength[$i] = mb_strlen($toWrite);
 			}
+
+			$worksheet->write($zeile, $i, $toWrite);
+
 			$i++;
 		}
 	}
@@ -620,4 +695,4 @@ foreach($maxlength as $i => $breite)
 
 $workbook->close();
 
-?>
+?>