diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-12-24 17:32:11 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2016-12-24 17:32:11 +0100 |
| commit | 02ac8d563db25aea8f7ec983b67061129536d457 (patch) | |
| tree | a6756b29a7d9cf92221d2cd737a5a06db95bb110 /app/Models/Auth.php | |
| parent | 7ae60ff0cc577997b9b754966a0f52649077b744 (diff) | |
| parent | e99a6b815290da614fe39658b6c76de8a9d16641 (diff) | |
Merge pull request #1397 from Alkarex/cookieDuration
Option for cookie duration
Diffstat (limited to 'app/Models/Auth.php')
| -rw-r--r-- | app/Models/Auth.php | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/app/Models/Auth.php b/app/Models/Auth.php index 3313fdf3f..042210eaf 100644 --- a/app/Models/Auth.php +++ b/app/Models/Auth.php @@ -219,8 +219,8 @@ class FreshRSS_FormAuth { } public static function makeCookie($username, $password_hash) { + $conf = Minz_Configuration::get('system'); do { - $conf = Minz_Configuration::get('system'); $token = sha1($conf->salt . $username . uniqid(mt_rand(), true)); $token_file = DATA_PATH . '/tokens/' . $token . '.txt'; } while (file_exists($token_file)); @@ -229,7 +229,9 @@ class FreshRSS_FormAuth { return false; } - $expire = time() + 2629744; //1 month //TODO: Use a configuration instead + $limits = $conf->limits; + $cookie_duration = empty($limits['cookie_duration']) ? 2629744 : $limits['cookie_duration']; + $expire = time() + $cookie_duration; Minz_Session::setLongTermCookie('FreshRSS_login', $token, $expire); return $token; } @@ -247,7 +249,10 @@ class FreshRSS_FormAuth { } public static function purgeTokens() { - $oldest = time() - 2629744; // 1 month // TODO: Use a configuration instead + $conf = Minz_Configuration::get('system'); + $limits = $conf->limits; + $cookie_duration = empty($limits['cookie_duration']) ? 2629744 : $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 $extension = pathinfo($file_info->getFilename(), PATHINFO_EXTENSION); |