bootstrapping

This commit is contained in:
Philip Häusler 2011-06-01 14:30:29 +02:00
parent 550467697f
commit 6ebee2c46b
19 changed files with 152 additions and 135 deletions

4
config/.gitignore vendored Normal file
View File

@ -0,0 +1,4 @@
config_db.php
config_jabber.php
config_modem.php
config.php

View File

@ -5,6 +5,9 @@ $url = "https://SEDENGELURL";
// Startverzeichnis des Engelhome // Startverzeichnis des Engelhome
$ENGEL_ROOT = "/"; $ENGEL_ROOT = "/";
// Default-Theme auf der Startseite, 1=style1.css usw.
$default_theme = 10;
// System disable message, ist ist set is: bages schow only this text // System disable message, ist ist set is: bages schow only this text
//$SystemDisableMessage="<H1>This system ist moved to a server in the BCC, you can in the moment only youse it in the in Engel Room</H1>"; //$SystemDisableMessage="<H1>This system ist moved to a server in the BCC, you can in the moment only youse it in the in Engel Room</H1>";
@ -16,7 +19,7 @@ $LETZTES_AUSTRAGEN=3;
//Setzt den zu verwendenden Crypto algorismis //Setzt den zu verwendenden Crypto algorismis
// mp5 oder crypt // mp5 oder crypt
// achtung crypt schaltet password ändern ab // achtung crypt schaltet password <EFBFBD>ndern ab
$crypt_system="md5"; $crypt_system="md5";
//$crypt_system="crypt"; //$crypt_system="crypt";
@ -26,7 +29,7 @@ $arch_angels="fnord";
// timezonen offsett // timezonen offsett
$gmdateOffset=3600; $gmdateOffset=3600;
// für Developen 1, sonst = 0 // f<EFBFBD>r Developen 1, sonst = 0
$debug = 0; $debug = 0;
// SSL Cert-KEY // SSL Cert-KEY
@ -42,7 +45,7 @@ $Tempdir="./tmp";
// local timezone // local timezone
date_default_timezone_set("Europe/Berlin"); date_default_timezone_set("Europe/Berlin");
//Pentabarf ConferenzDI für UpdateDB //Pentabarf ConferenzDI f<EFBFBD>r UpdateDB
$PentabarfXMLhost = "cccv.pentabarf.org"; $PentabarfXMLhost = "cccv.pentabarf.org";
$PentabarfXMLpath = "Xcal/conference/"; $PentabarfXMLpath = "Xcal/conference/";
$PentabarfXMLEventID = "31"; $PentabarfXMLEventID = "31";

View File

@ -1,5 +1,5 @@
<?php <?php
include("funktion_db.php"); include("../include/funktion_db.php");
$con = mysql_connect("localhost", "root", "changeme") or die ("connection failed"); $con = mysql_connect("localhost", "root", "changeme") or die ("connection failed");
$sel = mysql_select_db("tabel") or die (mysql_error()); $sel = mysql_select_db("tabel") or die (mysql_error());

View File

@ -20,13 +20,14 @@
} }
// pagename ermitteln // pagename ermitteln
$Page["Name"] = basename($_SERVER['PHP_SELF']); //$Page["Name"] = basename($_SERVER['PHP_SELF']);
$Page["Name"] = str_replace($ENGEL_ROOT, '', $_SERVER['PHP_SELF']);
//recht fuer diese seite auslesen //recht fuer diese seite auslesen
if(isset($_SESSION['CVS'][$Page["Name"]])) if(isset($_SESSION['CVS'][$Page["Name"]]))
$Page["CVS"] = $_SESSION['CVS'][$Page["Name"]]; $Page["CVS"] = $_SESSION['CVS'][$Page["Name"]];
else { else {
echo "SYSTEM ERROR: now right for " . $Page["Name"] . " exists."; echo "SYSTEM ERROR: no right for " . $Page["Name"] . " exists.";
die; die;
} }

View File

@ -1,10 +0,0 @@
<?php
// ist ein modem angeschlossen
$ModemEnable = false;
// COM port
$ModemDev = "/dev/ttyS0";
// vorwahl, bei tnovis telefonanlage fuer das programmieren von weckrufen
$WakeupNumber = "**3";
?>

View File

@ -1,6 +1,6 @@
<?php <?php
function PassCrypt($passwort) { function PassCrypt($passwort) {
include "config.php"; include "../../config/config.php";
switch ($crypt_system) { switch ($crypt_system) {
case "crypt": case "crypt":

View File

@ -100,7 +100,7 @@
function send_message(&$message) function send_message(&$message)
{ {
chdir(dirname(__FILE__)); chdir(dirname(__FILE__));
require_once('./config_jabber.php'); require_once('../config/config_jabber.php');
if (isset($jabber_recipient) && count($jabber_recipient)) { if (isset($jabber_recipient) && count($jabber_recipient)) {
$jabber = new Jabber($server, $port, $username, $password, $resource); $jabber = new Jabber($server, $port, $username, $password, $resource);

View File

@ -17,7 +17,9 @@ echo "<!DOCTYPE html>\n";
<meta name="revisit-after" content="1 days" /> <meta name="revisit-after" content="1 days" />
<script type="text/javascript" src="css/grossbild.js"></script> <script type="text/javascript" src="css/grossbild.js"></script>
<link rel="stylesheet" type="text/css" href="css/base.css" /> <link rel="stylesheet" type="text/css" href="css/base.css" />
<link rel="stylesheet" type="text/css" href="css/style<?php echo isset($_SESSION['color']) ? $_SESSION['color'] : "6" ?>.css" /> <link rel="stylesheet" type="text/css" href="css/style<?php echo isset($_SESSION['color']) ? $_SESSION['color'] : $default_theme ?>.css" />
<link rel="stylesheet" type="text/css" href="../css/base.css" />
<link rel="stylesheet" type="text/css" href="../css/style<?php echo isset($_SESSION['color']) ? $_SESSION['color'] : $default_theme ?>.css" />
<?php <?php

View File

@ -1,9 +1,9 @@
<?php <?php
ini_set("session.gc_maxlifetime", "65535"); ini_set("session.gc_maxlifetime", "65535");
include "config.php"; include "config/config.php";
include "error_handler.php"; include "error_handler.php";
include "config_db.php"; include "config/config_db.php";
include "funktion_lang.php"; include "funktion_lang.php";
include "funktion_faq.php"; // fuer noAnswer() im menu include "funktion_faq.php"; // fuer noAnswer() im menu
include "funktion_menu.php"; include "funktion_menu.php";

View File

@ -1,5 +1,5 @@
<?php <?php
include "config.php"; include "config/config.php";
?> ?>
<form action="<?php echo $url . $ENGEL_ROOT; ?>nonpublic/index.php" method="post"> <form action="<?php echo $url . $ENGEL_ROOT; ?>nonpublic/index.php" method="post">

12
www-ssl/bootstrap.php Normal file
View File

@ -0,0 +1,12 @@
<?php
// path and include settings
$rootpath = str_replace(DIRECTORY_SEPARATOR . 'bootstrap.php', '', __FILE__);
define('ROOTPATH', $rootpath);
$includePath = ini_get('include_path');
$includePath .= PATH_SEPARATOR . ROOTPATH . DIRECTORY_SEPARATOR . '..';
ini_set('include_path', $includePath);
?>

View File

@ -3,6 +3,9 @@
padding: 0; padding: 0;
} }
body {
}
header { header {
display: block; display: block;
width: 100%; width: 100%;

View File

@ -1,22 +1,24 @@
<?php <?php
$title = "Index"; require_once ('bootstrap.php');
$header = "FAQ";
include "../../camp2011/includes/header.php";
$SQL = "SELECT * FROM `FAQ`"; $title = "FAQ";
$Erg = mysql_query($SQL, $con); $header = "FAQ";
include "includes/header.php";
// anzahl Zeilen $SQL = "SELECT * FROM `FAQ`";
$Zeilen = mysql_num_rows($Erg); $Erg = mysql_query($SQL, $con);
for ($n = 0; $n < $Zeilen; $n++) { // anzahl Zeilen
if (mysql_result($Erg, $n, "Antwort") != "") { $Zeilen = mysql_num_rows($Erg);
echo "<dl>";
echo "<dt>" . mysql_result($Erg, $n, "Frage") . "</dt>";
echo "<dd>" . mysql_result($Erg, $n, "Antwort") . "</dd>";
echo "</dl>";
}
}
include "../../camp2011/includes/footer.php"; for ($n = 0; $n < $Zeilen; $n++) {
if (mysql_result($Erg, $n, "Antwort") != "") {
echo "<dl>";
echo "<dt>" . mysql_result($Erg, $n, "Frage") . "</dt>";
echo "<dd>" . mysql_result($Erg, $n, "Antwort") . "</dd>";
echo "</dl>";
}
}
include "includes/footer.php";
?> ?>

View File

@ -1,15 +1,17 @@
<?php <?php
$title = "Start"; require_once ('bootstrap.php');
$header = "Start";
include "../includes/header.php";
echo "<p>" . Get_Text("index_text1") . "</p>\n"; $title = "Start";
echo "<p>" . Get_Text("index_text2") . "</p>\n"; $header = "Start";
echo "<p>" . Get_Text("index_text3") . "</p>\n"; include "includes/header.php";
include "../includes/login_eingabefeld.php"; echo "<p>" . Get_Text("index_text1") . "</p>\n";
echo "<p>" . Get_Text("index_text2") . "</p>\n";
echo "<p>" . Get_Text("index_text3") . "</p>\n";
echo "<h6>" . Get_Text("index_text4") . "</h6>"; include "includes/login_eingabefeld.php";
include "../includes/footer.php"; echo "<h6>" . Get_Text("index_text4") . "</h6>";
include "includes/footer.php";
?> ?>

View File

@ -1,12 +1,15 @@
<?php <?php
include "../../camp2011/includes/config.php";
// Die Session zerstoeren...
session_start();
session_destroy ();
// und eine neue erstellen, damit kein Erzengelmenue angezeigt wird (falls sich ein Erzengel abmeldet...)
session_start();
header("HTTP/1.1 302 Moved Temporarily"); // Die Session zerstoeren usw
header("Location: " . $url . $ENGEL_ROOT); require_once ('bootstrap.php');
include "config/config.php";
session_start();
session_destroy();
// und eine neue erstellen, damit kein Erzengelmenue angezeigt wird (falls sich ein Erzengel abmeldet...)
session_start();
header("HTTP/1.1 302 Moved Temporarily");
header("Location: " . $url . $ENGEL_ROOT);
?> ?>

View File

@ -3,10 +3,10 @@
$header = ""; $header = "";
$success = "none"; $success = "none";
include "../../camp2011/includes/config.php"; include "../config/config.php";
include "../../camp2011/includes/header.php"; include "../includes/header.php";
include "../../camp2011/includes/config_db.php"; include "../config/config_db.php";
include "../../camp2011/includes/crypt.php"; include "../includes/crypt.php";
if(isset($_POST["send"])) { if(isset($_POST["send"])) {
$eNick = trim($_POST["Nick"]); $eNick = trim($_POST["Nick"]);
@ -177,5 +177,5 @@
Print_Text("makeuser_text3"); Print_Text("makeuser_text3");
} }
include "../../camp2011/includes/footer.php"; include "../includes/footer.php";
?> ?>

View File

@ -1,84 +1,77 @@
<?PHP <?PHP
include ('../bootstrap.php');
$title = "Index"; $title = "Index";
$header = "Index"; $header = "Index";
include ("../../../camp2011/includes/config_db.php"); include ("config/config_db.php");
include ("../../../camp2011/includes/crypt.php"); include ("includes/crypt.php");
session_start(); // alte Session - falls vorhanden - wiederherstellen... session_start(); // alte Session - falls vorhanden - wiederherstellen...
function LoginOK() function LoginOK() {
{ include ("../../config/config.php");
include ("../../../camp2011/includes/config.php"); header("HTTP/1.1 302 Moved Temporarily");
header("HTTP/1.1 302 Moved Temporarily"); header("Location: " . $url . $ENGEL_ROOT . "nonpublic/news.php");
header("Location: ". $url. $ENGEL_ROOT. "nonpublic/news.php");
} }
if ( !IsSet($_POST["user"])) if (!IsSet ($_POST["user"])) { // User ist bereits angemeldet... normaler Inhalt...
{ // User ist bereits angemeldet... normaler Inhalt... LoginOK();
LoginOK(); } else { // User ist noch nicht angemeldet
} $sql = "SELECT * FROM `User` WHERE `Nick`='" . $_POST["user"] . "'";
else $userstring = mysql_query($sql, $con);
{ // User ist noch nicht angemeldet
$sql = "SELECT * FROM `User` WHERE `Nick`='". $_POST["user"]. "'";
$userstring = mysql_query($sql, $con);
// anzahl zeilen // anzahl zeilen
$user_anz = mysql_num_rows($userstring); $user_anz = mysql_num_rows($userstring);
if ($user_anz == 1) { // Check, ob User angemeldet wird... if ($user_anz == 1) { // Check, ob User angemeldet wird...
if (mysql_result($userstring, 0, "Passwort") == PassCrypt($_POST["password"])) { // Passwort ok... if (mysql_result($userstring, 0, "Passwort") == PassCrypt($_POST["password"])) { // Passwort ok...
// Session wird eingeleitet und Session-Variablen gesetzt.. // Session wird eingeleitet und Session-Variablen gesetzt..
// session_start(); // session_start();
session_name("Himmel"); session_name("Himmel");
$_SESSION['UID'] = mysql_result($userstring, 0, "UID"); $_SESSION['UID'] = mysql_result($userstring, 0, "UID");
$_SESSION['Nick'] = mysql_result($userstring, 0, "Nick"); $_SESSION['Nick'] = mysql_result($userstring, 0, "Nick");
$_SESSION['Name'] = mysql_result($userstring, 0, "Name"); $_SESSION['Name'] = mysql_result($userstring, 0, "Name");
$_SESSION['Vorname'] = mysql_result($userstring, 0, "Vorname"); $_SESSION['Vorname'] = mysql_result($userstring, 0, "Vorname");
$_SESSION['Alter'] = mysql_result($userstring, 0, "Alter"); $_SESSION['Alter'] = mysql_result($userstring, 0, "Alter");
$_SESSION['Telefon'] = mysql_result($userstring, 0, "Telefon"); $_SESSION['Telefon'] = mysql_result($userstring, 0, "Telefon");
$_SESSION['Handy'] = mysql_result($userstring, 0, "Handy"); $_SESSION['Handy'] = mysql_result($userstring, 0, "Handy");
$_SESSION['DECT'] = mysql_result($userstring, 0, "DECT"); $_SESSION['DECT'] = mysql_result($userstring, 0, "DECT");
$_SESSION['email'] = mysql_result($userstring, 0, "email"); $_SESSION['email'] = mysql_result($userstring, 0, "email");
$_SESSION['ICQ'] = mysql_result($userstring, 0, "ICQ"); $_SESSION['ICQ'] = mysql_result($userstring, 0, "ICQ");
$_SESSION['jabber'] = mysql_result($userstring, 0, "jabber"); $_SESSION['jabber'] = mysql_result($userstring, 0, "jabber");
$_SESSION['Size'] = mysql_result($userstring, 0, "Size"); $_SESSION['Size'] = mysql_result($userstring, 0, "Size");
$_SESSION['Gekommen'] = mysql_result($userstring, 0, "Gekommen"); $_SESSION['Gekommen'] = mysql_result($userstring, 0, "Gekommen");
$_SESSION['Aktiv'] = mysql_result($userstring, 0, "Aktiv"); $_SESSION['Aktiv'] = mysql_result($userstring, 0, "Aktiv");
$_SESSION['Tshirt'] = mysql_result($userstring, 0, "Tshirt"); $_SESSION['Tshirt'] = mysql_result($userstring, 0, "Tshirt");
$_SESSION['Menu'] = mysql_result($userstring, 0, "Menu"); $_SESSION['Menu'] = mysql_result($userstring, 0, "Menu");
$_SESSION['color'] = mysql_result($userstring, 0, "color"); $_SESSION['color'] = mysql_result($userstring, 0, "color");
$_SESSION['Avatar'] = mysql_result($userstring, 0, "Avatar"); $_SESSION['Avatar'] = mysql_result($userstring, 0, "Avatar");
$_SESSION['Sprache'] = mysql_result($userstring, 0, "Sprache"); $_SESSION['Sprache'] = mysql_result($userstring, 0, "Sprache");
$_SESSION['Hometown'] = mysql_result($userstring, 0, "Hometown"); $_SESSION['Hometown'] = mysql_result($userstring, 0, "Hometown");
$_SESSION['IP'] = $_SERVER['REMOTE_ADDR']; $_SESSION['IP'] = $_SERVER['REMOTE_ADDR'];
// CVS import Data
$SQL = "SELECT * FROM `UserCVS` WHERE `UID`='".$_SESSION['UID']."'";
$Erg_CVS = mysql_query($SQL, $con);
$_SESSION['CVS'] = mysql_fetch_array($Erg_CVS);
LoginOK();
}
else
{ // Passwort nicht ok...
$ErrorText = "pub_index_pass_no_ok";
} // Ende Passwort-Check
}
else
{ // Anzahl der User in User-Tabelle <> 1 --> keine Anmeldung
if ($user_anz == 0)
$ErrorText = "pub_index_User_unset";
else
$ErrorText = "pub_index_User_more_as_one";
} // Ende Check, ob User angemeldet wurde
}
include ("../../../camp2011/includes/header.php");
if( isset($ErrorText))
echo "<h2>". Get_Text($ErrorText). "</h2><br />\n";
include ("../../../camp2011/includes/login_eingabefeld.php");
include ("../../../camp2011/includes/footer.php");
// CVS import Data
$SQL = "SELECT * FROM `UserCVS` WHERE `UID`='" . $_SESSION['UID'] . "'";
$Erg_CVS = mysql_query($SQL, $con);
$_SESSION['CVS'] = mysql_fetch_array($Erg_CVS);
LoginOK();
} else { // Passwort nicht ok...
$ErrorText = "pub_index_pass_no_ok";
} // Ende Passwort-Check
} else { // Anzahl der User in User-Tabelle <> 1 --> keine Anmeldung
if ($user_anz == 0)
$ErrorText = "pub_index_User_unset";
else
$ErrorText = "pub_index_User_more_as_one";
} // Ende Check, ob User angemeldet wurde
}
include ("includes/header.php");
if (isset ($ErrorText))
echo "<h2>" . Get_Text($ErrorText) . "</h2><br />\n";
include ("includes/login_eingabefeld.php");
include ("includes/footer.php");
?> ?>

View File

@ -1,10 +1,12 @@
<?php <?php
$title = "Himmel"; require_once ('../bootstrap.php');
$header = "News";
include "../../../camp2011/includes/header.php";
echo "<a href=\"#Neu\">" . Get_Text(3) . "</a>"; $title = "News";
include "news_output.php"; $header = "News";
include "includes/header.php";
include "../../../camp2011/includes/footer.php"; echo "<a href=\"#Neu\">" . Get_Text(3) . "</a>";
include "news_output.php";
include "includes/footer.php";
?> ?>