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
3f880fad3a
Merge pull request #1500 from knnniggett/zmdc_unlink
...
remove one unlink, add better error reporting to the rest
2016-05-24 14:35:39 -04:00
0052bb080c
unlink only if file exists
2016-05-24 12:13:17 -05:00
11701357aa
remove one unlink, add better error reporting to the rest
2016-05-24 09:01:32 -05:00
bc163b33fc
move multiserver message to once during startup only
2016-05-23 20:06:29 -05: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
8bbb443c67
fix invalid key name in config hash
2016-05-20 10:35:03 -05: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
924acf4284
fix zmdc.pl hang due to needing to connect to db after fork
2016-05-19 15:01:31 -04:00
8e06c0ec63
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2016-05-19 12:08:56 -04:00
183f9c70a4
Must use ZoneMinder instead of ZoneMinder::Logger
2016-05-19 12:08:45 -04:00
8bac5fbdfb
typo - remove extra comma
2016-05-18 16:58:04 -05:00
46039a1887
Merge pull request #1472 from ZoneMinder/v4l1_compat
...
V4l1 compat
2016-05-16 13:02:27 -05:00
b53a0a564d
Don't need the extra use ZoneMinder::Config
2016-05-16 10:07:24 -04:00
dd24c35afa
revert bogus optimisation
2016-05-16 10:05:12 -04: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
5df85770cd
zmupdate.pl.in
2016-05-13 13:52:34 -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
605edfd6d0
add ENV{LD_PRELOAD} setting
2016-05-09 12:46:26 -04:00
08bf97fe85
Add a config entry for ZM_LD_PRELOAD
2016-05-09 12:44:41 -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
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
f55f979cc9
use fully specified Config to simplify symbol tables
2016-05-07 09:30:03 -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
30f34a6f49
instead of code duplication for opening the db, use zmDbConnect everywhere
2016-05-03 08:59:40 -04:00
55d58a140e
instead of code duplication for opening the db, use zmDbConnect everywhere
2016-05-03 08:57:51 -04:00
6bf43631e2
Merge pull request #1428 from ZoneMinder/better_zmvideo
...
Better zmvideo
2016-04-28 22:00:52 +10:00
1072327dd1
remove extra quote
2016-04-21 08:01:13 -05:00
3a9ab7f685
Merge branch '1128_ssmtp_mail_option' of https://github.com/dreaddy/ZoneMinder into dreaddy-1128_ssmtp_mail_option
2016-04-21 07:27:19 -05:00
67f38d07df
Merge branch 'master' into better_zmvideo
2016-04-20 12:04:15 -04:00
7058b0862a
suppressed warnings of killall for FreeBSD
2016-04-16 16:39:58 +03:00
4e9a925933
Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete
2016-04-04 20:52:49 -05:00
7ff8d36598
Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation
2016-04-04 20:44:53 -05:00
a31660c1f6
Remove the code looks for zm.conf in the current dir.
2016-04-04 10:45:58 -04:00
38e3c92546
Minor grammar fixes
2016-03-25 13:18:43 +00:00
6d4d05184c
fix typo
2016-03-23 09:49:38 -04:00
d3558c5688
Merge pull request #1323 from knnniggett/zmfilter
...
fix missing Net::SFTP::Foreign::debug warning
2016-03-21 10:47:50 -04:00
4e1af516d7
Don't output sudo test cmd to /dev/null. Other tests aren't, and info us useful.
2016-03-11 14:29:48 -07:00
b9085cea64
Fix issue where programs are installed in unexpected paths.
...
For example, on freebsd, sudo is in /usr/local/bin, and as things
were pre-this commit, sudo wasn't being found.
2016-03-11 14:28:16 -07:00
facae6cb0d
use make "-f" parameter instead of "--makefile"
2016-03-10 13:58:41 -06:00
4606d2fbca
Update zmtrigger.pl.in
...
mention the %Q placholder when using showtext
2016-03-10 10:13:38 -06:00
313f46dceb
add zmtelemetry.pl to autotools build
2016-03-09 11:26:10 -05:00
ab3c35c629
fix missing Net::SFTP::Foreign::debug warning
2016-03-04 17:21:32 -06:00
bc89b95470
Merge pull request #1292 from ZoneMinder/telemetry
...
Telemetry Data
2016-03-01 07:17:16 -07:00
d40bf89b17
Remove Phone BW settings used with mobile skin
2016-02-26 22:43:37 +11:00
6b169af655
Remove eyezm configdata
...
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
2016-02-26 22:35:24 +11:00
5ff427d9e9
Removed Autotools Makefile.am
...
Conflicts:
Makefile.am
misc/Makefile.am
src/Makefile.am
web/includes/Makefile.am
web/js/Makefile.am
web/skins/classic/css/classic/views/Makefile.am
web/skins/classic/css/flat/views/Makefile.am
web/skins/classic/views/Makefile.am
web/skins/classic/views/js/Makefile.am
2016-02-26 22:19:02 +11:00
7a42a8c3f9
add Netcat ONVIF compatible ptz control
2016-02-24 10:15:59 -06:00
826a22a2a8
add missing .
2016-02-19 11:07:06 -05:00
3b07b56400
Use more descriptive names for the channels
2016-02-19 11:05:55 -05:00
64c5b64068
Log error before croaking and include port# in the error message
2016-02-19 11:04:02 -05:00
327a01cb20
Log error before croaking and show path to file in the error message
2016-02-19 10:59:40 -05:00
3a512f87a5
Log the reason for croaking before croaking.
2016-02-19 10:57:52 -05:00
d1ba45c56a
include the sock path in the error message and output an error on failure to open pid file
2016-02-16 10:02:30 -05:00
8a2dc2897d
Perl DateTime dependency not needed
2016-02-15 14:11:58 -06:00
041585b4a2
Change Info to Debug
2016-02-15 14:03:16 -06:00
e3afa5d1ec
change to testing5
2016-02-15 12:38:13 -06:00
87aceef479
change server endpoint
2016-02-15 08:50:11 -06:00
cd8a4adfab
replace uname system call with native perl when applicable
2016-02-15 08:43:34 -06:00
47eaea78be
use units of bytes for total memory
2016-02-13 15:01:22 -06:00
ee3f87a2ad
additional refinements to zmtelemetry
2016-02-13 14:53:22 -06:00
08af88df10
fix compilation errors
2016-02-13 08:54:40 -06:00
87857f5dc1
more debug and warnings
2016-02-12 17:45:08 -06:00
24838a91c9
set kernel, distro, and version for Mac OS
2016-02-12 17:38:00 -06:00
3c48d81edb
tweak regex's. add debug
2016-02-12 17:15:04 -06:00
5045da9382
add initial distro determination logic to zmtelemetry
2016-02-12 15:18:45 -06:00
c892e912cf
use uname -p for telemetry architecture
2016-02-12 10:47:12 -06:00
b04e1eb0c6
let mysql generate the uuid
2016-02-12 09:18:15 -06:00
799437fdf1
retrieve telemetry data from the monitors table
2016-02-12 08:59:16 -06:00
017417d8f8
small changes to zmtelemetry
2016-02-12 08:06:51 -06:00
1b6af8afae
modify telemetry parameters
2016-02-11 13:10:36 -06:00
1811d71562
make date format compatible with *BSD
2016-02-11 08:10:16 -06:00
f5ff5d152c
Add count query subroutine
2016-02-11 07:22:31 -06:00
6d81ef247e
build telemetry hash then jsonencode it
2016-02-10 20:46:05 -06:00
177a70a248
add getIP subroutine to zmtelemetry.pl
2016-02-10 14:05:34 -06:00
f48ffb60e6
update ZM_TELEMETRY_UUID after creating uuid
2016-02-10 13:37:22 -06:00
18c493a180
Add getUUID subroutine, Add ZM_TELEMETRY_LAST_UPLOAD
2016-02-10 13:04:14 -06:00
7a9740b1a4
Update zmtelemetry.pl.in
2016-02-09 14:35:45 -06:00
609784f902
Update telemetry host, port and protocol
2016-02-09 12:49:09 -07:00
b718bd298f
Merge branch 'vivotek-ePTZ' of https://github.com/schrorg/ZoneMinder into schrorg-vivotek-ePTZ
2016-02-09 06:56:38 -06:00
5bcc414038
codespell: misc. spelling corrections
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-02-08 20:41:36 +11:00
f607e3a6fa
zmtelemetry - the typo of my typo is my friend
2016-02-06 14:50:02 -06:00
4ad31695ba
fix typo in cmakefile
2016-02-06 14:25:00 -06:00
e0ee05e05c
add zmtelemetry to cmake
2016-02-06 14:10:42 -06:00
8a537029ea
Initial commit to add zmtelemetry.pl
2016-02-06 14:08:28 -06:00
9ace6c518d
Merge pull request #1225 from Simpler1/profiles
...
Added profiles for Wanscam-HW0025 and IPCC-7210W
2016-02-04 11:55:48 -05:00
d3755611c5
Merge pull request #1247 from bodegard/master
...
Corrected DB update version comments, fixed typos, and skin font modification
2016-02-04 11:54:02 -05:00
52e16dbdd0
Merge pull request #1249 from knnniggett/pelcop
...
Fix PelcoP checksum calculation
2016-02-04 11:52:51 -05:00
748754a213
Merge pull request #1209 from adamreiser/StrictKeyChecking
...
Strict key checking
2016-02-04 10:07:19 -06:00
fa168027b3
Fix PelcoP checksum calculation
2016-01-24 07:45:04 -06:00
50b113cd02
Merge pull request #1189 from marcolino7/master
...
PTZ - Added autostop to Down command on FI8918W
2016-01-24 07:40:30 -06:00
9c72579c2e
Corrected typo in function info
2016-01-22 12:12:39 -06:00
66c66106f5
Process off+time delay condition
2016-01-15 20:31:31 -06:00
f0486e5b5e
fix dumb mistake, undefing ZM_SERVBER_ID after setting it.
2016-01-04 22:07:07 -05:00
1432c6ae1f
Added profiles for Wanscam-HW0025 and IPCC-7210W
2016-01-04 12:30:46 -05:00
fc5de5a4f3
Merge pull request #1215 from ZoneMinder/multi-server
...
Multi server
2016-01-01 21:50:31 -06:00
54bff42fa0
Remove warnings when no server set
2016-01-01 21:27:30 -05:00
c827f55580
Merge pull request #1040 from ZoneMinder/multi-server
...
Multi server
2016-01-01 09:36:04 -06:00
659b3f37f5
Stylistic fix
2015-12-29 21:08:24 -08:00
28bf4dfe7b
Add option for strict host key checking
2015-12-29 16:34:11 -08:00
39bcb20dac
Skip directories that have non-digits in them
2015-12-22 12:59:37 -05:00
1aa79c306b
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2015-12-22 09:47:45 -05:00
dfd7986c01
Merge branch 'master' into multi-server
...
Conflicts:
distros/debian_cmake/links
distros/ubuntu1504_cmake/zoneminder.postinst
2015-12-21 12:57:45 -05:00
118dc12ad5
id => Id
2015-12-21 11:25:17 -05:00
f6d52e77b9
it is important to return the object from the constructor
2015-12-21 11:13:21 -05:00
ac88867fd2
fix namespace for dbh
2015-12-21 11:10:24 -05:00
8682b1af28
rough in a Storage class for the perl side of things
2015-12-21 11:03:53 -05:00
27b1b37d5b
added opt_use_api
2015-12-19 17:43:36 -05:00
d035753971
Add the event class.
...
Also, remove the unused Storage class
2015-12-17 14:38:18 -05:00
b32ef7751b
implement the options to generate videos for events specified by a stored filter. Also implement ability to generate a concatenated video of all events specified by the filter.
2015-12-17 14:36:40 -05:00
c71d1e52ac
Fix
2015-12-17 13:13:04 -05:00
9db9d243f2
Fix
2015-12-17 13:12:37 -05:00
6f34022613
add find and find_one routines
2015-12-17 13:11:32 -05:00
7a979bb891
remove duplicated routines
2015-12-17 13:11:15 -05:00
64f65b55cc
use new Filter object to do some of the heavy lifting in zmfilter.pl
2015-12-17 12:57:14 -05:00
7365c053e6
Create a Filter object, out of some of the code in zmfilter.pl. The purpose is to be able to use it elsewhere like zmvideo.pl.
2015-12-17 12:56:40 -05:00
62095b30d0
Added autostop to Down command
2015-12-16 16:58:20 +01:00
39e396eb6e
Merge branch 'master' into multi-server
2015-12-09 10:36:51 -05:00
ac23efebef
Merge pull request #1184 from ZoneMinder/TV-IP862_new_firmware
...
Add code to detect the change in REALM from older to newer firmware
2015-12-09 10:36:27 -05:00
7c298c58ed
Add code to detect the change in REALM from older to newer firmware
2015-12-08 16:20:38 -05:00
5390605797
Add v to front of version string in version->parse to force conversion of decimal to dotted decimal versions, and change from ge to > to prevent reapplying current version
2015-12-03 10:23:19 +11:00
4d6c4355db
Merge branch 'master' into multi-server
2015-11-20 16:07:50 -05:00
d231ac4533
remove comment at end of line
2015-11-10 14:46:12 -05:00
49a89b75a8
More verbose error reporting
2015-11-09 16:15:53 +01:00
3479af78bd
Add more verbose help
2015-11-06 13:36:29 -05:00
92401193a7
Add missing semicolon
2015-11-06 11:19:12 -05:00
ced0240fc3
Use the ssmtp path set in options first. shell command if ssmtp path empty. display debug suggesting set ssmtp path in option.
2015-11-06 10:43:30 -05:00
a942b22541
Add camera control module for Vivotek ePTZ protocol
2015-11-04 17:12:07 +01:00
35617a6cf7
#1128 - Added option to enable send email by ssmtp mail. Option for custom ssmtp path. Conditional checks for new options in filter
2015-11-02 22:16:10 -05:00
44168ce05e
Merge branch 'master' into multi-server
2015-10-30 11:29:03 -04:00
1cce60f6ec
Update version check URL
2015-10-23 11:45:32 -06:00
582cbe7567
Merge branch 'master' into multi-server
2015-10-15 09:01:19 -04:00
1367de292e
Fix error message when no ZM_SERVER_NAME or ZM_SERVER_HOST set
2015-10-07 08:57:50 -04:00
79d8e4b74f
Merge branch 'master' into fix_zmaudit
2015-10-06 09:30:32 -04:00
4a506368dc
Fix zmaudit sleeping and deleting Empty Events now that Frames also has an Id field
2015-10-06 09:30:10 -04:00
e0e048fe7e
fixed version compare logic
2015-10-04 09:10:05 -04:00
aa108eff6e
Add Info line on startup saying which Server it is loading for
2015-10-02 12:33:09 +00:00
b0b69c5176
parse ZM_SERVER_HOST into ZM_SERVER
2015-10-02 12:32:41 +00:00
ea87ffe66f
merge master, bump version to 1.28.108
2015-10-01 11:52:49 -04:00
4eb4bdbfb5
Added control script for SunEyes SP-P1802SWPTZ
...
(http://www.amazon.com/SunEyes-SP-P1802SWPTZ-Wireless-Camera-1080P/dp/B00MOTBXK6 )
2015-09-30 13:39:50 +02:00
e4b0e74f69
merge master
2015-09-24 10:01:27 -04:00
d754239a51
add debug statements for when LastWriteTime is not defined.
2015-09-24 09:57:58 -04:00
4c2545a5ca
Merge branch 'master' into multi-server
2015-09-17 15:39:26 -04:00
6e3c8bb380
revert
2015-09-14 15:15:44 -04:00
204f2b1e22
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-09-10 13:20:06 -04:00
31ad75dea9
only add -h hostname to mysql command if it is defined. This helps support local unix-socket mysql access
2015-09-10 13:04:52 -04:00
73fa051ef8
Google recaptcha
2015-08-29 13:29:52 -04:00
9cdf8ec317
tabs to spaces
2015-08-27 11:13:44 -04:00
80a294da34
tabs to spaces
2015-08-27 11:10:13 -04:00
75919c9cd5
Merge branch 'master' into multi-server
...
Conflicts:
docs/installationguide/ubuntu.rst
misc/apache.conf.in
src/zm_monitor.cpp
2015-08-27 10:34:47 -04:00
b4e9a0f0cf
whitespacing
2015-08-26 12:08:10 -04:00
46bd7b492b
adds sanity checks to isActive and default states
2015-08-26 11:20:58 -04:00
41637278c9
merge master
2015-08-19 16:08:12 -04:00
5a363273a2
Merge branch 'master' into multi-server
...
Conflicts:
distros/ubuntu1504/changelog
2015-07-16 16:37:44 -04:00
10adae3696
Merge pull request #941 from ZoneMinder/trigger_on_space
...
add space instead of + to handle old Axis cameras
2015-07-16 13:09:36 -05:00
ad23969982
add space instead of + to handle old Axis cameras
2015-07-16 13:06:15 -04:00
c788d70b93
zmtrigger: POD documentation
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-07-16 18:35:42 +10:00
ca9a391d62
Only load the monitors for our server
2015-07-15 16:24:01 -04:00
b8888b9d55
Only load triggers for our Server if ZM_SERVER_ID is set
2015-07-15 16:22:43 -04:00
4e5ca2cead
Merge pull request #937 from ZoneMinder/better_logging
...
improve log
2015-07-15 15:21:08 -05:00
104f375669
Merge pull request #936 from ZoneMinder/handle_serial_trigger_problem
...
add error handling on failure to open serial port
2015-07-15 15:20:56 -05:00
51af432468
Only load monitors for our server if ZM_SERVER_ID is specified
2015-07-15 16:18:05 -04:00
e318c3bf37
Add ServerId as a filter option
2015-07-15 16:12:35 -04:00
01518d6aa9
fix. without this zmc won't restart automatically
2015-07-15 16:08:02 -04:00
e4b3344a8c
improve log
2015-07-15 16:06:55 -04:00
cf3f160783
add error handling on failure to open serial port
2015-07-15 16:02:02 -04:00
4630bad24b
add http to control url if it isn't present
2015-07-15 15:59:21 -04:00
561bf43721
fix pod2man generation for out-of-source builds
2015-07-09 19:33:06 -05:00
58448adb51
Merge pull request #896 from knnniggett/pod2man
...
Generate man pages for perl scripts & C Binaries in the bin folder
2015-07-03 11:40:24 -04:00
1aebbec4e8
Merge branch '898-isRunning-States' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-898-isRunning-States
...
Conflicts:
db/zm_create.sql.in
db/zm_update-1.28.99.sql
2015-06-27 16:32:32 -05:00
b867ee4c4c
Merge pull request #891 from ZoneMinder/zmwatch_cleanup2
...
Zmwatch cleanup2
2015-06-23 08:36:42 -05:00
30c7ab697c
Merge pull request #847 from ZoneMinder/faster_shutdown
...
faster shutdown
2015-06-23 08:19:25 -05:00
e4106e34a1
put back build replacements, don't know how I lost those
2015-06-22 13:56:27 -04:00
91e7281695
Merge pull request #890 from ZoneMinder/zmwatch_cleanup1
...
reverse the if statement to reduce indenting
2015-06-22 12:53:06 -05:00
612e96bbfe
fix problem causing processes to not be restarted. Also, tabs to spaces
2015-06-22 13:37:26 -04:00
e758d9bf7c
Modified to handle setting isActive for custom states
2015-06-21 09:30:46 -04:00
fa835359a1
Add install target for C binary man pages
2015-06-20 17:33:13 -05:00
13b9921680
Modify zmsystemctl pod documentation
2015-06-20 16:13:40 -05:00
fd239f6545
Generate man pages for perl scripts in the bin folder
2015-06-20 15:22:11 -05:00
f8cc27e224
Protocol for 8918W
2015-06-19 15:45:50 -04:00
991291ce67
declared so perl does not complain of globals
2015-06-19 14:12:08 -04:00
39ee845ff0
Updated 9831W foscam script
2015-06-19 12:58:40 -04:00
1f87a696cf
improve debugging for analysis check and restart if can't read shared data
2015-06-19 11:07:20 -04:00
3be4a0aa11
re-enable restarting capture process if mem invalid
2015-06-19 09:04:19 -04:00
a9175705c1
reverse the if statement to reduce indenting
2015-06-19 08:59:49 -04:00
f6a226e700
Correct bareword config entries with newer {} style
2015-05-27 10:00:24 -04:00
47192156cd
alter shutdown behaviour to send a term signal to all processes and then go through again to send a KILL if neccessary. This eliminates unneccesary sleeping.
2015-05-21 15:37:08 -04:00
d509861f9e
Merge pull request #838 from ZoneMinder/zmaudit_update1
...
Zmaudit update1: Make MIN_AGE Configurable
2015-05-21 12:10:08 -05:00
8c7e633d8f
Undo ZM_VERSION changes
2015-05-18 21:55:00 -07:00
ffe46978d2
Undid PATH change, needed for mysqldump; which I see is indeed called
...
many other places with incorrect paths.
Make macros should be setting all this up correctly!
mysqldump is [for example] in /opt/local/bin, not /usr/bin, with pkgin
2015-05-18 21:49:08 -07:00
Isaac Connor
Isaac Connor
Andrew Bauer
josh4trunks
Isaac Connor
Andrew Bauer
Steve Gilvarry
abi
Sándor Czettner
Kyle Johnson
Isaac Connor
Dmitry Smirnov
Brandon Odegard
Simpler1
Adam Reiser
arjunrc
Marco
SteveGilvarry
Robin Daermann
dreaddy
Bobby Billingsley
Rick Sayre