FIX ODT substitution when many HTML tags in string #32515
+24
−12
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… everything is taken between first opening tag and last closing tag. Write test to reproduce.
thomas-Ngr
force-pushed
the
18_fix_many_tags_in_string
branch
from
72693f2 to
78bf506
Compare
rycks
reviewed
Jan 9, 2025
htdocs/includes/odtphp/odf.php
Outdated
| const FIND_TAGS_REGEX = '/<([A-Za-z0-9]+)(?:\s([A-Za-z]+(?:\-[A-Za-z]+)?(?:=(?:".*?")|(?:[0-9]+))))*(?:(?:\s\/>)|(?:>(.*)<\/\1>))/s'; | ||
| const FIND_ENCODED_TAGS_REGEX = '/<([A-Za-z]+)(?:\s([A-Za-z]+(?:\-[A-Za-z]+)?(?:=(?:".*?")|(?:[0-9]+))))*(?:(?:\s\/>)|(?:>(.*)<\/\1>))/'; | ||
| const FIND_TAGS_REGEX = '/<([A-Za-z0-9]+)(?:\s([A-Za-z]+(?:\-[A-Za-z]+)?(?:=(?:".*?")|(?:[0-9]+))))*(?:(?:\s\/>)|(?:>(((?!<\1>).)*)<\/\1>))/s'; | ||
| const FIND_ENCODED_TAGS_REGEX = '/<([A-Za-z]+)(?:\s([A-Za-z]+(?:\-[A-Za-z]+)?(?:=(?:".*?")|(?:[0-9]+))))*(?:(?:\s\/>)|(?:>(((?!<\1>).)*)<\/\1>))/'; |
There was a problem hiding this comment.
note, FIND_ENCODED_TAGS_REGEX seems to be never used into all dolibarr source code, maybe a code cleanup @eldy to simplify the code ?
thomas-Ngr
commented
Jan 9, 2025
| @@ -46,8 +46,8 @@ class Odf | |||
| public $userdefined=array(); | |||
|
|
|||
| const PIXEL_TO_CM = 0.026458333; | |||
| const FIND_TAGS_REGEX = '/<([A-Za-z0-9]+)(?:\s([A-Za-z]+(?:\-[A-Za-z]+)?(?:=(?:".*?")|(?:[0-9]+))))*(?:(?:\s\/>)|(?:>(.*)<\/\1>))/s'; | |||
| const FIND_ENCODED_TAGS_REGEX = '/<([A-Za-z]+)(?:\s([A-Za-z]+(?:\-[A-Za-z]+)?(?:=(?:".*?")|(?:[0-9]+))))*(?:(?:\s\/>)|(?:>(.*)<\/\1>))/'; | |||
| const FIND_TAGS_REGEX = '/<([A-Za-z0-9]+)(?:\s([A-Za-z]+(?:\-[A-Za-z]+)?(?:=(?:".*?")|(?:[0-9]+))))*(?:(?:\s\/>)|(?:>(((?!<\1(\s.*)?>).)*)<\/\1>))/s'; | |||
There was a problem hiding this comment.
(((?!<\1(\s.*)?>).)*)
This groups matches any character (last .) as much as we want (last*) EXCEPT (?!) the first capturing group between opening and closing chevron (<\1>). It allows any other chars between the chevrons, if a space separates them from the tag((\s.*)?) : this is a lazy way to allow html attributes.
NB - In case of intricated tags <b class="truc">quatre<i>troc</i></b>, we want the match to take the outer tags, because _getDataFromHtml() is called recursively on the tag inner content.
lvessiller-opendsi
approved these changes
Jan 9, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
FIX ODT substitution : if a string contains many times the same HTML tag, only the first opening tag and the last closing tag are used.
To reproduce :
create a translation string containing two times the same HTML tag, :
I <b>contain</b> two <b>bold</b> tagscreate an ODT template with this translation string and upload it for any object
generate the ODT
see that the string is incorrectly rendered
This PR fixes this behavior and adds a test to lock the correct behavior.
As a side enhancement, the PR reverses the orders of parameters in test assertEquals() method since they were not in the right order.