summaryrefslogtreecommitdiff
path: root/app/Controllers/configureController.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-12-25 17:37:52 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-12-25 17:37:52 +0100
commit06d4b8d10247146d9c6f7c78ff9fc584438dd8fe (patch)
treec85a0f839df94ef77a168ce0865586e9f03372af /app/Controllers/configureController.php
parenta4b890b67fb4d97c97a2b1b455c327ce4b905194 (diff)
Option globale pour la taille minimale de l'historique par défaut
Plus une réorganisation des options
Diffstat (limited to 'app/Controllers/configureController.php')
-rwxr-xr-xapp/Controllers/configureController.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index b83501f0b..762134dd0 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -97,7 +97,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
$description = sanitizeHTML(Minz_Request::param('description', '', true));
$website = Minz_Request::param('website', '');
$url = Minz_Request::param('url', '');
- $keep_history = intval(Minz_Request::param ('keep_history', 0));
+ $keep_history = intval(Minz_Request::param ('keep_history', -2));
$cat = Minz_Request::param ('category', 0);
$path = Minz_Request::param ('path_entries', '');
$priority = Minz_Request::param ('priority', 0);
@@ -160,6 +160,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
$lazyload = Minz_Request::param ('lazyload', 'no');
$sort = Minz_Request::param ('sort_order', 'DESC');
$old = Minz_Request::param ('old_entries', 3);
+ $keepHistoryDefault = Minz_Request::param('keep_history_default', 0);
$mail = Minz_Request::param ('mail_login', false);
$anon = Minz_Request::param ('anon_access', 'no');
$token = Minz_Request::param ('token', $current_token);
@@ -189,6 +190,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
$this->view->conf->_lazyload ($lazyload);
$this->view->conf->_sortOrder ($sort);
$this->view->conf->_oldEntries ($old);
+ $this->view->conf->_keepHistoryDefault($keepHistoryDefault);
$this->view->conf->_mailLogin ($mail);
$this->view->conf->_anonAccess ($anon);
$this->view->conf->_token ($token);
@@ -221,6 +223,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
'lazyload' => $this->view->conf->lazyload (),
'sort_order' => $this->view->conf->sortOrder (),
'old_entries' => $this->view->conf->oldEntries (),
+ 'keep_history_default' => $this->view->conf->keepHistoryDefault(),
'mail_login' => $this->view->conf->mailLogin (),
'anon_access' => $this->view->conf->anonAccess (),
'token' => $this->view->conf->token (),