xingcheng
/
FreshRSS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use FreshRSS_Context::$conf only

Browse Source 
- Replace $this->view->conf in controllers
- Replace $this->conf in views
pull/674/head
Marien Fressinaud 10 years ago
parent ad92dd7dae
commit 1a22a87fb1
27 changed files with 175 additions and 177 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      app/Controllers/authController.php
  2. 8
      app/Controllers/categoryController.php
  3. 92
      app/Controllers/configureController.php
  4. 6
      app/Controllers/entryController.php
  5. 18
      app/Controllers/feedController.php
  6. 4
      app/Controllers/importExportController.php
  7. 8
      app/Controllers/indexController.php
  8. 2
      app/Controllers/javascriptController.php
  9. 18
      app/Controllers/userController.php
  10. 2
      app/FreshRSS.php
  11. 8
      app/layout/aside_flux.phtml
  12. 2
      app/layout/layout.phtml
  13. 14
      app/layout/nav_menu.phtml
  14. 4
      app/views/auth/index.phtml
  15. 10
      app/views/configure/archiving.phtml
  16. 30
      app/views/configure/display.phtml
  17. 4
      app/views/configure/queries.phtml
  18. 42
      app/views/configure/reading.phtml
  19. 6
      app/views/configure/sharing.phtml
  20. 2
      app/views/configure/shortcut.phtml
  21. 16
      app/views/helpers/javascript_vars.phtml
  22. 2
      app/views/helpers/pagination.phtml
  23. 6
      app/views/helpers/view/global_view.phtml
  24. 30
      app/views/helpers/view/normal_view.phtml
  25. 4
      app/views/helpers/view/reader_view.phtml
  26. 6
      app/views/user/manage.phtml
  27. 2
      app/views/user/profil.phtml

6
app/Controllers/authController.php
Unescape View File

@ -26,10 +26,10 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
if (Minz_Request::isPost()) {
$ok = true;
$current_token = $this->view->conf->token;
$current_token = FreshRSS_Context::$conf->token;
$token = Minz_Request::param('token', $current_token);
$this->view->conf->_token($token);
$ok &= $this->view->conf->save();
FreshRSS_Context::$conf->_token($token);
$ok &= FreshRSS_Context::$conf->save();
$anon = Minz_Request::param('anon_access', false);
$anon = ((bool)$anon) && ($anon !== 'no');

8
app/Controllers/categoryController.php
Unescape View File

@ -136,8 +136,8 @@ class FreshRSS_category_Controller extends Minz_ActionController {
}
// Remove related queries.
$this->view->conf->remove_query_by_get('c_' . $id);
$this->view->conf->save();
FreshRSS_Context::$conf->remove_query_by_get('c_' . $id);
FreshRSS_Context::$conf->save();
Minz_Request::good(_t('category_deleted'), $url_redirect);
}
@ -172,9 +172,9 @@ class FreshRSS_category_Controller extends Minz_ActionController {
// Remove related queries
foreach ($feeds as $feed) {
$this->view->conf->remove_query_by_get('f_' . $feed->id());
FreshRSS_Context::$conf->remove_query_by_get('f_' . $feed->id());
}
$this->view->conf->save();
FreshRSS_Context::$conf->save();
Minz_Request::good(_t('category_emptied'), $url_redirect);
} else {

92
app/Controllers/configureController.php
Unescape View File

@ -44,23 +44,23 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
*/
public function displayAction() {
if (Minz_Request::isPost()) {
$this->view->conf->_language(Minz_Request::param('language', 'en'));
$this->view->conf->_theme(Minz_Request::param('theme', FreshRSS_Themes::$defaultTheme));
$this->view->conf->_content_width(Minz_Request::param('content_width', 'thin'));
$this->view->conf->_topline_read(Minz_Request::param('topline_read', false));
$this->view->conf->_topline_favorite(Minz_Request::param('topline_favorite', false));
$this->view->conf->_topline_date(Minz_Request::param('topline_date', false));
$this->view->conf->_topline_link(Minz_Request::param('topline_link', false));
$this->view->conf->_bottomline_read(Minz_Request::param('bottomline_read', false));
$this->view->conf->_bottomline_favorite(Minz_Request::param('bottomline_favorite', false));
$this->view->conf->_bottomline_sharing(Minz_Request::param('bottomline_sharing', false));
$this->view->conf->_bottomline_tags(Minz_Request::param('bottomline_tags', false));
$this->view->conf->_bottomline_date(Minz_Request::param('bottomline_date', false));
$this->view->conf->_bottomline_link(Minz_Request::param('bottomline_link', false));
$this->view->conf->_html5_notif_timeout(Minz_Request::param('html5_notif_timeout', 0));
$this->view->conf->save();
Minz_Session::_param('language', $this->view->conf->language);
FreshRSS_Context::$conf->_language(Minz_Request::param('language', 'en'));
FreshRSS_Context::$conf->_theme(Minz_Request::param('theme', FreshRSS_Themes::$defaultTheme));
FreshRSS_Context::$conf->_content_width(Minz_Request::param('content_width', 'thin'));
FreshRSS_Context::$conf->_topline_read(Minz_Request::param('topline_read', false));
FreshRSS_Context::$conf->_topline_favorite(Minz_Request::param('topline_favorite', false));
FreshRSS_Context::$conf->_topline_date(Minz_Request::param('topline_date', false));
FreshRSS_Context::$conf->_topline_link(Minz_Request::param('topline_link', false));
FreshRSS_Context::$conf->_bottomline_read(Minz_Request::param('bottomline_read', false));
FreshRSS_Context::$conf->_bottomline_favorite(Minz_Request::param('bottomline_favorite', false));
FreshRSS_Context::$conf->_bottomline_sharing(Minz_Request::param('bottomline_sharing', false));
FreshRSS_Context::$conf->_bottomline_tags(Minz_Request::param('bottomline_tags', false));
FreshRSS_Context::$conf->_bottomline_date(Minz_Request::param('bottomline_date', false));
FreshRSS_Context::$conf->_bottomline_link(Minz_Request::param('bottomline_link', false));
FreshRSS_Context::$conf->_html5_notif_timeout(Minz_Request::param('html5_notif_timeout', 0));
FreshRSS_Context::$conf->save();
Minz_Session::_param('language', FreshRSS_Context::$conf->language);
Minz_Translate::reset();
invalidateHttpCache();
@ -102,27 +102,27 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
*/
public function readingAction() {
if (Minz_Request::isPost()) {
$this->view->conf->_posts_per_page(Minz_Request::param('posts_per_page', 10));
$this->view->conf->_view_mode(Minz_Request::param('view_mode', 'normal'));
$this->view->conf->_default_view((int)Minz_Request::param('default_view', FreshRSS_Entry::STATE_ALL));
$this->view->conf->_auto_load_more(Minz_Request::param('auto_load_more', false));
$this->view->conf->_display_posts(Minz_Request::param('display_posts', false));
$this->view->conf->_display_categories(Minz_Request::param('display_categories', false));
$this->view->conf->_hide_read_feeds(Minz_Request::param('hide_read_feeds', false));
$this->view->conf->_onread_jump_next(Minz_Request::param('onread_jump_next', false));
$this->view->conf->_lazyload(Minz_Request::param('lazyload', false));
$this->view->conf->_sticky_post(Minz_Request::param('sticky_post', false));
$this->view->conf->_reading_confirm(Minz_Request::param('reading_confirm', false));
$this->view->conf->_sort_order(Minz_Request::param('sort_order', 'DESC'));
$this->view->conf->_mark_when(array(
FreshRSS_Context::$conf->_posts_per_page(Minz_Request::param('posts_per_page', 10));
FreshRSS_Context::$conf->_view_mode(Minz_Request::param('view_mode', 'normal'));
FreshRSS_Context::$conf->_default_view((int)Minz_Request::param('default_view', FreshRSS_Entry::STATE_ALL));
FreshRSS_Context::$conf->_auto_load_more(Minz_Request::param('auto_load_more', false));
FreshRSS_Context::$conf->_display_posts(Minz_Request::param('display_posts', false));
FreshRSS_Context::$conf->_display_categories(Minz_Request::param('display_categories', false));
FreshRSS_Context::$conf->_hide_read_feeds(Minz_Request::param('hide_read_feeds', false));
FreshRSS_Context::$conf->_onread_jump_next(Minz_Request::param('onread_jump_next', false));
FreshRSS_Context::$conf->_lazyload(Minz_Request::param('lazyload', false));
FreshRSS_Context::$conf->_sticky_post(Minz_Request::param('sticky_post', false));
FreshRSS_Context::$conf->_reading_confirm(Minz_Request::param('reading_confirm', false));
FreshRSS_Context::$conf->_sort_order(Minz_Request::param('sort_order', 'DESC'));
FreshRSS_Context::$conf->_mark_when(array(
'article' => Minz_Request::param('mark_open_article', false),
'site' => Minz_Request::param('mark_open_site', false),
'scroll' => Minz_Request::param('mark_scroll', false),
'reception' => Minz_Request::param('mark_upon_reception', false),
));
$this->view->conf->save();
FreshRSS_Context::$conf->save();
Minz_Session::_param('language', $this->view->conf->language);
Minz_Session::_param('language', FreshRSS_Context::$conf->language);
Minz_Translate::reset();
invalidateHttpCache();
@ -143,8 +143,8 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
public function sharingAction() {
if (Minz_Request::isPost()) {
$params = Minz_Request::params();
$this->view->conf->_sharing($params['share']);
$this->view->conf->save();
FreshRSS_Context::$conf->_sharing($params['share']);
FreshRSS_Context::$conf->save();
invalidateHttpCache();
Minz_Request::good(_t('configuration_updated'),
@ -185,8 +185,8 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
}
}
$this->view->conf->_shortcuts($shortcuts_ok);
$this->view->conf->save();
FreshRSS_Context::$conf->_shortcuts($shortcuts_ok);
FreshRSS_Context::$conf->save();
invalidateHttpCache();
Minz_Request::good(_t('shortcuts_updated'),
@ -213,10 +213,10 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
*/
public function archivingAction() {
if (Minz_Request::isPost()) {
$this->view->conf->_old_entries(Minz_Request::param('old_entries', 3));
$this->view->conf->_keep_history_default(Minz_Request::param('keep_history_default', 0));
$this->view->conf->_ttl_default(Minz_Request::param('ttl_default', -2));
$this->view->conf->save();
FreshRSS_Context::$conf->_old_entries(Minz_Request::param('old_entries', 3));
FreshRSS_Context::$conf->_keep_history_default(Minz_Request::param('keep_history_default', 0));
FreshRSS_Context::$conf->_ttl_default(Minz_Request::param('ttl_default', -2));
FreshRSS_Context::$conf->save();
invalidateHttpCache();
Minz_Request::good(_t('configuration_updated'),
@ -253,8 +253,8 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
$query['name'] = _t('query_number', $key + 1);
}
}
$this->view->conf->_queries($queries);
$this->view->conf->save();
FreshRSS_Context::$conf->_queries($queries);
FreshRSS_Context::$conf->save();
Minz_Request::good(_t('configuration_updated'),
array('c' => 'configure', 'a' => 'queries'));
@ -262,7 +262,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
$this->view->query_get = array();
$cat_dao = new FreshRSS_CategoryDAO();
$feed_dao = FreshRSS_Factory::createFeedDao();
foreach ($this->view->conf->queries as $key => $query) {
foreach (FreshRSS_Context::$conf->queries as $key => $query) {
if (!isset($query['get'])) {
continue;
}
@ -330,7 +330,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
*/
public function addQueryAction() {
$whitelist = array('get', 'order', 'name', 'search', 'state');
$queries = $this->view->conf->queries;
$queries = FreshRSS_Context::$conf->queries;
$query = Minz_Request::params();
$query['name'] = _t('query_number', count($queries) + 1);
foreach ($query as $key => $value) {
@ -342,8 +342,8 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
$query['state'] -= FreshRSS_Entry::STATE_STRICT;
}
$queries[] = $query;
$this->view->conf->_queries($queries);
$this->view->conf->save();
FreshRSS_Context::$conf->_queries($queries);
FreshRSS_Context::$conf->save();
Minz_Request::good(_t('query_created', $query['name']),
array('c' => 'configure', 'a' => 'queries'));

6
app/Controllers/entryController.php
Unescape View File

@ -21,7 +21,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
// the end.
$this->params = array();
$output = Minz_Request::param('output', '');
if ($output != '' && $this->view->conf->view_mode !== $output) {
if ($output != '' && FreshRSS_Context::$conf->view_mode !== $output) {
$this->params['output'] = $output;
}
@ -167,7 +167,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
public function purgeAction() {
@set_time_limit(300);
$nb_month_old = max($this->view->conf->old_entries, 1);
$nb_month_old = max(FreshRSS_Context::$conf->old_entries, 1);
$date_min = time() - (3600 * 24 * 30 * $nb_month_old);
$feedDAO = FreshRSS_Factory::createFeedDao();
@ -181,7 +181,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
if ($feed_history == -2) {
// TODO: -2 must be a constant!
// -2 means we take the default value from configuration
$feed_history = $this->view->conf->keep_history_default;
$feed_history = FreshRSS_Context::$conf->keep_history_default;
}
if ($feed_history >= 0) {

18
app/Controllers/feedController.php
Unescape View File

@ -14,7 +14,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
// 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 = $this->view->conf->token;
$token = FreshRSS_Context::$conf->token;
$token_param = Minz_Request::param('token', '');
$token_is_ok = ($token != '' && $token == $token_param);
$action = Minz_Request::actionName();
@ -154,14 +154,14 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
$feed->_id($id);
$feed->faviconPrepare();
$is_read = $this->view->conf->mark_when['reception'] ? 1 : 0;
$is_read = FreshRSS_Context::$conf->mark_when['reception'] ? 1 : 0;
$entryDAO = FreshRSS_Factory::createEntryDao();
// We want chronological order and SimplePie uses reverse order.
$entries = array_reverse($feed->entries());
// Calculate date of oldest entries we accept in DB.
$nb_month_old = $this->view->conf->old_entries;
$nb_month_old = FreshRSS_Context::$conf->old_entries;
$date_min = time() - (3600 * 24 * 30 * $nb_month_old);
// Use a shared statement and a transaction to improve a LOT the
@ -265,15 +265,15 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
$feeds[] = $feed;
}
} else {
$feeds = $feedDAO->listFeedsOrderUpdate($this->view->conf->ttl_default);
$feeds = $feedDAO->listFeedsOrderUpdate(FreshRSS_Context::$conf->ttl_default);
}
// Calculate date of oldest entries we accept in DB.
$nb_month_old = max($this->view->conf->old_entries, 1);
$nb_month_old = max(FreshRSS_Context::$conf->old_entries, 1);
$date_min = time() - (3600 * 24 * 30 * $nb_month_old);
$updated_feeds = 0;
$is_read = $this->view->conf->mark_when['reception'] ? 1 : 0;
$is_read = FreshRSS_Context::$conf->mark_when['reception'] ? 1 : 0;
foreach ($feeds as $feed) {
if (!$feed->lock()) {
Minz_Log::notice('Feed already being actualized: ' . $feed->url());
@ -294,7 +294,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
if ($feed_history == -2) {
// TODO: -2 must be a constant!
// -2 means we take the default value from configuration
$feed_history = $this->view->conf->keep_history_default;
$feed_history = FreshRSS_Context::$conf->keep_history_default;
}
// We want chronological order and SimplePie uses reverse order.
@ -470,8 +470,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
// TODO: Delete old favicon
// Remove related queries
$this->view->conf->remove_query_by_get('f_' . $id);
$this->view->conf->save();
FreshRSS_Context::$conf->remove_query_by_get('f_' . $id);
FreshRSS_Context::$conf->save();
Minz_Request::good(_t('feed_deleted'), $redirect_url);
} else {

4
app/Controllers/importExportController.php
Unescape View File

@ -289,7 +289,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
return true;
}
$is_read = $this->view->conf->mark_when['reception'] ? 1 : 0;
$is_read = FreshRSS_Context::$conf->mark_when['reception'] ? 1 : 0;
$google_compliant = strpos($article_object['id'], 'com.google') !== false;
@ -484,7 +484,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
$this->view->type = 'feed/' . $feed->id();
$this->view->entries = $this->entryDAO->listWhere(
'f', $feed->id(), FreshRSS_Entry::STATE_ALL, 'ASC',
$this->view->conf->posts_per_page
FreshRSS_Context::$conf->posts_per_page
);
$this->view->feed = $feed;
}

8
app/Controllers/indexController.php
Unescape View File

@ -5,7 +5,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
public function indexAction() {
$output = Minz_Request::param('output');
$token = $this->view->conf->token;
$token = FreshRSS_Context::$conf->token;
// check if user is logged in
if (!FreshRSS_Auth::hasAccess() && !Minz_Configuration::allowAnonymous()) {
@ -76,11 +76,11 @@ class FreshRSS_index_Controller extends Minz_ActionController {
);
// On récupère les différents éléments de filtrage
$this->view->state = Minz_Request::param('state', $this->view->conf->default_view);
$this->view->state = Minz_Request::param('state', FreshRSS_Context::$conf->default_view);
$state_param = Minz_Request::param('state', null);
$filter = Minz_Request::param('search', '');
$this->view->order = $order = Minz_Request::param('order', $this->view->conf->sort_order);
$nb = Minz_Request::param('nb', $this->view->conf->posts_per_page);
$this->view->order = $order = Minz_Request::param('order', FreshRSS_Context::$conf->sort_order);
$nb = Minz_Request::param('nb', FreshRSS_Context::$conf->posts_per_page);
$first = Minz_Request::param('next', '');
$ajax_request = Minz_Request::param('ajax', false);

2
app/Controllers/javascriptController.php
Unescape View File

@ -8,7 +8,7 @@ class FreshRSS_javascript_Controller extends Minz_ActionController {
public function actualizeAction() {
header('Content-Type: text/javascript; charset=UTF-8');
$feedDAO = FreshRSS_Factory::createFeedDao();
$this->view->feeds = $feedDAO->listFeedsOrderUpdate($this->view->conf->ttl_default);
$this->view->feeds = $feedDAO->listFeedsOrderUpdate(FreshRSS_Context::$conf->ttl_default);
}
public function nbUnreadsPerFeedAction() {

18
app/Controllers/userController.php
Unescape View File

@ -42,9 +42,9 @@ class FreshRSS_user_Controller extends Minz_ActionController {
$passwordPlain = '';
$passwordHash = preg_replace('/^\$2[xy]\$/', '\$2a\$', $passwordHash); //Compatibility with bcrypt.js
$ok &= ($passwordHash != '');
$this->view->conf->_passwordHash($passwordHash);
FreshRSS_Context::$conf->_passwordHash($passwordHash);
}
Minz_Session::_param('passwordHash', $this->view->conf->passwordHash);
Minz_Session::_param('passwordHash', FreshRSS_Context::$conf->passwordHash);
$passwordPlain = Minz_Request::param('apiPasswordPlain', '', true);
if ($passwordPlain != '') {
@ -55,17 +55,17 @@ class FreshRSS_user_Controller extends Minz_ActionController {
$passwordPlain = '';
$passwordHash = preg_replace('/^\$2[xy]\$/', '\$2a\$', $passwordHash); //Compatibility with bcrypt.js
$ok &= ($passwordHash != '');
$this->view->conf->_apiPasswordHash($passwordHash);
FreshRSS_Context::$conf->_apiPasswordHash($passwordHash);
}
// TODO: why do we need of hasAccess here?
if (FreshRSS_Auth::hasAccess('admin')) {
$this->view->conf->_mail_login(Minz_Request::param('mail_login', '', true));
FreshRSS_Context::$conf->_mail_login(Minz_Request::param('mail_login', '', true));
}
$email = $this->view->conf->mail_login;
$email = FreshRSS_Context::$conf->mail_login;
Minz_Session::_param('mail', $email);
$ok &= $this->view->conf->save();
$ok &= FreshRSS_Context::$conf->save();
if ($email != '') {
$personaFile = DATA_PATH . '/persona/' . $email . '.txt';
@ -113,9 +113,9 @@ class FreshRSS_user_Controller extends Minz_ActionController {
$db = Minz_Configuration::dataBase();
require_once(APP_PATH . '/SQL/install.sql.' . $db['type'] . '.php');
$new_user_language = Minz_Request::param('new_user_language', $this->view->conf->language);
if (!in_array($new_user_language, $this->view->conf->availableLanguages())) {
$new_user_language = $this->view->conf->language;
$new_user_language = Minz_Request::param('new_user_language', FreshRSS_Context::$conf->language);
if (!in_array($new_user_language, FreshRSS_Context::$conf->availableLanguages())) {
$new_user_language = FreshRSS_Context::$conf->language;
}
$new_user_name = Minz_Request::param('new_user_name');

2
app/FreshRSS.php
Unescape View File

@ -24,9 +24,7 @@ class FreshRSS extends Minz_FrontController {
}
// Load context and configuration.
// TODO: remove $this->view->conf variable which is contained in context
FreshRSS_Context::init();
Minz_View::_param('conf', FreshRSS_Context::$conf);
$this->loadParamsView();
$this->loadStylesAndScripts();

8
app/layout/aside_flux.phtml
Unescape View File

@ -1,4 +1,4 @@
<div class="aside aside_flux<?php if ($this->conf->hide_read_feeds && ($this->state & FreshRSS_Entry::STATE_NOT_READ) && !($this->state & FreshRSS_Entry::STATE_READ)) echo ' state_unread'; ?>" id="aside_flux">
<div class="aside aside_flux<?php if (FreshRSS_Context::$conf->hide_read_feeds && ($this->state & FreshRSS_Entry::STATE_NOT_READ) && !($this->state & FreshRSS_Entry::STATE_READ)) echo ' state_unread'; ?>" id="aside_flux">
<a class="toggle_aside" href="#close"><?php echo _i('close'); ?></a>
<ul class="categories">
@ -17,7 +17,7 @@
<?php
$arUrl = array('c' => 'index', 'a' => 'index', 'params' => array());
if ($this->conf->view_mode !== Minz_Request::param('output', 'normal')) {
if (FreshRSS_Context::$conf->view_mode !== Minz_Request::param('output', 'normal')) {
$arUrl['params']['output'] = 'normal';
}
?>
@ -47,7 +47,7 @@
$c_show = false;
if ($this->get_c == $cat->id()) {
$c_active = true;
if (!$this->conf->display_categories || $this->get_f) {
if (!FreshRSS_Context::$conf->display_categories || $this->get_f) {
$c_show = true;
}
}
@ -92,7 +92,7 @@
<li class="item"><a href="<?php echo _url('subscription', 'index', 'id', '!!!!!!'); ?>"><?php echo _t('administration'); ?></a></li>
<li class="item"><a href="<?php echo _url('feed', 'actualize', 'id', '!!!!!!'); ?>"><?php echo _t('actualize'); ?></a></li>
<li class="item">
<?php $confirm = $this->conf->reading_confirm ? 'confirm' : ''; ?>
<?php $confirm = FreshRSS_Context::$conf->reading_confirm ? 'confirm' : ''; ?>
<button class="read_all as-link <?php echo $confirm; ?>"
form="mark-read-aside"
formaction="<?php echo _url('entry', 'read', 'get', 'f_!!!!!!'); ?>"

2
app/layout/layout.phtml
Unescape View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="<?php echo $this->conf->language; ?>" xml:lang="<?php echo $this->conf->language; ?>">
<html lang="<?php echo FreshRSS_Context::$conf->language; ?>" xml:lang="<?php echo FreshRSS_Context::$conf->language; ?>">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="initial-scale=1.0" />

14
app/layout/nav_menu.phtml
Unescape View File

@ -98,13 +98,13 @@
<a class="no-mobile" href="<?php echo _url('configure', 'queries'); ?>"><?php echo _i('configure'); ?></a>
</li>
<?php foreach ($this->conf->queries as $query) { ?>
<?php foreach (FreshRSS_Context::$conf->queries as $query) { ?>
<li class="item query">
<a href="<?php echo $query['url']; ?>"><?php echo $query['name']; ?></a>
</li>
<?php } ?>
<?php if (count($this->conf->queries) > 0) { ?>
<?php if (count(FreshRSS_Context::$conf->queries) > 0) { ?>
<li class="separator no-mobile"></li>
<?php } ?>
@ -132,7 +132,7 @@
$string_mark = _t('mark_cat_read');
}
$nextGet = $get;
if ($this->conf->onread_jump_next && strlen($get) > 2) {
if (FreshRSS_Context::$conf->onread_jump_next && strlen($get) > 2) {
$anotherUnreadId = '';
$foundCurrent = false;
switch ($get[0]) {
@ -180,7 +180,7 @@
$arUrl = array('c' => 'entry', 'a' => 'read', 'params' => array('get' => $get, 'nextGet' => $nextGet, 'idMax' => $idMax));
$output = Minz_Request::param('output', '');
if ($output != '' && $this->conf->view_mode !== $output) {
if ($output != '' && FreshRSS_Context::$conf->view_mode !== $output) {
$arUrl['params']['output'] = $output;
}
$markReadUrl = Minz_Url::display($arUrl);
@ -190,7 +190,7 @@
<form id="mark-read-menu" method="post" style="display: none"></form>
<div class="stick" id="nav_menu_read_all">
<?php $confirm = $this->conf->reading_confirm ? 'confirm' : ''; ?>
<?php $confirm = FreshRSS_Context::$conf->reading_confirm ? 'confirm' : ''; ?>
<button class="read_all btn <?php echo $confirm; ?>"
form="mark-read-menu"
formaction="<?php echo $markReadUrl; ?>"
@ -252,8 +252,8 @@
<?php
$url_output['params']['output'] = 'rss';
if ($this->conf->token) {
$url_output['params']['token'] = $this->conf->token;
if (FreshRSS_Context::$conf->token) {
$url_output['params']['token'] = FreshRSS_Context::$conf->token;
}
?>
<a class="view_rss btn" target="_blank" title="<?php echo _t('rss_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">

4
app/views/auth/index.phtml
Unescape View File

@ -14,7 +14,7 @@
<option selected="selected"></option>
<?php } ?>
<option value="form"<?php echo Minz_Configuration::authType() === 'form' ? ' selected="selected"' : '', cryptAvailable() ? '' : ' disabled="disabled"'; ?>><?php echo _t('auth_form'); ?></option>
<option value="persona"<?php echo Minz_Configuration::authType() === 'persona' ? ' selected="selected"' : '', $this->conf->mail_login == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('auth_persona'); ?></option>
<option value="persona"<?php echo Minz_Configuration::authType() === 'persona' ? ' selected="selected"' : '', FreshRSS_Context::$conf->mail_login == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('auth_persona'); ?></option>
<option value="http_auth"<?php echo Minz_Configuration::authType() === 'http_auth' ? ' selected="selected"' : '', httpAuthUser() == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('http_auth'); ?> (REMOTE_USER = '<?php echo httpAuthUser(); ?>')</option>
<option value="none"<?php echo Minz_Configuration::authType() === 'none' ? ' selected="selected"' : ''; ?>><?php echo _t('auth_none'); ?></option>
</select>
@ -55,7 +55,7 @@
<?php if (Minz_Configuration::canLogIn()) { ?>
<div class="form-group">
<label class="group-name" for="token"><?php echo _t('auth_token'); ?></label>
<?php $token = $this->conf->token; ?>
<?php $token = FreshRSS_Context::$conf->token; ?>
<div class="group-controls">
<input type="text" id="token" name="token" value="<?php echo $token; ?>" placeholder="<?php echo _t('blank_to_disable'); ?>"<?php
echo Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />

10
app/views/configure/archiving.phtml
Unescape View File

@ -10,7 +10,7 @@
<div class="form-group">
<label class="group-name" for="old_entries"><?php echo _t('delete_articles_every'); ?></label>
<div class="group-controls">
<input type="number" id="old_entries" name="old_entries" min="1" max="1200" value="<?php echo $this->conf->old_entries; ?>" /> <?php echo _t('month'); ?>
<input type="number" id="old_entries" name="old_entries" min="1" max="1200" value="<?php echo FreshRSS_Context::$conf->old_entries; ?>" /> <?php echo _t('month'); ?>
  <a class="btn confirm" href="<?php echo _url('entry', 'purge'); ?>"><?php echo _t('purge_now'); ?></a>
</div>
</div>
@ -19,7 +19,7 @@
<div class="group-controls">
<select class="number" name="keep_history_default" id="keep_history_default" required="required"><?php
foreach (array('' => '', 0 => '0', 10 => '10', 50 => '50', 100 => '100', 500 => '500', 1000 => '1 000', 5000 => '5 000', 10000 => '10 000', -1 => '∞') as $v => $t) {
echo '<option value="' . $v . ($this->conf->keep_history_default == $v ? '" selected="selected' : '') . '">' . $t . ' </option>';
echo '<option value="' . $v . (FreshRSS_Context::$conf->keep_history_default == $v ? '" selected="selected' : '') . '">' . $t . ' </option>';
}
?></select> (<?php echo _t('by_default'); ?>)
</div>
@ -34,13 +34,13 @@
36000 => '10h', 43200 => '12h', 64800 => '18h',
86400 => '1d', 129600 => '1.5d', 172800 => '2d', 259200 => '3d', 345600 => '4d', 432000 => '5d', 518400 => '6d',
604800 => '1wk', -1 => '∞') as $v => $t) {
echo '<option value="' . $v . ($this->conf->ttl_default == $v ? '" selected="selected' : '') . '">' . $t . '</option>';
if ($this->conf->ttl_default == $v) {
echo '<option value="' . $v . (FreshRSS_Context::$conf->ttl_default == $v ? '" selected="selected' : '') . '">' . $t . '</option>';
if (FreshRSS_Context::$conf->ttl_default == $v) {
$found = true;
}
}
if (!$found) {
echo '<option value="' . intval($this->conf->ttl_default) . '" selected="selected">' . intval($this->conf->ttl_default) . 's</option>';
echo '<option value="' . intval(FreshRSS_Context::$conf->ttl_default) . '" selected="selected">' . intval(FreshRSS_Context::$conf->ttl_default) . 's</option>';
}
?></select> (<?php echo _t('by_default'); ?>)
</div>

30
app/views/configure/display.phtml
Unescape View File

@ -10,9 +10,9 @@
<label class="group-name" for="language"><?php echo _t('language'); ?></label>
<div class="group-controls">
<select name="language" id="language">
<?php $languages = $this->conf->availableLanguages(); ?>
<?php $languages = FreshRSS_Context::$conf->availableLanguages(); ?>
<?php foreach ($languages as $short => $lib) { ?>
<option value="<?php echo $short; ?>"<?php echo $this->conf->language === $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option>
<option value="<?php echo $short; ?>"<?php echo FreshRSS_Context::$conf->language === $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option>
<?php } ?>
</select>
</div>
@ -24,7 +24,7 @@
<select name="theme" id="theme" required=""><?php
$found = false;
foreach ($this->themes as $theme) {
?><option value="<?php echo $theme['id']; ?>"<?php if ($this->conf->theme === $theme['id']) { echo ' selected="selected"'; $found = true; } ?>><?php
?><option value="<?php echo $theme['id']; ?>"<?php if (FreshRSS_Context::$conf->theme === $theme['id']) { echo ' selected="selected"'; $found = true; } ?>><?php
echo $theme['name'] . ' — ' . _t('by') . ' ' . $theme['author'];
?></option><?php
}
@ -35,7 +35,7 @@
</div>
</div>
<?php $width = $this->conf->content_width; ?>
<?php $width = FreshRSS_Context::$conf->content_width; ?>
<div class="form-group">
<label class="group-name" for="content_width"><?php echo _t('content_width'); ?></label>
<div class="group-controls">
@ -73,20 +73,20 @@
<tbody>
<tr>
<th><?php echo _t('top_line'); ?></th>
<td><input type="checkbox" name="topline_read" value="1"<?php echo $this->conf->topline_read ? ' checked="checked"' : ''; ?> /></td>
<td><input type="checkbox" name="topline_favorite" value="1"<?php echo $this->conf->topline_favorite ? ' checked="checked"' : ''; ?> /></td>
<td><input type="checkbox" name="topline_read" value="1"<?php echo FreshRSS_Context::$conf->topline_read ? ' checked="checked"' : ''; ?> /></td>
<td><input type="checkbox" name="topline_favorite" value="1"<?php echo FreshRSS_Context::$conf->topline_favorite ? ' checked="checked"' : ''; ?> /></td>
<td><input type="checkbox" disabled="disabled" /></td>
<td><input type="checkbox" disabled="disabled" /></td>
<td><input type="checkbox" name="topline_date" value="1"<?php echo $this->conf->topline_date ? ' checked="checked"' : ''; ?> /></td>
<td><input type="checkbox" name="topline_link" value="1"<?php echo $this->conf->topline_link ? ' checked="checked"' : ''; ?> /></td>
<td><input type="checkbox" name="topline_date" value="1"<?php echo FreshRSS_Context::$conf->topline_date ? ' checked="checked"' : ''; ?> /></td>
<td><input type="checkbox" name="topline_link" value="1"<?php echo FreshRSS_Context::$conf->topline_link ? ' checked="checked"' : ''; ?> /></td>
</tr><tr>
<th><?php echo _t('bottom_line'); ?></th>
<td><input type="checkbox" name="bottomline_read" value="1"<?php echo $this->conf->bottomline_read ? ' checked="checked"' : ''; ?> /></td>
<td><input type="checkbox" name="bottomline_favorite" value="1"<?php echo $this->conf->bottomline_favorite ? ' checked="checked"' : ''; ?> /></td>
<td><input type="checkbox" name="bottomline_sharing" value="1"<?php echo $this->conf->bottomline_sharing ? ' checked="checked"' : ''; ?> /></td>
<td><input type="checkbox" name="bottomline_tags" value="1"<?php echo $this->conf->bottomline_tags ? ' checked="checked"' : ''; ?> /></td>
<td><input type="checkbox" name="bottomline_date" value="1"<?php echo $this->conf->bottomline_date ? ' checked="checked"' : ''; ?> /></td>
<td><input type="checkbox" name="bottomline_link" value="1"<?php echo $this->conf->bottomline_link ? ' checked="checked"' : ''; ?> /></td>
<td><input type="checkbox" name="bottomline_read" value="1"<?php echo FreshRSS_Context::$conf->bottomline_read ? ' checked="checked"' : ''; ?> /></td>
<td><input type="checkbox" name="bottomline_favorite" value="1"<?php echo FreshRSS_Context::$conf->bottomline_favorite ? ' checked="checked"' : ''; ?> /></td>
<td><input type="checkbox" name="bottomline_sharing" value="1"<?php echo FreshRSS_Context::$conf->bottomline_sharing ? ' checked="checked"' : ''; ?> /></td>
<td><input type="checkbox" name="bottomline_tags" value="1"<?php echo FreshRSS_Context::$conf->bottomline_tags ? ' checked="checked"' : ''; ?> /></td>
<td><input type="checkbox" name="bottomline_date" value="1"<?php echo FreshRSS_Context::$conf->bottomline_date ? ' checked="checked"' : ''; ?> /></td>
<td><input type="checkbox" name="bottomline_link" value="1"<?php echo FreshRSS_Context::$conf->bottomline_link ? ' checked="checked"' : ''; ?> /></td>
</tr>
</tbody>
</table><br />
@ -95,7 +95,7 @@
<div class="form-group">
<label class="group-name" for="posts_per_page"><?php echo _t('html5_notif_timeout'); ?></label>
<div class="group-controls">
<input type="number" id="html5_notif_timeout" name="html5_notif_timeout" value="<?php echo $this->conf->html5_notif_timeout; ?>" /> <?php echo _t('seconds_(0_means_no_timeout)'); ?>
<input type="number" id="html5_notif_timeout" name="html5_notif_timeout" value="<?php echo FreshRSS_Context::$conf->html5_notif_timeout; ?>" /> <?php echo _t('seconds_(0_means_no_timeout)'); ?>
</div>
</div>

4
app/views/configure/queries.phtml
Unescape View File

@ -6,7 +6,7 @@
<form method="post" action="<?php echo _url('configure', 'queries'); ?>">
<legend><?php echo _t('queries'); ?></legend>
<?php foreach ($this->conf->queries as $key => $query) { ?>
<?php foreach (FreshRSS_Context::$conf->queries as $key => $query) { ?>
<div class="form-group" id="query-group-<?php echo $key; ?>">
<label class="group-name" for="queries_<?php echo $key; ?>_name">
<?php echo _t('query_number', $key + 1); ?>
@ -82,7 +82,7 @@
</div>
<?php } ?>
<?php if (count($this->conf->queries) > 0) { ?>
<?php if (count(FreshRSS_Context::$conf->queries) > 0) { ?>
<div class="form-group form-actions">
<div class="group-controls">
<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>

42
app/views/configure/reading.phtml
Unescape View File

@ -9,7 +9,7 @@
<div class="form-group">
<label class="group-name" for="posts_per_page"><?php echo _t('articles_per_page'); ?></label>
<div class="group-controls">
<input type="number" id="posts_per_page" name="posts_per_page" value="<?php echo $this->conf->posts_per_page; ?>" min="5" max="50" />
<input type="number" id="posts_per_page" name="posts_per_page" value="<?php echo FreshRSS_Context::$conf->posts_per_page; ?>" min="5" max="50" />
<?php echo _i('help'); ?> <?php echo _t('number_divided_when_reader'); ?>
</div>
</div>
@ -18,8 +18,8 @@
<label class="group-name" for="sort_order"><?php echo _t('sort_order'); ?></label>
<div class="group-controls">
<select name="sort_order" id="sort_order">
<option value="DESC"<?php echo $this->conf->sort_order === 'DESC' ? ' selected="selected"' : ''; ?>><?php echo _t('newer_first'); ?></option>
<option value="ASC"<?php echo $this->conf->sort_order === 'ASC' ? ' selected="selected"' : ''; ?>><?php echo _t('older_first'); ?></option>
<option value="DESC"<?php echo FreshRSS_Context::$conf->sort_order === 'DESC' ? ' selected="selected"' : ''; ?>><?php echo _t('newer_first'); ?></option>
<option value="ASC"<?php echo FreshRSS_Context::$conf->sort_order === 'ASC' ? ' selected="selected"' : ''; ?>><?php echo _t('older_first'); ?></option>
</select>
</div>
</div>
@ -28,9 +28,9 @@
<label class="group-name" for="view_mode"><?php echo _t('default_view'); ?></label>
<div class="group-controls">
<select name="view_mode" id="view_mode">
<option value="normal"<?php echo $this->conf->view_mode === 'normal' ? ' selected="selected"' : ''; ?>><?php echo _t('normal_view'); ?></option>
<option value="reader"<?php echo $this->conf->view_mode === 'reader' ? ' selected="selected"' : ''; ?>><?php echo _t('reader_view'); ?></option>
<option value="global"<?php echo $this->conf->view_mode === 'global' ? ' selected="selected"' : ''; ?>><?php echo _t('global_view'); ?></option>
<option value="normal"<?php echo FreshRSS_Context::$conf->view_mode === 'normal' ? ' selected="selected"' : ''; ?>><?php echo _t('normal_view'); ?></option>
<option value="reader"<?php echo FreshRSS_Context::$conf->view_mode === 'reader' ? ' selected="selected"' : ''; ?>><?php echo _t('reader_view'); ?></option>
<option value="global"<?php echo FreshRSS_Context::$conf->view_mode === 'global' ? ' selected="selected"' : ''; ?>><?php echo _t('global_view'); ?></option>
</select>
</div>
</div>
@ -39,9 +39,9 @@
<label class="group-name" for="view_mode"><?php echo _t('articles_to_display'); ?></label>
<div class="group-controls">
<select name="default_view" id="default_view">
<option value="<?php echo FreshRSS_Entry::STATE_NOT_READ; ?>"<?php echo $this->conf->default_view === FreshRSS_Entry::STATE_NOT_READ ? ' selected="selected"' : ''; ?>><?php echo _t('show_adaptive'); ?></option>
<option value="<?php echo FreshRSS_Entry::STATE_ALL; ?>"<?php echo $this->conf->default_view === FreshRSS_Entry::STATE_ALL ? ' selected="selected"' : ''; ?>><?php echo _t('show_all_articles'); ?></option>
<option value="<?php echo FreshRSS_Entry::STATE_STRICT + FreshRSS_Entry::STATE_NOT_READ; ?>"<?php echo $this->conf->default_view === FreshRSS_Entry::STATE_STRICT + FreshRSS_Entry::STATE_NOT_READ ? ' selected="selected"' : ''; ?>><?php echo _t('show_not_reads'); ?></option>
<option value="<?php echo FreshRSS_Entry::STATE_NOT_READ; ?>"<?php echo FreshRSS_Context::$conf->default_view === FreshRSS_Entry::STATE_NOT_READ ? ' selected="selected"' : ''; ?>><?php echo _t('show_adaptive'); ?></option>
<option value="<?php echo FreshRSS_Entry::STATE_ALL; ?>"<?php echo FreshRSS_Context::$conf->default_view === FreshRSS_Entry::STATE_ALL ? ' selected="selected"' : ''; ?>><?php echo _t('show_all_articles'); ?></option>
<option value="<?php echo FreshRSS_Entry::STATE_STRICT + FreshRSS_Entry::STATE_NOT_READ; ?>"<?php echo FreshRSS_Context::$conf->default_view === FreshRSS_Entry::STATE_STRICT + FreshRSS_Entry::STATE_NOT_READ ? ' selected="selected"' : ''; ?>><?php echo _t('show_not_reads'); ?></option>
</select>
</div>
</div>
@ -49,7 +49,7 @@
<div class="form-group">
<div class="group-controls">
<label class="checkbox" for="hide_read_feeds">
<input type="checkbox" name="hide_read_feeds" id="hide_read_feeds" value="1"<?php echo $this->conf->hide_read_feeds ? ' checked="checked"' : ''; ?> />
<input type="checkbox" name="hide_read_feeds" id="hide_read_feeds" value="1"<?php echo FreshRSS_Context::$conf->hide_read_feeds ? ' checked="checked"' : ''; ?> />
<?php echo _t('hide_read_feeds'); ?>
</label>
</div>
@ -58,7 +58,7 @@
<div class="form-group">
<div class="group-controls">
<label class="checkbox" for="display_posts">
<input type="checkbox" name="display_posts" id="display_posts" value="1"<?php echo $this->conf->display_posts ? ' checked="checked"' : ''; ?> />
<input type="checkbox" name="display_posts" id="display_posts" value="1"<?php echo FreshRSS_Context::$conf->display_posts ? ' checked="checked"' : ''; ?> />
<?php echo _t('display_articles_unfolded'); ?>
<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
</label>
@ -68,7 +68,7 @@
<div class="form-group">
<div class="group-controls">
<label class="checkbox" for="display_categories">
<input type="checkbox" name="display_categories" id="display_categories" value="1"<?php echo $this->conf->display_categories ? ' checked="checked"' : ''; ?> />
<input type="checkbox" name="display_categories" id="display_categories" value="1"<?php echo FreshRSS_Context::$conf->display_categories ? ' checked="checked"' : ''; ?> />
<?php echo _t('display_categories_unfolded'); ?>
<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
</label>
@ -78,7 +78,7 @@
<div class="form-group">
<div class="group-controls">
<label class="checkbox" for="sticky_post">
<input type="checkbox" name="sticky_post" id="sticky_post" value="1"<?php echo $this->conf->sticky_post ? ' checked="checked"' : ''; ?> />
<input type="checkbox" name="sticky_post" id="sticky_post" value="1"<?php echo FreshRSS_Context::$conf->sticky_post ? ' checked="checked"' : ''; ?> />
<?php echo _t('sticky_post'); ?>
<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
</label>
@ -88,7 +88,7 @@
<div class="form-group">
<div class="group-controls">
<label class="checkbox" for="auto_load_more">
<input type="checkbox" name="auto_load_more" id="auto_load_more" value="1"<?php echo $this->conf->auto_load_more ? ' checked="checked"' : ''; ?> />
<input type="checkbox" name="auto_load_more" id="auto_load_more" value="1"<?php echo FreshRSS_Context::$conf->auto_load_more ? ' checked="checked"' : ''; ?> />
<?php echo _t('auto_load_more'); ?>
<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
</label>
@ -98,7 +98,7 @@
<div class="form-group">
<div class="group-controls">
<label class="checkbox" for="lazyload">
<input type="checkbox" name="lazyload" id="lazyload" value="1"<?php echo $this->conf->lazyload ? ' checked="checked"' : ''; ?> />
<input type="checkbox" name="lazyload" id="lazyload" value="1"<?php echo FreshRSS_Context::$conf->lazyload ? ' checked="checked"' : ''; ?> />
<?php echo _t('img_with_lazyload'); ?>
<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
</label>
@ -108,7 +108,7 @@
<div class="form-group">
<div class="group-controls">
<label class="checkbox" for="reading_confirm">
<input type="checkbox" name="reading_confirm" id="reading_confirm" value="1"<?php echo $this->conf->reading_confirm ? ' checked="checked"' : ''; ?> />
<input type="checkbox" name="reading_confirm" id="reading_confirm" value="1"<?php echo FreshRSS_Context::$conf->reading_confirm ? ' checked="checked"' : ''; ?> />
<?php echo _t('reading_confirm'); ?>
<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
</label>
@ -119,19 +119,19 @@
<label class="group-name"><?php echo _t('auto_read_when'); ?></label>
<div class="group-controls">
<label class="checkbox" for="check_open_article">
<input type="checkbox" name="mark_open_article" id="check_open_article" value="1"<?php echo $this->conf->mark_when['article'] ? ' checked="checked"' : ''; ?> />
<input type="checkbox" name="mark_open_article" id="check_open_article" value="1"<?php echo FreshRSS_Context::$conf->mark_when['article'] ? ' checked="checked"' : ''; ?> />
<?php echo _t('article_viewed'); ?>
</label>
<label class="checkbox" for="check_open_site">
<input type="checkbox" name="mark_open_site" id="check_open_site" value="1"<?php echo $this->conf->mark_when['site'] ? ' checked="checked"' : ''; ?> />
<input type="checkbox" name="mark_open_site" id="check_open_site" value="1"<?php echo FreshRSS_Context::$conf->mark_when['site'] ? ' checked="checked"' : ''; ?> />
<?php echo _t('article_open_on_website'); ?>
</label>
<label class="checkbox" for="check_scroll">
<input type="checkbox" name="mark_scroll" id="check_scroll" value="1"<?php echo $this->conf->mark_when['scroll'] ? ' checked="checked"' : ''; ?> />
<input type="checkbox" name="mark_scroll" id="check_scroll" value="1"<?php echo FreshRSS_Context::$conf->mark_when['scroll'] ? ' checked="checked"' : ''; ?> />
<?php echo _t('scroll'); ?>
</label>
<label class="checkbox" for="check_reception">
<input type="checkbox" name="mark_upon_reception" id="check_reception" value="1"<?php echo $this->conf->mark_when['reception'] ? ' checked="checked"' : ''; ?> />
<input type="checkbox" name="mark_upon_reception" id="check_reception" value="1"<?php echo FreshRSS_Context::$conf->mark_when['reception'] ? ' checked="checked"' : ''; ?> />
<?php echo _t('upon_reception'); ?>
</label>
</div>
@ -141,7 +141,7 @@
<label class="group-name"><?php echo _t('after_onread'); ?></label>
<div class="group-controls">
<label class="checkbox" for="onread_jump_next">
<input type="checkbox" name="onread_jump_next" id="onread_jump_next" value="1"<?php echo $this->conf->onread_jump_next ? ' checked="checked"' : ''; ?> />
<input type="checkbox" name="onread_jump_next" id="onread_jump_next" value="1"<?php echo FreshRSS_Context::$conf->onread_jump_next ? ' checked="checked"' : ''; ?> />
<?php echo _t('jump_next'); ?>
</label>
</div>

6
app/views/configure/sharing.phtml
Unescape View File

@ -15,8 +15,8 @@
<a target="_blank" class="btn" title="<?php echo _t('more_information'); ?>" href="##help##"><?php echo _i('help'); ?></a>
</div></div>'>
<legend><?php echo _t('sharing'); ?></legend>
<?php foreach ($this->conf->sharing as $key => $sharing): ?>
<?php $share = $this->conf->shares[$sharing['type']]; ?>
<?php foreach (FreshRSS_Context::$conf->sharing as $key => $sharing): ?>
<?php $share = FreshRSS_Context::$conf->shares[$sharing['type']]; ?>
<div class="form-group" id="group-share-<?php echo $key; ?>">
<label class="group-name">
<?php echo _t($sharing['type']); ?>
@ -41,7 +41,7 @@
<div class="form-group">
<div class="group-controls">
<select>
<?php foreach($this->conf->shares as $key => $params):?>
<?php foreach(FreshRSS_Context::$conf->shares as $key => $params):?>
<option value='<?php echo $key?>' data-form='<?php echo $params['form']?>' data-help='<?php if (!empty($params['help'])) {echo $params['help'];}?>'><?php echo _t($key) ?></option>
<?php endforeach; ?>
</select>

2
app/views/configure/shortcut.phtml
Unescape View File

@ -9,7 +9,7 @@
<?php } ?>
</datalist>
<?php $s = $this->conf->shortcuts; ?>
<?php $s = FreshRSS_Context::$conf->shortcuts; ?>
<form method="post" action="<?php echo _url('configure', 'shortcut'); ?>">
<legend><?php echo _t('shortcuts'); ?></legend>

16
app/views/helpers/javascript_vars.phtml
Unescape View File

@ -1,12 +1,12 @@
"use strict";
<?php
$mark = $this->conf->mark_when;
$mark = FreshRSS_Context::$conf->mark_when;
$mail = Minz_Session::param('mail', false);
$auto_actualize = Minz_Session::param('actualize_feeds', false);
$hide_posts = ($this->conf->display_posts ||
$hide_posts = (FreshRSS_Context::$conf->display_posts ||
Minz_Request::param('output') === 'reader');
$s = $this->conf->shortcuts;
$s = FreshRSS_Context::$conf->shortcuts;
$url_login = Minz_Url::display(array(
'c' => 'auth',
@ -19,15 +19,15 @@ $url_logout = Minz_Url::display(array(
echo 'var context={',
'hide_posts:', $hide_posts ? 'false' : 'true', ',',
'display_order:"', Minz_Request::param('order', $this->conf->sort_order), '",',
'display_order:"', Minz_Request::param('order', FreshRSS_Context::$conf->sort_order), '",',
'auto_mark_article:', $mark['article'] ? 'true' : 'false', ',',
'auto_mark_site:', $mark['site'] ? 'true' : 'false', ',',
'auto_mark_scroll:', $mark['scroll'] ? 'true' : 'false', ',',
'auto_load_more:', $this->conf->auto_load_more ? 'true' : 'false', ',',
'auto_load_more:', FreshRSS_Context::$conf->auto_load_more ? 'true' : 'false', ',',
'auto_actualize_feeds:', $auto_actualize ? 'true' : 'false', ',',
'does_lazyload:', $this->conf->lazyload ? 'true' : 'false', ',',
'sticky_post:', $this->conf->sticky_post ? 'true' : 'false', ',',
'html5_notif_timeout:', $this->conf->html5_notif_timeout, ',',
'does_lazyload:', FreshRSS_Context::$conf->lazyload ? 'true' : 'false', ',',
'sticky_post:', FreshRSS_Context::$conf->sticky_post ? 'true' : 'false', ',',
'html5_notif_timeout:', FreshRSS_Context::$conf->html5_notif_timeout, ',',
'auth_type:"', Minz_Configuration::authType(), '",',
'current_user_mail:', $mail ? ('"' . $mail . '"') : 'null', ',',
'current_view:"', Minz_Request::param('output', 'normal'), '"',

2
app/views/helpers/pagination.phtml
Unescape View File

@ -20,7 +20,7 @@
</a>
<?php } elseif ($markReadUrl) { ?>
<button id="bigMarkAsRead"
class="as-link <?php echo $this->conf->reading_confirm ? 'confirm' : ''; ?>"
class="as-link <?php echo FreshRSS_Context::$conf->reading_confirm ? 'confirm' : ''; ?>"
form="mark-read-pagination"
formaction="<?php echo $markReadUrl; ?>"
type="submit">

6
app/views/helpers/view/global_view.phtml
Unescape View File

@ -4,11 +4,11 @@
<div id="stream" class="global categories">
<?php
$arUrl = array('c' => 'index', 'a' => 'index', 'params' => array());
if ($this->conf->view_mode !== 'normal') {
if (FreshRSS_Context::$conf->view_mode !== 'normal') {
$arUrl['params']['output'] = 'normal';
}
$p = Minz_Request::param('state', '');
if (($p != '') && ($this->conf->default_view !== $p)) {
if (($p != '') && (FreshRSS_Context::$conf->default_view !== $p)) {
$arUrl['params']['state'] = $p;
}
@ -41,7 +41,7 @@
</div>
<div id="overlay"></div>
<div id="panel"<?php echo $this->conf->display_posts ? '' : ' class="hide_posts"'; ?>>
<div id="panel"<?php echo FreshRSS_Context::$conf->display_posts ? '' : ' class="hide_posts"'; ?>>
<a class="close" href="#"><?php echo _i('close'); ?></a>
</div>

30
app/views/helpers/view/normal_view.phtml
Unescape View File

@ -8,24 +8,24 @@ if (!empty($this->entries)) {
$display_yesterday = true;
$display_others = true;
if (FreshRSS_Auth::hasAccess()) {
$sharing = $this->conf->sharing;
$sharing = FreshRSS_Context::$conf->sharing;
} else {
$sharing = array();
}
$hidePosts = !$this->conf->display_posts;
$lazyload = $this->conf->lazyload;
$topline_read = $this->conf->topline_read;
$topline_favorite = $this->conf->topline_favorite;
$topline_date = $this->conf->topline_date;
$topline_link = $this->conf->topline_link;
$bottomline_read = $this->conf->bottomline_read;
$bottomline_favorite = $this->conf->bottomline_favorite;
$bottomline_sharing = $this->conf->bottomline_sharing && (count($sharing));
$bottomline_tags = $this->conf->bottomline_tags;
$bottomline_date = $this->conf->bottomline_date;
$bottomline_link = $this->conf->bottomline_link;
$hidePosts = !FreshRSS_Context::$conf->display_posts;
$lazyload = FreshRSS_Context::$conf->lazyload;
$topline_read = FreshRSS_Context::$conf->topline_read;
$topline_favorite = FreshRSS_Context::$conf->topline_favorite;
$topline_date = FreshRSS_Context::$conf->topline_date;
$topline_link = FreshRSS_Context::$conf->topline_link;
$bottomline_read = FreshRSS_Context::$conf->bottomline_read;
$bottomline_favorite = FreshRSS_Context::$conf->bottomline_favorite;
$bottomline_sharing = FreshRSS_Context::$conf->bottomline_sharing && (count($sharing));
$bottomline_tags = FreshRSS_Context::$conf->bottomline_tags;
$bottomline_date = FreshRSS_Context::$conf->bottomline_date;
$bottomline_link = FreshRSS_Context::$conf->bottomline_link;
$content_width = $this->conf->content_width;
$content_width = FreshRSS_Context::$conf->content_width;
?>
<div id="stream" class="normal<?php echo $hidePosts ? ' hide_posts' : ''; ?>"><?php
@ -140,7 +140,7 @@ if (!empty($this->entries)) {
<li class="dropdown-close"><a href="#close">❌</a></li>
<?php foreach ($sharing as $share) :?>
<li class="item share">
<a target="_blank" href="<?php echo FreshRSS_Share::generateUrl($this->conf->shares, $share, $item->link(), $item->title() . ' . ' . $feed->name())?>">
<a target="_blank" href="<?php echo FreshRSS_Share::generateUrl(FreshRSS_Context::$conf->shares, $share, $item->link(), $item->title() . ' . ' . $feed->name())?>">
<?php echo _t($share['name']);?>
</a>
</li>

4
app/views/helpers/view/reader_view.phtml
Unescape View File

@ -2,8 +2,8 @@
$this->partial('nav_menu');
if (!empty($this->entries)) {
$lazyload = $this->conf->lazyload;
$content_width = $this->conf->content_width;
$lazyload = FreshRSS_Context::$conf->lazyload;
$content_width = FreshRSS_Context::$conf->content_width;
?>
<div id="stream" class="reader">

6
app/views/user/manage.phtml
Unescape View File

@ -10,9 +10,9 @@
<label class="group-name" for="new_user_language"><?php echo _t('language'); ?></label>
<div class="group-controls">
<select name="new_user_language" id="new_user_language">
<?php $languages = $this->conf->availableLanguages(); ?>
<?php $languages = FreshRSS_Context::$conf->availableLanguages(); ?>
<?php foreach ($languages as $short => $lib) { ?>
<option value="<?php echo $short; ?>"<?php echo $this->conf->language === $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option>
<option value="<?php echo $short; ?>"<?php echo FreshRSS_Context::$conf->language === $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option>
<?php } ?>
</select>
</div>
@ -38,7 +38,7 @@
<div class="form-group">
<label class="group-name" for="new_user_email"><?php echo _t('persona_connection_email'); ?></label>
<?php $mail = $this->conf->mail_login; ?>
<?php $mail = FreshRSS_Context::$conf->mail_login; ?>
<div class="group-controls">
<input type="email" id="new_user_email" name="new_user_email" class="extend" autocomplete="off" placeholder="alice@example.net" />
</div>

2
app/views/user/profil.phtml
Unescape View File

@ -42,7 +42,7 @@
<div class="form-group">
<label class="group-name" for="mail_login"><?php echo _t('persona_connection_email'); ?></label>
<?php $mail = $this->conf->mail_login; ?>
<?php $mail = FreshRSS_Context::$conf->mail_login; ?>
<div class="group-controls">
<input type="email" id="mail_login" name="mail_login" class="extend" autocomplete="off" value="<?php echo $mail; ?>" <?php echo FreshRSS_Auth::hasAccess('admin') ? '' : 'disabled="disabled"'; ?> placeholder="alice@example.net" />
<noscript><b><?php echo _t('javascript_should_be_activated'); ?></b></noscript>

Write Preview
Loading…
Cancel
Save