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

Refactor -> create utils::AddParamToUrl - renaming of function + encode parameters

Browse Source
This commit is contained in:
acognet
2021-09-20 16:20:50 +02:00
parent 8af116275c
commit 6d4f919519
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,14 +80,14 @@ class TwigExtension
// Filter to add itopversion to an url
$oTwigEnv->addFilter(new Twig_SimpleFilter('add_itop_version', function ($sUrl) {
$sUrl = utils::AddParamToUrl($sUrl, 'itopversion', ITOP_VERSION);
$sUrl = utils::AddParameterToUrl($sUrl, 'itopversion', ITOP_VERSION);
return $sUrl;
}));
// Filter to add a module's version to an url
$oTwigEnv->addFilter(new Twig_SimpleFilter('add_module_version', function ($sUrl, $sModuleName) {
$sModuleVersion = utils::GetCompiledModuleVersion($sModuleName);
$sUrl = utils::AddParamToUrl($sUrl, 'moduleversion', $sModuleVersion);
$sUrl = utils::AddParameterToUrl($sUrl, 'moduleversion', $sModuleVersion);
return $sUrl;
}));

10
application/utils.inc.php
View File

@@ -3017,19 +3017,21 @@ HTML;
/**
* @param $sUrl
* @param string|null $sModuleVersion
* @param string $sParamName
* @param string $sParamValue
*
* @return string
* @since 3.0.0
*/
public static function AddParamToUrl($sUrl, string $sName, string $sModuleVersion): string
public static function AddParameterToUrl(string $sUrl, string $sParamName, string $sParamValue): string
{
if (strpos($sUrl, '?') === false)
{
$sUrl = $sUrl."?".$sName."=".$sModuleVersion;
$sUrl = $sUrl.'?'.urlencode($sParamName).'='.urlencode($sParamValue);
}
else
{
$sUrl = $sUrl."&".$sName."=".$sModuleVersion;
$sUrl = $sUrl.'&'.urlencode($sParamName).'='.urlencode($sParamValue);
}
return $sUrl;

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

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

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

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