Updated workService.

[gosa.git] / gosa-plugins / goto / admin / systems / goto / class_workstationService.inc

diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc
index e03b719e990b6c5065f5f3626db93d3f6d55bf0e..3897dfe71e05bdf46e3cdfe2545ac5203469eecd 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc
@@ -3,6 +3,8 @@
 class workservice extends plugin
 {
   var $gotoScannerEnable;
+  var $gotoLpdEnable = array();
+
   /* Generic terminal attributes */
   var $gotoXMonitor= "";
   var $gotoXDriver= "";
@@ -26,7 +28,6 @@ class workservice extends plugin
   var $base= "";
   var $cn= "";
   var $orig_dn= "";
-  var $XMethods= array();
   var $XDrivers= array();
   var $XResolutions = array();
   var $MouseTypes= array();
@@ -36,7 +37,7 @@ class workservice extends plugin
 
 
   /* attribute list for save action */
-  var $attributes= array("gotoXMonitor",
+  var $attributes= array("gotoXMonitor","gotoLpdEnable",
       "gotoXDriver", "gotoXResolution", "gotoXColordepth",
       "gotoXHsync", "gotoXVsync",
       "gotoScannerEnable", "gotoScannerClients",
@@ -62,6 +63,15 @@ class workservice extends plugin
         "1400x1050" =>  "1400x1050", 
         "1600x1200" =>  "1600x1200");
 
+    /* Load gotoLpdEnable 
+     */
+    $this->gotoLpdEnable = array();
+    if(isset($this->attrs['gotoLpdEnable']['count'])){
+      for($i = 0 ; $i < $this->attrs['gotoLpdEnable']['count']; $i ++){
+        $this->gotoLpdEnable[] = $this->attrs['gotoLpdEnable'][$i];
+      }
+    }
+
     if($this->config->get_cfg_value("resolutions") != ""){
       $file = $this->config->get_cfg_value("resolutions");
 
@@ -107,7 +117,7 @@ class workservice extends plugin
                              "/dev/input/mice"  => "/dev/input/mice");
 
     /* Additional values will be extracted from CONFIG_DIR./keyboardLayouts */
-    $this->XKbLayouts= array ("de"=> "de","intl" =>"intl","us" =>"us");
+    $this->XKbLayouts = array("de"=> "de","en" =>"en", "es" => "es", "us" =>"us", "fr" => "fr");
     $this->XKbVariants= array ("nodeadkeys"=>"nodeadkeys", "basic"=>"basic");
 
     /* try to read additional keyboard layouts 
@@ -128,17 +138,6 @@ class workservice extends plugin
       }
     }
 
-    /* Initialize methods */
-    $this->XMethods["indirect"]= _("show chooser");
-    $this->XMethods["query"]= _("direct");
-    #$this->XMethods["squery"]= _("direct via ssh");
-    #$this->XMethods["nquery"]= _("direct via nx");
-    $this->XMethods["load"]= _("load balanced");
-    #$this->XMethods["sload"]= _("load balanced via ssh");
-    #$this->XMethods["nload"]= _("load balanced via nx");
-    $this->XMethods["rdp"]= _("Windows RDP");
-    $this->XMethods["citrix"]= _("ICA client");
-
     $this->orig_dn= $this->dn;
 
     /* Load phone hardware list
@@ -263,6 +262,34 @@ class workservice extends plugin
       }
     }
 
+
+    /**********
+      gotoLpdEnable 
+     **********/
+    if(isset($_POST['gotoLpdEnable_Close'])){
+      $this->dialog = NULL;
+    }
+    if(isset($_POST['gotoLpdEnable_Ok'])){
+      $this->dialog->save_object();
+      $this->gotoLpdEnable = $this->dialog->save();
+      $this->dialog = NULL;
+    }
+
+    if(isset($_POST['gotoLpdEnable_Edit'])){
+      $this->dialog = new gotoLpdEnable($this->config,$this->gotoLpdEnable,$this);
+    }
+
+    if($this->dialog instanceof plugin){
+      $this->dialog->save_object();
+      return($this->dialog->execute());
+    }
+
+
+    /**********
+      Ende: gotoLpdEnable 
+     **********/
+
+
     /* Show main page */
     $smarty= get_smarty();
 
@@ -273,7 +300,7 @@ class workservice extends plugin
     }
 
     /* Arrays */ 
-    foreach(array("XMethods", "XDrivers", "XResolutions", "XColordepths",
+    foreach(array("XDrivers", "XResolutions", "XColordepths",
           "XKbModels", "XKbVariants",
           "MouseTypes", "MousePorts") as $val){
       $smarty->assign("$val", $this->$val);
@@ -449,17 +476,18 @@ class workservice extends plugin
     $this->cleanup();
 
 
-    /* Send goto reload event to gosaSupportDaemon */
-    if(count($this->attrs)){
-      $this->send_goto_reload(); 
-    }
-
     $ldap->modify ($this->attrs); 
     new log("modify","workstation/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
     if (!$ldap->success()){
       msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, LDAP_MOD, get_class()));
     }
     $this->handle_post_events("modify");
+
+    /* Send goto reload event to gosaSupportDaemon */
+    if(count($this->attrs)){
+      $this->send_goto_reload(); 
+    }
+
   }
 
 
@@ -505,6 +533,7 @@ class workservice extends plugin
             "gotoXVsync"            => _("VSync"),
             "AutoSync"              => _("Use DDC"),
             "gotoScannerEnable"     => _("Scanner enabled"),
+            "gotoLpdEnable"         => _("Printer enabled"),
             "gotoXKbModel"          => _("Keyboard model"),
             "gotoXKbLayout"         => _("Keyboard layout"),
             "gotoXKbVariant"        => _("Keyboard variant"),
@@ -554,8 +583,10 @@ class workservice extends plugin
         if(count($macs)){
           $tmp = new $evt['CLASS_NAME']($this->config);
           $tmp->set_type(TRIGGERED_EVENT);
-          $tmp->add_targets($macs);
-          if(!$o_queue->append($tmp)){
+          $target = $o_queue->get_host().":".$o_queue->get_port();
+          $tmp->add_targets(array($target));
+          $tmp->set_macs($macs);
+          if(!$o_queue->append($tmp,TRUE)){
             msg_dialog::display(_("Service infrastructure"),msgPool::siError($o_queue->get_error()),ERROR_DIALOG);
           }
         }