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

01_FHEMWEB.pm: reset FW_wname after getAll (Forum #68133)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13623 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2017-03-05 22:22:19 +00:00
parent 160b55ddbb
commit 8df7ca8d51
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fhem/FHEM/01_FHEMWEB.pm
View File

@ -278,7 +278,7 @@ FW_Define($$)
InternalTimer(1, sub(){ InternalTimer(1, sub(){
if($featurelevel >= 5.8 && !AttrVal($name, "csrfToken", undef)) { if($featurelevel >= 5.8 && !AttrVal($name, "csrfToken", undef)) {
my ($x,$y) = gettimeofday(); my ($x,$y) = gettimeofday();
($defs{$name}{CSRFTOKEN} = "csrf_".(rand($y)*rand($x))) =~s/[^a-z_0-9]//g; ($defs{$name}{CSRFTOKEN}="csrf_".(rand($y)*rand($x))) =~s/[^a-z_0-9]//g;
$FW_csrfTokenCache{$name} = $hash->{CSRFTOKEN}; $FW_csrfTokenCache{$name} = $hash->{CSRFTOKEN};
} }
}, $hash, 0); }, $hash, 0);
@ -3026,12 +3026,14 @@ sub
FW_Get($@) FW_Get($@)
{ {
my ($hash, @a) = @_; my ($hash, @a) = @_;
$FW_wname= $hash->{NAME};
my $arg = (defined($a[1]) ? $a[1] : ""); my $arg = (defined($a[1]) ? $a[1] : "");
if($arg eq "icon") { if($arg eq "icon") {
return "need one icon as argument" if(int(@a) != 3); return "need one icon as argument" if(int(@a) != 3);
my $ofn = $FW_wname;
$FW_wname = $hash->{NAME};
my $icon = FW_iconPath($a[2]); my $icon = FW_iconPath($a[2]);
$FW_wname = $ofn;
return defined($icon) ? "$FW_icondir/$icon" : "no such icon"; return defined($icon) ? "$FW_icondir/$icon" : "no such icon";
} elsif($arg eq "pathlist") { } elsif($arg eq "pathlist") {