ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/manupap1/ZoneMinder into plugin_support 

Conflicts:
	web/lang/et_ee.php
This commit is contained in:
Emmanuel Papin 2015-01-10 17:47:30 +01:00
parent 72d1581f44 d787ad3f7a
commit b5ab290e78
18 changed files with 151 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/zmaudit.pl.in
View File

@ -69,6 +69,7 @@ delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
my $report = 0;
my $interactive = 0;
my $continuous = 0;
my $version;
sub usage
{
@ -78,6 +79,7 @@ Parameters are :-
-r, --report - Just report don't actually do anything
-i, --interactive - Ask before applying any changes
-c, --continuous - Run continuously
-v, --version - Print the installed version of ZoneMinder
");
exit( -1 );
}
@ -89,14 +91,18 @@ sub deleteSwapImage();
logInit();
logSetSignal();
if ( !GetOptions( 'report'=>\$report, 'interactive'=>\$interactive, 'continuous'=>\$continuous ) )
if ( !GetOptions( report=>\$report, interactive=>\$interactive, continuous=>\$continuous, version=>\$version ) )
{
usage();
}
if ( $version ) {
print( ZoneMinder::Base::ZM_VERSION . "\n");
exit(0);
}
if ( ($report + $interactive + $continuous) > 1 )
{
print( STDERR "Error, only option may be specified\n" );
print( STDERR "Error, only one option may be specified\n" );
usage();
}

7
scripts/zmcamtool.pl.in
View File

@ -55,15 +55,20 @@ my $noregex = 0;
my $sqlfile = '';
my $dbUser = $Config{ZM_DB_USER};
my $dbPass = $Config{ZM_DB_PASS};
my $version = 0;
# Process commandline parameters with getopt long
if ( !GetOptions( 'export'=>\$export, 'import'=>\$import, 'overwrite'=>\$overwrite, 'help'=>\$help, 'topreset'=>\$topreset, 'noregex'=>\$noregex, 'user:s'=>\$dbUser, 'pass:s'=>\$dbPass ) ) {
if ( !GetOptions( 'export'=>\$export, 'import'=>\$import, 'overwrite'=>\$overwrite, 'help'=>\$help, 'topreset'=>\$topreset, 'noregex'=>\$noregex, 'user:s'=>\$dbUser, 'pass:s'=>\$dbPass, 'version'=>\$version ) ) {
Usage();
}
$Config{ZM_DB_USER} = $dbUser;
$Config{ZM_DB_PASS} = $dbPass;
if ( $version ) {
print( ZoneMinder::Base::ZM_VERSION . "\n");
exit(0);
}
# Check to make sure commandline params make sense
if ( ((!$help) && ($import + $export + $topreset) != 1 )) {
print( STDERR qq/Please give only one of the following: "import", "export", or "topreset".\n/ );

5
scripts/zmcontrol.pl.in
View File

@ -192,8 +192,11 @@ if ( !$server_up )
#Debug( Dumper( $params ) );
my $command = $params->{command};
$control->$command( $params );
close( CLIENT );
if ( $command eq 'quit' ) {
last;
}
$control->$command( $params );
}
else
{

8
scripts/zmdc.pl.in
View File

@ -78,7 +78,7 @@ sub Usage
Usage: zmdc.pl <command> [daemon [options]]
Parameters are :-
<command> - One of 'startup|shutdown|status|check|logrot' or
'start|stop|restart|reload'.
'start|stop|restart|reload|version'.
[daemon [options]] - Daemon name and options, required for second group of commands
");
exit( -1 );
@ -90,7 +90,11 @@ if( !$command )
print( STDERR "No command given\n" );
Usage();
}
my $needs_daemon = $command !~ /(?:startup|shutdown|status|check|logrot)/;
if ( $command eq 'version' ) {
print ZoneMinder::Base::ZM_VERSION."\n";
exit( 0 );
}
my $needs_daemon = $command !~ /(?:startup|shutdown|status|check|logrot|version)/;
my $daemon = shift( @ARGV );
if( $needs_daemon && !$daemon )
{

9
scripts/zmfilter.pl.in
View File

@ -115,11 +115,12 @@ delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
my $delay = $Config{ZM_FILTER_EXECUTE_INTERVAL};
my $event_id = 0;
my $filter_parm = "";
my $version = 0;
sub Usage
{
print( "
Usage: zmfilter.pl [-f <filter name>,--filter=<filter name>]
Usage: zmfilter.pl [-f <filter name>,--filter=<filter name>] | -v, --version
Parameters are :-
-f<filter name>, --filter=<filter name> - The name of a specific filter to run
");
@ -158,10 +159,14 @@ sub DateTimeToSQL
return( strftime( "%Y-%m-%d %H:%M:%S", localtime( $dt_val ) ) );
}
if ( !GetOptions( 'filter=s'=>\$filter_parm ) )
if ( !GetOptions( 'filter=s'=>\$filter_parm, version=>\$version ) )
{
Usage();
}
if ( $version ) {
print ZoneMinder::Base::ZM_VERSION . "\n";
exit(0);
}
if ( ! EVENT_PATH ) {
Error( "No event path defined. Config was $Config{ZM_DIR_EVENTS}\n" );

12
scripts/zmpkg.pl.in
View File

@ -47,15 +47,20 @@ delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
logInit();
my $command = $ARGV[0];
if ( $command eq 'version' ) {
print ZoneMinder::Base::ZM_VERSION . "\n";
exit(0);
}
my $state;
my $dbh = zmDbConnect();
my $dbh;
if ( !$command || $command !~ /^(?:start|stop|restart|status|logrot)$/ )
if ( !$command || $command !~ /^(?:start|stop|restart|status|logrot|version)$/ )
{
if ( $command )
{
$dbh = zmDbConnect();
# Check to see if it's a valid run state
my $sql = 'select * from States where Name = ?';
my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
@ -78,10 +83,11 @@ if ( !$command || $command !~ /^(?:start|stop|restart|status|logrot)$/ )
}
if ( !$command )
{
print( "Usage: zmpkg.pl <start|stop|restart|status|logrot|'state'>\n" );
print( "Usage: zmpkg.pl <start|stop|restart|status|logrot|'state'|version>\n" );
exit( -1 );
}
}
$dbh = zmDbConnect() if ! $dbh;
# Move to the right place
chdir( $Config{ZM_PATH_WEB} ) or Fatal( "Can't chdir to '".$Config{ZM_PATH_WEB}."': $!" );

4
scripts/zmsystemctl.pl.in
View File

@ -35,10 +35,10 @@ use ZoneMinder::Logger qw(:all);
my $command = $ARGV[0];
if ( (scalar(@ARGV) == 1) && ($command =~ /^(start|stop|restart)$/ )) {
if ( (scalar(@ARGV) == 1) && ($command =~ /^(start|stop|restart|version)$/ )) {
$command = $1;
} else {
die(" USAGE: zmsystemctl.pl <start|stop|restart>\n");
die(" USAGE: zmsystemctl.pl <start|stop|restart|version>\n");
}
my $path = qx(which systemctl);

9
scripts/zmvideo.pl.in
View File

@ -55,6 +55,7 @@ my $scale = '';
my $fps = '';
my $size = '';
my $overwrite = 0;
my $version = 0;
my @formats = split( /\s+/, $Config{ZM_FFMPEG_FORMATS} );
for ( my $i = 0; $i < @formats; $i++ )
@ -77,15 +78,21 @@ Parameters are :-
-F<fps>, --fps=<fps> - Absolute frame rate, in frames per second
-S<size>, --size=<size> - Absolute video size, WxH or other specification supported by ffmpeg
-o, --overwrite - Whether to overwrite an existing file, off by default.
-v, --version - Outputs the currently installed version of ZoneMinder
");
exit( -1 );
}
if ( !GetOptions( 'event=i'=>\$event_id, 'format|f=s'=>\$format, 'rate|r=f'=>\$rate, 'scale|s=f'=>\$scale, 'fps|F=f'=>\$fps, 'size|S=s'=>\$size, 'overwrite'=>\$overwrite ) )
if ( !GetOptions( 'event=i'=>\$event_id, 'format|f=s'=>\$format, 'rate|r=f'=>\$rate, 'scale|s=f'=>\$scale, 'fps|F=f'=>\$fps, 'size|S=s'=>\$size, 'overwrite'=>\$overwrite, version=>\$version ) )
{
Usage();
}
if ( $version ) {
print ZoneMinder::Base::ZM_VERSION . "\n";
exit(0);
}
if ( !$event_id || $event_id < 0 )
{
print( STDERR "Please give a valid event id\n" );

8
scripts/zmx10.pl.in
View File

@ -63,6 +63,7 @@ Usage: zmx10.pl -c <command>,--command=<command> [-u <unit code>,--unit-code=<un
Parameters are :-
-c <command>, --command=<command> - Command to issue, one of 'on','off','dim','bright','status','shutdown'
-u <unit code>, --unit-code=<unit code> - Unit code to act on required for all commands except 'status' (optional) and 'shutdown'
-v, --verison - Pirnts the currently installed version of ZoneMinder
");
exit( -1 );
}
@ -72,11 +73,16 @@ logSetSignal();
my $command;
my $unit_code;
my $version;
if ( !GetOptions( 'command=s'=>\$command, 'unit-code=i'=>\$unit_code ) )
if ( !GetOptions( 'command=s'=>\$command, 'unit-code=i'=>\$unit_code, version=>\$version ) )
{
Usage();
}
if ( $version ) {
print ZoneMinder::Base::ZM_VERSION;
exit(0);
}
die( "No command given" ) unless( $command );
die( "No unit code given" ) unless( $unit_code || ($command =~ /(?:start|status|shutdown)/) );

7
src/zma.cpp
View File

@ -31,6 +31,7 @@ void Usage()
fprintf( stderr, "Options:\n" );
fprintf( stderr, " -m, --monitor <monitor_id> : Specify which monitor to use\n" );
fprintf( stderr, " -h, --help : This screen\n" );
fprintf( stderr, " -v, --version : Report the installed version of ZoneMinder\n" );
exit( 0 );
}
@ -45,6 +46,7 @@ int main( int argc, char *argv[] )
static struct option long_options[] = {
{"monitor", 1, 0, 'm'},
{"help", 0, 0, 'h'},
{"version", 0, 0, 'v'},
{0, 0, 0, 0}
};
@ -52,7 +54,7 @@ int main( int argc, char *argv[] )
{
int option_index = 0;
int c = getopt_long (argc, argv, "m:h", long_options, &option_index);
int c = getopt_long (argc, argv, "m:h:v", long_options, &option_index);
if (c == -1)
{
break;
@ -67,6 +69,9 @@ int main( int argc, char *argv[] )
case '?':
Usage();
break;
case 'v':
cout << ZM_VERSION << "\n";
exit(0);
default:
//fprintf( stderr, "?? getopt returned character code 0%o ??\n", c );
break;

7
src/zmc.cpp
View File

@ -45,6 +45,7 @@ void Usage()
fprintf( stderr, " -f, --file <file_path> : For local images, jpg file to access.\n" );
fprintf( stderr, " -m, --monitor <monitor_id> : For sources associated with a single monitor\n" );
fprintf( stderr, " -h, --help : This screen\n" );
fprintf( stderr, " -v, --version : Report the installed version of ZoneMinder\n" );
exit( 0 );
}
@ -71,6 +72,7 @@ int main( int argc, char *argv[] )
{"file", 1, 0, 'f'},
{"monitor", 1, 0, 'm'},
{"help", 0, 0, 'h'},
{"version", 0, 0, 'v'},
{0, 0, 0, 0}
};
@ -78,7 +80,7 @@ int main( int argc, char *argv[] )
{
int option_index = 0;
int c = getopt_long (argc, argv, "d:H:P:p:f:m:h", long_options, &option_index);
int c = getopt_long (argc, argv, "d:H:P:p:f:m:h:v", long_options, &option_index);
if (c == -1)
{
break;
@ -108,6 +110,9 @@ int main( int argc, char *argv[] )
case '?':
Usage();
break;
case 'v':
cout << ZM_VERSION << "\n";
exit(0);
default:
//fprintf( stderr, "?? getopt returned character code 0%o ??\n", c );
break;

7
src/zmf.cpp
View File

@ -99,6 +99,7 @@ void Usage()
fprintf( stderr, "Options:\n" );
fprintf( stderr, " -m, --monitor <monitor_id> : Specify which monitor to use\n" );
fprintf( stderr, " -h, --help : This screen\n" );
fprintf( stderr, " -v, --version : Report the installed version of ZoneMinder\n" );
exit( 0 );
}
@ -113,6 +114,7 @@ int main( int argc, char *argv[] )
static struct option long_options[] = {
{"monitor", 1, 0, 'm'},
{"help", 0, 0, 'h'},
{"version", 0, 0, 'v'},
{0, 0, 0, 0}
};
@ -120,7 +122,7 @@ int main( int argc, char *argv[] )
{
int option_index = 0;
int c = getopt_long (argc, argv, "m:h", long_options, &option_index);
int c = getopt_long (argc, argv, "m:h:v", long_options, &option_index);
if (c == -1)
{
break;
@ -135,6 +137,9 @@ int main( int argc, char *argv[] )
case '?':
Usage();
break;
case 'v':
cout << ZM_VERSION << "\n";
exit(0);
default:
//fprintf( stderr, "?? getopt returned character code 0%o ??\n", c );
break;

9
src/zmstreamer.cpp
View File

@ -33,7 +33,7 @@
#include "zm_stream.h"
// Possible command-line options
#define OPTIONS "e:o:u:f:s:b:m:d:i:?"
#define OPTIONS "e:o:u:f:s:b:m:d:i:?:h:v"
// Default ZMS values
#define ZMS_DEFAULT_DEBUG 0
@ -87,6 +87,7 @@ int main(int argc, char** argv) {
case 'd':
debug = atoi(optarg);
break;
case 'h':
case 'i':
case '?':
printf("-e <mode> : Specify output mode: mpeg/jpg/zip/single/raw. Default = %s\n", ZMS_DEFAULT_MODE);
@ -97,8 +98,12 @@ int main(int argc, char** argv) {
printf("-b <bitrate in bps> : Specify bitrate. Default = %d\n", ZMS_DEFAULT_BITRATE);
printf("-m <monitor id> : Specify monitor id. Default = %d\n", ZMS_DEFAULT_ID);
printf("-d <debug mode> : 0 = off, 1 = no streaming, 2 = with streaming. Default = 0\n");
printf("-i or -? : This information\n");
printf("-i or -? or -h: This information\n");
printf("-v : This installed version of ZoneMinder\n");
return EXIT_SUCCESS;
case 'v':
cout << ZM_VERSION << "\n";
exit(0);
}
}

39
web/includes/actions.php
View File

@ -175,40 +175,7 @@ if ( !empty($action) )
$monitor = dbFetchOne( "select C.*,M.* from Monitors as M inner join Controls as C on (M.ControlId = C.Id) where M.Id = ?", NULL, array($mid) );
$ctrlCommand = buildControlCommand( $monitor );
if ( $ctrlCommand )
{
$socket = socket_create( AF_UNIX, SOCK_STREAM, 0 );
if ( $socket < 0 )
{
Fatal( "socket_create() failed: ".socket_strerror($socket) );
}
$sockFile = ZM_PATH_SOCKS.'/zmcontrol-'.$monitor['Id'].'.sock';
if ( @socket_connect( $socket, $sockFile ) )
{
$options = array();
foreach ( explode( " ", $ctrlCommand ) as $option )
{
if ( preg_match( '/--([^=]+)(?:=(.+))?/', $option, $matches ) )
{
$options[$matches[1]] = $matches[2]?$matches[2]:1;
}
}
$optionString = jsonEncode( $options );
if ( !socket_write( $socket, $optionString ) )
{
Fatal( "Can't write to control socket: ".socket_strerror(socket_last_error($socket)) );
}
socket_close( $socket );
}
else
{
$ctrlCommand .= " --id=".$monitor['Id'];
// Can't connect so use script
$ctrlOutput = exec( escapeshellcmd( $ctrlCommand ) );
}
}
sendControlCommand( $monitor['Id'], $ctrlCommand );
}
elseif ( $action == "settings" )
{
@ -573,6 +540,10 @@ if ( !empty($action) )
zmcControl( $monitor, "restart" );
zmaControl( $monitor, "start" );
}
if ( $monitor['Controllable'] ) {
require_once( 'control_functions.php' );
sendControlCommand( $mid, 'quit' );
}
//daemonControl( 'restart', 'zmwatch.pl' );
$refreshParent = true;
}

27
web/includes/control_functions.php
View File

@ -963,3 +963,30 @@ function buildControlCommand( $monitor )
$ctrlCommand .= " --command=".$_REQUEST['control'];
return( $ctrlCommand );
}
function sendControlCommand($mid,$command) {
// Either connects to running zmcontrol.pl or runs zmcontrol.pl to send the command.
$socket = socket_create( AF_UNIX, SOCK_STREAM, 0 );
if ( $socket < 0 ) {
Fatal( "socket_create() failed: ".socket_strerror($socket) );
}
$sockFile = ZM_PATH_SOCKS.'/zmcontrol-'.$mid.'.sock';
if ( @socket_connect( $socket, $sockFile ) ) {
$options = array();
foreach ( explode( " ", $command ) as $option ) {
if ( preg_match( '/--([^=]+)(?:=(.+))?/', $option, $matches ) ) {
$options[$matches[1]] = $matches[2]?$matches[2]:1;
}
}
$optionString = jsonEncode( $options );
if ( !socket_write( $socket, $optionString ) ) {
Fatal( "Can't write to control socket: ".socket_strerror(socket_last_error($socket)) );
}
socket_close( $socket );
} else if ( $command != 'quit' ) {
$command .= ' --id='.$mid;
// Can't connect so use script
$ctrlOutput = exec( escapeshellcmd( $command ) );
}
} // end function sendControlCommand( $mid, $command )

6
web/index.php
View File

@ -46,6 +46,9 @@ if ( false )
ob_end_clean();
}
require_once( 'includes/config.php' );
require_once( 'includes/logger.php' );
if ( isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on' )
{
$protocol = 'https';
@ -98,9 +101,6 @@ if ( !isset($_SESSION['css']) || isset($_REQUEST['css']) ) {
setcookie( "zmCSS", $css, time()+3600*24*30*12*10 );
}
require_once( 'includes/config.php' );
require_once( 'includes/logger.php' );
if ( ZM_OPT_USE_AUTH )
if ( isset( $_SESSION['user'] ) )
$user = $_SESSION['user'];

68
web/lang/et_ee.php
View File

@ -51,7 +51,7 @@
// do this by default, uncomment this if required.
//
// Example
header( "Content-Type: text/html; charset=utf-8' );
// header( "Content-Type: text/html; charset=utf-8' );
// You may need to change your locale here if your default one is incorrect for the
// language described in this file, or if you have multiple languages supported.
@ -129,7 +129,7 @@ $SLANG = array(
'BadAlarmFrameCount' => 'Alarmi kaadri hulga ühik peab olema integer. Kas üks või rohkem',
'BadAlarmMaxFPS' => 'Alarmi maksimaalne FPS peab olema positiivne integer või floating point väärtus',
'BadChannel' => 'Kanal peab olema integer, null või rohkem',
'BadColours' => 'Sihtmärgi värv peab olema pandud õige väärtus', // Added - 2011-06-15
'BadColours' => 'Sihtmärgi värv peab olema pandud õige väärtus', // Added - 2011-06-15
'BadDevice' => 'Seadmel peab olema õige väärtus',
'BadFPSReportInterval' => 'FPS raporteerimise intervall puhvri hulk peab olema integer, null või rohkem',
'BadFormat' => 'Formaadiks peab olema pandud õige väärtus',
@ -209,14 +209,14 @@ $SLANG = array(
'CheckMethod' => 'Alarm Check Method',
'ChooseDetectedCamera' => 'Vali tuvastatud kaamera',
'ChooseFilter' => 'Vali Filter',
'ChooseLogFormat' => 'Choose a log format', // Added - 2011-06-17
'ChooseLogSelection' => 'Choose a log selection', // Added - 2011-06-17
'ChooseLogFormat' => 'Choose a log format', // Added - 2011-06-17
'ChooseLogSelection' => 'Choose a log selection', // Added - 2011-06-17
'ChoosePreset' => 'Choose Preset',
'Clear' => 'Clear', // Added - 2011-06-16
'Clear' => 'Clear', // Added - 2011-06-16
'Close' => 'Sule',
'Colour' => 'Värv',
'Command' => 'Käsk',
'Component' => 'Komponent', // Added - 2011-06-16
'Component' => 'Komponent', // Added - 2011-06-16
'Config' => 'Seadistus',
'ConfiguredFor' => 'Seadistatud',
'ConfirmDeleteEvents' => 'Oled sa kindel kustamaks valitud sündmused?',
@ -236,7 +236,7 @@ $SLANG = array(
'Controllable' => 'Controllable',
'Cycle' => 'Cycle',
'CycleWatch' => 'Cycle Watch',
'DateTime' => 'Kuupäev/Aeg', // Added - 2011-06-16
'DateTime' => 'Kuupäev/Aeg', // Added - 2011-06-16
'Day' => 'Päevas',
'Debug' => 'Debug',
'DefaultRate' => 'Default Kiirus',
@ -249,7 +249,7 @@ $SLANG = array(
'Description' => 'Kirjeldus',
'DetectedCameras' => 'Tuvastatud kaamerad',
'Device' => 'Seade',
'DeviceChannel' => 'Seadme Kanal,
'DeviceChannel' => 'Seadme Kanal',
'DeviceFormat' => 'Seadme Formaat',
'DeviceNumber' => 'Seadme Number',
'DevicePath' => 'Seadme Path',
@ -257,8 +257,8 @@ $SLANG = array(
'Dimensions' => 'Mõõdud',
'DisableAlarms' => 'Keela alarmid',
'Disk' => 'Ketas',
'Display' => 'Ekraan', // Added - 2011-03-02
'Displaying' => 'Väljapanek', // Added - 2011-06-16
'Display' => 'Ekraan', // Added - 2011-03-02
'Displaying' => 'Väljapanek', // Added - 2011-06-16
'Donate' => 'Palun Anneta',
'DonateAlready' => 'EI, Ma olen juba annetanud',
'DonateEnticement' => 'Sa oled juba kasutanud ZoneMinderit juba mõnda aega. Nüüd kus sa oled leidnud, et see on kasulik lisa sinu kodule või sinu töökohale. Kuigi ZoneMinder on, jääb alatiseks, vabaks ja avatud lähtekoodiks, siiski selle arendamiseks kulub aega ja raha. Kui sa soovid meid aidata, siis toeta meid tuleviku arendusteks ja uute lisade loomiseks. Palun mõelge annetuse peale. Donating is, of course, optional but very much appreciated and you can donate as much or as little as you like.<br/><br/>If you would like to donate please select the option below or go to http://www.zoneminder.com/donate.html in your browser.<br/><br/>Thank you for using ZoneMinder and don\'t forget to visit the forums on ZoneMinder.com for support or suggestions about how to make your ZoneMinder experience even better.',
@ -266,7 +266,7 @@ $SLANG = array(
'DonateRemindHour' => 'Ei veel, tuleta meelde ühe tunni pärast',
'DonateRemindMonth' => 'Ei veel, tuleta meelde ühe kuu pärast',
'DonateRemindNever' => 'EI, Ma ei taha annetada, Vahet pole',
'DonateRemindWeek' => 'EI veel, tuleta meelde nädala pärast,
'DonateRemindWeek' => 'EI veel, tuleta meelde nädala pärast',
'DonateYes' => 'Jah, Ma soovin annetada',
'Download' => 'Lae alla',
'DuplicateMonitorName' => 'Dubleeri Monitori Nimi',
@ -288,7 +288,7 @@ $SLANG = array(
'Events' => 'Sündmuseid',
'Exclude' => 'Jäta välja',
'Execute' => 'Käivita',
'Export' => 'Eksport,
'Export' => 'Eksport',
'ExportDetails' => 'Ekspordi Sündmuste Detailid',
'ExportFailed' => 'Eksportimine Ebaõnnestus',
'ExportFormat' => 'Ekspordi Faili Formaat',
@ -303,7 +303,7 @@ $SLANG = array(
'ExportVideoFiles' => 'Export Video Files (kui neid on)',
'Exporting' => 'Eksportimine',
'FPS' => 'fps',
'FPSReportInterval' => 'FPS Raporteerimise Intervall,
'FPSReportInterval' => 'FPS Raporteerimise Intervall',
'FTP' => 'FTP',
'Far' => 'Far',
'FastForward' => 'Fast Forward',
@ -380,22 +380,22 @@ $SLANG = array(
'Language' => 'Keel',
'Last' => 'Viimane',
'Layout' => 'Layout',
'Level' => 'Level', // Added - 2011-06-16
'Libvlc' => 'Libvlc',
'Level' => 'Level', // Added - 2011-06-16
'Libvlc' => 'Libvlc',
'LimitResultsPost' => 'results only', // This is used at the end of the phrase 'Limit to first N results only'
'LimitResultsPre' => 'Limit to first', // This is used at the beginning of the phrase 'Limit to first N results only'
'Line' => 'Line', // Added - 2011-06-16
'Line' => 'Line', // Added - 2011-06-16
'LinkedMonitors' => 'Lingitud monitorid',
'List' => 'List',
'Load' => 'Koormus',
'Local' => 'Local',
'Log' => 'Logi', // Added - 2011-06-16
'Log' => 'Logi', // Added - 2011-06-16
'LoggedInAs' => 'Sisse logitud',
'Logging' => 'Logimine', // Added - 2011-06-16
'Logging' => 'Logimine', // Added - 2011-06-16
'LoggingIn' => 'Login sisse',
'Login' => 'Login',
'Logout' => 'Logi välja',
'Logs' => 'Logid', // Added - 2011-06-17
'Logs' => 'Logid', // Added - 2011-06-17
'Low' => 'Madal',
'LowBW' => 'Low&nbsp;B/W',
'Main' => 'Pea',
@ -429,7 +429,7 @@ $SLANG = array(
'MaximumFPS' => 'Maksimaalne FPS',
'Medium' => 'Keskmine',
'MediumBW' => 'Medium&nbsp;B/W',
'Message' => 'Message', // Added - 2011-06-16
'Message' => 'Message', // Added - 2011-06-16
'MinAlarmAreaLtMax' => 'Minimum alarm area should be less than maximum',
'MinAlarmAreaUnset' => 'You must specify the minimum alarm pixel count',
'MinBlobAreaLtMax' => 'Minimum blob area should be less than maximum',
@ -473,7 +473,7 @@ $SLANG = array(
'Monitors' => 'Monitors',
'Montage' => 'Montage',
'Month' => 'Kuus',
'More' => 'Veel', // Added - 2011-06-16
'More' => 'Veel', // Added - 2011-06-16
'Move' => 'Liiguta',
'MtgDefault' => 'Default', // Added 2013.08.15.
'Mtg2widgrd' => '2-pildi ruudustik', // Added 2013.08.15.
@ -539,14 +539,13 @@ $SLANG = array(
'Pause' => 'Pause',
'Phone' => 'Telefon',
'PhoneBW' => 'Phone&nbsp;B/W',
'Pid' => 'PID', // Added - 2011-06-16
'Pid' => 'PID', // Added - 2011-06-16
'PixelDiff' => 'Pixel Diff',
'Pixels' => 'pikslid',
'Play' => 'Play',
'PlayAll' => 'Play Kõike',
'PleaseWait' => 'Palun Oota',
'Plugin' => 'Plugin',
'Plugins' => 'Pluginad',
'Plugins' => 'Pluginad',
'Point' => 'Punkt',
'PostEventImageBuffer' => 'Post Event Image Count',
'PreEventImageBuffer' => 'Pre Event Image Count',
@ -587,7 +586,7 @@ $SLANG = array(
'Rewind' => 'Rewind',
'RotateLeft' => 'Pööra vasakule',
'RotateRight' => 'Pööra paremale',
'RunLocalUpdate' => 'Please run zmupdate.pl to update', // Added - 2011-05-25
'RunLocalUpdate' => 'Please run zmupdate.pl to update', // Added - 2011-05-25
'RunMode' => 'Käimis resiim',
'RunState' => 'Käimis olek',
'Running' => 'Töötab',
@ -599,8 +598,8 @@ $SLANG = array(
'Secs' => 'Secs',
'Sectionlength' => 'Section length',
'Select' => 'Selekteeri',
'SelectFormat' => 'Selekteeri Formaat', // Added - 2011-06-17
'SelectLog' => 'Selekteeri logi', // Added - 2011-06-17
'SelectFormat' => 'Selekteeri Formaat', // Added - 2011-06-17
'SelectLog' => 'Selekteeri logi', // Added - 2011-06-17
'SelectMonitors' => 'Selekteeri Monitorid',
'SelfIntersecting' => 'Polygon edges must not intersect',
'Set' => 'Säti',
@ -611,7 +610,7 @@ $SLANG = array(
'ShowTimeline' => 'Näita Timeline',
'SignalCheckColour' => 'Signaali Kontroll Värv',
'Size' => 'Suurus',
'SkinDescription' => 'Vaheta veebilehe välimus selles arvutis', // Added - 2011-03-02
'SkinDescription' => 'Vaheta veebilehe välimus selles arvutis', // Added - 2011-03-02
'Sleep' => 'Maga',
'SortAsc' => 'Kasvav',
'SortBy' => 'Sorteeri',
@ -643,7 +642,7 @@ $SLANG = array(
'StreamReplayBuffer' => 'Striimi Replay Pildi Puhver',
'Submit' => 'Submit',
'System' => 'Süsteem',
'SystemLog' => 'Süsteemi Logi', // Added - 2011-06-16
'SystemLog' => 'Süsteemi Logi', // Added - 2011-06-16
'Tele' => 'Tele',
'Thumbnail' => 'Thumbnail',
'Tilt' => 'Tilt',
@ -661,7 +660,7 @@ $SLANG = array(
'TimestampLabelY' => 'Timestamp Label Y',
'Today' => 'Täna',
'Tools' => 'Tööriistad',
'Total' => 'Summa', // Added - 2011-06-16
'Total' => 'Summa', // Added - 2011-06-16
'TotalBrScore' => 'Summa<br/>Skoor',
'TrackDelay' => 'Jälgimise Viide',
'TrackMotion' => 'Jälgi Liikumist',
@ -676,9 +675,8 @@ $SLANG = array(
'Update' => 'Uuenda',
'UpdateAvailable' => 'Uuendus ZoneMinder-ile saadaval.',
'UpdateNotNecessary' => 'Uuendus ei ole vajalik.',
'Updated' => 'Uuendatud', // Added - 2011-06-16
'Upload' => 'Üles laadimine', // Added - 2011-08-23
'UsedPlugins' => 'Used Plugins',
'Updated' => 'Uuendatud', // Added - 2011-06-16
'Upload' => 'Üles laadimine', // Added - 2011-08-23
'UseFilter' => 'Kasuta Filtrit',
'UseFilterExprsPost' => '&nbsp;filter&nbsp;expressions', // This is used at the end of the phrase 'use N filter expressions'
'UseFilterExprsPre' => 'Use&nbsp;', // This is used at the beginning of the phrase 'use N filter expressions'
@ -730,7 +728,7 @@ $SLANG = array(
'ZoneMinMaxBlobs' => 'Min/Max Blobs',
'ZoneMinMaxFiltArea' => 'Min/Max Filtered Area',
'ZoneMinMaxPixelThres' => 'Min/Max Pixel Threshold (0-255)',
'ZoneMinderLog' => 'ZoneMinder Log', // Added - 2011-06-17
'ZoneMinderLog' => 'ZoneMinder Log', // Added - 2011-06-17
'ZoneOverloadFrames' => 'Overload Frame Ignore Count',
'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
'Zones' => 'Tsoone',
@ -748,7 +746,7 @@ $CLANG = array(
'MonitorCount' => '%1$s %2$s', // For example '4 Monitors' (from Vlang below)
'MonitorFunction' => 'Monitor %1$s Function',
'RunningRecentVer' => 'You are running the most recent version of ZoneMinder, v%s.',
'VersionMismatch' => 'Version mismatch, system is version %1$s, database is %2$s.', // Added - 2011-05-25
'VersionMismatch' => 'Version mismatch, system is version %1$s, database is %2$s.', // Added - 2011-05-25
);
// The next section allows you to describe a series of word ending and counts used to

2
web/skins/classic/views/monitorprobe.php
View File

@ -292,7 +292,7 @@ unset($output);
$command = "type -p arp";
$result = exec( escapeshellcmd($command), $output, $status );
if ( $status )
Fatal( "Unable determine arp path, status is '$status'" );
Fatal( "Unable to determine path for arp command, type -p arp returned '$status'" );
// Now that we know where arp is, call it using the full path
$command = $output[0]." -a";
unset($output);