From 1a5ccec3976ce0b4a8c0e86ca8536163b0b39069 Mon Sep 17 00:00:00 2001 From: REJack Date: Tue, 11 Dec 2018 15:42:21 +0100 Subject: [PATCH] updated GroupModel, PermModel & UserModel --- application/Models/Aauth/GroupModel.php | 2 +- application/Models/Aauth/PermModel.php | 2 +- application/Models/Aauth/UserModel.php | 8 +++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/application/Models/Aauth/GroupModel.php b/application/Models/Aauth/GroupModel.php index 7be4adb..154c231 100644 --- a/application/Models/Aauth/GroupModel.php +++ b/application/Models/Aauth/GroupModel.php @@ -58,7 +58,7 @@ class GroupModel extends Model $this->table = $this->config->dbTableGroups; $this->DBGroup = $this->config->dbProfile; - $this->validationRules['name'] = 'required|is_unique[' . $this->table . '.name,id,{$row->id}]'; + $this->validationRules['name'] = 'required|is_unique[' . $this->table . '.name,id,{id}]'; $this->validationMessages = [ 'name' => [ diff --git a/application/Models/Aauth/PermModel.php b/application/Models/Aauth/PermModel.php index 9b41feb..d007573 100644 --- a/application/Models/Aauth/PermModel.php +++ b/application/Models/Aauth/PermModel.php @@ -58,7 +58,7 @@ class PermModel extends Model $this->table = $this->config->dbTablePerms; $this->DBGroup = $this->config->dbProfile; - $this->validationRules['name'] = 'required|is_unique[' . $this->table . '.name,id,{$row->id}]'; + $this->validationRules['name'] = 'required|is_unique[' . $this->table . '.name,id,{id}]'; $this->validationMessages = [ 'name' => [ diff --git a/application/Models/Aauth/UserModel.php b/application/Models/Aauth/UserModel.php index 3d74766..77d0919 100644 --- a/application/Models/Aauth/UserModel.php +++ b/application/Models/Aauth/UserModel.php @@ -100,11 +100,9 @@ class UserModel extends Model $this->table = $this->config->dbTableUsers; $this->DBGroup = $this->config->dbProfile; - print_r($this->config); - - $this->validationRules['email'] = 'required|if_exist|valid_email|is_unique[' . $this->table . '.email,id,{$row->id}]'; + $this->validationRules['email'] = 'required|if_exist|valid_email|is_unique[' . $this->table . '.email,id,{id}]'; $this->validationRules['password'] = 'required|if_exist|min_length[' . $this->config->passwordMin . ']|max_length[' . $this->config->passwordMax . ']'; - $this->validationRules['username'] = 'if_exist|is_unique[' . $this->table . '.username,id,{$row->id}]|min_length[3]|regex_match[/' . $this->config->userRegexPattern . '/]'; + $this->validationRules['username'] = 'if_exist|is_unique[' . $this->table . '.username,id,{id}]|min_length[3]|regex_match[/' . $this->config->userRegexPattern . '/]'; $this->validationMessages = [ 'email' => [ @@ -126,7 +124,7 @@ class UserModel extends Model 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 . '/]'; + $this->validationRules['username'] = 'required|if_exist|is_unique[' . $this->table . '.username,id,{id}]|min_length[3]|regex_match[/' . $this->config->userRegexPattern . '/]'; $this->validationMessages['username']['required'] = lang('Aauth.requiredUsername'); }