Changeset 46 for trunk/expressoAdmin1_2/inc/class.group.inc.php

Timestamp:

08/06/07 08:54:16 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

File:

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

trunk/expressoAdmin1_2/inc/class.group.inc.php

@@ -75 +75 @@
                         $group_info['userPassword']                     = '';
                         
+                        // E-mail for groups
+                        if ($params['email'] != '')
+                                $group_info['mail'] = $params['email'];
+                        
                         if (count($params['members']))
                         {
@@ -93 +97 @@
                         {
                                 $group_info['objectClass'][]  = 'sambaGroupMapping';
-                                $group_info['sambaSID']           = $params['sambadomain'] . '-' . (($id * 2) + 1001);
+                                $group_info['sambaSID']           = $params['sambasid'] . '-' . (($id * 2) + 1001);
                                 $group_info['sambaGroupType'] = '2';
                         }
@@ -166 +170 @@
                         }
                         
+                        $ldap_mod_replace = array();
                         ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                         // REPLACE SAMBASID OF SAMBA
-                        if ( ($this->current_config['expressoAdmin_samba_support'] == 'true') && ($diff['sambadomain']) ) 
-                        {
-                                $ldap_mod_replace['sambaSID'] = $new_values['sambadomain'] . '-' . ((2 * $new_values['uidnumber'])+1001);
-                                $this->db_functions->write_log("Alterado dominio samba do grupo $dn para " . $new_values['sambadomain'],'',$dn,'','');
+                        if ( ($this->current_config['expressoAdmin_samba_support'] == 'true') && ($diff['sambasid']) && ($old_values['sambasid']))
+                        {
+                                $ldap_mod_replace['sambasid'] = $new_values['sambasid'] . '-' . ((2 * $new_values['gidnumber'])+1001);
+                                $this->db_functions->write_log("Alterado dominio samba do grupo $dn para " . $new_values['sambasid'],'',$dn,'','');
                         }
                         
@@ -183 +188 @@
 
                         ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-                        // CALL LDAP_REPLACE FUNCTION                   
+                        // REPLACE E-Mail
+                        if ((($old_values['email']) && ($diff['email'])) && 
+                                $this->functions->check_acl($_SESSION['phpgw_session']['session_lid'],'edit_email_groups'))
+                        {
+                                $ldap_mod_replace['mail'] = $new_values['email'];
+                                $this->db_functions->write_log("Modificado E-Mail do grupo $dn",'',$dn,'','');
+                        }
+
+                        ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+                        // CALL LDAP_REPLACE FUNCTION
                         if (count($ldap_mod_replace))
                         {
@@ -226 +240 @@
                                         $ldap_add['objectClass'][]              = 'sambaGroupMapping';
                                         $ldap_add['sambagrouptype']             = '2';
-                                        $ldap_add['sambasid']                   = $new_values['sambadomain'] . '-' . ((2 * $new_values['gidnumber'])+1001);
+                                        $ldap_add['sambasid']                   = $new_values['sambasid'] . '-' . ((2 * $new_values['gidnumber'])+1001);
                                         
                                         $result = $this->ldap_functions->add_user_attributes($dn, $ldap_add);
@@ -241 +255 @@
                         ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                         // ADD ATTRIBUTES
+                        $ldap_add = array();
                         if (($new_values['phpgwaccountvisible'] == 'on') && ($old_values['phpgwaccountvisible'] != '-1'))
                         {
                                 $ldap_add['phpgwaccountvisible'] = '-1';
+                                $this->db_functions->write_log("Adicionado atributo phpgwaccountvisible ao grupo $dn",'','','','');
+                        }
+                        if ((($new_values['email']) && (!$old_values['email'])) &&
+                                $this->functions->check_acl($_SESSION['phpgw_session']['session_lid'],'edit_email_groups'))
+                        {
+                                $ldap_add['mail'] = $new_values['email'];
+                                $this->db_functions->write_log("Adicionado atributo mail ao grupo $dn",'','','','');
+                        }
+                        ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+                        // CALL LDAP_ADD FUNCTION                       
+                        if (count($ldap_add))
+                        {
                                 $result = $this->ldap_functions->add_user_attributes($dn, $ldap_add);
                                 if (!$result['status'])
@@ -250 +277 @@
                                         $return['msg'] .= $result['msg'];
                                 }
-                                else
-                                        $this->db_functions->write_log("Adicionado atributo phpgwaccountvisible ao grupo $dn",'','','','');
-                        }
-                        
+                        }
+                                                
+                        ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                         // REMOVE ATTRIBUTES
+                        $ldap_remove = array();
                         if (($new_values['phpgwaccountvisible'] != 'on') && ($old_values['phpgwaccountvisible'] == '-1'))
                         {
                                 $ldap_remove['phpgwaccountvisible'] = array();
+                                $this->db_functions->write_log("Removido atributo phpgwaccountvisible do grupo $dn",'','','','');
+                        }
+                        if (((!$new_values['email']) && ($old_values['email'])) &&
+                                $this->functions->check_acl($_SESSION['phpgw_session']['session_lid'],'edit_email_groups'))
+                        {
+                                $ldap_remove['mail'] = array();
+                                $this->db_functions->write_log("Removido atributo mail do grupo $dn",'','','','');
+                        }
+                        ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+                        // CALL LDAP_REMOVED FUNCTION                   
+                        if (count($ldap_remove))
+                        {
                                 $result = $this->ldap_functions->remove_user_attributes($dn, $ldap_remove);
                                 if (!$result['status'])
@@ -264 +303 @@
                                         $return['msg'] .= $result['msg'];
                                 }
-                                else
-                                        $this->db_functions->write_log("Removido atributo phpgwaccountvisible do grupo $dn",'','','','');
                         }