From 8c41781a9f30e1358e598a66bb28246518148a15 Mon Sep 17 00:00:00 2001 From: Kyle Johnson Date: Tue, 8 Nov 2016 16:53:06 -0700 Subject: [PATCH 1/3] Fix event.stop error in watch.js See #1672 (#1678) --- web/skins/classic/views/js/watch.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js index 742c9ea21..9b3b7ea21 100644 --- a/web/skins/classic/views/js/watch.js +++ b/web/skins/classic/views/js/watch.js @@ -496,7 +496,7 @@ function getEventCmdResponse( respObj, respText ) link.set( 'text', event.AvgScore+'/'+event.MaxScore ); link.inject( row.getElement( 'td.colScore' ) ); - link = new Element( 'a', { 'href': '#', 'title': deleteString, 'events': { 'click': function( e ) { deleteEvent( event, event.Id ); }.bind( link ), 'mouseover': highlightRow.pass( row ), 'mouseout': highlightRow.pass( row ) } }); + link = new Element( 'a', { 'href': '#', 'title': deleteString, 'events': { 'click': function( e ) { deleteEvent( e, event.Id ); }.bind( link ), 'mouseover': highlightRow.pass( row ), 'mouseout': highlightRow.pass( row ) } }); link.set( 'text', 'X' ); link.inject( row.getElement( 'td.colDelete' ) ); From 9f43825b9255f0473b722b9b8b68ae304c5b719b Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Tue, 8 Nov 2016 21:10:51 -0600 Subject: [PATCH 2/3] =?UTF-8?q?prevent=20the=20end=20user=20from=20slectin?= =?UTF-8?q?g=20an=20invalid=20configuration=20on=20the=20PT=E2=80=A6=20(#1?= =?UTF-8?q?676)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * prevent the end user from slecting an invalid configuration on the PTZ control configuraion "Move" tab * change to console.php should not be in this pr --- web/skins/classic/views/controlcap.php | 2 +- web/skins/classic/views/js/controlcap.js | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 web/skins/classic/views/js/controlcap.js diff --git a/web/skins/classic/views/controlcap.php b/web/skins/classic/views/controlcap.php index 2a898de9c..88e0d1212 100644 --- a/web/skins/classic/views/controlcap.php +++ b/web/skins/classic/views/controlcap.php @@ -183,7 +183,7 @@ foreach ( $tabs as $name=>$value ) ?>
-
+ diff --git a/web/skins/classic/views/js/controlcap.js b/web/skins/classic/views/js/controlcap.js new file mode 100644 index 000000000..04a0b9e76 --- /dev/null +++ b/web/skins/classic/views/js/controlcap.js @@ -0,0 +1,24 @@ +function validateForm( form ) { + var errors = new Array(); + + // If "Can Move" is enabled, then the end user must also select at least one of the other check boxes (excluding Can Move Diagonally) + if ( form.elements['newControl[CanMove]'].checked ) { + if ( !form.elements['newControl[CanMoveCon]'].checked || !form.elements['newControl[CanMoveRel]'].checked || !form.elements['newControl[CanMoveAbs]'].checked || !form.elements['newControl[CanMoveMap]'].checked ) { + errors[errors.length] = "In addition to \"Can Move\", you also must select at least one of: \"Can Move Mapped\", \"Can Move Absolute\", \"Can Move Relative\", or \"Can Move Continuous\""; + } + } else { + // Now lets check for the opposite condition. If any of the boxes below Can Move are checked, but Can Move is not checked then signal an error + + if ( form.elements['newControl[CanMoveCon]'].checked || form.elements['newControl[CanMoveRel]'].checked || form.elements['newControl[CanMoveAbs]'].checked || form.elements['newControl[CanMoveMap]'].checked || form.elements['newControl[CanMoveDiag]'].checked ) { + errors[errors.length] = "\"Can Move\" must also be selected if any one of the movement types are sleceted"; + } + } + + if ( errors.length ) { + alert( errors.join( "\n" ) ); + return( false ); + } + return( true ); + +} + From 49d8e35e56a3d0960b475d074f176de504a039d3 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Fri, 11 Nov 2016 07:47:08 -0600 Subject: [PATCH 3/3] Show available PATH_MAP percent on console (#1675) * Add PATH_SWAP percent to console * add changes to console.php * use ZM_PATH_MAP instead of ZM_PATH_SWAP * show the folder name PATH_MAP points to * use a dash as the delimiter instead of fwd slash --- web/includes/functions.php | 10 +++++----- web/skins/classic/views/console.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/includes/functions.php b/web/includes/functions.php index 765026a6d..667cab4de 100644 --- a/web/includes/functions.php +++ b/web/includes/functions.php @@ -1429,15 +1429,15 @@ function getLoad() { return( $load[0] ); } -function getDiskPercent() { - $total = disk_total_space(ZM_DIR_EVENTS); +function getDiskPercent($path = ZM_DIR_EVENTS) { + $total = disk_total_space($path); if ( ! $total ) { - Error("disk_total_space returned false for " . ZM_DIR_EVENTS ); + Error("disk_total_space returned false for " . $path ); return 0; } - $free = disk_free_space(ZM_DIR_EVENTS); + $free = disk_free_space($path); if ( ! $free ) { - Error("disk_free_space returned false for " . ZM_DIR_EVENTS ); + Error("disk_free_space returned false for " . $path ); } $space = round(($total - $free) / $total * 100); return( $space ); diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php index 6e06d9176..22368b619 100644 --- a/web/skins/classic/views/console.php +++ b/web/skins/classic/views/console.php @@ -195,7 +195,7 @@ xhtmlHeaders( __FILE__, translate('Console') );