Fixed deletion of services

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3769 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/admin/systems/class_goCupsServer.inc b/plugins/admin/systems/class_goCupsServer.inc
index 178cac45a8525b8a940f3a58172d80bf2262dfd2..677c986741b75898ddcf96d22366ef3ed5095f61 100644 (file)
--- a/plugins/admin/systems/class_goCupsServer.inc
+++ b/plugins/admin/systems/class_goCupsServer.inc
@@ -56,6 +56,13 @@ class goCupsServer extends plugin{
   function remove_from_parent()
   {
     plugin::remove_from_parent();
+
+    /* Remove status flag, it is not a memeber of 
+        this->attributes, so ensure that it is deleted too */
+    if(!empty($this->StatusFlag)){
+      $this->attrs[$this->StatusFlag] = array();
+    }
+
     /* Check if this is a new entry ... add/modify */
     $ldap = $this->config->get_ldap_link();
     $ldap->cat($this->dn,array("objectClass"));

diff --git a/plugins/admin/systems/class_goFaxServer.inc b/plugins/admin/systems/class_goFaxServer.inc
index 53e8ad3076cd137ffb72aac8e646cb5d0d84c3cf..9a1a732409348c98613c911a26d17c13fc2c504e 100644 (file)
--- a/plugins/admin/systems/class_goFaxServer.inc
+++ b/plugins/admin/systems/class_goFaxServer.inc
@@ -59,6 +59,13 @@ class goFaxServer extends plugin{
   function remove_from_parent()
   {
     plugin::remove_from_parent();
+
+    /* Remove status flag, it is not a memeber of 
+        this->attributes, so ensure that it is deleted too */
+    if(!empty($this->StatusFlag)){
+      $this->attrs[$this->StatusFlag] = array();
+    }
+
     /* Check if this is a new entry ... add/modify */
     $ldap = $this->config->get_ldap_link();
     $ldap->cat($this->dn,array("objectClass"));

diff --git a/plugins/admin/systems/class_goFonServer.inc b/plugins/admin/systems/class_goFonServer.inc
index e8cd4d529b9324d574b7b959c224754d1d318653..23139767488b2444a29c05612fa538c68cbd085d 100644 (file)
--- a/plugins/admin/systems/class_goFonServer.inc
+++ b/plugins/admin/systems/class_goFonServer.inc
@@ -62,6 +62,13 @@ class goFonServer extends plugin{
   function remove_from_parent()
   {
     plugin::remove_from_parent();
+
+    /* Remove status flag, it is not a memeber of 
+        this->attributes, so ensure that it is deleted too */
+    if(!empty($this->StatusFlag)){
+      $this->attrs[$this->StatusFlag] = array();
+    }
+
     /* Check if this is a new entry ... add/modify */
     $ldap = $this->config->get_ldap_link();
     $ldap->cat($this->dn,array("objectClass"));

diff --git a/plugins/admin/systems/class_goGlpiServer.inc b/plugins/admin/systems/class_goGlpiServer.inc
index f73caf538c85245cd55ad704a6bca5ae431cbf54..bc98853ae764d395cbc679ba6259264563de832a 100644 (file)
--- a/plugins/admin/systems/class_goGlpiServer.inc
+++ b/plugins/admin/systems/class_goGlpiServer.inc
@@ -61,6 +61,13 @@ class goGlpiServer extends plugin{
   function remove_from_parent()
   {
     plugin::remove_from_parent();
+
+    /* Remove status flag, it is not a memeber of 
+        this->attributes, so ensure that it is deleted too */
+    if(!empty($this->StatusFlag)){
+      $this->attrs[$this->StatusFlag] = array();
+    }
+
     /* Check if this is a new entry ... add/modify */
     $ldap = $this->config->get_ldap_link();
     $ldap->cat($this->dn,array("objectClass"));

diff --git a/plugins/admin/systems/class_goImapServer.inc b/plugins/admin/systems/class_goImapServer.inc
index f934a71be20d302895d29a1671184350c5790b41..8901800215bd79b27cccb6aea9cac41f63eda7b9 100644 (file)
--- a/plugins/admin/systems/class_goImapServer.inc
+++ b/plugins/admin/systems/class_goImapServer.inc
@@ -92,6 +92,13 @@ class goImapServer extends plugin{
   function remove_from_parent()
   {
     plugin::remove_from_parent();
+
+    /* Remove status flag, it is not a memeber of 
+        this->attributes, so ensure that it is deleted too */
+    if(!empty($this->StatusFlag)){
+      $this->attrs[$this->StatusFlag] = array();
+    }
+
     /* Check if this is a new entry ... add/modify */
     $ldap = $this->config->get_ldap_link();
     $ldap->cat($this->dn,array("objectClass"));

diff --git a/plugins/admin/systems/class_goKrbServer.inc b/plugins/admin/systems/class_goKrbServer.inc
index 953389a10d8fbd1013aa8c5a6fbee357e0948c8c..6ba4e230278520e8d40af3c2dfaec02ba4fb46d6 100644 (file)
--- a/plugins/admin/systems/class_goKrbServer.inc
+++ b/plugins/admin/systems/class_goKrbServer.inc
@@ -59,6 +59,13 @@ class goKrbServer extends plugin{
   function remove_from_parent()
   {
     plugin::remove_from_parent();
+
+    /* Remove status flag, it is not a memeber of 
+        this->attributes, so ensure that it is deleted too */
+    if(!empty($this->StatusFlag)){
+      $this->attrs[$this->StatusFlag] = array();
+    }
+
     /* Check if this is a new entry ... add/modify */
     $ldap = $this->config->get_ldap_link();
     $ldap->cat($this->dn,array("objectClass"));

diff --git a/plugins/admin/systems/class_goLdapServer.inc b/plugins/admin/systems/class_goLdapServer.inc
index 64d385f8a6ed2ab186a0afe63530a99f0b790a1e..97e93f6540fee2298a3fbc5a36169203c682cc35 100644 (file)
--- a/plugins/admin/systems/class_goLdapServer.inc
+++ b/plugins/admin/systems/class_goLdapServer.inc
@@ -57,6 +57,13 @@ class goLdapServer extends plugin{
   function remove_from_parent()
   {
     plugin::remove_from_parent();
+
+    /* Remove status flag, it is not a memeber of 
+        this->attributes, so ensure that it is deleted too */
+    if(!empty($this->StatusFlag)){
+      $this->attrs[$this->StatusFlag] = array();
+    }
+
     /* Check if this is a new entry ... add/modify */
     $ldap = $this->config->get_ldap_link();
     $ldap->cat($this->dn,array("objectClass"));

diff --git a/plugins/admin/systems/class_goLogDBServer.inc b/plugins/admin/systems/class_goLogDBServer.inc
index 3c8a414f88e8ea5f83d8da438d4c7d20b1c11f7c..42477edce98ac8d0b64038183617f93919a70087 100644 (file)
--- a/plugins/admin/systems/class_goLogDBServer.inc
+++ b/plugins/admin/systems/class_goLogDBServer.inc
@@ -59,6 +59,13 @@ class goLogDBServer extends plugin{
   function remove_from_parent()
   {
     plugin::remove_from_parent();
+
+    /* Remove status flag, it is not a memeber of 
+        this->attributes, so ensure that it is deleted too */
+    if(!empty($this->StatusFlag)){
+      $this->attrs[$this->StatusFlag] = array();
+    }
+
     /* Check if this is a new entry ... add/modify */
     $ldap = $this->config->get_ldap_link();
     $ldap->cat($this->dn,array("objectClass"));

diff --git a/plugins/admin/systems/class_goMailServer.inc b/plugins/admin/systems/class_goMailServer.inc
index 27357cc1018036ac9cde9e2dcb850c99c4a95218..c76dd9110d77ab9415572dee423cde1dea643684 100644 (file)
--- a/plugins/admin/systems/class_goMailServer.inc
+++ b/plugins/admin/systems/class_goMailServer.inc
@@ -492,6 +492,13 @@ class goMailServer extends plugin{
   function remove_from_parent()
   {
     plugin::remove_from_parent();
+
+    /* Remove status flag, it is not a memeber of 
+        this->attributes, so ensure that it is deleted too */
+    if(!empty($this->StatusFlag)){
+      $this->attrs[$this->StatusFlag] = array();
+    }
+
     /* Check if this is a new entry ... add/modify */
     $ldap = $this->config->get_ldap_link();
     $ldap->cat($this->dn,array("objectClass"));

diff --git a/plugins/admin/systems/class_goNtpServer.inc b/plugins/admin/systems/class_goNtpServer.inc
index f7a9ea42ea0f881685aab9fed452154794fdd9c3..223d2d20fb8f22762eb6b02a9e910e8d498d94f6 100644 (file)
--- a/plugins/admin/systems/class_goNtpServer.inc
+++ b/plugins/admin/systems/class_goNtpServer.inc
@@ -80,6 +80,13 @@ class goNtpServer extends plugin{
   function remove_from_parent()
   {
     plugin::remove_from_parent();
+
+    /* Remove status flag, it is not a memeber of 
+        this->attributes, so ensure that it is deleted too */
+    if(!empty($this->StatusFlag)){
+      $this->attrs[$this->StatusFlag] = array();
+    }
+
     /* Check if this is a new entry ... add/modify */
     $ldap = $this->config->get_ldap_link();
     $ldap->cat($this->dn,array("objectClass"));

diff --git a/plugins/admin/systems/class_goShareServer.inc b/plugins/admin/systems/class_goShareServer.inc
index 35b9cf51248086e3b0916ee2230d4258f0559942..e905b8894497a991517c36c84dba6b75ef0e7013 100644 (file)
--- a/plugins/admin/systems/class_goShareServer.inc
+++ b/plugins/admin/systems/class_goShareServer.inc
@@ -158,6 +158,13 @@ class goShareServer extends plugin{
   function remove_from_parent()
   {
     plugin::remove_from_parent();
+
+    /* Remove status flag, it is not a memeber of 
+        this->attributes, so ensure that it is deleted too */
+    if(!empty($this->StatusFlag)){
+      $this->attrs[$this->StatusFlag] = array();
+    }
+
     /* Check if this is a new entry ... add/modify */
     $ldap = $this->config->get_ldap_link();
     $ldap->cat($this->dn,array("objectClass"));

diff --git a/plugins/admin/systems/class_goSyslogServer.inc b/plugins/admin/systems/class_goSyslogServer.inc
index 1dec56f6dd7f88762a652c09e5cca95bd3d3cb0b..da1e8fbf0a83ccf64f2d505debb6aa78bd87e31c 100644 (file)
--- a/plugins/admin/systems/class_goSyslogServer.inc
+++ b/plugins/admin/systems/class_goSyslogServer.inc
@@ -56,6 +56,13 @@ class goSyslogServer extends plugin{
   function remove_from_parent()
   {
     plugin::remove_from_parent();
+
+    /* Remove status flag, it is not a memeber of 
+        this->attributes, so ensure that it is deleted too */
+    if(!empty($this->StatusFlag)){
+      $this->attrs[$this->StatusFlag] = array();
+    }
+
     /* Check if this is a new entry ... add/modify */
     $ldap = $this->config->get_ldap_link();
     $ldap->cat($this->dn,array("objectClass"));

diff --git a/plugins/admin/systems/class_goTerminalServer.inc b/plugins/admin/systems/class_goTerminalServer.inc
index be3a6640cc8c524d187a776f4ed6cf2cb72c0d44..04fcacc5432e065c8aeabe0e2fdeb2049a18f240 100644 (file)
--- a/plugins/admin/systems/class_goTerminalServer.inc
+++ b/plugins/admin/systems/class_goTerminalServer.inc
@@ -59,6 +59,13 @@ class goTerminalServer extends plugin{
   function remove_from_parent()
   {
     plugin::remove_from_parent();
+
+    /* Remove status flag, it is not a memeber of 
+        this->attributes, so ensure that it is deleted too */
+    if(!empty($this->StatusFlag)){
+      $this->attrs[$this->StatusFlag] = array();
+    }
+
     /* Check if this is a new entry ... add/modify */
     $ldap = $this->config->get_ldap_link();
     $ldap->cat($this->dn,array("objectClass"));

diff --git a/plugins/admin/systems/class_servKolab.inc b/plugins/admin/systems/class_servKolab.inc
index a869d5bc684d89b92bd2e6d2e5b83e6ec1007ba3..d2f43dcbc42b00ccb3bbabda70b45f7a0f8bc96e 100644 (file)
--- a/plugins/admin/systems/class_servKolab.inc
+++ b/plugins/admin/systems/class_servKolab.inc
@@ -139,6 +139,14 @@ class servkolab extends plugin {
 
   function remove_from_parent() 
   {
+
+     /* Remove status flag, it is not a memeber of
+        this->attributes, so ensure that it is deleted too */
+    if(!empty($this->StatusFlag)){
+      $this->attrs[$this->StatusFlag] = array();
+    }
+
+
     /* Only walk through following code, if this host 
        was a member of the kolab hosts, else skip this */
     if(!$this->initially_was_account){

diff --git a/plugins/admin/systems/class_servRepository.inc b/plugins/admin/systems/class_servRepository.inc
index 8b69190afa40964b0ac7f1dd9c8e7eb629ccb412..6be57a7b213b139e27d6a985ff058e1299e90c7b 100644 (file)
--- a/plugins/admin/systems/class_servRepository.inc
+++ b/plugins/admin/systems/class_servRepository.inc
@@ -278,6 +278,13 @@ class servrepository extends plugin
   function remove_from_parent()
   {
     plugin::remove_from_parent();    
+
+     /* Remove status flag, it is not a memeber of
+        this->attributes, so ensure that it is deleted too */
+    if(!empty($this->StatusFlag)){
+      $this->attrs[$this->StatusFlag] = array();
+    }
+
     $ldap= $this->config->get_ldap_link();
     $ldap->cd ($this->config->current['BASE']);