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

Fix setters on $user_conf

Browse Source 
Old setters does not exist anymore, remove them.

See https://github.com/FreshRSS/FreshRSS/issues/730
pull/749/head
Marien Fressinaud 10 years ago
parent dd41642ce6
commit eff804572f
3 changed files with 41 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app/Controllers/authController.php
  2. 77
      app/Controllers/configureController.php
  3. 6
      app/Controllers/userController.php

2
app/Controllers/authController.php
Unescape View File

@ -29,7 +29,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
$current_token = FreshRSS_Context::$user_conf->token; $current_token = FreshRSS_Context::$user_conf->token;
$token = Minz_Request::param('token', $current_token); $token = Minz_Request::param('token', $current_token);
FreshRSS_Context::$user_conf->_token($token); FreshRSS_Context::$user_conf->token = $token;
$ok &= FreshRSS_Context::$user_conf->save(); $ok &= FreshRSS_Context::$user_conf->save();
$anon = Minz_Request::param('anon_access', false); $anon = Minz_Request::param('anon_access', false);

77
app/Controllers/configureController.php
Unescape View File

@ -41,24 +41,24 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
*/ */
public function displayAction() { public function displayAction() {
if (Minz_Request::isPost()) { if (Minz_Request::isPost()) {
FreshRSS_Context::$user_conf->_language(Minz_Request::param('language', 'en')); FreshRSS_Context::$user_conf->language = Minz_Request::param('language', 'en');
FreshRSS_Context::$user_conf->_theme(Minz_Request::param('theme', FreshRSS_Themes::$defaultTheme)); FreshRSS_Context::$user_conf->theme = Minz_Request::param('theme', FreshRSS_Themes::$defaultTheme);
FreshRSS_Context::$user_conf->_content_width(Minz_Request::param('content_width', 'thin')); FreshRSS_Context::$user_conf->content_width = Minz_Request::param('content_width', 'thin');
FreshRSS_Context::$user_conf->_topline_read(Minz_Request::param('topline_read', false)); FreshRSS_Context::$user_conf->topline_read = Minz_Request::param('topline_read', false);
FreshRSS_Context::$user_conf->_topline_favorite(Minz_Request::param('topline_favorite', false)); FreshRSS_Context::$user_conf->topline_favorite = Minz_Request::param('topline_favorite', false);
FreshRSS_Context::$user_conf->_topline_date(Minz_Request::param('topline_date', false)); FreshRSS_Context::$user_conf->topline_date = Minz_Request::param('topline_date', false);
FreshRSS_Context::$user_conf->_topline_link(Minz_Request::param('topline_link', false)); FreshRSS_Context::$user_conf->topline_link = Minz_Request::param('topline_link', false);
FreshRSS_Context::$user_conf->_bottomline_read(Minz_Request::param('bottomline_read', false)); FreshRSS_Context::$user_conf->bottomline_read = Minz_Request::param('bottomline_read', false);
FreshRSS_Context::$user_conf->_bottomline_favorite(Minz_Request::param('bottomline_favorite', false)); FreshRSS_Context::$user_conf->bottomline_favorite = Minz_Request::param('bottomline_favorite', false);
FreshRSS_Context::$user_conf->_bottomline_sharing(Minz_Request::param('bottomline_sharing', false)); FreshRSS_Context::$user_conf->bottomline_sharing = Minz_Request::param('bottomline_sharing', false);
FreshRSS_Context::$user_conf->_bottomline_tags(Minz_Request::param('bottomline_tags', false)); FreshRSS_Context::$user_conf->bottomline_tags = Minz_Request::param('bottomline_tags', false);
FreshRSS_Context::$user_conf->_bottomline_date(Minz_Request::param('bottomline_date', false)); FreshRSS_Context::$user_conf->bottomline_date = Minz_Request::param('bottomline_date', false);
FreshRSS_Context::$user_conf->_bottomline_link(Minz_Request::param('bottomline_link', false)); FreshRSS_Context::$user_conf->bottomline_link = Minz_Request::param('bottomline_link', false);
FreshRSS_Context::$user_conf->_html5_notif_timeout(Minz_Request::param('html5_notif_timeout', 0)); FreshRSS_Context::$user_conf->html5_notif_timeout = Minz_Request::param('html5_notif_timeout', 0);
FreshRSS_Context::$user_conf->save(); FreshRSS_Context::$user_conf->save();
Minz_Session::_param('language', FreshRSS_Context::$user_conf->language); Minz_Session::_param('language', FreshRSS_Context::$user_conf->language);
Minz_Translate::reset(); Minz_Translate::reset(FreshRSS_Context::$user_conf->language);
invalidateHttpCache(); invalidateHttpCache();
Minz_Request::good(_t('feedback.conf.updated'), Minz_Request::good(_t('feedback.conf.updated'),
@ -100,29 +100,26 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
*/ */
public function readingAction() { public function readingAction() {
if (Minz_Request::isPost()) { if (Minz_Request::isPost()) {
FreshRSS_Context::$user_conf->_posts_per_page(Minz_Request::param('posts_per_page', 10)); FreshRSS_Context::$user_conf->posts_per_page = Minz_Request::param('posts_per_page', 10);
FreshRSS_Context::$user_conf->_view_mode(Minz_Request::param('view_mode', 'normal')); FreshRSS_Context::$user_conf->view_mode = Minz_Request::param('view_mode', 'normal');
FreshRSS_Context::$user_conf->_default_view(Minz_Request::param('default_view', 'adaptive')); FreshRSS_Context::$user_conf->default_view = Minz_Request::param('default_view', 'adaptive');
FreshRSS_Context::$user_conf->_auto_load_more(Minz_Request::param('auto_load_more', false)); FreshRSS_Context::$user_conf->auto_load_more = Minz_Request::param('auto_load_more', false);
FreshRSS_Context::$user_conf->_display_posts(Minz_Request::param('display_posts', false)); FreshRSS_Context::$user_conf->display_posts = Minz_Request::param('display_posts', false);
FreshRSS_Context::$user_conf->_display_categories(Minz_Request::param('display_categories', false)); FreshRSS_Context::$user_conf->display_categories = Minz_Request::param('display_categories', false);
FreshRSS_Context::$user_conf->_hide_read_feeds(Minz_Request::param('hide_read_feeds', false)); FreshRSS_Context::$user_conf->hide_read_feeds = Minz_Request::param('hide_read_feeds', false);
FreshRSS_Context::$user_conf->_onread_jump_next(Minz_Request::param('onread_jump_next', false)); FreshRSS_Context::$user_conf->onread_jump_next = Minz_Request::param('onread_jump_next', false);
FreshRSS_Context::$user_conf->_lazyload(Minz_Request::param('lazyload', false)); FreshRSS_Context::$user_conf->lazyload = Minz_Request::param('lazyload', false);
FreshRSS_Context::$user_conf->_sticky_post(Minz_Request::param('sticky_post', false)); FreshRSS_Context::$user_conf->sticky_post = Minz_Request::param('sticky_post', false);
FreshRSS_Context::$user_conf->_reading_confirm(Minz_Request::param('reading_confirm', false)); FreshRSS_Context::$user_conf->reading_confirm = Minz_Request::param('reading_confirm', false);
FreshRSS_Context::$user_conf->_auto_remove_article(Minz_Request::param('auto_remove_article', false)); FreshRSS_Context::$user_conf->auto_remove_article = Minz_Request::param('auto_remove_article', false);
FreshRSS_Context::$user_conf->_sort_order(Minz_Request::param('sort_order', 'DESC')); FreshRSS_Context::$user_conf->sort_order = Minz_Request::param('sort_order', 'DESC');
FreshRSS_Context::$user_conf->_mark_when(array( FreshRSS_Context::$user_conf->mark_when = array(
'article' => Minz_Request::param('mark_open_article', false), 'article' => Minz_Request::param('mark_open_article', false),
'site' => Minz_Request::param('mark_open_site', false), 'site' => Minz_Request::param('mark_open_site', false),
'scroll' => Minz_Request::param('mark_scroll', false), 'scroll' => Minz_Request::param('mark_scroll', false),
'reception' => Minz_Request::param('mark_upon_reception', false), 'reception' => Minz_Request::param('mark_upon_reception', false),
)); );
FreshRSS_Context::$user_conf->save(); FreshRSS_Context::$user_conf->save();
Minz_Session::_param('language', FreshRSS_Context::$user_conf->language);
Minz_Translate::reset();
invalidateHttpCache(); invalidateHttpCache();
Minz_Request::good(_t('feedback.conf.updated'), Minz_Request::good(_t('feedback.conf.updated'),
@ -142,7 +139,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
public function sharingAction() { public function sharingAction() {
if (Minz_Request::isPost()) { if (Minz_Request::isPost()) {
$params = Minz_Request::params(); $params = Minz_Request::params();
FreshRSS_Context::$user_conf->_sharing($params['share']); FreshRSS_Context::$user_conf->sharing = $params['share'];
FreshRSS_Context::$user_conf->save(); FreshRSS_Context::$user_conf->save();
invalidateHttpCache(); invalidateHttpCache();
@ -184,7 +181,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
} }
} }
FreshRSS_Context::$user_conf->_shortcuts($shortcuts_ok); FreshRSS_Context::$user_conf->shortcuts = $shortcuts_ok;
FreshRSS_Context::$user_conf->save(); FreshRSS_Context::$user_conf->save();
invalidateHttpCache(); invalidateHttpCache();
@ -212,9 +209,9 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
*/ */
public function archivingAction() { public function archivingAction() {
if (Minz_Request::isPost()) { if (Minz_Request::isPost()) {
FreshRSS_Context::$user_conf->_old_entries(Minz_Request::param('old_entries', 3)); FreshRSS_Context::$user_conf->old_entries = Minz_Request::param('old_entries', 3);
FreshRSS_Context::$user_conf->_keep_history_default(Minz_Request::param('keep_history_default', 0)); FreshRSS_Context::$user_conf->keep_history_default = Minz_Request::param('keep_history_default', 0);
FreshRSS_Context::$user_conf->_ttl_default(Minz_Request::param('ttl_default', -2)); FreshRSS_Context::$user_conf->ttl_default = Minz_Request::param('ttl_default', -2);
FreshRSS_Context::$user_conf->save(); FreshRSS_Context::$user_conf->save();
invalidateHttpCache(); invalidateHttpCache();
@ -252,7 +249,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
$query['name'] = _t('conf.query.number', $key + 1); $query['name'] = _t('conf.query.number', $key + 1);
} }
} }
FreshRSS_Context::$user_conf->_queries($queries); FreshRSS_Context::$user_conf->queries = $queries;
FreshRSS_Context::$user_conf->save(); FreshRSS_Context::$user_conf->save();
Minz_Request::good(_t('feedback.conf.updated'), Minz_Request::good(_t('feedback.conf.updated'),
@ -338,7 +335,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
} }
} }
$queries[] = $query; $queries[] = $query;
FreshRSS_Context::$user_conf->_queries($queries); FreshRSS_Context::$user_conf->queries = $queries;
FreshRSS_Context::$user_conf->save(); FreshRSS_Context::$user_conf->save();
Minz_Request::good(_t('feedback.conf.query_created', $query['name']), Minz_Request::good(_t('feedback.conf.query_created', $query['name']),

6
app/Controllers/userController.php
Unescape View File

@ -39,7 +39,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
$passwordPlain = ''; $passwordPlain = '';
$passwordHash = preg_replace('/^\$2[xy]\$/', '\$2a\$', $passwordHash); //Compatibility with bcrypt.js $passwordHash = preg_replace('/^\$2[xy]\$/', '\$2a\$', $passwordHash); //Compatibility with bcrypt.js
$ok &= ($passwordHash != ''); $ok &= ($passwordHash != '');
FreshRSS_Context::$user_conf->_passwordHash($passwordHash); FreshRSS_Context::$user_conf->passwordHash = $passwordHash;
} }
Minz_Session::_param('passwordHash', FreshRSS_Context::$user_conf->passwordHash); Minz_Session::_param('passwordHash', FreshRSS_Context::$user_conf->passwordHash);
@ -52,12 +52,12 @@ class FreshRSS_user_Controller extends Minz_ActionController {
$passwordPlain = ''; $passwordPlain = '';
$passwordHash = preg_replace('/^\$2[xy]\$/', '\$2a\$', $passwordHash); //Compatibility with bcrypt.js $passwordHash = preg_replace('/^\$2[xy]\$/', '\$2a\$', $passwordHash); //Compatibility with bcrypt.js
$ok &= ($passwordHash != ''); $ok &= ($passwordHash != '');
FreshRSS_Context::$user_conf->_apiPasswordHash($passwordHash); FreshRSS_Context::$user_conf->apiPasswordHash = $passwordHash;
} }
// TODO: why do we need of hasAccess here? // TODO: why do we need of hasAccess here?
if (FreshRSS_Auth::hasAccess('admin')) { if (FreshRSS_Auth::hasAccess('admin')) {
FreshRSS_Context::$user_conf->_mail_login(Minz_Request::param('mail_login', '', true)); FreshRSS_Context::$user_conf->mail_login = Minz_Request::param('mail_login', '', true);
} }
$email = FreshRSS_Context::$user_conf->mail_login; $email = FreshRSS_Context::$user_conf->mail_login;
Minz_Session::_param('mail', $email); Minz_Session::_param('mail', $email);

Write Preview
Loading…
Cancel
Save