From: hickert Date: Wed, 21 Jun 2006 03:41:42 +0000 (+0000) Subject: Fixed initially_was_account to be able to use it in ServerService X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c39b66e0d18516a014b3267b60a40b772818c104;p=gosa.git 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 2faa8a01e..155966473 100644 --- 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 74a7183e5..e5e9c6fdf 100644 --- 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{