ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add samesite when setting cookie for skin and css

This commit is contained in:
Isaac Connor 2021-05-25 11:20:52 -04:00
parent 6b478484bd
commit 9e64b912a8
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/index.php
View File

@ -139,6 +139,14 @@ $skinBase[] = $skin;
zm_session_start(); zm_session_start();
$cookie_options = array(
'expires'=>time()+3600*24*30*12*10,
);
if ( version_compare(phpversion(), '7.3.0', '>=') ) {
# samesite was introduced in 7.3.0
$cookie_options['samesite'] = 'Strict';
}
if ( if (
!isset($_SESSION['skin']) || !isset($_SESSION['skin']) ||
isset($_REQUEST['skin']) || isset($_REQUEST['skin']) ||
@ -146,7 +154,7 @@ if (
($_COOKIE['zmSkin'] != $skin) ($_COOKIE['zmSkin'] != $skin)
) { ) {
$_SESSION['skin'] = $skin; $_SESSION['skin'] = $skin;
setcookie('zmSkin', $skin, time()+3600*24*30*12*10); setcookie('zmSkin', $skin, $cookie_options);
} }
if ( if (
@ -156,7 +164,7 @@ if (
($_COOKIE['zmCSS'] != $css) ($_COOKIE['zmCSS'] != $css)
) { ) {
$_SESSION['css'] = $css; $_SESSION['css'] = $css;
setcookie('zmCSS', $css, time()+3600*24*30*12*10); setcookie('zmCSS', $css, $cookie_options);
} }
# Running is global but only do the daemonCheck if it is actually needed # Running is global but only do the daemonCheck if it is actually needed