From 3c29228df5b15e2bcb0855617c5c48e8ce1e3ae1 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 25 Aug 2020 11:30:22 -0400
Subject: [PATCH] Use zm_session_start

---
 distros/ubuntu1604/changelog                 | 6 +++---
 web/includes/csrf/csrf-magic.php             | 2 +-
 web/skins/classic/views/_monitor_filters.php | 2 +-
 web/skins/classic/views/cycle.php            | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/distros/ubuntu1604/changelog b/distros/ubuntu1604/changelog
index 616f75178..0fc2fda2e 100644
--- a/distros/ubuntu1604/changelog
+++ b/distros/ubuntu1604/changelog
@@ -1,3 +1,3 @@
-zoneminder (1.31.39~20180223.27-stretch-1) unstable; urgency=low
-  * 
- -- Isaac Connor <iconnor@connortechnology.com>  Fri, 23 Feb 2018 14:15:59 -0500
+zoneminder (1.35.6~20200825.27-xenial) xenial; urgency=low
+  *
+ -- Isaac Connor <isaac@zoneminder.com>  Tue, 25 Aug 2020 09:28:18 -0400
diff --git a/web/includes/csrf/csrf-magic.php b/web/includes/csrf/csrf-magic.php
index d96165eb9..edb04002a 100644
--- a/web/includes/csrf/csrf-magic.php
+++ b/web/includes/csrf/csrf-magic.php
@@ -389,7 +389,7 @@ function csrf_conf($key, $val) {
  */
 function csrf_start() {
     if ($GLOBALS['csrf']['auto-session'] && !session_id()) {
-        session_start();
+        zm_session_start();
     }
 }
 
diff --git a/web/skins/classic/views/_monitor_filters.php b/web/skins/classic/views/_monitor_filters.php
index 62a91d7f3..f144c17fa 100644
--- a/web/skins/classic/views/_monitor_filters.php
+++ b/web/skins/classic/views/_monitor_filters.php
@@ -23,7 +23,7 @@ $ServersById = array();
 foreach ( $servers as $S ) {
   $ServersById[$S->Id()] = $S;
 }
-session_start();
+zm_session_start();
 foreach ( array('GroupId','Function','ServerId','StorageId','Status','MonitorId','MonitorName','Source') as $var ) {
   if ( isset($_REQUEST[$var]) ) {
     if ( $_REQUEST[$var] != '' ) {
diff --git a/web/skins/classic/views/cycle.php b/web/skins/classic/views/cycle.php
index 082afad66..dd12b0fa3 100644
--- a/web/skins/classic/views/cycle.php
+++ b/web/skins/classic/views/cycle.php
@@ -91,7 +91,7 @@ if ( !$monitor ) {
   ZM\Error('There was no monitor to display.');
 }
 
-session_start();
+zm_session_start();
 
 if ( isset($_REQUEST['scale']) ) {
   $options['scale'] = validInt($_REQUEST['scale']);