RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ADDED] JSONP support for MPOS API

Browse Source 
Fixes #1700 once merged.

Thanks @spliznork for the feature request and solution.
This commit is contained in:
Sebastian Grewe 2014-02-07 09:00:09 +01:00
parent 93470fd63e
commit a03b9d4ace
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/include/classes/api.class.php
View File

@ -28,13 +28,17 @@ class Api extends Base {
* @return string JSON object * @return string JSON object
**/ **/
function get_json($data, $force=false) { function get_json($data, $force=false) {
return json_encode( $json = json_encode(
array( $_REQUEST['action'] => array( array( $_REQUEST['action'] => array(
'version' => $this->api_version, 'version' => $this->api_version,
'runtime' => (microtime(true) - $this->dStartTime) * 1000, 'runtime' => (microtime(true) - $this->dStartTime) * 1000,
'data' => $data 'data' => $data
)), $force ? JSON_FORCE_OBJECT : 0 )), $force ? JSON_FORCE_OBJECT : 0
); );
// JSONP support issue #1700
if (isset($_REQUEST['callback']))
return $_REQUEST['callback'] . '(' . $json . ');';
return $json;
} }
/** /**