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

Merge branch 'master' into iconnor_video

This commit is contained in:
Isaac Connor 2016-04-04 10:17:18 -04:00
parent 9287cd0e0a 9276eea491
commit de8f9570e6
2 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
distros/ubuntu1204/control
View File

@ -3,41 +3,41 @@ Section: net
Priority: optional Priority: optional
Maintainer: Isaac Connor <iconnor@connortechnology.com> Maintainer: Isaac Connor <iconnor@connortechnology.com>
Build-Depends: debhelper (>= 9), autoconf, automake, quilt, dh-autoreconf, libtool Build-Depends: debhelper (>= 9), autoconf, automake, quilt, dh-autoreconf, libtool
, libgnutls-dev ,libgnutls-dev
, libmysqlclient-dev | libmariadbclient-dev ,libmysqlclient-dev | libmariadbclient-dev
, libjpeg8-dev|libjpeg9-dev|libjpeg62-turbo-dev ,libjpeg8-dev|libjpeg9-dev|libjpeg62-turbo-dev
, libpcre3-dev ,libpcre3-dev
, libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev ,libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev
, libv4l-dev (>= 0.8.3) ,libv4l-dev (>= 0.8.3)
, libbz2-dev ,libbz2-dev
, libavdevice-dev ,libavdevice-dev
, libvlccore-dev, libvlc-dev ,libvlccore-dev, libvlc-dev
, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev ,libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
, libgcrypt11-dev, libpolkit-gobject-1-dev ,libgcrypt11-dev, libpolkit-gobject-1-dev
Standards-Version: 3.9.4 Standards-Version: 3.9.4
Package: zoneminder Package: zoneminder
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
, apache2, libapache2-mod-php5 | libapache2-mod-fcgid, php5, php5-mysql|php5-mysqlnd ,apache2, libapache2-mod-php5 | libapache2-mod-fcgid, php5, php5-mysql|php5-mysqlnd
, mariadb-client|mysql-client|mysql-client-5.6 ,mariadb-client|mysql-client|mysql-client-5.6
, libpcre3 ,libpcre3
, ffmpeg | libav-tools ,ffmpeg | libav-tools
, rsyslog | system-log-daemon ,rsyslog | system-log-daemon
, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl ,libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl
, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl ,libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl
, libdbd-mysql-perl ,libdbd-mysql-perl
, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl ,libmodule-load-perl, libsys-mmap-perl, libjson-any-perl
, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, liburi-encode-perl ,libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, liburi-encode-perl
, libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl ,libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl
, libsys-cpu-perl, libsys-meminfo-perl ,libsys-cpu-perl, libsys-meminfo-perl
, libavdevice53 | libavdevice55 ,libavdevice53 | libavdevice55
, libjpeg8|libjpeg9|libjpeg62-turbo ,libjpeg8|libjpeg9|libjpeg62-turbo
, zip ,zip
, libvlccore5 | libvlccore7 | libvlccore8, libvlc5 ,libvlccore5 | libvlccore7 | libvlccore8, libvlc5
, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev ,libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
, libpolkit-gobject-1-0 ,libpolkit-gobject-1-0
, php5-gd ,php5-gd
Recommends: mysql-server|mariadb-server Recommends: mysql-server|mariadb-server
Description: Video camera security and surveillance solution Description: Video camera security and surveillance solution
ZoneMinder is intended for use in single or multi-camera video security ZoneMinder is intended for use in single or multi-camera video security

4
web/includes/functions.php
View File

@ -985,6 +985,7 @@ function daemonControl( $command, $daemon=false, $args=false )
function zmcControl( $monitor, $mode=false ) function zmcControl( $monitor, $mode=false )
{ {
if ( (!ZM_SERVER) or ( ZM_SERVER==$monitor[ServerId}) ) {
$row = NULL; $row = NULL;
if ( $monitor['Type'] == "Local" ) if ( $monitor['Type'] == "Local" )
{ {
@ -1010,10 +1011,12 @@ function zmcControl( $monitor, $mode=false )
} }
daemonControl( "start", "zmc", $zmcArgs ); daemonControl( "start", "zmc", $zmcArgs );
} }
}
} }
function zmaControl( $monitor, $mode=false ) function zmaControl( $monitor, $mode=false )
{ {
if ( (!ZM_SERVER) or ( ZM_SERVER==$monitor[ServerId}) ) {
if ( !is_array( $monitor ) ) if ( !is_array( $monitor ) )
{ {
$monitor = dbFetchOne( "select C.*, M.* from Monitors as M left join Controls as C on (M.ControlId = C.Id ) where M.Id=?", NULL, array($monitor) ); $monitor = dbFetchOne( "select C.*, M.* from Monitors as M left join Controls as C on (M.ControlId = C.Id ) where M.Id=?", NULL, array($monitor) );
@ -1058,6 +1061,7 @@ function zmaControl( $monitor, $mode=false )
daemonControl( "reload", "zma", "-m ".$monitor['Id'] ); daemonControl( "reload", "zma", "-m ".$monitor['Id'] );
} }
} }
}
} }
function initDaemonStatus() function initDaemonStatus()