ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Converted filter action to use table Id's instead of filterName's when editing existings and creating new filters.

pull/1625/head
bhaal2 2016-09-15 01:29:35 +10:00
parent 0d83fc5be7
commit 99a212803a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/skins/classic/views/filter.php
View File

@ -22,15 +22,15 @@ if ( !canView( 'Events' ) ) {
$view = "error";
return;
}
$selectName = "filterName";
$selectName = "filterId";
$filterNames = array( ''=>translate('ChooseFilter') );
foreach ( dbFetchAll( "select * from Filters order by Name" ) as $row ) {
$filterNames[$row['Name']] = $row['Name'];
foreach ( dbFetchAll( "select * from Filters order by Id" ) as $row ) {
$filterNames[$row['Id']] = $row['Name'];
if ( $row['Background'] )
$filterNames[$row['Name']] .= "*";
$filterNames[$row['Id']] .= "*";
if ( $row['Concurrent'] )
$filterNames[$row['Name']] .= "&";
if ( !empty($_REQUEST['reload']) && isset($_REQUEST['filterName']) && $_REQUEST['filterName'] == $row['Name'] )
$filterNames[$row['Id']] .= "&";
if ( !empty($_REQUEST['reload']) && isset($_REQUEST['filterId']) && $_REQUEST['filterId'] == $row['Id'] )
$dbFilter = $row;
}
@ -57,7 +57,7 @@ if ( isset( $_REQUEST['reload'] ) and ! $_REQUEST['reload'] ) {
$dbFilter['AutoUpload'] = isset( $_REQUEST['AutoUpload'] );
$dbFilter['AutoVideo'] = isset( $_REQUEST['AutoVideo'] );
$dbFilter['AutoDelete'] = isset( $_REQUEST['AutoDelete'] );
$dbFilter['Name'] = $_REQUEST['filterName'];
$dbFilter['Name'] = $_REQUEST['filterId'];
}
$conjunctionTypes = array(