From bd73fa5b549e60918fcff9dee466f0e94b5cfa82 Mon Sep 17 00:00:00 2001 From: blkmutt Date: Sun, 13 Apr 2014 07:05:29 -0400 Subject: [PATCH 1/2] Updated validation to fail if values are all asterisks. --- app/controllers/AccountController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php index 9a3e80f347e5..320430d817c3 100755 --- a/app/controllers/AccountController.php +++ b/app/controllers/AccountController.php @@ -608,11 +608,13 @@ class AccountController extends \BaseController { if(in_array($field, ['merchant_id', 'passCode'])) { $rules[$gateway->id.'_'.$field] = 'required'; + $rules[$gateway->id.'_'.$field] = 'match:/?![*]+/'; } } else { $rules[$gateway->id.'_'.$field] = 'required'; + $rules[$gateway->id.'_'.$field] = 'match:/?![*]+/'; } } } From 33b90241a2f89dc3eab5ae8fadbf83bc8c6eb2ce Mon Sep 17 00:00:00 2001 From: blkmutt Date: Sun, 13 Apr 2014 21:54:01 -0400 Subject: [PATCH 2/2] Updated validation to avoid saving masked fields. --- app/controllers/AccountController.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php index 7efbe1bc018f..2a1b422e1ffd 100755 --- a/app/controllers/AccountController.php +++ b/app/controllers/AccountController.php @@ -483,6 +483,11 @@ class AccountController extends \BaseController { private function savePayments() { + Validator::extend('notmasked', function($attribute, $value, $parameters) + { + return $value != str_repeat('*', strlen($value)); + }); + $rules = array(); $recommendedId = Input::get('recommendedGateway_id'); @@ -502,14 +507,12 @@ class AccountController extends \BaseController { { if(in_array($field, ['merchant_id', 'passCode'])) { - $rules[$gateway->id.'_'.$field] = 'required'; - $rules[$gateway->id.'_'.$field] = 'match:/?![*]+/'; + $rules[$gateway->id.'_'.$field] = 'required|notmasked'; } } else { - $rules[$gateway->id.'_'.$field] = 'required'; - $rules[$gateway->id.'_'.$field] = 'match:/?![*]+/'; + $rules[$gateway->id.'_'.$field] = 'required|notmasked'; } } }