implement birthday as fileas option

This commit is contained in:
Ralf Becker 2016-05-06 16:17:05 +00:00
parent f70c828fbd
commit 28b534d7eb

View File

@ -57,6 +57,7 @@ class Contacts extends Contacts\Storage
'n_family, n_given', 'n_family, n_given',
'n_family, n_prefix', 'n_family, n_prefix',
'n_fn', 'n_fn',
'n_family, n_given (bday)',
); );
/** /**
@ -416,7 +417,7 @@ class Contacts extends Contacts\Storage
if($isUpdate) if($isUpdate)
{ {
$fileas_fields = array('n_prefix','n_given','n_middle','n_family','n_suffix','n_fn','org_name','org_unit','adr_one_locality'); $fileas_fields = array('n_prefix','n_given','n_middle','n_family','n_suffix','n_fn','org_name','org_unit','adr_one_locality','bday');
$old = null; $old = null;
foreach($fileas_fields as $field) foreach($fileas_fields as $field)
{ {
@ -432,9 +433,18 @@ class Contacts extends Contacts\Storage
// removing empty delimiters, caused by empty contact fields // removing empty delimiters, caused by empty contact fields
$fileas = str_replace(array(', , : ',', : ',': , ',', , ',': : ',' ()'), $fileas = str_replace(array(', , : ',', : ',': , ',', , ',': : ',' ()'),
array(': ',': ',': ',', ',': ',''), array(': ',': ',': ',', ',': ',''),
str_replace(array('n_prefix','n_given','n_middle','n_family','n_suffix','n_fn','org_name','org_unit','adr_one_locality'), strtr($type, array(
array($contact['n_prefix'],$contact['n_given'],$contact['n_middle'],$contact['n_family'],$contact['n_suffix'], 'n_prefix' => $contact['n_prefix'],
$contact['n_fn'], $contact['org_name'], $contact['org_unit'], $contact['adr_one_locality']), $type)); 'n_given' => $contact['n_given'],
'n_middle' => $contact['n_middle'],
'n_family' => $contact['n_family'],
'n_suffix' => $contact['n_suffix'],
'n_fn' => $contact['n_fn'],
'org_name' => $contact['org_name'],
'org_unit' => $contact['org_unit'],
'adr_one_locality' => $contact['adr_one_locality'],
'bday' => (int)$contact['bday'] ? DateTime::to($contact['bday'], true) : $contact['bday'],
)));
while ($fileas[0] == ':' || $fileas[0] == ',') while ($fileas[0] == ':' || $fileas[0] == ',')
{ {
@ -505,6 +515,7 @@ class Contacts extends Contacts\Storage
'org_name' => lang('company'), 'org_name' => lang('company'),
'org_unit' => lang('department'), 'org_unit' => lang('department'),
'adr_one_locality' => lang('city'), 'adr_one_locality' => lang('city'),
'bday' => lang('Birthday'),
); );
foreach(array_keys($labels) as $name) foreach(array_keys($labels) as $name)
{ {