[Fmsystem-commits] [16383] entity: acl_rights

[sigurdne]

Revision: 16383
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16383
Author:   sigurdne
Date:     2017-02-24 03:02:44 -0500 (Fri, 24 Feb 2017)
Log Message:
-----------
entity: acl_rights

Modified Paths:
--------------
    trunk/property/inc/class.uientity.inc.php

Modified: trunk/property/inc/class.uientity.inc.php
===================================================================
--- trunk/property/inc/class.uientity.inc.php   2017-02-23 19:39:18 UTC (rev 
16382)
+++ trunk/property/inc/class.uientity.inc.php   2017-02-24 08:02:44 UTC (rev 
16383)
@@ -121,13 +121,17 @@
                        {
                                $this->acl_location .= ".{$this->cat_id}";
                        }
+
+                       $acl_check_location = $this->acl_location;
+
                        $config = CreateObject('phpgwapi.config', 
'property')->read();
 
                        if(!empty($config['bypass_acl_at_entity']) && 
is_array($config['bypass_acl_at_entity']) && in_array($this->entity_id, 
$config['bypass_acl_at_entity']))
                        {
                                $acl_check_location = 
".{$this->type}.$this->entity_id"; //parent
-                               $this->acl_read = true;
                        }
+
+                       $this->acl_read = 
$this->acl->check($acl_check_location, PHPGW_ACL_READ, 
$this->type_app[$this->type]);
                        $this->acl_add = $this->acl->check($acl_check_location, 
PHPGW_ACL_ADD, $this->type_app[$this->type]);
                        $this->acl_edit = 
$this->acl->check($acl_check_location, PHPGW_ACL_EDIT, 
$this->type_app[$this->type]);
                        $this->acl_delete = 
$this->acl->check($acl_check_location, PHPGW_ACL_DELETE, 
$this->type_app[$this->type]);