mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-19 05:44:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix Controllers to use the correct config system

Browse Source 
See https://github.com/FreshRSS/FreshRSS/issues/730
This commit is contained in:
Marien Fressinaud
2015-01-06 17:38:31 +01:00
parent 7cca47d1ab
commit d27efeec04
6 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Controllers/indexController.php
View File

@@ -20,7 +20,8 @@ class FreshRSS_index_Controller extends Minz_ActionController {
* This action displays the normal view of FreshRSS.
*/
public function normalAction() {
if (!FreshRSS_Auth::hasAccess() && !Minz_Configuration::allowAnonymous()) {
$allow_anonymous = FreshRSS_Context::$system_conf->general['allow_anonymous'];
if (!FreshRSS_Auth::hasAccess() && !$allow_anonymous) {
Minz_Request::forward(array('c' => 'auth', 'a' => 'login'));
return;
}
@@ -82,7 +83,8 @@ class FreshRSS_index_Controller extends Minz_ActionController {
* This action displays the global view of FreshRSS.
*/
public function globalAction() {
if (!FreshRSS_Auth::hasAccess() && !Minz_Configuration::allowAnonymous()) {
$allow_anonymous = FreshRSS_Context::$system_conf->general['allow_anonymous'];
if (!FreshRSS_Auth::hasAccess() && !$allow_anonymous) {
Minz_Request::forward(array('c' => 'auth', 'a' => 'login'));
return;
}
@@ -109,13 +111,14 @@ class FreshRSS_index_Controller extends Minz_ActionController {
* This action displays the RSS feed of FreshRSS.
*/
public function rssAction() {
$allow_anonymous = FreshRSS_Context::$system_conf->general['allow_anonymous'];
$token = FreshRSS_Context::$user_conf->token;
$token_param = Minz_Request::param('token', '');
$token_is_ok = ($token != '' && $token === $token_param);
// Check if user has access.
if (!FreshRSS_Auth::hasAccess() &&
!Minz_Configuration::allowAnonymous() &&
!$allow_anonymous &&
!$token_is_ok) {
Minz_Error::error(403);
}