Merge branch 'password-ampersand-validation'
Fixes AIRAVATA-2715
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index d18900c..82864bc 100644
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -2,7 +2,7 @@
class AccountController extends BaseController
{
- const PASSWORD_VALIDATION = "required|min:6|max:48|regex:/^.*(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[@!$#*]).*$/";
+ const PASSWORD_VALIDATION = "required|min:6|max:48|regex:/^.*(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[@!$#*&]).*$/";
const PASSWORD_VALIDATION_MESSAGE = "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 - !@#$&*";
public function __construct()
diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php
index 03b67a7..e69c527 100644
--- a/app/controllers/AdminController.php
+++ b/app/controllers/AdminController.php
@@ -174,7 +174,7 @@
public function updateGateway(){
$rules = array(
- "password" => "min:6|max:48|regex:/^.*(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[@!$#*]).*$/",
+ "password" => "min:6|max:48|regex:/^.*(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[@!$#*&]).*$/",
"confirm_password" => "same:password",
"email" => "email",
);
@@ -463,7 +463,7 @@
$inputs = Input::all();
$rules = array(
- "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",
);
@@ -547,7 +547,7 @@
$rules = array(
"username" => "required",
- "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",
);
