5c3a582252
The signal we should be blocking is SIGCHLD not SIGINT
2017-04-06 21:21:28 -04:00
68ab2cb756
Merge pull request #1837 from DarkDeepBlue/fix-format-string-local-cam
...
zm_local_camera.cpp: Improve format strings
2017-04-06 08:54:20 -04:00
b4ac277ecb
Merge pull request #1846 from mnoorenberghe/docker_vhost
...
Use misc/apache.conf instead of utils/docker/apache-vhost in docker
2017-04-06 08:41:21 -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
6a9819e16b
whitespace, comments
2017-04-05 16:10:21 -04:00
2b9a0f96d3
remove and break over multiple lines
2017-04-05 16:10:06 -04:00
d611840750
whitespace, handle NaN in limitArea
2017-04-05 16:09:40 -04:00
c5ff45922f
fix zone edit height
2017-04-05 16:09:06 -04:00
a689fcff88
Fix use Time::HiRes
2017-04-05 16:08:47 -04:00
452e9571ee
add a different size warning
2017-04-05 16:08:29 -04:00
15e69fc817
fix . to ->
2017-04-05 10:39:38 -04:00
1dbf599f10
add a cast to get rid of build warning
2017-04-05 10:36:44 -04:00
7815f1c539
introduce a redirect flag global variable to allow us to redirect. Which allows to redirect on successful login so we don't get repost popups
2017-04-05 10:05:21 -04:00
372fde7a8a
fix typos in LIBSWRESAMPLE_H
2017-04-04 15:28:48 -04:00
1f3eecbd6c
change how opkt.pts/dts are calculated by using the diff since the last input packet instead of the diff since the beginning of stream. This should allow us to handle input pts/dts wrapping.
2017-04-04 15:15:37 -04:00
b609b9ad4c
Merge pull request #1826 from connortechnology/uri_decode_in_zms
...
Uri decode in zms
2017-04-03 20:13:30 -05:00
a10d52a3e1
Merge pull request #1844 from connortechnology/fix_1812
...
fix Monitors filtering SQL
2017-04-03 20:06:39 -05:00
a1f0ec3ecf
Use misc/apache.conf instead of utils/docker/apache-vhost in docker
...
This avoids duplication and fixes a few things that were missing in the Docker version for modern Apache:
* AllowOverride All
* Require all granted
Deleted `ServerName @WEB_HOST@` since `WEB_HOST` was never defined in ZM code so it would give an Apache error.
2017-04-02 21:54:49 -07:00
8555b07f95
Update redhat.rst
...
update rpm building instructions to reflect latest changes
2017-04-01 08:26:27 -05:00
a40de3b588
Update redhat.rst
...
better way to create a tarball from a local git repo
2017-04-01 08:20:34 -05:00
e70c7fa1ef
whitespace and comments
2017-03-31 23:34:58 -04:00
cd1b09d977
Update zoneminder.spec
...
use rpm macros
2017-03-31 20:35:24 -05:00
716a25fc1f
rpmspecfile - ensure cache folders are created during install
2017-03-31 20:17:05 -05:00
08766b7546
decrease wait time in order to achieve greater throughput. flush after every print so that we don't buffer the whole file
2017-03-31 14:33:00 -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
514c83d3e9
whitespace and add a test for ->Triggers being an array
2017-03-31 12:01:37 -04:00
d1a60dedc8
Fix the overzealous use of escapeshellcmd that breaks restarting monitors
2017-03-31 11:59:55 -04:00
30455feef7
code style
2017-03-31 11:12:52 -04:00
9c495b07dd
code style, whitespace, comments
2017-03-31 11:12:42 -04:00
26dfe45ec6
delete the videostore on camera delete so that the .mp4 gets written to disk
2017-03-31 11:06:15 -04:00
7068efd581
rpmspecfile - modify tarball handling
2017-03-30 18:31:58 -05:00
9a2c31d2c0
bump rpmspecfile to 1.30.2 release
2017-03-30 18:20:41 -05:00
3405a540a4
Merge pull request #1843 from connortechnology/fix_1842
...
Test for Controllable as well as ControlId
2017-03-30 13:43:06 -05:00
f2dcd18297
Merge branch 'armv7_neon' of https://github.com/mastertheknife/ZoneMinder into storageareas
2017-03-30 13:46:30 -04:00
5f6332f313
Fixed the assembly in hwcaps_detect() to compile with -fpic & -fPIC and added SSE4.1, SSE4.2 and AVX detection
2017-03-30 20:35:31 +03:00
d3f6ab3d29
fix Monitors filtering SQL
2017-03-30 13:06:54 -04:00
56476a7774
uppercase SQL
2017-03-30 13:05:10 -04:00
1d146b112a
remark out some code that detects when the pts is < last_pts. The rest isn't implemented yet so it's bogus
2017-03-30 13:04:54 -04:00
4f2dcdacb4
update, remove styles and fix the sql for limiting monitors
2017-03-30 13:04:16 -04:00
dd4550406f
remove styles from montagereview and stick them in a view-specific css
2017-03-30 13:03:46 -04:00
7e3b27a130
Test for Controllable as well as ControlId
2017-03-30 10:49:02 -04:00
b2db0888ae
add a warning if csrf_check returns false
2017-03-30 10:46:13 -04:00
5ea77f0781
Make zones a link to zones_overview
2017-03-30 10:45:55 -04:00
538658403c
Merge pull request #1822 from knnniggett/csrf
...
Implement CSRF Mitigation
2017-03-30 10:39:55 -04:00
8b7acb68a3
fix password and add debug
2017-03-29 20:07:58 -04:00
e46f64125e
Update zoneminder.tmpfiles.in
...
With cakephp debug mode off, we must ensure cake's tmp folders are created
2017-03-29 13:28:15 -05:00
fe223e3b29
remove a warning when adding users when not logged in (could happen if OPT_AUTH isn't turned on yet
2017-03-29 10:38:29 -04:00
a0c030413a
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-03-29 10:19:10 -04:00
Isaac Connor
Isaac Connor
Eliot Kent Woodrich
Andrew Bauer
Matthew Noorenberghe
Kfir Itzhak