Changeset 9 for trunk/expressoAdmin1_2/inc/class.uiaccounts.inc.php

Timestamp:

03/29/07 14:23:18 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

File:

• trunk/expressoAdmin1_2/inc/class.uiaccounts.inc.php (modified) (8 diffs)

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

@@ -26 +26 @@
                 var $functions;
                 var $current_config;
+                var $ldap_functions;
 
                 function uiaccounts()
@@ -32 +33 @@
                         $this->nextmatchs       = CreateObject('phpgwapi.nextmatchs');
                         $this->functions        = CreateObject('expressoAdmin1_2.functions');
+                        $this->ldap_functions = CreateObject('expressoAdmin1_2.ldap_functions');
                         
                         $c = CreateObject('phpgwapi.config','expressoAdmin1_2');
@@ -299 +301 @@
                         $tmp = $this->functions->read_acl($manager_account_lid);
                         $manager_context = $tmp[0]['context'];
+                        $alert_warning = '';
                         
                         // Verifica se tem acesso a este modulo
@@ -339 +342 @@
                         $GLOBALS['phpgw']->js->validate_file("jscode","users","expressoAdmin1_2");
                         $GLOBALS['phpgw']->js->set_onload("get_available_groups(document.forms[0].context.value);");
-                        //$GLOBALS['phpgw']->js->set_onload("get_sectors(document.forms[0].context.value, '".$user_info['context']."','".$user_info['departmentnumber']."');");
                         $GLOBALS['phpgw']->js->set_onload("get_available_maillists(document.forms[0].context.value);");
                         $GLOBALS['phpgw']->js->set_onload("use_samba_attrs('".$user_info['sambaUser']."');");
@@ -368 +370 @@
                                 foreach ($array_groups as $gidnumber=>$cn)
                                 {
-                                        $ea_select_user_groups_options .= "<option value=" . $gidnumber . ">" . $cn . "</option>";
+                                        
+                                        // O memberUid do usuário está somente no Banco, então adicionamos o memberUid no Ldap.
+                                        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 . " [Incluido memberUid no Ldap]</option>";
+                                                
+                                                if ($alert_warning == '')
+                                                        $alert_warning = "O expressoAdmin corrigiu as seguintes inconsistências:\\n";
+                                                $alert_warning .= "Incluido atributo memberUid do usuário no grupo $cn.\\n";
+                                        }
+                                        else
+                                                $ea_select_user_groups_options .= "<option value=" . $gidnumber . ">" . $cn . "3</option>";
+                                        
                                         if ($gidnumber == $user_info['gidnumber'])
                                         {
@@ -378 +393 @@
                                         }
                                 }
+                                
+                                // O memberUid do usuário está somente no Ldap, então removemos ele.
+                                $groups_db = array_flip($user_info['groups']);
+                                foreach ($user_info['groups_ldap'] as $gidnumber=>$cn)
+                                {
+                                        if (is_null($groups_db[$gidnumber]))
+                                        {
+                                                $this->ldap_functions->remove_user2group($gidnumber, $user_info['uid']);
+                                                if ($alert_warning == '')
+                                                        $alert_warning = "O expressoAdmin corrigiu as seguintes inconsistências:\\n";
+                                                $alert_warning .= "Removido atributo memberUid do usuário do grupo $cn.\\n";
+                                        }
+                                }       
                         }
                         
@@ -412 +440 @@
                         }
 
-                        /*
-                        echo '<pre>';
-                        _debug_array($user_info);
-                        echo '</pre>';
-                        */
-                        
+                        if ($alert_warning != '')
+                                $alert_warning = "alert('". $alert_warning ."')";
+
                         $var = Array(
                                 'uidnumber'                                     => $_GET['account_id'],
@@ -438 +463 @@
                                 
                                 // First ABA
+                                'alert_warning'                                 => "$alert_warning",
                                 'display_input_account_lid'             => 'display:none',
                                 'lang_general_information'              => lang('General Information'),