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
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
408fba8d24
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-04-30 10:09:52 -04:00
6bf43631e2
Merge pull request #1428 from ZoneMinder/better_zmvideo
...
Better zmvideo
2016-04-28 22:00:52 +10:00
0adbaafd98
Merge branch 'master' into storageareas
2016-04-26 13:10:37 -04: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
a2d92300b3
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-04-11 21:51:41 -04:00
60642c1fff
Merge branch 'iconnor_video' into storageareas
2016-04-05 12:32:33 -04:00
7ff8d36598
Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation
2016-04-04 20:44:53 -05:00
dd7f399959
Merge branch 'remove_local_zm_conf_override' into storageareas
2016-04-04 16:13:44 -04:00
a31660c1f6
Remove the code looks for zm.conf in the current dir.
2016-04-04 10:45:58 -04:00
ea49dc20d1
Merge branch 'master' into storageareas
2016-03-30 10:58:07 -04:00
38e3c92546
Minor grammar fixes
2016-03-25 13:18:43 +00:00
3a8352eb6b
Merge branch 'master' into storageareas
2016-03-21 10:25:03 -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
0d8c63f578
Merge branch 'master' into storageareas
2016-03-02 09:11:55 -05: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
86c223668d
Merge branch 'master' into storageareas
2016-02-25 19:11:38 -05:00
7a42a8c3f9
add Netcat ONVIF compatible ptz control
2016-02-24 10:15:59 -06:00
66e76e4c2e
Merge branch 'zm_trigger_improvements' into storageareas
2016-02-19 11:09:41 -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
ee3f87a2ad
additional refinements to zmtelemetry
2016-02-13 14:53:22 -06:00
0ff0262c8b
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-02-12 19:12:12 -05:00
18c493a180
Add getUUID subroutine, Add ZM_TELEMETRY_LAST_UPLOAD
2016-02-10 13:04:14 -06:00
b7256a6891
Merge branch 'master' into storageareas
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_create.sql.in
version
2016-02-10 09:17:40 -05: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
8a537029ea
Initial commit to add zmtelemetry.pl
2016-02-06 14:08:28 -06:00
1837cc89ea
Merge branch 'schrorg-vivotek-ePTZ' into storageareas
...
Conflicts:
CMakeLists.txt
configure.ac
version
2016-02-04 12:24:07 -05:00
89cff287cd
Merge branch 'master' into storageareas
2016-02-04 12:14:16 -05:00
d65c9d797b
fix merge, update to 1.30.1
2016-02-04 12:13:48 -05: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
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
11b206e281
fix getPath -> Path
2016-02-01 12:52:14 -05:00
ff46344175
Use Storage Areas in geteventPath
2016-02-01 12:51:43 -05: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
7700623b16
Move SQL debug to Execute
2016-01-13 09:02:37 -05:00
270c737f40
Merge branch 'master' into storageareas
2016-01-05 09:36:36 -05:00
f0486e5b5e
fix dumb mistake, undefing ZM_SERVBER_ID after setting it.
2016-01-04 22:07:07 -05:00
a6c3d05071
Debug return events and the sql used
2016-01-04 16:01:07 -05:00
17adc2b4e5
Rough in a Monitor class
2016-01-04 15:27:42 -05:00
1432c6ae1f
Added profiles for Wanscam-HW0025 and IPCC-7210W
2016-01-04 12:30:46 -05:00
bf2195828f
Merge branch 'multi-server' into storageareas
...
Conflicts:
docs/installationguide/index.rst
2016-01-02 14:42:47 -05:00
54bff42fa0
Remove warnings when no server set
2016-01-01 21:27:30 -05: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
d943488475
add sub Storage
2015-12-24 15:32:30 -05:00
177ed076a7
Make zmaudit only look at storage areas that are local
2015-12-24 15:25:56 -05:00
dfa9a5a390
Add AUTOLOAD
2015-12-23 14:31:56 -05:00
1328492c64
fixes
2015-12-23 14:16:09 -05:00
33a3661958
cleanup, revent to openprint style objects
2015-12-23 14:03:40 -05:00
9c6041d55b
require Object
2015-12-22 13:13:45 -05:00
3932ce692c
remove Exporter stuff
2015-12-22 12:55:36 -05:00
171fcf0dca
Use Object
2015-12-22 12:40:15 -05:00
26a92e5fed
require Object
2015-12-22 12:23:24 -05:00
7663955dc8
Merge branch 'storageareas' into newpointone
...
Conflicts:
scripts/zmaudit.pl.in
2015-12-22 12:14:29 -05:00
e2f8b1adc3
rough in generic object, using some similar syntax to dbix
2015-12-22 12:13:57 -05:00
c9dc53b237
add in find and find_one
2015-12-22 11:50:08 -05:00
1aa79c306b
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2015-12-22 09:47:45 -05:00
12d87c252f
Don't do Videod = 0, since zmvideo might need them to concatting and they won't regenerated if they exist anyways. Or maybe we want to encode them at a higher framerate or something
2015-12-21 16:04:31 -05:00
239b494db8
Add M.Id as MonitorID
2015-12-21 15:31:33 -05:00
07260adb2a
append ZoneMinder::General to executeShellCommand
2015-12-21 15:30:05 -05:00
a4024ffebc
Must do E.*, not *
2015-12-21 15:29:27 -05:00
9d454bdc41
Add test for empty storage path
2015-12-21 15:29:18 -05:00
3e29aa56a3
Return default event path when no Id in Storage
2015-12-21 15:27:53 -05:00
16a1768511
fixes
2015-12-21 15:19:57 -05:00
ad038edab4
chdir
2015-12-21 14:49:00 -05:00
99f9145cdd
Fix SQL for loading events
2015-12-21 14:43:55 -05:00
892623ce63
Use * to grab all Event columns
2015-12-21 14:14:00 -05:00
0cb2d141a5
Fix dbh's
2015-12-21 13:16:07 -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
5683210e42
Add missing ;
2015-12-21 12:42:00 -05:00
ca07b951cb
Merge branch 'master' into newpointone
...
Conflicts:
docs/installationguide/ubuntu.rst
2015-12-21 12:41:25 -05:00
2dfab0b408
Add delete and delete_files methods
2015-12-21 12:29:35 -05:00
872e5eff15
Merge branch 'multi-server' into newpointone
...
Conflicts:
web/lang/en_gb.php
web/skins/classic/views/filter.php
2015-12-21 11:35:16 -05:00
c2a857b498
Merge branch 'storageareas' into newpointone
2015-12-21 11:34:27 -05:00
3d00c3a50d
Make getDiskPercent take an optional path. When a Server is specified, add it to the Filter object so that we can use in getDiskPercent
2015-12-21 11:34:12 -05:00
710197a4f2
Merge branch 'filter_object' into storageareas
...
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/Storage.pm
scripts/zmfilter.pl.in
2015-12-21 11:27:48 -05:00
de83872671
id => Id
2015-12-21 11:25:38 -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
9f02f4353c
it is important to return the object from the constructor
2015-12-21 11:13:01 -05:00
e7c337f9f3
fix namespace for dbh
2015-12-21 11:10:45 -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
30353fbcf9
Add special case for Server Attr's because they are on the Monitor, not the event
2015-12-21 10:33:19 -05:00
5553760222
Add special cases for ServerId, ServerName, ServerHost to handle supplying the value of the host that the script is running on.
2015-12-21 10:23:37 -05:00
27b1b37d5b
added opt_use_api
2015-12-19 17:43:36 -05:00
fd773858a6
Merge branch 'better_zmvideo' into newpointone
...
Conflicts:
scripts/zmfilter.pl.in
2015-12-18 14:17:45 -05:00
d035753971
Add the event class.
...
Also, remove the unused Storage class
2015-12-17 14:38:18 -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
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
3121e5550c
Create a new class Storage and use it to handle figureing out where the event is actually stored.
2015-12-17 10:47:47 -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
7c298c58ed
Add code to detect the change in REALM from older to newer firmware
2015-12-08 16:20:38 -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
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
1367de292e
Fix error message when no ZM_SERVER_NAME or ZM_SERVER_HOST set
2015-10-07 08:57:50 -04:00
b0b69c5176
parse ZM_SERVER_HOST into ZM_SERVER
2015-10-02 12:32:41 +00: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
73fa051ef8
Google recaptcha
2015-08-29 13:29:52 -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
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
d509861f9e
Merge pull request #838 from ZoneMinder/zmaudit_update1
...
Zmaudit update1: Make MIN_AGE Configurable
2015-05-21 12:10:08 -05:00
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
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
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
246fadb097
support the old use of just putting the password in the control field
2015-05-13 08:23:16 -04:00
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
c7a50a7cbc
Replace newlines with a space
2015-05-09 12:13:38 -05:00
c7c0622673
rpmbuild incorrectly interprets the text "use standard" as a Perl module dependency.
2015-05-09 12:10:12 -05:00
eddada011c
spelling corrections (thanks, /usr/bin/codespell)
2015-04-19 20:38:23 +10:00
abc8d3fdd1
ConfigData.pm: wrap extraordinary long lines using new "qqq()" function.
2015-04-19 18:15:51 +10:00
458ed9ede9
ZoneMinder.pm: minor re-wrapping
2015-04-19 18:15:23 +10:00
62c1429039
wrap long lines
2015-04-19 16:31:53 +10:00
6a150d2607
tabs-to-spaces
2015-04-19 15:17:10 +10:00
85d75b0b27
Logger.pm: define '$LOGFILE'
...
non-bareword LOGFILE should be defined.
2015-04-17 11:15:49 +10:00
59b63188cb
eliminating {Two-argument "open"}/{Bareword file handle}. See pages 202,204 of PBP. (Severity: 5)
2015-04-17 09:33:06 +10:00
3d512dbada
eliminate Subroutine prototypes
2015-04-17 09:22:47 +10:00
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
30765fdedf
hide USE_DEEP_STORAGE
2015-04-12 12:20:20 -05:00
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
3e8c894a3e
Update ConfigData.pm.in
2015-04-04 09:20:21 -05:00
b0faa138bd
POD: added missing NAME sections
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-03-30 15:07:03 +11:00
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
7ef503ff59
User configurable arp tool
2015-02-21 13:08:04 -06:00
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
50e6784779
this adds two config options to System tab to set the default skin and css
2014-12-17 16:45:41 -05:00
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
f8dd2c6eaf
Merge branch 'master' into controlversionfixes
2014-11-19 12:53:28 -05:00
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
5fe0b84b3c
Create 3S.pm
...
3S API Control Protocol Module
2014-11-12 08:40:35 -03:00
17e38560d6
just update the perldoc parts
2014-11-06 10:02:34 -05:00
4863ce96a3
remove annoying warning.
2014-10-31 14:12:36 -04:00
c9c6c17699
add script for TVIP862IC. Should also work with IP672 and others.
2014-10-22 15:08:58 -04:00
e23c756ca4
Revert "replace uri_encode with uri_escape"
...
This reverts commit ce5396f4ea
2014-10-21 15:17:34 -04:00
ce5396f4ea
replace uri_encode with uri_escape
2014-10-21 09:47:31 -04:00
5dedbc2135
detect when the control address has a http in front, and do the right thing
2014-10-20 16:55:24 -04:00
a043526994
Merge pull request #462 from knnniggett/memory
...
Fix for shared data size conflict
2014-10-17 09:18:21 -04:00
58b826b0a2
more url documentation
2014-10-15 13:14:56 -04:00
348538b778
distros/ubuntu1204/changelog
2014-10-15 13:14:19 -04:00
a307b8a1e3
Use value from options (FFMPEG_OPEN_TIMEOUT) as timeout when calling av_open_input_file.
2014-10-12 16:23:58 +11:00
9c8419f89a
detaint to keep perl from complaining
2014-10-10 09:03:30 -05:00
19482851ff
New method to determine bitness
2014-10-10 08:10:03 -05:00
56fd08d6e9
Change TMPDIR default to /var/tmp, Add ZM_SOCKDIR
2014-10-05 09:42:47 -05:00
f1b2ba091c
Update meta makefiles
2014-09-12 16:06:19 +02:00
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
980a7a83bf
Add some text referencing the settings on the monitor settings page
2014-08-21 10:04:08 -04:00
7cbb079370
revert size check for now
2014-08-04 11:26:33 -04:00
254dffa633
Move ONVIF control script & add dB entry
2014-08-03 15:52:59 -05:00
a87f75eee0
any size discrepancy is caused for bailing
2014-08-01 11:27:51 -04:00
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
3513f87163
Fix for shared data size conflict
2014-07-07 15:56:56 -05:00
fbf4de5eb2
Update Wanscam.pm
...
No longer needed for zm 1.27
2014-03-19 11:56:08 -05:00
faacea50ef
Update Wanscam.pm
...
Use full package name when using ZM_VERSION
2014-03-19 11:52:58 -05:00
626c7bd6b7
pull this from the Wiki
2014-03-19 11:57:42 -04:00
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
05e395613b
Adding PTZ module for Toshiba IK-WB11A
2014-01-14 00:58:12 -08:00
d185f05006
robustness/code style changes
2014-01-03 12:55:30 -05:00
20dd76b354
Using the full path for ZM_VERSION. Using "Control Device" value for user/password.
2014-01-01 13:16:53 +01:00
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
b5e4e1e573
Update FI8608W_Y2k.pm
...
Fix typo
2013-12-21 11:32:47 -06:00
2cadb3c5a6
Fixed a small typo in ConfigData.pm.in
2013-12-21 10:55:36 -05:00
9e7d729ca8
use the full path for ZM_VERSION
2013-12-17 12:06:14 -05:00
2ced76c20d
do this one too
2013-12-17 11:24:33 -05:00
8777295468
use fully specified version
2013-12-17 11:23:03 -05:00
1d338ed879
more
2013-12-16 16:36:12 -05:00
48a6dcf5ce
Change COnfig from using the subroutine symbol table to just using a global hash
2013-12-16 16:32:02 -05:00
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
8c0ad352f5
Fix shared memory errors on centos 6.4
2013-11-08 14:53:01 -05:00
f4dfd88d9f
handle bad config lines better
2013-11-06 17:02:01 -05:00
7a2f3b5226
add in missing @
2013-11-04 09:57:00 -05:00
408cac5120
Remove the ZM_BLEND_ALARMED_IMAGES option (not needed anymore, global per monitor now)
2013-11-04 09:11:33 +02:00
d428c832e7
blah
2013-11-01 09:50:50 -04:00
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
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
60258e7aa1
Check the size of the mmap file before mmaping it. If the mmap file 0 ( can happen with remote cameras that can't be reached because it is offline ) we get sigbus. I think the mmap succeeds, but is zero sized, so the first access causes SIGBUS.
2013-10-04 11:54:21 -04:00
ab1314f250
clean out autogenerated files
2013-09-12 14:43:57 -04:00
4cc878e930
Merge branch 'release-1.26' into develop
...
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm
2013-09-05 11:40:38 -04:00
8608250b06
This adds PTZ control files and camera presets for specific ptz cameras.
2013-08-22 13:20:38 -05:00
c014f3faaa
delete generated files
2013-08-13 10:06:37 -04:00
1888bec092
Doing my best to manually remove nextime's plugin architecture while keeping his other changes.
2013-08-13 09:43:23 -04:00
cdac403fb1
Merge ../zum into develop
...
Conflicts:
AUTHORS
configure.ac
db/zm_create.sql.in
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
scripts/zmupdate.pl.in
src/Makefile.am
src/zm_buffer.cpp
src/zm_config_defines.h
src/zm_event.cpp
src/zm_ffmpeg.h
src/zm_ffmpeg_camera.cpp
src/zm_image.cpp
src/zm_jpeg.h
src/zm_local_camera.cpp
src/zm_logger.cpp
src/zm_mem_utils.h
src/zm_monitor.cpp
src/zm_monitor.h
src/zm_mpeg.cpp
src/zm_remote_camera_http.cpp
src/zm_remote_camera_rtsp.cpp
src/zm_rtsp.cpp
src/zm_sdp.cpp
src/zm_sdp.h
src/zm_stream.cpp
src/zm_thread.cpp
src/zm_thread.h
src/zm_threaddata.cpp
src/zm_user.cpp
src/zm_user.h
src/zm_utils.cpp
src/zm_zone.cpp
src/zm_zone.h
web/includes/actions.php
web/lang/big5_big5.php
web/lang/cn_zh.php
web/lang/cs_cz.php
web/lang/de_de.php
web/lang/dk_dk.php
web/lang/en_gb.php
web/lang/es_ar.php
web/lang/et_ee.php
web/lang/fr_fr.php
web/lang/he_il.php
web/lang/hu_hu.php
web/lang/it_it.php
web/lang/ja_jp.php
web/lang/nl_nl.php
web/lang/pl_pl.php
web/lang/pt_br.php
web/lang/ro_ro.php
web/lang/ru_ru.php
web/lang/se_se.php
web/skins/classic/js/skin.js
web/skins/classic/views/js/monitor.js.php
web/skins/classic/views/monitor.php
web/skins/classic/views/zone.php
2013-07-25 11:49:55 -04:00
9d89fb3bcb
Merge branch 'kfir-proper' into develop
2013-05-10 12:23:58 -04:00
d458c145a3
Add Brian Rudy's script to control SkyIPCam cameras.
2013-04-29 12:04:12 -04:00
33cbd89212
Migrate svn to git
2013-03-17 00:45:21 +01:00
f27b424503
Much more progress!
...
1) Removed the V4L2_CAPTURE_FIELDS option.
2) V4L2 Interlacing control options added to the new per-monitor deinterlacing option.
3) Fixed the 32bit version of Linear.
4) Added Blend (50%) and Blend (25%).
5) Completed the grayscale version of the Four Field Motion Adaptive deinterlacing algorithm.
2012-07-13 20:11:16 +03:00
0932f50d80
1) Added the image size and format to the shared memory. This is useful for viewer applications relying on the shared memory.
...
2) Small changes to improve the response time of the DVR controls. Going through frames in a paused event is now much faster.
2012-03-22 08:30:57 +02:00
60a042e44b
Fixed an error in zmMemWrite(), breaking shared memory writes from perl, which prevented zmtrigger.pl (and perhaps others) from working.
2012-03-12 19:52:53 +02:00
de2df49d64
1) Added support for the new formats to the mpeg code.
...
2) Fixed unwanted extra call to set video format for local cameras.
3) Small changes to the perl shared memory types.
2012-02-01 07:33:20 +02:00
8ac3dda54b
1) Removal of the ZM_LOCAL_BGR_INVERT option.
...
2) Allow FPS reporting interval to be zero again.
3) Added translation for the new texts.
4) Corrected the blend function declaration.
2012-02-01 07:33:20 +02:00
b0bc227232
1) Made shared memory 16 byte aligned and identical size and layout for all platforms.
...
2) Fixed a bug in zmwatch.pl: Not freeing shared memory handles between iterations.
3) Modified default monitor options to simplify new monitor creation.
2012-02-01 07:33:20 +02:00
4a59761bcc
Getting closer and closer everyday.
...
1) Fixed many errors to get it to compile
2) Fixed some small bugs
3) Small other changes
2012-02-01 07:33:20 +02:00
13e46d8595
Improved makePath and tweaks to createEvent
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3522 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-11-11 10:08:49 +00:00
dacb1f2a27
Added event creation functions for scripted events, not entirely complete.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3521 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-11-10 22:56:21 +00:00
1e80d72ddd
Fixed line endings.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3507 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-26 09:10:22 +00:00
b64c506659
Added SFTP upload option.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3500 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-23 14:10:20 +00:00
a3ba83aca4
Typo
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3498 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-23 08:46:59 +00:00
6df4a71336
Fixed event paths when using absolute paths.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3490 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-03 11:31:29 +00:00
65b0213960
Minor typo.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3475 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-30 21:18:46 +00:00
0d2a635689
Set up auto commit and auto reconnect on Logger database connection.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3473 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-28 11:06:02 +00:00
c3510148a6
Detaint JSON before decoding.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3466 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-24 09:04:54 +00:00
60cd56569e
Fixed default initialisations
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3464 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-24 08:31:47 +00:00
8082f491db
Fixed problem with environment variable parsing and detainting.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3461 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-23 21:12:47 +00:00
241cb5f84a
Fixed undefined variable issues with debug
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3460 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-23 21:12:18 +00:00
6ff385e407
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-21 09:19:10 +00:00
e9865320e7
Prevent memory handles from leaking when polling monitors
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3360 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-25 08:27:46 +00:00
c4af20ecc2
Added comment about PHP graphics needing to be installed for resampling to work.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3354 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-23 16:03:14 +00:00
7d3844f39a
Trap errors in JSON encoding and decoding
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3352 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-23 15:16:26 +00:00
60b66b909a
Added basic JSON encoding and decoding functions.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3349 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-23 13:15:42 +00:00
ee5d8db0cd
Moved the runCommand function into the library plus shell detection. Should have been there anyway.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3343 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-16 22:54:37 +00:00
e0633998f9
Changed extra debug log location to the temporary directory.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3329 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-26 15:50:02 +00:00
e3f8bdb6cd
XML (eyeZm) plugin: Now renamed plugin to eyeZm, along with all database variables. Note that this must still reside in the skins/xml path until iPhone apps can be moved over at a later point in time
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3306 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-19 20:25:54 +00:00
88e5abaa6e
Amended comment on FAST_IMAGE_BLENDS config
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3300 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-15 11:18:10 +00:00
e91795a619
Removed netpbm options
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3295 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-11 14:50:04 +00:00
26882df7e3
Made deep storage the default.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3271 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-31 09:02:19 +00:00
4178ac9731
Replaced missing :all tags
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3269 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-31 08:54:25 +00:00
20785810f0
Removebosus dependencies.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3250 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-24 10:57:38 +00:00
d67d19dc4f
Removed dependency on DB existing for config generation
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3245 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-21 23:53:36 +00:00
df0d6919c9
Added v4l2 interlacing control
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3230 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-20 18:49:42 +00:00
46358c84e9
Changed configure/build procedure to allow specified run, tmp and log dirs and avoid early replacement of configure variables in SQL defautl config.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3222 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-07 11:10:18 +00:00
eb0952d9a4
Fixed some issues with triggering and Unix sockets in particular
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3220 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-05 17:33:45 +00:00
069136fe53
Added vlog function to view log output, ability to redirect XML logging to it's own file
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3201 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:09:18 +00:00
Isaac Connor
Isaac Connor
Steve Gilvarry
Andrew Bauer
Andy Bauer
Sándor Czettner
Kyle Johnson
Isaac Connor
Dmitry Smirnov
Isaac Connor
Isaac Connor
Simpler1
Adam Reiser
Isaac Connor
arjunrc
Marco
Robin Daermann
dreaddy
Bobby Billingsley
jmcastro2014
Sune1337
Jan M. Hochstein
Florian Asche
tim
Dmitry Katsubo
Kyle Johnson
Patrick McGuire
Kfir Itzhak
Isaac Connor
Isaac Connor
nextime
stan
jaidhar