holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests 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:
Cornelius Weiß 2006-06-27 16:30:53 +00:00
parent 7630412a9e
commit 2bf64c906d
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
resources/inc/class.bo_resources.inc.php
View File

@ -322,9 +322,13 @@ class bo_resources
*/
function link_query( $pattern )
{
$criteria = array('name' => $pattern, 'short_description' => $pattern);
$criteria = array('name' => $pattern, 'short_description' => $pattern);
$only_keys = 'res_id,name,short_description';
$data = $this->so->search($criteria,$only_keys,$order_by='',$extra_cols='',$wildcard='%',$empty,$op='OR');
$filter = array(
'cat_id' => array_flip((array)$this->acl->get_cats(EGW_ACL_READ)),
//'accessory_of' => '-1'
);
$data = $this->so->search($criteria,$only_keys,$order_by='',$extra_cols='',$wildcard='%',$empty,$op='OR','',$filter);
foreach($data as $num => $resource)
{
if($num != 0)
@ -347,9 +351,8 @@ class bo_resources
{
if (!($resource = $this->so->read(array('res_id' => $resource)))) return null;
}
// ToDo Conny: ACL check !!!
//if (!$this->check_acl($resource,EGW_ACL_READ)) return false;
if(!$this->acl->is_permitted($resource['cat_id'],EGW_ACL_READ)) return false;
return $resource['name']. ($resource['short_description'] ? ', ['.$resource['short_description'].']':'');
}