Use FreshRSS_Context::$conf only

- Replace $this->view->conf in controllers
- Replace $this->conf in views

9 files changed, 81 insertions, 81 deletions

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index d4b65d849..4af39cb71 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -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');
diff --git a/app/Controllers/categoryController.php b/app/Controllers/categoryController.php
index 537a2b210..977ce51be 100644
--- a/app/Controllers/categoryController.php
+++ b/app/Controllers/categoryController.php
@@ -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 {
diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index fb8c1466e..8a9dcdc62 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -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'));
diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php
index a1dfacb4d..449029648 100755
--- a/app/Controllers/entryController.php
+++ b/app/Controllers/entryController.php
@@ -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) {
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 2a7238eaf..c2859edf4 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -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 {
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index aaac1b68b..ab277e688 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -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;
 		}
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 5b490e672..f994e257c 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -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);
diff --git a/app/Controllers/javascriptController.php b/app/Controllers/javascriptController.php
index 14e6f36de..62f413989 100755
--- a/app/Controllers/javascriptController.php
+++ b/app/Controllers/javascriptController.php
@@ -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() {
diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index d5c90a382..61d33437d 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -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');