[Phpgroupware-cvs] api/class.acl.php, 1.1.1.1.2.13

[nomail]

Update of /api
Modified Files:
        Branch: proposal-branch
          class.acl.php

date: 2004/05/08 06:00:10;  author: jengo;  state: Exp;  lines: +8 -12

Log Message:
Fixed delete account
=====================================================================
Index: api/class.acl.php
diff -u api/class.acl.php:1.1.1.1.2.12 api/class.acl.php:1.1.1.1.2.13
--- api/class.acl.php:1.1.1.1.2.12      Mon Apr 26 06:19:24 2004
+++ api/class.acl.php   Sat May  8 06:00:10 2004
@@ -85,11 +85,6 @@
                        $this->host_id = $args['host_id'];
                        $this->acl_isop = $args['acl_isop'];
                }
-
-               function __sleep()
-               {
-                       // stub so its gets cache'd. No cleanup needed.
-               }
                
                function get_memberships ()
                {
@@ -420,21 +415,22 @@
                }
 
                // This should only be used when accounts are deleted.
-               function delete_account_rights()
+               function _delete_account_rights()
                {
                        $args = new safe_args();
                        $args->set('account_id',REQUIRED,'number');
-                       $args = $args->get(func_get_args());
+                       extract($args->get(func_get_args()));
 
-                       if ($args['account_id'] == 
$GLOBALS['phpgw_data']['user']['id'])
+                       if ($account_id == $GLOBALS['phpgw_data']['user']['id'])
                        {
-                               $GLOBALS['msgbox']->add(lang('You can not 
delete your own ACL'), 'warning');
+                               trigger_error(lang('You can not delete your own 
ACL'),E_USER_WARNING);
+
                                return false;
                        }
 
-                       $GLOBALS['phpgw']->db->Execute("delete from phpgw_acl 
where acl_account='" . $args['account_id'] . "'");
+                       $GLOBALS['phpgw']->db->execute('DELETE FROM phpgw_acl 
WHERE acl_account=' . $account_id);
 
-                       return $GLOBALS['phpgw']->db->Affected_Rows();
+                       return $GLOBALS['phpgw']->db->affected_rows();
                }
 
                /* I dont feel this function will be needed, and plan to remove 
it when certain.