From 62762a936839f581fd3b64ae41751966cf08b891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20H=C3=A4usler?= <msquare@notrademark.de>
Date: Wed, 1 Jun 2011 15:03:10 +0200
Subject: [PATCH] bootstrapping finish

---
 www-ssl/ShowUserPicture.php | 100 ++++++++++++++++++------------------
 www-ssl/admin/dect.php      |   2 +-
 www-ssl/lageplan.php        |  14 ++---
 3 files changed, 60 insertions(+), 56 deletions(-)

diff --git a/www-ssl/ShowUserPicture.php b/www-ssl/ShowUserPicture.php
index b6e95897..96b1092a 100644
--- a/www-ssl/ShowUserPicture.php
+++ b/www-ssl/ShowUserPicture.php
@@ -1,51 +1,53 @@
 <?php
-  include "../../camp2011/includes/config.php";
-  include "../../camp2011/includes/error_handler.php";
-  include "../../camp2011/includes/config_db.php";
-
-  if(!isset($_SESSION))
-    session_start();
-
-  include "../../camp2011/includes/secure.php";
-
-  // Parameter check
-  if(!isset($_GET["UID"]))
-    $_GET["UID"] = "-1";
-
-  $SQL = "SELECT * FROM `UserPicture` WHERE `UID`='" . $_GET["UID"] . "'";
-  $res = mysql_query($SQL, $con);
-
-  if(mysql_num_rows($res) == 1) {
-    // genuegend rechte
-    if(!isset($_SESSION['UID']) || $_SESSION['UID'] == -1) {
-      header("HTTP/1.0 403 Forbidden");
-      die("403 Forbidden");
-    }
-
-    // ist das bild sichtbar?
-    if((mysql_result($res, 0, "show") == "N") AND ($_SESSION['UID']!=$_GET["UID"]) AND ($_SESSION['CVS'][ "admin/UserPicture.php" ] == "N")) {
-      $SQL = "SELECT * FROM `UserPicture` WHERE `UID`='-1'";
-      $res = mysql_query($SQL, $con);
-
-      if(mysql_num_rows($res) != 1) {
-        header("HTTP/1.0 404 Not Found");
-        die("404 Not Found");
-      }
-    }
-
-    // bild aus db auslesen
-    $bild = mysql_result($res, 0, "Bild");
-
-    // ausgabe bild
-    header("Accept-Ranges: bytes");
-    header("Content-Length: " . strlen($bild));
-    header("Content-type: " . mysql_result($res, 0, "ContentType"));
-    header("Cache-control: public");
-    header("Cache-request-directive: min-fresh = 120");
-    header("Cache-request-directive: max-age = 360");
-    echo $bild;
-  } else {
-    header("HTTP/1.0 404 Not Found");
-    die( "404 Not Found");
-  }
+require_once ('bootstrap.php');
+
+include "config/config.php";
+include "includes/error_handler.php";
+include "config/config_db.php";
+
+if (!isset ($_SESSION))
+	session_start();
+
+include "includes/secure.php";
+
+// Parameter check
+if (!isset ($_GET["UID"]))
+	$_GET["UID"] = "-1";
+
+$SQL = "SELECT * FROM `UserPicture` WHERE `UID`='" . $_GET["UID"] . "'";
+$res = mysql_query($SQL, $con);
+
+if (mysql_num_rows($res) == 1) {
+	// genuegend rechte
+	if (!isset ($_SESSION['UID']) || $_SESSION['UID'] == -1) {
+		header("HTTP/1.0 403 Forbidden");
+		die("403 Forbidden");
+	}
+
+	// ist das bild sichtbar?
+	if ((mysql_result($res, 0, "show") == "N") AND ($_SESSION['UID'] != $_GET["UID"]) AND ($_SESSION['CVS']["admin/UserPicture.php"] == "N")) {
+		$SQL = "SELECT * FROM `UserPicture` WHERE `UID`='-1'";
+		$res = mysql_query($SQL, $con);
+
+		if (mysql_num_rows($res) != 1) {
+			header("HTTP/1.0 404 Not Found");
+			die("404 Not Found");
+		}
+	}
+
+	// bild aus db auslesen
+	$bild = mysql_result($res, 0, "Bild");
+
+	// ausgabe bild
+	header("Accept-Ranges: bytes");
+	header("Content-Length: " . strlen($bild));
+	header("Content-type: " . mysql_result($res, 0, "ContentType"));
+	header("Cache-control: public");
+	header("Cache-request-directive: min-fresh = 120");
+	header("Cache-request-directive: max-age = 360");
+	echo $bild;
+} else {
+	header("HTTP/1.0 404 Not Found");
+	die("404 Not Found");
+}
 ?>
diff --git a/www-ssl/admin/dect.php b/www-ssl/admin/dect.php
index 6ad98c81..4e9f472a 100644
--- a/www-ssl/admin/dect.php
+++ b/www-ssl/admin/dect.php
@@ -6,7 +6,7 @@ $header = "DECT send call";
 include ("includes/header.php");
 
 include ("config/config_IAX.php");
-//include ("../../../camp2011/includes/funktion_modem.php");
+//include ("includes/funktion_modem.php");
 include ("includes/funktion_cron.php");
 
 if (!isset ($_GET["dial"]))
diff --git a/www-ssl/lageplan.php b/www-ssl/lageplan.php
index ca6ee4b0..3d1260c1 100644
--- a/www-ssl/lageplan.php
+++ b/www-ssl/lageplan.php
@@ -1,10 +1,12 @@
 <?php
-  $title = "Index";
-  $header = "Lageplan";
-  include "../../camp2011/includes/header.php";
+require_once ('bootstrap.php');
 
-  echo "<p>" . Get_Text("lageplan_text1") . "</p>";
-  echo "<p><img src=\"./pic/lageplan/lageplan.jpg\" alt=\"\" />";
+$title = "Index";
+$header = "Lageplan";
+include "includes/header.php";
 
-  include "../../camp2011/includes/footer.php";
+echo "<p>" . Get_Text("lageplan_text1") . "</p>";
+echo "<p><img src=\"./pic/lageplan/lageplan.jpg\" alt=\"\" />";
+
+include "includes/footer.php";
 ?>