Fixed wrong existance check

[gosa.git] / gosa-plugins / systems / admin / systems / class_serverService.inc

diff --git a/gosa-plugins/systems/admin/systems/class_serverService.inc b/gosa-plugins/systems/admin/systems/class_serverService.inc
index 6508592770ddacdbd4491a595776e2641f61405d..4bd58ed1894d29ca7ff73227e0b95b6f0595615e 100644 (file)
--- a/gosa-plugins/systems/admin/systems/class_serverService.inc
+++ b/gosa-plugins/systems/admin/systems/class_serverService.inc
@@ -53,6 +53,12 @@ class ServerService extends plugin
     plugin::plugin($config);
     $this->parent = $parent;
     $this->dn= $dn;
+
+    /* Adapt parent attributes */
+    if(isset($this->parent->attrs)){
+      $this->attrs = $this->parent->attrs;
+    }
+
     foreach ($config->data['TABS']['SERVERSERVICE'] as $plug){
 
       if(class_available($plug['CLASS'])){
@@ -61,6 +67,11 @@ class ServerService extends plugin
         $this->plugin_names[]= $name;
         $this->plugins[$name]= new $name($config, $dn, $this);
 
+        /* Initialize kerberos key support */ 
+        if(isset($this->plugins[$name]->krb_service_prefix) && !empty($this->plugins[$name]->krb_service_prefix)){
+          $this->plugins[$name]->krb_host_key = &$this->parent->kerberos_key_service;
+        }
+
         /* Capture all service objectClases, necessary for acl handling */ 
         if(isset($this->plugins[$name]->objectclasses)){
           foreach($this->plugins[$name]->objectclasses as $oc){
@@ -68,7 +79,7 @@ class ServerService extends plugin
           }
         }
       }else{
-        trigger_error("Service class missing: ".$plug['CLASS']);
+        #trigger_error("Service class missing: ".$plug['CLASS']);
       }
     }
     $this->divList = new divListSystemService($config,$this);
@@ -157,7 +168,7 @@ class ServerService extends plugin
     if($s_action == "RemoveSingleService"){
 
       /* Create resetted obj */
-      $new_obj = new $s_entry($this->config,$this->dn);
+      $new_obj = new $s_entry($this->config,$this->dn, $this);
       $new_obj -> set_acl_base($this->acl_base);
       $new_obj -> set_acl_category(preg_replace("/\/$/","",$this->acl_category));
       $tmp     = $new_obj->getListEntry();
@@ -181,9 +192,11 @@ class ServerService extends plugin
     /* Edit a service and make a backup from all attributes, 
        to be able to restore old values after aborting dialog */ 
     if($s_action == "EditSingleService"){
-      $this->backup   = get_object_vars($this->plugins[$s_entry]);
-      $this->dialog   = $this->plugins[$s_entry];
-      $this->current  = $s_entry;
+      if($this->plugins[$s_entry]->acl_is_readable("")){
+        $this->backup   = get_object_vars($this->plugins[$s_entry]);
+        $this->dialog   = $this->plugins[$s_entry];
+        $this->current  = $s_entry;
+      }
     }
 
    
@@ -199,7 +212,7 @@ class ServerService extends plugin
        Restore vars with values before editing */
     if(isset($_POST['CancelService']) && !empty($this->current)){
       if($this->backup == NULL){
-        $this->plugins[$this->current] = new $this->current($this->config,$this->dn);
+        $this->plugins[$this->current] = new $this->current($this->config,$this->dn,$this);
         $this->plugins[$this->current]-> set_acl_base($this->acl_base);
         $this->plugins[$this->current]-> set_acl_category(preg_replace("/\/$/","",$this->acl_category));
 
@@ -246,8 +259,12 @@ class ServerService extends plugin
 
     /* There is currently a subdialog open, display this dialog */
     if(is_object($this->dialog)){
-#      $this->dialog->save_object();
-      return($this->dialog->execute());
+      $add ="";
+      if(isset($this->dialog->krb_host_key) && $this->dialog->krb_host_key instanceof krbHostKeys){
+        $add = $this->dialog->krb_host_key->save_object_by_prefix($this->dialog->krb_service_prefix);
+        $add = $this->dialog->krb_host_key->execute_by_prefix($this->dialog->krb_service_prefix,TRUE);
+      }
+      return($add.$this->dialog->execute());
     }
 
 
@@ -365,7 +382,7 @@ class ServerService extends plugin
         $tmp = $this->plugins[$name]->getListEntry();
 
         /* Check if given action is allowed for this service */
-        if($tmp[$map[$action]]){
+        if($tmp[$map[$action]] && !empty($this->plugins[$name]->StatusFlag)){
           if($this->plugins[$name]->initially_was_account && $this->plugins[$name]->is_account){
             $this->plugins[$name]->setStatus($action);
           }
@@ -411,6 +428,9 @@ class ServerService extends plugin
         }
       }
       if($this->plugins[$name]->initially_was_account){
+        if(isset($this->plugins[$name]->krb_host_key) && $this->plugins[$name]->krb_host_key instanceof krbHostKeys){
+          $this->plugins[$name]->krb_host_key->remove_from_parent_by_prefix($this->plugins[$name]->krb_service_prefix);
+        }
         $this->plugins[$name]->remove_from_parent();
       }
     }