#15 finished

Source/src/DB.php

@@ -440,7 +440,7 @@ class DB
         else {
             $password = hash('sha256', $pass);
             dbw_query($this->conn, "INSERT INTO Users (`email`,`pass`,`nick`) VALUES ('$email','$password','$nick')");
-            return true;
+            return 'CORRECT';
         }
     }
 

Source/src/app.php

@@ -164,7 +164,9 @@ $app->get('/signup', function(Request $request) use ($app){
 
 function loginRegister($default,$state=''){
     global $app;
-
+    if($state!=''){
+        return $state;
+    }
     $page = array(
         "title"     =>  ucfirst($default),
         "description" => "Start now in CodeShare",
@@ -182,7 +184,7 @@ function loginOrRegister($state,$request){
             return loginRegister('login','BAD_CREDENTIAL');
         case 1:
             if(checklogin($request->get('email'),$request->get('pwd'))==''){
-                return $app->redirect($app["url_generator"]->generate('home'));
+                return 'redirect';
             }else{
                 return loginRegister("login",'BAD_CREDENTIAL');
             }
@@ -190,7 +192,7 @@ function loginOrRegister($state,$request){
             $state = register($request->get('emailre'),$request->get('emailre-re'),
             $request->get('pwdre'),  $request->get('pwdre-re'),$request->get('nick'));
             if ($state == '') 
-                return $app->redirect($app["url_generator"]->generate('home'));    
+                return 'redirect'; 
             else
                 return loginRegister("sing-up",$state);
             

Source/src/users.php

@@ -27,6 +27,7 @@ function checkInfo($request){
 function checklogin($email,$pass){
     $db = new DB();
     $bool = $db->checkPass($email,$pass);
+    
     if($bool){
         $idu = $db->loadIDU($email);
         $token = RandomString(50);
@@ -37,7 +38,7 @@ function checklogin($email,$pass){
         return '';
     }
     $db->close();
-    return false;
+    return 'BAD';
 }
 
 /**
@@ -53,7 +54,7 @@ function register($email,$emailre,$pass,$passre,$nick){
     if($emailre != $email || $pass != $passre)
         return 'POST_ERROR';
     $state = $db->register($email,$pass,$nick);
-    if($state) {
+    if($state == 'CORRECT') {
         $db->close();
         return checklogin($email, $pass);
     }else {