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

Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas

This commit is contained in:
Isaac Connor 2017-06-29 15:37:18 -04:00
parent 1b71114fb9 a886d30aa7
commit 76cb2f83e1
3 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
View File

@ -379,8 +379,8 @@ sub level {
$this->{effectiveLevel} = $this->{termLevel} if ( $this->{termLevel} > $this->{effectiveLevel} );
$this->{effectiveLevel} = $this->{databaseLevel} if ( $this->{databaseLevel} > $this->{effectiveLevel} );
$this->{effectiveLevel} = $this->{fileLevel} if ( $this->{fileLevel} > $this->{effectiveLevel} );
$this->{effectiveLevel} = $this->{syslogLevel} if ( $this->{syslogLevel} > $this->{level} );
$this->{effectiveLevel} = $this->{level} if ( $this->{effectiveLevel} > $this->{level} );
$this->{effectiveLevel} = $this->{syslogLevel} if ( $this->{syslogLevel} > $this->{effectiveLevel} );
$this->{effectiveLevel} = $this->{level} if ( $this->{effectiveLevel} > $this->{effectiveLevel} );
}
return( $this->{level} );
}

4
scripts/zmvideo.pl.in
View File

@ -190,9 +190,7 @@ if ( $event_id ) {
} else {
Debug(@event_ids . " events found for $filter_name");
}
$concat_name = $filter_name if ! $concat_name;
} else {
Warning("Nothing to do");
$concat_name = $filter_name if $concat_name eq '';
}
my $sql = " SELECT (SELECT max(Delta) FROM Frames WHERE EventId=Events.Id)-(SELECT min(Delta) FROM Frames WHERE EventId=Events.Id) as FullLength,

26
web/includes/Filter.php
View File

@ -59,7 +59,8 @@ public $defaults = array(
if ( array_key_exists( $fn, $this ) ) {
return $this->{$fn};
} else if ( array_key_exists( $fn, $this->defaults ) ) {
return $this->defaults{$fn};
$this->{$fn} = $this->defaults{$fn};
return $this->{$fn};
} else {
$backTrace = debug_backtrace();
@ -71,29 +72,40 @@ public $defaults = array(
public function terms( ) {
if ( func_num_args( ) ) {
$this->{'Query'}['terms'] = func_get_arg(0);
$this->Query()['terms'] = func_get_arg(0);
}
return $this->{'Query'}['terms'];
if ( isset( $this->Query()['terms'] ) ) {
return $this->Query()['terms'];
}
return array();
}
// The following three fields are actually stored in the Query
public function sort_field( ) {
if ( func_num_args( ) ) {
$this->{'Query'}['sort_field'] = func_get_arg(0);
$this->Query()['sort_field'] = func_get_arg(0);
}
return $this->{'Query'}['sort_field'];
if ( isset( $this->Query()['sort_field'] ) ) {
return $this->{'Query'}['sort_field'];
}
return $this->defaults{'sort_field'};
}
public function sort_asc( ) {
if ( func_num_args( ) ) {
$this->{'Query'}['sort_asc'] = func_get_arg(0);
}
return $this->{'Query'}['sort_asc'];
if ( isset( $this->Query()['sort_asc'] ) ) {
return $this->{'Query'}['sort_asc'];
}
return $this->defaults{'sort_asc'};
}
public function limit( ) {
if ( func_num_args( ) ) {
$this->{'Query'}['limit'] = func_get_arg(0);
}
return $this->{'Query'}['limit'];
if ( isset( $this->Query()['limit'] ) )
return $this->{'Query'}['limit'];
return $this->defaults{'limit'};
}
public static function find_all() {