From ee3a0c1fd112faa74a4dda359122f4d9138872c8 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Fri, 8 Feb 2019 09:55:32 -0500
Subject: [PATCH] fix validateForm running on monitor cancel due to lack of
 type=button on cancel button

---
 web/index.php                             | 2 +-
 web/skins/classic/views/js/monitor.js.php | 4 ++--
 web/skins/classic/views/monitor.php       | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/web/index.php b/web/index.php
index 5190fad65..40b387c02 100644
--- a/web/index.php
+++ b/web/index.php
@@ -224,7 +224,7 @@ if ( ZM_OPT_USE_AUTH and !isset($user) ) {
   Logger::Debug('Redirecting to login');
   $view = 'login';
   $request = null;
-} else if ( ZM_SHOW_PRIVACY && ($action != 'privacy') && ($view != 'options') && (!$request) && canEdit('System') ) {
+} else if ( ZM_SHOW_PRIVACY && ($view != 'privacy') && ($view != 'options') && (!$request) && canEdit('System') ) {
   Logger::Debug('Redirecting to privacy');
   $view = 'privacy';
   $request = null;
diff --git a/web/skins/classic/views/js/monitor.js.php b/web/skins/classic/views/js/monitor.js.php
index 82127dd8e..6bb6f73ff 100644
--- a/web/skins/classic/views/js/monitor.js.php
+++ b/web/skins/classic/views/js/monitor.js.php
@@ -133,9 +133,9 @@ function validateForm( form ) {
 
   if ( errors.length ) {
     alert( errors.join( "\n" ) );
-    return( false );
+    return false;
   }
-  return( true );
+  return true;
 }
 
 function updateLinkedMonitors( element ) {
diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index af770eb79..59e4ca04f 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -108,8 +108,8 @@ if ( ! $monitor ) {
           'EventPrefix' => 'Event-',
           'AnalysisFPSLimit' => '',
           'AnalysisUpdateDelay' => 0,
-          'MaxFPS' => '30',
-          'AlarmMaxFPS' => '30',
+          'MaxFPS' => null,
+          'AlarmMaxFPS' => null,
           'FPSReportInterval' => 100,
           'RefBlendPerc' => 6,
           'AlarmRefBlendPerc' => 6,
@@ -1044,7 +1044,7 @@ if ( $monitor->Type() == 'Local' ) {
         </table>
         <div id="contentButtons">
           <button type="submit" value="Save"<?php echo canEdit('Monitors') ? '' : ' disabled="disabled"' ?>><?php echo translate('Save') ?></button>
-          <button data-on-click="closeWindow"><?php echo translate('Cancel') ?></button>
+          <button type="button" data-on-click="closeWindow"><?php echo translate('Cancel') ?></button>
         </div>
       </form>
     </div>