Commit Graph

569 Commits

Author SHA1 Message Date
Isaac Connor
2d8a4794de add save, set, transform, and some globals pointing to dbh and log 2017-10-27 20:54:29 -07:00
Isaac Connor
8b4468caed add apache log style aliases 2017-10-27 20:54:19 -07:00
Isaac Connor
663cc6df87 improve logging of zmfilter 2017-10-27 09:09:12 -07:00
Isaac Connor
82fbec697f add IS and IS NOT as filter operators so that we can do IS NULL and IS NOT NULL because = NULL and !=NULL are not valid 2017-10-27 08:37:53 -07:00
Isaac Connor
e27b95c820 make zmfilter update DiskSPace. ALso rename DiskUsage in Event to DiskSpace 2017-10-27 08:05:35 -07:00
Isaac Connor
653d213d62 Add EndTime and DiskSpace to Filters 2017-10-25 11:11:19 -07:00
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
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
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
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
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
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
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
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
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
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
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
371b86300a Merge branch 'master' into storageareas 2017-06-08 14:23:40 -04:00
Andrew Bauer
2bc6f1627e Add support for conf.d subfolder (#1902)
* cmake changes to support conf.d

* php changes to support conf.d

* perl changes to support conf.d

* C changes to support conf.d

* add conf.d support to rpmspecfile

* fix typo

* specify ZM_CONFIG_SUBDIR in relevant target distros

* put back my config_file perl definition

* remove quotes from ZM macros

* fix snprintf

* add README to conf.d folder

* adjust rpm specfile

* remove custom permissions from README in rpmspecfile

* modify rpm README documentation to reflect conf.d support

* set ZM_CONFIG_SUBDIR in debian rules file
2017-06-05 16:39:19 -04:00
Isaac Connor
451714a403 Merge branch 'master' into storageareas 2017-06-04 21:42:56 -04:00
Isaac Connor
7d6f85f9ea Merge ../ZoneMinder.connortechnology 2017-06-02 20:18:16 -04:00
Isaac Connor
d910bcf121 fix quoting on config 2017-06-02 20:18:05 -04:00
Isaac Connor
7b8222f73b fix type for WEB_EVENT_DISK_SPACE to boolean. 2017-06-02 20:17:08 -04:00
Isaac Connor
98b49fb64d quotes, spacing 2017-05-31 21:28:40 -04:00
Isaac Connor
53a7b2e72c more double quotes to single quotes and fix some spacing 2017-05-31 09:57:55 -04:00
Isaac Connor
82a13fac76 new class for Monitors 2017-05-30 21:21:51 -04:00
Isaac Connor
32d1e62f73 braces, spacing, quotes 2017-05-30 21:18:13 -04:00
Isaac Connor
885823aeb6 remove unnecessary quotes and convert double quotes to single quotes 2017-05-30 21:11:51 -04:00
Isaac Connor
1d5248c0b8 merge from SA, but remove Storageareas bits 2017-05-30 20:06:29 -04:00
Isaac Connor
dcf7c7f015 put back requires 2017-05-30 19:52:19 -04:00
Isaac Connor
ab85239d82 fix braces, invert control directions when camera is flipped 2017-05-30 19:49:30 -04:00
Isaac Connor
0bb2bed32c remove blank lines, do some better escaping 2017-05-30 19:47:35 -04:00
Isaac Connor
cca2c624f9 fix spelling mistake 2017-05-30 19:42:38 -04:00