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

N°3928 - Polishing: Impact analysis

Browse Source
This commit is contained in:
acognet
2021-10-14 09:29:36 +02:00
parent 9ec6c2098b
commit bc2c12a8c3
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sources/application/Branding.php
View File

@@ -58,12 +58,14 @@ class Branding
];
/**
* Return url or path of logo defined by $sType
* @param string $sType
* @param string $sLinkPath
* @param string $sAppPath
* @param ?string $sModulePath
*
* @return string
*/
protected static function GetLogoPath(string $sType, string $sLinkPath): string
protected static function GetLogoPath(string $sType, string $sAppPath, ?string $sModulePath = null): string
{
$sDefaultLogoPath = static::$aLogoPaths[$sType]['default'];
$sWorkingPath = APPROOT.'env-'.utils::GetCurrentEnvironment().'/';
@@ -71,11 +73,11 @@ class Branding
if (isset($aThemeParameters[$sType])) {
$sCustomLogoPath = $aThemeParameters[$sType];
if (file_exists($sWorkingPath.$sCustomLogoPath)) {
return $sLinkPath.$sCustomLogoPath.'?t='.utils::GetCacheBusterTimestamp();
return ($sModulePath??$sAppPath).$sCustomLogoPath;
}
}
return utils::GetAbsoluteUrlAppRoot().$sDefaultLogoPath.'?t='.utils::GetCacheBusterTimestamp();
return $sAppPath.$sDefaultLogoPath;
}
/**
@@ -89,7 +91,7 @@ class Branding
*/
public static function GetLogoAbsoluteUrl($sType = self::DEFAULT_LOGO_TYPE)
{
return self::GetLogoPath($sType, utils::GetAbsoluteUrlModulesRoot());
return self::GetLogoPath($sType, utils::GetAbsoluteUrlAppRoot(), utils::GetAbsoluteUrlModulesRoot()).'?t='.utils::GetCacheBusterTimestamp();
}
/**
@@ -103,7 +105,8 @@ class Branding
*/
public static function GetLogoRelativePath($sType = self::DEFAULT_LOGO_TYPE)
{
return self::GetLogoPath($sType, APPROOT.'env-'.utils::GetCurrentEnvironment().'/');
$sPath =APPROOT.'env-'.utils::GetCurrentEnvironment().'/';
return self::GetLogoPath($sType, $sPath);
}
/**