ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixup saving Filters and executing them

This commit is contained in:
Isaac Connor 2016-09-20 12:17:19 -04:00
parent f06723a178
commit 1add270b72
1 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
web/includes/actions.php
View File

@ -124,36 +124,31 @@ if ( !empty($action) ) {
}
// Event scope actions, view permissions only required
if ( canView( 'Events' ) )
{
if ( $action == "filter" )
{
if ( !empty($_REQUEST['subaction']) )
{
if ( canView( 'Events' ) ) {
if ( $action == 'filter' ) {
if ( !empty($_REQUEST['subaction']) ) {
if ( $_REQUEST['subaction'] == "addterm" )
$_REQUEST['filter'] = addFilterTerm( $_REQUEST['filter'], $_REQUEST['line'] );
elseif ( $_REQUEST['subaction'] == "delterm" )
$_REQUEST['filter'] = delFilterTerm( $_REQUEST['filter'], $_REQUEST['line'] );
}
elseif ( canEdit( 'Events' ) )
{
if ( !empty($_REQUEST['execute']) )
$tempFilterName = "_TempFilter".time();
if ( isset($tempFilterName) ) {
$filterName = $tempFilterName;
}
elseif ( !empty($_REQUEST['newFilterName']) ) {
$filterName = $_REQUEST['newFilterName'];
$sql = "replace into Filters set Name = ".dbEscape($filterName).",";
} elseif ( canEdit( 'Events' ) ) {
$sql = '';
$endSql = '';
$filterName = '';
if ( !empty($_REQUEST['execute']) ) {
// TempFilterName is used in event listing later on
$tempFilterName = $filterName = "_TempFilter".time();
} elseif ( !empty($_REQUEST['newFilterName']) ) {
$filterName = $_REQUEST['newFilterName'];
}
else {
$doUpdate = 1;
$sql = "update Filters set";
$endSql = "where Id = ".$_REQUEST['filterId'];
if ( $filterName ) {
$sql = "REPLACE INTO Filters SET Name = ".dbEscape($filterName).",";
} else {
$sql = 'UPDATE Filters SET';
$endSql = "where Id = ".$_REQUEST['Id'];
}
if ( !empty($filterName) || $doUpdate )
{
if ( !empty($filterName) || $endSql ) {
$_REQUEST['filter']['sort_field'] = validStr($_REQUEST['sort_field']);
$_REQUEST['filter']['sort_asc'] = validStr($_REQUEST['sort_asc']);
$_REQUEST['filter']['limit'] = validInt($_REQUEST['limit']);
@ -180,9 +175,9 @@ if ( !empty($action) ) {
dbQuery( $sql );
$refreshParent = true;
}
}
}
}
} // end if canedit events
} // end if action == filter
} // end if canview events
// Event scope actions, edit permissions required
if ( canEdit( 'Events' ) )
@ -223,20 +218,21 @@ if ( !empty($action) ) {
}
}
}
elseif ( $action == "delete" )
elseif ( $action == 'delete' )
{
foreach( getAffectedIds( 'markEid' ) as $markEid )
{
deleteEvent( $markEid );
$refreshParent = true;
}
if ( !empty($_REQUEST['fid']) )
{
dbQuery( 'DELETE FROM Filters WHERE Id=?', array( $_REQUEST['filterId'] ) );
if ( isset( $_REQUEST['object'] ) and ( $_REQUEST['object'] == 'filter' ) ) {
if ( !empty($_REQUEST['Id']) ) {
dbQuery( 'DELETE FROM Filters WHERE Id=?', array( $_REQUEST['Id'] ) );
//$refreshParent = true;
}
}
}
}
// Monitor control actions, require a monitor id and control view permissions for that monitor
if ( !empty($_REQUEST['mid']) && canView( 'Control', $_REQUEST['mid'] ) )