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
273229858f
Merge branch 'master' into storageareas
2017-04-16 11:26:18 -04:00
d5fd4b43a5
experiment with zmDbDisconnect before forking
2017-04-16 11:24:37 -04:00
65f96df477
Merge pull request #1791 from dwalkes/FI8908ControlAdd
...
Additional controls for FI8908W cameras
2017-04-15 07:23:29 -05:00
d039227f79
Merge branch 'master' into storageareas
2017-04-12 13:51:10 -04:00
58a0c82015
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-04-09 15:41:40 -04:00
4215f227da
Merge branch 'mastertheknife-ssse3_improvements' into storageareas
2017-04-07 13:43:09 -04:00
7f4fb64495
blah
2017-04-07 13:38:41 -04:00
ed04c44ad0
comment out delete_empty_directories. It is too intensive
2017-04-07 13:21:33 -04:00
94ddfc4053
Fix
2017-04-07 11:58:27 -04:00
5c3a582252
The signal we should be blocking is SIGCHLD not SIGINT
2017-04-06 21:21:28 -04:00
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
a689fcff88
Fix use Time::HiRes
2017-04-05 16:08:47 -04:00
c944870526
sleep 100usec
2017-03-31 13:49:44 -04:00
58d119d9ed
Merge branch 'fix_1762' into storageareas
2017-03-31 13:38:59 -04:00
d3b6792a6a
block signals around checking for a process to die
2017-03-31 12:25:48 -04:00
538658403c
Merge pull request #1822 from knnniggett/csrf
...
Implement CSRF Mitigation
2017-03-30 10:39:55 -04:00
8bb9ba7bea
Add more debugging
2017-03-29 09:59:58 -04:00
a6261b5497
allow filters to act on unfinished events.
2017-03-29 09:39:20 -04:00
3cd9e46df9
Merge branch 'knnniggett-csrf' into storageareas
2017-03-28 20:44:38 -04:00
d006ebfc3c
Merge branch 'csrf' of https://github.com/knnniggett/ZoneMinder into knnniggett-csrf
2017-03-28 20:10:59 -04:00
4e16ae6d19
add ZM_ENABLE_CSRF_MAGIC toggle
2017-03-28 17:29:36 -05:00
7bce7f962a
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-03-27 16:56:22 -04:00
146ac87b51
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-03-24 11:53:53 -04:00
7360619941
Merge branch 'master' into storageareas
2017-03-24 11:53:45 -04:00
99a011da77
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-03-23 19:56:01 -04:00
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
a43adc241f
fix incorrect gpl license mailing address
2017-03-22 07:03:53 -05:00
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
c2461f93cd
google code style and a better debug message
2017-03-20 16:47:58 -04:00
eba6cec7a1
Merge branch 'master' into storageareas
2017-03-20 12:01:20 -04:00
7bb0d12a4f
Merge pull request #1819 from ZoneMinder/Copyright_patch1
...
Fix failure to attribute previous work
2017-03-20 09:17:03 -05:00
2dcd95bc7f
Merge pull request #1504 from ZoneMinder/improve_filter
...
Improve filter
2017-03-18 21:12:58 -05:00
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
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
7c765b5516
added feature to allow %tags% in arguments of exec command
2017-02-15 09:37:45 -05:00
d135216ac7
Merge branch 'master' into storageareas
2017-02-15 09:30:35 -05:00
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
7ab6818fa0
Merge branch 'sanitize_image_path' of https://github.com/knnniggett/ZoneMinder into storageareas_sanitize
2017-01-25 17:14:30 -05:00
2f3ebd80da
Remove zmf, die..die..die
2017-01-16 13:20:05 -08:00
052807aaf5
remove extra my
2017-01-15 10:57:39 -05:00
c79dfb6a16
fix typos
2017-01-15 10:56:57 -05:00
4973d8c74c
add support for connect options
2017-01-15 10:54:46 -05:00
d24d151f53
Slurp db update file in and do() it instead of calling mysql
2017-01-15 10:54:23 -05:00
ac32b001e9
use a real variable for the file handle so that it sticks around.
2017-01-12 13:05:39 -05:00
c97ecc2a38
remove debug line
2017-01-12 13:04:44 -05:00
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
513cd68c20
remove the verified caching. It makes calling zmMemVerify useless.
2017-01-12 13:02:16 -05:00
ed5c3c4ed4
remove debug stautement
2017-01-12 12:58:09 -05:00
d9ce1a68c6
restore defaults
2017-01-12 12:56:55 -05:00
e94a797a5e
remove debug stautement
2017-01-12 12:56:20 -05:00
65f7350313
remove debug stautement
2017-01-12 12:55:27 -05:00
82eaacc624
switch quotes
2017-01-12 12:54:46 -05:00
42484f7680
switch quotes, load monitors at the beginnign
2017-01-12 12:54:40 -05:00
0197c550ae
Use a real variable for file handle so that it sticks around
2017-01-12 12:54:14 -05:00
0f67d9847e
remove caching of verified status of an mmap.
2017-01-12 12:53:57 -05:00
7502b81064
zmMemVerify now checks valid, so don't need to do it again.
2017-01-10 15:32:38 -05:00
04f66917ae
Merge branch 'fix_mmap_leak' into storageareas
2017-01-10 15:29:54 -05:00
7ddd5359d0
zmMemVerify attaches, so we need to zmMemInvalidate even if the shared data is no good
2017-01-10 15:09:30 -05:00
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
faeb785961
zmMemVerify attaches, so we need to zmMemInvalidate even if the shared data is no good
2017-01-10 15:08:23 -05:00
4d84387807
Merge branch 'fix_mmap_leak' into work
2017-01-10 14:22:58 -05:00
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
d2ff6701f4
test
2017-01-10 13:53:02 -05:00
b3c5f4622f
revert knnniggett's zmMemDetach changes
2017-01-10 12:56:19 -05:00
3074263e06
Merge branch 'control_fixes' into storageareas
2017-01-10 12:54:46 -05:00
66cdcd95fa
Merge branch 'master' into fix_mmap_leak
2017-01-10 08:47:46 -05:00
99e823ef33
Merge branch 'zmtelemetry_improvements' into storageareas
2017-01-08 11:04:59 -05:00
27760ffce2
move pod below __END__ and improve it to include options. Add help option.
2017-01-08 10:12:25 -05:00
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
146a772a21
move ENDPOINT to hidden category
2017-01-06 19:49:03 -05:00
03b19bc1fd
when run from terminal, output a line that says that we are sleeping
2017-01-06 18:40:39 -05:00
7f2fcddc03
revert print to Info
2017-01-06 18:39:08 -05:00
426eabb12d
if running from a terminal, set termLevel to info
2017-01-05 11:24:53 -05:00
db1a6f9b3b
fix to remove qqq
2017-01-05 11:24:27 -05:00
75cd1de7ab
show the # of entries loaded and saved
2017-01-05 09:42:11 -05:00
0c34aa9830
Merge branch 'zmtelemetry_improvements' into storageareas
2017-01-04 12:25:01 -05:00
09783a1a39
add some command line options and use the INTERVAL and ENDPOINT from the Config hash
2017-01-04 12:22:40 -05:00
cf9747054c
add ZM_TELEMETRY_INTERVAL AND ENDPOINT
2017-01-04 12:22:01 -05:00
84183c819c
Merge branch 'master' into storageareas
2017-01-03 09:53:09 -05:00
2a1ec2beb1
Merge pull request #1719 from knnniggett/hikvisionptz
...
Add HikVision ptz control sciprt
2017-01-03 08:59:56 -05:00
b4bddee337
Merge branch 'master' into improve_filter
2017-01-03 08:49:56 -05:00
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
5ae34a7561
Merge branch 'master' into storageareas
2017-01-02 09:39:10 -05:00
25ab1bee18
more fixed to gpl license text
2016-12-26 10:40:09 -06:00
0f15b3ae62
update gpl 2 mailing address
2016-12-26 10:33:03 -06:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
ed46a6b6ac
must call zmMemInvalidate before next
2016-12-23 09:27:54 -05:00
631c13ab1a
revert to zmMemInvalidate
2016-12-23 09:26:38 -05:00
98a3d8f9f2
remove <<<< line
2016-12-22 11:02:07 -05:00
c27d0270dc
Merge branch 'knnniggett-zmMemDetach' into storageareas
2016-12-20 15:40:14 -05:00
c6368c4a1a
replace zmMemInvalidate with zmMemDetach
2016-12-20 13:49:07 -06:00
752f0eb40b
Merge branch 'master' into improve_filter
2016-12-20 11:43:02 -05:00
ed618ff7b0
Merge branch 'master' into storageareas
2016-12-20 11:29:31 -05:00
02e534dcff
Merge pull request #1694 from connortechnology/disk_space_in_events
...
Disk space in events
2016-12-20 09:19:21 -06:00
1bf93d76b7
fix www and parenthesis.
2016-12-13 14:56:29 -05:00
6ceb4cc93e
fix qqq and replace doube quotes with single quotes
2016-12-13 14:32:28 -05:00
708f52beda
Merge branch 'disk_space_in_events' into storageareas
2016-12-13 13:36:18 -05:00
a9548d3f6b
Add a config entry to turn event disk space on/off
2016-12-13 13:34:56 -05:00
8009bce3d9
quote the link name so that spaces don't break it
2016-12-13 13:23:20 -05:00
2c0a868eea
fix typo
2016-12-08 11:02:59 -05:00
857b4e8345
Merge branch 'master' into improve_filter
2016-12-06 11:58:41 -05:00
ecbaaef59a
Merge pull request #1670 from connortechnology/fix_braces
...
Fix braces
2016-12-06 08:39:43 -06:00
49620d51b9
Merge pull request #1692 from ZoneMinder/small_fixes
...
Small fixes
2016-11-24 20:42:45 -07:00
cf49a234b3
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-11-22 13:05:03 -05:00
9e8404516b
add a zmMemInvalidate at the beginning of the while loop to catch unreleased mmap files
2016-11-22 11:02:38 -05:00
02cd3e8cba
Merge branch 'master' into small_fixes
2016-11-22 10:52:07 -05:00
bb6b0c2d49
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into improve_filter
2016-11-17 12:16:49 -05:00
27b5b60eae
Merge branch 'master' into fix_braces
2016-11-14 21:46:25 -05:00
911256785e
Merge branch 'fix_braces' into storageareas
2016-11-08 13:14:12 -05:00
1be6c57aee
fix extra semi colon
2016-11-08 13:11:10 -05:00
5f0c1c0e26
fix layout in a complex map
2016-11-08 12:55:07 -05:00
4b3ac63a68
merge master, deprecate qqq()
2016-11-08 11:30:44 -05:00
eb2177e76a
whitespace fixes in prep for merging master
2016-11-08 10:44:00 -05:00
29e48da3b9
fix sftp xfers in zmfilter ( #1677 )
2016-11-07 16:08:43 -05:00
4be668f838
Add HikVision ptz control sciprt
2016-11-06 08:03:43 -06:00
0dbde8e290
correct a lot of braces
2016-11-04 15:53:14 -04:00
1e233c0ce5
Merge branch 'master' into improve_filter
2016-11-04 15:20:43 -04:00
93725b3f4b
fixup spacing in ConfigData
2016-11-04 14:05:51 -04:00
3d17067276
change tabs to spaces
2016-11-03 14:30:23 -04:00
68c8178648
remove some extra spaces
2016-11-03 14:21:07 -04:00
bb371612c3
tabs to spaces
2016-11-03 14:18:03 -04:00
d9a31f7fb6
Merge branch 'master' into storageareas
2016-10-26 13:39:31 -04:00
191efed8e3
change fast_delete to off - fixes #1597
2016-10-19 14:10:28 -05:00
b385ba7bf4
Merge branch 'master' into improve_filter
2016-10-18 09:59:45 -04:00
10e451faa6
fix log line
2016-10-02 12:23:19 -04:00
a77de33997
add a test for lib existence
2016-09-27 12:51:04 -04:00
69a71b1a37
cleaned up logic
2016-08-27 16:16:01 -07:00
16a9de3b1b
added missing brackets
2016-08-27 15:39:04 -07:00
2d161924c0
changed error message to debug message
2016-08-27 15:34:10 -07:00
52255e594e
improved style, added fallback when ssmtp can't be found
2016-08-27 15:18:00 -07:00
574390730a
added missing ssmtp support in sendMessage
2016-08-27 13:10:39 -07:00
69461a7c1b
Merge pull request #1579 from peruchi/master
...
Update file sock for multiserver
2016-08-17 10:23:01 -04:00
50f55af68f
Update zmdc.pl.in
2016-08-17 10:36:00 -03:00
7b389a79a6
Update zmdc.pl.in
2016-08-17 09:45:30 -03:00
fbc0086fcc
get the other dbPass use and quote it. Slight visual code style cleanup.
2016-08-08 16:52:09 -04:00
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
9d65ef3bb2
Merge pull request #1556 from knnniggett/banner
...
custom banner text on web console
2016-08-06 10:59:53 -04:00
528230c92d
Merge pull request #1581 from ZoneMinder/fix_1571
...
quote the password
2016-08-06 09:37:11 -05:00
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
e6b1cf90df
Merge pull request #1566 from gerdesj/Keekoon
...
Control script for Keekoon cameras.
2016-08-06 09:09:40 -05:00
0d85d3e60d
Update zmdc.pl.in
2016-08-02 16:26:27 -03:00
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
25d58f5192
quote the password
2016-08-02 13:22:44 -04:00
ee720c4561
Control script for Keekoon cameras. Tested with KK002.
2016-07-25 11:20:49 +01:00
aed3c3d29a
reduce noise on "zmupdate.pl" invocation
2016-07-14 00:43:32 +10:00
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
6129732e61
restore the behaviour where the generated file names are printed to stdout.
2016-07-11 08:01:43 -04:00
19265b631a
custom banner text on web console
2016-07-09 13:11:30 -05:00
1069b301a0
functions have been moved from ConfigAdmin to Config
2016-06-12 15:38:59 -04:00
2da709848a
remove extra comma screwing up the sql
2016-05-30 09:30:02 -04:00
408646ea4d
remove extra s
2016-05-27 10:52:59 -04:00
1983f106f4
Add a missing sth->finish
2016-05-27 09:01:01 -04:00
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
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
795665f8c7
Merge branch 'startup_time' into storageareas
2016-09-29 11:07:55 -04:00
29c015ecd3
need to put zmGetStartupTime in exports
2016-09-29 11:07:33 -04:00
5c867aa5f5
Merge branch 'fix_auth_timeout' into storageareas
2016-09-29 10:10:38 -04:00
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
b074a3257d
add StartTime to log line about deleting an event.
2016-09-28 08:35:19 -04:00
89d4b9fec5
ifdef the libswresample lib stuff
2016-09-27 13:34:10 -04:00
f40c8d0da8
contains due to glob
2016-09-20 15:54:37 -04:00
a3e99cf08d
quick update to Monitor to use Object methods
2016-09-20 12:15:48 -04:00
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
ae4a4681cd
fix using wrong var
2016-09-15 11:41:42 -04:00
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
2b4bad86cb
Merge branch 'master' into storageareas
2016-09-13 10:21:10 -04:00
5fb1c45c4e
Merge ../ZoneMinder.connortechnology into storageareas
2016-09-08 11:34:36 -04:00
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
e51cc7efc8
add a missing / in error message
2016-08-31 11:21:46 -04:00
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
d618b612fe
google code style & whitespace
2016-08-22 12:08:49 -04:00
707694d4ea
google code style
2016-08-22 11:41:26 -04:00
eafe3d7748
Merge branch 'master' into storageareas
2016-08-17 10:31:55 -04:00
3d65b0d2ad
Merge branch 'master' into storageareas
2016-08-08 18:09:11 -04:00
2451768295
Merge branch 'master' into storageareas
2016-08-08 18:08:46 -04:00
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
62d3c66e8f
Merge branch 'fix_1571' into storageareas
2016-08-02 13:53:32 -04:00
208337635a
Merge branch 'master' into storageareas
2016-08-01 19:30:01 -04:00
8eac8a1e1a
Merge branch 'master' into storageareas
2016-07-13 09:50:30 -04:00
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
26369268bb
merge Steve's updates, work on zmaudit
2016-07-12 11:27:25 -04:00
e29a0ebe71
Merge branch 'feature-h264-videostorage' into storageareas
2016-06-21 13:48:32 -04:00
76cb031a5e
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-06-12 07:14:30 -04:00
c0cb1419a3
fixup delete_empty_directories
2016-06-07 22:03:46 -04:00
eb4e36789d
maybe fix delete_empty_directories
2016-06-07 21:43:47 -04:00
5ff53ebce0
More output on errors, make them non-fatal
2016-06-07 21:37:33 -04:00
b081d2e3bf
rename fs_monitor to monitor_id, which is what it is
2016-06-06 10:30:52 -04:00
2460bccdac
fix missing $
2016-06-06 10:18:21 -04:00
5f83bac59c
add line to delete empty directories
2016-06-03 12:01:31 -04:00
ad185809f8
Merge branch 'fix_zmaudit' into storageareas
2016-06-03 11:57:38 -04:00
575180ba5e
introduce new function that recursively deletes empty directories. Call it on each monitor dir
2016-06-03 11:35:28 -04:00
ef9c0ca33a
Debug the SQL on execute, not on parse
2016-06-03 11:15:40 -04:00
b8c406f969
Merge branch 'master' into storageareas
2016-06-03 09:32:55 -04:00
b8cf7c04c1
Fix messed up SQL. die when the selectFrameData sql doesn't execute
2016-05-31 09:14:50 -04:00
8a14d6f4d2
Don't not load the event if it was videod before
2016-05-30 14:57:46 -04:00
409545b386
Add concat to the usage line and format it better
2016-05-30 14:08:38 -04:00
326c4f1fee
Check for existence of libraries specified in LD_PRELOAD and warn about them not existing
2016-05-30 14:08:08 -04:00
4469f909fa
Add support for DefaultVideo to video generation
2016-05-30 14:07:40 -04:00
07878e3e13
Put back the code that makes getDiskPercent look in the storagearea
2016-05-30 10:43:51 -04:00
Andrew Bauer
Isaac Connor
Isaac Connor
Eliot Kent Woodrich
Andy Bauer
Kfir Itzhak
Steve Gilvarry
Dan Walkes
Manojav Sridhar
Kyle Johnson
Isaac Connor
Andrew Bauer
mdrush
peruchi
Jon Gerdes
Dmitry Smirnov
Isaac Connor