X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_workstationGeneric.inc;h=976f42105d49ac112e468aeebc0d34a80cb21254;hb=e1bf22f058266d04da312a6a12cc26fcda9bd930;hp=dad2c0e87ed5163b094699ccf47491b321665b99;hpb=05149b49145271032dfba7236e34470f24a8f13c;p=gosa.git

diff --git a/plugins/admin/systems/class_workstationGeneric.inc b/plugins/admin/systems/class_workstationGeneric.inc
index dad2c0e87..976f42105 100644
--- a/plugins/admin/systems/class_workstationGeneric.inc
+++ b/plugins/admin/systems/class_workstationGeneric.inc
@@ -50,6 +50,16 @@ class workgeneric extends plugin
       "ghGfxAdapter", "ghSoundAdapter", "gotoLastUser", "l","FAIscript");
   var $objectclasses= array("top", "gotoWorkstation", "GOhard","FAIobject");
 
+  var $mapActions   = array("reboot"          => "",
+                            "instant_update"  => "softupdate",
+                            "update"          => "sceduledupdate",
+                            "reinstall"       => "install",
+                            "rescan"          => "",
+                            "memcheck"        => "memcheck",
+                            "sysinfo"         => "sysinfo");
+
+
+
   function workgeneric ($config, $dn= NULL)
   {
     plugin::plugin ($config, $dn);
@@ -91,8 +101,6 @@ class workgeneric extends plugin
 
     $this->modes["active"]= _("Activated");
     $this->modes["locked"]= _("Locked");
-    $this->modes["memcheck"]= _("Memory test");
-    $this->modes["sysinfo"]= _("System analysis");
 
     /* Set base */
     if ($this->dn == "new"){
@@ -135,6 +143,36 @@ class workgeneric extends plugin
         if ($retval != 0){
           print_red(sprintf(_("Execution of '%s' failed!"), $cmd));
         } else {
+
+          /* 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']];
+          }
+
+          for($i = 0; $i < $res['objectClass']['count'] ; $i ++){
+            $attrs['objectClass'][] = $res['objectClass'][$i];
+          }
+
+          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();
+          }
+
+          $ldap->cd($this->dn);
+          $ldap->modify($attrs);
+          show_ldap_error($ldap->get_error(), sprintf(_("Saving of system workstation/generic (FAIstate) with dn '%s' failed."),$this->dn));
+ 
           $this->didAction= TRUE;
         }
       }
@@ -152,7 +190,7 @@ class workgeneric extends plugin
     foreach($_POST as $name => $value){
       if(preg_match("/^chooseBase/",$name) && $once){
         $once = false;
-        $this->dialog = new baseSelectDialog($this->config);
+        $this->dialog = new baseSelectDialog($this->config,$this);
         $this->dialog->setCurrentBase($this->base);
       }
     }
@@ -190,7 +228,14 @@ class workgeneric extends plugin
     $smarty->assign("l", $this->l);
     $smarty->assign("bases", $this->config->idepartments);
     $smarty->assign("staticAddress", "");
-    $smarty->assign("gotoNtpServers",$this->gotoNtpServers);
+
+    $tmp = array();
+    foreach($this->gotoNtpServers as $server){
+      if(!in_array($server,$this->gotoNtpServer)){
+        $tmp[$server] = $server;
+      }
+    }
+    $smarty->assign("gotoNtpServers",$tmp);
         
     /* Check if workstation is online */
     $query= "fping -q -r 1 -t 500 ".$this->cn;
@@ -202,17 +247,28 @@ class workgeneric 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")));
     }
     /* Arrays */
     $smarty->assign("modes", $this->modes);
     $smarty->assign("nfsservers", $this->config->data['SERVERS']['NFS']);
     $smarty->assign("syslogservers", $this->gotoSyslogServers);
-    $smarty->assign("ntpservers", $this->config->data['SERVERS']['NTP']);
+
+    $ntpser = array();
+    foreach($this->gotoNtpServers as $server){
+      if(!in_array($server,$this->gotoNtpServer)){
+        $ntpser[$server] = $server;
+      }
+    }
+    $smarty->assign("gotoNtpServers", $ntpser);
 
     /* Variables */
     foreach(array("base", "gotoMode", "gotoSyslogServer", "gotoNtpServer") as $val){
@@ -234,7 +290,7 @@ class workgeneric extends plugin
     $this->netConfigDNS->remove_from_parent();
     $ldap= $this->config->get_ldap_link();
     $ldap->rmdir($this->dn);
-    show_ldap_error($ldap->get_error(), _("Removing workstation failed"));
+    show_ldap_error($ldap->get_error(), sprintf(_("Removing of system workstation/generic with dn '%s' failed."),$this->dn));
 
     /* Optionally execute a command after we're done */
     $this->handle_post_events("remove", array("macAddress" => $this->netConfigDNS->macAddress));
@@ -368,6 +424,10 @@ class workgeneric extends plugin
       }
     }
 
+    if(($this->gosaUnitTag) && (!in_array_ics("gosaAdministrativeUnitTag",$this->attrs['objectClass']))){
+      $this->attrs['objectClass'][] = "gosaAdministrativeUnitTag";
+    }
+
     /* Write back to ldap */
     $ldap= $this->config->get_ldap_link();
     if ($this->orig_dn == 'new'){
@@ -375,7 +435,7 @@ class workgeneric extends plugin
       $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn));
       $ldap->cd($this->dn);
       $ldap->add($this->attrs);
-      show_ldap_error($ldap->get_error(), _("Saving workstation failed"));
+      show_ldap_error($ldap->get_error(), sprintf(_("Saving of system workstation/generic with dn '%s' failed."),$this->dn));
       if(!$this->didAction){
         $this->handle_post_events("add");
       }
@@ -385,7 +445,6 @@ class workgeneric extends plugin
       }
       $ldap->cd($this->dn);
       $this->cleanup();
-//      $this->attrs['gosaUnitTag']= array();
       $ldap->modify ($this->attrs); 
 
       if(!$this->didAction){
@@ -394,7 +453,7 @@ class workgeneric extends plugin
     }
     $this->netConfigDNS->cn = $this->cn;
     $this->netConfigDNS->save($this->dn);
-    show_ldap_error($ldap->get_error(), _("Saving workstation failed"));
+    show_ldap_error($ldap->get_error(), sprintf(_("Saving of system workstation/generic with dn '%s' failed."),$this->dn));
   }
 
 }