[Fmsystem-commits] [15401] ACL: refine query

[sigurdne]

Revision: 15401
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15401
Author:   sigurdne
Date:     2016-08-02 17:41:09 +0000 (Tue, 02 Aug 2016)
Log Message:
-----------
ACL: refine query

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.acl.inc.php

Modified: trunk/phpgwapi/inc/class.acl.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.acl.inc.php        2016-08-02 15:54:49 UTC (rev 
15400)
+++ trunk/phpgwapi/inc/class.acl.inc.php        2016-08-02 17:41:09 UTC (rev 
15401)
@@ -2009,7 +2009,9 @@
                                $sql = "SELECT DISTINCT account_id, 
account_type FROM phpgw_accounts"
                                        . " {$this->_join} phpgw_acl on 
phpgw_accounts.account_id = phpgw_acl.acl_account"
                                        . " {$this->_join} phpgw_locations on 
phpgw_acl.location_id = phpgw_locations.location_id"
-                                       . " WHERE account_status = 'A' AND 
phpgw_locations.name = '{$location}'";
+                                       . " {$this->_join} phpgw_applications 
on phpgw_locations.app_id  = phpgw_applications.app_id"
+                                       . " WHERE account_status = 'A' AND 
phpgw_locations.name = '{$location}'"
+                                       . " AND phpgw_applications.app_name = 
'{$appname}'";
 
                                $this->_db->query($sql,__LINE__,__FILE__);