extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-04 04:19:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Fix save so fileas gets updated even if n_fn is set (normal edit)

Browse Source 
- Add isUpdate parameter to fill in any not set fields from DB when updating fileas
This commit is contained in:
Nathan Gray 2010-06-28 14:05:33 +00:00
parent f616c628b5
commit fc841ff9cf
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
addressbook/inc/class.addressbook_bo.inc.php
View File

@ -341,15 +341,31 @@ class addressbook_bo extends addressbook_so
* *
* @param array $contact * @param array $contact
* @param string $type=null file_as type, default null to read it from the contact, unknown/not set type default to the first one * @param string $type=null file_as type, default null to read it from the contact, unknown/not set type default to the first one
* @param boolean $update=false If true, reads the old record for any not set fields
* @return string * @return string
*/ */
function fileas($contact,$type=null) function fileas($contact,$type=null, $isUpdate=false)
{ {
if (is_null($type)) $type = $contact['fileas_type']; if (is_null($type)) $type = $contact['fileas_type'];
if (!$type) $type = $this->prefs['fileas_default'] ? $this->prefs['fileas_default'] : $this->fileas_types[0]; if (!$type) $type = $this->prefs['fileas_default'] ? $this->prefs['fileas_default'] : $this->fileas_types[0];
if (strpos($type,'n_fn') !== false) $contact['n_fn'] = $this->fullname($contact); if (strpos($type,'n_fn') !== false) $contact['n_fn'] = $this->fullname($contact);
if($isUpdate)
{
$fileas_fields = array('n_prefix','n_given','n_middle','n_family','n_suffix','n_fn','org_name','org_unit','adr_one_locality');
$old = null;
foreach($fileas_fields as $field)
{
if(!isset($contact[$field]))
{
if(is_null($old)) $old = $this->read($contact['id']);
$contact[$field] = $old[$field];
}
}
unset($old);
}
$fileas = str_replace(array('n_prefix','n_given','n_middle','n_family','n_suffix','n_fn','org_name','org_unit','adr_one_locality'), $fileas = 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'], 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); $contact['n_fn'],$contact['org_name'],$contact['org_unit'],$contact['adr_one_locality']),$type);
@ -787,8 +803,9 @@ class addressbook_bo extends addressbook_so
if (!isset($contact['n_fn'])) if (!isset($contact['n_fn']))
{ {
$contact['n_fn'] = $this->fullname($contact); $contact['n_fn'] = $this->fullname($contact);
if (isset($contact['org_name'])) $contact['n_fileas'] = $this->fileas($contact);
} }
if (isset($contact['org_name'])) $contact['n_fileas'] = $this->fileas($contact, null, false);
$to_write = $contact; $to_write = $contact;
// (non-admin) user editing his own account, make sure he does not change fields he is not allowed to (eg. via SyncML or xmlrpc) // (non-admin) user editing his own account, make sure he does not change fields he is not allowed to (eg. via SyncML or xmlrpc)
if (!$ignore_acl && !$contact['owner'] && !$this->is_admin($contact)) if (!$ignore_acl && !$contact['owner'] && !$this->is_admin($contact))