Changeset 317 for trunk/expressoAdmin1_2/inc/class.user.inc.php

Timestamp:

06/17/08 14:43:30 (16 years ago)

Author:

niltonneto

Message:

Versionamento feito pelo desenvolvedor (jakjr).

File:

• trunk/expressoAdmin1_2/inc/class.user.inc.php (modified) (6 diffs)

trunk/expressoAdmin1_2/inc/class.user.inc.php

@@ -132 +132 @@
                                 if (($this->current_config['expressoAdmin_samba_support'] == 'true') && ($params['use_attrs_samba'] == 'on'))
                                 {
+                                        
+                                        // Qualquer um que crie um usuário, deve ter permissão para adicionar a senha samba.
                                         // Verifica o acesso do gerente aos atributos samba
-                                        if ($this->functions->check_acl($_SESSION['phpgw_session']['session_lid'], 'edit_sambausers_attributes'))
-                                        {
+                                        //if ($this->functions->check_acl($_SESSION['phpgw_session']['session_lid'], 'edit_sambausers_attributes'))
+                                        //{
                                                 //Verifica se o binario para criar as senhas do samba exite.
                                                 if (!is_file('/home/expressolivre/mkntpwd'))
@@ -162 +164 @@
                                                         $user_info['sambaPwdMustChange']        = '2147483647';
                                                 }
-                                        }
+                                        //}
                                 }
                                 
@@ -292 +294 @@
                                 (!$this->functions->check_acl($manager_account_lid,'change_users_password')) &&
                                 (!$this->functions->check_acl($manager_account_lid,'edit_sambausers_attributes')) &&
-                                (!$this->functions->check_acl($manager_account_lid,'manipulate_corporative_information'))
+                                (!$this->functions->check_acl($manager_account_lid,'manipulate_corporative_information')) &&
+                                (!$this->functions->check_acl($manager_account_lid,'edit_users_phonenumber'))
                                 )
                         {
@@ -340 +343 @@
                                         $ldap_mod_replace['mail'] = $new_values['mail'];
                                         $this->ldap_functions->replace_user2maillists($new_values['mail'], $old_values['mail']);
+                                        $this->ldap_functions->replace_mail_from_institutional_account($new_values['mail'], $old_values['mail']);
                                         $this->db_functions->write_log("alterado mail do usuario",'',$dn,'','');
                                 }
@@ -354 +358 @@
                                 }
                                 */
-                                if (($diff['telephonenumber']) && ($old_values['telephonenumber'] != ''))
-                                {
-                                        $ldap_mod_replace['telephonenumber'] = $new_values['telephonenumber'];
-                                        $this->db_functions->write_log("alterado telephonenumber do usuario",'',$dn,'','');
-                                }
                                 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                                 // Passwd Expired - Com atributo
@@ -397 +396 @@
                                         
                                         $this->db_functions->write_log("alterado password do usuario",'',$dn,'','');
+                                }
+                        }
+
+                        if ( ($this->functions->check_acl($_SESSION['phpgw_session']['session_lid'], 'edit_users')) || 
+                             ($this->functions->check_acl($_SESSION['phpgw_session']['session_lid'], 'edit_users_phonenumber')) )
+                        {
+                                if (($diff['telephonenumber']) && ($old_values['telephonenumber'] != ''))
+                                {
+                                        $ldap_mod_replace['telephonenumber'] = $new_values['telephonenumber'];
+                                        $this->db_functions->write_log("alterado telephonenumber do usuario",'',$dn,'','');
                                 }
                         }