From 17f04ff573b4d59726b898e6ada4ee3a345b4487 Mon Sep 17 00:00:00 2001 From: REJack Date: Tue, 11 Dec 2018 15:15:13 +0100 Subject: [PATCH] updated UserModel --- application/Models/Aauth/UserModel.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/application/Models/Aauth/UserModel.php b/application/Models/Aauth/UserModel.php index fdc8a69..c13c48b 100644 --- a/application/Models/Aauth/UserModel.php +++ b/application/Models/Aauth/UserModel.php @@ -85,7 +85,7 @@ class UserModel extends Model /** * Constructor */ - public function __construct($db = NULL, $validation = NULL, $config = NULL) + public function __construct($db = null, $validation = null, $config = null) { parent::__construct(); @@ -106,20 +106,22 @@ class UserModel extends Model 'email' => [ 'is_unique' => lang('Aauth.existsAlreadyEmail'), 'valid_email' => lang('Aauth.invalidEmail'), - 'required' => lang('Aauth.invalidEmail'), + 'required' => lang('Aauth.invalidEmail'), ], 'password' => [ 'min_length' => lang('Aauth.invalidPassword'), 'max_length' => lang('Aauth.invalidPassword'), - 'required' => lang('Aauth.invalidPassword'), + 'required' => lang('Aauth.invalidPassword'), ], 'username' => [ - 'is_unique' => lang('Aauth.existsAlreadyUsername'), - 'min_length' => lang('Aauth.invalidUsername'), + 'is_unique' => lang('Aauth.existsAlreadyUsername'), + 'min_length' => lang('Aauth.invalidUsername'), 'regex_match' => lang('Aauth.invalidUsername'), ], ]; + print_r($this->config); + if ($this->config->loginUseUsername) { $this->validationRules['username'] = 'required|if_exist|is_unique[' . $this->table . '.username,id,{$row->id}]|min_length[3]|regex_match[/' . $this->config->userRegexPattern . '/]';