Updated hotplug dialog

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

diff --git a/Changelog b/Changelog
index 0cddad6ee4938aa22aa728b54a01e8a708977288..ca97ee475293b1137ec20333fcdf81ed65a5ba7f 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -2,6 +2,7 @@ GOsa2 changelog
 ===============
 
 * gosa 2.5.3
+  - Fixed problem in reloading departments when we've PHP4
   - Fixed gotoPrinter membership problem.
   - Fixed environment shares, only available shares will be displayed (gosaUnitTag was ignored)
   - Fixed saving of inherited workstation settings
@@ -18,6 +19,7 @@ GOsa2 changelog
   - Fixed ACL handling to *not* show the admin user dialog
     when configured for self modify only
   - Fixed problem when changing passwords via "My account"
+  - Added more information to hotplug devices.
 
 * gosa 2.5.2
   - Fixed current main base not beeing set when editing non tabbed

diff --git a/plugins/personal/environment/class_hotplugDialog.inc b/plugins/personal/environment/class_hotplugDialog.inc
index 210d787a79ea2801b6c312b73dd5798f783801fa..dbb082141e3ea561f3e3306cfb14f04b2019527a 100644 (file)
--- a/plugins/personal/environment/class_hotplugDialog.inc
+++ b/plugins/personal/environment/class_hotplugDialog.inc
@@ -9,25 +9,27 @@ class hotplugDialog extends plugin
 
   /* attribute list for save action */
   var $ignore_account       = TRUE;
-  var $attributes           = array("HOT_name","HOT_description","HOT_id");
+  var $attributes           = array("HOT_name","HOT_description","HOT_id","HOT_produkt","HOT_vendor");
   var $objectclasses        = array("whatever");
   var $use_existing         = false;  
 
   var $HOT_name                 = "";
   var $HOT_description          = "";
   var $HOT_id                   = "";
+  var $HOT_produkt              = "";
+  var $HOT_vendor               = "";
 
   var $hotplugDevices           = ""; 
   var $hotplugDeviceList        = array(); 
   var $regex                    = "*";
   var $depselect                = "/";
   var $deplist                  = "/";
+  var $skipThese                = array();
 
-
-
-  function hotplugDialog ($config, $dn= NULL,$use_existing=false )
+  function hotplugDialog ($config, $dn= NULL,$use_existing=false ,$skipThese = array())
   {
     $this->use_existing = $use_existing;
+    $this->skipThese    = $skipThese;
     plugin::plugin ($config, $dn);
     $this->depselect = $this->config->current['BASE'];
   }
@@ -118,6 +120,12 @@ class hotplugDialog extends plugin
       if((empty($this->HOT_id))||(preg_match("/[\|]/i",$this->HOT_id))){
         $message[]=_("Please specify a valid id.");
       }
+      if((empty($this->HOT_vendor))||(preg_match("/[\|]/i",$this->HOT_vendor))){
+        $message[]=_("Please specify a valid id.");
+      }
+      if((empty($this->HOT_produkt))||(preg_match("/[\|]/i",$this->HOT_produkt))){
+        $message[]=_("Please specify a valid id.");
+      }
 
     $ldap = $this->config->get_ldap_link();
     $ldap->search("(&(objectClass=gotoEnvironment)(gotoHotplugDevice=".$this->HOT_name."*))",array("gotoHotplugDevice"));
@@ -141,9 +149,11 @@ class hotplugDialog extends plugin
     /* return generated entry from input fields*/
     if(!$this->use_existing){
       $a_return=array();
-      $a_return[$this->HOT_name]['name']= $this->HOT_name; 
-      $a_return[$this->HOT_name]['description']= $this->HOT_description; 
-      $a_return[$this->HOT_name]['id']= $this->HOT_id;
+      $a_return[$this->HOT_name]['name']        = $this->HOT_name; 
+      $a_return[$this->HOT_name]['description'] = $this->HOT_description; 
+      $a_return[$this->HOT_name]['id']          = $this->HOT_id;
+      $a_return[$this->HOT_name]['produkt']     = $this->HOT_produkt;
+      $a_return[$this->HOT_name]['vendor']      = $this->HOT_vendor;
       return($a_return); 
     }else{
       $entries = array();
@@ -170,12 +180,27 @@ class hotplugDialog extends plugin
           $tmp = split("\|",$device);
           
           if(preg_match("/^".str_replace("*","",$this->regex).".*/i",$tmp[0])){
+  
+            if(in_array($tmp[0],$this->skipThese)) continue;
+
             $a_return[$tmp[0]]= $tmp[0]." [".$tmp[1]."] ".$tmp[2];
             
             $tmp2['name']         = $tmp[0];
-            $tmp2['description'] = $tmp[1];
+            $tmp2['description']  = $tmp[1];
             $tmp2['id']           = $tmp[2];
 
+            /* Produkt ID */
+            if(!isset($tmp[3])){
+              $tmp[3] = "";
+            }
+            /* Vendor ID */
+            if(!isset($tmp[4])){
+              $tmp[4] = "";
+            }
+
+            $tmp2['produkt']      = $tmp[3];
+            $tmp2['vendor']       = $tmp[4];
+
             $this->hotplugDeviceList[$tmp[0]]=$tmp2;
           }
         }

diff --git a/plugins/personal/environment/hotplugDialogNew.tpl b/plugins/personal/environment/hotplugDialogNew.tpl
index 635e93c962aabf9c9fe327d6d43ecdac19bf3ea2..9704ebeb63beabe6bece096edb529bb669271fb5 100644 (file)
--- a/plugins/personal/environment/hotplugDialogNew.tpl
+++ b/plugins/personal/environment/hotplugDialogNew.tpl
@@ -4,7 +4,7 @@
        
 <table width="100%" summary="">
  <tr>
-  <td width="50%">
+  <td width="50%" style="vertical-align:top">
        <table summary="{t}Create new hotplug device{/t}" style="border-right:1px solid #B0B0B0;width:100%">
                <tr>
                        <td><LABEL for="HOT_name">{t}Device name{/t}</LABEL>{$must}
@@ -24,12 +24,27 @@
    </td>
    <td style="vertical-align:top">
        <table summary="">
+               <tr>
+                       <td><LABEL for="HOT_vendor">{t}Vendor ID{/t}</LABEL>{$must}
+                       </td>
+                       <td>
+                               <input type="text" value="{$HOT_vendor}" name="HOT_vendor" id="HOT_vendor">
+                       </td>
+               </tr>
                <tr>
                        <td><LABEL for="HOT_id">{t}Device ID{/t}</LABEL>{$must}
                        </td>
                        <td>
                                <input type="text" value="{$HOT_id}" name="HOT_id" id="HOT_id">
                        </td>
+                       <td cols="2">&nbsp;</td>
+               </tr>
+               <tr>
+                       <td><LABEL for="HOT_produkt">{t}Product ID{/t}</LABEL>{$must}
+                       </td>
+                       <td>
+                               <input type="text" value="{$HOT_produkt}" name="HOT_produkt" id="HOT_produkt">
+                       </td>
                </tr>
        </table>
 </table>