composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 11:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°6204 - Fix REST/JSON API crash when using JSON-P and iBackofficeDictXXX interfaces

Browse Source
This commit is contained in:
Molkobain
2023-04-18 15:32:24 +02:00
parent d46d1db8e4
commit 51617113eb
12 changed files with 170 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
webservices/rest.php
View File

@@ -63,7 +63,6 @@ if (!function_exists('json_last_error_msg')) {
//
// Main
//
$oP = new AjaxPage('rest');
$oCtx = new ContextTag(ContextTag::TAG_REST);
$sVersion = utils::ReadParam('version', null, false, 'raw_data');
@@ -256,19 +255,19 @@ if ($sResponse === false)
$sResponse = json_encode($oJsonIssue);
}
$oP->add_header('Access-Control-Allow-Origin: *');
$sCallback = utils::ReadParam('callback', null);
if ($sCallback == null)
{
$oP->SetContentType('application/json');
$oP->add($sResponse);
$oP = new JsonPage();
$oP->SetOutputDataOnly(true);
}
else
{
$oP->SetContentType('application/javascript');
$oP->add($sCallback.'('.$sResponse.')');
$oP = new JsonPPage($sCallback);
}
$oP->add_header('Access-Control-Allow-Origin: *');
$oP->SetData(json_decode($sResponse, true));
$oP->Output();
// Log usage