stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-30 03:30:34 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add JSONP support. You must specify &output=jsonp?callback=<js_function>

Browse Source 
Fixes ticket #1205.
This commit is contained in:
Bharat Mediratta
2010-08-08 15:02:24 -07:00
parent 9b5e058dd3
commit d6f5a8a8d1
1 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/rest/helpers/rest.php
+25 -3
View File
@@ -24,7 +24,27 @@ class rest_Core {
Session::instance()->abort_save();
header("X-Gallery-API-Version: " . rest::API_VERSION);
if (Input::instance()->get("output") == "html") {
switch (Input::instance()->get("output", "json")) {
case "json":
json::reply($data);
break;
case "jsonp":
if (!($callback = Input::instance()->get("callback", ""))) {
throw new Rest_Exception(
"Bad Request", 400, array("errors" => array("callback" => "missing")));
}
if (preg_match('/^[$A-Za-z_][0-9A-Za-z_]*$/', $callback) == 1) {
header("Content-type: application/javascript");
print "$callback(" . json_encode($data) . ")";
} else {
throw new Rest_Exception(
"Bad Request", 400, array("errors" => array("callback" => "invalid")));
}
break;
case "html":
header("Content-type: text/html");
if ($data) {
$html = preg_replace(
@@ -34,8 +54,10 @@ class rest_Core {
$html = t("Empty response");
}
print "<pre>$html</pre>";
} else {
json::reply($data);
break;
default:
throw new Rest_Exception("Bad Request", 400);
}
}