FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-13 17:26:34 +00:00
Code Issues Releases Wiki Activity

EMBEDDED mode for FWEXT (for the floorplan project)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@1302 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2012-02-28 09:25:41 +00:00
parent b6245e560f
commit 0f0294290f
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fhem/webfrontend/pgm2/01_FHEMWEB.pm
View File

@ -393,13 +393,23 @@ FW_AnswerCall($)
##############################
# Axels FHEMWEB modules...
$arg = $1;
my $fwextPtr;
if(defined($data{FWEXT})) {
foreach my $k (sort keys %{$data{FWEXT}}) {
if($arg =~ m/^$k/) {
no strict "refs";
($FW_RETTYPE, $FW_RET) = &{$data{FWEXT}{$k}{FUNC}}($arg);
use strict "refs";
return 0;
if($data{FWEXT}{$k}{EMBEDDED}) {
$fwextPtr = $data{FWEXT}{$k};
last;
} else {
no strict "refs";
($FW_RETTYPE, $FW_RET) = &{$data{FWEXT}{$k}{FUNC}}($arg);
use strict "refs";
return 0;
}
}
}
}
@ -496,10 +506,14 @@ FW_AnswerCall($)
my $rf = AttrVal($FW_wname, "refresh", "");
FW_pO "<meta http-equiv=\"refresh\" content=\"$rf\">" if($rf);
FW_pO "<link href=\"$FW_ME/style.css\" rel=\"stylesheet\"/>";
FW_pO "<link href=\"$fwextPtr->{STYLESHEET}\" rel=\"stylesheet\"/>"
if($fwextPtr && $fwextPtr->{STYLESHEET});
FW_pO "<script type=\"text/javascript\" src=\"$FW_ME/svg.js\"></script>"
if($FW_plotmode eq "SVG");
FW_pO "<script type=\"text/javascript\" src=\"$FW_ME/longpoll.js\"></script>"
if($FW_longpoll);
FW_pO "<script type=\"text/javascript\" src=\"$fwextPtr->{JAVASCRIPT}\"></script>"
if($fwextPtr && $fwextPtr->{JAVASCRIPT});
FW_pO "</head>\n<body name=\"$t\">";
if($FW_cmdret) {
@ -519,7 +533,8 @@ FW_AnswerCall($)
}
FW_roomOverview($cmd);
if($cmd =~ m/^style /) { FW_style($cmd,undef); }
if($fwextPtr) { &{$fwextPtr->{FUNC}}($arg); }
elsif($cmd =~ m/^style /) { FW_style($cmd,undef); }
elsif($FW_detail) { FW_doDetail($FW_detail); }
elsif($FW_room) { FW_showRoom(); }
elsif($cmd =~ /^logwrapper/) { FW_logWrapper($cmd); }