Allow remove of systems without installed DNS/DHCP plugins,

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

diff --git a/gosa-plugins/systems/admin/systems/class_systemManagement.inc b/gosa-plugins/systems/admin/systems/class_systemManagement.inc
index 09bcfd24c07d5e8c0465235e26278df8763ecfcb..ba4055ea0e1757d68865da81adced491add4c3d1 100644 (file)
--- a/gosa-plugins/systems/admin/systems/class_systemManagement.inc
+++ b/gosa-plugins/systems/admin/systems/class_systemManagement.inc
@@ -76,7 +76,7 @@ class systems extends plugin
      */
     if(class_available("gosaSupportDaemon")){
       $o = new gosaSupportDaemon();
-      $this->si_active = $o->connect();
+      $this->si_active = $o->connect() && class_available("DaemonEvent");
     }
   }
 
@@ -736,7 +736,7 @@ class systems extends plugin
       $this->dns = array();
       $ids = $this->list_get_selected_items();
 
-      if(count($ids)){
+      if(count($ids) && class_available("DaemonEvent")){
         $mac= array();
 
         $ldap = $this->config->get_ldap_link();
@@ -787,7 +787,7 @@ class systems extends plugin
     }
 
     /* Insert scheduled events into queue */
-    if($this->systab instanceof DaemonEvent){
+    if(class_available("DaemonEvent") && $this->systab instanceof DaemonEvent){
       $this->systab->save_object();
 
       /* Save event 

diff --git a/gosa-plugins/systems/admin/systems/class_termDNS.inc b/gosa-plugins/systems/admin/systems/class_termDNS.inc
index b954e75ef0d4d534ad96047e88a877bbb69a0555..b03088a1bd18142a30627306170b58e63cdb6a2b 100644 (file)
--- a/gosa-plugins/systems/admin/systems/class_termDNS.inc
+++ b/gosa-plugins/systems/admin/systems/class_termDNS.inc
@@ -459,7 +459,7 @@ class termDNS extends plugin
 
   function remove_from_parent()
   {
-    if($this->initially_was_account){
+    if($this->DNS_is_account){
 
       $ldap = $this->config->get_ldap_link();