Merge pull request #199 from ExpDev07/dev

Bugfixes

Author: coalaura

app/Helpers/SessionHelper.php

@@ -8,7 +8,7 @@ class SessionHelper
 {
     const Cookie = 'op_fw_session_store';
     const Alphabet = 'abcdefghijklmnopqrstuvwxyz0123456789';
-    const Lifetime = 60 * 60 * 24 * 365;
+    const Lifetime = 60 * 60 * 24 * 2;
 
     /**
      * Singleton instance
@@ -133,6 +133,8 @@ private function load()
         if (file_exists($this->getSessionFile())) {
             $json = json_decode(file_get_contents($this->getSessionFile()), true) ?: [];
             $this->value = $json;
+
+            touch($this->getSessionFile());
         } else {
             LoggingHelper::log($this->sessionKey, 'Session file did not exist while loading data');
             $this->value = [];

app/Http/Middleware/StaffMiddleware.php

@@ -109,7 +109,7 @@ protected function checkSessionLock(): bool
                 LoggingHelper::log($session->getSessionKey(), 'current.detail -> ' . json_encode($detail));
                 LoggingHelper::log($session->getSessionKey(), 'session.detail -> ' . json_encode($session->get('session_detail')));
 
-                $this->error = 'Your session is invalid, please log in again.';
+                $this->error = 'Your session is invalid, please refresh this page or log in again.';
             }
 
             $session->put('session_detail', $detail);