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
SteveGilvarry
b3313edde0
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
...
Conflicts:
web/skins/classic/views/event.php
2015-03-21 23:49:56 +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
SteveGilvarry
79c82ea880
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
2015-02-17 23:16:42 +11: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
SteveGilvarry
b79c2c1604
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
...
Conflicts:
web/skins/classic/views/event.php
web/skins/classic/views/timeline.php
Also reapplied required PHP Short Tags fix to a event.php and monitor.php that got impacted in merge.
2014-12-25 08:24:48 +10: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
SteveGilvarry
cc85424999
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_ffmpeg_camera.cpp
2014-12-02 20:18:24 +11: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
SteveGilvarry
2712da614e
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2014-11-05 19:51:15 +11: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
SteveGilvarry
ee90541370
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2014-10-18 15:02:43 +11: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
SteveGilvarry
4245928b35
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/CMakeLists.txt
src/zm_monitor.cpp
web/skins/classic/js/skin.js
2014-10-12 20:10:36 +11: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