X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_servGeneric.inc;h=9c0f48cd1f442c63d0434f2fffc556b7810f816f;hb=78fd52f682986d25fb95c171757d58384f7f58f8;hp=7679c72e2d9683167f0bae3117d0ae0006d55a45;hpb=d1a1f67066cf07616d37a1b3cd983082d0028f2f;p=gosa.git

diff --git a/plugins/admin/systems/class_servGeneric.inc b/plugins/admin/systems/class_servGeneric.inc
index 7679c72e2..9c0f48cd1 100644
--- a/plugins/admin/systems/class_servGeneric.inc
+++ b/plugins/admin/systems/class_servGeneric.inc
@@ -17,6 +17,7 @@ class servgeneric extends plugin
   var $l= "";
   var $description= "";
   var $orig_dn= "";
+  var $didAction= FALSE;
 
   /* attribute list for save action */
   var $attributes= array("cn", "description","gotoMode");
@@ -27,14 +28,20 @@ class servgeneric extends plugin
   var $netConfigDNS;
   var $modes = array();
 
+  var $mapActions   = array("reboot"          => "",
+                            "instant_update"  => "softupdate",
+                            "update"          => "sceduledupdate",
+                            "reinstall"       => "install",
+                            "rescan"          => "",
+                            "memcheck"        => "memcheck",
+                            "sysinfo"         => "sysinfo");
+
   function servgeneric ($config, $dn= NULL)
   {
     plugin::plugin ($config, $dn);
 
     $this->modes["active"]= _("Activated");
     $this->modes["locked"]= _("Locked");
-    $this->modes["memcheck"]= _("Memory test");
-    $this->modes["sysinfo"]= _("System analysis");
 
     /* Set base */
     if ($this->dn == "new"){
@@ -51,8 +58,8 @@ class servgeneric extends plugin
 
   function execute()
   {
-	/* Call parent execute */
-	plugin::execute();
+    /* Call parent execute */
+    plugin::execute();
 
     /* Do we represent a valid server? */
     if (!$this->is_account && $this->parent == NULL){
@@ -63,42 +70,46 @@ class servgeneric extends plugin
 
     /* Check for action */
     if (isset($_POST['action'])){
-      switch($_POST['action']){
-        case 'wake':
-          $cmd= search_config($this->config->data['TABS'], "servgeneric", "WAKECMD");
-          if ($cmd == ""){
-            print_red(_("No WAKECMD definition found in your gosa.conf"));
-          } else {
-            exec ($cmd." ".$this->netConfigDNS->macAddress, $dummy, $retval);
-            if ($retval != 0){
-              print_red(sprintf(_("Execution of '%s' failed!"), $cmd));
-            }
+      $cmd= search_config($this->config->data['TABS'], "workgeneric", "ACTIONCMD");
+      if ($cmd == ""){
+        print_red(_("No ACTIONCMD definition found in your gosa.conf"));
+      } else {
+
+        exec ($cmd." ".$this->netConfigDNS->macAddress." ".escapeshellarg($_POST['saction']), $dummy, $retval);
+        if ($retval != 0){
+          print_red(sprintf(_("Execution of '%s' failed!"), $cmd));
+        } else {
+          $this->didAction= TRUE;
+
+          /* Set FAIstate */
+          $ldap = $this->config->get_ldap_link();
+          $ldap->cd($this->config->current['BASE']);
+          $ldap->cat($this->dn,array("objectClass"));
+          $res = $ldap->fetch();
+          
+          $attrs = array();
+          $attrs['FAIstate'] = "";
+          if(isset($this->mapActions[$_POST['saction']])){
+            $attrs['FAIstate'] = $this->mapActions[$_POST ['saction']];
           }
-          break;
-
-        case 'reboot':
-          $cmd= search_config($this->config->data['TABS'], "servgeneric", "REBOOTCMD");
-          if ($cmd == ""){
-            print_red(_("No REBOOTCMD definition found in your gosa.conf"));
-          } else {
-            exec ($cmd." ".$this->cn, $dummy, $retval);
-            if ($retval != 0){
-              print_red(sprintf(_("Execution of '%s' failed!"), $cmd));
-            }
+
+          for($i = 0; $i < $res['objectClass']['count'] ; $i ++){
+            $attrs['objectClass'][] = $res['objectClass'][$i];
           }
-          break;
-
-        case 'halt':
-          $cmd= search_config($this->config->data['TABS'], "servgeneric", "HALTCMD");
-          if ($cmd == ""){
-            print_red(_("No HALTCMD definition found in your gosa.conf"));
-          } else {
-            exec ($cmd." ".$this->cn, $dummy, $retval);
-            if ($retval != 0){
-              print_red(sprintf(_("Execution of '%s' failed!"), $cmd));
-            }
+
+          if(($attrs['FAIstate'] != "") && (!in_array("FAIobject",$attrs['objectClass']))){
+            $attrs['objectClass'][] = "FAIobject";
+          }
+
+          if($attrs['FAIstate'] == ""){
+            #FIXME we should check if FAIobject is used anymore
+            $attrs['FAIstate'] = array();
           }
-          break;
+ 
+          $ldap->cd($this->dn);
+          $ldap->modify($attrs);
+          show_ldap_error($ldap->get_error());
+        }
       }
     }
 
@@ -136,6 +147,8 @@ class servgeneric extends plugin
       $smarty->assign($attr."ACL", chkacl($this->acl, $attr));
       $smarty->assign("$attr", $this->$attr);
     }
+    $smarty->assign("baseACL", chkacl($this->acl, "base"));
+
     $smarty->assign("staticAddress", "");
     $smarty->assign("base_select", $this->base);
 
@@ -149,11 +162,15 @@ class servgeneric extends plugin
                                        "instant_update" => _("Instant update"),
                                        "update" => _("Scheduled update"),
                                        "reinstall" => _("Reinstall"),
-                                       "rescan" => _("Rescan hardware")));
+                                       "rescan" => _("Rescan hardware"),
+                                       "memcheck" => _("Memory test"),
+                                       "sysinfo"  => _("System analysis")));
     } else {
       $smarty->assign("actions", array("wake" => _("Wake up"),
                                        "reinstall" => _("Reinstall"),
-                                       "update" => _("Scheduled update")));
+                                       "update" => _("Scheduled update"),
+                                       "memcheck" => _("Memory test"),
+                                       "sysinfo"  => _("System analysis")));
     }
 
     /* Show main page */
@@ -280,12 +297,14 @@ class servgeneric extends plugin
 
       $mode= "modify";
     }
+    show_ldap_error($ldap->get_error(), _("Saving server failed"));
     $this->netConfigDNS->cn = $this->cn;
     $this->netConfigDNS->save($this->dn);
-    show_ldap_error($ldap->get_error(), _("Saving server failed"));
 
     /* Optionally execute a command after we're done */
-    $this->handle_post_events($mode);
+    if(!$this->didAction){
+      $this->handle_post_events($mode);
+    }
   }
 
 }