summaryrefslogtreecommitdiff
path: root/app/controllers/configureController.php
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers/configureController.php')
-rwxr-xr-xapp/controllers/configureController.php64
1 files changed, 47 insertions, 17 deletions
diff --git a/app/controllers/configureController.php b/app/controllers/configureController.php
index 243c155f9..2f56da177 100755
--- a/app/controllers/configureController.php
+++ b/app/controllers/configureController.php
@@ -5,14 +5,17 @@ class configureController extends ActionController {
if (login_is_conf ($this->view->conf) && !is_logged ()) {
Error::error (
403,
- array ('error' => array ('Vous n\'avez pas le droit d\'accéder à cette page'))
+ array ('error' => array (Translate::t ('access_denied')))
);
}
}
public function categorizeAction () {
+ $feedDAO = new FeedDAO ();
$catDAO = new CategoryDAO ();
$catDAO->checkDefault ();
+ $defaultCategory = $catDAO->getDefault ();
+ $defaultId = $defaultCategory->id ();
if (Request::isPost ()) {
$cats = Request::param ('categories', array ());
@@ -27,7 +30,8 @@ class configureController extends ActionController {
'color' => $cat->color ()
);
$catDAO->updateCategory ($ids[$key], $values);
- } elseif ($ids[$key] != '000000') {
+ } elseif ($ids[$key] != $defaultId) {
+ $feedDAO->changeCategory ($ids[$key], $defaultId);
$catDAO->deleteCategory ($ids[$key]);
}
}
@@ -48,7 +52,7 @@ class configureController extends ActionController {
// notif
$notif = array (
'type' => 'good',
- 'content' => 'Les catégories ont été mises à jour'
+ 'content' => Translate::t ('categories_updated')
);
Session::_param ('notification', $notif);
@@ -56,8 +60,9 @@ class configureController extends ActionController {
}
$this->view->categories = $catDAO->listCategories ();
+ $this->view->defaultCategory = $catDAO->getDefault ();
- View::prependTitle ('Gestion des catégories - ');
+ View::prependTitle (Translate::t ('categories_management') . ' - ');
}
public function feedAction () {
@@ -79,7 +84,7 @@ class configureController extends ActionController {
if (!$this->view->flux) {
Error::error (
404,
- array ('error' => array ('La page que vous cherchez n\'existe pas'))
+ array ('error' => array (Translate::t ('page_not_found')))
);
} else {
$catDAO = new CategoryDAO ();
@@ -88,10 +93,20 @@ class configureController extends ActionController {
if (Request::isPost () && $this->view->flux) {
$cat = Request::param ('category', 0);
$path = Request::param ('path_entries', '');
+ $priority = Request::param ('priority', 0);
+ $user = Request::param ('http_user', '');
+ $pass = Request::param ('http_pass', '');
+
+ $httpAuth = '';
+ if ($user != '' || $pass != '') {
+ $httpAuth = $user . ':' . $pass;
+ }
$values = array (
'category' => $cat,
- 'pathEntries' => $path
+ 'pathEntries' => $path,
+ 'priority' => $priority,
+ 'httpAuth' => $httpAuth
);
if ($feedDAO->updateFeed ($id, $values)) {
@@ -99,12 +114,12 @@ class configureController extends ActionController {
$notif = array (
'type' => 'good',
- 'content' => 'Le flux a été mis à jour'
+ 'content' => Translate::t ('feed_updated')
);
} else {
$notif = array (
'type' => 'bad',
- 'content' => 'Une erreur est survenue lors de la mise à jour'
+ 'content' => Translate::t ('error_occurred_update')
);
}
@@ -112,15 +127,16 @@ class configureController extends ActionController {
Request::forward (array ('c' => 'configure', 'a' => 'feed', 'params' => array ('id' => $id)), true);
}
- View::prependTitle ('Gestion des flux RSS - ' . $this->view->flux->name () . ' - ');
+ View::prependTitle (Translate::t ('rss_feed_management') . ' - ' . $this->view->flux->name () . ' - ');
}
} else {
- View::prependTitle ('Gestion des flux RSS - ');
+ View::prependTitle (Translate::t ('rss_feed_management') . ' - ');
}
}
public function displayAction () {
if (Request::isPost ()) {
+ $language = Request::param ('language', 'en');
$nb = Request::param ('posts_per_page', 10);
$view = Request::param ('default_view', 'all');
$display = Request::param ('display_posts', 'no');
@@ -130,7 +146,9 @@ class configureController extends ActionController {
$openArticle = Request::param ('mark_open_article', 'no');
$openSite = Request::param ('mark_open_site', 'no');
$openPage = Request::param ('mark_open_page', 'no');
+ $urlShaarli = Request::param ('shaarli', '');
+ $this->view->conf->_language ($language);
$this->view->conf->_postsPerPage (intval ($nb));
$this->view->conf->_defaultView ($view);
$this->view->conf->_displayPosts ($display);
@@ -142,8 +160,10 @@ class configureController extends ActionController {
'site' => $openSite,
'page' => $openPage,
));
+ $this->view->conf->_urlShaarli ($urlShaarli);
$values = array (
+ 'language' => $this->view->conf->language (),
'posts_per_page' => $this->view->conf->postsPerPage (),
'default_view' => $this->view->conf->defaultView (),
'display_posts' => $this->view->conf->displayPosts (),
@@ -151,6 +171,7 @@ class configureController extends ActionController {
'old_entries' => $this->view->conf->oldEntries (),
'mail_login' => $this->view->conf->mailLogin (),
'mark_when' => $this->view->conf->markWhen (),
+ 'url_shaarli' => $this->view->conf->urlShaarli (),
);
$confDAO = new RSSConfigurationDAO ();
@@ -158,27 +179,31 @@ class configureController extends ActionController {
Session::_param ('conf', $this->view->conf);
Session::_param ('mail', $this->view->conf->mailLogin ());
+ Session::_param ('language', $this->view->conf->language ());
+ Translate::reset ();
+
// notif
$notif = array (
'type' => 'good',
- 'content' => 'La configuration a été mise à jour'
+ 'content' => Translate::t ('configuration_updated')
);
Session::_param ('notification', $notif);
Request::forward (array ('c' => 'configure', 'a' => 'display'), true);
}
- View::prependTitle ('Gestion générale et affichage - ');
+ View::prependTitle (Translate::t ('general_and_reading_management') . ' - ');
}
public function importExportAction () {
$this->view->req = Request::param ('q');
if ($this->view->req == 'export') {
- View::_title ('feeds_opml.xml');
+ View::_title ('freshrss_feeds.opml');
$this->view->_useLayout (false);
- header('Content-type: text/xml');
+ header('Content-Type: text/xml; charset=utf-8');
+ header('Content-disposition: attachment; filename=freshrss_feeds.opml');
$feedDAO = new FeedDAO ();
$catDAO = new CategoryDAO ();
@@ -192,8 +217,11 @@ class configureController extends ActionController {
$this->view->categories = $list;
} elseif ($this->view->req == 'import' && Request::isPost ()) {
if ($_FILES['file']['error'] == 0) {
+ // on parse le fichier OPML pour récupérer les catégories et les flux associés
list ($categories, $feeds) = opml_import (file_get_contents ($_FILES['file']['tmp_name']));
+ // On redirige vers le controller feed qui va se charger d'insérer les flux en BDD
+ // les flux sont mis au préalable dans des variables de Request
Request::_param ('q', 'null');
Request::_param ('categories', $categories);
Request::_param ('feeds', $feeds);
@@ -203,9 +231,11 @@ class configureController extends ActionController {
$feedDAO = new FeedDAO ();
$this->view->feeds = $feedDAO->listFeeds ();
+
+ // au niveau de la vue, permet de ne pas voir un flux sélectionné dans la liste
$this->view->flux = false;
- View::prependTitle ('Importation et exportation OPML - ');
+ View::prependTitle (Translate::t ('import_export_opml') . ' - ');
}
public function shortcutAction () {
@@ -244,13 +274,13 @@ class configureController extends ActionController {
// notif
$notif = array (
'type' => 'good',
- 'content' => 'Les raccourcis ont été mis à jour'
+ 'content' => Translate::t ('shortcuts_updated')
);
Session::_param ('notification', $notif);
Request::forward (array ('c' => 'configure', 'a' => 'shortcut'), true);
}
- View::prependTitle ('Gestion des raccourcis - ');
+ View::prependTitle (Translate::t ('shortcuts_management') . ' - ');
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2026-02-10 09:03:53 +0000