[eGroupWare-svn] r56079 - /trunk/egroupware/api/src/Contacts.php
[email protected] Fri, 06 May 2016 16:17:05 -0000
| Newsgroups | gmane.comp.web.egroupware.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: ralfbecker
Date: Fri May 6 18:17:05 2016
New Revision: 56079
URL: http://svn.stylite.de/viewvc/egroupware?rev=56079&view=rev
Log:
implement birthday as fileas option
Modified:
trunk/egroupware/api/src/Contacts.php
Modified: trunk/egroupware/api/src/Contacts.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Contacts.php?rev=56079&r1=56078&r2=56079&view=diff
==============================================================================
--- trunk/egroupware/api/src/Contacts.php (original)
+++ trunk/egroupware/api/src/Contacts.php Fri May 6 18:17:05 2016
@@ -57,6 +57,7 @@
'n_family, n_given',
'n_family, n_prefix',
'n_fn',
+ 'n_family, n_given (bday)',
);
/**
@@ -416,7 +417,7 @@
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;
foreach($fileas_fields as $field)
{
@@ -432,9 +433,18 @@
// removing empty delimiters, caused by empty contact fields
$fileas = str_replace(array(', , : ',', : ',': , ',', , ',': : ',' ()'),
array(': ',': ',': ',', ',': ',''),
- str_replace(array('n_prefix','n_given','n_middle','n_family','n_suffix','n_fn','org_name','org_unit','adr_one_locality'),
- array($contact['n_prefix'],$contact['n_given'],$contact['n_middle'],$contact['n_family'],$contact['n_suffix'],
- $contact['n_fn'], $contact['org_name'], $contact['org_unit'], $contact['adr_one_locality']), $type));
+ strtr($type, array(
+ 'n_prefix' => $contact['n_prefix'],
+ '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] == ',')
{
@@ -505,6 +515,7 @@
'org_name' => lang('company'),
'org_unit' => lang('department'),
'adr_one_locality' => lang('city'),
+ 'bday' => lang('Birthday'),
);
foreach(array_keys($labels) as $name)
{
------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z