>>>>>> master return; } require_once('includes/Frame.php'); $eid = validInt($_REQUEST['eid']); if ( !empty($_REQUEST['fid']) ) $fid = validInt($_REQUEST['fid']); $Event = new Event( $eid ); $Monitor = $Event->Monitor(); if ( !empty($fid) ) { $sql = 'SELECT * FROM Frames WHERE EventId = ? AND FrameId = ?'; if ( !($frame = dbFetchOne( $sql, NULL, array($eid, $fid) )) ) $frame = array( 'FrameId'=>$fid, 'Type'=>'Normal', 'Score'=>0 ); } else { $frame = dbFetchOne( 'SELECT * FROM Frames WHERE EventId = ? AND Score = ?', NULL, array( $eid, $Event->MaxScore() ) ); } $Frame = new Frame( $frame ); $maxFid = $Event->Frames(); $firstFid = 1; $prevFid = $Frame->FrameId()-1; $nextFid = $Frame->FrameId()+1; $lastFid = $maxFid; $alarmFrame = $Frame->Type()=='Alarm'; if ( isset( $_REQUEST['scale'] ) ) { $scale = validInt($_REQUEST['scale']); } else if ( isset( $_COOKIE['zmWatchScale'.$Monitor->Id()] ) ) { $scale = $_COOKIE['zmWatchScale'.$Monitor->Id()]; } else if ( isset( $_COOKIE['zmWatchScale'] ) ) { $scale = $_COOKIE['zmWatchScale']; } else { $scale = max( reScale( SCALE_BASE, $Monitor->DefaultScale(), ZM_WEB_DEFAULT_SCALE ), SCALE_BASE ); } <<<<<<< HEAD $show = 'capt'; if ( isset($_REQUEST['show']) ) { $show = $_REQUEST['show']; #} else if ( $imageData['hasAnalImage'] ) { #$show = 'anal'; } $imageData = $Event->getImageSrc( $frame, $scale, ($show=="capt") ); ======= $imageData = $Event->getImageSrc( $frame, $scale, (isset($_REQUEST['show']) && $_REQUEST['show']=="capt") ); >>>>>>> master $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() ); $focusWindow = true; xhtmlHeaders(__FILE__, translate('Frame')." - ".$Event->Id()." - ".$Frame->FrameId() ); ?>

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

FrameId() > 1 ) { ?> FrameId() < $maxFid ) { ?> ======= "> <?php echo $Frame->EventId().FrameId() ?>" class=""/>

FrameId() > 1 ) { ?> FrameId() > 1 ) { ?> FrameId() < $maxFid ) { ?> FrameId() < $maxFid ) { ?> >>>>>>> master

<<<<<<< HEAD

=======

" width="Width(), $Event->DefaultScale(), $scale ) ?>" height="Height(), $Event->DefaultScale(), $scale ) ?>" class=""/>

>>>>>>> master