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

Implement zm_setcookie to simplify setting cookies, set samesite, deal with older php etc. Use it.

This commit is contained in:
Isaac Connor 2022-01-20 09:46:38 -05:00
parent dec440ead1
commit db866fa668
4 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/includes/Group.php
View File

@ -25,7 +25,7 @@ class Group extends ZM_Object {
if ( isset($_COOKIE['zmGroup']) ) {
if ( $this->{'Id'} == $_COOKIE['zmGroup'] ) {
unset($_COOKIE['zmGroup']);
setcookie('zmGroup', '', time()-3600*24*2);
zm_setcookie('zmGroup', '');
}
}
}

17
web/includes/session.php
View File

@ -1,4 +1,21 @@
<?php
// Wrapper around setcookie that auto-sets samesite, and deals with older versions of php
function zm_setcookie($cookie, $value, $options=array()) {
if (!isset($options['expires'])) {
$options['expires'] = time()+3600*24*30*12*10; // 10 years?!
}
if (!isset($options['samesite'])) {
$options['samesite'] = 'Strict';
}
if (version_compare(phpversion(), '7.3.0', '>=')) {
setcookie($cookie, $value, $options);
} else {
setcookie($cookie, $value, $options['expires'], '/; samesite=strict');
}
}
// ZM session start function support timestamp management
function zm_session_start() {

17
web/index.php
View File

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

9
web/skins/classic/views/montage.php
View File

@ -307,14 +307,7 @@ foreach (array_reverse($zones) as $zone) {
</div>
<?php
if ((!ZM_WEB_COMPACT_MONTAGE) && ($monitor->Type() != 'WebSite')) {
?>
<div id="monitorState<?php echo $monitor->Id() ?>" class="monitorState idle">
<?php echo translate('State') ?>:
<span id="stateValue<?php echo $monitor->Id() ?>"></span>
&nbsp;-&nbsp;
<span id="fpsValue<?php echo $monitor->Id() ?>"></span>&nbsp;fps
</div>
<?php
echo $monitor->getMonitorStateHTML();
}
?>
</div>