tedkulp/PrivateBin
1
0
Fork 0
mirror of https://github.com/PrivateBin/PrivateBin.git synced 2026-04-19 21:58:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

don't always set the cookie, having to unset it later

Browse Source 
but still unset it, if it currently should not be in use (templateselection = false)
This commit is contained in:
El RIDO
2025-11-11 09:45:51 +01:00
parent da9e85ecde
commit 194385e692
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Controller.php
+6 -9
View File
@@ -213,10 +213,11 @@ class Controller
TemplateSwitcher::setAvailableTemplates($templates); TemplateSwitcher::setAvailableTemplates($templates);
TemplateSwitcher::setTemplateFallback($template); TemplateSwitcher::setTemplateFallback($template);
// force default template, if template selection is disabled and a default is set // force default template, if template selection is disabled
if (!$this->_conf->getKey('templateselection') && !empty($template)) { if (!$this->_conf->getKey('templateselection') && array_key_exists('template', $_COOKIE)) {
$_COOKIE['template'] = $template; unset($_COOKIE['template']); // ensure value is not re-used in template switcher
setcookie('template', $template, array('SameSite' => 'Lax', 'Secure' => true)); $expiredInAllTimezones = time() - 86400;
setcookie('template', '', array('expires' => $expiredInAllTimezones, 'SameSite' => 'Lax', 'Secure' => true));
} }
} }
@@ -431,15 +432,11 @@ class Controller
setcookie('lang', $languageselection, array('SameSite' => 'Lax', 'Secure' => true)); setcookie('lang', $languageselection, array('SameSite' => 'Lax', 'Secure' => true));
} }
// set template cookie if that functionality was enabled, otherwise delete any existing cookie // set template cookie if that functionality was enabled
$templateselection = ''; $templateselection = '';
if ($this->_conf->getKey('templateselection')) { if ($this->_conf->getKey('templateselection')) {
$templateselection = TemplateSwitcher::getTemplate(); $templateselection = TemplateSwitcher::getTemplate();
setcookie('template', $templateselection, array('SameSite' => 'Lax', 'Secure' => true)); setcookie('template', $templateselection, array('SameSite' => 'Lax', 'Secure' => true));
} elseif (array_key_exists('template', $_COOKIE)) {
unset($_COOKIE['template']); // ensure value is not re-used in template switcher
$expiredInAllTimezones = time() - 86400;
setcookie('template', '', array('expires' => $expiredInAllTimezones, 'SameSite' => 'Lax', 'Secure' => true));
} }
// strip policies that are unsupported in meta tag // strip policies that are unsupported in meta tag