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
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