FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-24 21:29:21 +00:00
Code Issues Releases Wiki Activity

encoding is now UTF-8, alias attribute is honored in the web overview

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@1138 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2011-12-19 11:27:53 +00:00
parent 2c042f5f8e
commit f504ab1b2f
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -25,6 +25,7 @@
- change: move JsonList from contrib to main-modules - change: move JsonList from contrib to main-modules
- change: JsonList output optimized and more structured - change: JsonList output optimized and more structured
- feature: FHEMWEB save button, smallscreen first screen fix - feature: FHEMWEB save button, smallscreen first screen fix
- feature: FHEMWEB encoding is now UTF-8, alias attribute is respected
- 2011-07-08 (5.1) - 2011-07-08 (5.1)

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

@ -71,6 +71,8 @@ my %FW_hiddenroom; # hash of hidden rooms
my $FW_longpoll; my $FW_longpoll;
my $FW_inform; my $FW_inform;
my $FW_XHR; my $FW_XHR;
#my $FW_encoding="ISO-8859-1";
my $FW_encoding="UTF-8";
##################################### #####################################
@ -317,7 +319,7 @@ FW_AnswerCall($)
my ($arg) = @_; my ($arg) = @_;
$FW_RET = ""; $FW_RET = "";
$FW_RETTYPE = "text/html; charset=ISO-8859-1"; $FW_RETTYPE = "text/html; charset=$FW_encoding";
$FW_ME = "/" . AttrVal($FW_wname, "webname", "fhem"); $FW_ME = "/" . AttrVal($FW_wname, "webname", "fhem");
$FW_dir = AttrVal($FW_wname, "fwmodpath", "$attr{global}{modpath}/FHEM"); $FW_dir = AttrVal($FW_wname, "fwmodpath", "$attr{global}{modpath}/FHEM");
$FW_ss = AttrVal($FW_wname, "smallscreen", 0); $FW_ss = AttrVal($FW_wname, "smallscreen", 0);
@ -330,7 +332,7 @@ FW_AnswerCall($)
open(FH, "$FW_dir/$f") || return 0; open(FH, "$FW_dir/$f") || return 0;
pO join("", <FH>); pO join("", <FH>);
close(FH); close(FH);
$FW_RETTYPE = "text/plain; charset=ISO-8859-1" if($f !~ m/\.*html$/); $FW_RETTYPE = "text/plain; charset=$FW_encoding" if($f !~ m/\.*html$/);
return 1; return 1;
} elsif($arg =~ m,^$FW_ME/(.*).css,) { } elsif($arg =~ m,^$FW_ME/(.*).css,) {
@ -409,12 +411,12 @@ FW_AnswerCall($)
$defs{$FW_cname}{inform} = $FW_room; $defs{$FW_cname}{inform} = $FW_room;
my $c = $defs{$FW_cname}{CD}; my $c = $defs{$FW_cname}{CD};
print $c "HTTP/1.1 200 OK\r\n", print $c "HTTP/1.1 200 OK\r\n",
"Content-Type: text/plain; charset=ISO-8859-1\r\n\r\n"; "Content-Type: text/plain; charset=$FW_encoding\r\n\r\n";
return -1; return -1;
} }
if($FW_XHR) { if($FW_XHR) {
$FW_RETTYPE = "text/plain; charset=ISO-8859-1"; $FW_RETTYPE = "text/plain; charset=$FW_encoding";
pO $FW_cmdret; pO $FW_cmdret;
return 0; return 0;
} }
@ -841,11 +843,12 @@ FW_showRoom()
my $type = $defs{$d}{TYPE}; my $type = $defs{$d}{TYPE};
pF "\n<tr class=\"%s\">", ($row&1)?"odd":"even"; pF "\n<tr class=\"%s\">", ($row&1)?"odd":"even";
my $devName = AttrVal($d, "alias", $d);
if($FW_hiddenroom{detail}) { if($FW_hiddenroom{detail}) {
pO "<td><div class=\"col1\">$d</div></td>"; pO "<td><div class=\"col1\">$devName</div></td>";
} else { } else {
pH "detail=$d", $d, 1, "col1"; pH "detail=$d", $devName, 1, "col1";
} }