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

Fix addressbook HTML customfields were stripped of their tags when merging

Browse Source
This commit is contained in:
nathangray 2019-02-07 09:59:38 -07:00
parent dfb93cfa20
commit ec04121692
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/Contacts/Merge.php
View File

@ -57,7 +57,7 @@ class Merge extends Api\Storage\Merge
*/
protected function get_replacements($id,&$content=null,$ignore_acl=false)
{
if (!($replacements = $this->contact_replacements($id,'',$ignore_acl)))
if (!($replacements = $this->contact_replacements($id,'',$ignore_acl, $content)))
{
return false;
}

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

@ -293,9 +293,21 @@ abstract class Merge
foreach($ignore_acl ? Customfields::get('addressbook', true) : $this->contacts->customfields as $name => $field)
{
$name = '#'.$name;
if(!$contact[$name])
{
$replacements['$$'.($prefix ? $prefix.'/':'').$name] = '';
continue;
}
// Format date cfs per user Api\Preferences
if($this->mimetype !== 'application/x-yaml' && $contact[$name] &&
($field['type'] == 'date' || $field['type'] == 'date-time'))
{
$this->date_fields[] = '#'.$name;
$replacements['$$'.($prefix ? $prefix.'/':'').$name.'$$'] = Api\DateTime::to($contact[$name], $field['type'] == 'date' ? true : '');
}
$replacements['$$'.($prefix ? $prefix.'/':'').$name.'$$'] =
// use raw data for yaml, no user-preference specific formatting
$this->mimetype == 'application/x-yaml' ? (string)$contact[$name] :
$this->mimetype == 'application/x-yaml' || $field['type'] == 'htmlarea' ? (string)$contact[$name] :
Customfields::format($field, (string)$contact[$name]);
}
@ -895,7 +907,7 @@ abstract class Merge
// some general replacements: current user, date and time
if (strpos($content,'$$user/') !== null && ($user = $GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id')))
{
$replacements += $this->contact_replacements($user,'user');
$replacements += $this->contact_replacements($user,'user', false, $content);
$replacements['$$user/primary_group$$'] = $GLOBALS['egw']->accounts->id2name($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'account_primary_group'));
}
$replacements['$$date$$'] = Api\DateTime::to('now',true);