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

Refactor -> create utils::AddParamToUrl

Browse Source
This commit is contained in:
acognet
2021-09-17 16:29:06 +02:00
parent fc7d2551cd
commit b861d45b08
4 changed files with 27 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
application/twigextension.class.inc.php
View File

@@ -80,30 +80,14 @@ class TwigExtension
// Filter to add itopversion to an url // Filter to add itopversion to an url
$oTwigEnv->addFilter(new Twig_SimpleFilter('add_itop_version', function ($sUrl) { $oTwigEnv->addFilter(new Twig_SimpleFilter('add_itop_version', function ($sUrl) {
if (strpos($sUrl, '?') === false) $sUrl = utils::AddParamToUrl($sUrl, 'itopversion', ITOP_VERSION);
{
$sUrl = $sUrl."?itopversion=".ITOP_VERSION;
}
else
{
$sUrl = $sUrl."&itopversion=".ITOP_VERSION;
}
return $sUrl; return $sUrl;
})); }));
// Filter to add a module's version to an url // Filter to add a module's version to an url
$oTwigEnv->addFilter(new Twig_SimpleFilter('add_module_version', function ($sUrl, $sModuleName) { $oTwigEnv->addFilter(new Twig_SimpleFilter('add_module_version', function ($sUrl, $sModuleName) {
$sModuleVersion = utils::GetCompiledModuleVersion($sModuleName); $sModuleVersion = utils::GetCompiledModuleVersion($sModuleName);
$sUrl = utils::AddParamToUrl($sUrl, 'moduleversion', $sModuleVersion);
if (strpos($sUrl, '?') === false)
{
$sUrl = $sUrl."?moduleversion=".$sModuleVersion;
}
else
{
$sUrl = $sUrl."&moduleversion=".$sModuleVersion;
}
return $sUrl; return $sUrl;
})); }));
@@ -137,4 +121,5 @@ class TwigExtension
return utils::GetAbsoluteUrlModulePage($sModuleName, $sPage); return utils::GetAbsoluteUrlModulePage($sModuleName, $sPage);
})); }));
} }
} }

20
application/utils.inc.php
View File

@@ -3014,4 +3014,24 @@ HTML;
return $aMentionedObjects; return $aMentionedObjects;
} }
/**
* @param $sUrl
* @param string|null $sModuleVersion
*
* @return string
*/
public static function AddParamToUrl($sUrl, string $sName, string $sModuleVersion): string
{
if (strpos($sUrl, '?') === false)
{
$sUrl = $sUrl."?".$sName."=".$sModuleVersion;
}
else
{
$sUrl = $sUrl."&".$sName."=".$sModuleVersion;
}
return $sUrl;
}
} }

19
datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
View File

@@ -134,14 +134,7 @@ class AppExtension extends AbstractExtension
// Filter to add itopversion to an url // Filter to add itopversion to an url
$filters[] = new Twig_SimpleFilter('add_itop_version', function ($sUrl) { $filters[] = new Twig_SimpleFilter('add_itop_version', function ($sUrl) {
if (strpos($sUrl, '?') === false) $sUrl = utils::AddParamToUrl($sUrl, 'itopversion', ITOP_VERSION);
{
$sUrl = $sUrl."?itopversion=".ITOP_VERSION;
}
else
{
$sUrl = $sUrl."&itopversion=".ITOP_VERSION;
}
return $sUrl; return $sUrl;
}); });
@@ -149,15 +142,7 @@ class AppExtension extends AbstractExtension
// Filter to add a module's version to an url // Filter to add a module's version to an url
$filters[] = new Twig_SimpleFilter('add_module_version', function ($sUrl, $sModuleName) { $filters[] = new Twig_SimpleFilter('add_module_version', function ($sUrl, $sModuleName) {
$sModuleVersion = utils::GetCompiledModuleVersion($sModuleName); $sModuleVersion = utils::GetCompiledModuleVersion($sModuleName);
$sUrl = utils::AddParamToUrl($sUrl, 'moduleversion', $sModuleVersion);
if (strpos($sUrl, '?') === false)
{
$sUrl = $sUrl."?moduleversion=".$sModuleVersion;
}
else
{
$sUrl = $sUrl."&moduleversion=".$sModuleVersion;
}
return $sUrl; return $sUrl;
}); });

13
sources/application/TwigBase/Twig/Extension.php
View File

@@ -114,11 +114,7 @@ class Extension
// //
// Note: This could be rename "add_cache_buster" instead. // Note: This could be rename "add_cache_buster" instead.
$oTwigEnv->addFilter(new Twig_SimpleFilter('add_itop_version', function ($sUrl) { $oTwigEnv->addFilter(new Twig_SimpleFilter('add_itop_version', function ($sUrl) {
if (strpos($sUrl, '?') === false) { $sUrl = utils::AddParamToUrl($sUrl, 't', utils::GetCacheBusterTimestamp());
$sUrl = $sUrl."?t=".utils::GetCacheBusterTimestamp();
} else {
$sUrl = $sUrl."&t=".utils::GetCacheBusterTimestamp();
}
return $sUrl; return $sUrl;
})); }));
@@ -126,12 +122,7 @@ class Extension
// Filter to add a module's version to an url // Filter to add a module's version to an url
$oTwigEnv->addFilter(new Twig_SimpleFilter('add_module_version', function ($sUrl, $sModuleName) { $oTwigEnv->addFilter(new Twig_SimpleFilter('add_module_version', function ($sUrl, $sModuleName) {
$sModuleVersion = utils::GetCompiledModuleVersion($sModuleName); $sModuleVersion = utils::GetCompiledModuleVersion($sModuleName);
$sUrl = utils::AddParamToUrl($sUrl, 'moduleversion', $sModuleVersion);
if (strpos($sUrl, '?') === false) {
$sUrl = $sUrl."?moduleversion=".$sModuleVersion;
} else {
$sUrl = $sUrl."&moduleversion=".$sModuleVersion;
}
return $sUrl; return $sUrl;
})); }));