diff --git a/app/controllers/configureController.php b/app/controllers/configureController.php index a380e87c4..40c514b5a 100755 --- a/app/controllers/configureController.php +++ b/app/controllers/configureController.php @@ -44,6 +44,8 @@ class configureController extends ActionController { } $this->view->categories = $catDAO->listCategories (); + + View::prependTitle ('Gestion des catégories - '); } public function feedAction () { @@ -56,18 +58,29 @@ class configureController extends ActionController { if ($id != false) { $this->view->flux = $feedDAO->searchById ($id); - $catDAO = new CategoryDAO (); - $this->view->categories = $catDAO->listCategories (); - - if (Request::isPost () && $this->view->flux) { - $cat = Request::param ('category'); - $values = array ( - 'category' => $cat + if (!$this->view->flux) { + Error::error ( + 404, + array ('error' => array ('La page que vous cherchez n\'existe pas')) ); - $feedDAO->updateFeed ($id, $values); + } else { + $catDAO = new CategoryDAO (); + $this->view->categories = $catDAO->listCategories (); + + if (Request::isPost () && $this->view->flux) { + $cat = Request::param ('category'); + $values = array ( + 'category' => $cat + ); + $feedDAO->updateFeed ($id, $values); - $this->view->flux->_category ($cat); + $this->view->flux->_category ($cat); + } + + View::prependTitle ('Gestion des flux RSS - ' . $this->view->flux->name () . ' - '); } + } else { + View::prependTitle ('Gestion des flux RSS - '); } } @@ -101,6 +114,8 @@ class configureController extends ActionController { Session::_param ('conf', $this->view->conf); Session::_param ('mail', $this->view->conf->mailLogin ()); } + + View::prependTitle ('Gestion générale et affichage - '); } public function importExportAction () { @@ -132,6 +147,8 @@ class configureController extends ActionController { Request::forward (array ('c' => 'feed', 'a' => 'massiveImport')); } } + + View::prependTitle ('Importation et exportation OPML - '); } public function shortcutAction () { @@ -167,5 +184,7 @@ class configureController extends ActionController { $confDAO->update ($values); Session::_param ('conf', $this->view->conf); } + + View::prependTitle ('Gestion des raccourcis - '); } } diff --git a/app/controllers/errorController.php b/app/controllers/errorController.php index 3b6f202ab..092609280 100644 --- a/app/controllers/errorController.php +++ b/app/controllers/errorController.php @@ -2,8 +2,6 @@ class ErrorController extends ActionController { public function indexAction () { - View::prependTitle (Translate::t ('error') . ' - '); - switch (Request::param ('code')) { case 403: $this->view->code = 'Error 403 - Forbidden'; @@ -22,5 +20,7 @@ class ErrorController extends ActionController { } $this->view->logs = Request::param ('logs'); + + View::prependTitle ($this->view->code . ' - '); } } diff --git a/app/controllers/indexController.php b/app/controllers/indexController.php index 6db825ea6..b9e5f4f4a 100755 --- a/app/controllers/indexController.php +++ b/app/controllers/indexController.php @@ -16,8 +16,13 @@ class indexController extends ActionController { // Récupère les flux par catégorie, favoris ou tous if ($get == 'favoris') { $entries = $entryDAO->listFavorites ($mode, $order); + View::prependTitle ('Vos favoris - '); } elseif ($get != false) { $entries = $entryDAO->listByCategory ($get, $mode, $order); + $cat = $catDAO->searchById ($get); + View::prependTitle ($cat->name () . ' - '); + } else { + View::prependTitle ('Vos flux RSS - '); } // Cas où on ne choisie ni catégorie ni les favoris