From d8ef33396a63922bd35ffffcb04b756010179362 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Wed, 16 Jan 2019 13:44:57 -0500
Subject: [PATCH] If multi-port is on, we need to output CORS headers

---
 web/includes/functions.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/web/includes/functions.php b/web/includes/functions.php
index cad99230e..6ec0d5e22 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -66,6 +66,11 @@ function CORSHeaders() {
     if ( sizeof($Servers) < 1 ) {
 # Only need CORSHeaders in the event that there are multiple servers in use.
       # ICON: Might not be true. multi-port?
+      if ( ZM_MIN_STREAMING_PORT ) {
+        Logger::Debug("Setting default Access-Control-Allow-Origin from " . $_SERVER['HTTP_ORIGIN']);
+        header('Access-Control-Allow-Origin: ' . $_SERVER['HTTP_ORIGIN']);
+        header('Access-Control-Allow-Headers: x-requested-with,x-request');
+      }
       return;
     }
     foreach( $Servers as $Server ) {
@@ -2301,10 +2306,10 @@ function check_timezone() {
   $php_tzoffset = trim($now->format('O'));
   $mysql_tzoffset = trim(dbFetchOne("SELECT TIME_FORMAT(TIMEDIFF(NOW(), UTC_TIMESTAMP),'%H%i');",'TIME_FORMAT(TIMEDIFF(NOW(), UTC_TIMESTAMP),\'%H%i\')'));
 
-  Logger::Debug("System timezone offset determine to be: $sys_tzoffset,\x20 
-                 PHP timezone offset determine to be: $php_tzoffset,\x20 
-                 Mysql timezone offset determine to be: $mysql_tzoffset
-               ");
+  #Logger::Debug("System timezone offset determine to be: $sys_tzoffset,\x20 
+                 #PHP timezone offset determine to be: $php_tzoffset,\x20 
+                 #Mysql timezone offset determine to be: $mysql_tzoffset
+               #");
 
   if ( $sys_tzoffset != $php_tzoffset )
     Fatal("ZoneMinder is not installed properly: php's date.timezone does not match the system timezone!");