Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-04-26 01:09:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Twig session(key) function + reworked session functions to accept multi-array like in Laravel

Browse Source 
Important: getSession returns NULL now instead of false if session value not found
This commit is contained in:
slawkens 2025-02-02 16:16:59 +01:00
parent de468a8dcd
commit b46ddb43d0
5 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,5 +1,10 @@
# Changelog
## [master - 02.02.2025]
### Added
* Twig session(key) function + reworked session functions to accept multi-array like in Laravel
## [1.1 - 27.01.2025]
### Changed

27
system/functions.php
View File

@ -1057,17 +1057,36 @@ function get_browser_real_ip() {
return '0';
}
function setSession($key, $data): void {
$_SESSION[setting('core.session_prefix') . $key] = $data;
function setSession($key, $value = null): void {
if (!is_array($key)) {
$key = [$key => $value];
}
foreach ($key as $arrayKey => $arrayValue) {
if (is_null($arrayValue)) {
unsetSession($arrayKey);
}
else {
$_SESSION[setting('core.session_prefix') . $arrayKey] = $arrayValue;
}
}
}
function getSession($key) {
$key = setting('core.session_prefix') . $key;
return $_SESSION[$key] ?? false;
return $_SESSION[setting('core.session_prefix') . $key] ?? null;
}
function unsetSession($key): void {
unset($_SESSION[setting('core.session_prefix') . $key]);
}
function session($key): mixed {
if (is_array($key)) {
setSession($key);
return null;
}
return getSession($key);
}
function csrf(bool $return = false): string {
return CsrfToken::create($return);
}

4
system/login.php
View File

@ -14,12 +14,12 @@ $account_logged = new OTS_Account();
// stay-logged with sessions
$current_session = getSession('account');
if($current_session !== false)
if($current_session)
{
$account_logged->load($current_session);
if($account_logged->isLoaded() && $account_logged->getPassword() == getSession('password')
//&& (!isset($_SESSION['admin']) || admin())
&& (getSession('remember_me') !== false || getSession('last_visit') > time() - 15 * 60)) { // login for 15 minutes if "remember me" is not used
&& (getSession('remember_me') || getSession('last_visit') > time() - 15 * 60)) { // login for 15 minutes if "remember me" is not used
$logged = true;
}
else {

2
system/template.php
View File

@ -41,7 +41,7 @@ if(setting('core.template_allow_change'))
}
else {
$template_session = getSession('template');
if ($template_session !== false) {
if ($template_session) {
if (!preg_match("/[^A-z0-9_\-]/", $template_session)) {
$template_name = $template_session;
}

5
system/twig.php
View File

@ -140,6 +140,11 @@ $function = new TwigFunction('csrfToken', function () {
});
$twig->addFunction($function);
$function = new TwigFunction('session', function ($key) {
return session($key);
});
$twig->addFunction($function);
$filter = new TwigFilter('urlencode', function ($s) {
return urlencode($s);
});