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

Fix set() and __call to use the default value when set value is ''. Fixes issues in monitor view when changing type

pull/3202/head
Isaac Connor 2021-03-22 12:06:25 -04:00
parent c347261e19
commit fa08240a4d
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
web/includes/Object.php
View File

@ -39,6 +39,7 @@ class ZM_Object {
public function __call($fn, array $args){ public function __call($fn, array $args){
$type = (array_key_exists($fn, $this->defaults) && is_array($this->defaults[$fn])) ? $this->defaults[$fn]['type'] : 'scalar'; $type = (array_key_exists($fn, $this->defaults) && is_array($this->defaults[$fn])) ? $this->defaults[$fn]['type'] : 'scalar';
if ( count($args) ) { if ( count($args) ) {
if ( $type == 'set' and is_array($args[0]) ) { if ( $type == 'set' and is_array($args[0]) ) {
$this->{$fn} = implode(',', $args[0]); $this->{$fn} = implode(',', $args[0]);
@ -51,7 +52,15 @@ class ZM_Object {
$this->{$fn} = preg_replace($this->defaults[$fn]['filter_regexp'], '', $args[0]); $this->{$fn} = preg_replace($this->defaults[$fn]['filter_regexp'], '', $args[0]);
} }
} else { } else {
$this->{$fn} = $args[0]; if ( $args[0] == '' and array_key_exists($fn, $this->defaults) ) {
if ( is_array($this->defaults[$fn]) ) {
$this->{$fn} = $this->defaults[$fn]['default'];
} else {
$this->{$fn} = $this->defaults[$fn];
}
} else {
$this->{$fn} = $args[0];
}
} }
} }
@ -175,7 +184,7 @@ class ZM_Object {
$this->$field($value); $this->$field($value);
} else { } else {
if ( is_array($value) ) { if ( is_array($value) ) {
# perhaps should turn into a comma-separated string # perhaps should turn into a comma-separated string
$this->{$field} = implode(',', $value); $this->{$field} = implode(',', $value);
} else if ( is_string($value) ) { } else if ( is_string($value) ) {
if ( array_key_exists($field, $this->defaults) && is_array($this->defaults[$field]) && isset($this->defaults[$field]['filter_regexp']) ) { if ( array_key_exists($field, $this->defaults) && is_array($this->defaults[$field]) && isset($this->defaults[$field]['filter_regexp']) ) {
@ -186,8 +195,14 @@ class ZM_Object {
} else { } else {
$this->{$field} = preg_replace($this->defaults[$field]['filter_regexp'], '', trim($value)); $this->{$field} = preg_replace($this->defaults[$field]['filter_regexp'], '', trim($value));
} }
} else if ( $value == '' and array_key_exists($field, $this->defaults) ) {
if ( is_array($this->defaults[$field]) ) {
$this->{$field} = $this->defaults[$field]['default'];
} else {
$this->{$field} = $this->defaults[$field];
}
} else { } else {
$this->{$field} = trim($value); $this->{$field} = $value;
} }
} else if ( is_integer($value) ) { } else if ( is_integer($value) ) {
$this->{$field} = $value; $this->{$field} = $value;