b41363fd60
Merge branch 'patch-3' of https://github.com/habibapp1365/zoneminder into habibapp1365-patch-3
2018-03-06 11:37:49 -06:00
50a63c7899
Create DCS3415.pm
...
D-Link DCS-3415 IP Control Protocol
2018-03-06 11:31:39 +03:30
3aa31fd524
Merge branch 'master' into storageareas
2018-02-23 10:23:35 -05:00
3eaf95c607
handle Storage reload request
2018-02-21 14:09:51 -05:00
449ac87af1
force reload on Storage in Event object when moving
2018-02-21 14:09:12 -05:00
af560b8291
SIG{TERM} can be empty
2018-02-19 15:14:36 -05:00
6883350e47
spacing/quotes/google code style. Always close and reopen logfile, as the filename may have changed
2018-02-15 10:00:13 -05:00
956f9ee193
if there is a custom term handler in place, call it when Fatal
2018-02-11 14:17:44 -05:00
208d563e11
fix Event => __git_main[0]
2018-02-09 02:09:00 +01:00
069d53a9a0
Add the object debug when path to event does not exist in DiskSpace
2018-02-07 08:02:37 -05:00
630dde26d1
Add files via upload
2018-02-05 18:52:05 -05:00
0287868f5e
include the status when error runCommand
2018-02-02 11:06:47 -05:00
87ef17dddc
errors running a command should NOT exit!
2018-02-02 11:05:56 -05:00
c96f47886c
Fix discover not picking up a 1.2 response if we already have a 1.1
2018-01-31 16:56:46 -05:00
0bd1ee5992
Merge branch 'master' into m
2018-01-25 08:43:31 -05:00
e4c900a868
Use a LEFT JOIN on Storage WHEN Running Filters
2018-01-24 12:34:06 -05:00
1800c6fcf0
Add locking around Event deletion
2018-01-24 12:16:34 -05:00
cf4ac74d02
If failed to delete from Frames or Stats, return instead of deleting the event.
2018-01-24 10:45:42 -05:00
ce19c65cc9
Ipcc ( #2040 )
...
* fix(ipcc): Invert up/down to work properly
* fix(ipcc): Change the initial values for ipcc camera
2018-01-22 15:33:11 -05:00
37ff7c3779
Add finding by Id to Event
2018-01-22 15:26:01 -05:00
2068a5c684
Add object caching
2018-01-22 15:25:51 -05:00
b317748796
Add Server loading
2018-01-22 11:09:49 -05:00
493a2386c4
Only load Time from StartTime if it has a value. Parse Path to get LInkPath if no Time.
2018-01-22 11:09:35 -05:00
c5332a255b
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-01-21 21:11:28 +01:00
fedd67a7f6
add to_string
2018-01-21 21:11:05 +01:00
43d72decac
Turn off extra debugging
2018-01-19 18:24:59 -05:00
dfce773341
We should return the value of DiskSpace
2018-01-19 13:32:28 -05:00
62704601ca
We should return the value of DIskSpace
2018-01-19 19:22:43 +01:00
9fb1074875
add auto-scheme detection from path. Fix de-tainting in delete_files
2018-01-19 11:39:31 -05:00
5472a1a012
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-01-18 11:40:37 -05:00
715adb5acb
add locking to Event moving and diskspace updating.
2018-01-18 11:38:08 -05:00
eb92a1ed8b
merge updates that fix Event moving
2018-01-17 12:59:34 -08:00
426976ddb7
cleanup return code
2018-01-16 14:04:44 -05:00
aaa6c5cccb
Only delete files if no error
2018-01-16 14:01:26 -05:00
1d6c9d6edd
Empty Storage Name should not be Fatal
2018-01-13 10:14:11 -05:00
12d310a9cb
Cleanup
2018-01-11 22:53:34 +01:00
5792021ee3
Merge branch 'storageareas' into fugro
2018-01-10 15:08:28 -05:00
f14859d7d0
Add ZM_STATS_UPDATE_INTERVAL
2018-01-10 13:20:24 -05:00
e28b6c8b7c
When server is NULL, don't escape the NULL
2018-01-09 07:29:32 -08:00
4e24e3647e
Also join the Storage table, and use it for ServerId instead of Monitors table.
2018-01-03 07:20:20 -08:00
485741b6f7
treat File exists as a non-error
2018-01-02 12:44:47 -08:00
867f2a9166
simplify deleting event files. The old way was too intensive.
2018-01-02 09:15:50 -08:00
148e21d707
fugro
2017-12-21 21:46:21 -05:00
f036e95793
fix Moving when Medium Scheme
2017-12-21 16:53:22 -08:00
2922a86d23
fixes to new Storage Schemes code
2017-12-19 11:01:03 -05:00
dcfae11fc7
fix typos
2017-12-18 13:16:54 -05:00
d312482a2b
add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE
2017-12-18 12:52:26 -05:00
f64d65e6d7
Make db errors not fatal when deleting an event
2017-12-12 10:55:09 -05:00
e7a43b2618
fix, don't set the storage path to NULL
2017-12-06 10:11:59 -08:00
073b055b4c
fix Event Moving
2017-12-05 10:21:43 -08:00
b1a887dbd8
fixes to move Event
2017-12-05 10:02:21 -08:00
82bed8f3fa
actually delete the old files when we move an event
2017-12-05 08:43:13 -08:00
203fe79391
cleanup debug
2017-12-04 11:14:55 -05:00
1ccd344bf5
implement Storage Area move
2017-12-04 11:05:50 -05:00
0a995aea78
Add navbar refresh to all pages that use it
2017-11-30 16:33:46 -05:00
c2ff010d27
Support NULL in date/time values
2017-11-27 10:04:08 -08:00
489d3ba6ed
Merge ../ZoneMinder.master into storageareas
2017-11-21 12:23:17 -05:00
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
09a715a99f
prevent a warning
2017-11-18 09:41:37 -05:00
2ffa79172a
Only load Name,Value when loading config because that's all we use
2017-11-06 08:36:53 -08:00
31b756bd53
add missing tests for StartDateTime etc
2017-11-03 07:18:30 -04:00
cb01b96dc0
fixes
2017-11-01 12:01:11 -07:00
ae8bfadcf7
use static logging method
2017-10-27 21:13:14 -07:00
b3d65729da
apache style logging function take a logging object
2017-10-27 21:13:01 -07:00
2003798e64
copy in start and end transaction
2017-10-27 21:06:11 -07:00
2d6998ad25
fix debug_all
2017-10-27 20:54:54 -07:00
2d8a4794de
add save, set, transform, and some globals pointing to dbh and log
2017-10-27 20:54:29 -07:00
8b4468caed
add apache log style aliases
2017-10-27 20:54:19 -07:00
663cc6df87
improve logging of zmfilter
2017-10-27 09:09:12 -07:00
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
e27b95c820
make zmfilter update DiskSPace. ALso rename DiskUsage in Event to DiskSpace
2017-10-27 08:05:35 -07:00
653d213d62
Add EndTime and DiskSpace to Filters
2017-10-25 11:11:19 -07:00
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
7f565e318f
use the untaint version otherwise we die with error 9
2017-10-13 08:59:32 -04:00
5c7203f2bb
Fix File=> File::Find
2017-10-12 11:42:49 -07:00
e6c0add17e
add ZM_BANDWIDTH_DEFAULT
2017-10-12 12:09:05 -04:00
7f50a13074
add Event disk space recalc to zmaudit
2017-10-10 12:11:59 -07:00
09242d72b3
implement alternate ports for streaming
2017-10-05 16:05:41 -04:00
ad1808d43b
warn when path doesn't exist in event::age
2017-10-03 13:25:05 -04:00
11b29bf1ec
Fixup ONVIF module, making it actually usable
2017-08-25 11:16:37 -04:00
676c4b7ddc
Merge branch 'master' into storageareas
2017-08-22 09:52:14 -04:00
40cc13a903
fix whitespace
2017-08-22 09:34:02 -04:00
ac5d1738ea
allow changing of the timestamp char code delimeter ( #1972 )
2017-08-21 11:27:11 -04:00
49464d381a
Merge branch 'master' into storageareas
2017-08-14 10:44:40 -04:00
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
cfbfc0dd44
Merge branch 'master' into storageareas
2017-07-21 11:04:32 -04:00
ee7d714d59
refuse and log attempt to delete an event without full info
2017-07-21 10:54:09 -04:00
89bcfc4e28
fix incorrect gpl license text mailing address
2017-07-14 10:39:50 -05:00
b3984ea2da
Merge branch 'master' into storageareas
2017-07-14 10:38:20 -04:00
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
771d385257
Merge branch 'logger_fix' into storageareas
2017-07-05 15:28:44 -04:00
2cab6baf2c
add some comments and one change that may fix effectiveLevel use
2017-07-05 15:25:01 -04:00
92c25dc58c
Merge branch 'master' into storageareas
2017-06-23 10:43:46 -04:00
5d63bc47cc
I believe level should be effectiveLevel here
2017-06-23 10:22:37 -04:00
12c3bde8b0
remove debug
2017-06-23 10:04:50 -04:00
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
2460e1acd9
fix whitspace
2017-06-23 09:58:01 -04:00
be8be3b0fd
Put back Lost Storageareas code
2017-06-19 13:40:32 -04:00
085d239a6e
Merge branch 'master' into storageareas
2017-06-13 18:02:28 -04:00
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
Andy Bauer
habibapp1365
Isaac Connor
Isaac
flashoftheblades
Simpler1
Isaac Connor
digital-gnome
Ognyan Bankov
APHW2 MFGENG
Isaac Connor
Isaac Connor
Andrew Bauer
ralimi
Martin Goodwell
Isaac Connor