From a8419b146f949cc3630513230356ea59278395f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 13 Jul 2009 15:45:56 +0000
Subject: [PATCH]

---
 cis/public/bild.php | 13 ++-----------
 skin/style.css.php  |  2 +-
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/cis/public/bild.php b/cis/public/bild.php
index ae254a19a..48d26d436 100644
--- a/cis/public/bild.php
+++ b/cis/public/bild.php
@@ -27,17 +27,8 @@
   if (!$db = new basis_db())
   		die('Fehler beim Oeffnen der Datenbankverbindung');
 
-//Hexcode in String umwandeln
-function hexstr($hex)
-{
-    $string="";
-    for ($i=0;$i<strlen($hex)-1;$i+=2)
-        $string.=chr(hexdec($hex[$i].$hex[$i+1]));
-    return $string;
-}
-
 //default bild (ein weisser pixel)
-$cTmpHEX='ffd8ffe000104a46494600010101004800480000ffe100164578696600004d4d002a00000008000000000000fffe0017437265617465642077697468205468652047494d50ffdb0043000503040404030504040405050506070c08070707070f0b0b090c110f1212110f111113161c1713141a1511111821181a1d1d1f1f1f13172224221e241c1e1f1effdb0043010505050706070e08080e1e1411141e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1e1effc00011080001000103012200021101031101ffc4001500010100000000000000000000000000000008ffc40014100100000000000000000000000000000000ffc40014010100000000000000000000000000000000ffc40014110100000000000000000000000000000000ffda000c03010002110311003f00b2c007ffd9';
+$cTmpHEX='/9j/4AAQSkZJRgABAQEASABIAAD/4QAWRXhpZgAATU0AKgAAAAgAAAAAAAD//gAXQ3JlYXRlZCB3aXRoIFRoZSBHSU1Q/9sAQwAFAwQEBAMFBAQEBQUFBgcMCAcHBwcPCwsJDBEPEhIRDxERExYcFxMUGhURERghGBodHR8fHxMXIiQiHiQcHh8e/9sAQwEFBQUHBgcOCAgOHhQRFB4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4e/8AAEQgAAQABAwEiAAIRAQMRAf/EABUAAQEAAAAAAAAAAAAAAAAAAAAI/8QAFBABAAAAAAAAAAAAAAAAAAAAAP/EABQBAQAAAAAAAAAAAAAAAAAAAAD/xAAUEQEAAAAAAAAAAAAAAAAAAAAA/9oADAMBAAIRAxEAPwCywAf/2Q==';
 //Hex Dump aus der DB holen
 if(isset($_GET['src']) && $_GET['src']=='person' && isset($_GET['person_id']))
 {
@@ -55,7 +46,7 @@ if(isset($_GET['src']) && $_GET['src']=='person' && isset($_GET['person_id']))
 		
 //die bilder werden, sofern es funktioniert, in jpg umgewandelt da es sonst zu fehlern beim erstellen
 //von pdfs kommen kann.
-$im = @imagecreatefromstring(hexstr($cTmpHEX));
+$im = @imagecreatefromstring(base64_decode($cTmpHEX));
 if($im!==false)
 {
 	@ob_clean();
diff --git a/skin/style.css.php b/skin/style.css.php
index 9c6194660..24cb5cce2 100644
--- a/skin/style.css.php
+++ b/skin/style.css.php
@@ -7,7 +7,7 @@
 		$path=$_GET['path'];
 	else
 		$path='../';
-	require ($path.'cis/config.inc.php');
+	require ($path.'config/cis.config.inc.php');
 	//setcookie('stylesheet', DEFAULT_STYLE);
 	//Name des Stylesheets darf nur buchstaben von A-Z enthalten (ohne umlaute)
 	if (isset($_COOKIE['stylesheet']) && preg_match('/^[a-zA-Z]+$/', $_COOKIE['stylesheet']))