Commit Graph

427 Commits

Author SHA1 Message Date
Isaac Connor 2cab6baf2c add some comments and one change that may fix effectiveLevel use 2017-07-05 15:25:01 -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 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
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
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 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 53a7b2e72c more double quotes to single quotes and fix some spacing 2017-05-31 09:57:55 -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 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 b948bc5403 fix a few extra ) 2017-05-30 10:21:34 -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 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 7970b806e0 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-05-20 07:57:03 -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
Isaac Connor 65b4a7ccdb merge simple debug output changes from storageareas 2017-05-15 16:40:46 -04:00
Andrew Bauer e6c60737e9 Merge pull request #1756 from SteveGilvarry/zmf_goodbye
Remove zmf
2017-05-10 07:07:22 -05:00
Andrew Bauer 65f96df477 Merge pull request #1791 from dwalkes/FI8908ControlAdd
Additional controls for FI8908W cameras
2017-04-15 07:23:29 -05: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 538658403c Merge pull request #1822 from knnniggett/csrf
Implement CSRF Mitigation
2017-03-30 10:39:55 -04:00
Andy Bauer 4e16ae6d19 add ZM_ENABLE_CSRF_MAGIC toggle 2017-03-28 17:29:36 -05:00
Andrew Bauer a43adc241f fix incorrect gpl license mailing address 2017-03-22 07:03:53 -05: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
SteveGilvarry 2f3ebd80da Remove zmf, die..die..die 2017-01-16 13:20:05 -08: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 513cd68c20 remove the verified caching. It makes calling zmMemVerify useless. 2017-01-12 13:02:16 -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 d2ff6701f4 test 2017-01-10 13:53:02 -05:00