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
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
7c298c58ed
Add code to detect the change in REALM from older to newer firmware
2015-12-08 16:20:38 -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
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
1367de292e
Fix error message when no ZM_SERVER_NAME or ZM_SERVER_HOST set
2015-10-07 08:57:50 -04:00
Isaac Connor
b0b69c5176
parse ZM_SERVER_HOST into ZM_SERVER
2015-10-02 12:32:41 +00: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
Pliable Pixels
73fa051ef8
Google recaptcha
2015-08-29 13:29:52 -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
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
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
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
Andrew Bauer
30765fdedf
hide USE_DEEP_STORAGE
2015-04-12 12:20:20 -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
Andrew Bauer
3e8c894a3e
Update ConfigData.pm.in
2015-04-04 09:20:21 -05: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
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
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
f8dd2c6eaf
Merge branch 'master' into controlversionfixes
2014-11-19 12:53:28 -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
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
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
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
Isaac Connor
980a7a83bf
Add some text referencing the settings on the monitor settings page
2014-08-21 10:04:08 -04: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
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
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
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
tim
05e395613b
Adding PTZ module for Toshiba IK-WB11A
2014-01-14 00:58:12 -08:00
Isaac Connor
d185f05006
robustness/code style changes
2014-01-03 12:55:30 -05: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
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
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
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
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
Isaac Connor
7a2f3b5226
add in missing @
2013-11-04 09:57:00 -05: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
Isaac Connor
d428c832e7
blah
2013-11-01 09:50:50 -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
Isaac Connor
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
Isaac Connor
ab1314f250
clean out autogenerated files
2013-09-12 14:43:57 -04:00
Kyle Johnson
4cc878e930
Merge branch 'release-1.26' into develop
...
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm
2013-09-05 11:40:38 -04:00
Knniggett
8608250b06
This adds PTZ control files and camera presets for specific ptz cameras.
2013-08-22 13:20:38 -05:00
Isaac Connor
c014f3faaa
delete generated files
2013-08-13 10:06:37 -04:00
Kyle Johnson
1888bec092
Doing my best to manually remove nextime's plugin architecture while keeping his other changes.
2013-08-13 09:43:23 -04:00
Isaac Connor
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
Isaac Connor
9d89fb3bcb
Merge branch 'kfir-proper' into develop
2013-05-10 12:23:58 -04:00
Isaac Connor
d458c145a3
Add Brian Rudy's script to control SkyIPCam cameras.
2013-04-29 12:04:12 -04:00
nextime
33cbd89212
Migrate svn to git
2013-03-17 00:45:21 +01:00
Kfir Itzhak
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
Kfir Itzhak
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
Kfir Itzhak
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
Kfir Itzhak
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
Kfir Itzhak
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
Kfir Itzhak
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
Kfir Itzhak
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
stan
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
stan
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
stan
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
stan
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
stan
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
stan
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
stan
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
stan
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
stan
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
stan
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
stan
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
stan
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
stan
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
stan
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
stan
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
stan
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
stan
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
stan
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
stan
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
jaidhar
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
stan
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
stan
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
stan
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
stan
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
stan
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
stan
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
stan
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
stan
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
stan
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
jaidhar
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
jaidhar
c7b3d04eed
Got rid of MJPEG code choice for viewing events, only MPEG-4 and H264 now. Added default bitrate for event viewing to config XML
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3199 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:08:33 +00:00
jaidhar
e57c1b0331
XML Plugin: More config options added, stability fixes to H264 streaming
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3192 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-12 23:04:09 +00:00
jaidhar
78caa0adb0
XML Plugin: Added more XML Options along with H264 options. These will be disabled unless client ver >=1.2. Added ability to track client version in PHP
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3191 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-12 04:26:31 +00:00
jaidhar
2d7979ac93
XML Plugin: Moved key XML Plugin options to database and updated ConfigAdmin/options.php to show XML Tab (new category 'XML' created). More H264 streaming updates
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3186 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-11 05:25:43 +00:00
stan
e35dbae526
Removed USE_STREAMS config and moved CAN_STREAM and STREAM_METHOD to be bandwidth specific. Added further bandwidth config into phone bandwidth.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3163 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 16:03:42 +00:00
stan
f0e7aaf6db
Made mapped memory files not hidden
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2999 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-12-02 18:37:24 +00:00
stan
32c3bd6c98
Added return of status to executeShellCommand function
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2968 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-08 20:20:54 +00:00
stan
034f37cf4b
Applied contributed patch.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2890 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-25 18:03:46 +00:00
stan
a02eba25ff
Minor mpeg format and config changes.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2868 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-08 15:24:39 +00:00
stan
61089eeeb1
Added authentication hashed logins.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2781 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-19 14:06:39 +00:00
stan
3a86651627
Reworked multi-buffering etc for V4L multi-sources.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2775 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-17 21:23:27 +00:00
stan
cde8ea20bb
Detainted mmap paths so delete works.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2772 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-17 12:37:32 +00:00
stan
e64312e48c
Corrected so mapped memory files are removed by package script.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2771 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-17 12:32:03 +00:00
stan
d6de709ba3
Additional debug when getting shared memory conflicts.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2760 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-12 22:47:04 +00:00
stan
d421fd5c50
Typo
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2752 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-09 20:28:43 +00:00
stan
25a25922bc
Added mjpegStreamer control library
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2751 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-09 15:02:36 +00:00
stan
5137b829c2
Typo
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2749 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-09 14:43:13 +00:00
stan
73900f933b
Tersified some of the config hints.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2702 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 23:11:36 +00:00
stan
86f562ffe4
Added swf into allowed video formats list
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2666 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-14 13:49:44 +00:00
stan
b9e39cbede
Added auto check for ffmpeg and netpbm tools
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2665 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-14 13:49:18 +00:00
stan
435c469d4b
Added DUMP_CORES option.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2639 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-29 11:43:43 +00:00
stan
c207e7720f
Changed force close events to more general setting allowing long events to be closed after alarm.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2630 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-25 11:18:55 +00:00
stan
106882c161
Updated copyright notices
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2612 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-25 09:48:16 +00:00
stan
80a16065da
Fixed incorrect package names in memory packages.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2606 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-25 08:39:14 +00:00
stan
14a05cac4a
Added event migration (to deep storage) function.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2586 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-21 15:56:59 +00:00
stan
31e342b608
Bug 484 - Added method of checking last analysis time plus belatedly added modules to SVN
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2579 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-21 14:45:48 +00:00
stan
e722c6a5a4
Slight hack to get PTZ Protocol instead of remote cam protocol
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2548 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:04:35 +00:00
stan
29f38274e4
Added Axis MPEG config and deprecated some old config
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2547 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:45:50 +00:00
stan
c58b322a6e
Merged in mpeg_encode removal
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2520 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 15:56:52 +00:00
stan
b2f616ff21
Merged in mmap changes. Revision 2323:2515
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2516 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 15:21:16 +00:00
stan
2824cb7355
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2508 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 13:54:50 +00:00
stan
6acbc11296
Added POSIX lib call for strftime
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2313 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-16 18:39:59 +00:00
stan
b6fc0b2628
Bug 447 - Added getEventPath function and changed scripts to use it.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2302 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-13 22:41:17 +00:00
stan
8b59c84270
Bug 450 - Added version to config var for zmupdate to work out old version.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2300 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-13 22:38:58 +00:00
stan
61b4ad669e
Bug 447 - Fixed problems with deep storage file system deleting too many files.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2296 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-10 22:17:32 +00:00
stan
abab524930
Bug 449 - Made Ajax request timeouts configurable.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2289 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-10 21:52:44 +00:00
stan
97dd987315
Bug 427 - Allow aspect ratio to be preserved in monitor size changes.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2271 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-29 18:48:16 +00:00
stan
4b1716062e
Fixed PTZ control for non-Pelco protocols.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2229 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-11-04 17:30:29 +00:00
stan
401b4f73ef
Fixed issue swith db dis/connect
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2225 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-20 09:56:24 +00:00
stan
215184e4cb
Bug 345 - Added alarm jpeg file quality setting.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2209 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-18 10:58:03 +00:00
stan
3427dfddd2
Bug 42 - Users can now change their own passwords.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2204 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-17 15:49:08 +00:00
stan
b4032959e0
Bug 406 - Added ability to indicate mysql connection port in host.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2198 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-07 15:39:44 +00:00
stan
8d905aac99
Bug 400 - Made signal check colour monitor specific.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2193 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-05 15:05:28 +00:00
stan
d3977dde5b
Fixed glob issues.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2191 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-05 09:07:31 +00:00
stan
07a9f1fa1c
Bug 228 - Added deep storage option.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2190 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-04 16:08:55 +00:00
stan
e6392ba2ce
Further work on control protocol modules, removed scripts.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2181 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-08-30 12:07:42 +00:00
stan
bd558af08f
Bug 414 - Changed PTZ control functions to use libraries and sockets
...
rather than scripts.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2180 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-08-30 10:43:06 +00:00
stan
50cc4d980f
Bug 411 - Merged in DVR functionality.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2175 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-08-29 18:11:09 +00:00
stan
2811d6fb51
Added sql finish statement when loading config.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2103 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-04-03 10:25:08 +00:00
stan
fd0a44e816
Merged in changes for enhanced triggers and showtext.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2061 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-16 11:32:56 +00:00
stan
bee6536883
Bug 361 - Added proxy for update checks
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2024 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-10-20 09:41:57 +00:00
stan
b01847c332
Bug 354 - Added facility to reopen logs to allow logrotates to work properly.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2003 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-07-04 10:21:53 +00:00
stan
241e98207a
Bug 356 - Make default bandwidth rates a dropdown selection as per scales.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2002 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-07-04 10:21:18 +00:00
stan
6adeba6640
Bug 323 - Allowed config file entries to have spaces in
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1972 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-05-08 13:19:29 +00:00
stan
3db5b4538a
Bug 327 - Invalidated shared memory id on any errors.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1964 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-05-08 12:42:39 +00:00
stan
3d4bd1a81f
Changed default message text to use new tokens.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1942 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-04-24 13:24:47 +00:00
stan
cbe11fb17c
Hid/revealed mail subject body config.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1933 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-04-12 15:17:31 +00:00
stan
3ebdae4c5b
Added exports
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1931 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-04-12 15:15:57 +00:00
stan
08037eb79c
Changed default debug id to 'zmundef'
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1930 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-04-12 15:15:37 +00:00
stan
f05de80254
Set to not ignore hdiden config, also commented out core and include config
...
as not used any more.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1922 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-04-07 13:55:55 +00:00
stan
12dec07d7f
Bug 305 - Changed to use print instead of printf to avoid interpreting formatting chars
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1908 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-03-31 14:42:53 +00:00