FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-04 05:16:45 +00:00
Code Issues Releases Wiki Activity

98_MAX_Temperature: fix wong non-breaking-space

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@20917 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Wzut 2020-01-08 19:00:48 +00:00
parent 271fc93cdd
commit d1338258cc
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fhem/FHEM/98_MAX_Temperature.pm
View File

@ -91,7 +91,7 @@ sub MAX_Temperature_Define($$){
$attr{$name}{room} = "MAX" if( not defined( $attr{$name}{room} ) ); $attr{$name}{room} = "MAX" if( not defined( $attr{$name}{room} ) );
$attr{$name}{SendButton} = "audio_play" if( not defined( $attr{$name}{SendButton} ) ); $attr{$name}{SendButton} = "audio_play" if( not defined( $attr{$name}{SendButton} ) );
$attr{$name}{ResetButton} = "control_x" if( not defined( $attr{$name}{ResetButton} ) ); $attr{$name}{ResetButton} = "control_x" if( not defined( $attr{$name}{ResetButton} ) );
$attr{$name}{Layout} = "[DEVICE][MODE][TEMP][SEND][DATE][CLOCK][SEND]<br>\n[STATE]" if( not defined( $attr{$name}{Layout} ) ); $attr{$name}{Layout} = "[DEVICE][MODE][TEMP][SEND][DATE][CLOCK][SEND]<br>[STATE]" if( not defined( $attr{$name}{Layout} ) );
} else { } else {
#Log3 $name, 1, "$name: already defined"; #Log3 $name, 1, "$name: already defined";
} }
@ -414,7 +414,7 @@ sub MAX_Temperature_HTML($){
my $hash = shift; my $hash = shift;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $Layout = AttrVal($name, "Layout", "[DEVICE][MODE][TEMP][SEND][DATE][CLOCK][SEND]<br>\n[STATE]"); my $Layout = AttrVal($name, "Layout", "[DEVICE][MODE][TEMP][SEND][DATE][CLOCK][SEND]<br>[STATE]");
#Log3 $name,1,"$name, $Layout"; #Log3 $name,1,"$name, $Layout";
@ -536,7 +536,7 @@ sub MAX_Temperature_GetHTMLSelectMaxDevice($){
my $Reading = "Selected_Device"; my $Reading = "Selected_Device";
my $DDSelected = ReadingsVal($name, $Reading, ""); my $DDSelected = ReadingsVal($name, $Reading, "");
$DDSelected =~ s/ /&nbsp;/g; $DDSelected =~ s/ /&nbsp;/g;
$DDSelected =~ s/ /&nbsp;/g; #ACHTUNG! Kein richtiges leerzeichen!!! Siehe http://www.fileformat.info/info/unicode/char/00a0/index.htm $DDSelected =~ s/\xC2\xA0/&nbsp;/g; #non-page-breaking-space
my $html=""; my $html="";
@ -674,8 +674,7 @@ sub MAX_Temperature_GetDeviceFromName($$){
my $MaxDevice = $caption; #ggf. bereits das Device my $MaxDevice = $caption; #ggf. bereits das Device
$caption =~ s/ /&nbsp;/g; $caption =~ s/ /&nbsp;/g;
$caption =~ s/ /&nbsp;/g; #ACHTUNG! Kein richtiges leerzeichen!!! Siehe http://www.fileformat.info/info/unicode/char/00a0/index.htm $caption =~ s/\xC2\xA0/&nbsp;/g; #non-page-breaking-space
#Gruppe? #Gruppe?
my $AddGroup = AttrVal($name,"addGroups",""); my $AddGroup = AttrVal($name,"addGroups","");
my @AddGroups = split(/ /, $AddGroup); my @AddGroups = split(/ /, $AddGroup);
@ -684,7 +683,7 @@ sub MAX_Temperature_GetDeviceFromName($$){
my @split=split(/:/, $Grp); my @split=split(/:/, $Grp);
my $GrpName=$split[0]; my $GrpName=$split[0];
$GrpName =~ s/ /&nbsp;/g; $GrpName =~ s/ /&nbsp;/g;
$GrpName =~ s/ /&nbsp;/g; #ACHTUNG! Kein richtiges leerzeichen!!! Siehe http://www.fileformat.info/info/unicode/char/00a0/index.htm $GrpName =~ s/\xC2\xA0/&nbsp;/g; #non-page-breaking-space
#my @GrpDevices=split(/,/, $split[1]); #my @GrpDevices=split(/,/, $split[1]);
#Log3 $name,1,"$name $caption $GrpName"; #Log3 $name,1,"$name $caption $GrpName";
if ($caption eq $GrpName){ if ($caption eq $GrpName){
@ -699,7 +698,7 @@ sub MAX_Temperature_GetDeviceFromName($$){
my $AliasDevice=$list[0]; my $AliasDevice=$list[0];
my $AliasDeviceName=$list[1]; my $AliasDeviceName=$list[1];
$AliasDeviceName =~ s/ /&nbsp;/g; $AliasDeviceName =~ s/ /&nbsp;/g;
$AliasDeviceName =~ s/ /&nbsp;/g; #ACHTUNG! Kein richtiges leerzeichen!!! Siehe http://www.fileformat.info/info/unicode/char/00a0/index.htm $AliasDeviceName =~ s/\xC2\xA0/&nbsp;/g; #non-page-breaking-space
#Log3 $name,1,"$name $dev $AliasDeviceName"; #Log3 $name,1,"$name $dev $AliasDeviceName";
if ($caption eq $AliasDeviceName){ if ($caption eq $AliasDeviceName){
$MaxDevice = $AliasDevice; $MaxDevice = $AliasDevice;
@ -923,10 +922,10 @@ sub MAX_Temperature_GetHTMLReset($){
<br><br> <br><br>
Without setting the Holiday mode:<br> Without setting the Holiday mode:<br>
[STATE]&lt;br&gt;\n[DEVICE][MODE][TEMP][SEND]<br><br> [STATE]&lt;br&gt; [DEVICE][MODE][TEMP][SEND]<br><br>
Holiday mode setting only:<br> Holiday mode setting only:<br>
[STATE]&lt;br&gt;\n[DEVICE][TEMP][DATE][CLOCK][SEND]<br><br> [STATE]&lt;br&gt; [DEVICE][TEMP][DATE][CLOCK][SEND]<br><br>
All entries one below the other:<br> All entries one below the other:<br>
[STATE]&lt;br&gt;<br> [STATE]&lt;br&gt;<br>
@ -1125,10 +1124,10 @@ sub MAX_Temperature_GetHTMLReset($){
<br><br> <br><br>
Ohne Einstellung des Urluabsmodus:<br> Ohne Einstellung des Urluabsmodus:<br>
[STATE]&lt;br&gt;\n[DEVICE][MODE][TEMP][SEND]<br><br> [STATE]&lt;br&gt; [DEVICE][MODE][TEMP][SEND]<br><br>
Nur Einstellung des Urlaubsmodus:<br> Nur Einstellung des Urlaubsmodus:<br>
[STATE]&lt;br&gt;\n[DEVICE][TEMP][DATE][CLOCK][SEND]<br><br> [STATE]&lt;br&gt; [DEVICE][TEMP][DATE][CLOCK][SEND]<br><br>
Alle Einträge untereinander: Alle Einträge untereinander:
[STATE]&lt;br&gt;<br> [STATE]&lt;br&gt;<br>