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.0' into develop

Browse Source
This commit is contained in:
Eric Espie
2022-08-10 15:28:13 +02:00
parent 706b81b929 5854eefcce
commit 7a9e16766f
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
datamodels/2.x/itop-oauth-client/src/Controller/AjaxOauthClientController.php
View File

@@ -13,6 +13,7 @@ use Dict;
use IssueLog; use IssueLog;
use MetaModel; use MetaModel;
use utils; use utils;
use WebPage;
class AjaxOauthClientController extends Controller class AjaxOauthClientController extends Controller
{ {
@@ -52,9 +53,9 @@ class AjaxOauthClientController extends Controller
$aResult = []; $aResult = [];
$aResult['status'] = 'error'; $aResult['status'] = 'error';
$aURL = parse_url($sRedirectUrl); $aURL = parse_url($sRedirectUrl);
$aQuery = [];
if (isset($aURL['query'])) { if (isset($aURL['query'])) {
$sRedirectUrlQuery = $aURL['query']; $sRedirectUrlQuery = $aURL['query'];
$aQuery = [];
parse_str($sRedirectUrlQuery, $aQuery); parse_str($sRedirectUrlQuery, $aQuery);
if (isset($aQuery['error'])) { if (isset($aQuery['error'])) {
$aResult['status'] = 'error'; $aResult['status'] = 'error';
@@ -84,7 +85,7 @@ class AjaxOauthClientController extends Controller
$sId, $sId,
"$sClass:$sId:TokenCreated", "$sClass:$sId:TokenCreated",
$bIsCreation ? Dict::S('itop-oauth-client:Message:TokenCreated') : Dict::S('itop-oauth-client:Message:TokenRecreated'), $bIsCreation ? Dict::S('itop-oauth-client:Message:TokenCreated') : Dict::S('itop-oauth-client:Message:TokenRecreated'),
'ok', WebPage::ENUM_SESSION_MESSAGE_SEVERITY_OK,
1, 1,
true true
); );
@@ -101,11 +102,11 @@ class AjaxOauthClientController extends Controller
$sId, $sId,
"$sClass:$sId:TokenError", "$sClass:$sId:TokenError",
$aResult['error_description'] ?? Dict::S('itop-oauth-client:Message:TokenError'), $aResult['error_description'] ?? Dict::S('itop-oauth-client:Message:TokenError'),
'error', WebPage::ENUM_SESSION_MESSAGE_SEVERITY_ERROR,
1, 1,
true true
); );
IssueLog::Error("Token creation failed for $sClass:$sId", null, $aResult); IssueLog::Error("Token creation failed for $sClass:$sId", null, empty($aQuery) ? $aResult : $aQuery);
break; break;
} }