mirror/FreshRSS
0
0 Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-10-20 10:14:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

On ne récupère plus le script persona si le login n'est pas configuré

Browse Source
This commit is contained in:
Marien Fressinaud committed 2013-04-13 15:58:18 +02:00
1 parent 9b9543109e
commit 650a04458a
2 files changed
+23 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/App_FrontController.php
+18 -15
View File
@@ -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) {
app/controllers/feedController.php
+5
View File
@@ -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);
}
}