FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-05 08:20:23 +00:00
Code Issues Releases Wiki Activity

70_ENIGMA2.pm: verify define parameters port and interval

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@11773 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2016-07-09 13:55:35 +00:00
parent f4f610cf0f
commit d16b8cb24f
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fhem/FHEM/70_ENIGMA2.pm
View File

@ -505,10 +505,12 @@ sub ENIGMA2_Set($@) {
"ENIGMA2 set $name " . $a[1] . " " . $a[2] . " " . $a[3] "ENIGMA2 set $name " . $a[1] . " " . $a[2] . " " . $a[3]
if defined( $a[3] ); if defined( $a[3] );
my $commandKeys = join( " ", sort keys %{ my $commandKeys = join(
ENIGMA2_GetRemotecontrolCommand( " ",
"GetRemotecontrolCommands") sort keys %{
}); ENIGMA2_GetRemotecontrolCommand("GetRemotecontrolCommands")
}
);
if ( !defined( $a[2] ) ) { if ( !defined( $a[2] ) ) {
return "No argument given, choose one of" . $commandKeys; return "No argument given, choose one of" . $commandKeys;
} }
@ -565,14 +567,18 @@ sub ENIGMA2_Set($@) {
if ( $state eq "on" ) { if ( $state eq "on" ) {
my $cname = $a[2]; my $cname = $a[2];
if ( defined( $hash->{helper}{bouquet}{$input}{$cname}{sRef} ) ) { if ( defined( $hash->{helper}{bouquet}{$input}{$cname}{sRef} ) ) {
$result = ENIGMA2_SendCommand( $hash, "zap", $result = ENIGMA2_SendCommand(
$hash, "zap",
"sRef=" "sRef="
. urlEncode( $hash->{helper}{bouquet}{$input}{$cname}{sRef} ) . urlEncode(
$hash->{helper}{bouquet}{$input}{$cname}{sRef}
)
); );
} }
elsif ( $cname =~ m/^(\d+):(.*):$/) { elsif ( $cname =~ m/^(\d+):(.*):$/ ) {
$result = $result =
ENIGMA2_SendCommand( $hash, "zap", "sRef=" . urlEncode($cname) ); ENIGMA2_SendCommand( $hash, "zap",
"sRef=" . urlEncode($cname) );
} }
elsif ( $cname =~ m/^\d+$/ && $cname > 0 && $cname < 10000 ) { elsif ( $cname =~ m/^\d+$/ && $cname > 0 && $cname < 10000 ) {
for ( split( //, $a[2] ) ) { for ( split( //, $a[2] ) ) {
@ -752,10 +758,13 @@ sub ENIGMA2_Define($$) {
# use port 80 if not defined # use port 80 if not defined
my $port = $a[3] || 80; my $port = $a[3] || 80;
return "Port parameter needs to be of type integer" if ( $port !~ /^\d+$/ );
$hash->{helper}{PORT} = $port; $hash->{helper}{PORT} = $port;
# use interval of 45sec if not defined # use interval of 45sec if not defined
my $interval = $a[4] || 45; my $interval = $a[4] || 45;
return "Interval parameter needs to be of type integer"
if ( $interval !~ /^\d+$/ );
$hash->{INTERVAL} = $interval; $hash->{INTERVAL} = $interval;
# set http user if defined # set http user if defined
@ -1362,8 +1371,9 @@ sub ENIGMA2_ReceiveCommand($$$) {
# General readings # General readings
foreach my $reading ( foreach my $reading (
"enigmaversion", "imageversion", "webifversion", "enigmaversion", "imageversion",
"fpversion", "lanmac", "model", "webifversion", "fpversion",
"lanmac", "model",
) )
{ {
$e2reading = "e2" . $reading; $e2reading = "e2" . $reading;