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

use raw custom-field data for yaml files, no user-preference specific formatting, all to use regular expressions in yaml files to modify content of placeholders, eg. commas with linebreaks: "{{name/, */\n}}"

Browse Source
This commit is contained in:
Ralf Becker 2015-06-18 13:18:07 +00:00
parent d02ca8ecb5
commit 5449825beb
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
etemplate/inc/class.bo_merge.inc.php
View File

@ -263,7 +263,10 @@ abstract class bo_merge
foreach($this->contacts->customfields as $name => $field)
{
$name = '#'.$name;
$replacements['$$'.($prefix ? $prefix.'/':'').$name.'$$'] = egw_customfields::format($field, (string)$contact[$name]);
$replacements['$$'.($prefix ? $prefix.'/':'').$name.'$$'] =
// use raw data for yaml, no user-preference specific formatting
$this->mimetype == 'application/x-yaml' ? (string)$contact[$name] :
egw_customfields::format($field, (string)$contact[$name]);
}
// Add in extra cat field
@ -1089,13 +1092,25 @@ abstract class bo_merge
}
if ($mimetype == 'application/x-yaml')
{
$content = preg_replace_callback('/^( +)(\$\$[^$]+\$\$)/m', function($matches) use ($replacements)
$content = preg_replace_callback('/^( +)([^$\n]*)(\$\$.+?\$\$)/m', function($matches) use ($replacements)
{
$replacement = $replacements[$matches[2]];
// allow with {{name/replace/with}} syntax to replace eg. commas with linebreaks: "{{name/, */\n}}"
$parts = null;
if (preg_match('|^\$\$([^/]+)/([^/]+)/([^$]*)\$\$$|', $matches[3], $parts) && isset($replacements['$$'.$parts[1].'$$']))
{
$replacement =& $replacements['$$'.$parts[1].'$$'];
$replacement = preg_replace('/'.$parts[2].'/', strtr($parts[3], array(
'\\n' => "\n", '\\r' => "\r", '\\t' => "\t", '\\v' => "\v", '\\\\' => '\\', '\\f' => "\f",
)), $replacement);
}
else
{
$replacement =& $replacements[$matches[3]];
}
// replacement with multiple lines --> add same number of space as before placeholder
if (isset($replacement) && strpos($replacement, "\n") !== false)
if (isset($replacement))
{
return $matches[1].implode("\n".$matches[1], preg_split("/\r?\n/", $replacement));
return $matches[1].$matches[2].implode("\n".$matches[1], preg_split("/\r?\n/", $replacement));
}
return $matches[0]; // regular replacement below
}, $content);