[Phpgroupware-cvs] property/class.socommon.php, 1.1.1.4

[nomail]

Update of /property
Modified Files:
        Branch: 
          class.socommon.php

date: 2004/04/24 19:39:54;  author: sigurdne;  state: Exp;  lines: +4 -8

Log Message:
no message
=====================================================================
Index: property/class.socommon.php
diff -u property/class.socommon.php:1.1.1.3 property/class.socommon.php:1.1.1.4
--- property/class.socommon.php:1.1.1.3 Fri Apr 23 21:26:33 2004
+++ property/class.socommon.php Sat Apr 24 19:39:54 2004
@@ -20,7 +20,7 @@
 
                function property_socommon()
                {
-                       $this->currentapp       = 'property'; 
//$GLOBALS['phpgw_info']['flags']['currentapp'];
+                       $this->currentapp       = 'property'; 
//$GLOBALS['phpgw_data']['flags']['req_app'];
                        $this->db               = $GLOBALS['phpgw']->db;
                        $this->db2              = $this->db;
                        $this->account  = $GLOBALS['phpgw_data']['user']['id'];
@@ -67,23 +67,19 @@
 
                function get_user_list_right($right='',$acl_location='')
                {
+//html_print_r($acl_location);
                        $acl2   = 
CreateObject($this->currentapp.'_acl2','##DEFAULT##','##DEFAULT##');
-                       $myaccounts = CreateObject('phpgwapi_accounts');
-
-                       while($my_memberships && list($key,$group) = 
each($my_memberships))
-                       {
-                               $security .= "," . $group['account_id'];
-                       }
 
                        $sql = "SELECT * FROM phpgw_accounts $this->join 
fm_acl2 on phpgw_accounts.account_id=fm_acl2.acl_account where acl_location 
LIKE '%$acl_location%' order by account_lastname ASC";
                        $dbresult = $GLOBALS['phpgw']->db->Execute($sql);
                        while (!$dbresult->EOF)
                        {
+//html_print_r($dbresult->fields['account_id']);
                                
if($acl2->check($acl_location,$right,$dbresult->fields['acl_account']))
                                {
                                        
if($dbresult->fields['account_type']=='g')
                                        {
-                                               $members = 
$myaccounts->member($dbresult->fields['account_id']);
+                                               $members = 
$acl2->member($dbresult->fields['account_id']);
                                                if (isset($members) AND 
is_array($members))
                                                {
                                                        foreach($members as 
$user)