summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorHorus32014-03-16 19:23:28 +0100
committerHorus32014-03-16 19:23:28 +0100
commit151f569f196dd38a8e0cbeb888be55a57f4cc9d3 (patch)
tree0bbb787701949939e3993c0264a79bd76aefe639 /www
parentac364e0f8859d42478156a5e841c33dd23ef3d1a (diff)
downloadfiles.iamfabulous.de-151f569f196dd38a8e0cbeb888be55a57f4cc9d3.tar.gz
Final fix.
Diffstat (limited to 'www')
-rw-r--r--www/constants.php2
-rwxr-xr-xwww/functions/func_invite.php6
-rwxr-xr-xwww/functions/func_login.php10
-rwxr-xr-xwww/functions/func_register.php10
-rwxr-xr-xwww/index.php8
5 files changed, 18 insertions, 18 deletions
diff --git a/www/constants.php b/www/constants.php
index 209ff0f..ece68b4 100644
--- a/www/constants.php
+++ b/www/constants.php
@@ -1,4 +1,4 @@
-<?
+<?php
define("EMPTY", 0);
define("LOGIN_SUCCESSFULL", 1);
define("LOGIN_DATABASE", 2);
diff --git a/www/functions/func_invite.php b/www/functions/func_invite.php
index 8ed1139..ad87a21 100755
--- a/www/functions/func_invite.php
+++ b/www/functions/func_invite.php
@@ -12,7 +12,7 @@ function invite($db){
$invite = $invite_ar[0];
if($invite <= 0){
- return 'INVITE_INVITES';
+ return INVITE_INVITES;
}
/*Generates the invite key => [-_0-9a-zA-Z]{11}*/
@@ -46,9 +46,9 @@ function invite($db){
mail($email, "Invite", $subject, "From: mail@iamfabulous.de");
- return 'INVITE_SUCCESSFULL';
+ return INVITE_SUCCESSFULL;
} else {
- return 'INVITE_DATABASE';
+ return INVITE_DATABASE;
}
}
diff --git a/www/functions/func_login.php b/www/functions/func_login.php
index 0c60aa4..3869617 100755
--- a/www/functions/func_login.php
+++ b/www/functions/func_login.php
@@ -18,7 +18,7 @@ function login($db){
/*___Login___*/
if (!password_verify($password, $real_password)) {
- return 'LOGIN_PASSWORD';
+ return LOGIN_PASSWORD;
}
if($db->exec("
@@ -33,17 +33,17 @@ function login($db){
$_SESSION["username"] = $username;
$_SESSION["userid"] = $id;
- return 'LOGIN_SUCCESSFULL';
+ return LOGIN_SUCCESSFULL;
} else {
- return 'LOGIN_DATABASE';
+ return LOGIN_DATABASE;
}
}
function logout(){
if(session_destroy()){
- return 'LOGOUT_SUCCESSFULL';
+ return LOGOUT_SUCCESSFULL;
} else {
- return 'LOGOUT_FAILURE';
+ return LOGOUT_FAILURE
}
}
diff --git a/www/functions/func_register.php b/www/functions/func_register.php
index 762c9cc..252467b 100755
--- a/www/functions/func_register.php
+++ b/www/functions/func_register.php
@@ -9,11 +9,11 @@ function register($db){
/* checking for empty password etc. */
if(($cleartext_password != $second_password) || !isset($_POST["pswd"]) || !isset($_POST["2ndpswd"]) || $cleartext_password == "" || empty($_POST["pswd"]) || empty($_POST["2ndpswd"])){
- return 'REGISTER_PASSWORD';
+ return REGISTER_PASSWORD;
}
if(!preg_match("/[^.+@.+]/", $email)){
- return 'REGISTER_EMAIL';
+ return REGISTER_EMAIL;
}
$safe_name = SQLite3::escapeString("$name");
@@ -30,7 +30,7 @@ function register($db){
$test_key = $test_key_ar[0];
if (empty($test_status_ar) || $test_status_int != 0 || $test_key != $_POST["key"] || $test_key == ""){
- return 'REGISTER_PROHOBITED';
+ return REGISTER_PROHOBITED;
}
$id_db = $db->query("SELECT id FROM user WHERE email='" . $safe_email . "';");
@@ -57,10 +57,10 @@ function register($db){
$_SESSION["username"] = $name;
$_SESSION["userid"] = $userid;
- return 'REGISTER_SUCCESSFULL';
+ return REGISTER_SUCCESSFULL;
} else {
- return 'REGISTER_DATABASE';
+ return REGISTER_DATABASE;
}
}
diff --git a/www/index.php b/www/index.php
index 2e841a6..c0e6100 100755
--- a/www/index.php
+++ b/www/index.php
@@ -27,7 +27,7 @@ if(empty($_GET)){
case("login"):
if($_SERVER['REQUEST_METHOD'] == 'POST'){
$var = login($db);
- if($var == 'LOGIN_SUCCESSFULL'){
+ if($var == LOGIN_SUCCESSFULL){
account($db);
} else {
print_login($var);
@@ -39,7 +39,7 @@ if(empty($_GET)){
case("logout"):
$var = logout();
- if($var == 'LOGOUT_SUCCESSFULL'){
+ if($var == LOGOUT_SUCCESSFULL){
print_login($var);
} else {
header("Refresh: 0; /httperror.php?e=500");
@@ -53,7 +53,7 @@ if(empty($_GET)){
if($_SERVER['REQUEST_METHOD'] == 'POST'){
$var = invite($db);
- if($var == 'INVITE_SUCCESSFULL'){
+ if($var == INVITE_SUCCESSFULL){
header("Refresh: 0; /"); //TODO Direct link to the file browser.
} else {
print_invite($var);
@@ -66,7 +66,7 @@ if(empty($_GET)){
case("register"):
if($_SERVER['REQUEST_METHOD'] == 'POST'){
$var = register($db);
- if($var == 'REGISTER_SUCCESSFULL'){
+ if($var == REGISTER_SUCCESSFULL){
account($db);
} else {
print_register($var);