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

Timestamp:

11/03/11 13:24:14 (12 years ago)

Author:

wmerlotto

Message:

Ticket #2305 - Enviando alteracoes, desenvolvidas internamente na Prognus, do modulo ExpressoAdmin.

File:

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

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

@@ -135 +135 @@
                                 $return['msg'] .= $result['msg'];
                         }
-                        // PERSONAL DATA FIELDS TO BLOCK.
-                        if(is_array($params['acl_block_personal_data'])){
-                                $acl_personal_data = 0;
-                                foreach($params['acl_block_personal_data'] as $i => $data_field){
-                                        $acl_personal_data |= intval($data_field);
-                                }
-                                $this->db_functions->save_acl_personal_data($id, $acl_personal_data, 'add');
-                        }
                         
                         if ($return['status'] == true)
@@ -428 +420 @@
                         }
                         //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-                        // PERSONAL DATA FIELDS TO BLOCK.
-                        $old_acl_personal_data = intval($old_values['acl_block_personal_data']);
-                        $new_acl_personal_data = 0;
-                        if(is_array($new_values['acl_block_personal_data'])){                           
-                                foreach($new_values['acl_block_personal_data'] as $i => $data_field){
-                                        $new_acl_personal_data |= intval($data_field);
-                                }
-                        }
-                        if($new_acl_personal_data != $old_acl_personal_data){
-                                if($new_acl_personal_data > 0 && $old_acl_personal_data == 0) {
-                                        $this->db_functions->save_acl_personal_data($new_values['gidnumber'], $new_acl_personal_data, 'add');
-                                        $this->db_functions->write_log("added ACL block personal data to group","dn:$dn -> acl: $new_acl_personal_data");
-                                }
-                                elseif($new_acl_personal_data == 0 && $old_acl_personal_data > 0){
-                                        $this->db_functions->save_acl_personal_data($new_values['gidnumber'], $new_acl_personal_data, 'remove');
-                                        $this->db_functions->write_log("removed ACL block personal data to group","dn:$dn");
-                                }
-                                else{
-                                        $this->db_functions->save_acl_personal_data($new_values['gidnumber'], $new_acl_personal_data);
-                                        $this->db_functions->write_log("changed ACL block personal data to group","dn:$dn ->  acl: $old_acl_personal_data => $new_acl_personal_data");
-                                }
-                        }
                         
                         return $return;
@@ -455 +425 @@
                 
                 
-                function get_info($gidnumber,$use_global_context=false)
-                {
-                        $group_info_ldap = $this->ldap_functions->get_group_info($gidnumber,$use_global_context);
-                        $group_info_db = $this->db_functions->get_group_info($gidnumber,$use_global_context);
+                function get_info($gidnumber)
+                {
+                        $group_info_ldap = $this->ldap_functions->get_group_info($gidnumber);
+                        $group_info_db = $this->db_functions->get_group_info($gidnumber);
                         
                         $group_info = array_merge($group_info_ldap, $group_info_db);