Fixed initially_was_account to be able to use it in ServerService

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

diff --git a/plugins/admin/systems/class_servDNS.inc b/plugins/admin/systems/class_servDNS.inc
index 2faa8a01ea3cc199515be6dd12cf5d7fc4648a05..155966473306d485bf01ae25fd62d5d0b3ddf073 100644 (file)
--- a/plugins/admin/systems/class_servDNS.inc
+++ b/plugins/admin/systems/class_servDNS.inc
@@ -18,7 +18,7 @@ class servdns extends plugin
 
   var $orig_dn          = "";
 
-  var $DNSinitially_was_account;
+  var $initially_was_account;
   
   /* ServerService tab vars */
   var $conflicts        = array("servdns");
@@ -48,7 +48,7 @@ class servdns extends plugin
     }else{
       $this->is_account = true;
     }
-    $this->DNSinitially_was_account = $this->is_account;
+    $this->initially_was_account = $this->is_account;
   }
 
 
@@ -253,7 +253,7 @@ class servdns extends plugin
    */
   function remove_from_parent()
   {
-    if(!$this->DNSinitially_was_account){
+    if(!$this->initially_was_account){
       return;
     }
     print_red("Can't remove dns yet. returning without remove.");

diff --git a/plugins/admin/systems/class_termDNS.inc b/plugins/admin/systems/class_termDNS.inc
index 74a7183e59187bc7524da99b304ae6c566148ec6..e5e9c6fdf363ccd1b8d73a15852a41c90676e7b4 100644 (file)
--- a/plugins/admin/systems/class_termDNS.inc
+++ b/plugins/admin/systems/class_termDNS.inc
@@ -27,7 +27,7 @@ class termDNS extends plugin
    */
   var $DNSattributes            = array("dNSClass","zoneName","dNSTTL");
   var $DNS_is_Account           = false;
-  var $DNSinitially_was_account = false;
+  var $initially_was_account = false;
   var $dnsEntry                 = array();
   var $DNSenabled               = false;
 
@@ -100,7 +100,7 @@ class termDNS extends plugin
  
     /* Store initally account settings 
      */
-    $this->DNSinitially_was_account = $this->DNS_is_account;
+    $this->initially_was_account = $this->DNS_is_account;
   }
 
 
@@ -408,7 +408,7 @@ class termDNS extends plugin
       /* Create diff and follow instructions 
        * If Account was disabled, remove account by setting exists to false
        */
-      if((!$this->DNS_is_account)&&($this->DNSinitially_was_account)){  
+      if((!$this->DNS_is_account)&&($this->initially_was_account)){  
         $this->dnsEntry['exists'] = false;
         $tmp = getDNSHostEntriesDiff($this->config,$this->OrigCn,$this->dnsEntry,$this->cn);
       }else{