Updated hot plug ACLs.

- renamed dev_id to devID, ACLs only work with attributes not containing "_" or "-"

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

diff --git a/gosa-plugins/goto/admin/devices/class_deviceGeneric.inc b/gosa-plugins/goto/admin/devices/class_deviceGeneric.inc
index d66c4906c4483cb26bd2a5818db6337285ae8fd1..5a4de8ad20d434fc8f7629f29a4971147092fe4e 100644 (file)
--- a/gosa-plugins/goto/admin/devices/class_deviceGeneric.inc
+++ b/gosa-plugins/goto/admin/devices/class_deviceGeneric.inc
@@ -9,16 +9,16 @@ class deviceGeneric extends plugin
   public $orig_dn       = "";
   public $description   = "";
   public $vendor        = "";
-  public $dev_id        = "";
+  public $devID        = "";
   public $serial        = "";
   public $base          = "";  
   public $types;
   public $type;
 
-  public $attributes      = array("cn","description","dev_id","serial","vendor", "type");
+  public $attributes      = array("cn","description","devID","serial","vendor", "type");
   public $objectclasses   = array("top","gotoDevice");
 
-  public $CopyPasteVars   = array("orig_cn","description","vendor","dev_id","serial","base");
+  public $CopyPasteVars   = array("orig_cn","description","vendor","devID","serial","base");
 
   public function deviceGeneric(&$config,$dn = NULL)
   {
@@ -36,7 +36,7 @@ class deviceGeneric extends plugin
       $tmp = preg_split("/\|/",$this->attrs['gotoHotplugDevice'][0]);
       $this->cn         = $this->attrs['cn'][0];
       $this->description= $tmp[0];
-      $this->dev_id     = $tmp[1];
+      $this->devID     = $tmp[1];
       $this->serial     = $tmp[2];
       $this->vendor     = $tmp[3];
       if (isset($tmp[4])){
@@ -94,7 +94,7 @@ class deviceGeneric extends plugin
     }
 
     /* Skip serial check if vendor and product id are given */
-    if(preg_match("/^\s+$/i",$this->dev_id)){
+    if(preg_match("/^\s+$/i",$this->devID)){
       $message[]= msgPool::invalid(_("iSerial"),"","01234");
     }
     if(empty($this->serial) || !$this->is_2byteHex($this->serial)){
@@ -168,7 +168,7 @@ class deviceGeneric extends plugin
     $this->attrs = array();
     $this->attrs['cn'] = $this->cn;
     $this->attrs['gotoHotplugDevice'] = "";
-    foreach(array("description","dev_id","serial","vendor", "type") as $post){
+    foreach(array("description","devID","serial","vendor", "type") as $post){
       $this->attrs['gotoHotplugDevice'] .= $this->$post."|"; 
     }
     $this->attrs['gotoHotplugDevice'] = preg_replace("/\|$/","",$this->attrs['gotoHotplugDevice']);
@@ -255,7 +255,7 @@ class deviceGeneric extends plugin
             "type"          => _("Tpye"),
             "serial"        => _("Serial"),
             "vendor"        => _("Vendor"), 
-            "dev_id"        => _("Devive ID"))
+            "devID"        => _("Devive ID"))
           ));
 
   }

diff --git a/gosa-plugins/goto/admin/devices/deviceGeneric.tpl b/gosa-plugins/goto/admin/devices/deviceGeneric.tpl
index 25aac08c64ea88b6936970d15cd04a5674634eb2..294dddbe894022c8112e7426e7026848a0000880 100644 (file)
--- a/gosa-plugins/goto/admin/devices/deviceGeneric.tpl
+++ b/gosa-plugins/goto/admin/devices/deviceGeneric.tpl
@@ -50,11 +50,11 @@
    <td style="vertical-align:top">
     <table summary="">
         <tr>
-            <td><LABEL for="dev_id">{t}Serial number{/t}&nbsp;{t}(iSerial){/t}</LABEL>{$must}
+            <td><LABEL for="devID">{t}Serial number{/t}&nbsp;{t}(iSerial){/t}</LABEL>{$must}
             </td>
             <td>
-{render acl=$dev_idACL}
-                <input type="text" value="{$dev_id}" name="dev_id" id="dev_id">
+{render acl=$devIDACL}
+                <input type="text" value="{$devID}" name="devID" id="devID">
 {/render}
             </td>
             <td colspan="2">&nbsp;</td>