summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHorus32014-03-12 03:02:23 +0100
committerHorus32014-03-12 03:02:23 +0100
commitbdb10afe9dd0659bca3034d41be7b1550cb7aad5 (patch)
tree2686e8089a30b6efcac7802e313fef0c8234b99a
parent8970954933ecf4b5c842027faa7c52f85cc25fe2 (diff)
downloadfiles.iamfabulous.de-bdb10afe9dd0659bca3034d41be7b1550cb7aad5.tar.gz
Forgot ';' and added security check for pepper
-rw-r--r--www/index.php2
-rw-r--r--www/setup.php4
2 files changed, 5 insertions, 1 deletions
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);