Spelling and grammar fixes in help (#2603)
* Edit Help array to make it match others below. This should not affect the results * Misc. grammer and spelling fixes along with removing some duplicated words. This should not affect compilation. * More grammer and spelling errors * Replace Javascript with ZoneMinder because it did not make sense there. * More spelling and grammar edits
This commit is contained in:
parent
22c5d46c65
commit
74d9f4f1aa
|
@ -197,8 +197,8 @@ our @options = (
|
|||
name => 'ZM_BANDWIDTH_DEFAULT',
|
||||
default => 'high',
|
||||
description => 'Default setting for bandwidth profile used by web interface',
|
||||
help => q`The classic skin for ZoneMinder has different
|
||||
profiles to use for low medium or high bandwidth connections.
|
||||
help => q`The classic skin for ZoneMinder has different
|
||||
profiles to use for low, medium, or high bandwidth connections.
|
||||
`,
|
||||
type => $types{string},
|
||||
category => 'system',
|
||||
|
@ -547,7 +547,7 @@ our @options = (
|
|||
higher quality setting than the ordinary file setting. If set
|
||||
to a lower value then it is ignored. Thus leaving it at the
|
||||
default of 0 effectively means to use the regular file quality
|
||||
setting for all saved images. This is to prevent acccidentally
|
||||
setting for all saved images. This is to prevent accidentally
|
||||
saving important images at a worse quality setting.
|
||||
`,
|
||||
type => $types{integer},
|
||||
|
@ -671,7 +671,7 @@ our @options = (
|
|||
Internet Explorer that don't natively support this format. If
|
||||
you use this browser it is highly recommended to install this
|
||||
from the [cambozola project site](http://www.charliemouse.com/code/cambozola/).
|
||||
However, if it is not installed still images at a lower refresh rate can
|
||||
However, if it is not installed still images at a lower refresh rate can
|
||||
still be viewed.
|
||||
`,
|
||||
type => $types{boolean},
|
||||
|
@ -926,10 +926,10 @@ our @options = (
|
|||
help => q`
|
||||
Due to browsers only wanting to open 6 connections, if you have more
|
||||
than 6 monitors, you can have trouble viewing more than 6. This setting
|
||||
specified the beginning of a port range that will be used to contact ZM
|
||||
specified the beginning of a port range that will be used to contact ZM
|
||||
on. Each monitor will use this value plus the Monitor Id to stream
|
||||
content. So a value of 2000 here will cause a stream for Monitor 1 to
|
||||
hit port 2001. Please ensure that you configure apache appropriately
|
||||
content. So a value of 2000 here will cause a stream for Monitor 1 to
|
||||
hit port 2001. Please ensure that you configure apache appropriately
|
||||
to respond on these ports.`,
|
||||
type => $types{integer},
|
||||
category => 'network',
|
||||
|
@ -1065,12 +1065,12 @@ our @options = (
|
|||
default => '0',
|
||||
description => 'Save logging output to the system log',
|
||||
help => q`
|
||||
ZoneMinder logging is now more more integrated between
|
||||
ZoneMinder logging is now more integrated between
|
||||
components and allows you to specify the destination for
|
||||
logging output and the individual levels for each. This option
|
||||
lets you control the level of logging output that goes to the
|
||||
system log. ZoneMinder binaries have always logged to the
|
||||
system log but now scripts and web logging is also included. To
|
||||
system log but script and web logging is now included. To
|
||||
preserve the previous behaviour you should ensure this value is
|
||||
set to Info or Warning. This option controls the maximum level
|
||||
of logging that will be written, so Info includes Warnings and
|
||||
|
@ -1092,7 +1092,7 @@ our @options = (
|
|||
default => '-5',
|
||||
description => 'Save logging output to component files',
|
||||
help => q`
|
||||
ZoneMinder logging is now more more integrated between
|
||||
ZoneMinder logging is now more integrated between
|
||||
components and allows you to specify the destination for
|
||||
logging output and the individual levels for each. This option
|
||||
lets you control the level of logging output that goes to
|
||||
|
@ -1122,7 +1122,7 @@ our @options = (
|
|||
default => '-5',
|
||||
description => 'Save logging output to the weblog',
|
||||
help => q`
|
||||
ZoneMinder logging is now more more integrated between
|
||||
ZoneMinder logging is now more integrated between
|
||||
components and allows you to specify the destination for
|
||||
logging output and the individual levels for each. This option
|
||||
lets you control the level of logging output from the web
|
||||
|
@ -1149,7 +1149,7 @@ our @options = (
|
|||
default => '0',
|
||||
description => 'Save logging output to the database',
|
||||
help => q`
|
||||
ZoneMinder logging is now more more integrated between
|
||||
ZoneMinder logging is now more integrated between
|
||||
components and allows you to specify the destination for
|
||||
logging output and the individual levels for each. This option
|
||||
lets you control the level of logging output that is written to
|
||||
|
@ -1204,7 +1204,7 @@ our @options = (
|
|||
help => q`
|
||||
When enabled (default is on), this option will log FFMPEG messages.
|
||||
FFMPEG messages can be useful when debugging streaming issues. However,
|
||||
depending on your distro and FFMPEG version, this may also result in
|
||||
depending on your distro and FFMPEG version, this may also result in
|
||||
more logs than you'd typically like to see. If all your streams are working
|
||||
well, you may choose to turn this off.
|
||||
`,
|
||||
|
@ -1219,7 +1219,7 @@ our @options = (
|
|||
ZoneMinder components usually support debug logging available
|
||||
to help with diagnosing problems. Binary components have
|
||||
several levels of debug whereas more other components have only
|
||||
one. Normally this is disabled to minimise performance
|
||||
one. Normally this is disabled to minimize performance
|
||||
penalties and avoid filling logs too quickly. This option lets
|
||||
you switch on other options that allow you to configure
|
||||
additional debug information to be output. Components will pick
|
||||
|
@ -1480,8 +1480,8 @@ our @options = (
|
|||
default => 'ZoneMinder',
|
||||
description => 'The title displayed wherever the site references itself.',
|
||||
help => q`
|
||||
If you want the site to identify as something other than ZoneMinder, change this here.
|
||||
It can be used to more accurately identify this installation from others.
|
||||
If you want the site to identify as something other than ZoneMinder, change this here.
|
||||
It can be used to more accurately identify this installation from others.
|
||||
`,
|
||||
type => $types{string},
|
||||
category => 'web',
|
||||
|
@ -1504,8 +1504,8 @@ our @options = (
|
|||
default => 'http://zoneminder.com',
|
||||
description => 'The url used in the home/logo area of the navigation bar.',
|
||||
help => q`
|
||||
By default this takes you to the zoneminder.com website,
|
||||
but perhaps you would prefer it to take you somewhere else.
|
||||
By default this takes you to the zoneminder.com website,
|
||||
but perhaps you would prefer it to take you somewhere else.
|
||||
`,
|
||||
type => $types{string},
|
||||
category => 'web',
|
||||
|
@ -1515,7 +1515,7 @@ our @options = (
|
|||
default => 'ZoneMinder',
|
||||
description => 'The content of the home button.',
|
||||
help => q`
|
||||
You may wish to set this to empty if you are using css to put a background image on it.
|
||||
You may wish to set this to empty if you are using css to put a background image on it.
|
||||
`,
|
||||
type => $types{string},
|
||||
category => 'web',
|
||||
|
@ -1538,7 +1538,8 @@ our @options = (
|
|||
name => 'ZM_WEB_EVENT_DISK_SPACE',
|
||||
default => 'no',
|
||||
description => 'Whether to show disk space used by each event.',
|
||||
help => q`Adds another column to the listing of events
|
||||
help => q`
|
||||
Adds another column to the listing of events
|
||||
showing the disk space used by the event. This will impart a small
|
||||
overhead as it will call du on the event directory. In practice
|
||||
this overhead is fairly small but may be noticeable on IO-constrained
|
||||
|
@ -1555,7 +1556,7 @@ our @options = (
|
|||
Traditionally the main ZoneMinder web console window has
|
||||
resized itself to shrink to a size small enough to list only
|
||||
the monitors that are actually present. This is intended to
|
||||
make the window more unobtrusize but may not be to everyones
|
||||
make the window more unobtrusize but may not be to everyone's
|
||||
tastes, especially if opened in a tab in browsers which support
|
||||
this kind if layout. Switch this option off to have the console
|
||||
window size left to the users preference
|
||||
|
@ -2105,7 +2106,7 @@ our @options = (
|
|||
a remote ftp server. This option indicates that ftp transfers
|
||||
should be done in passive mode. This uses a single connection
|
||||
for all ftp activity and, whilst slower than active transfers,
|
||||
is more robust and likely to work from behind filewalls. This
|
||||
is more robust and likely to work from behind firewalls. This
|
||||
option is ignored for SFTP transfers.
|
||||
`,
|
||||
requires => [ { name => 'ZM_OPT_UPLOAD', value => 'yes' } ],
|
||||
|
@ -2631,7 +2632,7 @@ our @options = (
|
|||
help => q`
|
||||
As event images are captured they are stored to the filesystem
|
||||
with a numerical index. By default this index has three digits
|
||||
so the numbers start 001, 002 etc. This works works for most
|
||||
so the numbers start 001, 002 etc. This works for most
|
||||
scenarios as events with more than 999 frames are rarely
|
||||
captured. However if you have extremely long events and use
|
||||
external applications then you may wish to increase this to
|
||||
|
@ -2728,7 +2729,7 @@ our @options = (
|
|||
it to the ZoneMinder development team. This data will be used to
|
||||
determine things like who and where our customers are, how big their
|
||||
systems are, the underlying hardware and operating system, etc.
|
||||
This is being done for the sole purpoase of creating a better
|
||||
This is being done for the sole purpose of creating a better
|
||||
product for our target audience. This script is intended to be
|
||||
completely transparent to the end user, and can be disabled from
|
||||
the web console under Options. For more details on what information
|
||||
|
@ -2752,7 +2753,7 @@ our @options = (
|
|||
{
|
||||
name => 'ZM_TELEMETRY_LAST_UPLOAD',
|
||||
default => '',
|
||||
description => 'When the last ZoneMinder telemetry upload ocurred',
|
||||
description => 'When the last ZoneMinder telemetry upload occurred',
|
||||
help => '',
|
||||
type => $types{integer},
|
||||
readonly => 1,
|
||||
|
@ -2810,7 +2811,7 @@ our @options = (
|
|||
default => 'javascript',
|
||||
description => 'What method windows should use to refresh themselves',
|
||||
help => q`
|
||||
Many windows in Javascript need to refresh themselves to keep
|
||||
Many windows in ZoneMinder need to refresh themselves to keep
|
||||
their information current. This option determines what method
|
||||
they should use to do this. Choosing 'javascript' means that
|
||||
each window will have a short JavaScript statement in with a
|
||||
|
@ -2944,7 +2945,7 @@ our @options = (
|
|||
some indication of the type of content. However this is not a
|
||||
standard part of HTML. The official method is to use OBJECT
|
||||
tags which are able to give more information allowing the
|
||||
correct media viewers etc to be loaded. However these are less
|
||||
correct media viewers etc. to be loaded. However these are less
|
||||
widely supported and content may be specifically tailored to a
|
||||
particular platform or player. This option controls whether
|
||||
media content is enclosed in EMBED tags only or whether, where
|
||||
|
@ -2968,7 +2969,7 @@ our @options = (
|
|||
browsers. When this condition occurs, ZoneMinder will write a
|
||||
warning to the log file. To get around this, one can install a browser
|
||||
plugin or extension to ignore X-Frame headers, and then the page will
|
||||
display properly. Once the plugin or extenstion has ben installed,
|
||||
display properly. Once the plugin or extension has ben installed,
|
||||
the end user may choose to turn this warning off.
|
||||
`,
|
||||
type => $types{boolean},
|
||||
|
@ -3082,7 +3083,7 @@ our @options = (
|
|||
description => 'How often (in seconds) the event listing is refreshed in the watch window',
|
||||
help => q`
|
||||
The monitor window is actually made from several frames. The
|
||||
lower framme contains a listing of the last few events for easy
|
||||
lower frame contains a listing of the last few events for easy
|
||||
access. This option determines how often this is refreshed.
|
||||
`,
|
||||
type => $types{integer},
|
||||
|
@ -3212,12 +3213,12 @@ our @options = (
|
|||
{
|
||||
name => 'ZM_WEB_H_SCALE_THUMBS',
|
||||
default => 'no',
|
||||
description => 'Scale thumbnails in events, bandwidth versus cpu in rescaling',
|
||||
description => 'Scale thumbnails in events, bandwidth versus CPU in rescaling',
|
||||
help => q`
|
||||
If unset, this option sends the whole image to the browser
|
||||
which resizes it in the window. If set the image is scaled down
|
||||
on the server before sending a reduced size image to the
|
||||
browser to conserve bandwidth at the cost of cpu on the server.
|
||||
browser to conserve bandwidth at the cost of CPU on the server.
|
||||
Note that ZM can only perform the resizing if the appropriate
|
||||
PHP graphics functionality is installed. This is usually
|
||||
available in the php-gd package.
|
||||
|
@ -3251,7 +3252,7 @@ our @options = (
|
|||
help => q`
|
||||
When viewing events an event navigation panel and progress bar
|
||||
is shown below the event itself. This allows you to jump to
|
||||
specific points in the event, but can can also dynamically
|
||||
specific points in the event, but can also dynamically
|
||||
update to display the current progress of the event replay
|
||||
itself. This progress is calculated from the actual event
|
||||
duration and is not directly linked to the replay itself, so on
|
||||
|
@ -3355,7 +3356,7 @@ our @options = (
|
|||
description => 'How often (in seconds) the event listing is refreshed in the watch window',
|
||||
help => q`
|
||||
The monitor window is actually made from several frames. The
|
||||
lower framme contains a listing of the last few events for easy
|
||||
lower frame contains a listing of the last few events for easy
|
||||
access. This option determines how often this is refreshed.
|
||||
`,
|
||||
type => $types{integer},
|
||||
|
@ -3485,12 +3486,12 @@ our @options = (
|
|||
{
|
||||
name => 'ZM_WEB_M_SCALE_THUMBS',
|
||||
default => 'yes',
|
||||
description => 'Scale thumbnails in events, bandwidth versus cpu in rescaling',
|
||||
description => 'Scale thumbnails in events, bandwidth versus CPU in rescaling',
|
||||
help => q`
|
||||
If unset, this option sends the whole image to the browser
|
||||
which resizes it in the window. If set the image is scaled down
|
||||
on the server before sending a reduced size image to the
|
||||
browser to conserve bandwidth at the cost of cpu on the server.
|
||||
browser to conserve bandwidth at the cost of CPU on the server.
|
||||
Note that ZM can only perform the resizing if the appropriate
|
||||
PHP graphics functionality is installed. This is usually
|
||||
available in the php-gd package.
|
||||
|
@ -3524,7 +3525,7 @@ our @options = (
|
|||
help => q`
|
||||
When viewing events an event navigation panel and progress bar
|
||||
is shown below the event itself. This allows you to jump to
|
||||
specific points in the event, but can can also dynamically
|
||||
specific points in the event, but can also dynamically
|
||||
update to display the current progress of the event replay
|
||||
itself. This progress is calculated from the actual event
|
||||
duration and is not directly linked to the replay itself, so on
|
||||
|
@ -3628,7 +3629,7 @@ our @options = (
|
|||
description => 'How often (in seconds) the event listing is refreshed in the watch window',
|
||||
help => q`
|
||||
The monitor window is actually made from several frames. The
|
||||
lower framme contains a listing of the last few events for easy
|
||||
lower frame contains a listing of the last few events for easy
|
||||
access. This option determines how often this is refreshed.
|
||||
`,
|
||||
type => $types{integer},
|
||||
|
@ -3757,12 +3758,12 @@ our @options = (
|
|||
{
|
||||
name => 'ZM_WEB_L_SCALE_THUMBS',
|
||||
default => 'yes',
|
||||
description => 'Scale thumbnails in events, bandwidth versus cpu in rescaling',
|
||||
description => 'Scale thumbnails in events, bandwidth versus CPU in rescaling',
|
||||
help => q`
|
||||
If unset, this option sends the whole image to the browser
|
||||
which resizes it in the window. If set the image is scaled down
|
||||
on the server before sending a reduced size image to the
|
||||
browser to conserve bandwidth at the cost of cpu on the server.
|
||||
browser to conserve bandwidth at the cost of CPU on the server.
|
||||
Note that ZM can only perform the resizing if the appropriate
|
||||
PHP graphics functionality is installed. This is usually
|
||||
available in the php-gd package.
|
||||
|
@ -3796,7 +3797,7 @@ our @options = (
|
|||
help => q`
|
||||
When viewing events an event navigation panel and progress bar
|
||||
is shown below the event itself. This allows you to jump to
|
||||
specific points in the event, but can can also dynamically
|
||||
specific points in the event, but can also dynamically
|
||||
update to display the current progress of the event replay
|
||||
itself. This progress is calculated from the actual event
|
||||
duration and is not directly linked to the replay itself, so on
|
||||
|
@ -3988,7 +3989,7 @@ saveConfigToDB();
|
|||
|
||||
The ZoneMinder:ConfigData module contains the master definition of the
|
||||
ZoneMinder configuration options as well as helper methods. This module is
|
||||
intended for specialist confguration management and would not normally be
|
||||
intended for specialist configuration management and would not normally be
|
||||
used by end users.
|
||||
|
||||
The configuration held in this module, which was previously in zmconfig.pl,
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
// a formatting string. If the dynamic element is a number you will usually need to use a variable
|
||||
// replacement also as described below.
|
||||
// c) Variable replacements are used in conjunction with complex replacements and involve the generation
|
||||
// of a singular or plural noun depending on the number passed into the zmVlang function. See the
|
||||
// of a singular or plural noun depending on the number passed into the zmVlang function. See the
|
||||
// the zmVlang section below for a further description of this.
|
||||
// d) Optional strings which can be used to replace the prompts and/or help text for the Options section
|
||||
// of the web interface. These are not listed below as they are quite large and held in the database
|
||||
|
@ -40,7 +40,7 @@
|
|||
// quite easily from the Config table in the database if necessary.
|
||||
// 3. The tokens listed below are not used to build up phrases or sentences from single words. Therefore
|
||||
// you can safely assume that a single word token will only be used in that context.
|
||||
// 4. In new language files, or if you are changing only a few words or phrases it makes sense from a
|
||||
// 4. In new language files, or if you are changing only a few words or phrases it makes sense from a
|
||||
// maintenance point of view to include the original language file and override the old definitions rather
|
||||
// than copy all the language tokens across. To do this change the line below to whatever your base language
|
||||
// is and uncomment it.
|
||||
|
@ -57,10 +57,10 @@
|
|||
// If you do need to change your locale, be aware that the format of this function
|
||||
// is subtlely different in versions of PHP before and after 4.3.0, see
|
||||
// http://uk2.php.net/manual/en/function.setlocale.php for details.
|
||||
// Also be aware that changing the whole locale may affect some floating point or decimal
|
||||
// Also be aware that changing the whole locale may affect some floating point or decimal
|
||||
// arithmetic in the database, if this is the case change only the individual locale areas
|
||||
// that don't affect this rather than all at once. See the examples below.
|
||||
// Finally, depending on your setup, PHP may not enjoy have multiple locales in a shared
|
||||
// Finally, depending on your setup, PHP may not enjoy have multiple locales in a shared
|
||||
// threaded environment, if you get funny errors it may be this.
|
||||
//
|
||||
// Examples
|
||||
|
@ -768,7 +768,7 @@ $SLANG = array(
|
|||
'Update' => 'Update',
|
||||
'Upload' => 'Upload',
|
||||
'Updated' => 'Updated',
|
||||
'UsedPlugins' => 'Used Plugins',
|
||||
'UsedPlugins' => 'Used Plugins',
|
||||
'UseFilterExprsPost' => ' filter expressions', // This is used at the end of the phrase 'use N filter expressions'
|
||||
'UseFilterExprsPre' => 'Use ', // This is used at the beginning of the phrase 'use N filter expressions'
|
||||
'UseFilter' => 'Use Filter',
|
||||
|
@ -847,7 +847,7 @@ $CLANG = array(
|
|||
'VersionMismatch' => 'Version mismatch, system is version %1$s, database is %2$s.',
|
||||
);
|
||||
|
||||
// The next section allows you to describe a series of word ending and counts used to
|
||||
// The next section allows you to describe a series of word ending and counts used to
|
||||
// generate the correctly conjugated forms of words depending on a count that is associated
|
||||
// with that word.
|
||||
// This intended to allow phrases such a '0 potatoes', '1 potato', '2 potatoes' etc to
|
||||
|
@ -888,7 +888,7 @@ $VLANG = array(
|
|||
// with variable counts. This is used to conjugate the Vlang arrays above with a number passed
|
||||
// in to generate the correct noun form.
|
||||
//
|
||||
// In languages such as English this is fairly simple
|
||||
// In languages such as English this is fairly simple
|
||||
// Note this still has to be used with printf etc to get the right formatting
|
||||
function zmVlang( $langVarArray, $count )
|
||||
{
|
||||
|
@ -906,9 +906,9 @@ function zmVlang( $langVarArray, $count )
|
|||
// This is an version that could be used in the Russian example above
|
||||
// The rules are that the first word form is used if the count ends in
|
||||
// 0, 5-9 or 11-19. The second form is used then the count ends in 1
|
||||
// (not including 11 as above) and the third form is used when the
|
||||
// (not including 11 as above) and the third form is used when the
|
||||
// count ends in 2-4, again excluding any values ending in 12-14.
|
||||
//
|
||||
//
|
||||
// function zmVlang( $langVarArray, $count )
|
||||
// {
|
||||
// $secondlastdigit = substr( $count, -2, 1 );
|
||||
|
@ -916,7 +916,7 @@ function zmVlang( $langVarArray, $count )
|
|||
// // or
|
||||
// // $secondlastdigit = ($count/10)%10;
|
||||
// // $lastdigit = $count%10;
|
||||
//
|
||||
//
|
||||
// // Get rid of the special cases first, the teens
|
||||
// if ( $secondlastdigit == 1 && $lastdigit != 0 )
|
||||
// {
|
||||
|
@ -950,7 +950,7 @@ function zmVlang( $langVarArray, $count )
|
|||
// die( 'Error, unable to correlate variable language string' );
|
||||
// }
|
||||
|
||||
// This is an example of how the function is used in the code which you can uncomment and
|
||||
// This is an example of how the function is used in the code which you can uncomment and
|
||||
// use to test your custom function.
|
||||
//$monitors = array();
|
||||
//$monitors[] = 1; // Choose any number
|
||||
|
@ -967,17 +967,17 @@ $OLANG = array(
|
|||
"\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
|
||||
"\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
|
||||
),
|
||||
'OPTIONS_RTSPTrans' => array(
|
||||
'OPTIONS_RTSPTrans' => array(
|
||||
'Help' => "This sets the RTSP Transport Protocol for FFmpeg.~~ ".
|
||||
"TCP - Use TCP (interleaving within the RTSP control channel) as transport protocol.~~".
|
||||
"UDP - Use UDP as transport protocol. Higher resolution cameras have experienced some 'smearing' while using UDP, if so try TCP~~".
|
||||
"UDP Multicast - Use UDP Multicast as transport protocol~~".
|
||||
"HTTP - Use HTTP tunneling as transport protocol, which is useful for passing proxies.~~"
|
||||
"TCP - Use TCP (interleaving within the RTSP control channel) as transport protocol.~~".
|
||||
"UDP - Use UDP as transport protocol. Higher resolution cameras have experienced some 'smearing' while using UDP, if so try TCP~~".
|
||||
"UDP Multicast - Use UDP Multicast as transport protocol~~".
|
||||
"HTTP - Use HTTP tunneling as transport protocol, which is useful for passing proxies.~~"
|
||||
),
|
||||
'OPTIONS_LIBVLC' => array(
|
||||
'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
|
||||
"Examples (do not enter quotes)~~~~".
|
||||
"\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~".
|
||||
"\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~".
|
||||
"\"--verbose=2\" Set verbosity of libVLC"
|
||||
),
|
||||
'OPTIONS_EXIF' => array(
|
||||
|
@ -986,7 +986,7 @@ $OLANG = array(
|
|||
'OPTIONS_RTSPDESCRIBE' => array(
|
||||
'Help' => "Sometimes, during the initial RTSP handshake, the camera will send an updated media URL. ".
|
||||
"Enable this option to tell ZoneMinder to use this URL. Disable this option to ignore the ".
|
||||
"value from the camera and use the value as entered in the monitor configuration~~~~".
|
||||
"value from the camera and use the value as entered in the monitor configuration~~~~".
|
||||
"Generally this should be enabled. However, there are cases where the camera can get its".
|
||||
"own URL incorrect, such as when the camera is streaming through a firewall"),
|
||||
'OPTIONS_MAXFPS' => array(
|
||||
|
@ -994,12 +994,12 @@ $OLANG = array(
|
|||
"Failure to adhere to these limitations will cause a delay in live video, irregular frame skipping, ".
|
||||
"and missed events~~".
|
||||
"For streaming IP cameras, do not use this field to reduce the frame rate. Set the frame rate in the".
|
||||
" camera, instead. You can, however, use a value that is slightly higher than the frame rate in the camera. ".
|
||||
"In this case, this helps keep the cpu from being overtaxed in the event of a network problem.~~".
|
||||
" camera, instead. You can, however, use a value that is slightly higher than the frame rate in the camera. ".
|
||||
"In this case, this helps keep the cpu from being overtaxed in the event of a network problem.~~".
|
||||
"Some, mostly older, IP cameras support snapshot mode. In this case ZoneMinder is actively polling the camera ".
|
||||
"for new images. In this case, it is safe to use the field."
|
||||
),
|
||||
|
||||
|
||||
// 'LANG_DEFAULT' => array(
|
||||
// 'Prompt' => "This is a new prompt for this option",
|
||||
// 'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"
|
||||
|
|
|
@ -39,7 +39,7 @@ if ( ! empty($_REQUEST['mid']) ) {
|
|||
$monitor = new ZM\Monitor( $_REQUEST['mid'] );
|
||||
if ( $monitor and ZM_OPT_X10 )
|
||||
$x10Monitor = dbFetchOne('SELECT * FROM TriggersX10 WHERE MonitorId = ?', NULL, array($_REQUEST['mid']));
|
||||
}
|
||||
}
|
||||
if ( ! $monitor ) {
|
||||
|
||||
$nextId = getTableAutoInc('Monitors');
|
||||
|
@ -132,9 +132,9 @@ if ( ! $monitor ) {
|
|||
|
||||
if ( ZM_OPT_X10 && empty($x10Monitor) ) {
|
||||
$x10Monitor = array(
|
||||
'Activation' => '',
|
||||
'AlarmInput' => '',
|
||||
'AlarmOutput' => '',
|
||||
'Activation' => '',
|
||||
'AlarmInput' => '',
|
||||
'AlarmOutput' => '',
|
||||
);
|
||||
}
|
||||
|
||||
|
@ -166,7 +166,7 @@ if ( $monitor->AlarmMaxFPS() == '0.00' )
|
|||
if ( !empty($_REQUEST['preset']) ) {
|
||||
$preset = dbFetchOne( 'SELECT Type, Device, Channel, Format, Protocol, Method, Host, Port, Path, Width, Height, Palette, MaxFPS, Controllable, ControlId, ControlDevice, ControlAddress, DefaultRate, DefaultScale FROM MonitorPresets WHERE Id = ?', NULL, array($_REQUEST['preset']) );
|
||||
foreach ( $preset as $name=>$value ) {
|
||||
# Does isset handle NULL's? I don't think this code is correct.
|
||||
# Does isset handle NULL's? I don't think this code is correct.
|
||||
if ( isset($value) ) {
|
||||
$monitor->$name = $value;
|
||||
}
|
||||
|
@ -176,7 +176,7 @@ if ( !empty($_REQUEST['probe']) ) {
|
|||
$probe = json_decode(base64_decode($_REQUEST['probe']));
|
||||
foreach ( $probe as $name=>$value ) {
|
||||
if ( isset($value) ) {
|
||||
# Does isset handle NULL's? I don't think this code is correct.
|
||||
# Does isset handle NULL's? I don't think this code is correct.
|
||||
$monitor->$name = urldecode($value);
|
||||
}
|
||||
}
|
||||
|
@ -683,7 +683,7 @@ switch ( $tab ) {
|
|||
?>
|
||||
<tr class="Name"><td><?php echo translate('Name') ?></td><td><input type="text" name="newMonitor[Name]" value="<?php echo validHtmlStr($monitor->Name()) ?>" /></td></tr>
|
||||
<tr><td><?php echo translate('Server') ?></td><td>
|
||||
<?php
|
||||
<?php
|
||||
$servers = array(''=>'None','auto'=>'Auto');
|
||||
foreach ( ZM\Server::find(NULL, array('order'=>'lower(Name)')) as $Server ) {
|
||||
$servers[$Server->Id()] = $Server->Name();
|
||||
|
@ -763,7 +763,7 @@ echo htmlOptions(ZM\Group::get_dropdown_options( ), $monitor->GroupIds() );
|
|||
<td><?php echo translate('RefImageBlendPct') ?></td>
|
||||
<td><select name="newMonitor[RefBlendPerc]"><?php foreach ( $fastblendopts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $monitor->RefBlendPerc() ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<tr>
|
||||
<td><?php echo translate('AlarmRefImageBlendPct') ?></td>
|
||||
<td>
|
||||
<select name="newMonitor[AlarmRefBlendPerc]">
|
||||
|
@ -840,7 +840,7 @@ echo htmlOptions(ZM\Group::get_dropdown_options( ), $monitor->GroupIds() );
|
|||
</td></tr>
|
||||
<tr><td><?php echo translate('V4LCapturesPerFrame') ?></td><td><input type="number" name="newMonitor[V4LCapturesPerFrame]" value="<?php echo validHtmlStr($monitor->V4LCapturesPerFrame()); ?>"/></td></tr>
|
||||
<?php
|
||||
|
||||
|
||||
} else if ( $monitor->Type() == 'NVSocket' ) {
|
||||
include('_monitor_source_nvsocket.php');
|
||||
} else if ( $monitor->Type() == 'Remote' ) {
|
||||
|
@ -894,10 +894,10 @@ if ( $monitor->Type() != 'NVSocket' && $monitor->Type() != 'WebSite' ) {
|
|||
</td></tr>
|
||||
<tr><td><?php echo translate('CaptureWidth') ?> (<?php echo translate('Pixels') ?>)</td><td><input type="text" name="newMonitor[Width]" value="<?php echo validHtmlStr($monitor->Width()) ?>" size="4" onkeyup="updateMonitorDimensions(this);"/></td></tr>
|
||||
<tr><td><?php echo translate('CaptureHeight') ?> (<?php echo translate('Pixels') ?>)</td><td><input type="text" name="newMonitor[Height]" value="<?php echo validHtmlStr($monitor->Height()) ?>" size="4" onkeyup="updateMonitorDimensions(this);"/></td></tr>
|
||||
<tr><td><?php echo translate('PreserveAspect') ?></td><td><input type="checkbox" name="preserveAspectRatio" value="1"/></td></tr>
|
||||
<tr><td><?php echo translate('PreserveAspect') ?></td><td><input type="checkbox" name="preserveAspectRatio" value="1"/></td></tr>
|
||||
<tr><td><?php echo translate('Orientation') ?></td><td><?php echo htmlselect( 'newMonitor[Orientation]', $orientations, $monitor->Orientation() );?></td></tr>
|
||||
<?php
|
||||
}
|
||||
}
|
||||
if ( $monitor->Type() == 'Local' ) {
|
||||
?>
|
||||
<tr><td><?php echo translate('Deinterlacing') ?></td><td><select name="newMonitor[Deinterlacing]"><?php foreach ( $deinterlaceopts_v4l2 as $name => $value ) { ?><option value="<?php echo validHtmlStr($value); ?>"<?php if ( $value == $monitor->Deinterlacing()) { ?> selected="selected"<?php } ?>><?php echo validHtmlStr($name); ?></option><?php } ?></select></td></tr>
|
||||
|
@ -920,7 +920,7 @@ if ( $monitor->Type() == 'Local' ) {
|
|||
?>
|
||||
<tr><td><?php echo translate('SaveJPEGs') ?></td><td><select name="newMonitor[SaveJPEGs]"><?php foreach ( $savejpegopts as $name => $value ) { ?><option value="<?php echo validHtmlStr($value); ?>"<?php if ( $value == $monitor->SaveJPEGs() ) { ?> selected="selected"<?php } ?>><?php echo validHtmlStr($name); ?></option><?php } ?></select></td></tr>
|
||||
<tr><td><?php echo translate('VideoWriter') ?></td><td>
|
||||
<?php
|
||||
<?php
|
||||
$videowriteropts = array(
|
||||
0 => 'Disabled',
|
||||
);
|
||||
|
|
Loading…
Reference in New Issue