Isaac Connor
6c03ae32c2
add code to update the statuses in the Server record every second. This code also reduces the timeout from .1 seconds to 1 second. Should reduce load by zmdc on low power devices. I see no reason to poll that heavily...
2017-10-24 12:31:23 -07:00
Isaac Connor
7f565e318f
use the untaint version otherwise we die with error 9
2017-10-13 08:59:32 -04:00
Isaac Connor
5c7203f2bb
Fix File=> File::Find
2017-10-12 11:42:49 -07:00
Isaac Connor
e6c0add17e
add ZM_BANDWIDTH_DEFAULT
2017-10-12 12:09:05 -04:00
Isaac Connor
7f50a13074
add Event disk space recalc to zmaudit
2017-10-10 12:11:59 -07:00
Isaac Connor
09242d72b3
implement alternate ports for streaming
2017-10-05 16:05:41 -04:00
Isaac Connor
ad1808d43b
warn when path doesn't exist in event::age
2017-10-03 13:25:05 -04:00
Isaac Connor
11b29bf1ec
Fixup ONVIF module, making it actually usable
2017-08-25 11:16:37 -04:00
Isaac Connor
0c24556611
fix missing !
2017-08-24 10:59:56 -04:00
Isaac Connor
d11a2947bb
use Id instead of id
2017-08-24 10:44:14 -04:00
Isaac Connor
676c4b7ddc
Merge branch 'master' into storageareas
2017-08-22 09:52:14 -04:00
Isaac Connor
40cc13a903
fix whitespace
2017-08-22 09:34:02 -04:00
Andrew Bauer
ac5d1738ea
allow changing of the timestamp char code delimeter ( #1972 )
2017-08-21 11:27:11 -04:00
Isaac Connor
6e24eb6462
use find_one ins tead of New when loading event to determine if event still exists in db
2017-08-18 09:28:14 -04:00
Isaac Connor
85202a0bfd
add test for when an event is deleted during audit
2017-08-15 13:06:59 -04:00
Isaac Connor
49464d381a
Merge branch 'master' into storageareas
2017-08-14 10:44:40 -04:00
ralimi
ecb7df0e8b
Support SSL for mysql connections ( #1965 )
...
* Fix install location for config files when building to alternate directory.
With the previous code, we ended up with a directory structure like the following:
$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf
* Omitted README file that should have appeared in /etc/zm/conf.d
* Fix location for configs when building to alternate directory.
* Fix works, but this should go on a branch instead.
* Fix works, but this should go on a branch instead.
* Fix location for configs when building to alternate directory.
With the previous code, we ended up with a directory structure like the following:
$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf
* Remove double quotes. This is a list of paths.
* Allow SSL database connection to be secured with SSL.
* Fix incorrect variable name
* Fix PHP syntax errors
* SSL connection parameters must also be passed in API.
* Revert fixes to build files; they should not be in this branch.
2017-08-14 10:30:42 -04:00
Isaac Connor
1f8871639a
only complain about losing the dbh connection, if we can't reconnect
2017-07-27 09:56:07 -04:00
Isaac Connor
342aacd94f
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-07-26 10:19:44 -04:00
Isaac Connor
cfbfc0dd44
Merge branch 'master' into storageareas
2017-07-21 11:04:32 -04:00
Isaac Connor
ee7d714d59
refuse and log attempt to delete an event without full info
2017-07-21 10:54:09 -04:00
Isaac Connor
1264f0601f
update to storageareas version, which changes the sql to use subqueries instead of JOINs
2017-07-14 15:55:08 -04:00
Andrew Bauer
89bcfc4e28
fix incorrect gpl license text mailing address
2017-07-14 10:39:50 -05:00
Isaac Connor
b3984ea2da
Merge branch 'master' into storageareas
2017-07-14 10:38:20 -04:00
Isaac Connor
801d978898
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-07-14 10:30:25 -04:00
Isaac Connor
a07f8961d1
add another zmDbConnect at the bottom of the while(1) loop which will ping and reconnect to db if neccessary.
2017-07-14 10:30:12 -04:00
Isaac Connor
d5a4aaca5d
fix braces, spacing, move pod docs to bottom
2017-07-14 10:28:31 -04:00
Martin Goodwell
3789dcb5de
Introducing Maginon Supra IPC camera Controls and script ( #1947 )
...
* Added Maginon Supra IPC to Controls
* Adding support for Maginon Supra IPC camera
2017-07-13 11:10:20 -04:00
Isaac Connor
a9e72288f6
add -safe 0 to ffmpeg command line option so that it will generate the concat file
2017-07-11 16:11:52 -04:00
Isaac Connor
771d385257
Merge branch 'logger_fix' into storageareas
2017-07-05 15:28:44 -04:00
Isaac Connor
2cab6baf2c
add some comments and one change that may fix effectiveLevel use
2017-07-05 15:25:01 -04:00
Isaac Connor
f183a74b0a
increase the wait time for waiting for zmdc to startup
2017-07-04 10:11:57 -04:00
Isaac Connor
d7950bd732
Merge branch 'master' into knnniggett-configfiles
2017-07-03 21:53:47 -04:00
Isaac Connor
7a85e22bfc
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-06-28 16:22:16 -04:00
Isaac Connor
1ef25ae1f3
switch to single quotes where possible
2017-06-28 11:03:35 -04:00
Isaac Connor
9ba9495ae0
whitespace, braces, move pod doc to bottom. No functional changes
2017-06-28 10:53:35 -04:00
Isaac Connor
90696331a9
Merge branch 'master' into storageareas
2017-06-26 21:58:11 -04:00
Isaac Connor
92c25dc58c
Merge branch 'master' into storageareas
2017-06-23 10:43:46 -04:00
Isaac Connor
5d63bc47cc
I believe level should be effectiveLevel here
2017-06-23 10:22:37 -04:00
Isaac Connor
12c3bde8b0
remove debug
2017-06-23 10:04:50 -04:00
Isaac Connor
25b66e9629
whitespace mostly.
2017-06-23 09:58:54 -04:00
Isaac Connor
3a00656c3f
WHen can't open file log, turn on terminal logging so that the message goes somewhere useful.
2017-06-23 09:58:19 -04:00
Isaac Connor
2460e1acd9
fix whitspace
2017-06-23 09:58:01 -04:00
abishai
950c8f19d3
Upstream FreeBSD patches ( #1926 )
...
* apply FreeBSD patches
* timeval struct needs time.h
* typo
* added forgotten destination for systemd startup script install
2017-06-22 10:14:24 -04:00
Isaac Connor
be8be3b0fd
Put back Lost Storageareas code
2017-06-19 13:40:32 -04:00
Isaac Connor
085d239a6e
Merge branch 'master' into storageareas
2017-06-13 18:02:28 -04:00
Andrew Bauer
df304b417a
Update zmupdate.pl.in
2017-06-13 11:08:58 -05:00
Andrew Bauer
bacf65ae9a
Migrate values from Options -> Paths to zm.conf ( #1908 )
...
* initial commit to migrate contents of Options->Paths to zm.conf
* remove paths items from configdata.pm
* remove paths tab from options
* update deb packaging scripts with new cmake vars
* remove extraneous file
* save custom paths variables to config file before dB is freshened
* don't check configs if the dB version is >= 1.31.0
2017-06-12 21:39:37 -04:00
Isaac Connor
c75215ad29
fix merge problems
2017-06-09 09:13:30 -04:00
Isaac Connor
371b86300a
Merge branch 'master' into storageareas
2017-06-08 14:23:40 -04:00
Isaac Connor