aboutsummaryrefslogtreecommitdiff
path: root/app/Controllers
diff options
context:
space:
mode:
Diffstat (limited to 'app/Controllers')
-rw-r--r--app/Controllers/feedController.php9
-rw-r--r--app/Controllers/indexController.php12
2 files changed, 3 insertions, 18 deletions
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index b6ecbeec2..1829417c1 100644
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -13,12 +13,6 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController {
#[\Override]
public function firstAction(): void {
if (!FreshRSS_Auth::hasAccess()) {
- // Token is useful in the case that anonymous refresh is forbidden
- // and CRON task cannot be used with php command so the user can
- // set a CRON task to refresh his feeds by using token inside url
- $token = FreshRSS_Context::userConf()->token;
- $token_param = Minz_Request::paramString('token');
- $token_is_ok = ($token != '' && $token == $token_param);
$action = Minz_Request::actionName();
$allow_anonymous_refresh = FreshRSS_Context::systemConf()->allow_anonymous_refresh;
@@ -28,8 +22,7 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController {
return;
}
- if ($action !== 'actualize' ||
- !($allow_anonymous_refresh || $token_is_ok)) {
+ if ($action !== 'actualize' || !$allow_anonymous_refresh) {
Minz_Error::error(403);
}
}
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index bfa1eb521..fa46c3f3a 100644
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -200,14 +200,9 @@ class FreshRSS_index_Controller extends FreshRSS_ActionController {
*/
public function rssAction(): void {
$allow_anonymous = FreshRSS_Context::systemConf()->allow_anonymous;
- $token = FreshRSS_Context::userConf()->token;
- $token_param = Minz_Request::paramString('token');
- $token_is_ok = ($token != '' && $token === $token_param);
// Check if user has access.
- if (!FreshRSS_Auth::hasAccess() &&
- !$allow_anonymous &&
- !$token_is_ok) {
+ if (!FreshRSS_Auth::hasAccess() && !$allow_anonymous) {
Minz_Error::error(403);
}
@@ -241,12 +236,9 @@ class FreshRSS_index_Controller extends FreshRSS_ActionController {
*/
public function opmlAction(): void {
$allow_anonymous = FreshRSS_Context::systemConf()->allow_anonymous;
- $token = FreshRSS_Context::userConf()->token;
- $token_param = Minz_Request::paramString('token');
- $token_is_ok = ($token != '' && $token === $token_param);
// Check if user has access.
- if (!FreshRSS_Auth::hasAccess() && !$allow_anonymous && !$token_is_ok) {
+ if (!FreshRSS_Auth::hasAccess() && !$allow_anonymous) {
Minz_Error::error(403);
}