the-tempus-project/thetempusproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

various bugfixes

Browse Source
This commit is contained in:
Joey Kimsey
2024-12-18 08:58:35 -05:00
parent a859fb7ace
commit 5fe1c3aafe
34 changed files with 92 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/sessions.php
View File

@ -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();