Implement JSONP output for BattleReports

ta2edchimp · Jun 21, 2016 · 2b9ffcd · 2b9ffcd
1 parent ad0d4ba
commit 2b9ffcd
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 5 deletions.
diff --git a/classes/Utils.php b/classes/Utils.php
@@ -150,13 +150,32 @@ public static function compareVersions($firstVersion = null, $secondVersion = nu
 
 	/**
 	 * Returns JSON as the app's response
-	 * @param  Slim $app     A Slim Application instance
-	 * @param  Any $content An object of any kind to be output as JSON
+	 * @param  array $content An object of any kind to be output as JSON
 	 */
-	public static function renderJSON($app = null, $content = null) {
+	public static function renderJSON($content = array()) {
+		$app = \Slim\Slim::getInstance();
 		$response = $app->response;
+
 		$response['Content-Type'] = 'application/json';
 		$response->body(json_encode($content));
 	}
 
+	/**
+	 * Returns a "padded JSON" as the app's response
+	 * @param  array  $content   An object of any kind to be output as JSON
+	 * @param  string $callback  Name of the callback function to be called with $content
+	 */
+	public static function renderJSONP($content = array(), $callback = "") {
+		$app = \Slim\Slim::getInstance();
+		$response = $app->response;
+
+		$cbName = $callback;
+		if (empty($cbName)) {
+			$cbName = "callback";
+		}
+
+		$response['Content-Type'] = 'application/javascript';
+		$response->body("$cbName(". json_encode($content) .")");
+	}
+
 }
diff --git a/views/show.php b/views/show.php
@@ -35,7 +35,7 @@
 
 $battleReportDetailTitle = "Battle Overview";
 
-$availableDetails = array("timeline", "damage", "json");
+$availableDetails = array("timeline", "damage", "json", "jsonp");
 if (BR_COMMENTS_ENABLED === true)
 	$availableDetails[] = "comments";
 if (!empty($battleReportDetail)) {
@@ -79,7 +79,11 @@
 
 if ($battleReportDetail === "json") {
 
-	Utils::renderJSON($app, array( "previewMeta" => $previewMeta, "battleReport" => $battleReport ));
+	Utils::renderJSON(array( "previewMeta" => $previewMeta, "battleReport" => $battleReport ));
+
+} else if ($battleReportDetail === "jsonp") {
+
+	Utils::renderJSONP(array( "previewMeta" => $previewMeta, "battleReport" => $battleReport ), $app->request->get('callback'));
 
 } else {