[Phpgroupware-cvs] property/inc class.socommon.inc.php, 1.10 class.bocommon.inc.php, 1.15

[sigurdne]

Update of property/inc

Modified Files:
     Branch: MAIN
            class.socommon.inc.php lines: +2 -2
            class.bocommon.inc.php lines: +1 -2

Log Message:
Uncheck inactive user and list users status - whether 'Active' (A) or 
'Inactive' (I) in Admin->User accounts.

====================================================
Index: property/inc/class.socommon.inc.php
diff -u property/inc/class.socommon.inc.php:1.9 
property/inc/class.socommon.inc.php:1.10
--- property/inc/class.socommon.inc.php:1.9     Mon Sep 12 08:19:02 2005
+++ property/inc/class.socommon.inc.php Thu Sep 29 09:28:10 2005
@@ -79,7 +79,7 @@
                                $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 
$this->like '%$acl_location%' order by account_lastname ASC";
+                       $sql = "SELECT * FROM phpgw_accounts $this->join 
fm_acl2 on phpgw_accounts.account_id=fm_acl2.acl_account WHERE account_status = 
'A' AND acl_location $this->like '%$acl_location%' order by account_lastname 
ASC";
                        $this->db->query($sql,__LINE__,__FILE__);
                        while ($this->db->next_record())
                        {

====================================================
Index: property/inc/class.bocommon.inc.php
diff -u property/inc/class.bocommon.inc.php:1.14 
property/inc/class.bocommon.inc.php:1.15
--- property/inc/class.bocommon.inc.php:1.14    Mon Sep 12 08:19:02 2005
+++ property/inc/class.bocommon.inc.php Thu Sep 29 09:28:10 2005
@@ -485,7 +485,6 @@


                        
$users=$this->socommon->get_user_list_right($right,$acl_location);
-//_debug_array($users);

                        if (is_array($users_extra) && is_array($users))
                        {