From 7c30e6d275f1c07cb3a24134aed80365686d85aa Mon Sep 17 00:00:00 2001
From: Amal Francis <amalfra@gmail.com>
Date: Tue, 21 Oct 2014 00:28:11 +0530
Subject: [PATCH] Modified the message and userRoutes.php

---
 api/api.php        |  4 ++--
 api/userRoutes.php | 41 ++++++++++++++++++-----------------------
 2 files changed, 20 insertions(+), 25 deletions(-)
 mode change 100644 => 100755 api/api.php
 mode change 100644 => 100755 api/userRoutes.php

diff --git a/api/api.php b/api/api.php
old mode 100644
new mode 100755
index 0f84266..bc6b688
--- a/api/api.php
+++ b/api/api.php
@@ -18,10 +18,10 @@ require_once('helpers.php'); // Must come after $jsonResponse exists.
 // Catch Exception if connection to DB failed
 try {
     R::setup('sqlite:taskboard.db');
-    createInitialUser();
+    createInitialUser();  
 } catch(Exception $e) {
     $app->response->setStatus(503);
-    $jsonResponse->message = 'Connection to Database failed.';
+    $jsonResponse->message = 'Connection to Database failed. Ensure api is writable.';
 
     $app->response->setBody($jsonResponse->asJson());
 }
diff --git a/api/userRoutes.php b/api/userRoutes.php
old mode 100644
new mode 100755
index 3f034b8..71d9929
--- a/api/userRoutes.php
+++ b/api/userRoutes.php
@@ -6,34 +6,29 @@ $app->post('/login', function() use ($app, $jsonResponse) {
     $expires = ($data->rememberme)
         ? (2 * 7 * 24 * 60 * 60) /* Two weeks */
         : (1.5 * 60 * 60) /* One and a half hours */;
-    try {
-        $lookup = R::findOne('user', ' username = ? ', [$data->username]);
 
-        $jsonResponse->message = 'Invalid username or password.';
-        $app->response->setStatus(401);
+    $lookup = R::findOne('user', ' username = ? ', [$data->username]);
 
-        if (null != $lookup) {
-            $hash = password_hash($data->password, PASSWORD_BCRYPT, array('salt' => $lookup->salt));
-            if ($lookup->password == $hash) {
-                if ($lookup->logins == 0 && $lookup->username == 'admin') {
-                    $jsonResponse->addAlert('warning', "This is your first login, don't forget to change your password.");
-                    $jsonResponse->addAlert('success', 'Go to Settings to add your first board.');
-                }
-                setUserToken($lookup, $expires);
-                $lookup->logins = $lookup->logins + 1;
-                $lookup->lastLogin = time();
-                R::store($lookup);
+    $jsonResponse->message = 'Invalid username or password.';
+    $app->response->setStatus(401);
 
-                logAction($lookup->username . ' logged in.', null, null);
-                $jsonResponse->message = 'Login successful.';
-                $jsonResponse->data = $lookup->token;
-                $app->response->setStatus(200);
+    if (null != $lookup) {
+        $hash = password_hash($data->password, PASSWORD_BCRYPT, array('salt' => $lookup->salt));
+        if ($lookup->password == $hash) {
+            if ($lookup->logins == 0 && $lookup->username == 'admin') {
+                $jsonResponse->addAlert('warning', "This is your first login, don't forget to change your password.");
+                $jsonResponse->addAlert('success', 'Go to Settings to add your first board.');
             }
+            setUserToken($lookup, $expires);
+            $lookup->logins = $lookup->logins + 1;
+            $lookup->lastLogin = time();
+            R::store($lookup);
+
+            logAction($lookup->username . ' logged in.', null, null);
+            $jsonResponse->message = 'Login successful.';
+            $jsonResponse->data = $lookup->token;
+            $app->response->setStatus(200);
         }
-    } catch (Exception $ex) {
-    }
-    if (!is_writable('taskboard.db')) {
-        $jsonResponse->message = 'The api directory is not writable.';
     }
     $app->response->setBody($jsonResponse->asJson());
 });