From 211dce4702b4fe76860b4aa9a89ab1e3372d1544 Mon Sep 17 00:00:00 2001
From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 9 Dec 2005 12:03:32 +0000
Subject: [PATCH] These objects are not removable...

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2271 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../admin/systems/class_systemManagement.inc  |  3 +-
 plugins/admin/systems/class_terminalInfo.inc  |  3 --
 .../admin/systems/class_terminalService.inc   |  3 --
 .../admin/systems/class_terminalStartup.inc   |  5 +--
 .../systems/class_workstationService.inc      | 19 ++---------
 .../systems/class_workstationStartup.inc      | 33 -------------------
 6 files changed, 5 insertions(+), 61 deletions(-)

diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc
index 254eff490..6be034cbb 100644
--- a/plugins/admin/systems/class_systemManagement.inc
+++ b/plugins/admin/systems/class_systemManagement.inc
@@ -462,7 +462,8 @@ class systems extends plugin
           $this->systab= new $tabtype($this->config,
              $this->config->data['TABS']['TERMTABS'], $this->dn);
           $this->systab->set_acl(array($this->acl));
-          $this->systab->by_object['termgeneric']->remove_from_parent ();
+          $this->systab->delete();
+          #$this->systab->by_object['termgeneric']->remove_from_parent ();
         }
         unset ($this->systab);
         gosa_log ("System object'".$this->dn."' has been removed");
diff --git a/plugins/admin/systems/class_terminalInfo.inc b/plugins/admin/systems/class_terminalInfo.inc
index e60405bba..141dd6eae 100644
--- a/plugins/admin/systems/class_terminalInfo.inc
+++ b/plugins/admin/systems/class_terminalInfo.inc
@@ -223,9 +223,6 @@ class terminfo extends plugin
 
   function remove_from_parent()
   {
-    $ldap= $this->config->get_ldap_link();
-    $ldap->rmdir($this->dn);
-    show_ldap_error($ldap->get_error());
   }
 
 
diff --git a/plugins/admin/systems/class_terminalService.inc b/plugins/admin/systems/class_terminalService.inc
index 6dfea3537..6cce41a47 100644
--- a/plugins/admin/systems/class_terminalService.inc
+++ b/plugins/admin/systems/class_terminalService.inc
@@ -209,9 +209,6 @@ class termservice extends plugin
 
   function remove_from_parent()
   {
-    $ldap= $this->config->get_ldap_link();
-    $ldap->rmdir($this->dn);
-    show_ldap_error($ldap->get_error());
     $this->handle_post_events("remove");
   }
 
diff --git a/plugins/admin/systems/class_terminalStartup.inc b/plugins/admin/systems/class_terminalStartup.inc
index 4befeacf0..6a80c0de5 100644
--- a/plugins/admin/systems/class_terminalStartup.inc
+++ b/plugins/admin/systems/class_terminalStartup.inc
@@ -196,10 +196,7 @@ class termstartup extends plugin
 
   function remove_from_parent()
   {
-    $ldap= $this->config->get_ldap_link();
-    $ldap->rmdir($this->dn);
-    show_ldap_error($ldap->get_error());
-    $this->handle_post_events("remove");
+      $this->handle_post_events("remove");
   }
 
 
diff --git a/plugins/admin/systems/class_workstationService.inc b/plugins/admin/systems/class_workstationService.inc
index 4e773a46f..d226a77ef 100644
--- a/plugins/admin/systems/class_workstationService.inc
+++ b/plugins/admin/systems/class_workstationService.inc
@@ -193,23 +193,8 @@ class workservice extends plugin
 
   function remove_from_parent()
   {
-    /* This is not necessary, i think 
-     * Remove should be called from workGeneric ... 
-     */
-    /*$ldap= $this->config->get_ldap_link();
-    $ldap->rmdir($this->dn);
-    show_ldap_error($ldap->get_error());
-    $this->handle_post_events("remove");
-    */
-   
-    /* This only removes the attributes from this tab, 
-     * and not hte whole entry 
-     */ 
-    $ldap= $this->config->get_ldap_link();
-    plugin::remove_from_parent();
-    $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
-    show_ldap_error($ldap->get_error());}
+      $this->handle_post_events("remove");
+  }
 
 
   /* Save data to object */
diff --git a/plugins/admin/systems/class_workstationStartup.inc b/plugins/admin/systems/class_workstationStartup.inc
index 87c53ee72..1653aab8e 100644
--- a/plugins/admin/systems/class_workstationStartup.inc
+++ b/plugins/admin/systems/class_workstationStartup.inc
@@ -437,40 +437,7 @@ class workstartup extends plugin
 
   function remove_from_parent()
   {
-    /*
-    $ldap= $this->config->get_ldap_link();
-    $ldap->rmdir($this->dn);
-    show_ldap_error($ldap->get_error());
     $this->handle_post_events("remove");
-    */
-
-
-    /* Depending on the baseobject (Ogroup / WS) we
-     *  use another set of objectClasses
-     * In case of WS itself, we use  "array("GOhard", "FAIobject");"
-     * if we are currently editing from ogroup menu we use (array("gotWorkstationTemplate","GOhard", "FAIobject"))
-     */
-    if(isset($this->parent->by_object['ogroup'])){
-      $this->objectclasses = array("gotoWorkstationTemplate","GOhard", "FAIobject");
-    }elseif(isset($this->parent->by_object['workgeneric'])){
-      $this->objectclasses = array("GOhard", "FAIobject");
-    }else{
-      print "unknown";
-      exit();
-    }
-
-    $ldap= $this->config->get_ldap_link();
-    plugin::remove_from_parent();
-   
-    /* Remove additional attributes.*/ 
-    foreach(array("gotoModules", "gotoAutoFs", "gotoFilesystem") as $attr){
-      $this->attrs [$attr] = array();
-    }
-
-    $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
-    show_ldap_error($ldap->get_error());
-
   }
 
 
-- 
2.30.2