Updated gotoLpdEnable

-Do not write fill dieve type strings, just 'U' for USB, S Serial ...

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@12677 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-plugins/goto/admin/systems/goto/class_gotoLpdEnabled.inc b/gosa-plugins/goto/admin/systems/goto/class_gotoLpdEnabled.inc
index 0437ed9a0d747390c1a8fea1832cf4d90a764887..beec5b7adf64fe421ef31040c66adcecaff819f1 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/class_gotoLpdEnabled.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_gotoLpdEnabled.inc
@@ -8,7 +8,7 @@ class gotoLpdEnable extends plugin
   private $data = array();
   private $default_entry = array();
 
-  protected $s_Type = "USB";
+  protected $s_Type = "U";
   protected $s_Device = "/dev/usb/lp";
   protected $i_Port = 9100;   
   protected $s_Options = "";
@@ -33,8 +33,8 @@ class gotoLpdEnable extends plugin
   /*! \brief  Create gotoLpdEnable dialog, allows to edit printer settings.
       @param  Object  $config  The GOsa configuration object.
       @param  Array   $data    The values for attribute 'gotoLpdEnable'
-                      e.g.     array("USB:/dev/usb/lp0:9100:9600:S:E:0:Y:options",
-                               "USB:/dev/usb/lp1:9101:9600:S:E:5:Y:", ...)
+                      e.g.     array("U:/dev/usb/lp0:9100:9600:S:E:0:Y:options",
+                               "U:/dev/usb/lp1:9101:9600:S:E:5:Y:", ...)
       @param  Object  $parent  A reference to the parent plugin-object. 
       @return Object  gotoLpdEnable (plugin) 
   */
@@ -47,9 +47,9 @@ class gotoLpdEnable extends plugin
     /* Predefine selectable values 
      */ 
     $this->a_Types = array(
-        "USB" => _("USB"),
-        "Parallel" => _("Parallel port"),
-        "Serial" => _("Serial"));
+        "U" => _("USB"),
+        "P" => _("Parallel port"),
+        "S" => _("Serial"));
     $this->a_FlowControl = array(
         "S" => _("Software"),
         "H" => _("Hardware"));
@@ -69,9 +69,9 @@ class gotoLpdEnable extends plugin
     $this->a_Bits = array(
         5,6,7,8);
     $this->a_Devices = array(
-        "USB" => "/dev/usb/lp",
-        "Parallel" => "/dev/lp",
-        "Serial" => "/dev/ttyS");
+        "U" => "/dev/usb/lp",
+        "P" => "/dev/lp",
+        "S" => "/dev/ttyS");
 
     /* Create default entry 
      */

diff --git a/gosa-plugins/goto/admin/systems/goto/gotoLpdEnable.tpl b/gosa-plugins/goto/admin/systems/goto/gotoLpdEnable.tpl
index 18e025d34e22f1d67f80749f6aefd9394933ae15..438068495cb37bb16ad1e2a6010902e493cc8871 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/gotoLpdEnable.tpl
+++ b/gosa-plugins/goto/admin/systems/goto/gotoLpdEnable.tpl
@@ -80,7 +80,7 @@
                        </table>
                </td>
                <td>
-{if $s_Type == "Serial"}
+{if $s_Type == "S"}
                        <table>
                                <tr>
                                        <td>{t}Bit rate{/t}</td>