aboutsummaryrefslogtreecommitdiff
path: root/app/Models/Auth.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2017-02-25 13:08:45 +0100
committerGravatar GitHub <noreply@github.com> 2017-02-25 13:08:45 +0100
commitfb6bb8e826a29c1f94a705ea39ecc052ff59b99f (patch)
tree08643f3a2901fc38aaa0841cebd35fc714842f49 /app/Models/Auth.php
parentb8ac2b1d8ab47642018bd3f0fe6863b69a2743d6 (diff)
parent0bd4b2c74204a2f9360816ab22aac0da4c459824 (diff)
Merge pull request #1423 from plopoyop/feature/username-in-cli
[WIP] Feature/username in cli
Diffstat (limited to 'app/Models/Auth.php')
-rw-r--r--app/Models/Auth.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/Models/Auth.php b/app/Models/Auth.php
index b3255cfbd..476627e10 100644
--- a/app/Models/Auth.php
+++ b/app/Models/Auth.php
@@ -182,7 +182,7 @@ class FreshRSS_Auth {
class FreshRSS_FormAuth {
public static function checkCredentials($username, $hash, $nonce, $challenge) {
- if (!ctype_alnum($username) ||
+ if (!FreshRSS_user_Controller::checkUsername($username) ||
!ctype_graph($challenge) ||
!ctype_alnum($nonce)) {
Minz_Log::debug('Invalid credential parameters:' .
@@ -211,7 +211,7 @@ class FreshRSS_FormAuth {
// Token has expired (> 1 month) or does not exist.
// TODO: 1 month -> use a configuration instead
@unlink($token_file);
- return array();
+ return array();
}
$credentials = @file_get_contents($token_file);