Changeset 1391

Timestamp:

09/08/09 09:43:51 (15 years ago)

Author:

rodsouza

Message:

Ticket #478 - Aplicado patch disponibilizado no forum por Valmir Andre de Sena.

File:

• trunk/expressoAdmin1_2/inc/class.bosectors.inc.php (modified) (5 diffs)

trunk/expressoAdmin1_2/inc/class.bosectors.inc.php

@@ -27 +27 @@
                         $this->functions = $this->so->functions;
                         $this->db_functions = $this->so->db_functions;
-                        $this->soaccounts = createobject('expressoAdmin1_2.soaccounts');
-                        $this->sogroups = createobject('expressoAdmin1_2.sogroups');
+                        $this->group = createobject('expressoAdmin1_2.group');
+                        $this->user = createobject('expressoAdmin1_2.user');
                 }
 
@@ -109 +109 @@
                 function delete_sector()
                 {
+
                         // Verifica o acesso do gerente
                         if (!$this->functions->check_acl($_SESSION['phpgw_session']['session_lid'], 'delete_sectors'))
@@ -120 +121 @@
                         $manager_context = $_POST['manager_context'];
 
+                        
+
                         $sector_users = $this->so->get_sector_users($sector_dn);
-                        
                         for ($i=0; $i<count($sector_users)-1; $i++)
                         {
@@ -129 +131 @@
                                 $account_id = $sector_users[$i]['uidnumber'][0];
                                 $dn = $sector_users[$i]['dn'];
-
-                                $memberships = $this->soaccounts->get_user_memberships($account_id, $manager_context);
-                                $memberships = explode("|", $memberships);
-                                
-                                // Deleta os memberUid dos grupos que o usuario pertence.
-                                foreach ($memberships as $group_dn)
-                                        $this->soaccounts->delete_memberuid($group_dn, $uid);
-                        
-                                // Deleta o cn do usuarios no ldap.
-                                $this->soaccounts->delete_user_ldap($dn);
-                        
-                                // Deleta user dos grupos no BD
-                                $this->soaccounts->delete_group_user_pgsql($account_id);
-                        
-                                // Deleta apps do user
-                                $this->soaccounts->delete_apps_pgsql($account_id);
-                
-                                // Deleta permissao para alterar senha no pgsql
-                                $this->soaccounts->delete_changepassword_pgsql($account_id);
-
-                                // Deleta conta imap-cyrus do usuarios.
-                                $this->soaccounts->delete_account_imap($uid);
+                                $this->user->delete(Array('uid' =>  $uid , 'uidnumber' => $account_id));
                         }
 
@@ -160 +141 @@
                                 $gidnumber = $sector_groups[$i]['gidnumber'][0];
 
-                                //Delete cn of the group from ldap.
-                                if (!$this->sogroups->delete_group_ldap($dn))
-                                {
-                                        $_POST['error_messages'] = lang('Error delete Group in OpenLDAP.');
-                                        ExecMethod('expressoAdmin1_2.uisectors.list_sectors');
-                                        return false;
-                                }
-                        
-                                //Delete all users of the group from BD.
-                                $this->sogroups->delete_all_users_pgsql($gidnumber);
-                        
-                                //Delete all apps of the group from BD.
-                                $this->sogroups->delete_all_apps_pgsql($gidnumber);
+                                //Delete group
+                                $this->group->delete(Array('gidnumber' => $gidnumber, 'cn' => $dn));
                         }