From eefb761e9832d3f91c4325c4109ac29536efedd6 Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Thu, 30 Jul 2015 19:17:04 +0200 Subject: [PATCH 1/2] Refresh session timeout --- system/src/Grav/Common/Session.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/system/src/Grav/Common/Session.php b/system/src/Grav/Common/Session.php index cdc2e9958..6c353d264 100644 --- a/system/src/Grav/Common/Session.php +++ b/system/src/Grav/Common/Session.php @@ -20,16 +20,20 @@ class Session extends \RocketTheme\Toolbox\Session\Session $uri = $this->grav['uri']; $config = $this->grav['config']; + $session_timeout = $config->get('system.session.timeout', 1800); + $session_path = $config->get('system.session.path', '/' . ltrim($uri->rootUrl(false), '/')); + if ($config->get('system.session.enabled')) { // Define session service. parent::__construct( - $config->get('system.session.timeout', 1800), - $config->get('system.session.path', '/' . ltrim($uri->rootUrl(false), '/')) + $session_timeout, + $session_path ); $site_identifier = $config->get('site.title', 'unkown'); $this->setName($config->get('system.session.name', 'grav_site') . '_' . substr(md5($site_identifier), 0, 7)); $this->start(); + setcookie(session_name(), session_id(), time() + $session_timeout, $session_path); } } } From 7fa3e7bf2899995c8f7888367965003e94d9050f Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Fri, 31 Jul 2015 16:06:02 +0200 Subject: [PATCH 2/2] Move $session_timeout & $session_path inside the if statement --- system/src/Grav/Common/Session.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/src/Grav/Common/Session.php b/system/src/Grav/Common/Session.php index 6c353d264..795fcae09 100644 --- a/system/src/Grav/Common/Session.php +++ b/system/src/Grav/Common/Session.php @@ -20,10 +20,10 @@ class Session extends \RocketTheme\Toolbox\Session\Session $uri = $this->grav['uri']; $config = $this->grav['config']; - $session_timeout = $config->get('system.session.timeout', 1800); - $session_path = $config->get('system.session.path', '/' . ltrim($uri->rootUrl(false), '/')); - if ($config->get('system.session.enabled')) { + $session_timeout = $config->get('system.session.timeout', 1800); + $session_path = $config->get('system.session.path', '/' . ltrim($uri->rootUrl(false), '/')); + // Define session service. parent::__construct( $session_timeout,