AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor code improvements

Browse Source
This commit is contained in:
Frederic Guillot
2016-01-16 22:29:29 -05:00
parent ff149c354e
commit 27b9b7a727
8 changed files with 11 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/Validator/AuthValidator.php
View File

@@ -23,28 +23,17 @@ class AuthValidator extends Base
*/
public function validateForm(array $values)
{
$result = false;
$errors = array();
foreach (array('validateFields', 'validateLocking', 'validateCaptcha', 'validateCredentials') as $method) {
list($result, $errors) = $this->$method($values);
if (! $result) {
break;
}
}
return array($result, $errors);
return $this->executeValidators(array('validateFields', 'validateLocking', 'validateCaptcha', 'validateCredentials'), $values);
}
/**
* Validate credentials syntax
*
* @access private
* @access protected
* @param array $values Form values
* @return array $valid, $errors [0] = Success or not, [1] = List of errors
*/
private function validateFields(array $values)
protected function validateFields(array $values)
{
$v = new Validator($values, array(
new Validators\Required('username', t('The username is required')),
@@ -61,11 +50,11 @@ class AuthValidator extends Base
/**
* Validate user locking
*
* @access private
* @access protected
* @param array $values Form values
* @return array $valid, $errors [0] = Success or not, [1] = List of errors
*/
private function validateLocking(array $values)
protected function validateLocking(array $values)
{
$result = true;
$errors = array();
@@ -82,11 +71,11 @@ class AuthValidator extends Base
/**
* Validate password syntax
*
* @access private
* @access protected
* @param array $values Form values
* @return array $valid, $errors [0] = Success or not, [1] = List of errors
*/
private function validateCredentials(array $values)
protected function validateCredentials(array $values)
{
$result = true;
$errors = array();
@@ -102,11 +91,11 @@ class AuthValidator extends Base
/**
* Validate captcha
*
* @access private
* @access protected
* @param array $values Form values
* @return boolean
*/
private function validateCaptcha(array $values)
protected function validateCaptcha(array $values)
{
$result = true;
$errors = array();