diff --git a/web/includes/Frame.php b/web/includes/Frame.php index 707569157..661654d24 100644 --- a/web/includes/Frame.php +++ b/web/includes/Frame.php @@ -69,8 +69,8 @@ class Frame { } - public function getImageSrc( ) { - return $_SERVER['PHP_SELF'].'?view=image&fid='.$this->{'Id'}; + public function getImageSrc( $show='capture' ) { + return $_SERVER['PHP_SELF'].'?view=image&fid='.$this->{'Id'}.'&show='.$show;; } // end function getImageSrc public static function find( $parameters = array(), $limit = NULL ) { diff --git a/web/skins/classic/views/frame.php b/web/skins/classic/views/frame.php index 29ddcc1d6..abb4a3cc7 100644 --- a/web/skins/classic/views/frame.php +++ b/web/skins/classic/views/frame.php @@ -40,57 +40,59 @@ if ( !empty($fid) ) { } else { $frame = dbFetchOne( 'SELECT * FROM Frames WHERE EventId = ? AND Score = ?', NULL, array( $eid, $event['MaxScore'] ) ); } -$frame = new Frame( $frame ); +$Frame = new Frame( $frame ); $maxFid = $event['Frames']; $firstFid = 1; -$prevFid = $frame->FrameId()-1; -$nextFid = $frame->FrameId()+1; +$prevFid = $Frame->FrameId()-1; +$nextFid = $Frame->FrameId()+1; $lastFid = $maxFid; -$alarmFrame = $frame->Type()=='Alarm'; +$alarmFrame = $Frame->Type()=='Alarm'; if ( isset( $_REQUEST['scale'] ) ) $scale = validInt($_REQUEST['scale']); else $scale = max( reScale( SCALE_BASE, $event['DefaultScale'], ZM_WEB_DEFAULT_SCALE ), SCALE_BASE ); -$imageData = getImageSrc( $event, $frame->FrameId(), $scale, (isset($_REQUEST['show']) && $_REQUEST['show']=="capt") ); +$imageData = getImageSrc( $event, $frame, $scale, (isset($_REQUEST['show']) && $_REQUEST['show']=="capt") ); $imagePath = $imageData['thumbPath']; $eventPath = $imageData['eventPath']; -$dImagePath = sprintf( "%s/%0".ZM_EVENT_IMAGE_DIGITS."d-diag-d.jpg", $eventPath, $frame->FrameId() ); -$rImagePath = sprintf( "%s/%0".ZM_EVENT_IMAGE_DIGITS."d-diag-r.jpg", $eventPath, $frame->FrameId() ); +$dImagePath = sprintf( "%s/%0".ZM_EVENT_IMAGE_DIGITS."d-diag-d.jpg", $eventPath, $Frame->FrameId() ); +$rImagePath = sprintf( "%s/%0".ZM_EVENT_IMAGE_DIGITS."d-diag-r.jpg", $eventPath, $Frame->FrameId() ); $focusWindow = true; -xhtmlHeaders(__FILE__, translate('Frame')." - ".$event['Id']." - ".$frame->FrameId() ); +xhtmlHeaders(__FILE__, translate('Frame')." - ".$event['Id']." - ".$Frame->FrameId() ); ?>

-"> -<?php echo $frame->EventId().FrameId() ?>" class=""/> + +"> + +<?php echo $Frame->EventId().FrameId() ?>" class=""/>

-FrameId() > 1 ) { ?> +FrameId() > 1 ) { ?> -FrameId() > 1 ) { ?> +FrameId() > 1 ) { ?> -FrameId() < $maxFid ) { ?> +FrameId() < $maxFid ) { ?> -FrameId() < $maxFid ) { ?> +FrameId() < $maxFid ) { ?>

diff --git a/web/views/image.php b/web/views/image.php index 9bc242244..0135df7e0 100644 --- a/web/views/image.php +++ b/web/views/image.php @@ -61,18 +61,19 @@ $errorText = false; if ( empty($_REQUEST['path']) ) { if ( ! empty($_REQUEST['fid']) ) { + $show = empty($_REQUEST['show']) ? 'capture' : $_REQUEST['show']; if ( ! empty($_REQUEST['eid'] ) ) { $Event = new Event( $_REQUEST['eid'] ); $Frame = Frame::find_one( array( 'EventId' => $_REQUEST['eid'], 'FrameId' => $_REQUEST['fid'] ) ); if ( ! $Frame ) { Fatal("No Frame found for event(".$_REQUEST['eid'].") and frame id(".$_REQUEST['fid'].")"); } - $path = $Event->Path().'/'.sprintf("%'.0".ZM_EVENT_IMAGE_DIGITS.'d',$_REQUEST['fid']).'-capture.jpg'; + $path = $Event->Path().'/'.sprintf("%'.0".ZM_EVENT_IMAGE_DIGITS.'d',$_REQUEST['fid']).'-'.$show.'.jpg'; } else { # If we are only specifying fid, then the fid must be the primary key into the frames table. But when the event is specified, then it is the frame # $Frame = new Frame( $_REQUEST['fid'] ); $Event = new Event( $Frame->EventId() ); - $path = $Event->Path().'/'.sprintf("%'.0".ZM_EVENT_IMAGE_DIGITS.'d',$Frame->FrameId()).'-capture.jpg'; + $path = $Event->Path().'/'.sprintf("%'.0".ZM_EVENT_IMAGE_DIGITS.'d',$Frame->FrameId()).'-'.$show.'.jpg'; } } else { $errorText = "No image path";