273229858f
Merge branch 'master' into storageareas
2017-04-16 11:26:18 -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
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
94ddfc4053
Fix
2017-04-07 11:58:27 -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
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
7360619941
Merge branch 'master' into storageareas
2017-03-24 11:53:45 -04:00
a43adc241f
fix incorrect gpl license mailing address
2017-03-22 07:03:53 -05: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
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
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
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
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
e94a797a5e
remove debug stautement
2017-01-12 12:56:20 -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
04f66917ae
Merge branch 'fix_mmap_leak' into storageareas
2017-01-10 15:29:54 -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
d2ff6701f4
test
2017-01-10 13:53:02 -05:00
3074263e06
Merge branch 'control_fixes' into storageareas
2017-01-10 12:54:46 -05:00
99e823ef33
Merge branch 'zmtelemetry_improvements' into storageareas
2017-01-08 11:04:59 -05:00
146a772a21
move ENDPOINT to hidden category
2017-01-06 19:49:03 -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
cf9747054c
add ZM_TELEMETRY_INTERVAL AND ENDPOINT
2017-01-04 12:22:01 -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
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
752f0eb40b
Merge branch 'master' into improve_filter
2016-12-20 11:43:02 -05: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
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
02cd3e8cba
Merge branch 'master' into small_fixes
2016-11-22 10:52:07 -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
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
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
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
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
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
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
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
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
208337635a
Merge branch 'master' into storageareas
2016-08-01 19:30:01 -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
76cb031a5e
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-06-12 07:14:30 -04:00
2460bccdac
fix missing $
2016-06-06 10:18:21 -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
8a14d6f4d2
Don't not load the event if it was videod before
2016-05-30 14:57:46 -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
886d88b184
Merge branch 'improve_filter' into storageareas
2016-05-30 09:30:18 -04:00
63ac75b440
use ::Database::dbh instead of 3013self{dbh}
2016-05-30 09:27:36 -04:00
2663781adc
put back missing my =__git_main[0];
2016-05-30 09:13:39 -04:00
7bc95561ad
fix
2016-05-29 11:37:32 -04:00
d52a6f9a95
Merge branch 'improve_filter' into storageareas
2016-05-27 09:57:05 -04:00
419e67caa1
Put back the code that populates ZM_SERVER_ID
2016-05-26 12:42:22 -04:00
05709f3084
Merge branch 'id_on_console' into storageareas
2016-05-26 11:17:41 -04:00
a0af99459a
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-05-25 10:12:22 -04:00
aedba1bc7f
whitespace, google code style. Adds special cases for ServerId Attribute. ANd uses * to load all event fields instead of specifying each one.
2016-05-24 16:49:04 -04:00
8fabeb78d3
Merge branch 'fix_zone_edit' into storageareas
2016-05-24 15:55:49 -04:00
57a25373fa
Add logic to Config.pm
2016-05-22 08:53:30 -07:00
a3fe6ea181
Apply changes to Logger.pm
2016-05-22 08:28:23 -07:00
38e1cc909c
Reapply changes to Database.pm
2016-05-22 08:19:18 -07:00
1e52934dcf
Implement a time function that gets unix_timestamp from StartTime, and implement check_for_files_in_filessytem
2016-05-20 20:33:47 -04:00
bb5dbf3e4a
Need to import Config Data into Config
2016-05-20 09:29:40 -04:00
182fa9a5cd
revert the bulk of the merge_db_connects changes.
2016-05-20 08:53:53 -04:00
46039a1887
Merge pull request #1472 from ZoneMinder/v4l1_compat
...
V4l1 compat
2016-05-16 13:02:27 -05:00
3780f8a2e6
move functions from ConfigAdmin into Config. I see no reason for them to be in a separate module
2016-05-16 09:31:54 -04:00
e9d8b7925a
Merge branch 'db_reconnect' into storageareas
2016-05-10 11:13:09 -04:00
aaa4b3a824
check for db connection before assuming that dbh is valid
2016-05-10 11:11:45 -04:00
a5ba4759bf
fix new config entry
2016-05-10 10:54:40 -04:00
17f4f5789e
Merge branch 'master' into v4l1_compat
2016-05-10 10:10:48 -04:00
a012320a3e
Whitespace and code style changes. Change Event->getEventPath to Event->getPath to sync with PHP version
2016-05-10 09:06:49 -04:00
07e988266a
Merge branch 'merge_db_connects' into storageareas
2016-05-09 13:28:40 -04:00
9d9f2453c3
deprecate ConfigAdmin, merge it into Config.pm
2016-05-09 13:27:22 -04:00
cd8c9703c0
remove extra q
2016-05-09 12:48:56 -04:00
2fec880ff6
fix help/description mixup
2016-05-09 12:48:35 -04:00
5806eb0958
Merge branch 'v4l1_compat' into storageareas
2016-05-09 12:46:34 -04:00
08bf97fe85
Add a config entry for ZM_LD_PRELOAD
2016-05-09 12:44:41 -04:00
beebe74e7b
Merge branch 'merge_db_connects' into storageareas
2016-05-09 12:26:17 -04:00
b33e35bda7
move the require to the top
2016-05-09 12:14:59 -04:00
3522c5796b
add BEGIN Back to ZoneMinder.pm
2016-05-09 12:01:26 -04:00
e064af4214
Merge branch 'merge_db_connects' into storageareas
2016-05-07 09:35:14 -04:00
b444c8a6b4
Move the BEGIN from ZoneMinder to ZoneMinder/Base.
2016-05-07 09:34:45 -04:00
6e32b5d266
Use fully specified COnfig hash to simplify Symbol tables
2016-05-07 09:34:04 -04:00
1d63062188
Merge branch 'merge_db_connects' into storageareas
2016-05-07 09:30:18 -04:00
f55f979cc9
use fully specified Config to simplify symbol tables
2016-05-07 09:30:03 -04:00
18442be77f
Merge branch 'merge_db_connects' into storageareas
2016-05-03 14:09:18 -04:00
e3d581dcab
use single quotes instead of double quotes
2016-05-03 10:23:09 -04:00
24bf91707f
Database module should really use DBI
2016-05-03 10:22:38 -04:00
e80db4c433
Use zmDbConnect instead of duplicated db connect code
2016-05-03 10:22:16 -04:00
49e3d3be7a
Turn the config loading code from a BEGIN to a function that could be called repeatedly.
2016-05-03 10:21:50 -04:00
9406a2337f
Add a BEGIN section to load things in the correct order.
2016-05-03 10:21:01 -04:00
2ba18e14fc
Merge branch 'merge_db_connects' into storageareas
2016-05-03 09:05:36 -04:00
Isaac Connor
Andrew Bauer
Eliot Kent Woodrich
Isaac Connor
Andy Bauer
Steve Gilvarry
Dan Walkes
Isaac Connor
Andrew Bauer
Jon Gerdes
Dmitry Smirnov
Isaac Connor
Isaac Connor
Isaac Connor
josh4trunks