Take care about filenames containing a /. Just use the basename then.

[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 9748602c82f99d8a609a55369b813e25b93bf908..c7666fddff52ffb86e498d1299977eb3bb6f2fb1 100644 (file)
--- a/gosa-core/include/class_tabs.inc
+++ b/gosa-core/include/class_tabs.inc
@@ -73,7 +73,7 @@ class tabs
 
  
   /*! \brief Reinitializes the tab classes with fresh ldap values.
-             This maybe usefull if for example if the apply button was pressed.
+             This maybe usefull if for example the apply button was pressed.
    */ 
   function re_init()
   {
@@ -96,6 +96,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 +305,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);