|
|
|
@ -89,9 +89,11 @@ class UserModel extends Model
|
|
|
|
|
{ |
|
|
|
|
parent::__construct(); |
|
|
|
|
|
|
|
|
|
print_r($config); |
|
|
|
|
|
|
|
|
|
if (is_null($config)) |
|
|
|
|
{ |
|
|
|
|
$config = new \Config\Aauth(); |
|
|
|
|
$config = new AauthConfig(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$this->config = $config; |
|
|
|
@ -120,8 +122,6 @@ class UserModel extends Model
|
|
|
|
|
], |
|
|
|
|
]; |
|
|
|
|
|
|
|
|
|
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 . '/]'; |
|
|
|
|