From 027402e89776283f0a7dc6876e497543c15396b5 Mon Sep 17 00:00:00 2001 From: stan Date: Tue, 8 Jul 2003 09:24:03 +0000 Subject: [PATCH] Updated for v.14 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@614 e3e1d417-86f3-4887-817a-d78f3d33393f --- README | 1597 +++++++++++++++++++++++++++------------------------ README.doc | Bin 133632 -> 168960 bytes README.html | 912 ++++++++++++++++++----------- 3 files changed, 1423 insertions(+), 1086 deletions(-) diff --git a/README b/README index ec1503f1a..d8ce577ff 100644 --- a/README +++ b/README @@ -1,5 +1,6 @@ + 08/07/03 ZoneMinder 0.9.14 README 1 - ZoneMinder v0.9.12 + ZoneMinder v0.9.14 1. Introduction @@ -52,6 +53,12 @@ ZoneMinder is fresh off the keyboard and so comes with no warranty whatsoever, please try it, send your feedback and if you get anything useful out of it please let me know. +ZoneMinder is free but if you do get a ZoneMinder up and running +and find it useful then please feel free to visit +http://www.zoneminder.com/donate.html where any donations will be +appreciated and will help to fund future improvements of +ZoneMinder. + 2. Requirements @@ -69,32 +76,35 @@ generate thumbnails under certain circumstances though this can be modified. ZoneMinder can generate MPEG videos if necessary, for this you'll -need the Berkeley MPEG encoder, if you don't have it don't worry -the options will be hidden and you'll not miss much really. The -web interface uses PHP and so you need that in your apache or -other web server as well. There are also various perl modules that -you may need that vary depending on which options you choose on -installation. +need either ffmpeg (recommended) or the Berkeley MPEG encoder. If +you don't have either don't worry, as the options will be hidden +and you'll not miss much really. The web interface uses PHP and so +you need that in your apache or other web server as well, make +sure MySQL support is available either statically or as a module. +There are also various perl modules that you may need that vary +depending on which options you choose on installation, for more +details see later in this document. -Finally, there is quite a bit of image streaming in the package so -if you don't have Netscape or other browser that supports image -streaming natively I recommend you get the excellent Cambozola -java applet from http://www.charliemouse.com/code/cambozola/ which -will let you view the image stream in Internet Explorer and -others. Otherwise you're limited to just refreshing still images. +Finally, there is quite a bit of image streaming in the package. +So if you don't have Netscape or another browser that supports +image streaming natively I recommend you get the excellent +Cambozola java applet from +http://www.charliemouse.com/code/cambozola/ which will let you +view the image stream in Internet Explorer and others. Otherwise +you're limited to just refreshing still images. -Hardware-wise, ZoneMinder has been used with BTTV cards and USB +Hardware-wise, ZoneMinder has been used with various video and USB cameras with the V4L interface. I don't have a lot of cameras -myself so I've not had change to test it much. There will soon be -a list of devices that are definitely known to work on the web -site. Please let me know if your camera works or not. You do need -to have Video 4 Linux installed. I've not got many machines so -I've only really used it on RedHat, which does have everything -there by default I think. SlackWare does need a bit more tinkering -than other distributions; there will be document on the web site -describing what users have had to do to get it working with very -soon, though I can email additional information if requested. -Please give me feedback on other distributions. +myself so I've not had change to test it with a huge ranger +personally however there is a list of devices that are definitely +known to work on the web site. Please let me know if your camera +is not listed. You do need to have Video 4 Linux installed. I've +not got too many machines so I've only really used it on RedHat, +which does have everything there by default I think. SlackWare +does need a bit more tinkering than other distributions; there is +a document on the web site describing what users have had to do to +get it working. Please give me feedback on other distributions not +listed on the site. 3. Building @@ -140,9 +150,15 @@ perl ./zmconfig.pl -noi which will just read your file and do the substations with no questions asked. Also if you are upgrading from version 0.9.7 (or -later) you can copy your old zmconfig*.txt files into the current +later) you can copy your old zmconfig.txt file into the current build directory before you run zmconfig.pl and it will use your -preferences as a basis for generating the new ones. +preferences as a basis for generating the new ones. There are two +classes of options, 'core' options which much be specified with +zmconfig which detail things such as database passwords which are +compiled into ZoneMinder and other options with are stored in the +database and which can be modified dynamically via the 'options' +section of the web interface. Only the first set need to be +completed with zmconfig at this stage. Among the first questions zmconfig.pl asks you are to do with the database and the next thing you should do is create it and the @@ -159,22 +175,20 @@ x.y.z.sql to upgrade your database and make the necessary changes where x.y.z identifies the version of ZoneMinder you had installed previously. So if you are going from version 0.9.7 to version 0.9.11 you would run the scripts for all intervening versions to -get to the current one. For a new installation the simplest way to -create your database and users is as follows, +get to the current one, i.e. zmalter-0.9.7.sql, zmalter-0.9.8.sql, +zmalter-0.9.9.sql and zmalter0.9.10.sql. For a new installation +the simplest way to create your database and users is as follows, mysql mysql < zmschema.sql mysql mysql grant select,insert,update,delete on .* to -''@localhost identified by ''; -username>' identified by ''; - -grant select on .* to '' -identified by - -'' +grant select on .* to ''@localhost identified by '' quit @@ -182,7 +196,10 @@ mysqladmin reload You may need to supply a username and password to the mysql commands in the first place to give yourself sufficient privileges -to perform the required commands. +to perform the required commands. If you want to host your +database on a different machine than that which ZoneMinder is +running on then use the hostname of the remote machine instead of +localhost. Then just type 'make' and off you go. @@ -213,10 +230,10 @@ binaries. I will now briefly describe what each of them does. images. zmu - This is the ZoneMinder Utility. It's basically a handy - command line interface to several useful functions. Not really - meant to be used by anyone except the web page (there's only - limited 'help' in it so far) but can be if necessary, especially - for debugging video problems. + command line interface to several useful functions. It's not + really meant to be used by anyone except the web page (there's + only limited 'help' in it so far) but can be if necessary, + especially for debugging video problems. zmfix - This is a small binary that exists only to ensure that the video device files can be read by the main capture daemons. @@ -237,14 +254,14 @@ viewed and amended if necessary and are as follows. zmdc.pl - This is the ZoneMinder Daemon Control script. This is used by the web interface and the zmpkg.pl script to control and - maintain the execution of the capture and analysis daemons + maintain the execution of the capture and analysis daemons, amongst others. You should not need to run this script yourself. - zmfilter.pl - This script controsl the execution of saved - filters and will be started and stopped by the web - interface based on whether there are filters that have been - defined to be autonomous. This script is also responsible for - the automatic uploading of events to a 3rd party server. + zmfilter.pl - This script controls the execution of saved + filters and will be started and stopped by the web interface + based on whether there are filters that have been defined to be + autonomous. This script is also responsible for the automatic + uploading of events to a 3rd party server. zmaudit.pl - This script is used to check the consistency of the event file system and database. It can delete orphaned events, @@ -256,12 +273,16 @@ viewed and amended if necessary and are as follows. interface only deletes the event entry from the database itself. If this is set then it is this script that tidies up the rest. - zmx10.pl - This is an option script that can be used to initiate - and monitor X10 Home Automation style events and interface with - an alarm system either by the generation of X10 signals on - ZoneMinder events or by initiating ZoneMinder monitoring and - capture on receipt of X10 signals from elsewhere, for instance - the triggering of an X10 PIR. + zmx10.pl - This is an optional script that can be used to + initiate and monitor X10 Home Automation style events and + interface with an alarm system either by the generation of X10 + signals on ZoneMinder events or by initiating ZoneMinder + monitoring and capture on receipt of X10 signals from elsewhere, + for instance the triggering of an X10 PIR. For example I have + several cameras that don't do motion detection until I arm my + alarm system whereupon they switch to active mode when an X10 + signal is generated by the alarm system and received by + ZoneMinder. zmwatch.pl - This is a simple script purely designed to keep an eye on the capture daemons and restart them if they lockup. It @@ -277,7 +298,7 @@ configuration necessary in there. Most will have already been done by the configuration utilities. At this stage typing 'make install' will install everything to the -desired locations, you may to su to root first though. The +desired locations, you may wish to su to root first though. The installation routine will copy the binaries and scripts to your chosen install location, usually /usr/local/bin and then move zms to your cgi-bin area. It will then copy the web files to your @@ -293,9 +314,9 @@ something like /etc/rc.d/init.d and then add it by doing /sbin/chkconfig --add zm -or similar command. ZoneMinder will then start up when your -machine reboots and can be controlled (by the root user) by doing -'service zm start' or 'service zm stop' etc. +or similar command for your distribution. ZoneMinder will then +start up when your machine reboots and can be controlled (by the +root user) by doing 'service zm start' or 'service zm stop' etc. Now start your web browser and point it at your zm.php and off you go. @@ -303,40 +324,58 @@ go. 5. Tutorial -To start with you should see the ZoneMinder Console window, this -will resize itself to avoid being too intrusive on your desktop. -Along the top there are several informational entries like the -time of the last update and the current server load. There will -also be a 'start' or 'stop' link depending on the current state. -Below that are various other links including a set allowing you to -configure your bandwidth. This enables you to optimise your +What you see now (and subsequently) depends on whether you chose +to run ZoneMinder in authenticated mode or not. This is an option +that lets you specify whether anyone that goes to the ZoneMinder +web pages must authenticate themself in order to be given +permissions to perform certain tasks. If you chose this mode then +you will need to log in here. By default a fully privileged user +'admin' has been created with a password also of 'admin'. You +should change this password as soon as possible. + +Once you've logged in, or if you are running in un-authenticated +mode, you will now see the ZoneMinder Console window. This will +resize itself to avoid being too intrusive on your desktop. Along +the top there are several informational entries like the time of +the last update and the current server load. There will also be a +'start' or 'stop' link depending on the current state. Below that +are various other links including one detailing the current user +(in authenticated mode only) and one allowing you to configure +your bandwidth. This last one enables you to optimise your settings depending on where you are, the actual values relating to -this are defined at the op of the zm_config.php file. If you are -using a browser on the same machine or network then choose high, -over a cable or DSL link maybe choose medium and over a dialup -choose low. You can experiment to see which is best. This setting -is retained on a per machine basis with a persistent cookie. Also -on this line is a 'Report Bug' email link which you can use to -easily report any problems (or successes!) and a couple of other -links to the left which will be covered below. +this are defined in the options. If you are using a browser on the +same machine or network then choose high, over a cable or DSL link +maybe choose medium and over a dialup choose low. You can +experiment to see which is best. This setting is retained on a per +machine basis with a persistent cookie. Also on this line are a +number of other links that will be covered below. + +Please bear in mind that from here on the descriptions of the web +pages are based on what you will see if you are running as a fully +authenticated user. If you are running in un-authenticated mode or +as a less privileged user then some elements may not be shown or +will be disabled. 5.1. Defining Monitors To use ZoneMinder properly you need to define at least one -Monitor. Essentially a monitor is associated with a camera and +Monitor. Essentially, a monitor is associated with a camera and will continually check it for motion detection and such like. So, next click 'Add New Monitor' to bring up the dialog. You will see a bunch of things you have to fill in. To help you get started on the video configuration the best thing is to us a tool like 'xawtv' to get a picture you're happy with, -and to check your camera works and then run 'zmu -d -q --v' to get a dump of the settings. You can then enter these values +and to check your camera works. Then run 'zmu -d -q - +v' to get a dump of the settings (note, you will have to +additionally supply a username and password to zmu if you are +running in authenticated mode). You can then enter these values into the video related options of the monitor configuration panel. -Note that 'device_no' here is a number corresponding to the digit -at the end of your device file, so /dev/video0 has a 'device_no' -of 0 etc. If 'zmu' gives you an error related to permissions run -'zmfix -a' to make sure you can access all the video devices. +The 'device_no' referred to here is a number corresponding to the +digit at the end of your device file, so /dev/video0 has a +'device_no' of 0 etc. If 'zmu' gives you an error related to +permissions run 'zmfix -a' to make sure you can access all the +video devices. The options explained in a little more detail are as follows, @@ -348,15 +387,15 @@ The options explained in a little more detail are as follows, camera but no alarms or events will be generated, or 'Active' meaning all the images will be analysed as well as the stream being available to watch. If you have specified X10 support - then X10 is also available as an option which means that the - monitor is generally passive but may go active on receipt of - X10 commands. Generally you'll want 'Active' but for now leave - this at 'None'. + then X10 is also available as an option, which means that the + monitor is generally passive but may switch to or from active + mode on receipt of X10 commands (see below). Generally you'll + want 'Active' but for now leave this at 'None'. Source Type - This determines whether the camera is a local one attached to a physical video or USB port on your machine or a remote network camera or similar. Choosing one or the - other affects which set of three options are show next. + other affects which set of three options are shown next. Device Number/Channel - For a local camera enter the device number that your camera is attached to. If it is /dev/video0 @@ -377,18 +416,18 @@ The options explained in a little more detail are as follows, /cameras/camera1.jopg respectively. Leave the port at 80 if there is no special port required. If you require authentication to access your camera then add this onto the - host name in the form :@.com. + host name in the form :@.com. Orientation - If your camera is mounted upside down or at right angles you can use this field to specify a rotation that - it applied to the image as it is captured. This incurs an + is applied to the image as it is captured. This incurs an additional processing overhead so if possible it is better to mount your camera the right way round if you can. If not set the orientation here. If you choose one of the rotation - options remember to reverse the height and width fields so - that they apply, e.g. if your camera captures at 352x288 and - you choose 'Rotate Right' here then set the height to be 352 - and width to be 288. + options remember to switch the height and width fields so that + they apply, e.g. if your camera captures at 352x288 and you + choose 'Rotate Right' here then set the height to be 352 and + width to be 288. Capture Width/Height - The dimensions of the video stream your camera will supply. If your camera supports several just enter @@ -406,14 +445,14 @@ The options explained in a little more detail are as follows, Timestamp Label Format - This relates to the timestamp that is applied to each frame. It is a sprintf style string. It is - actually passed through sprintf and then through print to add + actually passed through sprintf and then through printf to add the monitor name so a format of '%%s - %y/%m/%d %H:%M:%S' would be recommended though you can modify it if necessary. If you don't want a timestamp or have a camera that puts one on itself then leave this field blank. Timestamp Label X/Y - The X and Y values determine where to - put the timestamp a value of 0 for the X value will put it on + put the timestamp. A value of 0 for the X value will put it on the left side of the image and a Y value of 0 will place it at the top of the image. A Y value of the height you supplied earlier minus 8 will place it on the bottom of the image. @@ -443,7 +482,15 @@ The options explained in a little more detail are as follows, will get you started but if you get a lot of short events and would prefer them to run together to form fewer longer ones then increase the Post Event buffer size. Both of these values - added together should not exceed the ring buffer size. + added together should not exceed the ring buffer size. You + should also bear in mind the frame rate of the camera when + choosing this value. For instance a network camera capturing + at 1FPS will give you 10 seconds before and after each event + if you chose 10 here. This may well be too much and pad out + events more than necessary. However a fast video card may well + capture at 25FPS and you will want to ensure that this setting + enables you to view a reasonable time frame pre and post + event. Maximum FPS - On some occasions you may have one or more cameras capable of high capture rates but find that you @@ -457,7 +504,7 @@ The options explained in a little more detail are as follows, value you set the less close the actual FPS may approach it especially on shared devices where it is difficult to synchronise two different capture rates precisely. There is a - global option in zmconfig.pl that allows you to turn this + global configuration option that allows you to turn this limiting off in the event of an alarm. FPS Report Interval - How often the current performance in @@ -495,8 +542,8 @@ The options explained in a little more detail are as follows, video stream but no analysis is done. On receipt of the appropriate X10 signal however it effectively changes to Active mode and starts to analyse images until an X10 signal - changes it back to Passive again. The format of this string is - as follows, + (or elapsed time) changes it back to Passive again. The format + of this string is as follows, n : If you simply enter a number then the monitor will be activated when an X10 ON signal for that unit code is @@ -525,7 +572,7 @@ The options explained in a little more detail are as follows, the previous definition it similarly inverts the mode, i.e. the OFF signal activates the monitor. - n+ : As per the previous mode except that the + n- : As per the previous mode except that the monitor will activate itself after the given number of seconds. @@ -1015,9 +1062,72 @@ however care should be taken when using this option as for many frequent events the penalty in CPU and disk space can quickly mount up. -That pretty much is it for the tour. You should experiment with + +5.6. Options and Users +The final area covered by the tutorial is the options and user +section. If you are running in authenticated mode and don't have +system privileges then you will not see this section at all and if +you are running in un-authenticated mode then no user section will +be displayed. + +The various options you can specify are displayed in a tabbed +dialog with each group of options displayed under a different +heading. Each option is displayed with its name, a short +description and the current value. You can also click on the '?' +link following each description to get a fuller explanation about +each option. This is the same as you would get from zmconfig.pl. A +number of option groups have a master option near the top which +enables or disables the whole group so you should be aware of the +state of this before modifying options and expecting them to make +any difference. + +If you have changed the value of an option you should then 'save' +it. A number of the option groups will then prompt you to let you +know that the option(s) you have changed will require a system +restart. This is not done automatically in case you will be +changing many values in the same session, however once you have +made all of your changes you should restart ZoneMinder as soon as +possible. The reason for this is that web and some scripts will +pick up the new changes immediately but some of the daemons will +still be using the old values and this can lead to data +inconsistency or loss. + +As mentioned above, you may also see a 'users' tab. In this +section you will see a list of the current users defined on the +system. You can also add or delete users from here. It is +recommended you do not delete the admin user unless you have +created another fully privileged user to take over the same role. +Each user is defined with a name and password (which is hidden) as +well as an enabled setting which you can use to temporarily enable +or disable users, for example a guest user for limited time +access. + +There are also four values that define the user permissions, these +are 'stream', 'events', 'monitors' and 'system' Each can have +values of 'none', 'view' or 'edit' apart from 'stream' which has +no 'edit' setting. These values cover access to the following +areas; 'stream' defines whether a user is allowed to view the +'live' video feeds coming from the cameras. You may wish to allow +a user to view historical events only in which case this setting +should be 'none'. The 'events' setting determines whether a user +can view and modify or delete any retained historical events. The +'monitors' setting specifies whether a user can see the current +monitor settings and change them. Finally the 'system' setting +determines whether a user can view or modify the system settings +as a whole, such as options and users or controlling the running +of the system as a whole. As well as these settings there is also +a monitor ids setting that can be used for non-'system' users to +restrict them to only being able to access streams, events or +monitors for the given monitors ids as a comma separated list with +no spaces. If a user with 'monitors' edit privileges is limited to +specific monitors here they will not be able to add or delete +monitors but only change the details of those they have access to. +If a user has 'system' privileges then the monitors ids setting is +ignored and has no effect. + +That's pretty much is it for the tour. You should experiment with the various setting to get the results you think are right for -your. Naturally letting thousands of events build up is not good +your. Naturally, letting thousands of events build up is not good for the database or your file system so you should endeavour to either prevent spurious events from being generated in the first place or ensure that you housekeep them strictly. @@ -1025,7 +1135,7 @@ place or ensure that you housekeep them strictly. Have fun, please report any bugs or features you'd like to see and hopefully ZoneMinder can be your camera monitoring friend! -Philip Coombes (philip.coombes@zoneminder.com) - April 2003 +Philip Coombes (philip.coombes@zoneminder.com) - July 2003 6. Troubleshooting @@ -1034,9 +1144,10 @@ Life eh? Nothing ever works first time does it? In case you are having problems here are some things to try. If these don't work then feel free to get in touch and I'll see if I can suggest something else. The best places to look for errors are in your -system error log (probably /var/log/messages on RedHat) and your -web server log (/var/log/httpd/error_log). There should be -something in one of those that gives you some kind of tip off. +system error log (normally /var/log/messages on RedHat) and your +web server log (/var/log/httpd/error_log unless otherwise +defined). There should be something in one of those that gives you +some kind of tip off. Some things to check. @@ -1051,77 +1162,71 @@ Some things to check. a problem then switch off ZM_STRICT_VIDEO_CONFIG in zmconfig.pl and recompile and reinstall. - o Start simple. Begin with a single monitor and single zone. - You can run the zmc capture daemon from the command line as 'zmc - - -device 0' (or whatever your video device is). If it returns - immediately there's a problem so check the logs, if it stays up - then your video configuration is probably ok. To get more - information out of it use debug as specified below. Also check - that the shared memory segment has been created by doing 'ipcs - - m'. Finally, beware of doing tests as root and then trying to run - as another user as some files may not be accessible. If you're - checking things as root make sure that you clean up afterwards! - - o Web server. Ensure that your web server can serve PHP files. - It's also possible that your php.ini file may have some settings - which break ZoneMinder, I'm not a PHP guru but setting safe mode - may prevent your PHP files from running certain programs. You may - have to set configuration to allow this. Also since the daemons - are started by your web server, if it dies or is shut down then - the daemons may disappear. In this version the daemons are run - under the control of a script which should trap expected signals - but it is possible this doesn't cover all circumstances. - - o One of the more common errors you can see in the log files is - of the form 'Can't shmget: Invalid argument'. Generally speaking - this is caused by an attempt to allocate an amount of shared - memory greater than your system can handle. The size it requests - is base on the following formula, ring buffer size x image width x - image height x 3 (for 24 bits images) + a bit of overhead. So if - for instance you were using 24bit 640x480 then this would come to - about 92Mb if you are using the default buffer size of 100. If - this is too large then you can either reduce the image or buffer - sizes or increase the maximum amount of shared memory available. - If you are using RedHat then you can get details on how to change - these settings at http://www.redhat.com/docs/manuals/database/RHDB- - 2.1-Manual/admin_user/kernel-resources.html - - o You should be able to use a similar process with other - distributions to modify the shared memory pool without kernel - recompilations though in some cases this may be necessary. Note, - this error also sometime occurs if you have an old shared memory - segment lying around from a previous run that is too small. Use - the ipcs and ipcrm commands to check and remove it if necessary. - - o If you get odd javascript errors and your web console or - other screens come up with bits missing then it's possible that - there is a problem with the PHP configuration. Since version 0.9.8 - ZoneMinder has used short PHP open tags to output information, so - instead of something like this '', it will be - something like this '' which is easier and quicker to - write as well as being neater. More information about this - directive can be seen at the following location, - http://www.php.net/manual/en/configuration.directives.php#ini.shor - t-open-tag. However although by default most PHP installations - support this form, some will need to have it switched on - explicitly. To do this you will first need to find your php.ini - file (do a 'locate php.ini' or 'find / -name php.ini'. Be aware - however that sometimes you might find more than one, so ensure you - identify the one that is actually being used. You will then need - to find the line that starts 'short_open_tag = ' and change the - Off value to On. This wil correct the problem. However in some - cases you may have explicitly switched it off, so that XML - compliant documents can be more easily served, or you may even not - have permission to edit the file. In this case you can go into the - web directory of ZoneMinder and run 'sh retag.sh' which will - replace all the short open tags in the files themselves with the - longer variant. You will obviously have to remember to do this for - each subsequent version of ZoneMinder that you install as well. - - o Use debug. ZoneMinder has various debug in it that by default - will go into your system log (via syslog). These will be of the - form of - +o Start simple. Begin with a single monitor and single zone. +You can run the zmc capture daemon from the command line as 'zmc - +-device 0' (or whatever your video device is). If it returns +immediately there's a problem so check the logs, if it stays up +then your video configuration is probably ok. To get more +information out of it use debug as specified below. Also check +that the shared memory segment has been created by doing 'ipcs - +m'. Finally, beware of doing tests as root and then trying to run +as another user as some files may not be accessible. If you're +checking things as root make sure that you clean up afterwards! +o Web server. Ensure that your web server can serve PHP files. +It's also possible that your php.ini file may have some settings +which break ZoneMinder, I'm not a PHP guru but setting safe mode +may prevent your PHP files from running certain programs. You may +have to set configuration to allow this. Also since the daemons +are started by your web server, if it dies or is shut down then +the daemons may disappear. In this version the daemons are run +under the control of a script which should trap expected signals +but it is possible this doesn't cover all circumstances. +o One of the more common errors you can see in the log files is +of the form 'Can't shmget: Invalid argument'. Generally speaking +this is caused by an attempt to allocate an amount of shared +memory greater than your system can handle. The size it requests +is base on the following formula, ring buffer size x image width x +image height x 3 (for 24 bits images) + a bit of overhead. So if +for instance you were using 24bit 640x480 then this would come to +about 92Mb if you are using the default buffer size of 100. If +this is too large then you can either reduce the image or buffer +sizes or increase the maximum amount of shared memory available. +If you are using RedHat then you can get details on how to change +these settings at http://www.redhat.com/docs/manuals/database/RHDB- +2.1-Manual/admin_user/kernel-resources.html +o You should be able to use a similar process with other +distributions to modify the shared memory pool without kernel +recompilations though in some cases this may be necessary. Note, +this error also sometime occurs if you have an old shared memory +segment lying around from a previous run that is too small. Use +the ipcs and ipcrm commands to check and remove it if necessary. +o If you get odd javascript errors and your web console or +other screens come up with bits missing then it's possible that +there is a problem with the PHP configuration. Since version 0.9.8 +ZoneMinder has used short PHP open tags to output information, so +instead of something like this '', it will be +something like this '' which is easier and quicker to +write as well as being neater. More information about this +directive can be seen at the following location, +http://www.php.net/manual/en/configuration.directives.php#ini.shor +t-open-tag. However although by default most PHP installations +support this form, some will need to have it switched on +explicitly. To do this you will first need to find your php.ini +file (do a 'locate php.ini' or 'find / -name php.ini'. Be aware +however that sometimes you might find more than one, so ensure you +identify the one that is actually being used. You will then need +to find the line that starts 'short_open_tag = ' and change the +Off value to On. This wil correct the problem. However in some +cases you may have explicitly switched it off, so that XML +compliant documents can be more easily served, or you may even not +have permission to edit the file. In this case you can go into the +web directory of ZoneMinder and run 'sh retag.sh' which will +replace all the short open tags in the files themselves with the +longer variant. You will obviously have to remember to do this for +each subsequent version of ZoneMinder that you install as well. +o Use debug. ZoneMinder has various debug in it that by default +will go into your system log (via syslog). These will be of the +form of "Sep 14 14:50:11 localhost zma-0[1975]: INF [Front: 221000 - Processing at 4.26 fps ]" @@ -1129,23 +1234,22 @@ Some things to check. is running on. Entries with INF in are informational and not an error, if you see ERR then it is one, though not all are fatal. You can prevent this information from being emitted by - setting the DLVL_zmc environment variable to -1 or less once - things are working. If you want to run any of the daemons - from the command line to test, setting DBG_PRINT to 1 will - output the debug on the console. You can also use the USR1 - and USR2 signals to increase or decrease the amount of debug - being emitted. + setting the ZM_DBG_LEVEL_zmc environment variable to -1 or + less once things are working. If you want to run any of the + daemons from the command line to test, setting ZM_DBG_PRINT + to 1 will output the debug on the console. You can also use + the USR1 and USR2 signals to increase or decrease the amount + of debug being emitted. o Paths. I admit it, the various paths in ZoneMinder are a bit of a nightmare. Make sure that they are all correct and that permissions are such that the various parts of ZoneMinder can actually run. - o Missing perl modules. There are various perl modules used by - the various scripts. If you get errors about missing ones, the - easiest way to install them is to type the following (you will - probably need to be root), - +o Missing perl modules. There are various perl modules used by +the various scripts. If you get errors about missing ones, the +easiest way to install them is to type the following (you will +probably need to be root), perl -MCPAN -eshell this will then (eventually, after some configuration if it's @@ -1169,54 +1273,50 @@ Some things to check. and if you can't get anything to work let me know and I'll try and add it. - o USB bus problems. If you have multiple USB cameras on one bus - then it can appear as if ZoneMinder is causing your cameras to - fail. This is because the bandwidth available to cameras is - limited by the fairly low USB speed. In order to use more than one - USB camera with ZoneMinder (or any application) you will need to - inform the driver that there are other cameras requiring - bandwidth. This is usually done with a simple module option. - Examples are usb_alt= for the OV511 driver and cams= for - CPIA etc. Check your driver documentation for more details. Be - aware however that sharing cameras in this way on one bus will - also limit the capture rate due to the reduced bandwidth. - - o Incorrect libjpeg.a detection. It seems to be the case that - in some cases the library file libjpeg.a is reported as missing - even when apparently present. This appears to actually be down to - the g++ compiler not being installed on the host system. Since - ZoneMinder contains both C++ and C files you need to be able to - compile both of these file types and so usually need to ensure you - have gcc and g++ installed (though they are often the same - binary). - - o Httpd and zms memory leaks. It has been reported by some - users with RedHat 9 that the zms process fails to terminate - correctly when the controlled window is killed and also that it, - and it's associated httpd process, continue to grow in memory size - until they kill the system. This appears to be a bug in either the - compiler or apache on RH9. On other systems it may appear that zms - is leaking and growing. However what grows is the total and shared - memory size while the non-shared memory size stays constant. It's - a little odd but I think what it happening is that as zms picks - images out of the shared memory ring buffer to display, as each - slot is read the size of that bit of memory is added to the shared - memory total for the process. As streamed images are not read - consecutively it's a semi-random process so initially most of the - buffer slots are new and the shared memory size grows then as time - goes on the remaining unaccessed slots reduce until once all have - been read the shared memory use caps out at the same size as the - actual segment. This is what I would have expected it to be in the - first place, but it seems to do it incrementally. Then once this - total is hit it grows no further. As it's shared memory anyway and - already in use this apparent leak is not consuming any more memory - than when it started. - - o Cambozola. There appears to be an issue with recent versions - of Cambozola that causes image corruption in the stream. If you - are getting this then I suggest you stick with version 0.22 which - is available from the Downloads section of www.zoneminder.com. - +o USB bus problems. If you have multiple USB cameras on one bus +then it can appear as if ZoneMinder is causing your cameras to +fail. This is because the bandwidth available to cameras is +limited by the fairly low USB speed. In order to use more than one +USB camera with ZoneMinder (or any application) you will need to +inform the driver that there are other cameras requiring +bandwidth. This is usually done with a simple module option. +Examples are usb_alt= for the OV511 driver and cams= for +CPIA etc. Check your driver documentation for more details. Be +aware however that sharing cameras in this way on one bus will +also limit the capture rate due to the reduced bandwidth. +o Incorrect libjpeg.a detection. It seems to be the case that +in some cases the library file libjpeg.a is reported as missing +even when apparently present. This appears to actually be down to +the g++ compiler not being installed on the host system. Since +ZoneMinder contains both C++ and C files you need to be able to +compile both of these file types and so usually need to ensure you +have gcc and g++ installed (though they are often the same +binary). +o Httpd and zms memory leaks. It has been reported by some +users with RedHat 9 that the zms process fails to terminate +correctly when the controlled window is killed and also that it, +and it's associated httpd process, continue to grow in memory size +until they kill the system. This appears to be a bug in either the +compiler or apache on RH9. On other systems it may appear that zms +is leaking and growing. However what grows is the total and shared +memory size while the non-shared memory size stays constant. It's +a little odd but I think what it happening is that as zms picks +images out of the shared memory ring buffer to display, as each +slot is read the size of that bit of memory is added to the shared +memory total for the process. As streamed images are not read +consecutively it's a semi-random process so initially most of the +buffer slots are new and the shared memory size grows then as time +goes on the remaining unaccessed slots reduce until once all have +been read the shared memory use caps out at the same size as the +actual segment. This is what I would have expected it to be in the +first place, but it seems to do it incrementally. Then once this +total is hit it grows no further. As it's shared memory anyway and +already in use this apparent leak is not consuming any more memory +than when it started. +o Cambozola. There appears to be an issue with recent versions +of Cambozola that causes image corruption in the stream. If you +are getting this then I suggest you stick with version 0.22 which +is available from the Downloads section of www.zoneminder.com. Also, if you are using IE under Windows and get lots of annoying clicks when various windows refresh then you'll need to edit your registry and remove the value for @@ -1228,93 +1328,170 @@ http://www.zoneminder.com/downloads/noIEClick.reg 7. Change Log -7.1. Release 0.9.12 +7.1. Release 0.9.14 +Major new feature and important bug-fixes. + + o Web configuration. Following many requests and to make + ZoneMinder easier to administer the configuration system has been + changed slightly. You should now still run zmconfig.pl to specify + an initial configuration but you now only need to answer the first + few questions to give a core set of options including the database + options. The remainder of configuration options can then be + ignored to start with and all but the core options will be written + to the database. You can then view and modify these options from + the web interface and apply then without recompilation, which is + now only necessary if you change the core configuration. + +o Following a number of requests the .sock file directory is +now configurable in zmconfig. +o Y channel bug. When using colour cameras a motion detection +problem was present if fast RGB images deltas (ZM_FAST_RGB_DIFFS) +was off. This was an overflow error in the calculation of the Y +channel and caused excessive image differences to be calculated. +This has now been fixed. +o The use of the Term::Readkey perl module in zmaudit.pl has +been removed. This module had been removed from zmconfig.pl +previously but had lingered in this script. +o A bug was found in zmx10.pl causing a crash if time delayed +X10 events were used. This has now been fixed. +o Removed use of 'zmu' binary from zmwatch.pl and zmx10.pl. +Previously these scripts had used zmu to determine last image time +and alarm state information. The use of this script was a bit +overkill and the introduction of user permissions complicated +matter slightly so these scripts now access the shared memory +directly. +o Shared memory permissions. Following introduction of a user +permissions system the previous 777 mode for shared memory was +deemed insecure. Consequently from now on shared memory is only +accessible from the owner. This means that zmu will only work when +run as root or the web user unless you set it setuid where it +should still be secure as it will require authentication. +o All SQL buffers in the C++ code have been enlarged. There was +previously an issue with a buffer overflow on certain occasions. + +7.2. Release 0.9.13 +Beta version of several features and fixes, never generally +released. + + o Following a number of requests the .sock file directory is + now configurable in zmconfig. + +o Changed some of the core video calls to be V4L2 compatible. +This primarily involved opening the video devices and memory maps +as read/write and not just readonly. +o Shared memory has now been rationalised to prevent some +common problems. Remember to shutdown the whole ZM package before +installing, from this version on it will remove all old shared +memory segments. +o Fixed not numeric comparison in zmwatch which was causing, or +appeared to be causing, some errors. +o Fixed zone image map bug for percentage zones. When you had +defined a zone in percentage terms, the imagemap used to select it +for editing was broken. This is now fixed. +o New contrast/brightness etc adjustments feature. This +accessible from the Settings link on the monitor window. It's +fairly basic at present but should work for most types of cameras. +If you have any device or driver specific auto-brightness, auto- +contrast etc enabled the changes you make may appear to work but +may be overridden by the auto feature immediately so check for +that if your changes do not appear to be having an effect. Also if +you have a number of cameras being multiplexed onto one device +then any changes here will probably affect all your cameras. +o Some redundant window scrollbars removed. +o Added user and access control. If enabled in config +(ZM_OPT_USE_AUTH) then you will need to define and login as ZM +users. There will be one users already defined, with username +'admin' and password 'admin'. This user is defined will full +permissions and clicking on the 'Options' link from the main +console window will allow you to modify and create users with +various permission sets which hopefully will satisfy most +requirements. These users (except any defined with 'system' edit +capability) can be restricted to certain cameras by adding the +monitor ids as a comma-separated list (no spaces) to the +appropriate field. Users limited to specific monitors may not +create or delete monitors even if defined with monitor edit +permissions. +o Some windows now (optionally) use a JavaScript timeout to +refresh themselves rather than a refresh header. Since refresh +headers were interrupted if a link of the page was linked there +were previously various forced refreshes from child windows to +restart the refresh process. By using JS refresh timers which are +not interrupted these extraneous refreshes have been mostly +eliminated. + +7.3. Release 0.9.12 Mostly bug-fixes with a couple of minor features. o Double first images. Fixed a problem where the first image of an event was being recorded twice. I don't think this was at the cost of any of the other images but one copy was an extra. - o Made zmdc connect more intelligent. On the suggestion of a - couple of people I have made the zmdc.pl server spawning and - waiting a bit more intelligent. Rather than waiting a fixed - (short) amount of time, it now polls every second for a while, - stopping if the connection is made. Thanks to Todd McAnally for - the initial suggestion. - - o Added image view to events lists. Again a partial - implementation of a suggested feature. If you click on the score - column you will now get a snapshot of the event frame with the - highest score. This is to enable you to quickly see what the event - was about without having to watch the stream or view all the - static images. - - o Make delta times variable precision. A couple of problems had - been reported where long events got negative durations. This was - due to an overflow in a time difference routine. This had been - operating on fixed precision allowing high precision for short - deltas. This routine has been changed to allow variable precision - and events will now have to be several days long to wrap in this - way. - - o Fixed round detection problem. Although the existence or - otherwise of the 'round' function is correctly detected, the - appropriate header file with the results of this test was not - included which was not helpful. This has been corrected. - - o Fixed monitor rename bug. Renaming a monitor did not - correctly modify the events directory to reflect this. This has - now been fixed. - - o OPT_MPEG bug. A bug was reported (by Fernando Diaz) where the - results of the ZM_OPT_MPEG configuration variable was not - correctly imported into the scripts. This now happens as intended. - - o Fixed zmvideo.pl event length bug. The zmvideo.pl script - which is used to generate video MPEG files tries to calculate the - correct frame rate based on the length of the event and the number - of frames it contains. Previously it did not take account of the - pre and post event frames and so passed a much shorter value to - the mpeg encoder than it should. This will only have affected - short events encoded with ffmpeg but will have resulted in much - faster frame rates than necessary. This has now been corrected to - take the whole event length into account. - - o Fixed remote camera memory leak. A memory leak was reported - when capturing with remote cameras, this is now fixed. - - o Orientation. Added option to rotate or invert captured images - for cameras mounted at unusual angles. - - o Fixed filter bug. A bug in the zmfilter.pl script was - detected and reported by Ernst Lehmann. This bug basically meant - that events were not checked as often as they should have been and - many may have been left out for filters that had no time - component. The script has now been updated to reflect Ernst's - suggested changes. - - o Stylesheet change. Previously the stylesheet didn't really - work very well on Mozilla, Netscape and browsers other than IE. - This turned out to be because I was using HTML style comments in - there instead of C style ones. This has now been corrected so you - should see the correct styles. - - o Zmconfig.pl ReadKey. Thanks to a ridiculously sensible - suggestion from Carlton Thomas this module has been removed from - zmconfig.pl. Originally Term::ReadKey was in there for funky - single character unbuffered input but that has long since - disappeared so just regular perl input methods are used now. This - removes one of the most irritating features about ZoneMinder - installs. - - o Delete monitor confirm. Due to some unfortunate accidents by - users, attempts to delete monitors will now require confirmation. - - o Detect libmysqlclient.a. Added better detection script into - 'configure' top spot when libmysqlclient.a is missing. - +o Made zmdc connect more intelligent. On the suggestion of a +couple of people I have made the zmdc.pl server spawning and +waiting a bit more intelligent. Rather than waiting a fixed +(short) amount of time, it now polls every second for a while, +stopping if the connection is made. Thanks to Todd McAnally for +the initial suggestion. +o Added image view to events lists. Again a partial +implementation of a suggested feature. If you click on the score +column you will now get a snapshot of the event frame with the +highest score. This is to enable you to quickly see what the event +was about without having to watch the stream or view all the +static images. +o Make delta times variable precision. A couple of problems had +been reported where long events got negative durations. This was +due to an overflow in a time difference routine. This had been +operating on fixed precision allowing high precision for short +deltas. This routine has been changed to allow variable precision +and events will now have to be several days long to wrap in this +way. +o Fixed round detection problem. Although the existence or +otherwise of the 'round' function is correctly detected, the +appropriate header file with the results of this test was not +included which was not helpful. This has been corrected. +o Fixed monitor rename bug. Renaming a monitor did not +correctly modify the events directory to reflect this. This has +now been fixed. +o OPT_MPEG bug. A bug was reported (by Fernando Diaz) where the +results of the ZM_OPT_MPEG configuration variable was not +correctly imported into the scripts. This now happens as intended. +o Fixed zmvideo.pl event length bug. The zmvideo.pl script +which is used to generate video MPEG files tries to calculate the +correct frame rate based on the length of the event and the number +of frames it contains. Previously it did not take account of the +pre and post event frames and so passed a much shorter value to +the mpeg encoder than it should. This will only have affected +short events encoded with ffmpeg but will have resulted in much +faster frame rates than necessary. This has now been corrected to +take the whole event length into account. +o Fixed remote camera memory leak. A memory leak was reported +when capturing with remote cameras, this is now fixed. +o Orientation. Added option to rotate or invert captured images +for cameras mounted at unusual angles. +o Fixed filter bug. A bug in the zmfilter.pl script was +detected and reported by Ernst Lehmann. This bug basically meant +that events were not checked as often as they should have been and +many may have been left out for filters that had no time +component. The script has now been updated to reflect Ernst's +suggested changes. +o Stylesheet change. Previously the stylesheet didn't really +work very well on Mozilla, Netscape and browsers other than IE. +This turned out to be because I was using HTML style comments in +there instead of C style ones. This has now been corrected so you +should see the correct styles. +o Zmconfig.pl ReadKey. Thanks to a ridiculously sensible +suggestion from Carlton Thomas this module has been removed from +zmconfig.pl. Originally Term::ReadKey was in there for funky +single character unbuffered input but that has long since +disappeared so just regular perl input methods are used now. This +removes one of the most irritating features about ZoneMinder +installs. +o Delete monitor confirm. Due to some unfortunate accidents by +users, attempts to delete monitors will now require confirmation. +o Detect linmysqlclient.a. Added better detection script into +'configure' top spot when libmysqlclient.a is missing. -7.2. Release 0.9.11 +7.4. Release 0.9.11 Various new features and fixes. o Added stats view - If you have the RECORD_EVENT_STATS @@ -1324,190 +1501,158 @@ Various new features and fixes. useful in tuning the various motion detection parameters and seeing why events occurred. - o Tabulated events - The main events view is now tabulated to - look a bit nicer. - - o New video palette support - As well as the existing greyscale - and 24 bit RGB palettes, you can now choose YUV420P and RGB565. - Rewrote the palette/colours area a bit to enable support for other - palettes in the future if requested. Bear in mind though that YUV - palettes are converted into RGB internally so if you have the - choice RGB24 may be faster as it's the 'native' format used - within. - - o Added preclusive zones - Added a new zone type, the - preclusive zone. For full details see the relevant section above - but in brief this is a zone type that if alarmed will actually - prevent an alarm. This completes the pantheon of zone types I - think. - - o Fixed Mozilla JavaScript - Various JavaScript functionality - did not function on Mozilla, Netscape and other browsers. This is - now (hopefully) fixed. - - o Allow image and mpegs to be attached to emails - Added new - tokens (%EI1%, %EIM% and %EV%) to the filter emails. This allows - the first alarm image, most highly scored alarm image and an alarm - MPEG to be attached to alarm notification emails. Use %EV% - especially with care! - - o Fixed possible motion detection bug - I found a few double - declared local variables left over from the rewrite. This may have - affected the motion detection algorithm. Fixed now anyway. - - o Modified scoring - Alarm scoring has been modified to give - more granularity for smaller events. This will have the effect of - raising the scores for small events while large ones will still be - about the same. - - o Fixed /cgi-bin path problem - Previously you could specify - the real path to you cgi-bin directory if you have one but not the - web path. You can now do both. - - o Improved video handling in browser - The MPEG/video area of - the web GUI had been a bit neglected and looked somewhat ugly. - This has now been improved to a degree and looks a bit nicer. - - o Added ffmpeg support - Historically ZoneMinder has only - supported the Berkeley mpeg encoder which was slow and rather - limited. ZoneMinder now supports the ffmpeg encoder as well which - is much much faster and makes generation of MPEG videos at - realistic frame rates more of a reality. As ffmpeg has so many - options and everyone will probably want a different emphasis you - can now also specify additional ffmpeg options via zmconfig.pl. - - o Colourise greyscale image files - In past versions, captured - greyscale images were stored as JPEG files with a corresponding - greyscale colourspace. This saved a small amount of space but - meant that mpeg_encode had to do a conversion to encode them, and - ffmpeg just fell in a heap. Now you can optionally opt to have - greyscale images saved as full 24 bit colourspace images (they - still look the same) at the price of a small penalty in CPU and - disk but allowing you to easily and quickly create MPEG files. - This option is one by default but can be switched off if you do - not require any MPEG encoding. - - o Fast RGB diffs - Previously ZoneMinder used quite a loose - method for calculating the differences between two colour images. - This was basically averaging the differences between each of the - RGB components to get an overall difference. This is still the - default but by setting ZM_FAST_RGB_DIFFS to 'no' you can now make - it calculate the Y (or brightness value) of the pixels and use the - difference between those instead. This will be more accurate and - responsive to changes but is may be slower especially on old - machines. There is a slight double whammy here if you have a YUV - palette for capture and set this option off as the image will be - converted to RGB and then partially converted back to get the Y - value. This is currently very inefficient and needs to be - optimised. - - o Fixed STRICT_VIDEO_CONFIG - Previously this actually behaved - the opposite of what it was supposed to, ie. if you wanted it - strict it wasn't and vice versa. Thanks to Dan Merillat for - pointing this one out. - - o Web colour change - I thought the old red, green and amber - text colours were just a bit too gaudy so I've toned them down a - bit. Hope you like them! - +o Tabulated events - The main events view is now tabulated to +look a bit nicer. +o New video palette support - As well as the existing greyscale +and 24 bit RGB palettes, you can now choose YUV420P and RGB565. +Rewrote the palette/colours area a bit to enable support for other +palettes in the future if requested. Bear in mind though that YUV +palettes are converted into RGB internally so if you have the +choice RGB24 may be faster as it's the 'native' format used +within. +o Added preclusive zones - Added a new zone type, the +preclusive zone. For full details see the relevant section above +but in brief this is a zone type that if alarmed will actually +prevent an alarm. This completes the pantheon of zone types I +think. +o Fixed Mozilla JavaScript - Various JavaScript functionality +did not function on Mozilla, Netscape and other browsers. This is +now (hopefully) fixed. +o Allow image and mpegs to be attached to emails - Added new +tokens (%EI1%, %EIM% and %EV%) to the filter emails. This allows +the first alarm image, most highly scored alarm image and an alarm +MPEG to be attached to alarm notification emails. Use %EV% +especially with care! +o Fixed possible motion detection bug - I found a few double +declared local variables left over from the rewrite. This may have +affected the motion detection algorithm. Fixed now anyway. +o Modified scoring - Alarm scoring has been modified to give +more granularity for smaller events. This will have the effect of +raising the scores for small events while large ones will still be +about the same. +o Fixed /cgi-bin path problem - Previously you could specify +the real path to you cgi-bin directory if you have one but not the +web path. You can now do both. +o Improved video handling in browser - The MPEG/video area of +the web GUI had been a bit neglected and looked somewhat ugly. +This has now been improved to a degree and looks a bit nicer. +o Added ffmpeg support - Historically ZoneMinder has only +supported the Berkeley mpeg encoder which was slow and rather +limited. ZoneMinder now supports the ffmpeg encoder as well which +is much much faster and makes generation of MPEG videos at +realistic frame rates more of a reality. As ffmpeg has so many +options and everyone will probably want a different emphasis you +can now also specify additional ffmpeg options via zmconfig.pl. +o Colourise greyscale image files - In past versions, captured +greyscale images were stored as JPEG files with a corresponding +greyscale colourspace. This saved a small amount of space but +meant that mpeg_encode had to do a conversion to encode them, and +ffmpeg just fell in a heap. Now you can optionally opt to have +greyscale images saved as full 24 bit colourspace images (they +still look the same) at the price of a small penalty in CPU and +disk but allowing you to easily and quickly create MPEG files. +This option is one by default but can be switched off if you do +not require any MPEG encoding. +o Fast RGB diffs - Previously ZoneMinder used quite a loose +method for calculating the differences between two colour images. +This was basically averaging the differences between each of the +RGB components to get an overall difference. This is still the +default but by setting ZM_FAST_RGB_DIFFS to 'no' you can now make +it calculate the Y (or brightness value) of the pixels and use the +difference between those instead. This will be more accurate and +responsive to changes but is may be slower especially on old +machines. There is a slight double whammy here if you have a YUV +palette for capture and set this option off as the image will be +converted to RGB and then partially converted back to get the Y +value. This is currently very inefficient and needs to be +optimised. +o Fixed STRICT_VIDEO_CONFIG - Previously this actually behaved +the opposite of what it was supposed to, ie. if you wanted it +strict it wasn't and vice versa. Thanks to Dan Merillat for +pointing this one out. +o Web colour change - I thought the old red, green and amber +text colours were just a bit too gaudy so I've toned them down a +bit. Hope you like them! -7.3. Release 0.9.10 +7.5. Release 0.9.10 Many bug-fixes and major feature enhancements. o Configure 'round' bug - Fixed a problem with the configure script that didn't detect if the 'round' function was already declared before try to do it itself. - o Low event id bug - Fixed bug where events with an id of < - 1000 were being cleaned up by zmaudit.pl by mistake. - - o Source file restructuring - The source files have been broken - up and renamed extensively to support the first stage of the code - being straightened out. Likewise the class structure has been - rationalised somewhat. The php file names have also changed in - some cases so it might be best to delete all your php and css - files from the zone minder install directory first as the old ones - won't be overwritten and will be left behind. - - o Streamed cycle view - The monitor cycle view (the one where - each monitor is displayed sequentially) now supports streams as - well as stills. - - o New 'montage' view - Added a montage view showing all your - cameras simultaneously either streaming or stills. The width of - this window (in terms of number of monitors) is a configuration - option. - - o Network camera support - A major change in this version is - support for remote or network cameras. This is currently - implemented as series of http grabs of stills rather than being - able to break up motion jpeg streams. However frame rates of from - 2-10 should be achievable depending on your network proximity to - the cameras. - - o Option BGR->RGB swap - Added the option to switch on or off - the inversion of RGB to BGR for local cameras. It is on by default - to maintain compatibility with previous releases. - - o zmu suspend alarm option - Added new -n option to zmu to - effectively suspend alarm detection for a monitor. This is - intended for short term use and to support PTZ cameras where alarm - detection is desired to be suspended while the camera changes - orientation or zoom level. - - o FPS limiting - Added a new option to monitors to add a - maximum capture rate. This allows you to limit the amount of hits - a network camera gets or to reduce the system load with many - cameras. It also works with multi-port cards and limiting the - capture rate on one camera allows the spare FPS to be allocated to - other devices. For instance with two cameras and no throttle, I - get about 4FPS each. Throttling one to 2FPS allows the other to - operate at 6FPS so you can allocate your capture resources - accordingly. This limiting can be disabled while alarms are - occurring as a global option in zmconfig.pl. - - o Alarm reference update - Added option to not blend alarmed - images into the reference image. See the help in zmconfig.pl for - caveats. - - o Disappearing monitors - Fixed the disappearing monitor - problem in the console view where monitors with no events were - randomly not being shown. - - o Clean and tidy - Cleaned up a load of compiler warnings and - miscellanea to ensure a cleaner happier build. - - o Streamed image headers - Made all headers in streamed images - have full CRLF termination which will hopefully now prevent the - problems with broken streams that had existed mostly with Mozilla - (and hopefully won't break anything else). - - o Expire streams - Added expiry headers to streamed images so - they will always display fully. - - o Event navigation - Added next, prev, delete & next, delete & - prev navigation to events to allow you to quickly review events in - sequence as had been requested by a number of people. - - o USR blocking - The debug USR signals were not being blocked - properly leading to nasty effects in zmc mostly. - - o zmfilter execution - Previously zmfilter execution was not - synchronised with the monitor state or the analysis daemon leading - to it sometimes being run unnecessarily. From now on the zmfilter - process will only run when a monitor is active and so actually - potentially generating alarms. - - o zmdc short statuses - Removed the logging of the short status - values that zmdc.pl returns to it's clients which had been - clogging up the log file. - - o Bugs and pieces - Fixed various bug(ettes) that I came across - that that I don't think had been reported or noticed so I don't - think we need to talk about them here do we. - +o Low event id bug - Fixed bug where events with an id of < +1000 were being cleaned up by zmaudit.pl by mistake. +o Source file restructuring - The source files have been broken +up and renamed extensively to support the first stage of the code +being straightened out. Likewise the class structure has been +rationalised somewhat. The php file names have also changed in +some cases so it might be best to delete all your php and css +files from the zone minder install directory first as the old ones +won't be overwritten and will be left behind. +o Streamed cycle view - The monitor cycle view (the one where +each monitor is displayed sequentially) now supports streams as +well as stills. +o New 'montage' view - Added a montage view showing all your +cameras simultaneously either streaming or stills. The width of +this window (in terms of number of monitors) is a configuration +option. +o Network camera support - A major change in this version is +support for remote or network cameras. This is currently +implemented as series of http grabs of stills rather than being +able to break up motion jpeg streams. However frame rates of from +2-10 should be achievable depending on your network proximity to +the cameras. +o Option BGR->RGB swap - Added the option to switch on or off +the inversion of RGB to BGR for local cameras. It is on by default +to maintain compatibility with previous releases. +o zmu suspend alarm option - Added new -n option to zmu to +effectively suspend alarm detection for a monitor. This is +intended for short term use and to support PTZ cameras where alarm +detection is desired to be suspended while the camera changes +orientation or zoom level. +o FPS limiting - Added a new option to monitors to add a +maximum capture rate. This allows you to limit the amount of hits +a network camera gets or to reduce the system load with many +cameras. It also works with multi-port cards and limiting the +capture rate on one camera allows the spare FPS to be allocated to +other devices. For instance with two cameras and no throttle, I +get about 4FPS each. Throttling one to 2FPS allows the other to +operate at 6FPS so you can allocate your capture resources +accordingly. This limiting can be disabled while alarms are +occurring as a global option in zmconfig.pl. +o Alarm reference update - Added option to not blend alarmed +images into the reference image. See the help in zmconfig.pl for +caveats. +o Disappearing monitors - Fixed the disappearing monitor +problem in the console view where monitors with no events were +randomly not being shown. +o Clean and tidy - Cleaned up a load of compiler warnings and +miscellanea to ensure a cleaner happier build. +o Streamed image headers - Made all headers in streamed images +have full CRLF termination which will hopefully now prevent the +problems with broken streams that had existed mostly with Mozilla +(and hopefully won't break anything else). +o Expire streams - Added expiry headers to streamed images so +they will always display fully. +o Event navigation - Added next, prev, delete & next, delete & +prev navigation to events to allow you to quickly review events in +sequence as had been requested by a number of people. +o USR blocking - The debug USR signals were not being blocked +properly leading to nasty effects in zmc mostly. +o zmfilter execution - Previously zmfilter execution was not +synchronised with the monitor state or the analysis daemon leading +to it sometimes being run unnecessarily. From now on the zmfilter +process will only run when a monitor is active and so actually +potentially generating alarms. +o zmdc short statuses - Removed the logging of the short status +values that zmdc.pl returns to it's clients which had been +clogging up the log file. +o Bugs and pieces - Fixed various bug(ettes) that I came across +that that I don't think had been reported or noticed so I don't +think we need to talk about them here do we. -7.4. Release 0.9.9 +7.6. Release 0.9.9 Mainly bug-fixes and minor feature enhancements. o Added zmu -q/--query option - There is now a new query option @@ -1518,206 +1663,153 @@ Mainly bug-fixes and minor feature enhancements. device by default. This now requires the -q option also to bring into line with it's -m equivalent. - o Added creation of events directory - Previously the 'events' - directory was not created on install, this has been fixed. - - o Can now retag PHP files if necessary - Version 0.9.8 was the - first version to use short_open_tags in the PHP files. This caused - grief to some people so this script will put them back to the long - verion. - - o Frame and event lengths fractional - A new field has been - added to the Frames table. This is 'Delta' and is a fractional - number of seconds relative to the event start time. This is - intended to support the real-time playback of events rather than - just 'as fast as possible' or with a configured delay as at - present. The event length is now also fractional. - - o Corrected extraneous Width to be Height - The last version of - zmu included a Width comment which should have been height. - - o Changed colour depth to bits - Having colour depths expressed - in bytes has caused no end of problems. This is now changed to be - bits and can be changed via a dropdown to limit what can be - entered. Don't forget to run the zmalter script to update your DB. - - o Renamed terminate to zm_terminate - The use of 'terminate' in - zmc.cpp caused a conflict on some systems so renamed it to - something more specific. - - o Zone deletion problem - A problem was found such that when - deleting zones the appropriate daemons were not being asked to - restart daemons correctly. - - o Console changes - The current version number is now displayed - in the console. A refresh button has also been added along with a - minor reorg. - - o Added delete button enable to checkAll - Using the 'Check - All' button in the main monitor window previously did not enable - the delete button. This is now fixed. - - o Reload on click - In previous versions the console window - would reload if a monitor window for example was clicked. Thsi was - removed in the last version which meant that sometimes the console - never go refreshed as it's timing loop was broken. This - functionality has now been reinstated. - +o Added creation of events directory - Previously the 'events' +directory was not created on install, this has been fixed. +o Can now retag PHP files if necessary - Version 0.9.8 was the +first version to use short_open_tags in the PHP files. This caused +grief to some people so this script will put them back to the long +verion. +o Frame and event lengths fractional - A new field has been +added to the Frames table. This is 'Delta' and is a fractional +number of seconds relative to the event start time. This is +intended to support the real-time playback of events rather than +just 'as fast as possible' or with a configured delay as at +present. The event length is now also fractional. +o Corrected extraneous Width to be Height - The last version of +zmu included a Width comment which should have been height. +o Changed colour depth to bits - Having colour depths expressed +in bytes has caused no end of problems. This is now changed to be +bits and can be changed via a dropdown to limit what can be +entered. Don't forget to run the zmalter script to update your DB. +o Renamed terminate to zm_terminate - The use of 'terminate' in +zmc.cpp caused a conflict on some systems so renamed it to +something more specific. +o Zone deletion problem - A problem was found such that when +deleting zones the appropriate daemons were not being asked to +restart daemons correctly. +o Console changes - The current version number is now displayed +in the console. A refresh button has also been added along with a +minor reorg. +o Added delete button enable to checkAll - Using the 'Check +All' button in the main monitor window previously did not enable +the delete button. This is now fixed. +o Reload on click - In previous versions the console window +would reload if a monitor window for example was clicked. Thsi was +removed in the last version which meant that sometimes the console +never go refreshed as it's timing loop was broken. This +functionality has now been reinstated. -7.5. Release 0.9.8 +7.7. Release 0.9.8 Several new features and bug-fixes o Upgrade note - If you have installed 0.9.7 and wish to save your configuration then copy your existing zmconfig.txt file over to your 0.9.8 directory and before running zmconfig.pl. - o Added multiple options to zmu - You can now give multiple - options to zmu and get all the responses at once. However this is - currently in a deterministic order and not related to the order - you give them. - - o Added -v/--verbose option to zmu - Zmu has been made more - human friendly though it still remains primarily for daemon use. - Giving the -v or --verbose option prints out a bit more as a - response to each command. - - o Add -d/--device to zmu - This option is designed to allow you - to get your video device working with another application such as - xawtv and then use zmu -d to print out the settings it's using - - o (especially with the -v option). These options can then be - used as a starting point for your ZoneMinder configuration. - - o Added FPS in status field - The status field in the web - monitor views now contains an FPS setting as well as the status. - - o Zmconfig changes - zmconfig handles missing options better - and rewrites config file even in non-interactive mode. - - o Fixed config problems in zmcfg.h - Some config was not being - set up correctly in zmcfg.h. - - o Zmwatch now works on image delay and not fps - Previously the - zmwatch daemon detected capture daemon failure by trying to use - the FPS setting. This was imprecise and prone to false readings. - It now uses the time delay since the last captured image. - - o Added zmpkg.pl and zm scripts - There are now two new - scripts. zmpkg.pl is in charge of starting and stopping ZoneMinder - as a whole package and zm is designed to be (optionally) installed - into your init.d directory to use ZoneMinder as a service. - - o Fixed bug in Scan mode - The monitor cycle or scan mode had - stopped working properly due to images not being generated. This - is now fixed. - - o Revamped the console window slightly - The console window has - now been reformatted slightly to give more and better information - including server load. - - o Added email and messaging to filters - Filters now allow you - to send emails or messages (basically just short emails intended - for mobile devices) on alarms. The format and possible content for - these emails is in zmconfig_eml.txt and zmconfig_msg.txt. - - o Made zmdc more aggresive in killing old processes - The - zmdc.pl daeamon will now kill any ZoneMinder processes it finds on - startup or shutdown to prevent orphans from being left around. - - o Configuration changes - Previously there were a lot of files - generated by configure. Now only zmconfig.pl is generated this way - and all the other configuration files are created by zmconfig.pl - (from .z files) to centralise configuration more. - - o Fixed cambolzola opt bug - There was a bug in the Cambozola - options, I can't remember what it was but it's fixed! - - o Retaint arguments in zmdc.pl - In some installations zmdc was - complaining about tainted arguments from the socket. These are now - detainted prior to sending and after receiving. - - o Forced alarms - You can now force alarms when looking at the - monitor window should anything catch your attention. You have to - remember to switch them off as well though. - - o Looser video configuration - Some video configuration errors - can now be ignored via the STRICT_VIDEO_CONFIG option. - - o Monitor window refresh on alarm - When the monitor window is - active and an alarm has occurred the most recent alarms list is - immediately refreshed to show it. - +o Added multiple options to zmu - You can now give multiple +options to zmu and get all the responses at once. However this is +currently in a deterministic order and not related to the order +you give them. +o Added -v/--verbose option to zmu - Zmu has been made more +human friendly though it still remains primarily for daemon use. +Giving the -v or --verbose option prints out a bit more as a +response to each command. +o Add -d/--device to zmu - This option is designed to allow you +to get your video device working with another application such as +xawtv and then use zmu -d to print out the settings it's using +o (especially with the -v option). These options can then be +used as a starting point for your ZoneMinder configuration. +o Added FPS in status field - The status field in the web +monitor views now contains an FPS setting as well as the status. +o Zmconfig changes - zmconfig handles missing options better +and rewrites config file even in non-interactive mode. +o Fixed config problems in zmcfg.h - Some config was not being +set up correctly in zmcfg.h. +o Zmwatch now works on image delay and not fps - Previously the +zmwatch daemon detected capture daemon failure by trying to use +the FPS setting. This was imprecise and prone to false readings. +It now uses the time delay since the last captured image. +o Added zmpkg.pl and zm scripts - There are now two new +scripts. zmpkg.pl is in charge of starting and stopping ZoneMinder +as a whole package and zm is designed to be (optionally) installed +into your init.d directory to use ZoneMinder as a service. +o Fixed bug in Scan mode - The monitor cycle or scan mode had +stopped working properly due to images not being generated. This +is now fixed. +o Revamped the console window slightly - The console window has +now been reformatted slightly to give more and better information +including server load. +o Added email and messaging to filters - Filters now allow you +to send emails or messages (basically just short emails intended +for mobile devices) on alarms. The format and possible content for +these emails is in zmconfig_eml.txt and zmconfig_msg.txt. +o Made zmdc more aggresive in killing old processes - The +zmdc.pl daeamon will now kill any ZoneMinder processes it finds on +startup or shutdown to prevent orphans from being left around. +o Configuration changes - Previously there were a lot of files +generated by configure. Now only zmconfig.pl is generated this way +and all the other configuration files are created by zmconfig.pl +(from .z files) to centralise configuration more. +o Fixed cambolzola opt bug - There was a bug in the Cambozola +options, I can't remember what it was but it's fixed! +o Retaint arguments in zmdc.pl - In some installations zmdc was +complaining about tainted arguments from the socket. These are now +detainted prior to sending and after receiving. +o Forced alarms - You can now force alarms when looking at the +monitor window should anything catch your attention. You have to +remember to switch them off as well though. +o Looser video configuration - Some video configuration errors +can now be ignored via the STRICT_VIDEO_CONFIG option. +o Monitor window refresh on alarm - When the monitor window is +active and an alarm has occurred the most recent alarms list is +immediately refreshed to show it. -7.6. Release 0.9.7 +7.8. Release 0.9.7 Yes, a big jump in release number but a lot of changes too. Now somewhat more mature, not really an alpha any more, and a lot of bugs fixed too. o Added zmconfig.pl script to help with configuration. - o Revamped to work better with configure scripts - - o Monitors now have more configuration options, including some - that were statically defined before such as location and format of - the image timestamps. - - o Removed Alarms table from schema as not required, never was - actually... - - o Added a number of new scripts, see the scripts directory - - o Added Fast delete to PHP files. This allows the web interface - to only delete the event entries themselves for speed and then - have the zmaudit script periodically tidy up the rest. - - o Added event filter to enable bulk viewing, upload or deletion - of events according to various attributes. Filter can be saved and - edited. - - o Added last event id to shared memory for auto-filtering etc. - - o Changed zmu -i option to write to monitor named image file. - - o Made shared memory management somewhat more sensible. - - o Now stores DB times as localtime rather than UTC avoiding - daylight saving related bugs. - - o Fixed bug with inactive zones and added more debug. - - o Changed main functions to return int. - - o Added help and usage to zmu. - - o Fixed browser acceptance problem, more easily defaults to - HTML. - - o Split out the PHP files into a bunch with specific functions - rather than one monolithic one. - - o Fixed NetPBM paths and changed _SERVER to HTTP_SERVER_VARS. - - o Added HUP signal on zone deletion. - - o Added NETPBM_DIR and conditional netpbm stuff. - - o Removed hard coded window sizes, all popup window dimensions - can be specified in zmconfig.php - - o Changed form methods to 'get' from 'post' to avoid resubmit - warnings all the time. - - o Added conditional sound to alarm on web interface. - - o Fixed syntax error when adding default monitor. - - o Some of the web views have changed slightly to accommodate - the separate events view. - - o And much much more, probably... - +o Revamped to work better with configure scripts +o Monitors now have more configuration options, including some +that were statically defined before such as location and format of +the image timestamps. +o Removed Alarms table from schema as not required, never was +actually... +o Added a number of new scripts, see the scripts directory +o Added Fast delete to PHP files. This allows the web interface +to only delete the event entries themselves for speed and then +have the zmaudit script periodically tidy up the rest. +o Added event filter to enable bulk viewing, upload or deletion +of events according to various attributes. Filter can be saved and +edited. +o Added last event id to shared memory for auto-filtering etc. +o Changed zmu -i option to write to monitor named image file. +o Made shared memory management somewhat more sensible. +o Now stores DB times as localtime rather than UTC avoiding +daylight saving related bugs. +o Fixed bug with inactive zones and added more debug. +o Changed main functions to return int. +o Added help and usage to zmu. +o Fixed browser acceptance problem, more easily defaults to +HTML. +o Split out the PHP files into a bunch with specific functions +rather than one monolithic one. +o Fixed NetPBM paths and changed _SERVER to HTTP_SERVER_VARS. +o Added HUP signal on zone deletion. +o Added NETPBM_DIR and conditional netpbm stuff. +o Removed hard coded window sizes, all popup window dimensions +can be specified in zmconfig.php +o Changed form methods to 'get' from 'post' to avoid resubmit +warnings all the time. +o Added conditional sound to alarm on web interface. +o Fixed syntax error when adding default monitor. +o Some of the web views have changed slightly to accommodate +the separate events view. +o And much much more, probably... -7.7. Release 0.0.1 +7.9. Release 0.0.1 Initial release, therefore nothing new. @@ -1731,79 +1823,65 @@ enhancements still to do, here is just a sample. be a separate table and class from monitors. Not critical but would represent a better model. - o Comments - Needs many more, but that's just me I'm hopeless - at commenting things out. I'll get round to it soon though honest! - You're lucky to even get this document. - - o Optimised zones - The zones could do with being sorted out a - bit to optimise the processing of overlapping ones, at the moment - you can waste resource unless your zones are kept very tidy. - - o Create zones using server side image maps - This would make - it easier to precisely define and see where your zone is going to - go. Not critical but handy but a bugger to do. - - o Zone Definitions - Allow zones to be defined according to a - colour coded bitmap or as polygons. Currently all zones are - rectangular this would add a bit of flexibility. Would need a bit - of a rewrite though. This will incur a slight penalty on startup - and a very slight one on processing for all reasonably shaped - zones. - - o Security - I think I need to give the php file a bit of a - good going over as I'm sure it's not done in the most secure way - regarding passing things onto command line, exposing file paths - and other stuff. I'm a bit of a PHP novice, as I'm sure you can - tell so might need help here. I should have done it in perl! - - o Mouseover help - A bit more help popping up when you - mouseover things would be handy. A bit more help full stop - actually. - - o WAP interface - A bit of a crusade of mine I'm afraid. I'd - like to put a WML interface on to allow you to view event listing - and perhaps the most significant image from each event on your - phone. Also simple management. From version 0.9.7 there is a very - basic crude initial version that probably won't work with your - phone but its there as a testbed. - - o Automatic device configuration - Video 4 Linux supports - various device queries, it should be possible to get most of the - device capability information from the device itself. The zmu - utility does this now but it's not yet integrated into the web - pages. - - o Extend the API. Well ok it's not really got an API yet but - the image data is held in shared memory in a very simple format. - In theory you could use the capture daemon to gab the images and - other things could read them from memory or the analysis daemon - could read images from elsewhere. Either way this should be done - through an API, and would need a library I think. Also the zmu - utility could probably do a whole lot more to enable other things - to manage when the daemons become active etc. - - o Access control should probably be built in rather than - relying on .htaccess etc. This is a frequently requested feature - (FRF) and must be done soon. - - o Create .rpm packages (as there can be several dependencies) - and maybe other types of packages also, e.g. for Debian - distributions. - - o Allow ZoneMinder to 'train' itself by allowing the user to - select events that are considered important and to discard those - that should be ignored. ZoneMinder will interpolate, add a bit of - magic, and recommend settings that will support this selection - automatically thereafter. The hooks for this are already in to - some extent. - - o Add quotes to all PHP array references. I should have done it - in the first place but I'm a perl person really and it kind of - bugs me that you have to. - - o Add sound support to allow a captured audio channel to be - associated with a video device. - +o Comments - Needs many more, but that's just me I'm hopeless +at commenting things out. I'll get round to it soon though honest! +You're lucky to even get this document. +o Optimised zones - The zones could do with being sorted out a +bit to optimise the processing of overlapping ones, at the moment +you can waste resource unless your zones are kept very tidy. +o Create zones using server side image maps - This would make +it easier to precisely define and see where your zone is going to +go. Not critical but handy but a bugger to do. +o Zone Definitions - Allow zones to be defined according to a +colour coded bitmap or as polygons. Currently all zones are +rectangular this would add a bit of flexibility. Would need a bit +of a rewrite though. This will incur a slight penalty on startup +and a very slight one on processing for all reasonably shaped +zones. +o Security - I think I need to give the php file a bit of a +good going over as I'm sure it's not done in the most secure way +regarding passing things onto command line, exposing file paths +and other stuff. I'm a bit of a PHP novice, as I'm sure you can +tell so might need help here. I should have done it in perl! +o Mouseover help - A bit more help popping up when you +mouseover things would be handy. A bit more help full stop +actually. +o WAP interface - A bit of a crusade of mine I'm afraid. I'd +like to put a WML interface on to allow you to view event listing +and perhaps the most significant image from each event on your +phone. Also simple management. From version 0.9.7 there is a very +basic crude initial version that probably won't work with your +phone but its there as a testbed. +o Automatic device configuration - Video 4 Linux supports +various device queries, it should be possible to get most of the +device capability information from the device itself. The zmu +utility does this now but it's not yet integrated into the web +pages. +o Extend the API. Well ok it's not really got an API yet but +the image data is held in shared memory in a very simple format. +In theory you could use the capture daemon to gab the images and +other things could read them from memory or the analysis daemon +could read images from elsewhere. Either way this should be done +through an API, and would need a library I think. Also the zmu +utility could probably do a whole lot more to enable other things +to manage when the daemons become active etc. +o Access control should probably be built in rather than +relying on .htaccess etc. This is a frequently requested feature +(FRF) and must be done soon. +o Create .rpm packages (as there can be several dependencies) +and maybe other types of packages also, e.g. for Debian +distributions. +o Allow ZoneMinder to 'train' itself by allowing the user to +select events that are considered important and to discard those +that should be ignored. ZoneMinder will interpolate, add a bit of +magic, and recommend settings that will support this selection +automatically thereafter. The hooks for this are already in to +some extent. +o Add quotes to all PHP array references. I should have done it +in the first place but I'm a perl person really and it kind of +bugs me that you have to. +o Add sound support to allow a captured audio channel to be +associated with a video device. 9. Bugs @@ -1813,21 +1891,18 @@ enhancements still to do, here is just a sample. associated with the image anyway. So I think this should be moved to the analysis daemon. - o I suspect there may be a bug in zmaudit.pl if your monitor - names have spaces in them. I've not been able to reproduce it but - to be on the safe side don't put spaces in your Monitor names. - - o When opening a link to an event etc from a notification email - the window that is opened is just a regular browser window and not - in the context of a proper ZoneMinder web interface. Thus it comes - up too big usually (not a major issue) and also things like - 'Delete' don't work as it wants to do things to its parent (which - is more of a major issue). - - o The .sock files used by the *nix sockets I suspect may have - the odd permission issue now and again. I think everything - recovers from it but it needs checking out. - +o I suspect there may be a bug in zmaudit.pl if your monitor +names have spaces in them. I've not been able to reproduce it but +to be on the safe side don't put spaces in your Monitor names. +o When opening a link to an event etc from a notification email +the window that is opened is just a regular browser window and not +in the context of a proper ZoneMinder web interface. Thus it comes +up too big usually (not a major issue) and also things like +'Delete' don't work as it wants to do things to its parent (which +is more of a major issue). +o The .sock files used by the *nix sockets I suspect may have +the odd permission issue now and again. I think everything +recovers from it but it needs checking out. Probably bucket loads more, just fire them at me. diff --git a/README.doc b/README.doc index f783401b0c06eeea3c1000231235624448dab955..1ba534357eff30a5bcbd2407360ec61beccca3eb 100755 GIT binary patch delta 27578 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 delta 16249 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 diff --git a/README.html b/README.html index a138c6638..6e085ae68 100644 --- a/README.html +++ b/README.html @@ -9,22 +9,22 @@ xmlns="http://www.w3.org/TR/REC-html40"> -ZoneMinder v0.9.12 README +ZoneMinder v0.9.14