From 7cca47d1ab5838f5440b1a1e08fa4c0d43989664 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 5 Jan 2015 22:43:15 +0100
Subject: Change name of user configuration var in Context

- FreshRSS_Context::$conf is replaced by FreshRSS_Context::$user_conf
- Introduce FreshRSS_Context::$system_conf
- Remove FreshRSS_Configuration object

See https://github.com/FreshRSS/FreshRSS/issues/730
---
 app/views/index/global.phtml |  4 ++--
 app/views/index/normal.phtml | 32 ++++++++++++++++----------------
 app/views/index/reader.phtml |  4 ++--
 3 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'app/views/index')

diff --git a/app/views/index/global.phtml b/app/views/index/global.phtml
index ae7f5ffbc..cf95bd0f5 100644
--- a/app/views/index/global.phtml
+++ b/app/views/index/global.phtml
@@ -2,7 +2,7 @@
 	$this->partial('nav_menu');
 
 	$class = '';
-	if (FreshRSS_Context::$conf->hide_read_feeds &&
+	if (FreshRSS_Context::$user_conf->hide_read_feeds &&
 			FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ) &&
 			!FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_READ)) {
 		$class = ' state_unread';
@@ -50,5 +50,5 @@
 <div id="overlay">
 	<a class="close" href="#"><?php echo _i('close'); ?></a>
 </div>
-<div id="panel"<?php echo FreshRSS_Context::$conf->display_posts ? '' : ' class="hide_posts"'; ?>>
+<div id="panel"<?php echo FreshRSS_Context::$user_conf->display_posts ? '' : ' class="hide_posts"'; ?>>
 </div>
diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml
index b8a78cc3d..c2cf7c887 100644
--- a/app/views/index/normal.phtml
+++ b/app/views/index/normal.phtml
@@ -8,24 +8,24 @@ if (!empty($this->entries)) {
 	$display_yesterday = true;
 	$display_others = true;
 	if (FreshRSS_Auth::hasAccess()) {
-		$sharing = FreshRSS_Context::$conf->sharing;
+		$sharing = FreshRSS_Context::$user_conf->sharing;
 	} else {
 		$sharing = array();
 	}
-	$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;
+	$hidePosts = !FreshRSS_Context::$user_conf->display_posts;
+	$lazyload = FreshRSS_Context::$user_conf->lazyload;
+	$topline_read = FreshRSS_Context::$user_conf->topline_read;
+	$topline_favorite = FreshRSS_Context::$user_conf->topline_favorite;
+	$topline_date = FreshRSS_Context::$user_conf->topline_date;
+	$topline_link = FreshRSS_Context::$user_conf->topline_link;
+	$bottomline_read = FreshRSS_Context::$user_conf->bottomline_read;
+	$bottomline_favorite = FreshRSS_Context::$user_conf->bottomline_favorite;
+	$bottomline_sharing = FreshRSS_Context::$user_conf->bottomline_sharing && (count($sharing));
+	$bottomline_tags = FreshRSS_Context::$user_conf->bottomline_tags;
+	$bottomline_date = FreshRSS_Context::$user_conf->bottomline_date;
+	$bottomline_link = FreshRSS_Context::$user_conf->bottomline_link;
 
-	$content_width = FreshRSS_Context::$conf->content_width;
+	$content_width = FreshRSS_Context::$user_conf->content_width;
 
 	$today = @strtotime('today');
 ?>
@@ -142,11 +142,11 @@ if (!empty($this->entries)) {
 							<li class="dropdown-close"><a href="#close">❌</a></li>
 							<?php
 								foreach ($sharing as $share) {
-									$type_share = FreshRSS_Context::$conf->shares[$share['type']];
+									$type_share = FreshRSS_Context::$user_conf->shares[$share['type']];
 									$has_specific_title = ($type_share['form'] === 'advanced');
 							?>
 								<li class="item share">
-									<a target="_blank" href="<?php echo FreshRSS_Share::generateUrl(FreshRSS_Context::$conf->shares, $share, $item->link(), $item->title() . ' . ' . $feed->name())?>">
+									<a target="_blank" href="<?php echo FreshRSS_Share::generateUrl(FreshRSS_Context::$user_conf->shares, $share, $item->link(), $item->title() . ' . ' . $feed->name())?>">
 										<?php echo $has_specific_title ? $share['name'] : _t('index.share.' . $share['name']); ?>
 									</a>
 								</li>
diff --git a/app/views/index/reader.phtml b/app/views/index/reader.phtml
index 1eab86dd2..017297710 100644
--- a/app/views/index/reader.phtml
+++ b/app/views/index/reader.phtml
@@ -2,8 +2,8 @@
 $this->partial('nav_menu');
 
 if (!empty($this->entries)) {
-	$lazyload = FreshRSS_Context::$conf->lazyload;
-	$content_width = FreshRSS_Context::$conf->content_width;
+	$lazyload = FreshRSS_Context::$user_conf->lazyload;
+	$content_width = FreshRSS_Context::$user_conf->content_width;
 ?>
 
 <div id="stream" class="reader">
-- 
cgit v1.2.3