extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-23 07:09:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

link_title method returns now null to indicate an entry does not exist (and all links can be deleted) or false if there are insufficent rights to view the title

Browse Source
This commit is contained in:
Ralf Becker 2006-06-24 16:03:00 +00:00
parent 558a52b491
commit a48b353c14
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
addressbook/inc/class.bocontacts.inc.php
View File

@ -442,14 +442,17 @@ class bocontacts extends socontacts
* reads contacts matched by key and puts all cols in the data array * reads contacts matched by key and puts all cols in the data array
* *
* @param int/string $contact_id * @param int/string $contact_id
* @return array/boolean contact data or false on error * @return array/boolean array with contact data, null if not found or false on no view perms
*/ */
function read($contact_id) function read($contact_id)
{ {
$data = parent::read($contact_id); if (!($data = parent::read($contact_id)))
if (!$data || !$this->check_perms(EGW_ACL_READ,$data))
{ {
return false; return null; // not found
}
if (!$this->check_perms(EGW_ACL_READ,$data))
{
return false; // no view perms
} }
// determine the file-as type // determine the file-as type
$data['fileas_type'] = $this->fileas_type($data); $data['fileas_type'] = $this->fileas_type($data);
@ -635,7 +638,7 @@ class bocontacts extends socontacts
* Is called as hook to participate in the linking * Is called as hook to participate in the linking
* *
* @param int/string/array $contact int/string id or array with contact * @param int/string/array $contact int/string id or array with contact
* @param string the title * @param string/boolean string with the title, null if contact does not exitst, false if no perms to view it
*/ */
function link_title($contact) function link_title($contact)
{ {
@ -645,9 +648,9 @@ class bocontacts extends socontacts
} }
if (!is_array($contact)) if (!is_array($contact))
{ {
return False; return $contact;
} }
return $contact['n_fileas']; return $contact['n_fileas'] ? $contact['n_fileas'] : $this->fileas($contact);
} }
/** /**