From b6dde354be1aedfe843265061e8f1409469cd2cd Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@tesla.com>
Date: Tue, 24 Oct 2017 17:34:32 -0700
Subject: [PATCH] rename AnalysisFPS to AnalysisFPSLimit

---
 web/includes/database.php                 |  8 ++++----
 web/skins/classic/views/js/monitor.js.php |  2 +-
 web/skins/classic/views/monitor.php       | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/web/includes/database.php b/web/includes/database.php
index d19bc86ac..483df64a5 100644
--- a/web/includes/database.php
+++ b/web/includes/database.php
@@ -127,10 +127,10 @@ function dbQuery( $sql, $params=NULL ) {
     } else {
       $result = $dbConn->query( $sql );
     }
-    //if ( $params )
-    //Warning("SQL: $sql" . implode(',',$params));
-    //else
-    //Warning("SQL: $sql" );
+    if ( $params )
+      Warning("SQL: $sql" . implode(',',$params));
+    else
+      Warning("SQL: $sql" );
   } catch(PDOException $e) {
     Error( "SQL-ERR '".$e->getMessage()."', statement was '".$sql."' params:" . implode(',',$params) );
   }
diff --git a/web/skins/classic/views/js/monitor.js.php b/web/skins/classic/views/js/monitor.js.php
index 755c1671f..97a60dd8c 100644
--- a/web/skins/classic/views/js/monitor.js.php
+++ b/web/skins/classic/views/js/monitor.js.php
@@ -55,7 +55,7 @@ function validateForm( form ) {
   else if ( form.elements.mid.value == 0 && monitorNames[form.elements['newMonitor[Name]'].value] )
     errors[errors.length] = "<?php echo translate('DuplicateMonitorName') ?>";
 
-  if ( form.elements['newMonitor[AnalysisFPS]'].value && !(parseFloat(form.elements['newMonitor[AnalysisFPS]'].value) > 0 ) )
+  if ( form.elements['newMonitor[AnalysisFPSLimit]'].value && !(parseFloat(form.elements['newMonitor[AnalysisFPSLimit]'].value) > 0 ) )
     errors[errors.length] = "<?php echo translate('BadAnalysisFPS') ?>";
   if ( form.elements['newMonitor[MaxFPS]'].value && !(parseFloat(form.elements['newMonitor[MaxFPS]'].value) > 0 ) )
     errors[errors.length] = "<?php echo translate('BadMaxFPS') ?>";
diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index 42891ac23..340fec26b 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -122,7 +122,7 @@ if ( ! $monitor ) {
           'FrameSkip' => 0,
           'MotionFrameSkip' => 0,
           'EventPrefix' => 'Event-',
-          'AnalysisFPS' => '',
+          'AnalysisFPSLimit' => '',
           'AnalysisUpdateDelay' => 0,
           'MaxFPS' => '',
           'AlarmMaxFPS' => '',
@@ -170,8 +170,8 @@ if ( isset( $_REQUEST['newMonitor'] ) ) {
 }
 
 # What if it has less zeros?  This is not robust code.
-if ( $monitor->AnalysisFPS() == '0.00' )
-  $monitor->AnalysisFPS( '' );
+if ( $monitor->AnalysisFPSLimit() == '0.00' )
+  $monitor->AnalysisFPSLimit( '' );
 if ( $monitor->MaxFPS() == '0.00' )
   $monitor->MaxFPS( '' );
 if ( $monitor->AlarmMaxFPS() == '0.00' )
@@ -538,7 +538,7 @@ if ( $tab != 'general' ) {
       <input type="hidden" name="newMonitor[Enabled]" value="<?php echo validHtmlStr($monitor->Enabled()) ?>"/>
       <input type="hidden" name="newMonitor[RefBlendPerc]" value="<?php echo validHtmlStr($monitor->RefBlendPerc()) ?>"/>
       <input type="hidden" name="newMonitor[AlarmRefBlendPerc]" value="<?php echo validHtmlStr($monitor->AlarmRefBlendPerc()) ?>"/>
-      <input type="hidden" name="newMonitor[AnalysisFPS]" value="<?php echo validHtmlStr($monitor->AnalysisFPS()) ?>"/>
+      <input type="hidden" name="newMonitor[AnalysisFPSLimit]" value="<?php echo validHtmlStr($monitor->AnalysisFPSLimit()) ?>"/>
       <input type="hidden" name="newMonitor[MaxFPS]" value="<?php echo validHtmlStr($monitor->MaxFPS()) ?>"/>
       <input type="hidden" name="newMonitor[AlarmMaxFPS]" value="<?php echo validHtmlStr($monitor->AlarmMaxFPS()) ?>"/>
 <?php
@@ -727,7 +727,7 @@ switch ( $tab ) {
             </select>
           </td>
         </tr>
-        <tr><td><?php echo translate('AnalysisFPS') ?></td><td><input type="text" name="newMonitor[AnalysisFPS]" value="<?php echo validHtmlStr($monitor->AnalysisFPS()) ?>" size="6"/></td></tr>
+        <tr><td><?php echo translate('AnalysisFPS') ?></td><td><input type="text" name="newMonitor[AnalysisFPSLimit]" value="<?php echo validHtmlStr($monitor->AnalysisFPSLimit()) ?>" size="6"/></td></tr>
 <?php
       if ( $monitor->Type() != 'Local' && $monitor->Type() != 'File' && $monitor->Type() != 'NVSocket' ) {
 ?>