diff options
| author |  Patrick Crandol <patrick@crandol.com>
| 2018-11-18 13:34:41 -0500 |
|---|---|---|
| committer |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2018-11-18 19:34:41 +0100 |
| commit | ebb9ee0873333c111546412ad08bf5207529f24a (patch) | |
| tree | 67387066bb14df60973d43a811c51055b09ad7c9 /app/Models | |
| parent | e20c7ef1b020df492923ca9a445fb8fa172a11dd (diff) | |
Edit cookie_duration from GUI (#2137)
* Use cookie_duration correctly
* WIP allow cookie_duration to be modified from GUI
* Allow cookie_duration to actually be updated
* Update view to properly display cookie_duration
* Add new strings in Translation Files
* Fix typo
* Fix trailing whitespace
* I18n: French translation
* I18n fr: Forgot todo
Diffstat (limited to 'app/Models')
| -rw-r--r-- | app/Models/Auth.php | 11 | ||||
| -rw-r--r-- | app/Models/ConfigurationSetter.php | 3 |
2 files changed, 9 insertions, 5 deletions
diff --git a/app/Models/Auth.php b/app/Models/Auth.php index 8c711308c..d1e26b8e8 100644 --- a/app/Models/Auth.php +++ b/app/Models/Auth.php @@ -233,9 +233,10 @@ class FreshRSS_FormAuth { $token_file = DATA_PATH . '/tokens/' . $token . '.txt'; $mtime = @filemtime($token_file); - if ($mtime + 2629744 < time()) { - // Token has expired (> 1 month) or does not exist. - // TODO: 1 month -> use a configuration instead + $limits = $conf->limits; + $cookie_duration = empty($limits['cookie_duration']) ? 2592000 : $limits['cookie_duration']; + if ($mtime + $cookie_duration < time()) { + // Token has expired (> cookie_duration) or does not exist. @unlink($token_file); return array(); } @@ -256,7 +257,7 @@ class FreshRSS_FormAuth { } $limits = $conf->limits; - $cookie_duration = empty($limits['cookie_duration']) ? 2629744 : $limits['cookie_duration']; + $cookie_duration = empty($limits['cookie_duration']) ? 2592000 : $limits['cookie_duration']; $expire = time() + $cookie_duration; Minz_Session::setLongTermCookie('FreshRSS_login', $token, $expire); return $token; @@ -277,7 +278,7 @@ class FreshRSS_FormAuth { public static function purgeTokens() { $conf = Minz_Configuration::get('system'); $limits = $conf->limits; - $cookie_duration = empty($limits['cookie_duration']) ? 2629744 : $limits['cookie_duration']; + $cookie_duration = empty($limits['cookie_duration']) ? 2592000 : $limits['cookie_duration']; $oldest = time() - $cookie_duration; foreach (new DirectoryIterator(DATA_PATH . '/tokens/') as $file_info) { // $extension = $file_info->getExtension(); doesn't work in PHP < 5.3.7 diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php index ad703dfc5..ec6380df4 100644 --- a/app/Models/ConfigurationSetter.php +++ b/app/Models/ConfigurationSetter.php @@ -335,6 +335,9 @@ class FreshRSS_ConfigurationSetter { private function _limits(&$data, $values) { $max_small_int = 16384; $limits_keys = array( + 'cookie_duration' => array( + 'min' => 0, + ), 'cache_duration' => array( 'min' => 0, ), |