Merge pull request #259 from chernjie/master

Improved support for jsonp callbacks

Author: chriskacerguis

application/libraries/Format.php

@@ -215,7 +215,24 @@ public function to_csv()
 	// Encode as JSON
 	public function to_json()
 	{
-	   	return json_encode($this->_data);
+		$callback = isset($_GET['callback']) ? $_GET['callback'] : '';
+		if ($callback === '')
+		{
+			return json_encode($this->_data);
+		}
+		// we only honour jsonp callback which are valid javascript identifiers
+		else if (preg_match('/^[a-z_\$][a-z0-9\$_]*(\.[a-z_\$][a-z0-9\$_]*)*$/i', $callback))
+		{
+			// this is a jsonp request, the content-type must be updated to be text/javascript
+			header("Content-Type: application/javascript");
+			return $callback . "(" . json_encode($this->_data) . ");";
+		}
+		else
+		{
+			// we have an invalid jsonp callback identifier, we'll return plain json with a warning field
+			$this->_data['warning'] = "invalid jsonp callback provided: ".$callback;
+			return json_encode($this->_data);
+		}
 	}
 
 	// Encode as Serialized array

application/libraries/REST_Controller.php

@@ -468,6 +468,7 @@ public function response($data = null, $http_code = null)
 
 			is_numeric($http_code) OR $http_code = 200;
 
+			// @deprecated the following statement can be deleted.
 			// If the format method exists, call and return the output in that format
 			if (method_exists($this, '_format_'.$this->response->format))
 			{
@@ -1529,19 +1530,4 @@ protected function _check_access()
 		return FALSE;
 	}
 
-
-	// FORMATING FUNCTIONS ---------------------------------------------------------
-	// Many of these have been moved to the Format class for better separation, but these methods will be checked too
-
-	/**
-	 * Encode as JSONP
-	 *
-	 * @param array $data The input data.
-	 * @return string The JSONP data string (loadable from Javascript).
-	 */
-	protected function _format_jsonp($data = array())
-	{
-		return $this->get('callback').'('.json_encode($data).')';
-	}
-
 }