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

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

This commit is contained in:
bhaal2 2016-09-15 01:27:59 +10:00
parent cd0e6ba285
commit 0d83fc5be7
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
web/includes/actions.php
View File

@ -139,16 +139,25 @@ if ( !empty($action) ) {
{ {
if ( !empty($_REQUEST['execute']) ) if ( !empty($_REQUEST['execute']) )
$tempFilterName = "_TempFilter".time(); $tempFilterName = "_TempFilter".time();
if ( isset($tempFilterName) ) if ( isset($tempFilterName) ) {
$filterName = $tempFilterName; $filterName = $tempFilterName;
elseif ( !empty($_REQUEST['newFilterName']) ) }
elseif ( !empty($_REQUEST['newFilterName']) ) {
$filterName = $_REQUEST['newFilterName']; $filterName = $_REQUEST['newFilterName'];
if ( !empty($filterName) ) $sql = "replace into Filters set Name = ".dbEscape($filterName).",";
$endSql = '';
}
else {
$doUpdate = 1;
$sql = "update Filters set";
$endSql = "where Id = ".$_REQUEST['filterId'];
}
if ( !empty($filterName) || $doUpdate )
{ {
$_REQUEST['filter']['sort_field'] = validStr($_REQUEST['sort_field']); $_REQUEST['filter']['sort_field'] = validStr($_REQUEST['sort_field']);
$_REQUEST['filter']['sort_asc'] = validStr($_REQUEST['sort_asc']); $_REQUEST['filter']['sort_asc'] = validStr($_REQUEST['sort_asc']);
$_REQUEST['filter']['limit'] = validInt($_REQUEST['limit']); $_REQUEST['filter']['limit'] = validInt($_REQUEST['limit']);
$sql = "replace into Filters set Name = ".dbEscape($filterName).", Query = ".dbEscape(jsonEncode($_REQUEST['filter'])); $sql .= " Query = ".dbEscape(jsonEncode($_REQUEST['filter']));
if ( !empty($_REQUEST['AutoArchive']) ) if ( !empty($_REQUEST['AutoArchive']) )
$sql .= ", AutoArchive = ".dbEscape($_REQUEST['AutoArchive']); $sql .= ", AutoArchive = ".dbEscape($_REQUEST['AutoArchive']);
if ( !empty($_REQUEST['AutoVideo']) ) if ( !empty($_REQUEST['AutoVideo']) )
@ -167,6 +176,7 @@ if ( !empty($action) ) {
$sql .= ", Background = ".dbEscape($_REQUEST['background']); $sql .= ", Background = ".dbEscape($_REQUEST['background']);
if ( !empty($_REQUEST['concurrent']) ) if ( !empty($_REQUEST['concurrent']) )
$sql .= ", Concurrent = ".dbEscape($_REQUEST['concurrent']); $sql .= ", Concurrent = ".dbEscape($_REQUEST['concurrent']);
$sql .= $endSql;
dbQuery( $sql ); dbQuery( $sql );
$refreshParent = true; $refreshParent = true;
} }