Updated opsi clinet handling.

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

diff --git a/gosa-plugins/systems/admin/systems/class_servGeneric.inc b/gosa-plugins/systems/admin/systems/class_servGeneric.inc
index dbda1c6706088b1e5a91b828ec23f686f28296c7..c52153441db85ea360fdfdd9ce7e70cbd6fef07e 100644 (file)
--- a/gosa-plugins/systems/admin/systems/class_servGeneric.inc
+++ b/gosa-plugins/systems/admin/systems/class_servGeneric.inc
@@ -45,7 +45,7 @@ class servgeneric extends plugin
   var $modes = array();
   var $ui   ;
   var $validActions   = array("reboot" => "", "update" => "", "localboot" => "", "reinstall" => "", "rescan" => "",
-                            "wake" => "", "memcheck" => "", "sysinfo" => "");
+                            "wakeup" => "", "memcheck" => "", "sysinfo" => "");
 
   var $fai_activated  =FALSE;
   var $view_logged = FALSE;
@@ -55,6 +55,17 @@ class servgeneric extends plugin
 
   var $kerberos_key_service = NULL;
 
+  var $mapActions   = array("reboot"          => "",
+                            "instant_update"  => "softupdate",
+                            "localboot"       => "localboot",
+                            "update"          => "sceduledupdate",
+                            "reinstall"       => "install",
+                            "rescan"          => "",
+                            "wakeup"            => "",
+                            "memcheck"        => "memcheck",
+                            "sysinfo"         => "sysinfo");
+
+
   function servgeneric (&$config, $dn= NULL, $parent= NULL)
   {
     /* Check if FAI is activated */
@@ -67,8 +78,8 @@ class servgeneric extends plugin
     plugin::plugin ($config, $dn, $parent);
 
     /* Initialize kerberos host key plugin */
-    if(class_available("krb_host_keys")){
-      $this->kerberos_key_service = new krb_host_keys($this->config,$this);
+    if(class_available("krbHostKeys")){
+      $this->kerberos_key_service = new krbHostKeys($this->config,$this);
     }
 
     $this->ui = get_userinfo();
@@ -88,7 +99,7 @@ class servgeneric extends plugin
     $this->netConfigDNS->set_acl_base($this->base);
 
     /* Check if this host is currently in installation process*/
-    if(class_available("gosaSupportDaemon") && class_available("DaemonEvent")){
+    if($this->dn != "new" && class_available("gosaSupportDaemon") && class_available("DaemonEvent")){
       $o = new gosaSupportDaemon();
       $e_types = DaemonEvent::get_event_types(USER_EVENT | SYSTEM_EVENT | HIDDEN_EVENT);
       $evts = $o->get_entries_by_mac(array($this->netConfigDNS->macAddress));
@@ -219,7 +230,7 @@ class servgeneric extends plugin
                                        "localboot" => _("Force localboot"),
                                        "sysinfo"  => _("System analysis")));
     } else {
-      $smarty->assign("actions", array("wake" => _("Wake up"),
+      $smarty->assign("actions", array("wakeup" => _("Wake up"),
                                        "reinstall" => _("Reinstall"),
                                        "update" => _("System update"),
                                        "memcheck" => _("Memory test"),
@@ -240,7 +251,7 @@ class servgeneric extends plugin
 
     $smarty->assign("host_key","");
     if(is_object($this->kerberos_key_service)){
-      $smarty->assign("host_key",$this->kerberos_key_service->execute());
+      $smarty->assign("host_key",$this->kerberos_key_service->execute_by_prefix("host/"));
     }
 
     return($smarty->fetch (get_template_path('server.tpl', TRUE)));
@@ -255,7 +266,7 @@ class servgeneric extends plugin
 
     /* Remove kerberos key dependencies too */
     if(is_object($this->kerberos_key_service)){
-      $this->kerberos_key_service->remove_from_parent();
+      $this->kerberos_key_service->remove_from_parent_by_prefix("host/");
     }
 
     $this->netConfigDNS->remove_from_parent();
@@ -310,7 +321,7 @@ class servgeneric extends plugin
 
     /* Hanle kerberos host key plugin */
     if(is_object($this->kerberos_key_service)){
-      $this->kerberos_key_service->save_object();
+      $this->kerberos_key_service->save_object_by_prefix("host/");
     }
   }