diff --git a/plugins/personal/environment/class_environment.inc b/plugins/personal/environment/class_environment.inc
index 4132771b48a963cde6528fd5e8cafa49b5df3eaf..6c06c7817eef67853cedabcbcdf60b029d3afbc5 100644 (file)
$tmp2['name'] = $tmp[0];
$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->gotoHotplugDevices[$tmp[0]]=$tmp2;
}
}
$key = preg_replace("/^gotoShareDel_/","",$name);
$key = preg_replace("/_+[xy]$/","",$key);
$key = preg_replace("/_/", ".", $key);
+
+ if(isset($this->gotoShares[$key])) {
+ unset($this->gotoShares[$key]);
+ }
+
+ /* Remove corresponding password entry, too. This is a workaround
+ to get rid of old-style entries. */
+ $key= preg_replace("/\|/", "|!", $key);
if(isset($this->gotoShares[$key])) {
unset($this->gotoShares[$key]);
}
/* There are already defined hotplugs from other users we could use */
if(isset($_POST['gotoHotplugDeviceUse'])){
- $this->dialog = new hotplugDialog($this->config,$this->dn,true);
+ $tmp =array();
+ foreach($this->gotoHotplugDevices as $plugs){
+ $tmp[] = $plugs['name'];
+ }
+ $this->dialog = new hotplugDialog($this->config,$this->dn,true,$tmp);
$this->is_dialog = true;
}
/* Als smarty vars are set. Get smarty template and generate output */
$display.= $smarty->fetch(get_template_path('environment.tpl', TRUE,dirname(__FILE__)));
-
return($display);
}
if($this->uid==$user){
unset($attr['goto'.$s_suffix.'Printer'][$key]);
}
- }
+ }
+ $tmp = array();
+ foreach($attr['goto'.$s_suffix.'Printer'] as $user){
+ $tmp[] = $user;
+ }
+ $attr['goto'.$s_suffix.'Printer'] = array();
+ $attr['goto'.$s_suffix.'Printer'] = $tmp;
}
/* Remove administrational entries (Admin)*/
unset($attr['goto'.$s_suffix.'AdminPrinter'][$key]);
}
}
+ $tmp = array();
+ foreach($attr['goto'.$s_suffix.'AdminPrinter'] as $user){
+ $tmp[] = $user;
+ }
+ $attr['goto'.$s_suffix.'AdminPrinter'] = array();
+ $attr['goto'.$s_suffix.'AdminPrinter'] = $tmp;
}
/* Extract useable tags, to be able to save all changes
/* Prepare HotPlug devices */
$this->attrs['gotoHotplugDevice'] = array();
foreach($this->gotoHotplugDevices as $name => $device){
- $this->attrs['gotoHotplugDevice'][] = $device['name']."|".$device['description']."|".$device['id'];
+ $this->attrs['gotoHotplugDevice'][] = $device['name']."|".$device['description']."|".$device['id'].
+ "|".$device['produkt']."|".$device['vendor'];
}
/* Prepare LogonScripts */