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

N°2060 - Fix regression making url pointing to the portal not working in notification anymore

Browse Source
This commit is contained in:
Molkobain
2019-12-05 12:39:28 +01:00
parent 4db114f64d
commit 366d2754ef
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
datamodels/2.x/itop-portal-base/portal/config/bootstrap.php
View File

@@ -147,10 +147,6 @@ if (empty($_ENV['PORTAL_ID']))
exit; exit;
} }
// Stacking context tag so it knows we are in the portal
$oContext = new ContextTag('GUI:Portal');
$oContext2 = new ContextTag('Portal:' . $_ENV['PORTAL_ID']);
// Env. vars to be used in templates and others // Env. vars to be used in templates and others
$_ENV['COMBODO_CURRENT_ENVIRONMENT'] = utils::GetCurrentEnvironment(); $_ENV['COMBODO_CURRENT_ENVIRONMENT'] = utils::GetCurrentEnvironment();
$_ENV['COMBODO_ABSOLUTE_URL'] = utils::GetAbsoluteUrlAppRoot(); $_ENV['COMBODO_ABSOLUTE_URL'] = utils::GetAbsoluteUrlAppRoot();

6
datamodels/2.x/itop-portal-base/portal/public/index.php
View File

@@ -15,8 +15,6 @@
* GNU Affero General Public License for more details. * GNU Affero General Public License for more details.
* *
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
*
*
*/ */
use Combodo\iTop\Portal\Kernel; use Combodo\iTop\Portal\Kernel;
@@ -24,6 +22,10 @@ use Symfony\Component\HttpFoundation\Request;
require_once MODULESROOT.'itop-portal-base/portal/config/bootstrap.php'; require_once MODULESROOT.'itop-portal-base/portal/config/bootstrap.php';
// Stacking context tag so it knows we are in the portal
$oContext = new ContextTag('GUI:Portal');
$oContext2 = new ContextTag('Portal:' . $_ENV['PORTAL_ID']);
// Note: Manually refactored ternary condition to be PHP 5.x compatible // Note: Manually refactored ternary condition to be PHP 5.x compatible
if ($trustedProxies = isset($_SERVER['TRUSTED_PROXIES']) ? $_SERVER['TRUSTED_PROXIES'] : (isset($_ENV['TRUSTED_PROXIES']) ? $_ENV['TRUSTED_PROXIES'] : false)) if ($trustedProxies = isset($_SERVER['TRUSTED_PROXIES']) ? $_SERVER['TRUSTED_PROXIES'] : (isset($_ENV['TRUSTED_PROXIES']) ? $_ENV['TRUSTED_PROXIES'] : false))
{ {