FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-05 02:19:31 +00:00
Code Issues Releases Wiki Activity

jsonp

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@1186 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2012-01-11 21:45:19 +00:00
parent 910bfd4cca
commit 77dee1295b
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,6 +1,7 @@
- SVN - SVN
- feature: internal NotifyOrderPrefix: 98_average.pm is more straightforward - feature: internal NotifyOrderPrefix: 98_average.pm is more straightforward
- feature: the usb command tries to flash unflashed CULs on linux - feature: the usb command tries to flash unflashed CULs on linux
- feature: FHEMWEB: jsonp support, .holiday and .cfg added to Edit Files
- 2011-12-31 (5.2) - 2011-12-31 (5.2)

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

@ -72,6 +72,7 @@ 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_jsonp;
#my $FW_encoding="ISO-8859-1"; #my $FW_encoding="ISO-8859-1";
my $FW_encoding="UTF-8"; my $FW_encoding="UTF-8";
@ -423,9 +424,14 @@ FW_AnswerCall($)
return -1; return -1;
} }
if($FW_XHR) { if($FW_XHR || $FW_jsonp) {
$FW_RETTYPE = "text/plain; charset=$FW_encoding"; $FW_RETTYPE = "text/plain; charset=$FW_encoding";
FW_pO $FW_cmdret; if($FW_jsonp) {
$FW_cmdret =~ s/'/\\'/g;
FW_pO "$FW_jsonp('$FW_cmdret');";
} else {
FW_pO $FW_cmdret;
}
return 0; return 0;
} }
@ -519,6 +525,7 @@ FW_digestCgi($)
$FW_room = ""; $FW_room = "";
$FW_detail = ""; $FW_detail = "";
$FW_XHR = undef; $FW_XHR = undef;
$FW_jsonp = undef;
$FW_inform = undef; $FW_inform = undef;
%FW_webArgs = (); %FW_webArgs = ();
@ -542,6 +549,7 @@ FW_digestCgi($)
if($p eq "pos") { %FW_pos = split(/[=;]/, $v); } if($p eq "pos") { %FW_pos = split(/[=;]/, $v); }
if($p eq "data") { $FW_data = $v; } if($p eq "data") { $FW_data = $v; }
if($p eq "XHR") { $FW_XHR = 1; } if($p eq "XHR") { $FW_XHR = 1; }
if($p eq "jsonp") { $FW_jsonp = $v; }
if($p eq "inform") { $FW_inform = $v; } if($p eq "inform") { $FW_inform = $v; }
} }