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

Timestamp:

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

Author:

niltonneto

Message:

* empty log message *

File:

• trunk/expressoAdmin1_2/inc/class.group.inc.php (modified) (1 diff)

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

@@ -282 +282 @@
                                 }
                         }
-                        $add_apps    = array_diff($new_values2, $old_values2);
-                        $remove_apps = array_diff($old_values2, $new_values2);
+                        
+                        $add_apps    = array_flip(array_diff($new_values2, $old_values2));
+                        $remove_apps = array_flip(array_diff($old_values2, $new_values2));
 
                         if (count($add_apps)>0)
                         {
-                                $this->db_functions->add_id2apps($new_values['gidnumber'], array_flip($add_apps));
-                        }
+                                $this->db_functions->add_id2apps($new_values['gidnumber'], $add_apps);
+                                
+                                foreach ($add_apps as $app => $index)
+                                        $this->db_functions->write_log("Adicionado aplicativo $app ao grupo $dn",'',$dn,'','');
+                        }
+                        
                         if (count($remove_apps)>0)
                         {
-                                $this->db_functions->remove_id2apps($new_values['gidnumber'], array_flip($remove_apps));
+                                //Verifica se o gerente tem acesso a aplicação antes de remove-la do usuario.
+                                $manager_apps = $this->db_functions->get_apps($_SESSION['phpgw_session']['session_lid']);
+                                        
+                                foreach ($remove_apps as $app => $app_index)
+                                {
+                                        if ($manager_apps[$app] == 'run')
+                                                $remove_apps2[$app] = $app_index;
+                                }
+                                $this->db_functions->remove_id2apps($new_values['gidnumber'], $remove_apps2);
+                                        
+                                foreach ($remove_apps2 as $app => $access)
+                                        $this->db_functions->write_log("Removido aplicativo $app do grupo $dn",'',$dn,'','');
                         }
                         //////////////////////////////////////////////////////////////////////////////////////////////////////////////////