ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,662 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

832 Commits

Author SHA1 Message Date
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
Knniggett 32ee0a8976 create ZM_PATH_DATA and point zmupdate to ZM_PATH_DATA/db 2013-10-05 18:40:54 -05:00
Knniggett d0cbb3f498 remove ${CMAKE_CURRENT_SOURCE_DIR} from add_custom_target 2013-10-05 14:29:12 -05:00
mastertheknife 3dbef94b04 Removed INSTALLDIRS from the cmake perl modules CMakeLists.txt 2013-10-04 22:50:50 +03:00
mastertheknife 5607f2823f Fixed missing perl5 in path in the last commit 2013-10-04 22:40:09 +03:00
mastertheknife 9c3540a952 Attempt to fix issues with perl paths that andy is experiencing 2013-10-04 22:35:16 +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 34f84a4097 Merge branch 'v1.26.4-beta' 2013-10-03 10:14:09 -04:00
mastertheknife 79b45bec68 Avoid trouble with whitespaces in current directory path 2013-10-03 15:37:46 +03:00
mastertheknife 883e676e29 Fixed path issues when creating packages (rpms and such) 2013-10-03 15:35:10 +03:00
mastertheknife 489e832cf6 Fixed typo in the last commit 2013-10-03 15:15:59 +03:00
mastertheknife f043c6e955 Changed perl paths again, this time to <prefix>/<libdir>/perl5 and few improvements 2013-10-03 15:08:09 +03:00
mastertheknife 5fce4c516b Perl modules will be now be installed in <prefix>/<datadir>/zoneminder/perl5 2013-10-01 17:38:51 +03:00
mastertheknife 48f11a8064 Add cmake to zoneminder 2013-09-28 12:59:50 +03:00
Isaac Connor ab4c091693 change eq's to le's so that it runs scripts for upgrading from 1.26.0 2013-09-15 12:59:45 -04:00
Isaac Connor ab1314f250 clean out autogenerated files 2013-09-12 14:43:57 -04:00
Isaac Connor e21a08c4b6 new code to look for update scripts instead of having distinct lines for each 2013-09-12 14:40:02 -04:00
Andy Bauer 0bf9aacab2 Update zmupdate.pl.in for 1.26.3 release 2013-09-10 12:46:33 -05:00
mastertheknife caa73f608b Merge remote-tracking branch 'origin/develop' 2013-09-09 16:44:58 +03:00
Kyle Johnson 6c134f9b4b Merge pull request #116 from knnniggett/zmupdate_newrelease 
Add 1.26.1 and 1.26.2 releases to zmupdate
 2013-09-07 19:07:37 -07:00
Knniggett 8f3d95fd38 modify zmupdate.pl.in 2013-09-07 15:11:57 -05:00
Isaac Connor 9c7f02e8c0 Merge branch 'develop' of github.com:ZoneMinder/ZoneMinder into develop 
Conflicts:
	scripts/zmupdate.pl
 2013-09-06 14:44:21 -04:00
Isaac Connor 0a9e63ca2c remove autogenerated files 2013-09-06 14:40:55 -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
Chris Wiggins d6440ca70e Change repo to ZoneMinder for pull request 2013-09-05 23:50:51 +12:00
Chris Wiggins e792c8eb44 Move version check from zoneminder.com to repository 2013-09-05 23:40:03 +12:00
Kyle Johnson c8ad6ae656 Fixes #107 for real this time. 2013-09-05 20:31:52 -04:00
Kyle Johnson 52116f9642 Merge pull request #84 from knnniggett/patch-5 
Update zmupdate.pl.in to give option to convert to InnoDB tables
 2013-08-30 18:47:34 -07:00
Kyle Johnson 69f31d9e90 Merge pull request #85 from knnniggett/addptzcameras 
Add PTZ control files and presets for FOSCAM FI8608W PT, FI8620 PTZ, 9821W PTZ and Loftek Sentinel IP
 2013-08-26 09:48:37 -07:00
Andy 2f456967f4 edit zmupdate function in init script 
Noticed the init script was looking for a zm_update, which doesn't exist.  My best guess is that this should be changed to zmupdate.pl. This causes zoneminder to reload its configuration from the database prior to startup. Thoughts?
 2013-08-22 14:13:22 -05:00
Knniggett 8608250b06 This adds PTZ control files and camera presets for specific ptz cameras. 2013-08-22 13:20:38 -05:00
Andy 594a44cbbb Update zmupdate.pl.in to give option to convert to InnoDB tables 
When upgrading the zoneminder database to 1.26, this proposed change will ask the user to convert existing MyISAM tables over InnoDB.  It first scans for existing MyISAM tables and will skip over any tables that are already converted to InnoDB.

I've tested this on (a copy of) a production database server and have verified it doesn't alter existing tables from a different schema.

And I'm done messing with the zmupdate script. I promise.
I understand if this change is considered outside the scope of a current bug fix release.
 2013-08-20 19:49:02 -05:00
Isaac Connor 3afad1a0a8 have to override ZoneMinder::Database::ZM_DB_USER, etc instead of just ZM_DB_USER. 2013-08-20 15:13:50 -04:00
Isaac Connor 34bfcb5e7e add lines to change the ZM_DB_USER and ZM_DB_PASS when the user and password are supplied on the command line. 
This is neccessary when the regular zm user does not have alter privileges.
 2013-08-19 11:19:34 -04:00
Kyle Johnson 0a79e4a975 1.26 Beta did not install SkyIPCam7xx.pm Control Script. Fixes #38 2013-08-15 09:08:51 -04:00
Isaac Connor 940f7a191e add code to add Colours and Deinterlacing to Monitors table. These were added by mastertheknife's perfpatch. 2013-08-13 11:05:20 -04: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 3a8481a591 cleanup 2013-05-10 14:02:22 -04:00
Isaac Connor a468baf9eb cleanup 2013-05-10 13:55:45 -04:00
Isaac Connor 9d89fb3bcb Merge branch 'kfir-proper' into develop 2013-05-10 12:23:58 -04:00
Isaac Connor 7cf5475542 Merge ../ZoneMinder-kfir into kfir-proper 
Conflicts:
	configure
	src/Makefile.am
	src/Makefile.in
 2013-05-02 21:28:51 -04:00
Isaac Connor ca4e6b455e look for script in installed bath, not build location 2013-04-29 13:46:37 -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
stan 4996dd0a51 Recreated generated files. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3662 e3e1d417-86f3-4887-817a-d78f3d33393f
 2012-07-04 09:46:18 +00: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 2fd6e99ec5 1) Rebased to 1.24.4 
2) Reverted to stock zmdc.pl.in and zmwatch.pl.in because the bugs are fixed
3) Updated configure and Makefile files
 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 33119c6dc5 1) Added image size requirements to ensure proper alignment 
2) Changed image class buffer related functions
3) Improved format selection for local cameras
4) Removed imagesize check for swscale
5) Fixed mmap unexpected memory size when changing capture options
6) Fixed unrelated bug in zmdc.pl: sockets directory doesn't exist
 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 a665a66071 Fixed typo in command string. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3519 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-10-04 21:24:58 +00:00
stan f74f893651 Added low_priority qualifier to some audit statements to avoid pre-empting more important operations. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3508 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-26 09:51:13 +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 cad65de5c9 Removed temporary module inclusion. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3506 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-26 09:05:42 +00:00
stan b7ca4dba77 Fixed a few more incorrectly quoted split patterns, though these were not disfunctional. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3505 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-26 07:51:36 +00:00
stan 5c2149e319 Fixed incorrectly quoted patterns to split 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3504 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-25 20:45:32 +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 9f6c9fe0dc Detect and clean broken event links 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3472 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-06-28 11:05:03 +00:00
stan ad803d0327 Added script reinitialisations after fork 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3467 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-06-24 16:04:32 +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 88da162112 Reinitialise logs to allow database output after fork. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3465 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-06-24 09:04:32 +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 962b61f269 Fixed typo. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3380 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-30 10:39:26 +00:00
stan d2f5e9623c Added checks for mismatches between system and database versions 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3364 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-25 09:15:14 +00:00
stan 2cb0ef57e1 More info when converting filters and trap errors so they aren't fatal. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3361 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-25 08:29:06 +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 58c77d2b40 Updates for version 1.24.4 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3358 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-23 16:19:12 +00:00
stan 7b43ac2645 Use JSON encoding for language independent serialisation (filters and control commands) rather than PHP serialisation. Removes dependency on rare PHP::Serialization perl module. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3357 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-23 16:18:18 +00:00
stan 8ece56e7b9 Tidied up updating to auto detect version and be more informative 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3356 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-23 16:15:30 +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 ca3646677d Be more intelligent about custom directories. Don't chown/delete standard system dirs and recreate temp directory on startup if missing. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3348 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-20 09:46:14 +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 70505b5f6a Added -d option to allow specification of path to update files. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3337 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-04 14:11:23 +00:00
stan 36291aebf4 Comment 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3336 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-04 14:10:56 +00:00
stan 68200320de Restructured to fix scoping errors. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3335 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-04-28 14:22:44 +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
stan 4121d5f5de Restructured slightly to workmore efficiently and require fewer passes for full cleanups. Also added tests for hanging monitor symbolic links and events left behind when monitors are removed. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3327 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-04-19 13:01:45 +00:00
stan f5186813f7 Changed to use standard shell execution method 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3319 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-04-19 09:32:50 +00:00
stan f15ef08d90 Do database freshening unconditionally on startup 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3318 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-04-19 09:27:55 +00:00
stan 755bd93a09 Un-hardcode /tmp in zmupdate 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3312 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-04-05 20:54:41 +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 8048c1c355 Updated to allow the versions of video4linux to existed independently of each other. Ubuntu 11.04 oalyn has V4L2. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3302 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-15 21:59:06 +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 6c3c639575 Fixed incorrect dist file 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3293 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-11 14:49:38 +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 08a5256cf4 Added update from 1.24.2 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3228 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-17 18:21:37 +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 215884ecc5 Added properly constructed path to Unix domain socket 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3221 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-05 17:35:25 +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
stan dc9e2755b0 Added sample apache config file. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3218 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-03 23:27:58 +00:00
stan 10d7d28ac7 Corrected names of scripts included in tar file. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3216 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-03 14:20:43 +00:00
stan c3918a7ac4 Use pidfile variable instead of hardcoded value. Fixed parameter passed to zmupdate. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3208 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-28 21:22:05 +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 825eda95a6 Regenerated 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3162 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-03 15:56:23 +00:00
stan 331c6ca9cc Fixed typo in audit script 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3064 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-05-27 12:17:53 +00:00
stan 3428fc48f5 Updated EVENT_PATH for absolute event paths 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3041 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-02-28 22:03:27 +00:00
stan 60f0136ed3 Merged in image root changes 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3040 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-02-28 19:16:40 +00:00
stan fd4ee47e00 Fixed mislabelled SQL sth. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3016 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-02-07 17:54:11 +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 3303216e7c Fixed issues with detecting some unclosed events and added check for orphaned events. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2969 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-10-08 20:23:45 +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 9f8296a067 Added missing DB update to 1.24.2 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2937 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-06-30 07:41:54 +00:00
stan ccff3f8a50 Fixed issue with changing to new state from state where cameras disabled. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2935 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-06-29 15:27:48 +00:00
stan 8cad0dbd6a Updated. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2933 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-06-24 10:27:28 +00:00
stan 5c4322e245 Moved DB backup to /tmp 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2917 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-06-09 14:18:32 +00:00
stan c32109f08b Removed. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2914 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-06-09 13:57:07 +00:00
stan b944c07f66 Added after bogus delete 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2911 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-06-08 09:22:28 +00:00
stan f318138a5b Added. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2910 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-06-08 09:19:55 +00:00
stan b696f637e5 Removed temporarily. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2909 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-06-08 09:18:38 +00:00
stan 11a1cc2d41 Now supports custom perl install path 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2908 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-06-08 09:11:56 +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 0cb7e61eaf Improved queries for orphaned Frames and Stats 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2869 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-05-08 16:11:50 +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 75c654e654 Downgraded to support autoconf 2.59 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2812 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-23 21:59:13 +00:00
stan 3069dc2402 Final timestamp update 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2802 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-09 12:45:32 +00:00
stan 429884741a Updated for timestamps 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2801 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-09 12:32:04 +00:00
stan 60a9f1d317 Fixed issue with empty tar files. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2794 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-03 17:51:27 +00:00
stan a018876744 Updated to version 1.24.1 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2788 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-23 20:54:36 +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