Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

EZP-24292: Extract template operator(s) do not work correctly with utf8 strings #1162

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

EZP-24292: Extract template operator(s) do not work correctly with utf8 strings #1162

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 48 additions & 33 deletions lib/eztemplate/classes/eztemplatearrayoperator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,9 @@ function operatorTemplateHints()
function arrayTrans( $operatorName, &$node, $tpl, &$resourceData,
$element, $lastElement, $elementList, $elementTree, &$parameters )
{
$strposFunc = function_exists( 'mb_strpos' ) ? 'mb_strpos' : 'strpos';
$substrFunc = function_exists( 'mb_substr' ) ? 'mb_substr' : 'substr';

switch( $operatorName )
{
case $this->ArrayName:
Expand Down Expand Up @@ -434,7 +437,7 @@ function arrayTrans( $operatorName, &$node, $tpl, &$resourceData,
{
if ( $isString )
{
$result = ( strpos( $inParam, $matchParam ) !== false );
$result = ( $strposFunc( $inParam, $matchParam ) !== false );
}
else if( $isArray )
{
Expand All @@ -453,7 +456,7 @@ function arrayTrans( $operatorName, &$node, $tpl, &$resourceData,

if ( $isString )
{
$code = '%output% = ( strpos( ' . $inParamCode . ', ' . $matchParamCode . ' ) !== false );';
$code = '%output% = ( $strposFunc( ' . $inParamCode . ', ' . $matchParamCode . ' ) !== false );';
}
else if ( $isArray )
{
Expand All @@ -463,7 +466,7 @@ function arrayTrans( $operatorName, &$node, $tpl, &$resourceData,
{
$code = 'if( is_string( ' . $inParamCode . ' ) )' . "\n" .
'{' . "\n" .
' %output% = ( strpos( ' . $inParamCode . ', ' . $matchParamCode . ' ) !== false );' . "\n" .
' %output% = ( $strposFunc( ' . $inParamCode . ', ' . $matchParamCode . ' ) !== false );' . "\n" .
'}' . "\n" .
'else if ( is_array( ' . $inParamCode . ' ) )' . "\n" .
'{' . "\n" .
Expand Down Expand Up @@ -731,7 +734,7 @@ function arrayTrans( $operatorName, &$node, $tpl, &$resourceData,
{
if ( $isString )
{
return array( eZTemplateNodeTool::createStringElement( substr( $inputArray, $offset, $length ) ) );
return array( eZTemplateNodeTool::createStringElement( $substrFunc( $inputArray, $offset, $length ) ) );
}
else if ( $isArray )
{
Expand All @@ -747,7 +750,7 @@ function arrayTrans( $operatorName, &$node, $tpl, &$resourceData,

if ( $isString )
{
$code = '%output% = substr( ' . $inputArrayCode . ', ' . $offsetCode;
$code = '%output% = $substrFunc( ' . $inputArrayCode . ', ' . $offsetCode;
if ( $lengthCode )
$code .= ', ' . $lengthCode;
$code .= ' );';
Expand All @@ -764,13 +767,13 @@ function arrayTrans( $operatorName, &$node, $tpl, &$resourceData,
$code = ( '%tmp1% = ' . $inputArrayCode . ';' . "\n" .
'if ( is_string( %tmp1% ) )' . "\n" .
'{' . "\n" .
' %output% = ( substr( %tmp1%, 0, ' . $offsetCode . ' )' );
' %output% = ( $substrFunc( %tmp1%, 0, ' . $offsetCode . ' )' );

$lengthCode = !$lengthCode ? 1 : $lengthCode;

if ( $lengthCode )
{
$code .= ' . substr( %tmp1%, ' . $offsetCode . ' + ' . $lengthCode . ' )';
$code .= ' . $substrFunc( %tmp1%, ' . $offsetCode . ' + ' . $lengthCode . ' )';
}
$code .= ( ' );' . "\n" .
'}' . "\n" .
Expand Down Expand Up @@ -845,7 +848,7 @@ function arrayTrans( $operatorName, &$node, $tpl, &$resourceData,
{
if ( $isString )
{
return array( eZTemplateNodeTool::createStringElement( substr( $inputArray, 0, $offset ) . $insertText . substr( $inputArray, $offset ) ) );
return array( eZTemplateNodeTool::createStringElement( $substrFunc( $inputArray, 0, $offset ) . $insertText . $substrFunc( $inputArray, $offset ) ) );
}
else if ( $isArray )
{
Expand All @@ -865,7 +868,7 @@ function arrayTrans( $operatorName, &$node, $tpl, &$resourceData,
$tmpCount = 0;
if ( $isString )
{
$code = '%output% = substr( ' . $inputArrayCode . ', 0, ' . $offsetCode . ' ) . ' . $insertElemCode[0] . ' . substr( ' . $inputArrayCode . ', ' . $offsetCode . ' );';
$code = '%output% = $substrFunc( ' . $inputArrayCode . ', 0, ' . $offsetCode . ' ) . ' . $insertElemCode[0] . ' . $substrFunc( ' . $inputArrayCode . ', ' . $offsetCode . ' );';
}
else if ( $isArray )
{
Expand All @@ -890,7 +893,7 @@ function arrayTrans( $operatorName, &$node, $tpl, &$resourceData,
$code = '%tmp1% = ' . $inputArrayCode . ';' . "\n" .
'if ( is_string( %tmp1% ) )' . "\n" .
'{' . "\n" .
' %output% = substr( ' . $inputArrayCode . ', 0, ' . $offsetCode . ' ) . ' . $insertElemCode[0] . ' . substr( ' . $inputArrayCode . ', ' . $offsetCode . ' );' . "\n" .
' %output% = $substrFunc( ' . $inputArrayCode . ', 0, ' . $offsetCode . ' ) . ' . $insertElemCode[0] . ' . $substrFunc( ' . $inputArrayCode . ', ' . $offsetCode . ' );' . "\n" .
'}' . "\n" .
'else if ( is_array( %tmp1% ) )' . "\n" .
'{' . "\n" .
Expand Down Expand Up @@ -1041,6 +1044,10 @@ function compareTrans( $operatorName, &$node, $tpl, &$resourceData,
$values = array();
$tmpCount = 0;

$strrposFunc = function_exists( 'mb_strrpos' ) ? 'mb_strrpos' : 'strrpos';
$strlenFunc = function_exists( 'mb_strlen' ) ? 'mb_strlen' : 'strlen';
$strposFunc = function_exists( 'mb_strpos' ) ? 'mb_strpos' : 'strpos';

if ( eZTemplateNodeTool::isConstantElement( $parameters[0] ) )
{
$inParam = eZTemplateNodeTool::elementConstantValue( $parameters[0] );
Expand Down Expand Up @@ -1076,7 +1083,7 @@ function compareTrans( $operatorName, &$node, $tpl, &$resourceData,
{
if ( $isString )
{
$result = ( strrpos( $inParam, $compareParams[0] ) === ( strlen( $inParam ) - strlen ( $compareParams[0] ) ) );
$result = ( $strrposFunc( $inParam, $compareParams[0] ) === ( $strlenFunc( $inParam ) - $strlenFunc( $compareParams[0] ) ) );
}
else if ( $isArray )
{
Expand All @@ -1100,7 +1107,7 @@ function compareTrans( $operatorName, &$node, $tpl, &$resourceData,

if ( $isString )
{
$code = '%output% = ( strrpos( ' . $inParamCode . ', ' . $compareParamsCode[0] . ' ) === ( strlen( ' . $inParamCode . ' ) - strlen( ' . $compareParamsCode[0] . ' ) ) );';
$code = '%output% = ( $strrposFunc( ' . $inParamCode . ', ' . $compareParamsCode[0] . ' ) === ( $strlenFunc( ' . $inParamCode . ' ) - $strlenFunc( ' . $compareParamsCode[0] . ' ) ) );';
}
else if ( $isArray )
{
Expand All @@ -1124,7 +1131,7 @@ function compareTrans( $operatorName, &$node, $tpl, &$resourceData,
$code = '%tmp4% = ' . $inParamCode . ';' . "\n" .
'if ( is_string( %tmp4% ) )' . "\n" .
'{' . "\n" .
' %output% = ( strrpos( %tmp4%, ' . $compareParamsCode[0] . ' ) === ( strlen( %tmp4% ) - strlen( ' . $compareParamsCode[0] . ' ) ) );' . "\n" .
' %output% = ( $strrposFunc( %tmp4%, ' . $compareParamsCode[0] . ' ) === ( $strlenFunc( %tmp4% ) - $strlenFunc( ' . $compareParamsCode[0] . ' ) ) );' . "\n" .
'}' . "\n" .
'else if( is_array( %tmp4% ) )' . "\n" .
'{' . "\n" .
Expand Down Expand Up @@ -1153,7 +1160,7 @@ function compareTrans( $operatorName, &$node, $tpl, &$resourceData,
{
if ( $isString )
{
$result = ( strpos ( $inParam, $compareParams[0] ) === 0 );
$result = ( $strposFunc( $inParam, $compareParams[0] ) === 0 );
}
else if ( $isArray )
{
Expand All @@ -1173,7 +1180,7 @@ function compareTrans( $operatorName, &$node, $tpl, &$resourceData,

if ( $isString )
{
$code = '%output% = ( ' . $compareParamsCode[0] . ' && strpos( ' . $inParamCode . ', ' . $compareParamsCode[0] . ' ) === 0 );';
$code = '%output% = ( ' . $compareParamsCode[0] . ' && $strposFunc( ' . $inParamCode . ', ' . $compareParamsCode[0] . ' ) === 0 );';
}
else if ( $isArray )
{
Expand All @@ -1197,7 +1204,7 @@ function compareTrans( $operatorName, &$node, $tpl, &$resourceData,
" if ( {$compareParamsCode[0]} == '' )\n" .
" %output% = false;\n" .
" else\n" .
' %output% = ( strpos( %tmp1%, ' . $compareParamsCode[0] . ' ) === 0 );' . "\n" .
' %output% = ( $strposFunc( %tmp1%, ' . $compareParamsCode[0] . ' ) === 0 );' . "\n" .
'}' . "\n" .
'else if( is_array( %tmp1% ) )' . "\n" .
'{' . "\n" .
Expand Down Expand Up @@ -1226,6 +1233,9 @@ function extractTrans( $operatorName, &$node, $tpl, &$resourceData,
$length = false;
$values = array();
$code = '';

$substrFunc = function_exists( 'mb_substr' ) ? 'mb_substr' : 'substr';

if ( $operatorName == $this->ExtractName )
{
if ( eZTemplateNodeTool::isConstantElement( $parameters[1] ) )
Expand Down Expand Up @@ -1292,14 +1302,14 @@ function extractTrans( $operatorName, &$node, $tpl, &$resourceData,
if ( $operatorName == $this->ExtractRightName or !$length )
{
if ( is_string( $input ) )
$output = substr( $input, $offset );
$output = $substrFunc( $input, $offset );
else
$output = array_slice( $input, $offset );
}
else
{
if ( is_string( $input ) )
$output = substr( $input, $offset, $length );
$output = $substrFunc( $input, $offset, $length );
else
$output = array_slice( $input, $offset, $length );
}
Expand All @@ -1314,7 +1324,7 @@ function extractTrans( $operatorName, &$node, $tpl, &$resourceData,
{
$values[] = $parameters[0];
$code = ( "if ( is_string( %" . count( $values ) . "% ) )\n" .
" %output% = substr( %" . count( $values ) . "%, " . $code . " );\n" .
" %output% = $substrFunc( %" . count( $values ) . "%, " . $code . " );\n" .
"else\n" .
" %output% = array_slice( %" . count( $values ) . "%, " . $code . " );" );
}
Expand Down Expand Up @@ -1564,6 +1574,11 @@ function modify( $tpl, $operatorName, $operatorParameters,
$rootNamespace, $currentNamespace, &$operatorValue,
$namedParameters, $placement )
{
$strlenFunc = function_exists( 'mb_strlen' ) ? 'mb_strlen' : 'strlen';
$substrFunc = function_exists( 'mb_substr' ) ? 'mb_substr' : 'substr';
$strposFunc = function_exists( 'mb_strpos' ) ? 'mb_strpos' : 'strpos';
$strrposFunc = function_exists( 'mb_strrpos' ) ? 'mb_strrpos' : 'strrpos';

switch( $operatorName )
{
case $this->ArrayName:
Expand Down Expand Up @@ -1947,7 +1962,7 @@ function modify( $tpl, $operatorName, $operatorParameters,
// Check if the string contains a specified sequence of chars/string.
case $this->ContainsName:
{
$operatorValue = ( strpos( $operatorValue, $namedParameters['match'] ) !== false );
$operatorValue = ( $strposFunc( $operatorValue, $namedParameters['match'] ) !== false );
}
break;

Expand All @@ -1969,29 +1984,29 @@ function modify( $tpl, $operatorName, $operatorParameters,
case $this->ExtractName:
{
if ( $namedParameters['extract_length'] === false )
$operatorValue = substr( $operatorValue, $namedParameters['extract_start'] );
$operatorValue = $substrFunc( $operatorValue, $namedParameters['extract_start'] );
else
$operatorValue = substr( $operatorValue, $namedParameters['extract_start'], $namedParameters['extract_length'] );
$operatorValue = $substrFunc( $operatorValue, $namedParameters['extract_start'], $namedParameters['extract_length'] );
}
break;

// Extract string/portion from the start of the string.
case $this->ExtractLeftName:
{
$operatorValue = substr( $operatorValue, 0, $namedParameters['length'] );
$operatorValue = $substrFunc( $operatorValue, 0, $namedParameters['length'] );
}break;

// Extract string/portion from the end of the string.
case $this->ExtractRightName:
{
$offset = strlen( $operatorValue ) - $namedParameters['length'];
$operatorValue = substr( $operatorValue, $offset );
$offset = $strlenFunc( $operatorValue ) - $namedParameters['length'];
$operatorValue = $substrFunc( $operatorValue, $offset );
}break;

// Check if string begins with specified sequence:
case $this->BeginsWithName:
{
if ( strpos( $operatorValue, $namedParameters['match'] ) === 0 )
if ( $strposFunc( $operatorValue, $namedParameters['match'] ) === 0 )
{
$operatorValue = true;
}
Expand All @@ -2004,7 +2019,7 @@ function modify( $tpl, $operatorName, $operatorParameters,
// Check if string ends with specified sequence:
case $this->EndsWithName:
{
if ( strrpos( $operatorValue, $namedParameters['match'] ) === ( strlen( $operatorValue ) - strlen ($namedParameters['match'] ) ) )
if ( $strrposFunc( $operatorValue, $namedParameters['match'] ) === ( $strlenFunc( $operatorValue ) - $strlenFunc( $namedParameters['match'] ) ) )
{
$operatorValue = true;
}
Expand Down Expand Up @@ -2041,24 +2056,24 @@ function modify( $tpl, $operatorName, $operatorParameters,
// Insert a given string at a specified position:
case $this->InsertName:
{
$first = substr( $operatorValue, 0, $namedParameters['insert_position'] );
$second = substr( $operatorValue, $namedParameters['insert_position'] );
$first = $substrFunc( $operatorValue, 0, $namedParameters['insert_position'] );
$second = $substrFunc( $operatorValue, $namedParameters['insert_position'] );
$operatorValue = $first . $namedParameters['insert_string'] . $second;
}break;

// Remove a portion from a string:
case $this->RemoveName:
{
$first = substr( $operatorValue, 0, $namedParameters['offset'] );
$second = substr( $operatorValue, $namedParameters['offset'] + $namedParameters['length'] );
$first = $substrFunc( $operatorValue, 0, $namedParameters['offset'] );
$second = $substrFunc( $operatorValue, $namedParameters['offset'] + $namedParameters['length'] );
$operatorValue = $first . $second;
}break;

// Replace a portion of a string:
case $this->ReplaceName:
{
$first = substr( $operatorValue, 0, $namedParameters['offset'] );
$second = substr( $operatorValue, $namedParameters['offset'] + $namedParameters['length'] );
$first = $substrFunc( $operatorValue, 0, $namedParameters['offset'] );
$second = $substrFunc( $operatorValue, $namedParameters['offset'] + $namedParameters['length'] );
$mid = '';

for ( $i = 2; $i < count( $operatorParameters ); ++ $i )
Expand Down