aboutsummaryrefslogtreecommitdiff
path: root/app/Models
diff options
context:
space:
mode:
Diffstat (limited to 'app/Models')
-rw-r--r--app/Models/Auth.php14
1 files changed, 2 insertions, 12 deletions
diff --git a/app/Models/Auth.php b/app/Models/Auth.php
index 6bf4a2b3f..ee806d78b 100644
--- a/app/Models/Auth.php
+++ b/app/Models/Auth.php
@@ -170,18 +170,8 @@ class FreshRSS_Auth {
'REMOTE_USER' => false,
]);
- $username = '';
- $token_param = Minz_Request::paramString('token');
- if ($token_param != '') {
- $username = Minz_Request::paramString('user');
- if ($username != '') {
- $conf = FreshRSS_UserConfiguration::getForUser($username);
- if ($conf == null) {
- $username = '';
- }
- }
- }
- if ($username == '') {
+ $username = Minz_Request::paramString('user');
+ if (!Minz_Request::tokenIsOk()) {
$username = FreshRSS_Context::systemConf()->default_user;
}
Minz_User::change($username);