holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow to process real JSON requests with Content-Type: application/json

Browse Source 
so far we always send it encoded as form, which is still supported of cause
This commit is contained in:
Ralf Becker 2018-08-15 13:10:15 +02:00
parent c69532e7f0
commit 61577b45b1
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
json.php
View File

@ -7,7 +7,6 @@
* @package api
* @subpackage ajax
* @author Andreas Stoeckel <as@stylite.de>
* @version $Id$
*/
use EGroupware\Api;
@ -116,7 +115,15 @@ if (isset($_GET['menuaction']))
$json->isJSONRequest(true); // otherwise exception is not send back to client, as we have not yet called parseRequest()
throw new Json\Exception\ScriptTags("JSON Data contains script tags. Aborting...");
}
$json->parseRequest($_GET['menuaction'], $_REQUEST['json_data']);
// check if we have a real json request
if (strpos($_SERVER['CONTENT_TYPE'], 'application/json') === 0)
{
$json->parseRequest($_GET['menuaction'], file_get_contents('php://input'));
}
else
{
$json->parseRequest($_GET['menuaction'], $_REQUEST['json_data']);
}
Json\Response::get();
exit();
}