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

N°879 Portal: Notification URLs poiting to a portal were not working when several portal instances were configured.

Browse Source 
SVN:trunk[4742]
This commit is contained in:
Guillaume Lajarige
2017-05-19 08:30:34 +00:00
parent 5451ced894
commit 522108dc69
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
datamodels/2.x/itop-portal/main.itop-portal.php
View File

@@ -68,13 +68,20 @@ class iTopPortalEditUrlMaker implements iDBObjectURLMaker
}
$sPortalAbsoluteUrl = utils::GetAbsoluteUrlModulePage($sPortalId, 'index.php');
if (strpos($sPortalAbsoluteUrl, '?') !== false)
if (strpos($sPortalAbsoluteUrl, '?') !== false)
{
$sUrl = substr($sPortalAbsoluteUrl, 0, strpos($sPortalAbsoluteUrl, '?')).$sObjectQueryString.substr($sPortalAbsoluteUrl, strpos($sPortalAbsoluteUrl, '?'));
// Removing generated url query parameters so it can be replaced with those from the absolute url
// Mostly necessary when iTop instance has multiple portals
if(strpos($sObjectQueryString, '?') !== false)
{
$sObjectQueryString = substr($sObjectQueryString, 0, strpos($sObjectQueryString, '?'));
}
$sUrl = substr($sPortalAbsoluteUrl, 0, strpos($sPortalAbsoluteUrl, '?')).$sObjectQueryString.substr($sPortalAbsoluteUrl, strpos($sPortalAbsoluteUrl, '?'));
}
else
{
$sUrl = $sPortalAbsoluteUrl.$sObjectQueryString;
$sUrl = $sPortalAbsoluteUrl.$sObjectQueryString;
}
return $sUrl;