FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 12:49:34 +00:00
Code Issues Releases Wiki Activity

Rooms with space are not available for dropdown assignment.

Browse Source 
(removed   as it had other side effects)


git-svn-id: https://svn.fhem.de/fhem/trunk@1746 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2012-07-21 10:57:16 +00:00
parent b40509f833
commit b1371337ad
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,7 +145,14 @@ FW_Define($$)
return "Usage: define <name> FHEMWEB [IPV6:]<tcp-portnr> [global]" return "Usage: define <name> FHEMWEB [IPV6:]<tcp-portnr> [global]"
if($port !~ m/^(IPV6:)?\d+$/ || ($global && $global ne "global")); if($port !~ m/^(IPV6:)?\d+$/ || ($global && $global ne "global"));
return TcpServer_Open($hash, $port, $global); my $ret = TcpServer_Open($hash, $port, $global);
# Make sure that fhem only runs once
if($ret && !$init_done) {
Log 1, "$ret. Exiting.";
exit(1);
}
return $ret;
} }
##################################### #####################################
@ -753,8 +760,7 @@ FW_doDetail($)
FW_makeTable($d, $defs{$d}{READINGS}); FW_makeTable($d, $defs{$d}{READINGS});
my $attrList = getAllAttr($d); my $attrList = getAllAttr($d);
my $roomList = join(",", sort keys %FW_rooms); my $roomList = join(",", sort grep !/ /, keys %FW_rooms);
$roomList=~s/ /\&nbsp;/g;
$attrList =~ s/room /room:$roomList /; $attrList =~ s/room /room:$roomList /;
FW_makeSelect($d, "attr", $attrList,"attr"); FW_makeSelect($d, "attr", $attrList,"attr");
@ -2051,7 +2057,6 @@ FW_ReadIcons()
#foreach my $k (keys %FW_icons) { #foreach my $k (keys %FW_icons) {
# Debug " icon: $k => " . $FW_icons{$k}; # Debug " icon: $k => " . $FW_icons{$k};
#} #}
} }
sub sub