From 650a04458a8733fb776f39bc7016444725b04dff Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 13 Apr 2013 15:58:18 +0200
Subject: [PATCH] =?UTF-8?q?On=20ne=20r=C3=A9cup=C3=A8re=20plus=20le=20scri?=
 =?UTF-8?q?pt=20persona=20si=20le=20login=20n'est=20pas=20configur=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/App_FrontController.php        | 33 ++++++++++++++++--------------
 app/controllers/feedController.php |  5 +++++
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/app/App_FrontController.php b/app/App_FrontController.php
index b7b060418..5a66ae1dd 100644
--- a/app/App_FrontController.php
+++ b/app/App_FrontController.php
@@ -9,20 +9,20 @@ class App_FrontController extends FrontController {
 	public function init () {
 		$this->loadLibs ();
 		$this->loadModels ();
-		
+
 		Session::init (); // lancement de la session doit se faire après chargement des modèles sinon bug (pourquoi ?)
 		$this->loadParamsView ();
 		$this->loadStylesAndScripts ();
 		$this->loadNotifications ();
 	}
-	
+
 	private function loadLibs () {
 		require (LIB_PATH . '/lib_phpQuery.php');
 		require (LIB_PATH . '/lib_rss.php');
 		require (LIB_PATH . '/SimplePie_autoloader.php');
 		require (LIB_PATH . '/lib_text.php');
 	}
-	
+
 	private function loadModels () {
 		include (APP_PATH . '/models/Exception/FeedException.php');
 		include (APP_PATH . '/models/RSSConfiguration.php');
@@ -31,22 +31,25 @@ class App_FrontController extends FrontController {
 		include (APP_PATH . '/models/Feed.php');
 		include (APP_PATH . '/models/Entry.php');
 	}
-	
-	private function loadStylesAndScripts () {
-		View::appendStyle (Url::display ('/theme/global.css'));
-		View::appendStyle (Url::display ('/theme/freshrss.css'));
-		View::appendScript ('https://login.persona.org/include.js');
-		View::appendScript (Url::display ('/scripts/jquery.js'));
-		View::appendScript (Url::display ('/scripts/notification.js'));
-	}
-	
+
 	private function loadParamsView () {
-		View::_param ('conf', Session::param ('conf', new RSSConfiguration ()));
-		
+		$this->conf = Session::param ('conf', new RSSConfiguration ());
+		View::_param ('conf', $this->conf);
+
 		$entryDAO = new EntryDAO ();
 		View::_param ('nb_not_read', $entryDAO->countNotRead ());
 	}
-	
+
+	private function loadStylesAndScripts () {
+		View::appendStyle (Url::display ('/theme/global.css'));
+		View::appendStyle (Url::display ('/theme/freshrss.css'));
+		if (login_is_conf ($this->conf)) {
+			View::appendScript ('https://login.persona.org/include.js');
+		}
+		View::appendScript (Url::display ('/scripts/jquery.js'));
+		View::appendScript (Url::display ('/scripts/notification.js'));
+	}
+
 	private function loadNotifications () {
 		$notif = Session::param ('notification');
 		if ($notif) {
diff --git a/app/controllers/feedController.php b/app/controllers/feedController.php
index 83fc19e20..73921e215 100755
--- a/app/controllers/feedController.php
+++ b/app/controllers/feedController.php
@@ -161,6 +161,11 @@ class feedController extends ActionController {
 			Session::_param ('notification', $notif);
 			Request::forward (array (), true);
 		} else {
+			$notif = array (
+				'type' => 'good',
+				'content' => 'Les flux ont été mis à jour'
+			);
+			Session::_param ('notification', $notif);
 			$this->view->_useLayout (false);
 		}
 	}