Changeset 5220

Timestamp:

11/30/11 10:14:43 (11 years ago)

Author:

clairson

Message:

Ticket #2358 - Verificar inconsistencia do usuario no bd e nao estar no ldap

Location:

trunk/expressoAdmin1_2

Files:

• inc/class.uiaccounts.inc.php (modified) (2 diffs)
• setup/phpgw_pt-br.lang (modified) (previous)

trunk/expressoAdmin1_2/inc/class.uiaccounts.inc.php

@@ -496 +496 @@
                                 foreach ($array_groups as $gidnumber=>$cn)
                                 {
-                                        // O memberUid do usuário está somente no Banco, então adicionamos o memberUid no Ldap.
+                                        //Não foi possível encontrar o grupo do usuário, portanto excluimos o usuário(não tem inserir no grupo do Ldap se não possui grupo)
                                         if (is_null($user_info['groups_ldap'][$gidnumber]))
                                         {
-                                                $this->ldap_functions->add_user2group($gidnumber, $user_info['uid']);
-                                                $ea_select_user_groups_options .= "<option value=" . $gidnumber . ">" . $cn . " [" . lang('included memberuid on ldap')."]</option>";
-
+                                                $this->db_functions->remove_user2group($gidnumber, $_GET['account_id']);
                                                 if ($alert_warning == '')
                                                         $alert_warning = lang("the expressoadmin corrected the following inconsistencies") . ":\\n";
-                                                $alert_warning .= lang("included user on group") . ":\\n$cn - gidnumber: $gidnumber.";
+                                                $alert_warning .= lang("user excluded because the group do not was found") . ":\\n$cn - gidnumber: $gidnumber.";
                                         }
-                                        else
+                                        else                                               
                                                 $ea_select_user_groups_options .= "<option value=" . $gidnumber . ">" . $cn . "</option>";
                                         
@@ -518 +516 @@
                                         }
                                 }
-                                
+                                
                                 // O memberUid do usuário está somente no Ldap.
                                 $groups_db = array_flip($user_info['groups']);