coderkun/questlab
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Wiki Activity

add validation to UsersController and let users change their own data and add breadcrumbs to user pages

Browse source
This commit is contained in:
coderkun 2014-05-01 03:22:02 +02:00
commit aed297c33e
8 changed files with 312 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

20
models/UsersModel.inc
View file

@ -149,24 +149,22 @@
* Check if an username already exists.
*
* @param string $username Username to check
* @param int $userId Do not check this ID (for editing)
* @return boolean Whether username exists or not
*/
public function usernameExists($username)
public function usernameExists($username, $userId=null)
{
$data = $this->db->query(
'SELECT count(id) AS c '.
'SELECT id '.
'FROM users '.
'WHERE username = ? OR url = ?',
'ss',
$username,
\nre\core\Linker::createLinkParam($username)
);
if(!empty($data)) {
return ($data[0]['c'] > 0);
}
return false;
return (!empty($data) && (is_null($userId) || $userId != $data[0]['id']));
}
@ -174,23 +172,21 @@
* Check if an e‑mail address already exists.
*
* @param string $email E‑mail address to check
* @param int $userId Do not check this ID (for editing)
* @return boolean Whether e‑mail address exists or not
*/
public function emailExists($email)
public function emailExists($email, $userId=null)
{
$data = $this->db->query(
'SELECT count(id) AS c '.
'SELECT id '.
'FROM users '.
'WHERE email = ?',
's',
$email
);
if(!empty($data)) {
return ($data[0]['c'] > 0);
}
return false;
return (!empty($data) && (is_null($userId) || $userId != $data[0]['id']));
}