Code

Fixed /var/www/gosa/plugins/admin/groups/class_groupAcl.inc (Line 173) Undefined...
[gosa.git] / plugins / admin / ogroups / tabs_ogroups.inc
index 896a1592399ee5f974fa396f6c8f44e8413e0788..3e4979224223e031491792f994eac0145bb7e897 100644 (file)
@@ -23,12 +23,11 @@ class ogrouptabs extends tabs
       unset($this->by_object['phonequeue']);
       unset($this->by_name['phonequeue']);
     }
-
     /* Remove mail group if there is no user anymore */
-    if((!preg_match("/U/",$objects))&&(isset($this->by_object['mailgroup']))){
-      $this->by_object['mailgroup']->remove_from_parent();
-      unset($this->by_object['mailgroup']);
-      unset($this->by_name['mailgroup']);
+    if((!preg_match("/U/",$objects))&&(isset($this->by_object['mailogroup']))){
+      $this->by_object['mailogroup']->remove_from_parent();
+      unset($this->by_object['mailogroup']);
+      unset($this->by_name['mailogroup']);
     }
     
     /* Remove terminal group, if theres no terminal left in the object list */
@@ -94,7 +93,7 @@ class ogrouptabs extends tabs
         $this->by_object['workstartup']= new workstartup($this->config, $this->dn);
         $this->by_object['workstartup']->acl = "#all#";
         $this->by_object['workstartup']->parent= &$this;
-        $this->by_name['workservice']= _("Service");
+        $this->by_name['workservice']= _("Devices");
         $this->by_object['workservice']= new workservice($this->config, $this->dn);
         $this->by_object['workservice']->acl = "#all#";
         $this->by_object['workservice']->parent= &$this;
@@ -104,6 +103,9 @@ class ogrouptabs extends tabs
 
   function execute(){
     $str = "";
+       /* Call parent execute */
+       plugin::execute();
+
     $this->by_object['ogroup']->AddDelMembership();
     $this->reload($this->by_object['ogroup']->gosaGroupObjects);
     $str .= tabs::execute();
@@ -169,7 +171,7 @@ class ogrouptabs extends tabs
 
   function check()
   {
-    return (tabs::check(TRUE));
+    return (tabs::check(FALSE));
   }