Changeset 191 for Dev/trunk/index.php

Timestamp:

12/21/11 17:52:00 (13 years ago)

Author:

fpvanagthoven

Message:

• Clean up van bestanden die niet meer gebruikt worden/niet nodig zijn/zijn gemerged met bestaande files.
• Daarnaast question/survey editor nu grotendeels werkend (min save functie...)
• Inloggen werkt nu op userUid ipv naam, werkt beter met het aanmaken van creators.
• Bug in returnObjectDisplay gefixt, er stond nog een var_dump tussen de echoes. JSON houdt niet van HTML tags.

File:

• Dev/trunk/index.php (modified) (2 diffs)

Dev/trunk/index.php

@@ -8 +8 @@
 
 //Even voor tijdelijk, aangezien er nog pagina's missen en redirects daarom niet goed werken:
-if (isset($_SESSION['username'])) {
+if (isset($_SESSION['userUid'])) {
     redirect("logout.php");
 }
@@ -15 +15 @@
 
 if (isset($_POST['register'])) {
-    if ($_POST['username'] != null && $_POST['password'] != null) {
+    if (isset($_POST['username']) && isset($_POST['password'])) {
         $dbi = new DatabaseInterface();
         $user_results = $dbi->get("user", array("name" => $_POST['username']));
-        $user_exists = (count($user_results) > 0);
-        if (!$user_exists) {
+        if (count($user_results) == 0 || !$user_results) {
             if (strlen($_POST['password']) > 6) {
                 $user = new User(null, $_POST['username'], $_POST['password']);
                 $dbi->set($user);
-                $_SESSION['username'] = $_POST['username'];
+                $_SESSION['userUid'] = $user->uid;
             } else {
-                $errorMessage[] = "Password is too short!";
-                //echo "Password is too short!";
+                $errorMessage[] = "Password is too short";
             }
         }
         else
             $errorMessage[] = "Username already exists, try something else!";
-        //echo "Username already exists, try something else";
     }
     else
         $errorMessage[] = "Please fill in a username and password";
-    //echo "please fill in a username and password";
 }
 
-if (isset($_POST['login'])) {
+if (isset($_POST['login'])) {   // User clicked the login button
     $dbi = new DatabaseInterface();
     $user_results = $dbi->get("user", array("name" => $_POST['username']));
     if (isset($user_results[0])) {
         if ($user_results[0]->password == $_POST['password']) {
-            $_SESSION['username'] = $user_results[0]->name;
-            // USER HAS LOGGED IN
+            $_SESSION['userUid'] = $user_results[0]->uid;
         } else {
             $errorMessage[] = "Incorrect password!";
-            //echo "Incorrect password!";
         }
     } else {
         $errorMessage[] = "Username doesn't exist!";
-        //echo "Username doesn't exist!";
     }
 }
 
-if (isset($_SESSION['username'])) {
+if (isset($_SESSION['userUid'])) {  // User just registered a new account
     redirect('selectSession.php');
 }