FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-19 18:56:03 +00:00
Code Issues Releases Wiki Activity

FRITZBOX: get luaQuery

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@8823 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
tpoitzsch 2015-06-25 10:46:29 +00:00
parent 9961b7f2c1
commit 396fdd3cec
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fhem/FHEM/72_FRITZBOX.pm
View File

@ -505,13 +505,31 @@ sub FRITZBOX_Get($@)
my ($hash, $name, $cmd, @val) = @_; my ($hash, $name, $cmd, @val) = @_;
my $returnStr; my $returnStr;
if (lc $cmd eq "ringtones") { if ( lc $cmd eq "luaquery" && AttrVal( $name, "allowTR064Command", 0 ) ) {
Log3 $name, 3, "FRITZBOX: get $name $cmd ".join(" ", @val);
return "Wrong number of arguments, usage: get $name luaQuery <query>" if int @val !=1;
$returnStr = "Result of query = '$val[0]'\n";
$returnStr .= "----------------------------------------------------------------------\n";
my $queryStr = "&result=".$val[0];
my $result = FRITZBOX_Web_Query( $hash, $queryStr) ;
my $tmp = Dumper ($result->{result});
$returnStr .= $tmp;
return $returnStr;
}
elsif (lc $cmd eq "ringtones") {
Log3 $name, 3, "FRITZBOX: get $name $cmd ".join(" ", @val); Log3 $name, 3, "FRITZBOX: get $name $cmd ".join(" ", @val);
$returnStr = "Ring tones to use with 'set <name> ring <intern> <duration> <ringTone>'\n"; $returnStr = "Ring tones to use with 'set <name> ring <intern> <duration> <ringTone>'\n";
$returnStr .= "----------------------------------------------------------------------\n"; $returnStr .= "----------------------------------------------------------------------\n";
$returnStr .= join "\n", sort values %ringTone; $returnStr .= join "\n", sort values %ringTone;
return $returnStr; return $returnStr;
} }
elsif ( lc $cmd eq "shellcommand" && int @val && AttrVal( $name, "allowShellCommand", 0 ) ) {
Log3 $name, 3, "FRITZBOX: get $name $cmd ".join(" ", @val);
my $shCmd = join " ", @val;
return FRITZBOX_Exec( $hash, $shCmd );
}
elsif (lc $cmd eq "tr064command" && AttrVal( $name, "allowTR064Command", 0 )) { elsif (lc $cmd eq "tr064command" && AttrVal( $name, "allowTR064Command", 0 )) {
# http://fritz.box:49000/tr64desc.xml # http://fritz.box:49000/tr64desc.xml
#get Fritzbox tr064command DeviceInfo:1 deviceinfo GetInfo #get Fritzbox tr064command DeviceInfo:1 deviceinfo GetInfo
@ -543,14 +561,10 @@ sub FRITZBOX_Get($@)
$returnStr .= $tmp; $returnStr .= $tmp;
return $returnStr; return $returnStr;
} }
elsif ( lc $cmd eq "shellcommand" && int @val && AttrVal( $name, "allowShellCommand", 0 ) ) {
Log3 $name, 3, "FRITZBOX: get $name $cmd ".join(" ", @val);
my $shCmd = join " ", @val;
return FRITZBOX_Exec( $hash, $shCmd );
}
my $list = "ringTones:noArg"; my $list = "ringTones:noArg";
$list .= " tr064Command" if AttrVal( $name, "allowTr064Command", 0 ); $list .= " luaQuery" if AttrVal( $name, "allowTR064Command", 0 );
$list .= " tr064Command" if AttrVal( $name, "allowTR064Command", 0 );
$list .= " shellCommand" if AttrVal( $name, "allowShellCommand", 0 ); $list .= " shellCommand" if AttrVal( $name, "allowShellCommand", 0 );
return "Unknown argument $cmd, choose one of $list"; return "Unknown argument $cmd, choose one of $list";
} # end FRITZBOX_Get } # end FRITZBOX_Get
@ -1108,7 +1122,7 @@ sub FRITZBOX_Readout_Run_Web($)
my $returnStr; my $returnStr;
my $queryStr = "&radio=configd:settings/WEBRADIO/list(Id,Name)"; # Webradio my $queryStr = "&radio=configd:settings/WEBRADIO/list(Name)"; # Webradio
$queryStr .= "&box_dect=dect:settings/enabled"; # DECT Sender $queryStr .= "&box_dect=dect:settings/enabled"; # DECT Sender
$queryStr .= "&handset=dect:settings/Handset/list(User,Manufacturer,Model,FWVersion)"; # DECT Handsets $queryStr .= "&handset=dect:settings/Handset/list(User,Manufacturer,Model,FWVersion)"; # DECT Handsets
$queryStr .= "&init=telcfg settings/Foncontrol"; $queryStr .= "&init=telcfg settings/Foncontrol";