FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-27 04:35:34 +00:00
Code Issues Releases Wiki Activity

updated: GDS InfoPanel

Browse Source 
FHEM/55_GDS.pm - added link target
contrib/55_InfoPanel.pm - added link target

git-svn-id: https://svn.fhem.de/fhem/trunk@7790 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2015-01-31 11:06:58 +00:00
parent a55c4dee6f
commit a504f0ca0e
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fhem/FHEM/55_GDS.pm
View File

@ -130,7 +130,6 @@ sub GDS_Define($$$) {
sub GDS_Undef($$) { sub GDS_Undef($$) {
my ($hash, $arg) = @_; my ($hash, $arg) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
CommandDelete(undef, "gds_web_".$name);
RemoveInternalTimer($hash); RemoveInternalTimer($hash);
return undef; return undef;
} }
@ -473,10 +472,8 @@ sub GDS_HTMLTail {
} }
sub GDS_getURL { sub GDS_getURL {
# my $name = `hostname`;
# chop($name);
my $proto = (AttrVal($FW_wname, 'HTTPS', 0) == 1) ? 'https' : 'http'; my $proto = (AttrVal($FW_wname, 'HTTPS', 0) == 1) ? 'https' : 'http';
return $proto."://$FW_httpheader{Host}:" . $defs{$FW_wname}{PORT} . $FW_ME; return $proto."://$FW_httpheader{Host}$FW_ME"; #".$FW_ME;
} }
#################################################################################################### ####################################################################################################

6
fhem/contrib/InfoPanel/55_InfoPanel.pm
View File

@ -875,7 +875,7 @@ sub btIP_addExtension($$$) {
my $url = "/" . $link; my $url = "/" . $link;
$data{FWEXT}{$url}{FUNC} = $func; $data{FWEXT}{$url}{FUNC} = $func;
$data{FWEXT}{$url}{LINK} = "$link"; $data{FWEXT}{$url}{LINK} = "+$link";
$data{FWEXT}{$url}{NAME} = $friendlyname; $data{FWEXT}{$url}{NAME} = $friendlyname;
$data{FWEXT}{$url}{FORKABLE} = 0; $data{FWEXT}{$url}{FORKABLE} = 0;
} }
@ -1000,10 +1000,8 @@ sub btIP_Overview {
} }
sub btIP_getURL { sub btIP_getURL {
my $name = `hostname`;
chop($name);
my $proto = (AttrVal($FW_wname, 'HTTPS', 0) == 1) ? 'https' : 'http'; my $proto = (AttrVal($FW_wname, 'HTTPS', 0) == 1) ? 'https' : 'http';
return $proto."://$name:" . $defs{$FW_wname}{PORT} . $FW_ME; return $proto."://$FW_httpheader{Host}$FW_ME";
} }