composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 15:22:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.1' into support/3.2

Browse Source
This commit is contained in:
jf-cbd
2025-03-06 16:24:40 +01:00
parent 9b1395db03 056dce4d78
commit 1ec139782e
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
webservices/rest.php
View File

@@ -231,9 +231,6 @@ try
if ($oRS instanceof iRestInputSanitizer) { if ($oRS instanceof iRestInputSanitizer) {
$sSanitizedJsonInput = $oRS->SanitizeJsonInput($sJsonString); $sSanitizedJsonInput = $oRS->SanitizeJsonInput($sJsonString);
} }
else {
$sSanitizedJsonInput = $sJsonString;
}
CMDBObject::SetTrackOrigin('webservice-rest'); CMDBObject::SetTrackOrigin('webservice-rest');
$oResult = $oRS->ExecOperation($sVersion, $sOperation, $aJsonData); $oResult = $oRS->ExecOperation($sVersion, $sOperation, $aJsonData);
@@ -291,7 +288,7 @@ if (MetaModel::GetConfig()->Get('log_rest_service'))
$oLog->SetTrim('userinfo', UserRights::GetUser()); $oLog->SetTrim('userinfo', UserRights::GetUser());
$oLog->Set('version', $sVersion); $oLog->Set('version', $sVersion);
$oLog->Set('operation', $sOperation); $oLog->Set('operation', $sOperation);
$oLog->SetTrim('json_input', $sSanitizedJsonInput); $oLog->SetTrim('json_input', $sSanitizedJsonInput ?? $sJsonString);
$oLog->Set('provider', $sProvider); $oLog->Set('provider', $sProvider);
$sMessage = $oResult->message; $sMessage = $oResult->message;