From b05e222b78ca711248b6c80399c6ea7e93e3f599 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Sun, 4 Mar 2012 09:20:26 +0000 Subject: [PATCH] htmlCode type for weblink added git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@1311 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- webfrontend/pgm2/01_FHEMWEB.pm | 7 ++++++- webfrontend/pgm2/98_weblink.pm | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/webfrontend/pgm2/01_FHEMWEB.pm b/webfrontend/pgm2/01_FHEMWEB.pm index b11b10c3e..0220bf0ea 100755 --- a/webfrontend/pgm2/01_FHEMWEB.pm +++ b/webfrontend/pgm2/01_FHEMWEB.pm @@ -1681,7 +1681,12 @@ FW_showWeblink($$$$) my ($d, $v, $t, $buttons) = @_; my $attr = AttrVal($d, "htmlattr", ""); - if($t eq "link") { + + if($t eq "htmlCode") { + $v = AnalyzePerlCommand(undef, $v) if($v =~ m/^{(.*)}$/); + FW_pO $v; + + } elsif($t eq "link") { FW_pO "$d"; # no FW_pH, want to open extra browser } elsif($t eq "image") { diff --git a/webfrontend/pgm2/98_weblink.pm b/webfrontend/pgm2/98_weblink.pm index d4f6f4bfa..5dfde1009 100755 --- a/webfrontend/pgm2/98_weblink.pm +++ b/webfrontend/pgm2/98_weblink.pm @@ -22,7 +22,7 @@ weblink_Define($$) { my ($hash, $def) = @_; my ($type, $name, $wltype, $link) = split("[ \t]+", $def, 4); - my %thash = ( link=>1, fileplot=>1, image=>1, iframe=>1 ); + my %thash = ( link=>1, fileplot=>1, image=>1, iframe=>1, htmlCode=>1 ); if(!$link || !$thash{$wltype}) { return "Usage: define weblink [" .