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

Ensure URL always contains floorplan-name (redirect)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4579 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
ulimaass
2014-01-06 19:26:14 +00:00
parent a112ffc5f1
commit b8e3721957
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fhem/FHEM/95_FLOORPLAN.pm
View File

@@ -40,6 +40,7 @@
# 0029: Fixed floorplan-specific icons and eliminated FHT-text "desired-temp" - both due to changes in fhemweb (Sep 29, 2013) # 0029: Fixed floorplan-specific icons and eliminated FHT-text "desired-temp" - both due to changes in fhemweb (Sep 29, 2013)
# 0030: Style4 (S300TH) now works with longpoll without loosing its formatting (Dec 24, 2013) # 0030: Style4 (S300TH) now works with longpoll without loosing its formatting (Dec 24, 2013)
# 0031: Text "desiredTemperature" will also be eliminated - for MAX devices (Dec 25, 2013) # 0031: Text "desiredTemperature" will also be eliminated - for MAX devices (Dec 25, 2013)
# 0032: Ensure URL always contains floorplan-name (redirect if !htmlarg[0]) as basis for fp-specific icon-folder (Jan 06, 2014)
# #
################################################################ ################################################################
# #
@@ -251,7 +252,7 @@ FP_CGI(){
#####redirect URL - either back to fhemweb-detailscreen, or for redirectCmds to suppress repeated execution of commands upon browser refresh #####redirect URL - either back to fhemweb-detailscreen, or for redirectCmds to suppress repeated execution of commands upon browser refresh
my $me = $defs{$FW_cname}; # from FHEMWEB: Current connection name my $me = $defs{$FW_cname}; # from FHEMWEB: Current connection name
my $tgt = undef; my $tgt = undef;
if( AttrVal($FW_wname, "redirectCmds", 1) && $me && $commands && !$FP_ret) { if( !$htmlpart[0] || (AttrVal($FW_wname, "redirectCmds", 1) && $me && $commands && !$FP_ret)) {
if($FP_name) { if($FP_name) {
$tgt = "/floorplan/$FP_name" $tgt = "/floorplan/$FP_name"
} else { } else {