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

Merge branch 'fix_x10' into storageareas

pull/1857/head
Isaac Connor 2017-03-28 20:05:52 -04:00
parent 4d2fb6b7f8 589b369109
commit 769af661e9
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
distros/ubuntu1604/zoneminder.links
View File

@ -1,3 +1,4 @@
/var/cache/zoneminder/events /usr/share/zoneminder/www/events
/var/cache/zoneminder/images /usr/share/zoneminder/www/images
/var/cache/zoneminder/temp /usr/share/zoneminder/www/temp
/var/tmp /usr/share/zoneminder/www/api/app/tmp

8
distros/ubuntu1604/zoneminder.tmpfile
View File

@ -1,2 +1,6 @@
d /var/run/zm 0755 www-data www-data
d /tmp/zm 0755 www-data www-data
d /var/run/zm 0755 www-data www-data
d /tmp/zm 0755 www-data www-data
d /var/tmp/zm 0755 www-data www-data
d /var/tmp/cache 0755 www-data www-data
d /var/tmp/cache/models 0755 www-data www-data
d /var/tmp/cache/persistent 0755 www-data www-data

2
web/includes/actions.php
View File

@ -525,7 +525,7 @@ if ( !empty($action) ) {
dbQuery( "update TriggersX10 set ".implode( ", ", $x10Changes )." where MonitorId=?", array($mid) );
} elseif ( !$user['MonitorIds'] ) {
if ( !$x10Monitor ) {
dbQuery( "insert into TriggersX10 set MonitorId = ?".implode( ", ", $x10Changes ), array( $mid ) );
dbQuery( "insert into TriggersX10 set MonitorId = ?, ".implode( ", ", $x10Changes ), array( $mid ) );
} else {
dbQuery( "delete from TriggersX10 where MonitorId = ?", array($mid) );
}