mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed missing $FW_ME

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4764 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme1968
2014-01-28 19:39:52 +00:00
parent c20b60708b
commit d813a1ac8f
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fhem/FHEM/31_LightScene.pm
View File

@@ -9,6 +9,9 @@ use POSIX;
#use JSON; #use JSON;
#use Data::Dumper; #use Data::Dumper;
use vars qw($FW_ME);
use vars qw($FW_subdir);
use vars qw($FW_wname);
use vars qw(%FW_webArgs); # all arguments specified in the GET use vars qw(%FW_webArgs); # all arguments specified in the GET
my $LightScene_hasJSON = 1; my $LightScene_hasJSON = 1;

11
fhem/FHEM/33_readingsGroup.pm
View File

@@ -23,6 +23,9 @@ package main;
use strict; use strict;
use warnings; use warnings;
use vars qw($FW_ME);
use vars qw($FW_subdir);
use vars qw($FW_wname);
use vars qw(%FW_webArgs); # all arguments specified in the GET use vars qw(%FW_webArgs); # all arguments specified in the GET
sub readingsGroup_Initialize($) sub readingsGroup_Initialize($)
@@ -279,10 +282,10 @@ readingsGroup_2html($)
my $ret; my $ret;
$ret .= "<table>"; $ret .= "<table>";
my $txt = AttrVal($d, "alias", $d); my $txt = AttrVal($d, "alias", $d);
$txt = "<a href=\"/fhem?detail=$d\">$txt</a>" if( $show_links ); $txt = "<a href=\"$FW_ME$FW_subdir?detail=$d\">$txt</a>" if( $show_links );
$ret .= "<tr><td><div class=\"devType\">$txt</a></div></td></tr>" if( $show_heading ); $ret .= "<tr><td><div class=\"devType\">$txt</a></div></td></tr>" if( $show_heading );
$ret .= "<tr><td><table class=\"block wide\">"; $ret .= "<tr><td><table class=\"block wide\">";
#$ret .= "<div class=\"devType\"><a style=\"color:#ff8888\" href=\"/fhem?detail=$d\">readingsGroup $txt is disabled.</a></div>"; #$ret .= "<div class=\"devType\"><a style=\"color:#ff8888\" href=\"$FW_ME$FW_subdir?detail=$d\">readingsGroup $txt is disabled.</a></div>";
$ret .= "<td><div style=\"color:#ff8888;text-align:center\">disabled</div></td>"; $ret .= "<td><div style=\"color:#ff8888;text-align:center\">disabled</div></td>";
$ret .= "</table></td></tr>"; $ret .= "</table></td></tr>";
$ret .= "</table>"; $ret .= "</table>";
@@ -331,7 +334,7 @@ readingsGroup_2html($)
my $ret; my $ret;
$ret .= "<table>"; $ret .= "<table>";
my $txt = AttrVal($d, "alias", $d); my $txt = AttrVal($d, "alias", $d);
$txt = "<a href=\"/fhem?detail=$d\">$txt</a>" if( $show_links ); $txt = "<a href=\"$FW_ME$FW_subdir?detail=$d\">$txt</a>" if( $show_links );
$ret .= "<tr><td><div class=\"devType\">$txt</a></div></td></tr>" if( $show_heading ); $ret .= "<tr><td><div class=\"devType\">$txt</a></div></td></tr>" if( $show_heading );
$ret .= "<tr><td><table $style class=\"block wide\">"; $ret .= "<tr><td><table $style class=\"block wide\">";
$ret .= "<tr><td colspan=\"99\"><div style=\"color:#ff8888;text-align:center\">updates disabled</div></tr>" if( $disable > 0 ); $ret .= "<tr><td colspan=\"99\"><div style=\"color:#ff8888;text-align:center\">updates disabled</div></tr>" if( $disable > 0 );
@@ -494,7 +497,7 @@ readingsGroup_2html($)
$row++; $row++;
} }
$txt = "<a href=\"/fhem?detail=$name\">$txt</a>" if( $show_links ); $txt = "<a href=\"$FW_ME$FW_subdir?detail=$name\">$txt</a>" if( $show_links );
$v = "<div $value_style>$v</div>" if( $value_style && !$devStateIcon ); $v = "<div $value_style>$v</div>" if( $value_style && !$devStateIcon );
$ret .= "<td><div $name_style class=\"dname\">$txt</div></td>" if( $first || $multi == 1 ); $ret .= "<td><div $name_style class=\"dname\">$txt</div></td>" if( $first || $multi == 1 );