extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-26 15:11:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix button tags over multiple lines were not processed correctly

Browse Source
This commit is contained in:
ralf 2022-07-26 17:36:22 +02:00
parent df0b4f3afb
commit 656c155951
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/etemplate.php
View File

@ -13,7 +13,7 @@
use EGroupware\Api; use EGroupware\Api;
// add et2- prefix to following widgets/tags, if NO <overlay legacy="true" // add et2- prefix to following widgets/tags, if NO <overlay legacy="true"
const ADD_ET2_PREFIX_REGEXP = '#<((/?)([vh]?box|date(-time[^\s]*|-duration|-since)?|button|colorpicker|url(-email|-phone|-fax)?))(/?|\s[^>]*)>#m'; const ADD_ET2_PREFIX_REGEXP = '#<((/?)([vh]?box|date(-time[^\s]*|-duration|-since)?|colorpicker|url(-email|-phone|-fax)?))(/?|\s[^>]*)>#m';
const ADD_ET2_PREFIX_LAST_GROUP = 6; const ADD_ET2_PREFIX_LAST_GROUP = 6;
// unconditional of legacy add et2- prefix to this widgets // unconditional of legacy add et2- prefix to this widgets
@ -298,9 +298,9 @@ function send_template()
else else
{ {
// fix <button(only)?.../> --> <et2-button(-image)? noSubmit="true".../> // fix <button(only)?.../> --> <et2-button(-image)? noSubmit="true".../>
$str = preg_replace_callback('#<button(only)?\s(.*?)/>#u', function ($matches) use ($name) { $str = preg_replace_callback('#<button(only)?\s(.*?)/>#s', function ($matches) use ($name) {
$tag = 'et2-button'; $tag = 'et2-button';
preg_match_all('/(^| )([a-z0-9_-]+)="([^"]+)"/i', $matches[2], $attrs, PREG_PATTERN_ORDER); preg_match_all('/(^|\s)([a-z0-9_-]+)="([^"]+)"/i', $matches[2], $attrs, PREG_PATTERN_ORDER);
$attrs = array_combine($attrs[2], $attrs[3]); $attrs = array_combine($attrs[2], $attrs[3]);
// replace buttononly tag with noSubmit="true" attribute // replace buttononly tag with noSubmit="true" attribute
if (!empty($matches[1])) if (!empty($matches[1]))