holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow expansion of custom fields when merging to include fields from other apps

Browse Source 
eg: {{#other_app/#addressbook_cf/n_fn}}
This commit is contained in:
nathangray 2017-01-19 10:51:57 -07:00
parent 4d67545849
commit d205c2d294
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
api/src/Storage/Merge.php
View File

@ -1368,6 +1368,18 @@ abstract class Merge
preg_match_all('/\${2}(([^\/#]*?\/)?)#([^$\/]+)\/(.*?)[$}]{2}/', $content, $matches); preg_match_all('/\${2}(([^\/#]*?\/)?)#([^$\/]+)\/(.*?)[$}]{2}/', $content, $matches);
list($placeholders, , , $cf, $sub) = $matches; list($placeholders, , , $cf, $sub) = $matches;
// Collect any used custom fields from entries so you can do
// {{#other_app/#other_app_cf/n_fn}}
$expand_sub_cfs = [];
foreach($sub as $index => $cf_sub)
{
if(strpos($cf_sub, '#') === 0)
{
$expand_sub_cfs[$cf[$index]] .= '$$'.$cf_sub . '$$ ';
}
}
$expand_sub_cfs = array_unique($expand_sub_cfs);
foreach($cf as $index => $field) foreach($cf as $index => $field)
{ {
if($cfs[$field]) if($cfs[$field])
@ -1398,9 +1410,10 @@ abstract class Merge
{ {
$classname = "{$field_app}_merge"; $classname = "{$field_app}_merge";
$class = new $classname(); $class = new $classname();
// If we send the real content, it can result in infinite loop of lookups // If we send the real content it can result in infinite loop of lookups
// This means you can't do {{#other_app/#other_app_cf/n_fn}} // so we send only the used fields
$content = ''; $content = $expand_sub_cfs[$field] ? $expand_sub_cfs[$field] : '';
$app_replacements[$field] = $class->get_replacements($values['#'.$field], $content); $app_replacements[$field] = $class->get_replacements($values['#'.$field], $content);
} }
$replacements[$placeholders[$index]] = $app_replacements[$field]['$$'.$sub[$index].'$$']; $replacements[$placeholders[$index]] = $app_replacements[$field]['$$'.$sub[$index].'$$'];