karsten/scattport-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some function calls in user model

Browse Source
This commit is contained in:
Eike Foken
2011-04-22 02:55:53 +02:00
parent e81f68136a
commit 7a7b05652c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/models/user.php
View File

@@ -211,7 +211,7 @@ class User extends CI_Model {
* @return boolean * @return boolean
*/ */
public function register($username, $password, $email, $additionalData = false, $groupName = false) { public function register($username, $password, $email, $additionalData = false, $groupName = false) {
if ($this->username_check($username)) { if ($this->checkUsername($username)) {
$this->access->setError('account_creation_duplicate_username'); $this->access->setError('account_creation_duplicate_username');
return false; return false;
} }
@@ -401,7 +401,7 @@ class User extends CI_Model {
$this->db->trans_begin(); $this->db->trans_begin();
if (array_key_exists('username', $data) && $this->username_check($data['username']) && $user->username !== $data['username']) { if (array_key_exists('username', $data) && $this->checkUsername($data['username']) && $user->username !== $data['username']) {
$this->db->trans_rollback(); $this->db->trans_rollback();
$this->access->setError('account_creation_duplicate_username'); $this->access->setError('account_creation_duplicate_username');
return false; return false;
@@ -459,7 +459,7 @@ class User extends CI_Model {
* @return boolean * @return boolean
*/ */
public function loginRememberedUser() { public function loginRememberedUser() {
if (!get_cookie('username') || !get_cookie('remember_code') || !$this->username_check(get_cookie('username'))) { if (!get_cookie('username') || !get_cookie('remember_code') || !$this->checkUsername(get_cookie('username'))) {
return false; return false;
} }