Isaac Connor
4e24e3647e
Also join the Storage table, and use it for ServerId instead of Monitors table.
2018-01-03 07:20:20 -08:00
Isaac Connor
485741b6f7
treat File exists as a non-error
2018-01-02 12:44:47 -08:00
Isaac Connor
867f2a9166
simplify deleting event files. The old way was too intensive.
2018-01-02 09:15:50 -08:00
Isaac Connor
f036e95793
fix Moving when Medium Scheme
2017-12-21 16:53:22 -08:00
Isaac Connor
2922a86d23
fixes to new Storage Schemes code
2017-12-19 11:01:03 -05:00
Isaac Connor
dcfae11fc7
fix typos
2017-12-18 13:16:54 -05:00
Isaac Connor
d312482a2b
add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE
2017-12-18 12:52:26 -05:00
Isaac Connor
f64d65e6d7
Make db errors not fatal when deleting an event
2017-12-12 10:55:09 -05:00
Isaac Connor
e7a43b2618
fix, don't set the storage path to NULL
2017-12-06 10:11:59 -08:00
Isaac Connor
073b055b4c
fix Event Moving
2017-12-05 10:21:43 -08:00
Isaac Connor
b1a887dbd8
fixes to move Event
2017-12-05 10:02:21 -08:00
Isaac Connor
82bed8f3fa
actually delete the old files when we move an event
2017-12-05 08:43:13 -08:00
Isaac Connor
203fe79391
cleanup debug
2017-12-04 11:14:55 -05:00
Isaac Connor
1ccd344bf5
implement Storage Area move
2017-12-04 11:05:50 -05:00
digital-gnome
0a995aea78
Add navbar refresh to all pages that use it
2017-11-30 16:33:46 -05:00
Isaac Connor
c2ff010d27
Support NULL in date/time values
2017-11-27 10:04:08 -08:00
Isaac Connor
489d3ba6ed
Merge ../ZoneMinder.master into storageareas
2017-11-21 12:23:17 -05:00
Ognyan Bankov
ded6b1864a
2006 support floureon 1080p 18x 30x ( #2007 )
...
* perl control script for Fluoreon 1080p
* DB update for Floureon cameras support
2017-11-18 19:02:23 -05:00
Isaac Connor
09a715a99f
prevent a warning
2017-11-18 09:41:37 -05:00
APHW2 MFGENG
2ffa79172a
Only load Name,Value when loading config because that's all we use
2017-11-06 08:36:53 -08:00
Isaac Connor
31b756bd53
add missing tests for StartDateTime etc
2017-11-03 07:18:30 -04:00
Isaac Connor
cb01b96dc0
fixes
2017-11-01 12:01:11 -07:00
Isaac Connor
ae8bfadcf7
use static logging method
2017-10-27 21:13:14 -07:00
Isaac Connor
b3d65729da
apache style logging function take a logging object
2017-10-27 21:13:01 -07:00
Isaac Connor
2003798e64
copy in start and end transaction
2017-10-27 21:06:11 -07:00
Isaac Connor
2d6998ad25
fix debug_all
2017-10-27 20:54:54 -07:00
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