|
|
@@ -104,8 +104,8 @@ function validateToken($token, $global = false)
|
|
|
// Validate script
|
|
|
$userInfo = jwtParse($token);
|
|
|
$validated = $userInfo ? true : false;
|
|
|
- if ($validated == true) {
|
|
|
- if ($global == true) {
|
|
|
+ if ($global == true) {
|
|
|
+ if ($validated == true) {
|
|
|
try {
|
|
|
$database = new Dibi\Connection([
|
|
|
'driver' => 'sqlite3',
|
|
|
@@ -138,12 +138,15 @@ function validateToken($token, $global = false)
|
|
|
} catch (Dibi\Exception $e) {
|
|
|
$GLOBALS['organizrUser'] = false;
|
|
|
}
|
|
|
+ }else{
|
|
|
+ // Delete cookie & reload page
|
|
|
+ coookie('delete', $GLOBALS['cookieName']);
|
|
|
+ $GLOBALS['organizrUser'] = false;
|
|
|
}
|
|
|
} else {
|
|
|
- // Delete cookie & reload page
|
|
|
- coookie('delete', $GLOBALS['cookieName']);
|
|
|
- $GLOBALS['organizrUser'] = false;
|
|
|
+ return $userInfo;
|
|
|
}
|
|
|
+ return false;
|
|
|
}
|
|
|
|
|
|
function getOrganizrUserToken()
|