From bdb10afe9dd0659bca3034d41be7b1550cb7aad5 Mon Sep 17 00:00:00 2001
From: Horus3
Date: Wed, 12 Mar 2014 03:02:23 +0100
Subject: Forgot ';' and added security check for pepper

---
 www/index.php | 2 +-
 www/setup.php | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'www')

diff --git a/www/index.php b/www/index.php
index 0ce2d72..1f6a38a 100644
--- a/www/index.php
+++ b/www/index.php
@@ -24,7 +24,7 @@ if(empty($_GET)){
 	if(empty($_GET["name"])){
 		switch($_GET["task"]){
 			case("login"):
-				login($db)
+				login($db);
 				break;
 			case("logout"):
 				logout();
diff --git a/www/setup.php b/www/setup.php
index 1effda5..ea56795 100644
--- a/www/setup.php
+++ b/www/setup.php
@@ -30,6 +30,10 @@ if($bool){
 	$cleartext_password="password";
 	$email="admin@iamfabulous.de";
 	$pepper = file_get_contents("../database/pepper.txt");
+	if(!isset($pepper)){
+		echo "There is no pepper in '../database/pepper.txt'! <br> Please generate one manually and run this script again.";
+		exit;
+	}
 	$password = $cleartext_password . $pepper;
 	
 	$hash_password = password_hash($password, PASSWORD_DEFAULT);
-- 
cgit v1.2.3