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

1098 Commits

Author SHA1 Message Date
Isaac Connor 3013d87783 Add -v --version command line param to zmpkg.pl 2015-01-07 09:05:16 -05:00
Isaac Connor 8ea01e631b Add -v --version command line param to zmfilter.pl 2015-01-07 09:00:46 -05:00
Isaac Connor 94e0ec542a Add -v --version command line param to zmdc.pl 2015-01-07 08:47:32 -05:00
Isaac Connor 76d0dfa475 Add -v --version command line param to zmcamtool.pl 2015-01-07 08:43:51 -05:00
Isaac Connor 71c94475ff Add -v --version command line parameters to zmaudit.pl 2015-01-06 21:08:41 -05:00
Stephen Arthur 89a603cf27 Modified zmfilter.pl.in to fix #652, crashing while processing background filter with no terms 2015-01-03 12:45:18 -05:00
Isaac Connor 4c97bd1137 Merge pull request #638 from KristofRobot/instantNotification 
zmfilter: Send message for events that are still ongoing
 2014-12-29 12:02:51 -05:00
Isaac Connor 50e6784779 this adds two config options to System tab to set the default skin and css 2014-12-17 16:45:41 -05:00
Isaac Connor d7586c2a28 fix a bare ZM_PATH_BIN which should be $Config{ZM_PATH_BIN} 2014-12-17 16:35:30 -05:00
Kristof Robot 643438e3f2 zmfilter: Send message for events that are still ongoing 2014-12-15 08:15:59 +01:00
Isaac Connor 78f0243c69 This replaces Module::Load with Module::Load::Conditional which can actually handle errors. 
Then I move the module load call up before the fork so that any errors will be visible and will make zmcontrol.pl die quickly instead of waiting 11 seconds for something that will never happen.
 2014-12-12 16:33:18 -05:00
Isaac Connor a52f07fa8e Some cleanups, remove code that does nothing. 
Instead of using ControlDevice to store the password, parse the ControlAddress to get username, password
enforce a port, which fixes the Digest Auth.
 2014-12-08 15:54:27 -05:00
Isaac Connor f69f46c2fb Don't use Data::Dumper unless you are actually using it for debugging. No need to use ram. It is probably being included by one of the libraries anyways, but let's at least try to keep things as light as possible. 2014-11-25 14:44:08 -05:00
Andrew Bauer 9d7f3c2026 Update zm.in 
The legacy sysv init script will not work with systemd.  This is by design.
 2014-11-23 11:09:52 -06:00
Andrew Bauer 83120e69b1 Merge pull request #584 from ZoneMinder/zmupdatefixes 
Zmupdatefixes
 2014-11-19 13:09:07 -06:00
Isaac Connor cc989dbe19 fix putting the mode back. I merged it to the wrong place 2014-11-19 13:54:10 -05:00
Isaac Connor f8dd2c6eaf Merge branch 'master' into controlversionfixes 2014-11-19 12:53:28 -05:00
Isaac Connor 793998484c Merge branch 'master' into zmupdatefixes 
Conflicts:
	scripts/zmupdate.pl.in
 2014-11-19 12:47:31 -05:00
Andrew Bauer a00f719f12 Merge pull request #531 from SteveGilvarry/ffmpeg-stability-fixes 
351-Rebase Attempt for ffmpeg stability fixes
 2014-11-13 15:18:13 -06:00
jmcastro2014 5fe0b84b3c Create 3S.pm 
3S API Control Protocol Module
 2014-11-12 08:40:35 -03:00
Isaac Connor 17e38560d6 just update the perldoc parts 2014-11-06 10:02:34 -05:00
Isaac Connor 4863ce96a3 remove annoying warning. 2014-10-31 14:12:36 -04:00
Isaac Connor c9c6c17699 add script for TVIP862IC. Should also work with IP672 and others. 2014-10-22 15:08:58 -04:00
Isaac Connor e23c756ca4 Revert "replace uri_encode with uri_escape" 
This reverts commit ce5396f4ea.
 2014-10-21 15:17:34 -04:00
Isaac Connor ce5396f4ea replace uri_encode with uri_escape 2014-10-21 09:47:31 -04:00
Isaac Connor 5dedbc2135 detect when the control address has a http in front, and do the right thing 2014-10-20 16:55:24 -04:00
Isaac Connor 9ce7da4147 Don't 'use Data::Dumper'; it was only there for debug 2014-10-20 16:47:03 -04:00
Isaac Connor a043526994 Merge pull request #462 from knnniggett/memory 
Fix for shared data size conflict
 2014-10-17 09:18:21 -04:00
Isaac Connor 58b826b0a2 more url documentation 2014-10-15 13:14:56 -04:00
Isaac Connor 348538b778 distros/ubuntu1204/changelog 2014-10-15 13:14:19 -04:00
Isaac Connor 9eb88d3f15 add a check for db connection to handle the db going away and coming back 2014-10-15 09:43:00 -04:00
Sune1337 a307b8a1e3 Use value from options (FFMPEG_OPEN_TIMEOUT) as timeout when calling av_open_input_file. 2014-10-12 16:23:58 +11:00
Andrew Bauer 9c8419f89a detaint to keep perl from complaining 2014-10-10 09:03:30 -05:00
Andrew Bauer 19482851ff New method to determine bitness 2014-10-10 08:10:03 -05:00
Andrew Bauer 1a5844afef auto-recreate missing folders during startup 2014-10-05 11:25:41 -05:00
Andrew Bauer 56fd08d6e9 Change TMPDIR default to /var/tmp, Add ZM_SOCKDIR 2014-10-05 09:42:47 -05:00
Jan M. Hochstein f1b2ba091c Update meta makefiles 2014-09-12 16:06:19 +02:00
Andrew Bauer 60ed8d7366 Update ConfigData.pm.in 
Changing the help text for DIR_EVENTS, DIR_IMAGES, and DIR_SOUNDS to make it more obvious that one should not specify a folder outside the web root and that one should probably not ever change these values from their default.
 2014-09-12 08:05:15 -05:00
Kyle Johnson 4d579e239a Merge pull request #502 from knnniggett/systemd-2 
Initial systemd support.
 2014-09-03 15:59:42 -04:00
Isaac Connor 980a7a83bf Add some text referencing the settings on the monitor settings page 2014-08-21 10:04:08 -04:00
Andrew Bauer ad364d090a rename and process zmsystemctl.pl.in 2014-08-19 17:19:44 -05:00
Andrew Bauer 411d77dc7f remove obsoleted code 2014-08-13 19:02:59 -05:00
Andrew Bauer 1e8e710f5a full systemd support 2014-08-10 08:47:11 -05:00
Isaac Connor 7cbb079370 revert size check for now 2014-08-04 11:26:33 -04:00
Andrew Bauer 254dffa633 Move ONVIF control script & add dB entry 2014-08-03 15:52:59 -05:00
Isaac Connor a87f75eee0 any size discrepancy is caused for bailing 2014-08-01 11:27:51 -04:00
Isaac Connor d5a7a1849a make zmupdate re-run the most recent update. 2014-07-29 09:47:22 -04:00
Florian Asche fa67e21c07 Update FI9821W_Y2k.pm 
Fixed this issue:
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 138.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 141.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 144.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 154.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 156.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 195.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 222.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 247.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 275.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 302.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 329.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 356.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 383.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 399.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 414.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 448.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 671.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 690.
 2014-07-22 19:06:04 +02:00
Andrew Bauer 3513f87163 Fix for shared data size conflict 2014-07-07 15:56:56 -05:00
Isaac Connor c58c4a9720 add the glue to define HOST_OS and use it to detect BSD and use different arguments to killall 2014-06-25 15:28:10 -04:00
Martin Hagelin a148e04ea2 Update zmtrigger.pl.in 
zmtrigger.pl should not open serial port #1 by default. There could be situations where other hardware etc. would be attached to the port that is not used by zoneminder. 

Better if this can be commented out by default and if a user needs serial access, he can enable it by removing the comment.

This line also gives an permissions error when running on Ubuntu which prevents zmtrigger to start. That error can probably be fixed by adding the zm user permission to the serial port. But the main issue is that if the program does not need access to the port, it should not open it.
 2014-04-30 15:07:29 +02:00
barjac fd9e808fe1 Update zmupdate.pl.in 
Fix typo 'from' version replaced with 'to' version.
 2014-03-24 13:35:53 +00:00
Andrew Bauer fbf4de5eb2 Update Wanscam.pm 
No longer needed for zm 1.27
 2014-03-19 11:56:08 -05:00
Andrew Bauer faacea50ef Update Wanscam.pm 
Use full package name when using ZM_VERSION
 2014-03-19 11:52:58 -05:00
Isaac Connor 626c7bd6b7 pull this from the Wiki 2014-03-19 11:57:42 -04:00
Andrew Bauer 189d9938cc Add zmcamtool to autotools file manifest 2014-03-16 07:32:18 -05:00
Andrew Bauer 15f014eb8b Changes from nagyrobi: 
Todays computer hardware and internet speeds allow for a much more responsive user interface to be ran. I suggest to optimize these values in the "High bandwidth" profile for today's technology. These values were established at least 8 years ago... There's no risk for the user because on a fresh install and new logins, new browsers "Low bandwidth" is always the default. Optimizing these values produce no noticeable load increase on modern hardware, and a snapy, pleasant user interface if desired.

Also increased event image digits because I often run into situations where very long events run out of file naming digits (max 999 files is too short, that's only 40 seconds).
 2014-02-26 09:00:10 -06:00
Andrew Bauer e5ac6e95fa Update zmupdate.pl.in 
mysql generates a warning, instead of an error, when trying to convert to InnoDB and that engine is not available.  By temporarily elevating warnings to errors, we can catch these rather than silently failing.
 2014-02-04 15:30:04 -06:00
Andrew Bauer f5ce597609 final cleanup and changes before 1.27 release 2014-02-01 12:17:46 -06:00
Andrew Bauer e707e72fe3 Perl::Critic recommended a couple minor changes 2014-01-25 12:42:33 -06:00
Andrew Bauer dbe6fc539c Additional error checking 2014-01-25 11:26:29 -06:00
Andrew Bauer ae1731477b further refinements 2014-01-25 10:39:38 -06:00
Andrew Bauer 2037afb3ca new subroutine runQuery 2014-01-23 08:41:47 -06:00
Andrew Bauer 869a139809 create rmName subroutine 2014-01-22 19:18:08 -06:00
Andy Bauer 91b0676343 Call checkName for certain reptitive tasks 2014-01-22 09:20:56 -06:00
Andrew Bauer f00e72be1e Initial commit for new zmcamtool.pl script 2014-01-21 16:22:30 -06:00
tim 05e395613b Adding PTZ module for Toshiba IK-WB11A 2014-01-14 00:58:12 -08:00
Andrew Bauer 5ccfa305d3 Merge pull request #294 from knnniggett/glob_ptz_scripts 
glob ptz scripts under control folder
 2014-01-06 08:50:48 -08:00
Kyle Johnson faaf237731 Revert "Broke zmfilter.pl.in in order to test travis" 
This reverts commit acc158f3cb.
 2014-01-04 15:10:15 -05:00
Kyle Johnson acc158f3cb Broke zmfilter.pl.in in order to test travis 2014-01-04 15:04:14 -05:00
Isaac Connor d185f05006 robustness/code style changes 2014-01-03 12:55:30 -05:00
Isaac Connor 3d55dde548 COnfig fixes 2014-01-03 09:33:49 -05:00
Kyle Johnson c5afecc2b4 Revert "Introducing a bug in zmfilter.pl.in to test travis" 
This reverts commit 337750430b.
 2014-01-02 12:15:06 -05:00
Kyle Johnson 337750430b Introducing a bug in zmfilter.pl.in to test travis 2014-01-02 12:02:07 -05:00
Kyle Johnson 07b4d83d74 Have Usage() in zmcontrol.pl exit 0 instead of -1 2014-01-02 11:50:39 -05:00
Andrew Bauer 0eac723409 glob ptz scripts under control folder 2014-01-01 12:17:13 -06:00
Dmitry Katsubo 20dd76b354 Using the full path for ZM_VERSION. Using "Control Device" value for user/password. 2014-01-01 13:16:53 +01:00
Dmitry Katsubo 3fb76eaf35 Initial version of control file for Foscam IP cameras. 
Taken from http://www.zoneminder.com/wiki/index.php/Foscam
 2013-12-29 22:24:35 +01:00
Isaac Connor 7b26636bcd Merge pull request #280 from ZoneMinder/zmfixremoval 
Remove zmfix
 2013-12-22 11:22:18 -08:00
Kfir Itzhak e9bb632a78 Remove zmfix 2013-12-22 16:08:17 +02:00
Andrew Bauer b5e4e1e573 Update FI8608W_Y2k.pm 
Fix typo
 2013-12-21 11:32:47 -06:00
Kyle Johnson 2cadb3c5a6 Fixed a small typo in ConfigData.pm.in 2013-12-21 10:55:36 -05:00
Isaac Connor 7251a8e1ae fixes to $Config changes, also exit if no EVENT_PATH 2013-12-19 13:41:55 -05:00
Isaac Connor 4d9234089c fix ZM_URL to $Config{ZM_URL} 2013-12-19 13:01:52 -05:00
Isaac Connor 462108583b fix ZM_EVENT_PATH 2013-12-19 12:55:14 -05:00
Isaac Connor 42642937e4 fix ZM_VERSION 2013-12-17 13:05:58 -05:00
Isaac Connor 9e7d729ca8 use the full path for ZM_VERSION 2013-12-17 12:06:14 -05:00
Isaac Connor 2ced76c20d do this one too 2013-12-17 11:24:33 -05:00
Isaac Connor 8777295468 use fully specified version 2013-12-17 11:23:03 -05:00
Isaac Connor 1d338ed879 more 2013-12-16 16:36:12 -05:00
Isaac Connor 48a6dcf5ce Change COnfig from using the subroutine symbol table to just using a global hash 2013-12-16 16:32:02 -05:00
Andrew Bauer b0b471eb5b Update zm.in 2013-12-14 09:13:49 -06:00
Andrew Bauer cd43496a7d Update zm.in 
Don't think this is needed.  This may contribute to the corrupt Config table issue
 2013-12-14 09:05:15 -06:00
Kyle Johnson c3c3cfbfb9 Merge pull request #264 from ZoneMinder/improvezmpkg 
Use proper DBI parameter passing in zmpkg.pl to improve security
 2013-12-13 10:34:48 -08:00
Kyle Johnson f39f2fab66 Merge pull request #241 from ZoneMinder/alarmrefblendoption 
Add alarm reference image blend percentage option and replace the text field if fast blends are enabled
 2013-12-13 10:13:34 -08:00
Isaac Connor 2775752a41 use proper DBI parameter passing to improve security 
remark out call to zmupdate.pl -f
 2013-12-06 16:46:21 -05:00
Isaac Connor 150b3a0e7a document interactive command line option 
only do innoDB upgrade if interactive
 2013-12-06 13:47:39 -05:00
Bartek Zdanowski f6dca0f575 Fixing bug that stops installation/upgrade if DB is already at current version 2013-11-20 10:39:51 +01:00
Isaac Connor 7da2cdd159 cleanups, only connect and disconnect once. Remove unncessary require's of DBI 
cleanup MyISAM to InnoDB code
 2013-11-13 11:45:53 -05:00
Isaac Connor 29e2cdf561 split the innoDB upgrade out of the version section, so that it always checked for MyISAM tables and if found, offers to update them. 2013-11-13 09:42:10 -05:00
Patrick McGuire 8c0ad352f5 Fix shared memory errors on centos 6.4 2013-11-08 14:53:01 -05:00
Isaac Connor f4dfd88d9f handle bad config lines better 2013-11-06 17:02:01 -05:00
Kfir Itzhak be21a882ab Merge pull request #242 from ZoneMinder/removeversionnumberfromzm.conf 
Remove ZM_VERSION from zm.conf
 2013-11-04 12:27:50 -08:00
Isaac Connor 7a2f3b5226 add in missing @ 2013-11-04 09:57:00 -05:00
Kfir Itzhak 9d5ac7ae8c Fix cmake installing wrong files in an out-of-source build 2013-11-04 09:56:40 +02:00
Kfir Itzhak 408cac5120 Remove the ZM_BLEND_ALARMED_IMAGES option (not needed anymore, global per monitor now) 2013-11-04 09:11:33 +02:00
Kfir Itzhak 1d0e721ba2 Attempt to get the perl modules to be fully out of source during an out-of-source build 2013-11-03 00:20:49 +02:00
Isaac Connor d428c832e7 blah 2013-11-01 09:50:50 -04:00
Isaac Connor 72b80d7417 remake this branch off master instead of off mysql2PDO. 
Establish an automake substitution of @VERSION@ and use it throughotu to override whatever is in zm.conf
 2013-11-01 09:47:28 -04:00
Kfir Itzhak c2bd7c97ec First attempt at enabling out-of-source building for zm with cmake 2013-10-31 18:10:00 +02:00
Kfir Itzhak 36f525efae Correctly hard code man dir path into cmake this time hopefully 2013-10-29 12:43:28 +02:00
Kfir Itzhak 604b7f4ccc Clean files generated by MakeMaker when running cmake's make clean target 2013-10-29 11:21:23 +02:00
Kfir Itzhak 23ec8266d9 Hard code man dir path into cmake to fix issues with some distros 2013-10-29 11:02:47 +02:00
Kfir Itzhak 0143969498 Do not print progress while building zoneminder perl modules unless CMAKE_VERBOSE_MAKEFILE is enabled 2013-10-29 10:01:29 +02:00
Andrew Bauer 54a22e7fe8 We need a toggle for x10 support 2013-10-19 09:22:59 -05:00
Kfir Itzhak b558d42cdc Improvements to cmake: Better support for CMAKE_PREFIX_PATH enviroment variable (and similar ones), added ZM_PERL_SUBPREFIX and ZM_PERL_USE_PATH options and improved detection of libraries and headers 2013-10-09 15:41:14 +03:00
Kyle Johnson 03d12ef3e4 Point zmupdate to the github pages site (non-https) for version numbers 2013-10-07 10:11:09 -04:00
Kfir Itzhak ba727a5611 Changed default HTTP version to 1.0 instead of 1.1, as we don't fully support important HTTP/1.1 features such as chunked encoding 2013-10-07 16:57:26 +03:00
Kfir Itzhak 1609fd688b Changed default option of ZM_COLOUR_JPEG_FILES to no. It impacts performance and is not needed anymore, all modern image viewers support grayscale JPEG images 2013-10-07 16:54:13 +03:00
Andy Bauer 6b11db11ca Update CMakeLists.txt 
Need the zm.in file to be processed by CMake
 2013-10-06 17:43:59 -05:00
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
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 e14efbd493 Updated generated files. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2726 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-01-28 11:24:01 +00:00
stan d43d2289ed Changes from updated build tools. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2714 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-01-20 14:54:50 +00:00
stan 549aa39cbb Updated autoconf/make files 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2710 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-12-06 00:05:56 +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 6a3ab327ca Changed process exit string to look les like crashes when things get restarted and sleeps interrupted. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2701 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-12-05 21:13:19 +00:00
stan 7d96edeacd Added .in files to svn 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2681 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-11-03 12:14:50 +00:00
stan 1f2949543c Don't unconditionally restart daemons if shared memory not valid, leave it to zmdc to manage. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2675 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-10-28 12:52:39 +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 1dd9aa5ddf Fixed typo in zmdc.pl 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2663 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-10-14 12:14:14 +00:00
stan c2f07f55dd Reduced maximum restart delay reset time. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2660 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-10-09 09:18:20 +00:00
stan a76a850ade Fixed video generation issue with paths 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2659 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-10-09 09:17:07 +00:00
stan 8af774a98c Fixes and patches. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2641 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-09-30 08:41:23 +00:00
stan 323338b661 Applied Corey patch. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2640 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-09-29 13:15:13 +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 dfb9331c62 Removed bashism 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2623 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-09-01 15:23:56 +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 1bc624f13b Added patch from 1.23.3 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2587 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-21 15:57:51 +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 ba2bf22ea7 Bug 465 - Now supports transitions to/from TAPE state in determining alarms 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2392 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-04-21 14:02:43 +00:00
stan 132772f5d3 Updated for version 1.23.3 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2358 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-03-13 13:44:52 +00:00
stan 4c452c22c3 Bug 470 - Fixed some anachronistic control script references 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2344 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-03-10 09:43:48 +00:00
stan 3f2a6bff1b Bug 461 - Updated Ross script 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2342 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-03-10 09:38:59 +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 6078e93c09 Updated for version 1.23.2 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2312 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-02-13 23:57:00 +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 d0fdcec204 Bug 461 - Added RDM scripts 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2301 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-02-13 22:39:46 +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 12dbabe916 Bug 461 - Added RDM scripts. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2299 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-02-13 22:33:01 +00:00
stan ac8f2decc8 Updated for 1.23.2 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2297 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-02-10 22:25:00 +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 ff3552188b Turned off debug by default. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2286 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-01-13 18:17:42 +00:00
stan 262b9b9ceb Turned debug off by default. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2284 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-01-13 18:15:36 +00:00
stan e8e5fe2461 Updated for v1.23.1 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2283 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-01-13 17:53:08 +00:00
stan 9e13cae829 Bug 438 - Fixed various PTZ protocol and control issues. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2281 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-01-08 12:33:11 +00:00
stan a41e39f431 Updated to 1.23.1 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2279 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-01-03 20:31:05 +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 79e3847c1b Bug 429 - Fixed video generation with deep storage. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2270 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-12-29 18:24:26 +00:00
stan c3f8cebe45 Fixed issue with Event name in filters not being quoted. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2263 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-12-21 16:46:48 +00:00
stan f0e172fd38 Changed path to remove extra EVENTS dir. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2258 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-12-17 14:14:47 +00:00
stan b7b2dea5aa Bug 417 - Removed frame id from Frames table. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2253 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-12-09 16:26:30 +00:00
stan 860e6026ad Updated version number. Not sure if this file should be in CVS. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2249 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-12-08 18:37:34 +00:00
stan d56d807c1a Turned off X10 module debug. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2243 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-11-18 13:06:44 +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 ced4653ed0 Fixed incorrect stream quality migration 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2219 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-09-18 14:40:34 +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 cc2acd6d36 Removed dependency on General module due to missing symbols. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2203 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-09-17 15:48:02 +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 f93e109b8d Bug 386 - Added system load as filter 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2195 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-09-06 09:34:44 +00:00
stan 6932898d40 Bug 390 - Changed timestamp tokens. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2194 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-09-05 16:31:42 +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 ec3cef978e Fixed issue with flat event file dirs not being detected. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2192 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-09-05 14:13:13 +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 2647ba20fe Bug 415 - Merged in enhanced filters 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2189 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-09-04 14:52:26 +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 78b3feb715 Modifications to storage of ZM versions. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2104 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-04-03 10:27:14 +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 feaa245671 Fixed update fix. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2088 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-11-24 14:39:38 +00:00
stan e5d77fd130 Added in upgrade from 1.22.2 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2087 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-11-24 00:33:50 +00:00
stan ecaf3ac879 Build file changes. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2077 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-11-16 20:54:54 +00:00
stan 247b94f17b Rmeoved zminit 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2076 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-11-16 20:48:57 +00:00
stan 7158a18616 Reinstated missing EINTR symbol. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2071 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-11-16 19:08:04 +00:00
stan cc072e55a6 Removed META.yml 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2065 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-11-16 13:29:04 +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 3f785e52eb Applied Corey mods. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2058 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-11-16 09:06:37 +00:00
stan f078a600ac Turned off debug by default. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2056 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-11-16 08:55:05 +00:00
stan cd709e4f2c Removed commented out signal blocks 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2036 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-11-07 11:58:22 +00:00
stan 16e0383c54 Bug 376 - Close all open file descriptors when daemonising. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2029 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-10-24 10:58:00 +00:00
stan 471c78c544 Bug 246 - Manually execute filters with actions. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2027 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-10-23 15:32:22 +00:00
stan 9654f3d927 Fixes to non-defined proxy setting. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2026 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-10-23 15:31:15 +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 1598f4c066 Bug 357 - Changed most die calls to Fatal 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2023 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-10-20 09:31:40 +00:00
stan e0df6cac9d Changed some Info to Debug 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2022 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-10-20 09:30:39 +00:00
stan e429a6b2f4 Bug 373 - Fixed to work with saved weekday filters. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2021 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-10-19 15:59:13 +00:00
stan 2b5292eaa5 Bug 372 - Videoed flag now gets set after video created. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2020 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-10-19 15:56:01 +00:00
stan 184305c547 Bug 365 - Added missing finish statements. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2014 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-10-18 15:11:15 +00:00
stan a61c655133 Bug 371 - Fixed negative time on last event 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2013 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-10-18 15:09:08 +00:00
stan 98bdf77ac5 Bug 270 - Fixed divide by zero error. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2012 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-10-18 15:08:07 +00:00
stan fd92f7bcb0 Bug 354 - Added facility to signal scripts to rotate logs. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2008 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-07-04 10:34:21 +00:00
stan 834bc81a07 Null 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2007 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-07-04 10:33:32 +00:00
stan 2ca45492bb Bug 355 - Fixed issue with filters on Notes or Cause fields 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2006 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-07-04 10:33:11 +00:00
stan 5ef4bb8779 Added write_drain to serial port. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2005 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-07-04 10:32:38 +00:00
stan 8e97247c8d Bug 357 - Changed die calls to Fatal 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2004 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-07-04 10:31:14 +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 391d6f0345 Bug 343 - Fixed issue with monitor names in filters. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1993 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-05-25 14:02:15 +00:00
stan 8d00dafe98 Bug 338 - Fixed case and parameter errors in showtext function. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1986 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-05-22 16:02:03 +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 fcb27ace30 Bug 312 - Added /usr/local/bin to paths for mysql. Added 1.22.1 update. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1963 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-05-08 12:38:41 +00:00
stan f803481079 Bug 326 - Removed unnecessary include of Device::SerialPort 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1962 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-05-08 12:37:48 +00:00
stan 3e4db7d646 Bug 313 - Added missing quote in 'su' test. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1960 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-05-05 11:30:06 +00:00
stan 0475133a84 Fixed typo. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1946 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-04-27 10:50:41 +00:00
stan b3ab5b611f Hide test for sudo if not present. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1945 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-04-27 09:06:15 +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 440236b80b Added zminit script. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1939 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-04-24 11:39:37 +00:00
stan 0055ecb026 Modified ZM_PATH_UPDATE and sql script behaviour 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1938 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-04-23 20:24:18 +00:00
stan afd229d375 Modified some 'die' calls to 'Fatal'. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1937 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-04-23 19:51:28 +00:00
stan 31a630d746 Added Corey changes. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1936 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-04-23 19:50:34 +00:00
stan 188ca65ca5 Bug 254 - Split out email subject and body config. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1934 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-04-12 15:18:51 +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 f0c08b561d Now handles null MaxFPS 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1932 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-04-12 15:16:28 +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 fca550fe8e Fixed issue with detecting missing config. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1923 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-04-07 13:56:26 +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 7dafbb5731 Only output output if there is any 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1911 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-03-31 15:34:39 +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
stan 8b4ba55581 Bug 301 - Added upgrade to 1.22.1, converts general alarm max FPS setting to 
monitor specific.


git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1905 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-03-31 12:50:29 +00:00
stan 7465244fa7 Bug 301 - Alarm maximum FPS now specified on per monitor basis. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1902 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-03-31 12:48:37 +00:00
stan dd118888a0 Bug 302 - Added control state scratch area to shared memory. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1899 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-03-30 13:52:51 +00:00
stan 227961486a Removed cap on speeds 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1891 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-03-24 11:06:25 +00:00
stan abf547959d Enhanced and corrected checksum etc. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1890 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-03-24 11:05:38 +00:00
stan 03de837429 Bug 285 - Now uses sudo as first preference. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1889 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-03-24 11:04:23 +00:00