Updated opsi

[gosa.git] / gosa-core / include / class_tabs.inc

diff --git a/gosa-core/include/class_tabs.inc b/gosa-core/include/class_tabs.inc
index b6fb6b057ffa813a55f5993d3cf918a22637f026..a10db017ce7e333a7646fac07ef060e626d5cbb6 100644 (file)
--- a/gosa-core/include/class_tabs.inc
+++ b/gosa-core/include/class_tabs.inc
@@ -43,6 +43,13 @@ class tabs
     $this->dn= $dn;
     $this->config= &$config;
 
+    if(!count($data)) {
+      $data[] = array("CLASS" => 'plugin',"NAME" => 'Error');
+      msg_dialog::display(_("Error"),
+        sprintf(_("No plugin definitions found to initialize '%s', please check your configuration file."),get_class($this)),
+        "ERROR_DIALOG");
+    }
+
     $baseobject= NULL;
     $this->acl_category = $acl_category;
     foreach ($data as &$tab){
@@ -96,6 +103,9 @@ class tabs
 
   function execute()
   {
+    /* Ensure that the currently selected tab is valid. */
+    if(!isset($this->by_name[$this->current])) $this->current = key($this->by_name);
+
     /* Rotate current to last */
     $this->last= $this->current;
 
@@ -302,12 +312,17 @@ class tabs
 
       $obj->dn= $this->dn;
 
-      if ($obj->is_account || $ignore_account || $obj->ignore_account){
-        if ($obj->save() == 1){
-          return (1);
+      if(!$obj instanceof plugin){
+        trigger_error("Something went wrong while saving ".$obj->dn.". Object class '".get_class($obj)."'.");
+      }else{
+
+        if ($obj->is_account || $ignore_account || $obj->ignore_account){
+          if ($obj->save() == 1){
+            return (1);
+          }
+        } else {
+          $obj->remove_from_parent();
         }
-      } else {
-        $obj->remove_from_parent();
       }
     }
     return (0);