From e2d892961b55284816147dee14d44dedb662a6c8 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Fri, 19 Feb 2016 09:46:56 -0500
Subject: [PATCH] use storage area paths in getting analyze images and frame
 stills

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

diff --git a/web/includes/functions.php b/web/includes/functions.php
index 14a8d778e..6cbc24704 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -516,6 +516,7 @@ function canEdit( $area, $mid=false )
 
 function getEventPath( $event )
 {
+	
     if ( ZM_USE_DEEP_STORAGE )
         $eventPath = $event['MonitorId'].'/'.strftime( "%y/%m/%d/%H/%M/%S", strtotime($event['StartTime']) );
     else
@@ -1146,7 +1147,9 @@ function zmaCheck( $monitor )
 
 function getImageSrc( $event, $frame, $scale=SCALE_BASE, $captureOnly=false, $overwrite=false )
 {
+	require_once('includes/Storage.php');
     $eventPath = getEventPath( $event );
+	$Storage = new Storage( $event['StorageId'] );
 
     if ( !is_array($frame) )
         $frame = array( 'FrameId'=>$frame, 'Type'=>'' );
@@ -1159,7 +1162,8 @@ function getImageSrc( $event, $frame, $scale=SCALE_BASE, $captureOnly=false, $ov
 
     $analImage = sprintf( "%0".ZM_EVENT_IMAGE_DIGITS."d-analyse.jpg", $frame['FrameId'] );
     $analPath = $eventPath.'/'.$analImage;
-    $analFile =  ZM_DIR_EVENTS."/".$analPath;
+
+    $analFile =  $Storage->Path()."/".$analPath;
     $thumbAnalPath = ZM_DIR_IMAGES.'/'.$event['Id'].'-'.$analImage;
     //echo "AI:$analImage, AP:$analPath, TAP:$thumbAnalPath<br>";
 
@@ -1171,8 +1175,8 @@ function getImageSrc( $event, $frame, $scale=SCALE_BASE, $captureOnly=false, $ov
     if ( !ZM_WEB_SCALE_THUMBS || $scale >= SCALE_BASE || !function_exists( 'imagecreatefromjpeg' ) )
     {
         $imagePath = $thumbPath = $isAnalImage?$analPath:$captPath;
-        $imageFile = ZM_DIR_EVENTS."/".$imagePath;
-        $thumbFile = ZM_DIR_EVENTS."/".$thumbPath;
+        $imageFile = $Storage->Path()."/".$imagePath;
+        $thumbFile = $Storage->Path()."/".$thumbPath;
     }
     else
     {
@@ -1196,7 +1200,7 @@ function getImageSrc( $event, $frame, $scale=SCALE_BASE, $captureOnly=false, $ov
             $thumbPath = $thumbCaptPath;
         }
 
-        $imageFile = ZM_DIR_EVENTS."/".$imagePath;
+        $imageFile = $Storage->Path()."/".$imagePath;
         //$thumbFile = ZM_DIR_EVENTS."/".$thumbPath;
         $thumbFile = $thumbPath;
         if ( $overwrite || !file_exists( $thumbFile ) || !filesize( $thumbFile ) )