From d073ba37babc5035c7fb4f391932108fa263ec55 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 20 Feb 2023 15:42:30 -0500
Subject: [PATCH] Default to Monitor->DefaultScale instead of 100% scale.

---
 web/skins/classic/views/frame.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/web/skins/classic/views/frame.php b/web/skins/classic/views/frame.php
index 98afec4b0..6dc8ae187 100644
--- a/web/skins/classic/views/frame.php
+++ b/web/skins/classic/views/frame.php
@@ -57,24 +57,24 @@ if (isset($_REQUEST['scale'])) {
 } else if (isset($_COOKIE['zmWatchScale'])) {
   $scale = validNum($_COOKIE['zmWatchScale']);
 } else {
-  $scale = max(reScale(SCALE_BASE, $Monitor->DefaultScale(), ZM_WEB_DEFAULT_SCALE), SCALE_BASE);
+  $scale = $Monitor->DefaultScale();
 }
 $scale = $scale ? $scale : 0;
 
 $imageData = $Event->getImageSrc($frame, $scale, 0);
 if (!$imageData) {
   ZM\Error("No data found for Event $eid frame $fid");
-  $imageData = array('hasAnalImage'=>0, 'thumbPath' => '', 'eventPath'=>'');
+  $imageData = array('hasAnalysisImage'=>0, 'thumbPath' => '', 'eventPath'=>'');
 }
 
-$show = 'capt';
-if (isset($_REQUEST['show']) && in_array($_REQUEST['show'], array('capt', 'anal'))) {
+$show = 'capture';
+if (isset($_REQUEST['show']) && in_array($_REQUEST['show'], array('capture', 'analysis'))) {
   $show = $_REQUEST['show'];
-  if ($show == 'anal' and ! $imageData['hasAnalImage']) {
-    $show = 'capt';
+  if ($show == 'analysis' and ! $imageData['hasAnalysisImage']) {
+    $show = 'capture';
   }
-} else if ($imageData['hasAnalImage']) {
-  $show = 'anal';
+} else if ($imageData['hasAnalysisImage']) {
+  $show = 'analysis';
 }
 
 $imagePath = $imageData['thumbPath'];
@@ -115,16 +115,16 @@ xhtmlHeaders(__FILE__, translate('Frame').' - '.$Event->Id().' - '.$Frame->Frame
       <div>
         <p id="image">
 <?php
-if ($imageData['hasAnalImage']) {
+if ($imageData['hasAnalysisImage']) {
   echo sprintf('<a href="?view=frame&amp;eid=%d&amp;fid=%d&scale=%d&amp;show=%s" title="Click to display frame %s analysis">',
     $Event->Id(), $Frame->FrameId(), $scale,
-    ($show=='anal'?'capt':'anal'),
-    ($show=='anal'?'without':'with')
+    ($show=='analysis'?'capture':'analysis'),
+    ($show=='analysis'?'without':'with')
   );
 }
 ?>
 <img id="frameImg"
-  src="<?php echo validHtmlStr($Frame->getImageSrc($show=='anal'?'analyse':'capture')) ?>"
+  src="<?php echo validHtmlStr($Frame->getImageSrc($show=='analysis'?'analyse':'capture')) ?>"
   width="<?php echo reScale($Event->Width(), $Monitor->DefaultScale(), $scale) ?>"
   height="<?php echo reScale($Event->Height(), $Monitor->DefaultScale(), $scale) ?>"
   alt="<?php echo $Frame->EventId().'-'.$Frame->FrameId() ?>"
@@ -132,7 +132,7 @@ if ($imageData['hasAnalImage']) {
   loading="lazy"
 />
 <?php
-if ($imageData['hasAnalImage']) { ?></a><?php } ?>
+if ($imageData['hasAnalysisImage']) { ?></a><?php } ?>
         </p>
 <?php
   $frame_url_base = '?view=frame&amp;eid='.$Event->Id().'&amp;scale='.$scale.'&amp;show='.$show.'&amp;fid=';