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
Emmanuel Papin
6b2c435460
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support_list
...
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
2015-05-14 11:12:38 +02: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
Emmanuel Papin
630c8f335f
Merge master
2015-05-05 23:37:20 +02: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
Emmanuel Papin
9929233e75
Merge branch 'master' into plugin_support_test
...
Conflicts:
configure.ac
web/lang/fr_fr.php
2015-02-25 23:14:25 +01: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
Emmanuel Papin
5060fc490f
Merge branch 'master' into plugin_support_test
2015-02-15 15:03:23 +01: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
Emmanuel Papin
b5ab290e78
Merge branch 'master' of https://github.com/manupap1/ZoneMinder into plugin_support
...
Conflicts:
web/lang/et_ee.php
2015-01-10 17:47:30 +01: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
Emmanuel Papin
f551b50ec0
Merge branch 'master' of https://github.com/manupap1/ZoneMinder into plugin_support
...
Conflicts:
distros/debian8/patches/01_vendor-perl.diff
distros/debian8/patches/series
2015-01-04 12:23:29 +01: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
Emmanuel Papin
d070b36aec
Merge branch 'master' of https://github.com/manupap1/ZoneMinder into plugin_support
2014-12-31 12:23:26 +01: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
Emmanuel Papin
cb3b8a901e
Merge branch 'master' into plugin_support_test
...
Conflicts:
distros/debian/control
web/skins/classic/views/js/Makefile.am
2014-12-21 16:49:25 +01: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
Emmanuel Papin
d961831355
Fix conflict when merging upstream master
2014-12-13 19:54:54 +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
Emmanuel Papin
a4c01435d7
Fix confict when pulling master
2014-11-29 03:37:06 +01: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
Emmanuel Papin
dde1e13f22
Merge branch 'master' into plugin_support
2014-11-21 14:02:12 +01: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
manupap1
dac1756d0d
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support
2014-11-14 10:55:05 +01: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
manupap1
7ff86427b3
Add config options for plugins in web ui
2014-11-11 23:40:42 +01: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
Andrew Bauer
f5ce597609
final cleanup and changes before 1.27 release
2014-02-01 12:17:46 -06:00
Andrew Bauer
e707e72fe3
Perl::Critic recommended a couple minor changes
2014-01-25 12:42:33 -06:00
Andrew Bauer
dbe6fc539c
Additional error checking
2014-01-25 11:26:29 -06:00
Andrew Bauer
ae1731477b
further refinements
2014-01-25 10:39:38 -06:00
Andrew Bauer
2037afb3ca
new subroutine runQuery
2014-01-23 08:41:47 -06:00
Andrew Bauer
869a139809
create rmName subroutine
2014-01-22 19:18:08 -06:00
Andy Bauer
91b0676343
Call checkName for certain reptitive tasks
2014-01-22 09:20:56 -06:00
Andrew Bauer
f00e72be1e
Initial commit for new zmcamtool.pl script
2014-01-21 16:22:30 -06:00
tim
05e395613b
Adding PTZ module for Toshiba IK-WB11A
2014-01-14 00:58:12 -08:00
Andrew Bauer
5ccfa305d3
Merge pull request #294 from knnniggett/glob_ptz_scripts
...
glob ptz scripts under control folder
2014-01-06 08:50:48 -08:00
Kyle Johnson
faaf237731
Revert "Broke zmfilter.pl.in in order to test travis"
...
This reverts commit acc158f3cb
.
2014-01-04 15:10:15 -05:00
Kyle Johnson
acc158f3cb
Broke zmfilter.pl.in in order to test travis
2014-01-04 15:04:14 -05:00
Isaac Connor
d185f05006
robustness/code style changes
2014-01-03 12:55:30 -05:00
Isaac Connor
3d55dde548
COnfig fixes
2014-01-03 09:33:49 -05:00
Kyle Johnson
c5afecc2b4
Revert "Introducing a bug in zmfilter.pl.in to test travis"
...
This reverts commit 337750430b
.
2014-01-02 12:15:06 -05:00
Kyle Johnson
337750430b
Introducing a bug in zmfilter.pl.in to test travis
2014-01-02 12:02:07 -05:00
Kyle Johnson
07b4d83d74
Have Usage() in zmcontrol.pl exit 0 instead of -1
2014-01-02 11:50:39 -05:00
Andrew Bauer
0eac723409
glob ptz scripts under control folder
2014-01-01 12:17:13 -06:00
Dmitry Katsubo
20dd76b354
Using the full path for ZM_VERSION. Using "Control Device" value for user/password.
2014-01-01 13:16:53 +01:00
Dmitry Katsubo
3fb76eaf35
Initial version of control file for Foscam IP cameras.
...
Taken from http://www.zoneminder.com/wiki/index.php/Foscam
2013-12-29 22:24:35 +01:00
Isaac Connor
7b26636bcd
Merge pull request #280 from ZoneMinder/zmfixremoval
...
Remove zmfix
2013-12-22 11:22:18 -08:00
Kfir Itzhak
e9bb632a78
Remove zmfix
2013-12-22 16:08:17 +02:00
Andrew Bauer
b5e4e1e573
Update FI8608W_Y2k.pm
...
Fix typo
2013-12-21 11:32:47 -06:00
Kyle Johnson
2cadb3c5a6
Fixed a small typo in ConfigData.pm.in
2013-12-21 10:55:36 -05:00
Isaac Connor
7251a8e1ae
fixes to $Config changes, also exit if no EVENT_PATH
2013-12-19 13:41:55 -05:00
Isaac Connor
4d9234089c
fix ZM_URL to $Config{ZM_URL}
2013-12-19 13:01:52 -05:00
Isaac Connor
462108583b
fix ZM_EVENT_PATH
2013-12-19 12:55:14 -05:00
Isaac Connor
42642937e4
fix ZM_VERSION
2013-12-17 13:05:58 -05:00
Isaac Connor
9e7d729ca8
use the full path for ZM_VERSION
2013-12-17 12:06:14 -05:00
Isaac Connor
2ced76c20d
do this one too
2013-12-17 11:24:33 -05:00
Isaac Connor
8777295468
use fully specified version
2013-12-17 11:23:03 -05:00
Isaac Connor
1d338ed879
more
2013-12-16 16:36:12 -05:00
Isaac Connor
48a6dcf5ce
Change COnfig from using the subroutine symbol table to just using a global hash
2013-12-16 16:32:02 -05:00
Andrew Bauer
b0b471eb5b
Update zm.in
2013-12-14 09:13:49 -06:00
Andrew Bauer
cd43496a7d
Update zm.in
...
Don't think this is needed. This may contribute to the corrupt Config table issue
2013-12-14 09:05:15 -06:00
Kyle Johnson
c3c3cfbfb9
Merge pull request #264 from ZoneMinder/improvezmpkg
...
Use proper DBI parameter passing in zmpkg.pl to improve security
2013-12-13 10:34:48 -08:00
Kyle Johnson
f39f2fab66
Merge pull request #241 from ZoneMinder/alarmrefblendoption
...
Add alarm reference image blend percentage option and replace the text field if fast blends are enabled
2013-12-13 10:13:34 -08:00
Isaac Connor
2775752a41
use proper DBI parameter passing to improve security
...
remark out call to zmupdate.pl -f
2013-12-06 16:46:21 -05:00
Isaac Connor
150b3a0e7a
document interactive command line option
...
only do innoDB upgrade if interactive
2013-12-06 13:47:39 -05:00
Bartek Zdanowski
f6dca0f575
Fixing bug that stops installation/upgrade if DB is already at current version
2013-11-20 10:39:51 +01:00
Isaac Connor
7da2cdd159
cleanups, only connect and disconnect once. Remove unncessary require's of DBI
...
cleanup MyISAM to InnoDB code
2013-11-13 11:45:53 -05:00
Isaac Connor
29e2cdf561
split the innoDB upgrade out of the version section, so that it always checked for MyISAM tables and if found, offers to update them.
2013-11-13 09:42:10 -05:00
Patrick McGuire
8c0ad352f5
Fix shared memory errors on centos 6.4
2013-11-08 14:53:01 -05:00
Isaac Connor
f4dfd88d9f
handle bad config lines better
2013-11-06 17:02:01 -05:00
Kfir Itzhak
be21a882ab
Merge pull request #242 from ZoneMinder/removeversionnumberfromzm.conf
...
Remove ZM_VERSION from zm.conf
2013-11-04 12:27:50 -08:00
Isaac Connor
7a2f3b5226
add in missing @
2013-11-04 09:57:00 -05:00
Kfir Itzhak
9d5ac7ae8c
Fix cmake installing wrong files in an out-of-source build
2013-11-04 09:56:40 +02:00
Kfir Itzhak
408cac5120
Remove the ZM_BLEND_ALARMED_IMAGES option (not needed anymore, global per monitor now)
2013-11-04 09:11:33 +02:00
Kfir Itzhak
1d0e721ba2
Attempt to get the perl modules to be fully out of source during an out-of-source build
2013-11-03 00:20:49 +02:00
Isaac Connor
d428c832e7
blah
2013-11-01 09:50:50 -04:00
Isaac Connor
72b80d7417
remake this branch off master instead of off mysql2PDO.
...
Establish an automake substitution of @VERSION@ and use it throughotu to override whatever is in zm.conf
2013-11-01 09:47:28 -04:00
Kfir Itzhak
c2bd7c97ec
First attempt at enabling out-of-source building for zm with cmake
2013-10-31 18:10:00 +02:00
Kfir Itzhak
36f525efae
Correctly hard code man dir path into cmake this time hopefully
2013-10-29 12:43:28 +02:00
Kfir Itzhak
604b7f4ccc
Clean files generated by MakeMaker when running cmake's make clean target
2013-10-29 11:21:23 +02:00
Kfir Itzhak
23ec8266d9
Hard code man dir path into cmake to fix issues with some distros
2013-10-29 11:02:47 +02:00
Kfir Itzhak
0143969498
Do not print progress while building zoneminder perl modules unless CMAKE_VERBOSE_MAKEFILE is enabled
2013-10-29 10:01:29 +02:00
Andrew Bauer
54a22e7fe8
We need a toggle for x10 support
2013-10-19 09:22:59 -05:00
Kfir Itzhak
b558d42cdc
Improvements to cmake: Better support for CMAKE_PREFIX_PATH enviroment variable (and similar ones), added ZM_PERL_SUBPREFIX and ZM_PERL_USE_PATH options and improved detection of libraries and headers
2013-10-09 15:41:14 +03:00
Kyle Johnson
03d12ef3e4
Point zmupdate to the github pages site (non-https) for version numbers
2013-10-07 10:11:09 -04:00
Kfir Itzhak
ba727a5611
Changed default HTTP version to 1.0 instead of 1.1, as we don't fully support important HTTP/1.1 features such as chunked encoding
2013-10-07 16:57:26 +03:00
Kfir Itzhak
1609fd688b
Changed default option of ZM_COLOUR_JPEG_FILES to no. It impacts performance and is not needed anymore, all modern image viewers support grayscale JPEG images
2013-10-07 16:54:13 +03:00
Andy Bauer
6b11db11ca
Update CMakeLists.txt
...
Need the zm.in file to be processed by CMake
2013-10-06 17:43:59 -05:00