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

Fix saving Filters and other objects. Apparently comparing 0 to NOW() doesn't work.

pull/3196/head
Isaac Connor 2021-03-18 14:09:15 -04:00
parent edefbfcad6
commit 4cb38a119e
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
web/includes/Object.php
View File

@ -302,14 +302,20 @@ class ZM_Object {
# Set defaults. Note that we only replace "" with null, not other values
# because for example if we want to clear TimestampFormat, we clear it, but the default is a string value
foreach ( $this->defaults as $field => $default ) {
if ( (!property_exists($this, $field)) or ($this->{$field} === '') ) {
if ( is_array($default) ) {
if (!property_exists($this, $field)) {
if (is_array($default)) {
$this->{$field} = $default['default'];
} else if ( $default == null ) {
} else {
$this->{$field} = $default;
}
} else if ($this->{$field} === '') {
if (is_array($default)) {
$this->{$field} = $default['default'];
} else if ($default == null) {
$this->{$field} = $default;
}
}
}
} # end foreach default
$fields = array_filter(
$this->defaults,
@ -339,10 +345,10 @@ class ZM_Object {
') VALUES ('.
implode(', ', array_map(function($field){return $this->$field() == 'NOW()' ? 'NOW()' : '?';}, $fields)).')';
$values = array_values(array_map(
function($field){return $this->$field();},
array_filter($fields, function($field){ return $this->$field() != 'NOW()';})
));
# For some reason comparing 0 to 'NOW()' returns false; So we do this.
$filtered = array_filter($fields, function($field){ return ( (!$this->$field()) or ($this->$field() != 'NOW()'));});
$mapped = array_map(function($field){return $this->$field();}, $filtered);
$values = array_values($mapped);
if ( dbQuery($sql, $values) ) {
$this->{'Id'} = dbInsertId();
return true;