diff --git a/App/Wrappers/SessionWrapper.php b/App/Wrappers/SessionWrapper.php new file mode 100644 index 0000000..f21aab0 --- /dev/null +++ b/App/Wrappers/SessionWrapper.php @@ -0,0 +1,25 @@ +value, array: $_SESSION)) + { + return $_SESSION[$target->value]; + } + die(); + } +} diff --git a/App/Wrappers/TwigWrapper.php b/App/Wrappers/TwigWrapper.php index 2d9fd4f..5c1df3f 100644 --- a/App/Wrappers/TwigWrapper.php +++ b/App/Wrappers/TwigWrapper.php @@ -28,10 +28,7 @@ class TwigWrapper $this->loader = new FilesystemLoader(dirname($_SERVER["DOCUMENT_ROOT"]) . "/Templates/"); $this->twig = new Environment($this->loader, ["debug" => true]); - if (session_status() == PHP_SESSION_NONE) { - session_start(); - } - + SessionWrapper::Start(); $this->twig->addGlobal('_SESSION_', $_SESSION); diff --git a/Pages/profile.php b/Pages/profile.php index 06959c5..cf1ad2a 100644 --- a/Pages/profile.php +++ b/Pages/profile.php @@ -2,6 +2,7 @@ use App\Enumerators\SessionElement; use App\Wrappers\DatabaseInteractions; +use App\Wrappers\SessionWrapper; use App\Wrappers\TwigWrapper; require_once __DIR__ . "/../vendor/autoload.php"; @@ -14,7 +15,7 @@ $yourTunes = $db->RunSelect( table: 'Tunes' ) ->where(cond: 'T.CreatedBy LIKE :__user_id__') - ->bindValue(name: '__user_id__', value: $_SESSION[SessionElement::USER_ID->value]) + ->bindValue(name: '__user_id__', value: SessionWrapper::Get(target: SessionElement::USER_ID)) ); TwigWrapper::RenderTwig( diff --git a/Public/API/V1/RateTune.php b/Public/API/V1/RateTune.php index c4c3c12..671ce5f 100644 --- a/Public/API/V1/RateTune.php +++ b/Public/API/V1/RateTune.php @@ -2,11 +2,12 @@ use App\Enumerators\SessionElement; use App\Wrappers\DatabaseInteractions; +use App\Wrappers\SessionWrapper; use App\Wrappers\SQLQueryBuilderWrapper; require_once __DIR__ . "/../../../vendor/autoload.php"; -if(!$_SESSION[SessionElement::IS_LOGGED_IN->value]) +if(!SessionWrapper::Get(target: SessionElement::IS_LOGGED_IN)) { die(); } @@ -34,7 +35,7 @@ $existingRating = $db->RunSelect( ) ->where(cond: 'CreatedBy=:__user_id__') ->where(cond: 'TuneID=:__tune_id__') - ->bindValue(name: '__user_id__', value: $_SESSION[SessionElement::USER_ID->value]) + ->bindValue(name: '__user_id__', value: SessionWrapper::Get(target: SessionElement::USER_ID)) ->bindValue(name: '__tune_id__', value: $_GET['tune-id']) ); @@ -47,7 +48,7 @@ if(sizeof($existingRating) == 0) ->set(col: 'CreatedBy', value: ':__user_id__') ->set(col: 'TuneID', value: ':__tune_id__') ->set(col: 'Rating', value: ':__rating__') - ->bindValue(name: '__user_id__', value: $_SESSION[SessionElement::USER_ID->value]) + ->bindValue(name: '__user_id__', value: SessionWrapper::Get(target: SessionElement::USER_ID)) ->bindValue(name: '__tune_id__', value: $_GET['tune-id']) ->bindValue(name: '__rating__', value: $ratingValue) ); @@ -61,7 +62,7 @@ elseif(sizeof($existingRating) == 1) ->set(col: 'Rating', value: ':__rating__') ->where(cond: 'CreatedBy=:__user_id__') ->where(cond: 'TuneID=:__tune_id__') - ->bindValue(name: '__user_id__', value: $_SESSION[SessionElement::USER_ID->value]) + ->bindValue(name: '__user_id__', value: SessionWrapper::Get(target: SessionElement::USER_ID)) ->bindValue(name: '__tune_id__', value: $_GET['tune-id']) ->bindValue(name: '__rating__', value: $ratingValue) );