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

avoid setting fullname to empty string by first checking the strlen of it

Browse Source
This commit is contained in:
Christian Binder 2009-11-04 15:09:24 +00:00
parent 4e9120ecf0
commit 79a3b59ccb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -618,10 +618,11 @@ class addressbook_bo extends addressbook_so
$contact['modifier'] = $this->user; $contact['modifier'] = $this->user;
$contact['modified'] = $this->now_su; $contact['modified'] = $this->now_su;
// set full name and fileas from the content // set full name and fileas from the content
if (!isset($contact['n_fn']) || $contact['n_fn'] != $this->fullname($contact)) { if (strlen($fullname = $this->fullname($contact)) > 0 && (!isset($contact['n_fn']) || $contact['n_fn'] != $fullname)) {
$contact['n_fn'] = $this->fullname($contact); $contact['n_fn'] = $fullname;
if (isset($contact['org_name'])) $contact['n_fileas'] = $this->fileas($contact); if (isset($contact['org_name'])) $contact['n_fileas'] = $this->fileas($contact);
} }
unset($fullname);
$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))