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

Use zm_session_start

This commit is contained in:
Isaac Connor 2020-08-25 11:30:22 -04:00
parent 278be59c86
commit 3d3dde22c4
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
distros/ubuntu1604/changelog
View File

@ -1,3 +1,3 @@
zoneminder (1.31.39~20180223.27-stretch-1) unstable; urgency=low zoneminder (1.35.6~20200825.27-xenial) xenial; urgency=low
* *
-- Isaac Connor <iconnor@connortechnology.com> Fri, 23 Feb 2018 14:15:59 -0500 -- Isaac Connor <isaac@zoneminder.com> Tue, 25 Aug 2020 09:28:18 -0400

2
web/includes/csrf/csrf-magic.php
View File

@ -389,7 +389,7 @@ function csrf_conf($key, $val) {
*/ */
function csrf_start() { function csrf_start() {
if ($GLOBALS['csrf']['auto-session'] && !session_id()) { if ($GLOBALS['csrf']['auto-session'] && !session_id()) {
session_start(); zm_session_start();
} }
} }

2
web/skins/classic/views/_monitor_filters.php
View File

@ -23,7 +23,7 @@ $ServersById = array();
foreach ( $servers as $S ) { foreach ( $servers as $S ) {
$ServersById[$S->Id()] = $S; $ServersById[$S->Id()] = $S;
} }
session_start(); zm_session_start();
foreach ( array('GroupId','Function','ServerId','StorageId','Status','MonitorId','MonitorName','Source') as $var ) { foreach ( array('GroupId','Function','ServerId','StorageId','Status','MonitorId','MonitorName','Source') as $var ) {
if ( isset($_REQUEST[$var]) ) { if ( isset($_REQUEST[$var]) ) {
if ( $_REQUEST[$var] != '' ) { if ( $_REQUEST[$var] != '' ) {

2
web/skins/classic/views/cycle.php
View File

@ -91,7 +91,7 @@ if ( !$monitor ) {
} }
$options['connkey'] = generateConnKey(); $options['connkey'] = generateConnKey();
session_start(); zm_session_start();
if ( isset($_REQUEST['scale']) ) { if ( isset($_REQUEST['scale']) ) {
$options['scale'] = validInt($_REQUEST['scale']); $options['scale'] = validInt($_REQUEST['scale']);