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
16f01d5ecb
Fix when specifying by filter_id or filter_name. Probably a botched merge.
2018-01-02 07:10:38 -08:00
Isaac Connor
7fcbd86ba0
fix auditing Medium directory structures
2017-12-29 15:29:57 -05:00
Isaac Connor
148e21d707
fugro
2017-12-21 21:46:21 -05: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
eebc7ce856
code doc
2017-12-12 11:16:17 -05:00
Isaac Connor
f64d65e6d7
Make db errors not fatal when deleting an event
2017-12-12 10:55:09 -05:00
Isaac Connor
bd73e7c2e2
Merge branch 'robots' into storageareas
2017-12-07 10:31:25 -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
4b92a788f7
fix filter execute
2017-11-24 15:37:50 -05:00
Isaac Connor
485567349d
Don't calc DiskSpace if it is already defined
2017-11-23 07:29:05 -08:00
Isaac Connor
9d6b417b60
make zmwatch.pl update columns in the Monitors table for Event And DiskSpace counts
2017-11-22 17:03:37 -08:00
Isaac Connor
cd1d2e1721
lots more debugging. re-add status update command on failure
2017-11-22 01:18:07 -05:00
Isaac Connor
bf6312a8ec
put back zma
2017-11-21 23:56:05 -05:00
Isaac Connor
489d3ba6ed
Merge ../ZoneMinder.master into storageareas
2017-11-21 12:23:17 -05:00
Isaac Connor
95c19fa674
Make zmaudit check for a pid file and not running if it exists
2017-11-20 11:55:42 -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
3c0be45eb8
have zmdc.pl update the Servers table with system status information
2017-10-24 15:13:48 -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
Michael Barkdoll
707444c39e
Add files via upload
2017-10-09 09:44:45 -05: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
9ad29f4baf
fix and move pod to bottom
2017-09-11 22:19:49 -04:00
Isaac Connor
5516a62a0e
google code style, switch quotes
2017-09-11 22:12:10 -04:00
Isaac Connor
104bf07c5a
fix pod docs
2017-09-11 21:52:22 -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
52d5099677
fix quotes
2017-06-28 11:01:57 -04:00
Isaac Connor
e7de8e6d7b
use variable instead of recalculating
2017-06-28 10:59:50 -04:00
Isaac Connor
e831740dc5
Merge branch 'master' into zmtelemetry_improvements
2017-06-28 10:58:46 -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
abdb567e4e
Merge branch 'master' into zmtelemetry_improvements
2017-06-28 10:45:13 -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
c55814647c
fix spacing, braces, quotes
2017-06-07 15:28:31 -04:00
Isaac Connor
1ab5e0e374
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-06 15:36:10 -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
90c3c40f55
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-04 17:33:30 -04:00
Isaac Connor
07704dd5d6
coments
2017-06-04 17:30:39 -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
9c9eaa6851
move test for MIN_AGE up. Don't need to constantly check for it because it won't change.
2017-06-02 12:35:01 -04:00
Isaac Connor
8b91403c25
remove references to Storage object
2017-06-02 12:32:02 -04:00
Isaac Connor
b6b4738b9f
fix quotes
2017-06-02 12:31:54 -04:00
Isaac Connor
71b9ca97c6
no need to store filters as an array ref
2017-06-02 12:25:26 -04:00
Isaac Connor
5228b9d008
move command line option parsing up, so if we are just getting the version we exit quick before doing a bunch of other things.
2017-06-02 11:54:40 -04:00
Isaac Connor
be5b93a64e
whitespace, braces, quotes
2017-06-02 11:39:35 -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
36ccc5b7b6
Merge bits from SA. Mostly double to single quotes plus some debug lines when errors happen
2017-05-31 09:33:51 -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
Isaac Connor
845ef6c05a
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-05-30 10:22:17 -04:00
Isaac Connor
b948bc5403
fix a few extra )
2017-05-30 10:21:34 -04:00
Isaac Connor
32daa4faed
Merge branch 'master' into storageareas
2017-05-30 10:21:01 -04:00
Isaac Connor
b979712892
fix inconsistent whitespace
2017-05-30 10:01:02 -04:00
Isaac Connor
3c9d8f4ec6
Don't do the qqq thing to remove whitespace from the config descriptions. HTML doesn't care about it. That kind of parsing should be done at display time.
2017-05-30 09:44:43 -04:00
Isaac Connor
86361b59c7
convert double quotes to single quotes
2017-05-26 14:17:28 -04:00
Isaac Connor
0c25cecb93
Fix some spacing
2017-05-26 13:36:20 -04:00
Isaac Connor
368567335b
remove some quotes
2017-05-26 13:33:34 -04:00
Isaac Connor
a2bf5df2d4
remove some quotes
2017-05-26 13:27:55 -04:00
Isaac Connor
2a2d667afb
remove some quotes
2017-05-26 13:27:06 -04:00
Isaac Connor
34f4abb549
Merge branch 'master' into storageareas
2017-05-26 13:17:51 -04:00
Isaac Connor
ed12dab648
fixup docs, cleanup
2017-05-26 13:13:34 -04:00
Isaac Connor
cc83582a90
put back AutoMessage and AutoVideo logic
2017-05-26 13:04:08 -04:00
Isaac Connor
8fde33ee1b
remove StorageAreas stuff
2017-05-26 12:30:20 -04:00
Isaac Connor
5f1b084cc5
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-23 14:27:07 -04:00
Isaac Connor
dbf83831ff
merge from SA. Adds the ability to pass in additional options when connecting
2017-05-20 10:32:41 -04:00
Isaac Connor
d76d65f475
merge from SA, includes StorageAreas support
2017-05-20 10:32:04 -04:00
Isaac Connor
2f2b75252f
remove Makefile.am
2017-05-20 10:23:32 -04:00
Isaac Connor
7970b806e0
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-20 07:57:03 -04:00
Isaac Connor
f4224bb88e
Merge branch 'master' into storageareas
2017-05-17 17:47:39 -04:00
Isaac Connor
6ffe8018ef
fixup spacing/braces
2017-05-17 11:52:25 -04:00
Isaac Connor
a933d4ae12
fix spacing and braces
2017-05-17 11:40:54 -04:00
Joshua Ruehlig
3e35fc24a3
Add Socket Support to zmupdate ( #1867 )
...
* Update zmupdate.pl.in
* Fix spacing
* Update zmupdate.pl.in
2017-05-17 11:31:13 -04:00
Andrew Bauer
200f92b1ad
make zmexport not rely on symlinks in the webroot ( #1888 )
...
* make zmexport not rely on symlinks in the webroot
* add archive view
2017-05-17 11:30:39 -04:00
Vladimir Poluyaktov
2c9d21f59f
1768 fix email tokens for h264 storage ( #1814 )
...
* 1768-Fix-email-tokens-for-h264-storage Snapshot extraction impmemented
* 1768-Fix-email-tokens-for-h264-storage: Video file path fixed
* 1768-Fix-email-tokens-for-h264-storage: vframes 1 option added
* 1768-Fix-email-tokens-for-h264-storage: generateImage sub created
* 1768-Fix-email-tokens-for-h264-storage: Few typos fixed
* 1768-Fix-email-tokens-for-h264-storage: Code refactoring. EI1A and EIMA macros added
2017-05-16 13:04:42 -04:00
Isaac Connor
65b4a7ccdb
merge simple debug output changes from storageareas
2017-05-15 16:40:46 -04:00
Isaac Connor
fd44ff4e60
Merge branch 'master' into storageareas
2017-05-10 13:16:08 -04:00
Isaac Connor
de24ba7120
Merge pull request #1779 from vajonam/1778-add-subtituteTags-for-exec
...
add the ability to add substitued tags to the commandline
2017-05-10 09:00:36 -04:00
Andrew Bauer
e6c60737e9
Merge pull request #1756 from SteveGilvarry/zmf_goodbye
...
Remove zmf
2017-05-10 07:07:22 -05:00
Isaac Connor
c33b8a8780
fix SQL query that gets the event
2017-05-05 17:52:56 -04:00
Isaac Connor
e5c38be716
Cleanup, when the monitor is flipped horizontally, reverse the commands
2017-05-04 12:27:30 -04:00
Isaac Connor
013dab0f47
must unblock after blocking in killuntildead
2017-04-29 14:52:47 -04:00
Isaac Connor
1b0f5bda4c
usleep for 20000 usecs. Testing on i7 says 17000 is average value it takes to startup
2017-04-28 14:19:16 -04:00
Isaac Connor
151126e70c
fix placing of KILL_DELAY constant and turn it to 1/10th of a second instead of 1/100/th
2017-04-28 11:43:36 -04:00
Isaac Connor
e9e913c043
fixup whitespace. Switch to useconds and sleep and sleep for less time when starting up and comment out the 5 second shutdown wait.
2017-04-28 10:32:05 -04:00
Isaac Connor
c80c02ea00
move the reconnect to db logic after the continuous sleep, so that we reconnect after long sleep
2017-04-19 12:46:44 -04:00
Isaac Connor
b71d021ae1
Merge branch 'fix_1849' into storageareas
2017-04-18 12:43:04 -04:00
Andrew Bauer
24c50ea7bd
Merge pull request #1832 from mastertheknife/cmake_pod2man_outofsource
...
Fix out-of-source building failing because pod2man
2017-04-17 07:45:42 -05:00
Isaac Connor
273229858f
Merge branch 'master' into storageareas
2017-04-16 11:26:18 -04:00
Isaac Connor
d5fd4b43a5
experiment with zmDbDisconnect before forking
2017-04-16 11:24:37 -04:00
Andrew Bauer
65f96df477
Merge pull request #1791 from dwalkes/FI8908ControlAdd
...
Additional controls for FI8908W cameras
2017-04-15 07:23:29 -05:00
Isaac Connor
d039227f79
Merge branch 'master' into storageareas
2017-04-12 13:51:10 -04:00
Isaac Connor
58a0c82015
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-04-09 15:41:40 -04:00
Isaac Connor
4215f227da
Merge branch 'mastertheknife-ssse3_improvements' into storageareas
2017-04-07 13:43:09 -04:00
Isaac Connor
7f4fb64495
blah
2017-04-07 13:38:41 -04:00
Isaac Connor
ed04c44ad0
comment out delete_empty_directories. It is too intensive
2017-04-07 13:21:33 -04:00
Isaac Connor
94ddfc4053
Fix
2017-04-07 11:58:27 -04:00
Isaac Connor
5c3a582252
The signal we should be blocking is SIGCHLD not SIGINT
2017-04-06 21:21:28 -04:00
Eliot Kent Woodrich
c4ec2d7fab
Suppress debug messages on ZM service start/restart
...
The tests in the script General.pm that determine the format for superuser calls on the target environment may leak debug messages to STDOUT. This can be replicated on a Docker installation of Zoneminder lacking sudo. Starting the Zoneminder process will display an intimidating series of error messages that can safely be ignored by the user:
e.g.
'''
root@2bfdd23cc27a:~# service zoneminder start
Starting ZoneMinder: Can't exec "sudo": No such file or directory at /usr/share/perl5/ZoneMinder/General.pm line 1 10.
Use of uninitialized value $output in scalar chomp at /usr/share/perl5/ZoneMinder/General.pm line 119.
Use of uninitialized value $output in concatenation (.) or string at /usr/share/perl5/ZoneMinder/General.pm line 1 20.
success
'''
This patch redirects STDERR from the qx(...) calls to the debug message., And if the output of qx(...) is undefined, replaces it with any error in $! resulting from the qx(...) call.
2017-04-05 17:26:19 -07:00
Isaac Connor
a689fcff88
Fix use Time::HiRes
2017-04-05 16:08:47 -04:00
Isaac Connor
c944870526
sleep 100usec
2017-03-31 13:49:44 -04:00
Isaac Connor
58d119d9ed
Merge branch 'fix_1762' into storageareas
2017-03-31 13:38:59 -04:00
Isaac Connor
d3b6792a6a
block signals around checking for a process to die
2017-03-31 12:25:48 -04:00
Isaac Connor
538658403c
Merge pull request #1822 from knnniggett/csrf
...
Implement CSRF Mitigation
2017-03-30 10:39:55 -04:00
Isaac Connor
8bb9ba7bea
Add more debugging
2017-03-29 09:59:58 -04:00
Isaac Connor
a6261b5497
allow filters to act on unfinished events.
2017-03-29 09:39:20 -04:00
Isaac Connor
3cd9e46df9
Merge branch 'knnniggett-csrf' into storageareas
2017-03-28 20:44:38 -04:00
Isaac Connor
d006ebfc3c
Merge branch 'csrf' of https://github.com/knnniggett/ZoneMinder into knnniggett-csrf
2017-03-28 20:10:59 -04:00
Andy Bauer
4e16ae6d19
add ZM_ENABLE_CSRF_MAGIC toggle
2017-03-28 17:29:36 -05:00
Isaac Connor
7bce7f962a
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-03-27 16:56:22 -04:00
Isaac Connor
146ac87b51
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-03-24 11:53:53 -04:00
Isaac Connor
7360619941
Merge branch 'master' into storageareas
2017-03-24 11:53:45 -04:00
Isaac Connor
99a011da77
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-03-23 19:56:01 -04:00
Isaac Connor
56acea30fe
implement a command line option to limit the monitor to which zmaudit is doing it's job
2017-03-23 19:54:16 -04:00
Andrew Bauer
a43adc241f
fix incorrect gpl license mailing address
2017-03-22 07:03:53 -05:00
Kfir Itzhak
8debb1277f
Fixed out-of-source building failing because pod2man fails to find the files, and cmake complains about target name containing slahes
2017-03-21 22:46:10 +02:00
Isaac Connor
c2461f93cd
google code style and a better debug message
2017-03-20 16:47:58 -04:00
Isaac Connor
eba6cec7a1
Merge branch 'master' into storageareas
2017-03-20 12:01:20 -04:00
Andrew Bauer
7bb0d12a4f
Merge pull request #1819 from ZoneMinder/Copyright_patch1
...
Fix failure to attribute previous work
2017-03-20 09:17:03 -05:00
Andrew Bauer
2dcd95bc7f
Merge pull request #1504 from ZoneMinder/improve_filter
...
Improve filter
2017-03-18 21:12:58 -05:00
Steve Gilvarry
3a69238381
Fix failure to attribute previous work
...
Just fixing this up as there is a issue logged from Debian for it.
2017-03-18 23:05:32 +11:00
Dan Walkes
aa1aeeeca4
Additional controls for FI8908W cameras
...
Mobile application ZM View uses relative move commands and presetGoto
commands which were not supported by the previous version of the script.
Add these commands based on documentation in
http://www.foscam.es/descarga/ipcam_cgi_sdk.pdf
Commands were tested on an FI8908W camera running version 11.37.2.65
firmware
2017-02-18 17:14:59 -07:00
Manojav Sridhar
7c765b5516
added feature to allow %tags% in arguments of exec command
2017-02-15 09:37:45 -05:00
Isaac Connor
d135216ac7
Merge branch 'master' into storageareas
2017-02-15 09:30:35 -05:00
Manojav Sridhar
f0b2910647
fix typo for correct checking if a command has excuted for an event, prevents execution on every filter run
2017-02-15 08:10:50 -05:00
Isaac Connor
7ab6818fa0
Merge branch 'sanitize_image_path' of https://github.com/knnniggett/ZoneMinder into storageareas_sanitize
2017-01-25 17:14:30 -05:00
SteveGilvarry
2f3ebd80da
Remove zmf, die..die..die
2017-01-16 13:20:05 -08:00
Isaac Connor
052807aaf5
remove extra my
2017-01-15 10:57:39 -05:00
Isaac Connor
c79dfb6a16
fix typos
2017-01-15 10:56:57 -05:00
Isaac Connor
4973d8c74c
add support for connect options
2017-01-15 10:54:46 -05:00
Isaac Connor
d24d151f53
Slurp db update file in and do() it instead of calling mysql
2017-01-15 10:54:23 -05:00
Isaac Connor
ac32b001e9
use a real variable for the file handle so that it sticks around.
2017-01-12 13:05:39 -05:00
Isaac Connor
c97ecc2a38
remove debug line
2017-01-12 13:04:44 -05:00
Isaac Connor
a5cdfd2932
call loadMonitors at the beginning. Otherwise we may not know about a monitor while handling a message from it.
2017-01-12 13:03:53 -05:00
Isaac Connor
513cd68c20
remove the verified caching. It makes calling zmMemVerify useless.
2017-01-12 13:02:16 -05:00
Isaac Connor
ed5c3c4ed4
remove debug stautement
2017-01-12 12:58:09 -05:00
Isaac Connor
d9ce1a68c6
restore defaults
2017-01-12 12:56:55 -05:00
Isaac Connor
e94a797a5e
remove debug stautement
2017-01-12 12:56:20 -05:00
Isaac Connor
65f7350313
remove debug stautement
2017-01-12 12:55:27 -05:00
Isaac Connor
82eaacc624
switch quotes
2017-01-12 12:54:46 -05:00
Isaac Connor
42484f7680
switch quotes, load monitors at the beginnign
2017-01-12 12:54:40 -05:00
Isaac Connor
0197c550ae
Use a real variable for file handle so that it sticks around
2017-01-12 12:54:14 -05:00
Isaac Connor
0f67d9847e
remove caching of verified status of an mmap.
2017-01-12 12:53:57 -05:00
Isaac Connor
7502b81064
zmMemVerify now checks valid, so don't need to do it again.
2017-01-10 15:32:38 -05:00
Isaac Connor
04f66917ae
Merge branch 'fix_mmap_leak' into storageareas
2017-01-10 15:29:54 -05:00
Isaac Connor
7ddd5359d0
zmMemVerify attaches, so we need to zmMemInvalidate even if the shared data is no good
2017-01-10 15:09:30 -05:00
Isaac Connor
a146d7bee1
add a test for valid in the shared data. zmc sets this to false when it closes properly
2017-01-10 15:08:49 -05:00
Isaac Connor
faeb785961
zmMemVerify attaches, so we need to zmMemInvalidate even if the shared data is no good
2017-01-10 15:08:23 -05:00
Isaac Connor
4d84387807
Merge branch 'fix_mmap_leak' into work
2017-01-10 14:22:58 -05:00
Isaac Connor
a66e9e45a2
merge a fix from storageareas that adds a test for the shared data being valid and reloads the monitors if it can't reconnect
2017-01-10 14:22:42 -05:00
Isaac Connor
d2ff6701f4
test
2017-01-10 13:53:02 -05:00
Isaac Connor
b3c5f4622f
revert knnniggett's zmMemDetach changes
2017-01-10 12:56:19 -05:00
Isaac Connor
3074263e06
Merge branch 'control_fixes' into storageareas
2017-01-10 12:54:46 -05:00
Isaac Connor
66cdcd95fa
Merge branch 'master' into fix_mmap_leak
2017-01-10 08:47:46 -05:00
Isaac Connor
99e823ef33
Merge branch 'zmtelemetry_improvements' into storageareas
2017-01-08 11:04:59 -05:00
Isaac Connor
27760ffce2
move pod below __END__ and improve it to include options. Add help option.
2017-01-08 10:12:25 -05:00
Isaac Connor
b3a07c27b8
Add test for lastCheck being in the future. print out a notice when we are sleeping and are being run from a terminal.
2017-01-08 09:40:09 -05:00
Isaac Connor
146a772a21
move ENDPOINT to hidden category
2017-01-06 19:49:03 -05:00
Isaac Connor
03b19bc1fd
when run from terminal, output a line that says that we are sleeping
2017-01-06 18:40:39 -05:00
Isaac Connor
7f2fcddc03
revert print to Info
2017-01-06 18:39:08 -05:00
Isaac Connor
426eabb12d
if running from a terminal, set termLevel to info
2017-01-05 11:24:53 -05:00
Isaac Connor
db1a6f9b3b
fix to remove qqq
2017-01-05 11:24:27 -05:00
Isaac Connor
75cd1de7ab
show the # of entries loaded and saved
2017-01-05 09:42:11 -05:00
Isaac Connor
0c34aa9830
Merge branch 'zmtelemetry_improvements' into storageareas
2017-01-04 12:25:01 -05:00
Isaac Connor
09783a1a39
add some command line options and use the INTERVAL and ENDPOINT from the Config hash
2017-01-04 12:22:40 -05:00
Isaac Connor
cf9747054c
add ZM_TELEMETRY_INTERVAL AND ENDPOINT
2017-01-04 12:22:01 -05:00
Isaac Connor
84183c819c
Merge branch 'master' into storageareas
2017-01-03 09:53:09 -05:00
Isaac Connor
2a1ec2beb1
Merge pull request #1719 from knnniggett/hikvisionptz
...
Add HikVision ptz control sciprt
2017-01-03 08:59:56 -05:00
Isaac Connor
b4bddee337
Merge branch 'master' into improve_filter
2017-01-03 08:49:56 -05:00
Isaac Connor
ac88490338
When use warnings is on and there is a null value in the monitor data it causes warnings. So add skip if __git_main is not defined.
2017-01-02 12:49:37 -05:00
Isaac Connor
5ae34a7561
Merge branch 'master' into storageareas
2017-01-02 09:39:10 -05:00
Andy Bauer
25ab1bee18
more fixed to gpl license text
2016-12-26 10:40:09 -06:00
Andy Bauer
0f15b3ae62
update gpl 2 mailing address
2016-12-26 10:33:03 -06:00
Andy Bauer
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
Isaac Connor
ed46a6b6ac
must call zmMemInvalidate before next
2016-12-23 09:27:54 -05:00
Isaac Connor
631c13ab1a
revert to zmMemInvalidate
2016-12-23 09:26:38 -05:00
Isaac Connor
98a3d8f9f2
remove <<<< line
2016-12-22 11:02:07 -05:00
Isaac Connor
c27d0270dc
Merge branch 'knnniggett-zmMemDetach' into storageareas
2016-12-20 15:40:14 -05:00
Andy Bauer
c6368c4a1a
replace zmMemInvalidate with zmMemDetach
2016-12-20 13:49:07 -06:00
Isaac Connor
752f0eb40b
Merge branch 'master' into improve_filter
2016-12-20 11:43:02 -05:00
Isaac Connor
ed618ff7b0
Merge branch 'master' into storageareas
2016-12-20 11:29:31 -05:00
Andrew Bauer
02e534dcff
Merge pull request #1694 from connortechnology/disk_space_in_events
...
Disk space in events
2016-12-20 09:19:21 -06:00
Isaac Connor
1bf93d76b7
fix www and parenthesis.
2016-12-13 14:56:29 -05:00
Isaac Connor
6ceb4cc93e
fix qqq and replace doube quotes with single quotes
2016-12-13 14:32:28 -05:00
Isaac Connor
708f52beda
Merge branch 'disk_space_in_events' into storageareas
2016-12-13 13:36:18 -05:00
Isaac Connor
a9548d3f6b
Add a config entry to turn event disk space on/off
2016-12-13 13:34:56 -05:00
Isaac Connor
8009bce3d9
quote the link name so that spaces don't break it
2016-12-13 13:23:20 -05:00
Isaac Connor
2c0a868eea
fix typo
2016-12-08 11:02:59 -05:00
Isaac Connor
857b4e8345
Merge branch 'master' into improve_filter
2016-12-06 11:58:41 -05:00
Andrew Bauer
ecbaaef59a
Merge pull request #1670 from connortechnology/fix_braces
...
Fix braces
2016-12-06 08:39:43 -06:00
Kyle Johnson
49620d51b9
Merge pull request #1692 from ZoneMinder/small_fixes
...
Small fixes
2016-11-24 20:42:45 -07:00
Isaac Connor
cf49a234b3
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-11-22 13:05:03 -05:00
Isaac Connor
9e8404516b
add a zmMemInvalidate at the beginning of the while loop to catch unreleased mmap files
2016-11-22 11:02:38 -05:00
Isaac Connor
02cd3e8cba
Merge branch 'master' into small_fixes
2016-11-22 10:52:07 -05:00
Isaac Connor
bb6b0c2d49
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into improve_filter
2016-11-17 12:16:49 -05:00
Isaac Connor
27b5b60eae
Merge branch 'master' into fix_braces
2016-11-14 21:46:25 -05:00
Isaac Connor
911256785e
Merge branch 'fix_braces' into storageareas
2016-11-08 13:14:12 -05:00
Isaac Connor
1be6c57aee
fix extra semi colon
2016-11-08 13:11:10 -05:00
Isaac Connor
5f0c1c0e26
fix layout in a complex map
2016-11-08 12:55:07 -05:00
Isaac Connor
4b3ac63a68
merge master, deprecate qqq()
2016-11-08 11:30:44 -05:00
Isaac Connor
eb2177e76a
whitespace fixes in prep for merging master
2016-11-08 10:44:00 -05:00
Andrew Bauer
29e48da3b9
fix sftp xfers in zmfilter ( #1677 )
2016-11-07 16:08:43 -05:00
Andy Bauer
4be668f838
Add HikVision ptz control sciprt
2016-11-06 08:03:43 -06:00
Isaac Connor
0dbde8e290
correct a lot of braces
2016-11-04 15:53:14 -04:00
Isaac Connor
1e233c0ce5
Merge branch 'master' into improve_filter
2016-11-04 15:20:43 -04:00
Isaac Connor
93725b3f4b
fixup spacing in ConfigData
2016-11-04 14:05:51 -04:00
Isaac Connor
3d17067276
change tabs to spaces
2016-11-03 14:30:23 -04:00
Isaac Connor
68c8178648
remove some extra spaces
2016-11-03 14:21:07 -04:00
Isaac Connor
bb371612c3
tabs to spaces
2016-11-03 14:18:03 -04:00
Isaac Connor
d9a31f7fb6
Merge branch 'master' into storageareas
2016-10-26 13:39:31 -04:00
Andrew Bauer
191efed8e3
change fast_delete to off - fixes #1597
2016-10-19 14:10:28 -05:00
Isaac Connor
b385ba7bf4
Merge branch 'master' into improve_filter
2016-10-18 09:59:45 -04:00
Isaac Connor
10e451faa6
fix log line
2016-10-02 12:23:19 -04:00
Isaac Connor
a77de33997
add a test for lib existence
2016-09-27 12:51:04 -04:00
mdrush
69a71b1a37
cleaned up logic
2016-08-27 16:16:01 -07:00
mdrush
16a9de3b1b
added missing brackets
2016-08-27 15:39:04 -07:00
mdrush
2d161924c0
changed error message to debug message
2016-08-27 15:34:10 -07:00
mdrush
52255e594e
improved style, added fallback when ssmtp can't be found
2016-08-27 15:18:00 -07:00
mdrush
574390730a
added missing ssmtp support in sendMessage
2016-08-27 13:10:39 -07:00
Isaac Connor
69461a7c1b
Merge pull request #1579 from peruchi/master
...
Update file sock for multiserver
2016-08-17 10:23:01 -04:00
peruchi
50f55af68f
Update zmdc.pl.in
2016-08-17 10:36:00 -03:00
peruchi
7b389a79a6
Update zmdc.pl.in
2016-08-17 09:45:30 -03:00
Isaac Connor
fbc0086fcc
get the other dbPass use and quote it. Slight visual code style cleanup.
2016-08-08 16:52:09 -04:00
Andrew Bauer
24d471f452
Merge pull request #1503 from ZoneMinder/id_on_console
...
add option to show monitor ID on console
2016-08-06 10:59:03 -05:00
Isaac Connor
9d65ef3bb2
Merge pull request #1556 from knnniggett/banner
...
custom banner text on web console
2016-08-06 10:59:53 -04:00
Andrew Bauer
528230c92d
Merge pull request #1581 from ZoneMinder/fix_1571
...
quote the password
2016-08-06 09:37:11 -05:00
Andrew Bauer
382896dc0d
Merge pull request #1498 from josh4trunks/mysql_port_socket
...
Add support for MySQL Port / Unix Socket
2016-08-06 09:32:32 -05:00
Andrew Bauer
e6b1cf90df
Merge pull request #1566 from gerdesj/Keekoon
...
Control script for Keekoon cameras.
2016-08-06 09:09:40 -05:00
peruchi
0d85d3e60d
Update zmdc.pl.in
2016-08-02 16:26:27 -03:00
peruchi
0238656542
Update file sock for multiserver
...
Added the ZM_SERVER_ID in the creation the sock for not to give conflict in mode multi server.
2016-08-02 15:36:40 -03:00
Isaac Connor
25d58f5192
quote the password
2016-08-02 13:22:44 -04:00
Jon Gerdes
ee720c4561
Control script for Keekoon cameras. Tested with KK002.
2016-07-25 11:20:49 +01:00
Dmitry Smirnov
aed3c3d29a
reduce noise on "zmupdate.pl" invocation
2016-07-14 00:43:32 +10:00
Isaac Connor
85c0377280
When generating video, zmvideo.pl now returns the file path to the video file so don't append eventPath to it
2016-07-12 14:21:54 -04:00
Isaac Connor
6129732e61
restore the behaviour where the generated file names are printed to stdout.
2016-07-11 08:01:43 -04:00
Andy Bauer
19265b631a
custom banner text on web console
2016-07-09 13:11:30 -05:00
Isaac Connor
1069b301a0
functions have been moved from ConfigAdmin to Config
2016-06-12 15:38:59 -04:00
Isaac Connor
2da709848a
remove extra comma screwing up the sql
2016-05-30 09:30:02 -04:00
Isaac Connor
408646ea4d
remove extra s
2016-05-27 10:52:59 -04:00
Isaac Connor
1983f106f4
Add a missing sth->finish
2016-05-27 09:01:01 -04:00
Isaac Connor
b0116f25e9
put back in the lines that populate ZM_SERVER_ID. They got lost somehow in the perl db undo
2016-05-27 08:59:46 -04:00
Isaac Connor
f969186abb
add the ZM_WEB_ID_ON_CONSOLE option and use it to show the ID column on the console
2016-05-26 11:15:13 -04:00
Isaac Connor
795665f8c7
Merge branch 'startup_time' into storageareas
2016-09-29 11:07:55 -04:00
Isaac Connor
29c015ecd3
need to put zmGetStartupTime in exports
2016-09-29 11:07:33 -04:00
Isaac Connor
5c867aa5f5
Merge branch 'fix_auth_timeout' into storageareas
2016-09-29 10:10:38 -04:00
Isaac Connor
8bc7b9562f
introduce config option ZM_AUTH_HASH_TTL which is the # of hours to make an auth hash valid for
2016-09-29 10:04:53 -04:00
Isaac Connor
b074a3257d
add StartTime to log line about deleting an event.
2016-09-28 08:35:19 -04:00
Isaac Connor
89d4b9fec5
ifdef the libswresample lib stuff
2016-09-27 13:34:10 -04:00
Isaac Connor
f40c8d0da8
contains due to glob
2016-09-20 15:54:37 -04:00
Isaac Connor
a3e99cf08d
quick update to Monitor to use Object methods
2016-09-20 12:15:48 -04:00
Isaac Connor
e228de6ebe
detect relative path for ZM_PATH_EVENTS and use ZM_PATH_WEB to make a full path
2016-09-19 16:44:43 -04:00
Isaac Connor
ae4a4681cd
fix using wrong var
2016-09-15 11:41:42 -04:00
Isaac Connor
8f33ed6ca6
introduce another sharedmem variable called startup_time, which is set by zmc indicating when the process started.
2016-09-15 11:16:05 -04:00
Isaac Connor
2b4bad86cb
Merge branch 'master' into storageareas
2016-09-13 10:21:10 -04:00
Isaac Connor
5fb1c45c4e
Merge ../ZoneMinder.connortechnology into storageareas
2016-09-08 11:34:36 -04:00
Isaac Connor
7b0a14ee72
change doulbe quotes to single quotes. Detect if we can't chdir into the monitor dir.
2016-09-08 11:06:02 -04:00
Isaac Connor
e51cc7efc8
add a missing / in error message
2016-08-31 11:21:46 -04:00
Isaac Connor
747382f214
change double quotes to single quotes. When can't connect, print out the path to the sock file
2016-08-22 13:34:02 -04:00
Isaac Connor
d618b612fe
google code style & whitespace
2016-08-22 12:08:49 -04:00
Isaac Connor
707694d4ea
google code style
2016-08-22 11:41:26 -04:00
Isaac Connor
eafe3d7748
Merge branch 'master' into storageareas
2016-08-17 10:31:55 -04:00
Isaac Connor
3d65b0d2ad
Merge branch 'master' into storageareas
2016-08-08 18:09:11 -04:00
Isaac Connor
2451768295
Merge branch 'master' into storageareas
2016-08-08 18:08:46 -04:00
Isaac Connor
99289e4713
Deprecate MAX_AGED_DIRS. Only check age if the fs event isn't in the db. This should work much better.
2016-08-04 12:22:33 -04:00
Isaac Connor
62d3c66e8f
Merge branch 'fix_1571' into storageareas
2016-08-02 13:53:32 -04:00
Isaac Connor
208337635a
Merge branch 'master' into storageareas
2016-08-01 19:30:01 -04:00
Isaac Connor
8eac8a1e1a
Merge branch 'master' into storageareas
2016-07-13 09:50:30 -04:00
Isaac Connor
1e2ec7028e
better debugging. add back deleting of zmswap files. detaint them so that they can be deleted. Use Objects to fix up deleting events
2016-07-12 14:16:20 -04:00
Isaac Connor
26369268bb
merge Steve's updates, work on zmaudit
2016-07-12 11:27:25 -04:00
Isaac Connor
e29a0ebe71
Merge branch 'feature-h264-videostorage' into storageareas
2016-06-21 13:48:32 -04:00
Isaac Connor
76cb031a5e
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-06-12 07:14:30 -04:00
Isaac Connor
c0cb1419a3
fixup delete_empty_directories
2016-06-07 22:03:46 -04:00