- if(strpos($nickname, '@'))
- {
- $user = User::staticGet('email',$nickname);
- if($user && isset($user->email))
- {
- if(common_check_user($user->nickname,$password))
- {
- $authenticatedUser = $user;
- return false;
- }
+ if (!strpos($nickname, '@')) {
+ return true;
+ }
+
+ $user = User::getKV('email', $nickname);
+ if ($user instanceof User && $user->email === $nickname) {
+ if (common_check_user($user->nickname, $password)) {
+ $authenticatedUser = $user;
+ return false;