mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-14 02:03:55 -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

5
app/Controllers/feedController.php
View File

@@ -18,8 +18,9 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
$token_param = Minz_Request::param('token', '');
$token_is_ok = ($token != '' && $token == $token_param);
$action = Minz_Request::actionName();
$allow_anonymous_refresh = FreshRSS_Context::$system_conf->general['allow_anonymous_refresh'];
if ($action !== 'actualize' ||
!(Minz_Configuration::allowAnonymousRefresh() || $token_is_ok)) {
!($allow_anonymous_refresh || $token_is_ok)) {
Minz_Error::error(403);
}
}
@@ -65,7 +66,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
'params' => array(),
);
$limits = Minz_Configuration::limits();
$limits = FreshRSS_Context::$system_conf->limits;
$this->view->feeds = $feedDAO->listFeeds();
if (count($this->view->feeds) >= $limits['max_feeds']) {
Minz_Request::bad(_t('feedback.sub.feed.over_max', $limits['max_feeds']),