airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [20/23] airavata-php-gateway git commit: Removing % from password creationg process
Date Sat, 23 Apr 2016 02:08:17 GMT
Removing % from password creationg process


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/89ca51a8
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/89ca51a8
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/89ca51a8

Branch: refs/heads/master
Commit: 89ca51a8719cd9540204136329ad657c41bc72e2
Parents: 06f8220
Author: Nipurn Doshi <nipunhere@gmail.com>
Authored: Tue Apr 19 13:56:47 2016 -0400
Committer: Nipurn Doshi <nipunhere@gmail.com>
Committed: Tue Apr 19 13:56:47 2016 -0400

----------------------------------------------------------------------
 app/controllers/AccountController.php | 4 ++--
 app/views/account/create.blade.php    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/89ca51a8/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index 8a95992..f2965ba 100644
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -12,13 +12,13 @@ class AccountController extends BaseController
     {
         $rules = array(
             "username" => "required|min:6",
-            "password" => "required|min:6|max:48|regex:/^.*(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[@!$#%*]).*$/",
+            "password" => "required|min:6|max:48|regex:/^.*(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[@!$#*]).*$/",
             "confirm_password" => "required|same:password",
             "email" => "required|email",
         );
 
         $messages = array(
-            'password.regex' => 'Password needs to contain at least (a) One lower case
letter (b) One Upper case letter and (c) One number (d) One of the following special characters
- !@#$%&*',
+            'password.regex' => 'Password needs to contain at least (a) One lower case
letter (b) One Upper case letter and (c) One number (d) One of the following special characters
- !@#$&*',
         );
 
         $validator = Validator::make(Input::all(), $rules, $messages);

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/89ca51a8/app/views/account/create.blade.php
----------------------------------------------------------------------
diff --git a/app/views/account/create.blade.php b/app/views/account/create.blade.php
index 441935d..1eafc70 100644
--- a/app/views/account/create.blade.php
+++ b/app/views/account/create.blade.php
@@ -39,7 +39,7 @@
         <div class="form-group required"><label class="control-label">Password</label>
 
             <div><input class="form-control" id="password" minlength="6" name="password"
placeholder="Password"
-                        required="required" title="" type="password" data-container="body"
data-toggle="popover" data-placement="left" data-content="Password needs to contain at least
(a) One lower case letter (b) One Upper case letter and (c) One number (d) One of the following
special characters - !@#$%*"/>
+                        required="required" title="" type="password" data-container="body"
data-toggle="popover" data-placement="left" data-content="Password needs to contain at least
(a) One lower case letter (b) One Upper case letter and (c) One number (d) One of the following
special characters - !@#$*"/>
             </div>
         </div>
         <div class="form-group required"><label class="control-label">Password
(again)</label>


Mime
View raw message