ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

User names: removed case sensitivity

Browse source
This commit is contained in:
Marcin Kurczewski 2013-11-21 22:29:38 +01:00
parent c8fb9c20c6
commit 909026ae0f
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Controllers/AuthController.php
View file

@ -17,7 +17,7 @@ class AuthController
$config = \Chibi\Registry::getConfig(); $config = \Chibi\Registry::getConfig();
$context = \Chibi\Registry::getContext(); $context = \Chibi\Registry::getContext();
$dbUser = R::findOne('user', 'name = ?', [$name]); $dbUser = Model_User::locate($name, false);
if ($dbUser === null) if ($dbUser === null)
throw new SimpleException('Invalid username'); throw new SimpleException('Invalid username');

6
src/Models/Model_Post_QueryBuilder.php
View file

@ -197,7 +197,7 @@ class Model_Post_QueryBuilder implements AbstractQueryBuilder
->innerJoin('user') ->innerJoin('user')
->on('favoritee.user_id = user.id') ->on('favoritee.user_id = user.id')
->where('post_id = post.id') ->where('post_id = post.id')
->and('user.name = ?')->put($val) ->and('LOWER(user.name) = LOWER(?)')->put($val)
->close(); ->close();
} }
@ -226,7 +226,7 @@ class Model_Post_QueryBuilder implements AbstractQueryBuilder
->innerJoin('user') ->innerJoin('user')
->on('commenter_id = user.id') ->on('commenter_id = user.id')
->where('post_id = post.id') ->where('post_id = post.id')
->and('user.name = ?')->put($val) ->and('LOWER(user.name) = LOWER(?)')->put($val)
->close(); ->close();
} }
@ -242,7 +242,7 @@ class Model_Post_QueryBuilder implements AbstractQueryBuilder
->open() ->open()
->select('user.id') ->select('user.id')
->from('user') ->from('user')
->where('name = ?')->put($val) ->where('LOWER(name) = LOWER(?)')->put($val)
->close(); ->close();
} }

4
src/Models/Model_User.php
View file

@ -3,7 +3,7 @@ class Model_User extends AbstractModel
{ {
public static function locate($key, $throw = true) public static function locate($key, $throw = true)
{ {
$user = R::findOne(self::getTableName(), 'name = ?', [$key]); $user = R::findOne(self::getTableName(), 'LOWER(name) = LOWER(?)', [$key]);
if ($user) if ($user)
return $user; return $user;
@ -97,7 +97,7 @@ class Model_User extends AbstractModel
{ {
$userName = trim($userName); $userName = trim($userName);
$dbUser = R::findOne(self::getTableName(), 'name = ?', [$userName]); $dbUser = R::findOne(self::getTableName(), 'LOWER(name) = LOWER(?)', [$userName]);
if ($dbUser !== null) if ($dbUser !== null)
{ {
if (!$dbUser->email_confirmed and \Chibi\Registry::getConfig()->registration->needEmailForRegistering) if (!$dbUser->email_confirmed and \Chibi\Registry::getConfig()->registration->needEmailForRegistering)