From 8d22ad42dd6c28d8e957e7f856452352c8b6221b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Thu, 12 Jul 2012 13:17:04 +0000
Subject: [PATCH] =?UTF-8?q?-=20Bildpruefung=20zeigt=20nun=20das=20gro?=
 =?UTF-8?q?=C3=9Fe=20Profilbild=20an=20statt=20dem=20kleinen=20-=20Englisc?=
 =?UTF-8?q?her=20Text=20f=C3=BCr=20Infomail=20beim=20Bildcheck=20hinzugef?=
 =?UTF-8?q?=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 content/bild.php                   | 14 ++++++++++++--
 vilesci/fhausweis/bildpruefung.php | 17 +++++++++++++++--
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/content/bild.php b/content/bild.php
index bf7d4d8a8..4ae2180c8 100644
--- a/content/bild.php
+++ b/content/bild.php
@@ -24,18 +24,28 @@
 // Aufruf mit <img src='bild.php?src=frage&frage_id=1
 require_once('../config/vilesci.config.inc.php');
 require_once('../include/basis_db.class.php');
+$db = new basis_db();
 //base64 Dump aus der DB holen
 $cTmpHEX='/9j/4AAQSkZJRgABAQEASABIAAD/4QAWRXhpZgAATU0AKgAAAAgAAAAAAAD//gAXQ3JlYXRlZCB3aXRoIFRoZSBHSU1Q/9sAQwAFAwQEBAMFBAQEBQUFBgcMCAcHBwcPCwsJDBEPEhIRDxERExYcFxMUGhURERghGBodHR8fHxMXIiQiHiQcHh8e/9sAQwEFBQUHBgcOCAgOHhQRFB4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4e/8AAEQgAAQABAwEiAAIRAQMRAf/EABUAAQEAAAAAAAAAAAAAAAAAAAAI/8QAFBABAAAAAAAAAAAAAAAAAAAAAP/EABQBAQAAAAAAAAAAAAAAAAAAAAD/xAAUEQEAAAAAAAAAAAAAAAAAAAAA/9oADAMBAAIRAxEAPwCywAf/2Q==';
 if(isset($_GET['src']) && $_GET['src']=='person' && isset($_GET['person_id']))
 {
-	$qry = "SELECT foto FROM public.tbl_person WHERE person_id='".addslashes($_GET['person_id'])."'";
-	$db = new basis_db();
+	$qry = "SELECT foto FROM public.tbl_person WHERE person_id=".$db->db_add_param($_GET['person_id'], FHC_INTEGER);
 	if($result = $db->db_query($qry))
 	{
 		if($row = $db->db_fetch_object($result))	
 			$cTmpHEX=$row->foto;
 	}		
 }
+elseif(isset($_GET['src']) && $_GET['src']=='akte' && isset($_GET['person_id']))
+{
+	$qry = "SELECT inhalt as foto FROM public.tbl_akte WHERE person_id=".$db->db_add_param($_GET['person_id'], FHC_INTEGER)." AND dokument_kurzbz='Lichtbil'";
+	if($result = $db->db_query($qry))
+	{
+		if($row = $db->db_fetch_object($result))	
+			$cTmpHEX=$row->foto;
+	}		
+}
+
 //Header fuer Bild schicken
 header("Content-type: image/gif");
 //base64 Werte in Zeichen umwandeln und ausgeben
diff --git a/vilesci/fhausweis/bildpruefung.php b/vilesci/fhausweis/bildpruefung.php
index 83cb3c313..45755fd49 100755
--- a/vilesci/fhausweis/bildpruefung.php
+++ b/vilesci/fhausweis/bildpruefung.php
@@ -112,7 +112,20 @@ if(isset($_POST['person_id']))
 			$text .= "Bitte Laden Sie ein entsprechendes Profilbild im CIS unter 'Mein CIS'->'Profil' hoch.\n";
 			$text .= "\n";
 			$text .= "Herzlichen Dank\n";
-			$text .= "Fachhochschule Technikum Wien";
+			$text .= "Fachhochschule Technikum Wien\n";
+			$text .= "\n------------------\n\n";
+			if($person->geschlecht=='m')
+				$text .= "Dear Mr ".$person->vorname.' '.$person->nachname.",\n\n";
+			else
+				$text .= "Dear Ms ".$person->vorname.' '.$person->nachname.",\n\n";
+			$text .= "Your profile photograph has been checked and does not fulfil the photo criteria.\n";
+			$text .= "The current criteria can be found under the following link:\n";
+			$text .= "https://cis.technikum-wien.at/cms/content.php?content_id=6174\n";
+			$text .= "\n";
+			$text .= "Please upload a suitable profile photo in the CIS under 'My CIS'->'Profile'.\n";
+			$text .= "\n";
+			$text .= "Thank you\n";
+			$text .= "University of Applied Sciences Technikum Wien";
 			
 			$mail = new mail($to, $from, $subject, $text);
 			if($mail->send())
@@ -240,7 +253,7 @@ if($result = $db->db_query($qry))
 		<table>	
 			<tr>
 				<td>
-				<img src="../../content/bild.php?src=person&person_id='.$row->person_id.'" height="100px" width="75px">
+				<img src="../../content/bild.php?src=akte&person_id='.$row->person_id.'" height="100px" width="75px">
 				</td>
 				<td>&nbsp;</td>
 				<td>