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

N°2154 - var into string patterns can now also be enabled using server vars

Browse Source 
- usage: $_SERVER['ITOP_CONFIG_PLACEHOLDERS']
 - plus removal of useless log Trace since this code is too early in iTop's init process for this feature
This commit is contained in:
bruno DA SILVA
2020-02-03 18:46:09 +01:00
parent f2fbd8457d
commit 214dbeef5b
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/config.class.inc.php
View File

@@ -2321,10 +2321,8 @@ class ConfigPlaceholdersResolver
public function Resolve($rawValue)
{
if (empty($this->aEnv['ITOP_CONFIG_PLACEHOLDERS']))
if (empty($this->aEnv['ITOP_CONFIG_PLACEHOLDERS']) && empty($this->aServer['ITOP_CONFIG_PLACEHOLDERS']))
{
IssueLog::Trace('ITOP_CONFIG_PLACEHOLDERS disabled, the feature is disabled', self::class, array($rawValue));
return $rawValue;
}
@@ -2335,14 +2333,12 @@ class ConfigPlaceholdersResolver
{
$aResolvedRawValue[$key] = $this->Resolve($value);
}
IssueLog::Trace('Resolved array ', self::class, array($aResolvedRawValue));
return $aResolvedRawValue;
}
if (!is_string($rawValue))
{
IssueLog::Trace('Unhandled var type', self::class, array($rawValue));
return $rawValue;
}
@@ -2350,8 +2346,6 @@ class ConfigPlaceholdersResolver
if (! preg_match_all($sPattern, $rawValue, $aMatchesCollection, PREG_SET_ORDER))
{
IssueLog::Trace("No matching pattern found inside '{$rawValue}'", self::class);
return $rawValue;
}
@@ -2368,8 +2362,6 @@ class ConfigPlaceholdersResolver
$sValue = str_replace($sWholeMask, $sReplacement, $sValue);
}
IssueLog::Trace("replacement done, from '{$rawValue}' to '{$sValue}'", self::class);
return $sValue;
}