Andy Bauer
ee3f87a2ad
additional refinements to zmtelemetry
2016-02-13 14:53:22 -06:00
Andy Bauer
08af88df10
fix compilation errors
2016-02-13 08:54:40 -06:00
Andrew Bauer
87857f5dc1
more debug and warnings
2016-02-12 17:45:08 -06:00
Andrew Bauer
24838a91c9
set kernel, distro, and version for Mac OS
2016-02-12 17:38:00 -06:00
Andrew Bauer
3c48d81edb
tweak regex's. add debug
2016-02-12 17:15:04 -06:00
Andrew Bauer
5045da9382
add initial distro determination logic to zmtelemetry
2016-02-12 15:18:45 -06:00
Andrew Bauer
c892e912cf
use uname -p for telemetry architecture
2016-02-12 10:47:12 -06:00
Andrew Bauer
b04e1eb0c6
let mysql generate the uuid
2016-02-12 09:18:15 -06:00
Andrew Bauer
799437fdf1
retrieve telemetry data from the monitors table
2016-02-12 08:59:16 -06:00
Andrew Bauer
017417d8f8
small changes to zmtelemetry
2016-02-12 08:06:51 -06:00
Andrew Bauer
1b6af8afae
modify telemetry parameters
2016-02-11 13:10:36 -06:00
Andrew Bauer
1811d71562
make date format compatible with *BSD
2016-02-11 08:10:16 -06:00
Andrew Bauer
f5ff5d152c
Add count query subroutine
2016-02-11 07:22:31 -06:00
Andy Bauer
6d81ef247e
build telemetry hash then jsonencode it
2016-02-10 20:46:05 -06:00
Andrew Bauer
177a70a248
add getIP subroutine to zmtelemetry.pl
2016-02-10 14:05:34 -06:00
Andrew Bauer
f48ffb60e6
update ZM_TELEMETRY_UUID after creating uuid
2016-02-10 13:37:22 -06:00
Andrew Bauer
18c493a180
Add getUUID subroutine, Add ZM_TELEMETRY_LAST_UPLOAD
2016-02-10 13:04:14 -06:00
Andrew Bauer
7a9740b1a4
Update zmtelemetry.pl.in
2016-02-09 14:35:45 -06:00
Kyle Johnson
609784f902
Update telemetry host, port and protocol
2016-02-09 12:49:09 -07:00
Andy Bauer
b718bd298f
Merge branch 'vivotek-ePTZ' of https://github.com/schrorg/ZoneMinder into schrorg-vivotek-ePTZ
2016-02-09 06:56:38 -06:00
Dmitry Smirnov
5bcc414038
codespell: misc. spelling corrections
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-02-08 20:41:36 +11:00
Andrew Bauer
f607e3a6fa
zmtelemetry - the typo of my typo is my friend
2016-02-06 14:50:02 -06:00
Andrew Bauer
4ad31695ba
fix typo in cmakefile
2016-02-06 14:25:00 -06:00
Andrew Bauer
e0ee05e05c
add zmtelemetry to cmake
2016-02-06 14:10:42 -06:00
Andrew Bauer
8a537029ea
Initial commit to add zmtelemetry.pl
2016-02-06 14:08:28 -06:00
Isaac Connor
9ace6c518d
Merge pull request #1225 from Simpler1/profiles
...
Added profiles for Wanscam-HW0025 and IPCC-7210W
2016-02-04 11:55:48 -05:00
Isaac Connor
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
Isaac Connor
52e16dbdd0
Merge pull request #1249 from knnniggett/pelcop
...
Fix PelcoP checksum calculation
2016-02-04 11:52:51 -05:00
Andrew Bauer
748754a213
Merge pull request #1209 from adamreiser/StrictKeyChecking
...
Strict key checking
2016-02-04 10:07:19 -06:00
Andy Bauer
fa168027b3
Fix PelcoP checksum calculation
2016-01-24 07:45:04 -06:00
Andrew Bauer
50b113cd02
Merge pull request #1189 from marcolino7/master
...
PTZ - Added autostop to Down command on FI8918W
2016-01-24 07:40:30 -06:00
Brandon Odegard
9c72579c2e
Corrected typo in function info
2016-01-22 12:12:39 -06:00
Andy Bauer
66c66106f5
Process off+time delay condition
2016-01-15 20:31:31 -06:00
Isaac Connor
f0486e5b5e
fix dumb mistake, undefing ZM_SERVBER_ID after setting it.
2016-01-04 22:07:07 -05:00
Simpler1
1432c6ae1f
Added profiles for Wanscam-HW0025 and IPCC-7210W
2016-01-04 12:30:46 -05:00
Andrew Bauer
fc5de5a4f3
Merge pull request #1215 from ZoneMinder/multi-server
...
Multi server
2016-01-01 21:50:31 -06:00
Isaac Connor
54bff42fa0
Remove warnings when no server set
2016-01-01 21:27:30 -05:00
Andrew Bauer
c827f55580
Merge pull request #1040 from ZoneMinder/multi-server
...
Multi server
2016-01-01 09:36:04 -06:00
Adam Reiser
659b3f37f5
Stylistic fix
2015-12-29 21:08:24 -08:00
Adam Reiser
28bf4dfe7b
Add option for strict host key checking
2015-12-29 16:34:11 -08:00
Isaac Connor
39bcb20dac
Skip directories that have non-digits in them
2015-12-22 12:59:37 -05:00
Isaac Connor
1aa79c306b
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2015-12-22 09:47:45 -05:00
Isaac Connor
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
Isaac Connor
118dc12ad5
id => Id
2015-12-21 11:25:17 -05:00
Isaac Connor
f6d52e77b9
it is important to return the object from the constructor
2015-12-21 11:13:21 -05:00
Isaac Connor
ac88867fd2
fix namespace for dbh
2015-12-21 11:10:24 -05:00
Isaac Connor
8682b1af28
rough in a Storage class for the perl side of things
2015-12-21 11:03:53 -05:00
arjunrc
27b1b37d5b
added opt_use_api
2015-12-19 17:43:36 -05:00
Isaac Connor
d035753971
Add the event class.
...
Also, remove the unused Storage class
2015-12-17 14:38:18 -05:00
Isaac Connor
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
Isaac Connor
c71d1e52ac
Fix
2015-12-17 13:13:04 -05:00
Isaac Connor
9db9d243f2
Fix
2015-12-17 13:12:37 -05:00
Isaac Connor
6f34022613
add find and find_one routines
2015-12-17 13:11:32 -05:00
Isaac Connor
7a979bb891
remove duplicated routines
2015-12-17 13:11:15 -05:00
Isaac Connor
64f65b55cc
use new Filter object to do some of the heavy lifting in zmfilter.pl
2015-12-17 12:57:14 -05:00
Isaac Connor
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
Marco
62095b30d0
Added autostop to Down command
2015-12-16 16:58:20 +01:00
Isaac Connor
39e396eb6e
Merge branch 'master' into multi-server
2015-12-09 10:36:51 -05:00
Isaac Connor
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
Isaac Connor
7c298c58ed
Add code to detect the change in REALM from older to newer firmware
2015-12-08 16:20:38 -05:00
SteveGilvarry
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
Isaac Connor
4d6c4355db
Merge branch 'master' into multi-server
2015-11-20 16:07:50 -05:00
Isaac Connor
d231ac4533
remove comment at end of line
2015-11-10 14:46:12 -05:00
Robin Daermann
49a89b75a8
More verbose error reporting
2015-11-09 16:15:53 +01:00
dreaddy
3479af78bd
Add more verbose help
2015-11-06 13:36:29 -05:00
dreaddy
92401193a7
Add missing semicolon
2015-11-06 11:19:12 -05:00
dreaddy
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
Robin Daermann
a942b22541
Add camera control module for Vivotek ePTZ protocol
2015-11-04 17:12:07 +01:00
dreaddy
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
Isaac Connor
44168ce05e
Merge branch 'master' into multi-server
2015-10-30 11:29:03 -04:00
Kyle Johnson
1cce60f6ec
Update version check URL
2015-10-23 11:45:32 -06:00
Isaac Connor
582cbe7567
Merge branch 'master' into multi-server
2015-10-15 09:01:19 -04:00
Isaac Connor
1367de292e
Fix error message when no ZM_SERVER_NAME or ZM_SERVER_HOST set
2015-10-07 08:57:50 -04:00
Isaac Connor
79d8e4b74f
Merge branch 'master' into fix_zmaudit
2015-10-06 09:30:32 -04:00
Isaac Connor
4a506368dc
Fix zmaudit sleeping and deleting Empty Events now that Frames also has an Id field
2015-10-06 09:30:10 -04:00
Pliable Pixels
e0e048fe7e
fixed version compare logic
2015-10-04 09:10:05 -04:00
Isaac Connor
aa108eff6e
Add Info line on startup saying which Server it is loading for
2015-10-02 12:33:09 +00:00
Isaac Connor
b0b69c5176
parse ZM_SERVER_HOST into ZM_SERVER
2015-10-02 12:32:41 +00:00
Isaac Connor
ea87ffe66f
merge master, bump version to 1.28.108
2015-10-01 11:52:49 -04:00
Bobby Billingsley
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
Isaac Connor
e4b0e74f69
merge master
2015-09-24 10:01:27 -04:00
Isaac Connor
d754239a51
add debug statements for when LastWriteTime is not defined.
2015-09-24 09:57:58 -04:00
Isaac Connor
4c2545a5ca
Merge branch 'master' into multi-server
2015-09-17 15:39:26 -04:00
Isaac Connor
6e3c8bb380
revert
2015-09-14 15:15:44 -04:00
Isaac Connor
204f2b1e22
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-09-10 13:20:06 -04:00
Isaac Connor
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
Pliable Pixels
73fa051ef8
Google recaptcha
2015-08-29 13:29:52 -04:00
Isaac Connor
9cdf8ec317
tabs to spaces
2015-08-27 11:13:44 -04:00
Isaac Connor
80a294da34
tabs to spaces
2015-08-27 11:10:13 -04:00
Isaac Connor
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
Pliable Pixels
b4e9a0f0cf
whitespacing
2015-08-26 12:08:10 -04:00
Pliable Pixels
46bd7b492b
adds sanity checks to isActive and default states
2015-08-26 11:20:58 -04:00
Isaac Connor
41637278c9
merge master
2015-08-19 16:08:12 -04:00
Isaac Connor
5a363273a2
Merge branch 'master' into multi-server
...
Conflicts:
distros/ubuntu1504/changelog
2015-07-16 16:37:44 -04:00
Andrew Bauer
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
Isaac Connor
ad23969982
add space instead of + to handle old Axis cameras
2015-07-16 13:06:15 -04:00
Dmitry Smirnov
c788d70b93
zmtrigger: POD documentation
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-07-16 18:35:42 +10:00
Isaac Connor
ca9a391d62
Only load the monitors for our server
2015-07-15 16:24:01 -04:00
Isaac Connor
b8888b9d55
Only load triggers for our Server if ZM_SERVER_ID is set
2015-07-15 16:22:43 -04:00
Andrew Bauer
4e5ca2cead
Merge pull request #937 from ZoneMinder/better_logging
...
improve log
2015-07-15 15:21:08 -05:00
Andrew Bauer
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
Isaac Connor
51af432468
Only load monitors for our server if ZM_SERVER_ID is specified
2015-07-15 16:18:05 -04:00
Isaac Connor
e318c3bf37
Add ServerId as a filter option
2015-07-15 16:12:35 -04:00
Isaac Connor
01518d6aa9
fix. without this zmc won't restart automatically
2015-07-15 16:08:02 -04:00
Isaac Connor
e4b3344a8c
improve log
2015-07-15 16:06:55 -04:00
Isaac Connor
cf3f160783
add error handling on failure to open serial port
2015-07-15 16:02:02 -04:00
Isaac Connor
4630bad24b
add http to control url if it isn't present
2015-07-15 15:59:21 -04:00
Andy Bauer
561bf43721
fix pod2man generation for out-of-source builds
2015-07-09 19:33:06 -05:00
Isaac Connor
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
Andy Bauer
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
Andrew Bauer
b867ee4c4c
Merge pull request #891 from ZoneMinder/zmwatch_cleanup2
...
Zmwatch cleanup2
2015-06-23 08:36:42 -05:00
Andrew Bauer
30c7ab697c
Merge pull request #847 from ZoneMinder/faster_shutdown
...
faster shutdown
2015-06-23 08:19:25 -05:00
Isaac Connor
e4106e34a1
put back build replacements, don't know how I lost those
2015-06-22 13:56:27 -04:00
Andrew Bauer
91e7281695
Merge pull request #890 from ZoneMinder/zmwatch_cleanup1
...
reverse the if statement to reduce indenting
2015-06-22 12:53:06 -05:00
Isaac Connor
612e96bbfe
fix problem causing processes to not be restarted. Also, tabs to spaces
2015-06-22 13:37:26 -04:00
Pliable Pixels
e758d9bf7c
Modified to handle setting isActive for custom states
2015-06-21 09:30:46 -04:00
Andrew Bauer
fa835359a1
Add install target for C binary man pages
2015-06-20 17:33:13 -05:00
Andrew Bauer
13b9921680
Modify zmsystemctl pod documentation
2015-06-20 16:13:40 -05:00
Andrew Bauer
fd239f6545
Generate man pages for perl scripts in the bin folder
2015-06-20 15:22:11 -05:00
Pliable Pixels
f8cc27e224
Protocol for 8918W
2015-06-19 15:45:50 -04:00
Pliable Pixels
991291ce67
declared so perl does not complain of globals
2015-06-19 14:12:08 -04:00
Pliable Pixels
39ee845ff0
Updated 9831W foscam script
2015-06-19 12:58:40 -04:00
Isaac Connor
1f87a696cf
improve debugging for analysis check and restart if can't read shared data
2015-06-19 11:07:20 -04:00
Isaac Connor
3be4a0aa11
re-enable restarting capture process if mem invalid
2015-06-19 09:04:19 -04:00
Isaac Connor
a9175705c1
reverse the if statement to reduce indenting
2015-06-19 08:59:49 -04:00
Isaac Connor
f6a226e700
Correct bareword config entries with newer {} style
2015-05-27 10:00:24 -04:00
Isaac Connor
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
Andrew Bauer
d509861f9e
Merge pull request #838 from ZoneMinder/zmaudit_update1
...
Zmaudit update1: Make MIN_AGE Configurable
2015-05-21 12:10:08 -05:00
Rick Sayre
8c7e633d8f
Undo ZM_VERSION changes
2015-05-18 21:55:00 -07:00
Rick Sayre
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
Rick Sayre
fb5c1abc87
Undid ZM_VERSION hacks
2015-05-18 21:44:41 -07:00
Rick Sayre
12516da3dc
Patched in changes to 1.28.1 to allow OmniOS/Illumos to build and work
...
haven't attempted to build yet, there are some changes
2015-05-17 17:18:54 -07:00
Isaac Connor
8eb5e53aad
Remove with {ZM_PATH_SWAP}
2015-05-14 10:27:11 -04:00
Isaac Connor
3709ac411d
Not having ZM_AUDIT_MIN_AGE should be fatal
2015-05-13 12:36:35 -04:00
Isaac Connor
950cd06535
Revert "Revert "Switch from a MIN_AGE constant in zmaudit.pl to using a ZM_AUDIT_MIN_AGE Config setting""
...
This reverts commit 9c73b7247c
.
2015-05-13 11:38:55 -04:00
Isaac Connor
9c73b7247c
Revert "Switch from a MIN_AGE constant in zmaudit.pl to using a ZM_AUDIT_MIN_AGE Config setting"
...
This reverts commit a5fed03524
.
2015-05-13 11:37:13 -04:00
Isaac Connor
a5fed03524
Switch from a MIN_AGE constant in zmaudit.pl to using a ZM_AUDIT_MIN_AGE Config setting
2015-05-13 11:33:22 -04:00
Isaac Connor
246fadb097
support the old use of just putting the password in the control field
2015-05-13 08:23:16 -04:00
Isaac Connor
e8114c90bb
Fix printMsg. We don't use it as an object method. Update to parse a user:password out of ControlAddress which is what a lot of other scripts do.
2015-05-12 17:08:55 -04:00
Andrew Bauer
c7a50a7cbc
Replace newlines with a space
2015-05-09 12:13:38 -05:00
Andrew Bauer
c7c0622673
rpmbuild incorrectly interprets the text "use standard" as a Perl module dependency.
2015-05-09 12:10:12 -05:00
Dmitry Smirnov
eddada011c
spelling corrections (thanks, /usr/bin/codespell)
2015-04-19 20:38:23 +10:00
Dmitry Smirnov
abc8d3fdd1
ConfigData.pm: wrap extraordinary long lines using new "qqq()" function.
2015-04-19 18:15:51 +10:00
Dmitry Smirnov
458ed9ede9
ZoneMinder.pm: minor re-wrapping
2015-04-19 18:15:23 +10:00
Dmitry Smirnov
62c1429039
wrap long lines
2015-04-19 16:31:53 +10:00
Dmitry Smirnov
6a150d2607
tabs-to-spaces
2015-04-19 15:17:10 +10:00
Dmitry Smirnov
85d75b0b27
Logger.pm: define '$LOGFILE'
...
non-bareword LOGFILE should be defined.
2015-04-17 11:15:49 +10:00
Dmitry Smirnov
59b63188cb
eliminating {Two-argument "open"}/{Bareword file handle}. See pages 202,204 of PBP. (Severity: 5)
2015-04-17 09:33:06 +10:00
Dmitry Smirnov
3d512dbada
eliminate Subroutine prototypes
2015-04-17 09:22:47 +10:00
Dmitry Smirnov
f02b9c94ec
PelcoP.pm: correct package declaration (thanks, perlcritic)
...
Package declaration must match filename at line 25, column 1. Correct the filename or package statement. (Severity: 5)
2015-04-17 08:24:01 +10:00
Dmitry Smirnov
b0909a4c57
autouse Data::Dumper
2015-04-16 15:48:51 +10:00
Dmitry Smirnov
b0d98c6052
zmx10.pl: pod2usage + readability
2015-04-16 15:48:50 +10:00
Dmitry Smirnov
14f3c106fe
zmwatch.pl: comments to POD + readability
2015-04-16 15:48:49 +10:00
Dmitry Smirnov
7ba03132fc
zmvideo.pl: pod2usage + readability
2015-04-16 15:48:48 +10:00
Dmitry Smirnov
fcdd9b6fb5
zmtrigger.pl: comments to POD + readability
2015-04-16 15:48:47 +10:00
Dmitry Smirnov
60b355cb92
zmtrack.pl: pod2usage + readability
2015-04-16 15:48:36 +10:00
Dmitry Smirnov
6f3baca5cd
zmsystemctl.pl: pod2usage
2015-04-16 14:38:27 +10:00
Dmitry Smirnov
b3b9647740
zm.in: tabs-to-spaces
2015-04-16 14:26:31 +10:00
Isaac Connor
1668949f18
Merge pull request #792 from knnniggett/perl
...
cmake - use perl INSTALLDIRS
2015-04-15 11:07:14 -04:00
Isaac Connor
c17d156d95
Merge pull request #798 from onlyjob/PBP
...
zmcontrol.pl, zmfilter.pl: pod2usage + readability improvements.
2015-04-13 10:19:59 -04:00
Andrew Bauer
30765fdedf
hide USE_DEEP_STORAGE
2015-04-12 12:20:20 -05:00
Dmitry Smirnov
afb127125d
zmpkg.pl: correction for "Use of uninitialized value $command in string eq at zmpkg.pl line 62"
2015-04-11 22:41:07 +10:00
Dmitry Smirnov
fa97348535
zmpkg.pl: pod2usage, tabs-to-spaces + readability
2015-04-11 22:39:32 +10:00
Dmitry Smirnov
ac685fd247
zmfilter.pl: pod2usage + beautification
2015-04-11 11:18:21 +10:00
Dmitry Smirnov
fba085a1c5
zmcontrol.pl: pod2usage (draft) + minor readability improvements.
...
Looks like "zmcontrol.pl" was based upon "zmfilter.pl" so it inherited
commented description of the latter.
Therefore "zmcontrol.pl" needs a description...
2015-04-11 11:15:56 +10:00
Andrew Bauer
0cf82a0b71
Allow user to override perl installation. Replace old perl cmake vars with new.
2015-04-10 12:09:01 -05:00
Dmitry Smirnov
53907eeba1
zmcamtool.pl: readability
2015-04-11 00:35:40 +10:00
Dmitry Smirnov
90fa57788a
zmcamtool.pl: pod2usage
2015-04-11 00:35:35 +10:00
Dmitry Smirnov
4dee542e99
zmcamtool.pl: tabs-to-spaces
2015-04-11 00:07:36 +10:00
Dmitry Smirnov
4bb8043fe5
zmaudit.pl: PBP/5 + readability
2015-04-10 20:34:17 +10:00
Dmitry Smirnov
aeb3486322
zmaudit.pl: convert to pod2usage
2015-04-10 20:34:17 +10:00
Andrew Bauer
e6631ebaf1
Propagate new perl changes to the ONVIF perl modules
2015-04-09 20:11:32 -05:00
Dmitry Smirnov
373b53f8f3
zmdc.pl: Usage() --> pod2usage()
2015-04-09 03:56:04 +10:00
Dmitry Smirnov
81860d99a6
zmdc.pl: PBP/5 + reformatting
2015-04-09 03:55:51 +10:00
abauer
a2d9c0c042
Don't copy .in files into staging
2015-04-08 12:22:46 -05:00
Andrew Bauer
e895fd26f7
cmake - use perl INSTALLDIRS
2015-04-07 08:19:21 -05:00
Dmitry Smirnov
904f2989ed
Improving ZM_USE_DEEP_STORAGE description ( #783 ):
...
Removed "If you are upgrading from a previous version of ZoneMinder" from
description. From data loss prospective it is irrelevant whether database
is upgraded or not as fresh install is just as vulnerable.
Changed "enable" to "change" to emphasize the above.
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-04-06 18:39:13 +10:00
Dmitry Smirnov
078c5aa14b
Briefly document "--migrate-events" option in zmupdate.pl ( #783 ).
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-04-06 18:38:14 +10:00
Andrew Bauer
3e8c894a3e
Update ConfigData.pm.in
2015-04-04 09:20:21 -05:00
Isaac Connor
2671e71e33
Merge pull request #763 from onlyjob/podhelp
...
POD: zmupdate.pl converted to "pod2usage"
2015-03-30 13:29:03 -04:00
Dmitry Smirnov
5f6c559476
POD: zmupdate.pl converted to "pod2usage"
...
Best practice for POD documentation is to (re-)use it for displaying usage
info. Now `perldoc zmupdate.pl` shows expected information and we can even
generate man page automatically with `pod2man zmupdate.pl`.
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-03-31 02:47:16 +11:00
Dmitry Smirnov
b0faa138bd
POD: added missing NAME sections
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-03-30 15:07:03 +11:00
Dmitry Smirnov
11f7af3b03
fixing POD errors
...
manpage-has-errors-from-pod2man (forgotten '=back' before '=head2')
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-03-30 14:41:01 +11:00
Andrew Bauer
7ef503ff59
User configurable arp tool
2015-02-21 13:08:04 -06:00
Andy Bauer
9f3ff787d1
Merge branch '478-onvif-support' of https://github.com/altaroca/ZoneMinder into altaroca-478-onvif-support
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_create.sql.in
distros/redhat/archive/zoneminder.el6.spec
distros/redhat/zoneminder.el6.spec
web/skins/classic/views/monitor.php
2015-02-18 18:53:47 -06:00
Isaac Connor
856a8ce1d0
minor improvement removing 1 coll to time()
...
improve logging tell which monitor the event belonged to
2015-02-06 09:30:48 -05:00
Isaac Connor
20fec3ed7a
According perldoc DBI we should NOT be calling finish after processing all rows.
2015-02-04 11:15:31 -05:00
Andrew Bauer
d787ad3f7a
Merge pull request #666 from ZoneMinder/kill_zmcontrol
...
Kill zmcontrol
2015-01-07 17:28:08 -06:00
Isaac Connor
21ccb9b91a
introduce the quit command which makes the resident zmcontrol.pl exit
2015-01-07 16:37:26 -05:00
Isaac Connor
a10f2aa31c
Add version to the usage line in zmx10.pl
2015-01-07 09:14:00 -05:00
Isaac Connor
7f934e0e69
Add version to the usage line in zmvideo.pl
2015-01-07 09:11:07 -05:00
Isaac Connor
5b79139a05
Add version to the usage line in zmsystemctl.pl
2015-01-07 09:07:40 -05:00
Isaac Connor
3013d87783
Add -v --version command line param to zmpkg.pl
2015-01-07 09:05:16 -05:00
Isaac Connor
8ea01e631b
Add -v --version command line param to zmfilter.pl
2015-01-07 09:00:46 -05:00
Isaac Connor
94e0ec542a
Add -v --version command line param to zmdc.pl
2015-01-07 08:47:32 -05:00
Isaac Connor
76d0dfa475
Add -v --version command line param to zmcamtool.pl
2015-01-07 08:43:51 -05:00
Isaac Connor
71c94475ff
Add -v --version command line parameters to zmaudit.pl
2015-01-06 21:08:41 -05:00
Stephen Arthur
89a603cf27
Modified zmfilter.pl.in to fix #652 , crashing while processing background filter with no terms
2015-01-03 12:45:18 -05:00
Isaac Connor
4c97bd1137
Merge pull request #638 from KristofRobot/instantNotification
...
zmfilter: Send message for events that are still ongoing
2014-12-29 12:02:51 -05:00
Isaac Connor
50e6784779
this adds two config options to System tab to set the default skin and css
2014-12-17 16:45:41 -05:00
Isaac Connor
d7586c2a28
fix a bare ZM_PATH_BIN which should be $Config{ZM_PATH_BIN}
2014-12-17 16:35:30 -05:00
Kristof Robot
643438e3f2
zmfilter: Send message for events that are still ongoing
2014-12-15 08:15:59 +01:00
Isaac Connor
78f0243c69
This replaces Module::Load with Module::Load::Conditional which can actually handle errors.
...
Then I move the module load call up before the fork so that any errors will be visible and will make zmcontrol.pl die quickly instead of waiting 11 seconds for something that will never happen.
2014-12-12 16:33:18 -05:00
Isaac Connor
a52f07fa8e
Some cleanups, remove code that does nothing.
...
Instead of using ControlDevice to store the password, parse the ControlAddress to get username, password
enforce a port, which fixes the Digest Auth.
2014-12-08 15:54:27 -05:00
Isaac Connor
f69f46c2fb
Don't use Data::Dumper unless you are actually using it for debugging. No need to use ram. It is probably being included by one of the libraries anyways, but let's at least try to keep things as light as possible.
2014-11-25 14:44:08 -05:00
Andrew Bauer
9d7f3c2026
Update zm.in
...
The legacy sysv init script will not work with systemd. This is by design.
2014-11-23 11:09:52 -06:00
Andrew Bauer
83120e69b1
Merge pull request #584 from ZoneMinder/zmupdatefixes
...
Zmupdatefixes
2014-11-19 13:09:07 -06:00
Isaac Connor
cc989dbe19
fix putting the mode back. I merged it to the wrong place
2014-11-19 13:54:10 -05:00
Isaac Connor
f8dd2c6eaf
Merge branch 'master' into controlversionfixes
2014-11-19 12:53:28 -05:00
Isaac Connor
793998484c
Merge branch 'master' into zmupdatefixes
...
Conflicts:
scripts/zmupdate.pl.in
2014-11-19 12:47:31 -05:00
Andrew Bauer
a00f719f12
Merge pull request #531 from SteveGilvarry/ffmpeg-stability-fixes
...
351-Rebase Attempt for ffmpeg stability fixes
2014-11-13 15:18:13 -06:00
jmcastro2014
5fe0b84b3c
Create 3S.pm
...
3S API Control Protocol Module
2014-11-12 08:40:35 -03:00
Isaac Connor
17e38560d6
just update the perldoc parts
2014-11-06 10:02:34 -05:00
Isaac Connor
4863ce96a3
remove annoying warning.
2014-10-31 14:12:36 -04:00
Isaac Connor
c9c6c17699
add script for TVIP862IC. Should also work with IP672 and others.
2014-10-22 15:08:58 -04:00
Isaac Connor
e23c756ca4
Revert "replace uri_encode with uri_escape"
...
This reverts commit ce5396f4ea
.
2014-10-21 15:17:34 -04:00
Isaac Connor
ce5396f4ea
replace uri_encode with uri_escape
2014-10-21 09:47:31 -04:00
Isaac Connor
5dedbc2135
detect when the control address has a http in front, and do the right thing
2014-10-20 16:55:24 -04:00
Isaac Connor
9ce7da4147
Don't 'use Data::Dumper'; it was only there for debug
2014-10-20 16:47:03 -04:00
Isaac Connor
a043526994
Merge pull request #462 from knnniggett/memory
...
Fix for shared data size conflict
2014-10-17 09:18:21 -04:00
Isaac Connor
58b826b0a2
more url documentation
2014-10-15 13:14:56 -04:00
Isaac Connor
348538b778
distros/ubuntu1204/changelog
2014-10-15 13:14:19 -04:00
Isaac Connor
9eb88d3f15
add a check for db connection to handle the db going away and coming back
2014-10-15 09:43:00 -04:00
Sune1337
a307b8a1e3
Use value from options (FFMPEG_OPEN_TIMEOUT) as timeout when calling av_open_input_file.
2014-10-12 16:23:58 +11:00
Andrew Bauer
9c8419f89a
detaint to keep perl from complaining
2014-10-10 09:03:30 -05:00
Andrew Bauer
19482851ff
New method to determine bitness
2014-10-10 08:10:03 -05:00
Andrew Bauer
1a5844afef
auto-recreate missing folders during startup
2014-10-05 11:25:41 -05:00
Andrew Bauer
56fd08d6e9
Change TMPDIR default to /var/tmp, Add ZM_SOCKDIR
2014-10-05 09:42:47 -05:00
Jan M. Hochstein
f1b2ba091c
Update meta makefiles
2014-09-12 16:06:19 +02:00
Andrew Bauer
60ed8d7366
Update ConfigData.pm.in
...
Changing the help text for DIR_EVENTS, DIR_IMAGES, and DIR_SOUNDS to make it more obvious that one should not specify a folder outside the web root and that one should probably not ever change these values from their default.
2014-09-12 08:05:15 -05:00
Kyle Johnson
4d579e239a
Merge pull request #502 from knnniggett/systemd-2
...
Initial systemd support.
2014-09-03 15:59:42 -04:00
Isaac Connor
980a7a83bf
Add some text referencing the settings on the monitor settings page
2014-08-21 10:04:08 -04:00
Andrew Bauer
ad364d090a
rename and process zmsystemctl.pl.in
2014-08-19 17:19:44 -05:00
Andrew Bauer
411d77dc7f
remove obsoleted code
2014-08-13 19:02:59 -05:00
Andrew Bauer
1e8e710f5a
full systemd support
2014-08-10 08:47:11 -05:00
Isaac Connor
7cbb079370
revert size check for now
2014-08-04 11:26:33 -04:00
Andrew Bauer
254dffa633
Move ONVIF control script & add dB entry
2014-08-03 15:52:59 -05:00
Isaac Connor
a87f75eee0
any size discrepancy is caused for bailing
2014-08-01 11:27:51 -04:00
Isaac Connor
d5a7a1849a
make zmupdate re-run the most recent update.
2014-07-29 09:47:22 -04:00
Florian Asche
fa67e21c07
Update FI9821W_Y2k.pm
...
Fixed this issue:
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 138.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 141.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 144.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 154.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 156.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 195.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 222.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 247.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 275.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 302.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 329.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 356.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 383.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 399.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 414.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 448.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 671.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 690.
2014-07-22 19:06:04 +02:00
Andrew Bauer
3513f87163
Fix for shared data size conflict
2014-07-07 15:56:56 -05:00
Isaac Connor
c58c4a9720
add the glue to define HOST_OS and use it to detect BSD and use different arguments to killall
2014-06-25 15:28:10 -04:00
Martin Hagelin
a148e04ea2
Update zmtrigger.pl.in
...
zmtrigger.pl should not open serial port #1 by default. There could be situations where other hardware etc. would be attached to the port that is not used by zoneminder.
Better if this can be commented out by default and if a user needs serial access, he can enable it by removing the comment.
This line also gives an permissions error when running on Ubuntu which prevents zmtrigger to start. That error can probably be fixed by adding the zm user permission to the serial port. But the main issue is that if the program does not need access to the port, it should not open it.
2014-04-30 15:07:29 +02:00
barjac
fd9e808fe1
Update zmupdate.pl.in
...
Fix typo 'from' version replaced with 'to' version.
2014-03-24 13:35:53 +00:00
Andrew Bauer
fbf4de5eb2
Update Wanscam.pm
...
No longer needed for zm 1.27
2014-03-19 11:56:08 -05:00
Andrew Bauer
faacea50ef
Update Wanscam.pm
...
Use full package name when using ZM_VERSION
2014-03-19 11:52:58 -05:00
Isaac Connor
626c7bd6b7
pull this from the Wiki
2014-03-19 11:57:42 -04:00
Andrew Bauer
189d9938cc
Add zmcamtool to autotools file manifest
2014-03-16 07:32:18 -05:00
Andrew Bauer
15f014eb8b
Changes from nagyrobi:
...
Todays computer hardware and internet speeds allow for a much more responsive user interface to be ran. I suggest to optimize these values in the "High bandwidth" profile for today's technology. These values were established at least 8 years ago... There's no risk for the user because on a fresh install and new logins, new browsers "Low bandwidth" is always the default. Optimizing these values produce no noticeable load increase on modern hardware, and a snapy, pleasant user interface if desired.
Also increased event image digits because I often run into situations where very long events run out of file naming digits (max 999 files is too short, that's only 40 seconds).
2014-02-26 09:00:10 -06:00
Andrew Bauer
e5ac6e95fa
Update zmupdate.pl.in
...
mysql generates a warning, instead of an error, when trying to convert to InnoDB and that engine is not available. By temporarily elevating warnings to errors, we can catch these rather than silently failing.
2014-02-04 15:30:04 -06:00