init

17 files changed, 0 insertions, 1511 deletions

diff --git a/bootstrap/action.php b/bootstrap/action.php
deleted file mode 100644
index a52d471..0000000
--- a/bootstrap/action.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-if ( ! isset($_GET["page"]) || $_GET["page"] != "action" ){
-	header($_SERVER["SERVER_PROTOCOL"] . " 404 Not Found");
-	ob_clean();
-	exit;
-}
-
-if ( ! isset($_GET["task"]) || $_GET["task"] == "" ){
-	header($_SERVER["SERVER_PROTOCOL"] . "400 Wrong Request");
-	header("Location: /?page=index");
-	ob_clean();
-	exit;
-}
-
-switch($_GET["task"]){
-	case("login"):
-		if ( $_SERVER['REQUEST_METHOD'] != 'POST' ){
-			header($_SERVER["SERVER_PROTOCOL"] . " 405 Method Not Allowed");
-			ob_clean();
-			echo "Method not allowed";
-			exit;
-		}
-		if ( ! isset($_POST["name"]) || $_POST["name"] == "" || ! isset($_POST["password"]) || $_POST["password"] == "" ){
-			print_login("missing");
-		} else 	if ( $user->login($_POST["name"], $_POST["password"]) ){
-			header($_SERVER["SERVER_PROTOCOL"] . " 302 Moved");
-			header("Location: /?page=" . $_GET["goto"]);
-			ob_clean();
-			exit;
-		} else {
-			print_login("password");
-		}
-		break;
-
-	case("register"):
-		if ( $_SERVER['REQUEST_METHOD'] != 'POST' ){
-			header($_SERVER["SERVER_PROTOCOL"] . " 405 Method Not Allowed");
-			ob_clean();
-			echo "Method not allowed";
-			exit;
-		}
-		if ( ! isset($_POST["name"]) || $_POST["name"] == "" || ! isset($_POST["password"]) || $_POST["password"] == "" || ! isset($_POST["confirm"]) || $_POST["confirm"] == "" || ! isset($_POST["key"])){
-			print_login("missing");
-		} 
-		else if ( $_POST["key"] != INVITEKEY ){
-			print_login("key");
-		} 
-		else if ( $_POST["password"] != $_POST["confirm"]){
-			print_login("password");
-		} else {
-			if ( ! isset($_POST["email"]) || $_POST["email"] == "" ){
-				$email = "null";
-				$sql = $db->prepare("SELECT 1 FROM " . DBPREFIX . "user WHERE name = %s LIMIT 1;", $_POST["name"]);
-			}
-			else {
-				$email = $_POST["email"];
-				$sql = $db->prepare("SELECT 1 FROM " . DBPREFIX . "user WHERE name = %s OR email = %s LIMIT 1", $_POST["name"], $_POST["email"]);	
-			}	
-			$check_db = $db->doQuery($sql);
-			$check_ar = $check_db->fetch_array(MYSQLI_NUM);
-			if ( $check_ar[0] == 1) {
-				print_login("double");
-			} else {
-				if ( ! $user->register($_POST["name"], $_POST["password"], $email))
-					print_login("database");
-				else {
-					header($_SERVER["SERVER_PROTOCOL"] . " 302 Moved");
-					header("Location: /?page=" . $_GET["goto"]);
-					ob_clean();
-					exit;
-				}
-			}
-		} 
-		break;
-
-	case("update"):
-		if ( $_SERVER['REQUEST_METHOD'] != 'POST' ){
-			header($_SERVER["SERVER_PROTOCOL"] . " 405 Method Not Allowed");
-			ob_clean();
-			echo "Method not allowed";
-			exit;
-		}
-		if ( ! isset($_GET["id"]) || $_GET["id"] == 0 || $_GET["id"] == "" ){
-			print_list("update");
-		} else {
-			$sql = $db->prepare("UPDATE " . DBPREFIX . "member SET name = %s, adresse = %s, telefonnummer = %s, handynummer = %s, email = %s, geburtstag = %s WHERE member_id = %d;", 
-				$_POST["name"], $_POST["adresse"], $_POST["telefonnummer"], $_POST["handynummer"], $_POST["email"], $_POST["geburtstag"], $_GET["id"]
-			);
-			if ( ! $sql ){
-				ob_clean();
-				echo "SQL preparation failed.";
-				exit;
-			}
-			if ( $result = $db->doQuery($sql) ){
-				header($_SERVER["SERVER_PROTOCOL"] . " 302 Moved");
-				header("Location: /?page=" . $_GET["goto"]);
-				$c->flush();
-			}
-		}
-		break;
-
-	case("add"):
-		if ( $_SERVER['REQUEST_METHOD'] != 'POST' ){
-			header($_SERVER["SERVER_PROTOCOL"] . " 405 Method Not Allowed");
-			echo "Method not allowed";
-			exit;
-		}
-		$sql = $db->prepare("INSERT INTO " . DBPREFIX . "member (member_id, name, adresse, telefonnummer, handynummer, email, geburtstag) VALUES (NULL, %s, %s, %s, %s, %s, %s);", 
-			 $_POST["name"], $_POST["adresse"], $_POST["telefonnummer"], $_POST["handynummer"], $_POST["email"], $_POST["geburtstag"]
-		);
-		if ( ! $sql ){
-			echo "SQL preparation failed.";
-			exit;
-		}
-		if ( $result = $db->doQuery($sql) ){
-			header($_SERVER["SERVER_PROTOCOL"] . " 302 Moved");
-			header("Location: /?page=" . $_GET["goto"]);
-			$c->flush($_GET["_flush"]);
-		}
-		break;
-	case("account"):
-		if ( $_SERVER['REQUEST_METHOD'] != 'POST' ){
-			header($_SERVER["SERVER_PROTOCOL"] . " 405 Method Not Allowed");
-			echo "Method not allowed";
-			exit;
-		}
-		if ( ! isset($_POST["name"]) || $_POST["name"] == "" || ! isset($_POST["confirm"]) || $_POST["confirm"] == ""){
-			print_account("info");
-		} else if ( ! isset($_POST["email"]) ){
-			$_POST["email"] = "";
-		} else if ( ! password_verify($_POST["confirm"] . PEPPER , $user->getPassword()) ) {
-			print_account("password");
-		} else {
-			$sql = false;
-			$check_ar[0] = 0;
-			if ( $_POST["name"] != $_SESSION["username"]){
-			
-				if ( isset($_POST["email"]) && $_POST["email"] != "" && $_POST["email"] != $user->getEmail() )
-					$sql = $db->prepare("SELECT 1 FROM " . DBPREFIX ."user WHERE name = %s OR email = %s ;", $_POST["name"], $_POST["email"]);
-				else
-					$sql = $db->prepare("SELECT 1 FROM " . DBPREFIX ."user WHERE name = %s ;", $_POST["name"]);
-
-			} else 	if ( isset($_POST["email"]) && $_POST["email"] != "" && $_POST["email"] != $user->getEmail() ){
-					$sql = $db->prepare("SELECT 1 FROM " . DBPREFIX ."user WHERE email = %s ;", $_POST["email"]);
-
-			} else if ( $_POST["password"] == "" ){
-				redirect("account");
-			}
-			
-			if ( $sql ){
-				$check_db = $db->doQuery($sql);
-				$check_ar = $check_db->fetch_array(MYSQLI_NUM);
-			}
-			
-			if ( $check_ar[0] == 1){
-				print_account("double");
-			} else {
-				if ( $_POST["password"] != $_POST["confirm"] && $_POST["password"] != "" ){
-					$sql = $db->prepare("UPDATE " . DBPREFIX . "user SET name = %s, password = %s, email = %s WHERE id = %d;", $_POST["name"] , password_hash($_POST["password"]. PEPPER, PASSWORD_DEFAULT),  $_POST["email"], $_SESSION["userid"]);
-				} else
-					$sql = $db->prepare("UPDATE " . DBPREFIX . "user SET name = %s,  email = %s WHERE id = %d;", $_POST["name"], $_POST["email"], $_SESSION["userid"]);
-				if ( ! $db->doQuery($sql) ){
-				
-					echo $sql;
-					print_account("database");
-				} else
-					$_SESSION["username"] = $_POST["name"];
-					redirect("account&success=1");
-			}
-		}
-		break;
-	case("recover"):
-		if ( $_SERVER['REQUEST_METHOD'] != 'POST' ){
-			header($_SERVER["SERVER_PROTOCOL"] . " 405 Method Not Allowed");
-			echo "Method not allowed";
-			exit;
-		}
-		$sql = $db->prepare("SELECT 1, name FROM " . DBPREFIX . "user WHERE email = %s ;", $_POST["email"]);
-		$result_db = $db->doQuery($sql);
-		$result_ar = $result_db->fetch_array(MYSQLI_NUM);
-		if ( $result_ar[0] == 1){
-			
-			$arr = array("a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "_", "-");
-			$password = "";
-			$l = count($arr) -1 ;
-			for ($i=0;$i<10;$i++){
-				$r = mt_rand(0, $l);
-				$password.=$arr[$r];
-			}
-
-			$hash = password_hash($password . PEPPER, PASSWORD_DEFAULT);
-			$sql = $db->prepare("UPDATE " . DBPREFIX . "user SET password = %s WHERE email = %s ;", $hash, $_POST["email"]);
-			if ( ! $db->doQuery($sql) )
-				redirect("recover&track=0");
-
-			$body = 
-"Hello,
-someone requested a new password for '".$result_ar[1]."' on https://jungegemeinde.iamfabulous.de.
-The new password is '". $password ."'. Remember to change it immediately at https://jungegemeinde.iamfabulous.de/?page=account after successfull login.
-
-Kindly regards,
-JG Adlershof";
-
-			// header injection
-			mail($_POST["email"], "JG: Passwort Reset", $body, "From: JG Adlershof <noreply@jungegemeinde.iamfabulous.de>\r\n" );
-			redirect("recover&track=1");
-		} else {
-			redirect("recover&track=0");
-		}
-		break;
-}
diff --git a/bootstrap/bootstrap.php b/bootstrap/bootstrap.php
deleted file mode 100644
index aab8bbe..0000000
--- a/bootstrap/bootstrap.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-### loads the vfs environment
-
-require_once( dirname(__FILE__) . '/config.php');
-
-# absolute path
-if ( ! defined('ABSPATH') )
-	define('ABSPATH', dirname(__FILE__) . '/');
-
-# scheme, set to https if set, otherwise plain http
-if ( ! defined('SCHEME') ){
-	if(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on')
-		define('SCHEME', 'https://');
-	else
-		define('SCHEME', 'http://');
-}
-
-# hostname
-if ( ! defined('HOST') )
-	define('HOST', $_SERVER['HTTP_HOST']);
-if ( ! defined('DOMAIN') )
-	define('DOMAIN', SCHEME . HOST);
-
-# define session name
-if ( ! defined('SESSION') )
-	define('SESSION', 'JGSID');
-
-# define include path for class files
-if ( ! defined('INCLASS') )
-	define('INCLASS', 'class/');
-
-# redis access
- if ( ! defined('USE_REDIS') )
-	define('USE_REDIS', true);
- if ( ! defined('REDIS_CONNECT') )
-	define('REDIS_CONNECT', '/var/run/redis/redis.sock');
- if ( ! defined('REDIS_DB') )
-	define('REDIS_DB', 2);
- if ( ! defined('CACHEPREFIX') )
- 	define('CACHEPREFIX', 'jg_');
-
-# redirects to correct host
-if ( $_SERVER['HTTP_HOST'] != HOST){
-	header($_SERVER['SERVER_PROTOCOL']. ' 301 Moved Permanently');
-	header('Location: ' . DOMAIN);
-	exit;
-}
-
-require(ABSPATH . 'functions.php');
-require(ABSPATH . INCLASS . 'cache.php');
-require(ABSPATH . INCLASS . 'mysql.php');
-require(ABSPATH . INCLASS . 'user.php');
-
-# first install only
-if ( file_exists(ABSPATH . 'setup.php') )
-	require(ABSPATH . 'setup.php');
diff --git a/bootstrap/class/cache.php b/bootstrap/class/cache.php
deleted file mode 100644
index 8005484..0000000
--- a/bootstrap/class/cache.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-class cache {
-	public $token = "";
-
-	private $db;
-
-	public function __construct($rconnect, $rdb){
-		$this->db = new Redis();	
-
-		try {
-			$this->db->connect($rconnect);
-		} catch (Exception $e) {
-			return $e->getMessage();
-		}
-		try {
-			$this->db->ping();
-		} catch (Exception $e) {
-			return $e->getMessage();
-		}
-		try {
-			$this->db->select($rdb);
-		} catch (Exception $e) {
-			return $e->getMessage();
-		}
-	}
-
-	public function check(){
-		try {
-			return $this->db->ping();
-		} catch (Exception $e) {
-			return $e->getMessage();
-		}
-	}
-
-	public function setKey($key, $value, $ttl = null){
-		$this->db->set($key, $value, $ttl);
-	}
-
-	public function getValue($key){
-		return $this->db->get($key);
-	}
-
-	public function getToken($data, $append = ""){
-		$this->token = CACHEPREFIX . $append . md5(strtolower($data));
-		return $this->token;
-	}
-	
-	public function exists($key){
-		return $this->db->exists($key);
-	}
-
-	public function delete($key){
-		return $this->db->delete($key);
-	}
-
-	public function del($key){
-		return $this->db->delete($key);
-	}
-
-	public function flush($token = null){
-		if ( is_null($token) )
-			return $this->db->flushDB();
-		else
-			return $this->db->delete($token);
-	}
-}
-
-
diff --git a/bootstrap/class/mysql.php b/bootstrap/class/mysql.php
deleted file mode 100644
index 8d75538..0000000
--- a/bootstrap/class/mysql.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-
-class db {
-	
-	protected $db;
-
-	public function __construct(){
-		$this->open();
-	}
-
-	public function open(){
-		try {
-			$this->db = new mysqli(DBHOST, DBUSER, DBPASSWORD, DBNAME);	
-		} catch (Exception $e){
-			failure("<p>".$e->getMessage()."</p>", '500 Server Failure', false, '<h1>Failed to open database connection.</h1>');
-		}
-
-		if ( $this->db->connect_errno ){
-			failure("<p>Can't connect to the database. MySQL gave this error code: " . $this->db->connect_errno . "</p>", '500 Server Failure', false, '<h1>Connection to MySQL server failed.</h1>');
-		}
-
-		if ( ! $this->db->ping() ){
-			failure("<p>Can't reach MySQL server. Server says: " . $this->db->error . "</p>", '500 Server Failure', false, "<h1>Can't reach MySQL server!</h1>");
-		}
-
-		if ( ! $this->db->set_charset(DBCHARSET) ){
-			failure("<p>Can't set " . DBCHARSET . " as the charset on your MySQL server.</p>" , '500 Server Failure', false, "<h1>Setting Charset failed!</h1>");
-		}
-
-	}
-
-	public function close(){
-		$this->db->close();	
-	}
-
-	public function check(){
-		if ( ! $this->db->ping() ){
-			return false;
-		}
-
-		return true;
-	}
-
-	# does a single MySQL query with output (SELECT, INSERT, UPDATE... )
-	public function doQuery($string){
-		if ( ! $this->check() )
-			return false;
-
-		return $this->db->query($string);
-	}
-
-	# does multiple queries WITHOUT output (INSERT, UPDATE, DELETE... )
-	public function execMultipleQueries($sql){
-		if ( ! $this->check() )
-			return false;	
-
-		$result = $this->db->multi_query($sql);
-		if ( ! $result )
-			return false;
-
-		do {
-			if( ! $this->db->more_results() )	
-				break;
-			if ( ! $this->db->next_result() ){
-				if ( $this->db->error != "" ){
-					//$result->free();
-					return false;
-				}
-			}
-		} while (true);
-
-		return true;
-	}
-
-	# code by WordPress. See @link https://core.trac.wordpress.org/browser/branches/4.0/src/wp-includes/wp-db.php#L1154
-	# syntax like sprintf()
-	public function prepare( $query, $args ) {
-		if ( is_null( $query ) )
-			return;
-		
-		// This is not meant to be foolproof -- but it will catch obviously incorrect usage.
-		if ( strpos( $query, '%' ) === false ) {
-			return false;
-		}
-		
-		$args = func_get_args();
-		array_shift( $args );
-
-		// If args were passed as an array (as in vsprintf), move them up
-		if ( isset( $args[0] ) && is_array($args[0]) )
-			$args = $args[0];
-
-		$query = str_replace( "'%s'", '%s', $query ); // in case someone mistakenly already singlequoted it
-		$query = str_replace( '"%s"', '%s', $query ); // doublequote unquoting
-		$query = preg_replace( '|(?<!%)%f|' , '%F', $query ); // Force floats to be locale unaware
-		$query = preg_replace( '|(?<!%)%s|', "'%s'", $query ); // quote the strings, avoiding escaped strings like %%s
-
-		array_walk( $args, array( $this, '_escape_by_ref' ) );
-
-		return @vsprintf( $query, $args );
-	}
-
-	private function _escape_by_ref( &$string ){
-		if ( ! is_float( $string ) )
-			$string = $this->_real_escape( $string );
-	}
-
-	private function _real_escape( $string ){
-		return $this->db->real_escape_string($string);
-	}
-	# WordPress End
-
-	public function createTables(){
-		$user_table = 
-		'CREATE TABLE IF NOT EXISTS ' . DBPREFIX . 'user 
-			( id INTEGER AUTO_INCREMENT NOT NULL, PRIMARY KEY(id), 
-			name VARCHAR(70), UNIQUE(name), 
-			password VARCHAR(70), UNIQUE(password), 
-			email VARCHAR(70), UNIQUE(email), 
-			register INTEGER 
-			) ENGINE=InnoDB;';
-
-		$banned_user_table = 
-		'CREATE TABLE IF NOT EXISTS ' . DBPREFIX . 'banned_user
-			( banned_id INTEGER AUTO_INCREMENT NOT NULL, PRIMARY KEY(banned_id),
-			login_attempts INTEGER,
-			ip TEXT,
-			session_id TEXT,
-			time INTEGER,
-			user INTEGER
-			)
-		ENGINE=InnoDB;';
-
-		$jg_table = 
-		'CREATE TABLE IF NOT EXISTS ' . DBPREFIX . 'member
-			( member_id INTEGER AUTO_INCREMENT NOT NULL, PRIMARY KEY(member_id),
-			name varchar(70), UNIQUE(name),
-			adresse TEXT,
-			telefonnummer TEXT,
-			handynummer TEXT,
-			email varchar(70), UNIQUE(email),
-			geburtstag TEXT
-			)
-		ENGINE=InnoDB;';
-
-		if ( ! $this->execMultipleQueries('BEGIN; '. $user_table . ' ' . $banned_user_table . ' ' . $jg_table . ' COMMIT;') )
-			failure("<p>There was a problem during bootstrapping the database schema. " . $this->db->error . "</p>", '500 Server Failure', false, "<h1>CREATE TABLE FAILED</h1>");
-	}
-	
-	public function __destruct(){
-		$this->close();
-	}
-}
diff --git a/bootstrap/class/user.php b/bootstrap/class/user.php
deleted file mode 100644
index 969d734..0000000
--- a/bootstrap/class/user.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-
-class jg {
-
-	public $username;
-	public $login 	= false;
-
-	private $pepper;
-	private $query 	= false;
-	
-	public function __construct($name = null){
-
-		$this->username = $name;
-
-		if ( isset($_SESSION["loggedin"]) )
-			$this->login = $_SESSION["loggedin"];
-		
-		$this->_setPepper();
-
-		$this->_setQuery();
-	}
-
-	# get's everything from the database
-	private function _setQuery(){
-		global $db;
-
-		$sql = $db->prepare("SELECT * FROM " . DBPREFIX . "user WHERE name=%s;", $this->username);
-		$db_db = $db->doQuery($sql);
-		if ( is_bool($db_db) )
-			$this->query = false;
-		else
-			$this->query = $db_db->fetch_array(MYSQLI_ASSOC);
-	}
-
-	private function _setPepper(){
-		if ( PEPPER_IS_FILE )
-			$this->pepper = file_get_contents(PEPPER);
-		else
-			$this->pepper = PEPPER;
-	}
-
-	public function getUser(){
-		return $this->query['name'];
-	}
-
-	public function getUserId(){
-		return $this->query['id'];
-	}
-
-	public function getPassword(){
-		return $this->query['password'];
-	}
-
-	public function getEmail(){
-		if ( $this->query['email'] == "null" )
-			return "";
-		else
-			return $this->query['email'];	
-	}
-
-	public function getRegister(){
-		return $this->query['register'];
-	}
-
-	# check if valid user
-	public function isValidUser(){
-		if( ( is_bool($this->query) && ! $this->query ) || is_null($this->query) )
-			return false;
-
-		return true;
-	}
-
-	# check if current user is authenticated
-	public function isLoggedIn(){
-		return $this->login;	
-	}
-
-	public function login($user, $password){
-		if ( is_null($this->username) )
-			$this->__construct($user);
-		
-		# get hashed password from the database
-		$hashed_password = $this->getPassword();
-
-		# do the password check with php function
-		if ( ! password_verify($password . PEPPER, $hashed_password) )
-			return false;
-
-		# set login to true
-		$this->login = true;
-
-		$this->username=$user;
-
-		# start a session if needed
-		if ( session_status() != PHP_SESSION_ACTIVE ) {
-			session_name(SESSION);
-			session_start();
-		}
-
-		# set session variable to true
-		$_SESSION["loggedin"] = true;
-
-		# assign userid to the session variable
-		$_SESSION["userid"] = $this->getUserId();
-		$_SESSION["username"] = $this->username;
-
-		return true;
-	}
-
-	public function logout(){
-
-		# no session active, so return false
-		if ( session_status() != PHP_SESSION_ACTIVE )	
-			return false;
-
-		# set login to false
-		$this->login = false;
-
-		# destroy session
-		if( ! session_destroy() )
-			return false;
-
-		return true;
-	}
-
-	public function register($name, $password, $email){
-		global $db;
-
-		$hash	  = password_hash($password . PEPPER, PASSWORD_DEFAULT);
-
-		$sql = $db->prepare("
-			INSERT INTO " . DBPREFIX . "user (id, name, password, email, register) VALUES (NULL, %s, %s, %s, %d);", $name, $hash, $email, time() 
-		);
-
-		if ( ! $db->doQuery($sql) )
-			return false;
-
-		# the user is successfull registered, thus already logged in
-		$this->username = $name;
-
-		# redefine the class attributes
-		$this->_setPepper();
-		$this->_setQuery();
-
-		$this->login($name, $password);
-
-		return true;
-	}
-
-	public function __destruct(){
-		return true;
-	}
-}
diff --git a/bootstrap/config.php b/bootstrap/config.php
deleted file mode 100644
index 585f34a..0000000
--- a/bootstrap/config.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-### mysql access
-define('DBHOST', '127.0.0.1');
-define('DBUSER', 'jg');
-define('DBNAME', 'jg');
-define('DBPASSWORD', 'secretpassword');
-define('DBCHARSET', 'utf8');
-define('DBPREFIX', 'jg_');
-
-### define your pepper for password security
-define('PEPPER_IS_FILE', false);
-define('PEPPER', 'somelongstringhere');
-
-# define('PEPPER_IS_FILE', true);
-# define('PEPPER', dirname(__FILE__) . '/../pepper.txt');
-
-### absolute path
-# define('ABSPATH', dirname(__FILE__) . '/');
-
-### file directory
-# define('FILEPATH', ABSPATH . '../files');
-
-### scheme, set to https if possible, otherwise plain http
-# define('SCHEME', 'http://');
-# define('SCHEME', 'https://');
-
-### hostname
-# define('HOST', 'jungegemeinde.iamfabulous.de');
-# define('DOMAIN', 'https://jungegemeinde.iamfabulous.de');
-
-#define('INVITEKEY', 'fadfhaoshfasodfhioadsfhadsofhpf');
-define('INVITEKEY', 'p');
diff --git a/bootstrap/functions.php b/bootstrap/functions.php
deleted file mode 100644
index 3e937d2..0000000
--- a/bootstrap/functions.php
+++ /dev/null
@@ -1,578 +0,0 @@
-<?php
-
-function lredirect($goto){
-	global $user;
-	if ( $user->isLoggedIn() != 1){
-		redirect("login&goto=".$goto);
-	}
-}
-
-function redirect($goto){
-	header($_SERVER["SERVER_PROTOCOL"] . " 302 Moved");
-	header("Location: /?page=".$goto);
-	ob_clean();
-	exit;
-}
-function failure($reason, $httpcode, $ajax = true, $heading = NULL){
-
-	# send header with $httpcode
-	header($_SERVER['SERVER_PROTOCOL'] . " " . $httpcode);
-
-	# just echo the reason to the ajax response
-	if($ajax){
-		echo $reason;
-		exit;
-	}
-
-	// TODO: Put pretty HTML here, please
-
-	# print full error page
-	if($heading != NULL)
-		echo $heading;
-
-	echo $reason;
-
-	# exit the script here
-	exit;
-}
-
-function print_login($option = false){
-if(isset($_GET["goto"]) && $_GET["goto"] != "")
-	$goto = htmlentities($_GET["goto"]);
-else
-	$goto = "index";
-
-	global $user;
-	if ( $user->isLoggedIn() ){
-		redirect("index");
-	}
-?>
-<form class="form-horizontal" method="POST" action="/?page=action&task=login&goto=<?php echo $goto; ?>">
-<fieldset>
-
-<!-- Form Name -->
-<legend><h1>Junge Gemeinde Adlershof</h1>
-<?php
-	if ( ! $option ){
-?>
-<p>Login required</p>
-<?php
-	} else if ( $option == "logout" ){
-?>
-<p style="color:red">Logout erfolgreich!</p>
-<?php
-	} else if ( $option == "password" ) {
-?>
-<p style="color:red">Nutzer/Passwort falsch</p>
-<?php
-	} else if ( $option == "missing") {
-?>
-<p style="color:red">Bitte fülle alle Felder aus!</p>
-<?php
-	}
-?>
-</legend>
-
-<!-- Text input-->
-<div class="form-group">
-  <label class="col-md-4 control-label" for="name">Username*</label>  
-  <div class="col-md-4">
-  <input id="name" name="name" placeholder="Name (Pflicht)" class="form-control input-md" required="" type="text">
-  </div>
-</div>
-
-<!-- Password input-->
-<div class="form-group">
-  <label class="col-md-4 control-label" for="password">Password*</label>
-  <div class="col-md-4">
-    <input id="password" name="password" placeholder="Passwort (Pflicht)" class="form-control input-md" required="" type="password">
-  </div>
-</div>
-
-<!-- Button -->
-<div class="form-group">
-  <label class="col-md-4 control-label" for="submit"></label>
-  <div class="col-md-4">
-    <button id="submit" name="submit" class="btn btn-info">Log In</button>
-  </div>
-</div>
-
-</fieldset>
-</form>
-<br>
-<p><strong>Mit * markierte Felder sind Pflichtfelder.</strong></p>
-</div>
-<div class="row">
-<a href="/?page=recover" title="Recover your password">[Passwort vergessen?]</a>
-</div>
-<?php
-}
-
-function print_logout(){
-	global $user;
-	$user->logout();
-	print_login("logout");
-}
-
-function print_index(){
-?>
-        <h1>Junge Gemeinde Adlershof</h1>
-	<br>
-        </div>
-        <div class="row">
-		<img src="/static/kitten-prays-small.jpg" alt="praing kitten" class="img-responsive">
-	</div>
-		<br>
-        <div class="row">
-		<p>Wir sind die Junge Gemeinde in Adlershof.</p>
-		<p>Wir treffen uns immer Donnerstags um 19:30 Uhr in der Remise Arndtstraße 12a.</p>
-		<p>Am besten sind wir über unsere <span id="mail"><strong>Aktiviere JavaScript um die E-Mail Adresse zu sehen!</strong></span> erreichbar.</p>
-	</div>
-<?php
-}
-
-function print_list($option = false){
-	lredirect("liste");
-	global $db;
-
-	$result = $db->doQuery("SELECT * FROM " . DBPREFIX . "member;");
-?>
-	<h1>Adress Liste</h1>
-<?php
-	if ( $option == "update"){
-?>
-<h4 style="color:red;">Es existiert kein Mitglied mit dieser ID</h4>
-	<br>
-<?php
-	} else if ( $option == false )  {
-?>
-	<br>
-<?php
-	}
-?>
-        </div>
-        <div class="row">
-        <div class="table-responsive">
-	<table width='60%' class='table table-striped'>
-		<thead>
-			<tr>
-				<th><p>#</p></th>
-				<th><p>Name</p></th>
-				<th><p>Adresse</p></th>
-				<th><p>Telefon</p></th>
-				<th><p>Handynummer</p></th>
-				<th><p>E-Mail</p></th>
-				<th><p>Geburtstag</p></th>
-				<th><p>ändern</p></th>
-			</tr>
-		</thead>
-		<tbody>
-		<?php
-		$count = 1;
-		while ( $row = $result->fetch_array(MYSQLI_ASSOC) ){
-			echo "<tr>
-				<td>$count</td>
-				<td>".htmlentities($row['name'])."</td>
-				<td>".htmlentities($row['adresse'])."</td>
-				<td>".htmlentities($row['telefonnummer'])."</td>
-				<td>".htmlentities($row['handynummer'])."</td>
-				<td>".htmlentities($row['email'])."</td>
-				<td>".htmlentities($row['geburtstag'])."</td>
-				<td><a href='/?page=update&id=".htmlentities($row['member_id'])."'><input type='checkbox' name='change' value='true'></a></td>
-			</tr>";
-			$count++;
-		}
-		?>
-		</tbody>
-	</table>
-	</div>
-	<form method="POST" action="/?page=add">
-		<button id="singlebutton" class="btn btn-info" type="submit">Füge jemanden hinzu</button>
-	</form>
-</div>
-</div>
-				
-<?php
-}
-
-function print_update_list($id){
-	lredirect("liste");
-	global $db;
-
-	$sql 	= $db->prepare("SELECT * FROM " . DBPREFIX . "member WHERE member_id = %d", $id);
-	$result = $db->doQuery($sql);
-	if(!$result){
-		print_list("update");
-		exit;
-	}
-	if ( $row = $result->fetch_array(MYSQLI_ASSOC) ){
-?>
-	        <h1>Änderung für <?php echo htmlentities($row['name']); ?></h1>
-        	</div>
-	        <div class="row">
-			<form method='POST' action='/?page=action&task=update&id=<?php echo htmlentities($row['member_id']); ?>&goto=liste'>
-			<div class="table-responsive">
-				<table class='table'>
-					<thead>
-						<tr>
-						<th>Name</th>
-						<th>Adresse</th>
-						<th>Telefon</th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr>
-							<td><input type='text' name='name' value='<?php echo htmlentities($row['name']); ?>'></td>
-							<td><input type='text' name='adresse' value='<?php echo htmlentities($row['adresse']); ?>'></td>
-							<td><input type='text' name='telefonnummer' value='<?php echo htmlentities($row['telefonnummer']); ?>'></td>
-						</tr>
-					</tbody>
-					<thead>
-						<tr>
-						<th>Handynummer</th>
-						<th>E-Mail</th>
-						<th>Geburtstag</th>
-						</tr>
-					<tbody>
-						<tr>
-							<td><input type='text' name='handynummer' value='<?php echo htmlentities($row['handynummer']); ?>'></td>
-							<td><input type='text' name='email' value='<?php echo htmlentities($row['email']); ?>'></td>
-							<td><input type='text' name='geburtstag' value='<?php echo htmlentities($row['geburtstag']); ?>'></td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-				<button id="singlebutton" name="singlebutton" class="btn btn-info" type="submit">Ändere!</button>
-			</form>
-		</div>
-<?php
-	} else {
-		print_list("update");
-	}
-}
-
-function print_add_entry_to_list(){
-	lredirect("liste");
-?>
-		<h1>Füge die Daten hinzu</h1>
-	</div>
-		<div class="row">
-			<form method='POST' action='/?page=action&task=add&goto=liste&_flush=<?php echo $c->token; ?>'>
-			<div class="table-responsive">
-				<table class='table'>
-					<thead>
-						<tr>
-						<th>Name</th>
-						<th>Adresse</th>
-						<th>Telefon</th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr>
-							<td><input type='text' name='name' placeholder='Name'></td>
-							<td><input type='text' name='adresse' placeholder='Adresse'></td>
-							<td><input type='text' name='telefonnummer' placeholder='Telefonnummer'></td>
-						</tr>
-					</tbody>
-					<thead>
-						<tr>
-						<th>Handynummer</th>
-						<th>E-Mail</th>
-						<th>Geburtstag</th>
-						</tr>
-					<tbody>
-						<tr>
-							<td><input type='text' name='handynummer' placeholder='Handynummer'></td>
-							<td><input type='text' name='email' placeholder='E-Mail'></td>
-							<td><input type='text' name='geburtstag' placeholder='Geburtstag'></td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-				<button id="singlebutton" name="singlebutton" class="btn btn-info" type="submit">Hinzufügen!</button>
-			</form>
-		</div>
-<?php
-}
-
-function _add_entry(){
-	lredirect("liste");
-	global $db;
-
-	$sql = $db->prepare("INSERT INTO " . DPREFIX . "member (id, name, adresse, telefonnummer, handynummer, email, geburtstag) VALUES (NULL. %s, %s, %s, %s, %s, %s);", $_POST['name'], $_POST['adresse'], $_POST['telefonnummer'], $_POST['handynummer'], $_POST['email'], $_POST['geburtstag']);
-	if( ! $db->doQuery($sql) )
-		return false;
-	else
-		return true;
-}
-
-function print_404(){
-	header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found');
-?>
-<h1>404 - Not Found</h1>
-<br>
-<h4>The requested page (<?php echo htmlentities($_SERVER['REQUEST_URI']); ?>) wasn't found on this server.</h4>
-</div>
-<?php
-}
-
-function print_register($option = false){
-	global $user;
-	if ( $user->isLoggedIn() ){
-		redirect("index");
-	}
-?>
-
-<form class="form-horizontal" method='POST' action='/?page=action&task=register&goto=account'>
-<fieldset>
-
-<!-- Form Name -->
-<legend><h1>Junge Gemeinde Adlershof</h1>
-<?php
-	if ( $option == false ){
-?>
-<p>Register</p>
-<?php
-	} else if ( $option == "password") {
-?>
-<p style="color:red;">Passwörter stimmen nicht überein!</p>
-<?php
-	} else if ( $option == "missing") {
-?>
-<p style="color:red;">Bitte fülle alle mit '*' markierten Felder aus!</p>
-<?php
-	} else if ( $option == "key") {
-?>
-<p style="color:red;">Registrierung verweigert!</p>
-<?php
-	} else if ( $option == "double") {
-?>
-<p style="color:red;">Nutzer/E-Mail gibt es schon!</p>
-<?php
-	} else if ( $option == "double") {
-?>
-<p style="color:red;">Interner Fehler!</p>
-<?php
-	}
-?>
-</legend>
-
-<!-- Text input-->
-<div class="form-group">
-  <label class="col-md-4 control-label" for="name">Name*</label>  
-  <div class="col-md-4">
-  <input id="name" name="name" placeholder="Name (Pflicht)" class="form-control input-md" required="" type="text">
-    
-  </div>
-</div>
-
-<!-- Password input-->
-<div class="form-group">
-  <label class="col-md-4 control-label" for="password">Passwort*</label>
-  <div class="col-md-4">
-    <input id="password" name="password" placeholder="Passwort (Pflicht)" class="form-control input-md" required="" type="password">
-    
-  </div>
-</div>
-
-<!-- Password input-->
-<div class="form-group">
-  <label class="col-md-4 control-label" for="confirm">Bestätige Passwort*</label>
-  <div class="col-md-4">
-    <input id="confirm" name="confirm" placeholder="Passwort (Pflicht)" class="form-control input-md" required="" type="password">
-    
-  </div>
-</div>
-
-<!-- Text input-->
-<div class="form-group">
-  <label class="col-md-4 control-label" for="email">E-Mail</label>  
-  <div class="col-md-4">
-  <input id="email" name="email" placeholder="E-Mail" class="form-control input-md" type="text">
-  <span class="help-block">Deine E-Mail wird gebraucht, wenn du dein Passwort vergessen hast.</span>  
-  </div>
-</div>
-
-<!-- Text input-->
-<div class="form-group">
-  <label class="col-md-4 control-label" for="key">Key*</label>  
-  <div class="col-md-4">
-  <input id="key" name="key" placeholder="Schlüssel (Pflicht)" class="form-control input-md" required="" type="text">
-  <span class="help-block">Du solltest den Schlüssel in einer Mail bekommen haben.</span>  
-  </div>
-</div>
-
-<!-- Button -->
-<div class="form-group">
-	<label class="col-md-4 control-label" for="submit"></label>
-	<div class="col-md-4">
-	<button id="submit" name="submit" class="btn btn-info">Registrieren</button>
-	</div>
-</div>
-
-</fieldset>
-</form>
-<br>
-<p><strong>Mit * markierte Felder sind Pflichtfelder.</strong></p>
-</div>
-<?php
-}
-
-function print_account($option = false){
-	lredirect("accout");
-	global $user;
-?>
-<form class="form-horizontal" method="POST" action="/?page=action&task=account&goto=account">
-<fieldset>
-
-<!-- Form Name -->
-<legend>
-<h1><?php echo htmlentities($_SESSION["username"]);?></h1>
-<?php
-	if ( $option == false && ! isset($_GET["success"]) && $_GET["success"] != 1){
-?>
-<p>Ändere deine Daten</p>
-<?php
-	} else if ( $option == "info" ){
-?>
-<p style="color:red;">Bitte fülle alle notwendigen Felder aus!</p>
-<?php
-	} else if ( $option == "password" ){
-?>
-<p style="color:red;">Dein Passwort stimmt nicht!</p>
-<?php
-	} else if ( $option == "double" ){
-?>
-<p style="color:red;">Nutzer/E-Mail schon vergeben!</p>
-<?php
-	} else if ( $option == "database" ){
-?>
-<p style="color:red;">Interner Fehler!</p>
-<?php
-	} else if ( $option == "success" || $_GET["success"] == 1 ){
-?>
-<p style="color:green;">Erfolgreich aktualisiert!</p>
-<?php
-	}
-?>
-</legend>
-
-<!-- Text input-->
-<div class="form-group">
-  <label class="col-md-4 control-label" for="name">Name*</label>  
-  <div class="col-md-4">
-  <input id="name" name="name" placeholder="Neuer Name" class="form-control input-md" type="text" value="<?php echo $_SESSION["username"];?>" required="">
-  <span class="help-block">Wechsle deinen Namen hier.</span>  
-  </div>
-</div>
-
-<!-- Password input-->
-<div class="form-group">
-  <label class="col-md-4 control-label" for="passwordinput">Neues Passwort</label>
-  <div class="col-md-4">
-    <input id="passwordinput" name="password" placeholder="Neues Passwort" class="form-control input-md" type="password">
-    <span class="help-block">Ändere dein Passwort. Lass das Feld leer, wenn du es nicht ändern möchtest.</span>
-  </div>
-</div>
-
-<!-- Text input-->
-<div class="form-group">
-  <label class="col-md-4 control-label" for="textinput">E-Mail</label>  
-  <div class="col-md-4">
-  <input id="textinput" name="email" placeholder="E-Mail" class="form-control input-md" type="text" value="<?php echo $user->getEmail(); ?>">
-  <span class="help-block">Ändere deine E-Mail Adresse.</span>  
-  </div>
-</div>
-
-<!-- Password input-->
-<div class="form-group">
-  <label class="col-md-4 control-label" for="confirm">Passwort*</label>
-  <div class="col-md-4">
-    <input id="confirm" name="confirm" placeholder="Bestätige mit deinem alten Passwort." class="form-control input-md" required="" type="password">
-    <span class="help-block">Bestätige die Angaben mit deinem gültigen Passwort.</span>
-  </div>
-</div>
-
-<!-- Button -->
-<div class="form-group">
-  <label class="col-md-4 control-label" for="submit"></label>
-  <div class="col-md-4">
-    <button id="submit" name="submit" class="btn btn-primary">Ändere!</button>
-  </div>
-</div>
-
-</fieldset>
-</form>
-<br>
-<p><strong>Mit * markierte Felder sind Pflichtfelder.</strong></p>
-	</div>
-<?php
-}
-
-function print_recover($option = false){
-?>
-<form class="form-horizontal" method='POST' action='/?page=action&task=recover'>
-<fieldset>
-
-<!-- Form Name -->
-<legend><h1>Junge Gemeinde Adlershof</h1>
-<?php
-	if(isset($_GET["track"])){
-		if ($_GET["track"] == 1) {
-?>
-<p style="color:green;">Passwort zugeschickt!</p>
-<?php
-		} else {
-?>
-<p style="color:red;">Fehler! Passwort konnte nicht geändert werden.</p>
-<?php
-		}
-	} else {
-?>
-<p>Passwort wiederherstellen</p>
-<?php
-	}
-?>
-</legend>
-
-<!-- Text input-->
-<div class="form-group">
- <label class="col-md-4 control-label" for="email">E-Mail*</label>  
- <div class="col-md-4">
-    <input id="email" name="email" placeholder="Deine hinterlegte E-Mail Adresse." class="form-control input-md" required="" type="text">
-    <span class="help-block">Wenn deine E-Mail gespeichert ist, wird dir das neue Passwort automatisch zugestellt.</span>  
- </div>
-</div>
-
-<!-- Button -->
-<div class="form-group">
-  <label class="col-md-4 control-label" for="submit"></label>
-  <div class="col-md-4">
-    <button id="submit" name="submit" class="btn btn-primary">Recover!</button>
-  </div>
-</div>
-
-</fieldset>
-</form>
-
-</div>
-<?php
-}
-
-function minify($buffer){
-    $search = array(
-        '/\>[^\S ]+/s',  // strip whitespaces after tags, except space
-        '/[^\S ]+\</s',  // strip whitespaces before tags, except space
-        '/(\s)+/s'       // shorten multiple whitespace sequences
-    );  
-
-    $replace = array(
-        '>',
-        '<',
-        '\\1'
-    );  
-
-    $buffer = preg_replace($search, $replace, $buffer);
-
-    return $buffer;
-}
diff --git a/bootstrap/index.php b/bootstrap/index.php
deleted file mode 100644
index 21cbda7..0000000
--- a/bootstrap/index.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-
-# if we kann redirect user with the ?goto variable
-$redirect = true;
-
-require_once( dirname(__FILE__) . '/bootstrap.php');
-ob_start('minify');
-session_name(SESSION);
-session_start();
-
-$c = new cache(REDIS_CONNECT, REDIS_DB);
-
-if ( isset($_SESSION["loggedin"]) && $_SESSION["loggedin"]){
-	$a = "1_";
-} else {
-	$a = "0_";
-}
-
-if ( $_SERVER["REQUEST_METHOD"] == "GET" && $_SERVER["REDIRECT_STATUS"] == 200 && strpos($_SERVER["QUERY_STRING"], "account") === false ) {
-	$token = $c->getToken($_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"]. $_SERVER["QUERY_STRING"], $a);
-	if ( $c->exists($token)){
-		header("X-Cache: Hit");
-		echo $c->getValue($token);
-		ob_end_flush();
-		exit;
-	}
-} else {
-	header("X-Cache: Miss ");
-}
-
-$db = new db();
-if ( ! isset($_SESSION["username"]))
-	$u = null;
-else
-	$u = $_SESSION["username"];
-
-$user = new jg($u);
-?>
-<!doctype html>
-<html>
-<head>
-	<meta charset="utf-8">
-	<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
-	<?php 
-	//<link rel ="stylesheet" href="/static/style.css">
-
-	echo "<style>" . file_get_contents('static/style.min.css');?>
-	.dl-horizontal dt{white-space: normal;} .btn-info{background-color:#3083D6;} .img-responsive{margin: 0 auto;} @-moz-document url-prefix() { fieldset { display: table-cell; } }</style>
-	<title>Junge Gemeinde Adlershof</title>
-	<link rel='shortcut icon' href='/favicon.ico' type='image/x-icon'>
-	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<noscript><style>.navbar{margin-bottom:0;}</style></noscript>
-</head>
-<?php
-require_once 'static/header.php';
-?>
-<div class="container">
-	<div class="text-center">
-		<div class="row">
-<?php
-	if( ! isset($_GET["page"]))
-		$_GET["page"] = "";
-
-	if($_GET["page"] == "" || $_GET["page"] == "index")
-		print_index();
-	else{
-		switch($_GET["page"]){
-			case("login"):
-				print_login();
-				break;
-			case("logout"):
-				print_logout();
-				break;
-			case("liste"):
-				print_list();
-				break;
-			case("register"):
-				print_register();
-				break;
-			case("update"):
-				print_update_list($_GET['id']);
-				break;
-			case("add"):
-				print_add_entry_to_list();
-				break;
-			case("account"):
-				print_account();
-				break;
-			case("404"):
-				print_404();
-				break;
-			case("action"):
-				require_once 'action.php';
-				break;
-			case("recover").
-				print_recover();
-				break;
-			default:
-				print_index();
-				break;
-		}
-	}
-
-/*
-if ( isset($_GET['goto']) && $_GET['goto'] != "" && $redirect ){
-	header($_SERVER['SERVER_PROTOCOL'] . ' 302 Moved');
-	header('Location: /?page='.$_GET['goto']);
-}
-*/
-?>
-</div>
-</div>
-<?php
-require_once 'static/footer.php';
-
-$html = ob_get_contents();
-
-if ( $_SERVER["REQUEST_METHOD"] == "GET" && $_SERVER["REDIRECT_STATUS"] == 200 && strpos($_SERVER["QUERY_STRING"], "account") === false ) {
-	$c->setKey($token, $html, 3600);
-}
-ob_end_flush();
diff --git a/bootstrap/robots.txt b/bootstrap/robots.txt
deleted file mode 100644
index 1f53798..0000000
--- a/bootstrap/robots.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-User-agent: *
-Disallow: /
diff --git a/bootstrap/static/footer.php b/bootstrap/static/footer.php
deleted file mode 100755
index 2c6a6cf..0000000
--- a/bootstrap/static/footer.php
+++ /dev/null
@@ -1,13 +0,0 @@
-		<div class="footer text-right">
-			<div class="container">
-				<p>  Copyright 2014 <a id="copyright-text" href="//www.moehm.org/" target="_blank">Maximilian M&ouml;hring</a></p>
-			</div>
-		</div>
-		<script type='text/javascript'>var a = new Array('s.de','iamfabulou','nde@lists.','jungegemei');document.getElementById('mail').innerHTML="<a href='mailto:"+a[3]+a[2]+a[1]+a[0]+"'>E-Mail Adresse</a>";</script>
-		<script src="//code.jquery.com/jquery-1.10.1.min.js" defer></script>
-		<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js" defer></script>
-		<?php //<script src='/boring.js' defer></script> ?>
-		<?php //include("piwik.html"); ?>
-	</body>
-</html>
-
diff --git a/bootstrap/static/header.php b/bootstrap/static/header.php
deleted file mode 100644
index d20ddf9..0000000
--- a/bootstrap/static/header.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<nav class="navbar navbar-default navbar-custom" role="navigation">
-	<div class="container">
-                        <div class="navbar-header">
-                                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbarCollapse">
-                                        <span class="sr-only">Toggle navigation</span>
-                                        <span class="icon-bar"></span>
-                                        <span class="icon-bar"></span>
-                                        <span class="icon-bar"></span>
-                                </button>
-                                <a class="navbar-brand" href="/?page=index" title="Startseite">Home</a>
-                        </div>
-<div class="collapse navbar-collapse" id="navbarCollapse">
-                                <ul class="nav navbar-nav navbar-left">
-                                        <li>
-                                                <a href="/?page=liste" title="Liste aller JG-Mitglieder">Adressliste</a>
-                                        </li>
-                                        <li>
-                                                <a href="https://lists.iamfabulous.de/mailman/listinfo/jungegemeinde" target="_blank" title="JG E-Mail Verteiler">E-Mail Verteiler</a>
-                                        </li>
-                                </ul>
-				<ul class="nav navbar-nav navbar-right">
-					<li>
-					<?php
-					if ( $user->isLoggedIn() ) {
-					?>
-                                                <a href="/?page=account" title="Manage deinen Account">Account</a>
-					</li>
-					<li>
-						<a href="/?page=logout" title="Beende die Session">Logout</a>
-					<?php
-					} else  {
-					?>
-                                                <a href="/?page=register&goto=index" title="Registriere dich für unbeschränkten Zugang">Register</a>
-					</li>
-					<li>
-						<a href="/?page=login&goto=index" title="Login">Login</a>
-					<?php
-					}
-					?>
-					</li>
-				</ul>
-                        </div>
-                </div>
-        </nav>
-        <noscript>
-                <div class="noscript">
-                        <div class="container">
-                                <div class="row text-center noscript">
-                                        <h5>Bitte aktiviere JavaScript damit die Seite im vollen Umfang funktioniert.</h5>
-                                </div>
-                        </div>
-                </div>
-        </noscript>
-
diff --git a/bootstrap/static/kitten-praying.jpg b/bootstrap/static/kitten-praying.jpg
deleted file mode 100644
index 7f291e0..0000000
--- a/bootstrap/static/kitten-praying.jpg
+++ /dev/null
diff --git a/bootstrap/static/kitten-prays-small.jpg b/bootstrap/static/kitten-prays-small.jpg
deleted file mode 100644
index 5734aea..0000000
--- a/bootstrap/static/kitten-prays-small.jpg
+++ /dev/null
diff --git a/bootstrap/static/kitten-prays.jpg b/bootstrap/static/kitten-prays.jpg
deleted file mode 100644
index 3eb6ede..0000000
--- a/bootstrap/static/kitten-prays.jpg
+++ /dev/null
diff --git a/bootstrap/static/kitten.jpg b/bootstrap/static/kitten.jpg
deleted file mode 100644
index 376c195..0000000
--- a/bootstrap/static/kitten.jpg
+++ /dev/null
diff --git a/bootstrap/static/style.css b/bootstrap/static/style.css
deleted file mode 100644
index 5821df4..0000000
--- a/bootstrap/static/style.css
+++ /dev/null
@@ -1,66 +0,0 @@
-html {
-	position: relative;
-	min-height: 100%;
-}
-
-body {
-	margin-bottom: 60px;
-}
-
-a {
-	color: #3083D6;
-}
-
-/* navbar */
-
-.navbar-default {
-    background-color: #3083D6 ;
-    border-color: #3083D6 ;
-    background: #3083D6 ;
-}
-
-.navbar-default .navbar-brand {
-	color: white;
-}
-
-.navbar-default .navbar-brand:hover,
-.navbar-default .navbar-brand:focus {
-}
-
-.navbar-default .navbar-nav > li > a {
-	color: white;
-}
-
-
-/* footer */
-
-.footer {
-    background-color: #3083D6 ;
-    border-color: #3083D6 ;
-    background: #3083D6 ;
-    color: white ;
-    position: absolute;
-    bottom: 0;
-    width: 100%;
-}
-
-#copyright-text {
-    color: white;
-}
-
-/* noscript */
-
-.noscript {
-	background-color: red;
-	color: white;
-}
-
-.table-center {
-	margin: 0 auto !important;
-	float: none !important;
-}
-
-.disabled {
-	color: #5E5E5E;
-	text-decoration: line-through;
-}
diff --git a/bootstrap/static/style.min.css b/bootstrap/static/style.min.css
deleted file mode 100644
index dc54b0f..0000000
--- a/bootstrap/static/style.min.css
+++ /dev/null
@@ -1 +0,0 @@
-html{position:relative;min-height:100%}body{margin-bottom:60px}a{color:#3083D6}.navbar-default{border-color:#3083D6;background:#3083D6}.navbar-default .navbar-brand{color:#fff}.navbar-default .navbar-nav>li>a{color:#fff}.footer{border-color:#3083D6;background:#3083D6;color:#fff;position:absolute;bottom:0;width:100%}#copyright-text{color:#fff}.noscript{background-color:red;color:#fff}.table-center{margin:0 auto!important;float:none!important}.disabled{color:#5E5E5E;text-decoration:line-through}