From 9480adcc317844572a290ab37df8806a155b87cc Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 22 Feb 2018 13:05:53 -0500
Subject: [PATCH] include authentication info when building the link to mp4
---
web/includes/Event.php | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/web/includes/Event.php b/web/includes/Event.php
index 6f92836ce..6915cf7c5 100644
--- a/web/includes/Event.php
+++ b/web/includes/Event.php
@@ -168,15 +168,22 @@ class Event {
} else {
$streamSrc .= $_SERVER['HTTP_HOST'];
}
- $streamSrc .= ( ZM_BASE_PATH != '/' ? ZM_BASE_PATH : '' ).'/index.php?view=view_video&eid='.$this->{'Id'};
- return $streamSrc;
+ $streamSrc .= ( ZM_BASE_PATH != '/' ? ZM_BASE_PATH : '' ).'/index.php';
+ $args['eid'] = $this->{'Id'};
+ $args['view'] = 'view_video';
+ } else {
+ $streamSrc = ZM_BASE_URL.ZM_PATH_ZMS;
+
+ $args['source'] = 'event';
+ $args['event'] = $this->{'Id'};
+ if ( ( (!isset($args['mode'])) or ( $args['mode'] != 'single' ) ) && !empty($GLOBALS['connkey']) ) {
+ $args['connkey'] = $GLOBALS['connkey'];
+ }
+ if ( ZM_RAND_STREAM ) {
+ $args['rand'] = time();
+ }
}
- $streamSrc = ZM_BASE_URL.ZM_PATH_ZMS;
-
- $args['source'] = 'event';
- $args['event'] = $this->{'Id'};
-
if ( ZM_OPT_USE_AUTH ) {
if ( ZM_AUTH_RELAY == 'hashed' ) {
$args['auth'] = generateAuthHash( ZM_AUTH_HASH_IPS );
@@ -187,16 +194,10 @@ class Event {
$args['user'] = $_SESSION['username'];
}
}
- if ( ( (!isset($args['mode'])) or ( $args['mode'] != 'single' ) ) && !empty($GLOBALS['connkey']) ) {
- $args['connkey'] = $GLOBALS['connkey'];
- }
- if ( ZM_RAND_STREAM ) {
- $args['rand'] = time();
- }
$streamSrc .= '?'.http_build_query( $args,'', $querySep );
- return( $streamSrc );
+ return $streamSrc;
} // end function getStreamSrc
function DiskSpace( $new='' ) {