From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 4 Jun 2008 11:18:38 +0000 (+0000)
Subject: Fixed service remove.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9e429a0ee43119828e574331d562951545b6dbde;p=gosa.git

Fixed service remove.


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

diff --git a/gosa-plugins/apache2/admin/systems/services/apache2/class_servApacheVhost.inc b/gosa-plugins/apache2/admin/systems/services/apache2/class_servApacheVhost.inc
index 51c7c4d16..3c6b572b7 100644
--- a/gosa-plugins/apache2/admin/systems/services/apache2/class_servApacheVhost.inc
+++ b/gosa-plugins/apache2/admin/systems/services/apache2/class_servApacheVhost.inc
@@ -33,7 +33,7 @@ class servapache extends goService
   var $dialog           = NULL;
   var $orig_dn          = "";
 
-  var $APACHEinitially_was_account;
+  var $initially_was_account;
 
 
   function servapache ($config, $dn= NULL, $parent= NULL)
@@ -53,7 +53,7 @@ class servapache extends goService
     }else{
       $this->is_account = true;
     }
-    $this->APACHEinitially_was_account = $this->is_account;
+    $this->initially_was_account = $this->is_account;
 
     /* Set service name */
     $this->DisplayName = _("Apache service");
@@ -200,17 +200,10 @@ class servapache extends goService
    */
   function remove_from_parent()
   {
-    if($this->APACHEinitially_was_account){
-      $bool = true;
-      foreach($this->Vhosts as $key => $vhost){
-        $bool= $bool & $this->RemoveVhost($key);
-      }
-
-      if($bool){
-        $this->save();
-      }
-      return($bool);
+    foreach($this->Vhosts as $key => $vhost){
+      $this->RemoveVhost($key);
     }
+    $this->save();
   }