extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 12:39:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix error "Can not parse attributes ''" in smallpart.course

Browse Source 
thought preprocessor can currently not kope with nested details tags!
This commit is contained in:
ralf 2022-12-08 12:27:43 +01:00
parent d7f8f7d997
commit 06cb34974a
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
api/etemplate.php
View File

@ -136,7 +136,7 @@ function send_template()
return $matches[0]; return $matches[0];
}, $str); }, $str);
// Change details title --> summary // Change details title --> summary (This can currently not kope with nested details like in smallpart.curse.xet
$str = preg_replace_callback('#<details([^>]*?)>(.*?)</details>#su', static function ($matches) $str = preg_replace_callback('#<details([^>]*?)>(.*?)</details>#su', static function ($matches)
{ {
$attrs = parseAttrs($matches[1]); $attrs = parseAttrs($matches[1]);
@ -145,7 +145,7 @@ function send_template()
$attrs['summary'] = $attrs['title']; $attrs['summary'] = $attrs['title'];
unset($attrs['title']); unset($attrs['title']);
} }
return "<et2-details " . stringAttrs($attrs) . '>' . $matches[2] . "</et2-details>"; return "<et2-details" . stringAttrs($attrs) . '>' . $matches[2] . "</et2-details>";
}, $str); }, $str);
// Change splitter dockside -> primary + vertical // Change splitter dockside -> primary + vertical
@ -165,7 +165,7 @@ function send_template()
} }
unset($attrs['dock_side']); unset($attrs['dock_side']);
return "<$tag " . stringAttrs($attrs) . '>' . $matches[2] . "</$tag>"; return "<$tag" . stringAttrs($attrs) . '>' . $matches[2] . "</$tag>";
}, $str); }, $str);
// modify <(image|description) expose_view="true" --> <et2-*-expose // modify <(image|description) expose_view="true" --> <et2-*-expose
@ -220,7 +220,7 @@ function send_template()
$attrs['app'] = $attrs['only_app']; $attrs['app'] = $attrs['only_app'];
unset($attrs['only_app'], $attrs['readonly']); unset($attrs['only_app'], $attrs['readonly']);
} }
return "<$tag " . stringAttrs($attrs) . "></$tag>"; return "<$tag" . stringAttrs($attrs) . "></$tag>";
}, $str); }, $str);
// handling of select and taglist widget, incl. removing of type attribute // handling of select and taglist widget, incl. removing of type attribute
@ -292,7 +292,7 @@ function send_template()
$matches[2] = preg_replace('/^(select|taglist)/', '', $attrs['type']); $matches[2] = preg_replace('/^(select|taglist)/', '', $attrs['type']);
unset($attrs['type']); unset($attrs['type']);
} }
return '<et2-select' . $matches[2] . ' ' . stringAttrs($attrs) . '>'.$matches[5].'</et2-select' . $matches[2] . '>'; return '<et2-select' . $matches[2] . stringAttrs($attrs) . '>'.$matches[5].'</et2-select' . $matches[2] . '>';
}, $str); }, $str);
// nextmatch headers // nextmatch headers
@ -316,7 +316,7 @@ function send_template()
$matches[2] = "filter"; $matches[2] = "filter";
} }
return '<et2-nextmatch-header-' . $matches[2] . ' ' . stringAttrs($attrs) . '/>'; return '<et2-nextmatch-header-' . $matches[2] . stringAttrs($attrs) . '/>';
}, $str); }, $str);
// fix <(button|buttononly|timestamper).../> --> <et2-(button|image|button-timestamp) (noSubmit="true")?.../> // fix <(button|buttononly|timestamper).../> --> <et2-(button|image|button-timestamp) (noSubmit="true")?.../>
@ -351,7 +351,7 @@ function send_template()
$tag = 'et2-button-icon'; $tag = 'et2-button-icon';
} }
unset($attrs['background_image']); unset($attrs['background_image']);
return "<$tag " . stringAttrs($attrs) . '></' . $tag . '>'; return "<$tag" . stringAttrs($attrs) . '></' . $tag . '>';
}, $str); }, $str);
$str = preg_replace('#<time_or_date\s([^>]+)/>#', '<et2-date-time-today $1></et2-date-time-today>', $str); $str = preg_replace('#<time_or_date\s([^>]+)/>#', '<et2-date-time-today $1></et2-date-time-today>', $str);
@ -383,9 +383,9 @@ function send_template()
$tab_attrs['summary'] = $tab_attrs['label']; $tab_attrs['summary'] = $tab_attrs['label'];
$tab_attrs['title'] = $tab_attrs['statustext']; $tab_attrs['title'] = $tab_attrs['statustext'];
unset($tab_attrs['label'], $tab_attrs['statustext']); unset($tab_attrs['label'], $tab_attrs['statustext']);
$details[] = $indent."\t".'<et2-details '.stringAttrs($tab_attrs).'>'."\n$indent\t\t".$panels[0][$n]."\n$indent\t</et2-details>"; $details[] = $indent."\t".'<et2-details'.stringAttrs($tab_attrs).'>'."\n$indent\t\t".$panels[0][$n]."\n$indent\t</et2-details>";
} }
return $indent.'<vbox '.stringAttrs($tabbox_attrs).">\n".implode("\n", $details)."\n$indent</vbox>"; return $indent.'<vbox'.stringAttrs($tabbox_attrs).">\n".implode("\n", $details)."\n$indent</vbox>";
}, $str); }, $str);
} }
@ -499,6 +499,10 @@ function send_template()
*/ */
function parseAttrs($str) function parseAttrs($str)
{ {
if (empty($str) || !trim($str))
{
return [];
}
if (!preg_match_all('/(^|\s)([a-z\d_-]+)="([^"]*)"/i', $str, $attrs, PREG_PATTERN_ORDER)) if (!preg_match_all('/(^|\s)([a-z\d_-]+)="([^"]*)"/i', $str, $attrs, PREG_PATTERN_ORDER))
{ {
throw new Exception("Can NOT parse attributes from '$str'"); throw new Exception("Can NOT parse attributes from '$str'");
@ -509,12 +513,18 @@ function parseAttrs($str)
/** /**
* Combine attribute array into a string * Combine attribute array into a string
* *
* If there are attributes the returned string is prefixed with a single space, otherwise an empty string is returned.
*
* @param array $attrs * @param array $attrs
* @return string * @return string
*/ */
function stringAttrs(array $attrs) function stringAttrs(array $attrs)
{ {
return implode(' ', array_map(static function ($name, $value) { if (!$attrs)
{
return '';
}
return ' '.implode(' ', array_map(static function ($name, $value) {
return $name . '="' . $value . '"'; return $name . '="' . $value . '"';
}, array_keys($attrs), $attrs)); }, array_keys($attrs), $attrs));
} }