airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [1/6] airavata-php-gateway git commit: fixing login failure error message
Date Mon, 19 Oct 2015 20:10:18 GMT
Repository: airavata-php-gateway
Updated Branches:
  refs/heads/master 4e0e4f37b -> 88b50373d


fixing login failure error message


Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/1ece3518
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/1ece3518
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/1ece3518

Branch: refs/heads/master
Commit: 1ece3518ee0c5d95f3c7486bc3ec3fef9009fc1b
Parents: 4e0e4f3
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Mon Oct 19 11:38:11 2015 -0400
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Mon Oct 19 11:38:11 2015 -0400

----------------------------------------------------------------------
 app/controllers/AccountController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/1ece3518/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index a5add17..355a164 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -12,7 +12,7 @@ class AccountController extends BaseController
     {
         $rules = array(
             "username" => "required|min:6",
-            "password" => "required|min:6|max:12|regex:/^.*(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[@!$#%&]).*$/",
+            "password" => "required|min:6|max:12|regex:/^.*(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[@!$#%&*]).*$/",
             "confirm_password" => "required|same:password",
             "email" => "required|email",
         );
@@ -97,7 +97,7 @@ class AccountController extends BaseController
             $password = $_POST['password'];
             $response = WSIS::authenticate($username, $password);
             if(!isset($response->access_token)){
-                return Redirect::to('home');
+                return Redirect::to("login")->with("invalid-credentials", true);
             }
 
             $accessToken = $response->access_token;


Mime
View raw message