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

Refactor "sanitize_identifier" and "sanitize_variable_name"custom TWIG functions to "sanitize(FOO)"

Browse Source 
Note: FOO is one of \utils::ENUM_SANITIZATION_FILTER_XXX
This commit is contained in:
Molkobain
2021-02-15 16:28:34 +01:00
parent 44587663bb
commit eea8ceda63
4 changed files with 64 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,19 +86,18 @@ class Extension
})
);
// Filter to sanitize an XML / HTML identifier
// Usage in twig: {{ 'identifier:to-sanitize'|sanitize_identifier }}
$oTwigEnv->addFilter(new Twig_SimpleFilter('sanitize_identifier', function ($sString) {
return utils::Sanitize($sString, '', utils::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER);
/**
* Filter to sanitize a text
* Usage in twig: {{ 'variable_name:to-sanitize'|sanitize(constant('utils::ENUM_SANITIZATION_FILTER_VARIABLE_NAME')) }}
*
* @uses \utils::Sanitize()
* @since 3.0.0
*/
$oTwigEnv->addFilter(new Twig_SimpleFilter('sanitize', function (string $sString, string $sFilter) {
return utils::Sanitize($sString, '', $sFilter);
})
);
// Filter to sanitize a variable name
// Usage in twig: {{ 'variable_name:to-sanitize'|sanitize_variable_name }}
$oTwigEnv->addFilter(new Twig_SimpleFilter('sanitize_variable_name', function ($sString) {
return utils::Sanitize($sString, '', utils::ENUM_SANITIZATION_FILTER_VARIABLE_NAME);
})
);
// Filter to add a parameter at the end of the URL to force cache invalidation after an upgrade.
// Previously we put the iTop version but now it's the last setup/toolkit timestamp to avoid cache issues when building several times the same version during tests
//
@@ -106,9 +105,7 @@ class Extension
$oTwigEnv->addFilter(new Twig_SimpleFilter('add_itop_version', function ($sUrl) {
if (strpos($sUrl, '?') === false) {
$sUrl = $sUrl."?t=".utils::GetCacheBusterTimestamp();
}
else
{
} else {
$sUrl = $sUrl."&t=".utils::GetCacheBusterTimestamp();
}