diff --git a/app/js/main.js b/app/js/main.js index 00641e3..5b38519 100644 --- a/app/js/main.js +++ b/app/js/main.js @@ -94,7 +94,6 @@ $(document).ready(function() { }); }); -// with the dynamic footer, you need to adjust the content padding to make sure the footer doesn't overlap the content document.addEventListener('DOMContentLoaded', function () { const toggleButton = document.getElementById('dark-mode-toggle'); const enableButton = document.getElementById('dark-mode-toggle-button'); diff --git a/app/models/sessions.php b/app/models/sessions.php index a25ab8f..9edde85 100644 --- a/app/models/sessions.php +++ b/app/models/sessions.php @@ -20,6 +20,7 @@ use TheTempusProject\Canary\Bin\Canary as Debug; use TheTempusProject\Bedrock\Functions\Session; use TheTempusProject\Bedrock\Functions\Cookie; use TheTempusProject\Classes\DatabaseModel; +use TheTempusProject\Classes\Config; use TheTempusProject\TheTempusProject as App; class Sessions extends DatabaseModel { @@ -56,9 +57,11 @@ class Sessions extends DatabaseModel { $user = new User; // @todo lets put this on some sort of realistic checking regime other than check everything every time if ( $sessionID == false ) { + Debug::log( 'sessionID false' ); return false; } if ( !Check::id( $sessionID ) ) { + Debug::log( 'sessionID not id' ); return false; } $data = self::$db->get( $this->tableName, [ 'ID', '=', $sessionID ] ); @@ -115,12 +118,12 @@ class Sessions extends DatabaseModel { public function checkCookie( $cookieToken, $create = false ) { $user = new User; if ( $cookieToken === false ) { + Debug::info( 'cookieToken false' ); return false; } $data = self::$db->get( $this->tableName, [ 'token', '=', $cookieToken ] ); if ( !$data->count() ) { Debug::info( 'sessions->checkCookie - Session token not found.' ); - return false; } $session = $data->first(); @@ -155,9 +158,10 @@ class Sessions extends DatabaseModel { * @return {bool} */ public function newSession( $expire = null, $override = false, $remember = false, $userID = null ) { - if ( ! isset( $expire ) ) { + if ( empty( $expire ) ) { // default Session Expiration is 24 hours - $expire = ( time() + ( 3600 * 24 ) ); + $expireLimit = Config::getValue( 'main/loginTimer' ); + $expire = ( time() + $expireLimit ); Debug::log( 'Using default expiration time' ); } $lastPage = App::getUrl(); diff --git a/app/plugins/blog/templates/blog.tpl b/app/plugins/blog/templates/blog.tpl index 1444ac6..880a176 100644 --- a/app/plugins/blog/templates/blog.tpl +++ b/app/plugins/blog/templates/blog.tpl @@ -13,7 +13,7 @@ - +