diff --git a/gosa-plugins/goto/personal/environment/class_environment.inc b/gosa-plugins/goto/personal/environment/class_environment.inc
index 80270b74f620865d41ab4a40b0e603565d81bf51..b72ced3ce70b2584673ccef8f447eb45cba48c2d 100644 (file)
unset($this->attrs['gotoLogonScript']['count']);
foreach($this->attrs['gotoLogonScript'] as $device){
$tmp = $tmp2 = array();
- $tmp = split("\|",$device);
+ $tmp = explode("|",$device);
$tmp2['LogonName'] = $tmp[0];
$tmp2['LogonPriority'] = $tmp[2];
if(preg_match("/O/i",$tmp[1])){
unset($this->attrs['gotoShare']['count']);
foreach($this->attrs['gotoShare'] as $share){
$tmp = $tmp2 = array();
- $tmp = split("\|",$share);
+ $tmp = explode("|",$share);
$tmp2['server'] =$tmp[0];
$tmp2['name'] =$tmp[1];
"1280x768" => "1280x768",
"1280x1024" => "1280x1024");
- if(isset($this->config->data['MAIN']['RESOLUTION_HOOK'])){
- $file = $this->config->data['MAIN']['RESOLUTION_HOOK'];
+ if($this->config->get_cfg_value("resolutions") != ""){
+ $file = $this->config->get_cfg_value("resolutions");
if(is_readable($file)){
$str = file_get_contents($file);
- $lines = split("\n",$str);
+ $lines = preg_split("/\n/",$str);
foreach($lines as $line){
$line = trim($line);
if(!empty($line)){
}
$smarty->assign("gotoPrinter",$this->printOutPrinterDevices());
- $smarty->assign("gotoPrinterKeys",array_flip($this->printOutPrinterDevices()));
/* General behavior */
if(is_object($this->dialog)){
/* Prepare HotPlug devices */
$this->attrs['gotoHotplugDeviceDN'] = array();
foreach($this->gotoHotplugDevices as $name => $device){
- $this->attrs['gotoHotplugDeviceDN'][]= $device['dn'];
+ $this->attrs['gotoHotplugDeviceDN'][]= LDAP::fix($device['dn']);
}
/* Prepare LogonScripts */
if(is_array($this->gotoPrinter)){
foreach($this->gotoPrinter as $printer){
- if($printer['mode'] == "admin"){
+ if($printer['mode'] == 'admin'){
$a_return[$printer['cn'][0]]= $printer['cn'][0]." - "._("Administrator");
}else{
$a_return[$printer['cn'][0]]= $printer['cn'][0];
}
}
}
+ asort($a_return);
return($a_return);
}
unset($this->multi_attrs_all['gotoShare']['count']);
foreach($this->multi_attrs_all['gotoShare'] as $share){
$tmp = $tmp2 = array();
- $tmp = split("\|",$share);
+ $tmp = explode("|",$share);
$tmp2['server'] =$tmp[0];
$tmp2['name'] =$tmp[1];
unset($this->multi_attrs['gotoShare']['count']);
foreach($this->multi_attrs['gotoShare'] as $share){
$tmp = $tmp2 = array();
- $tmp = split("\|",$share);
+ $tmp = explode("|",$share);
$tmp2['server'] =$tmp[0];
$tmp2['name'] =$tmp[1];
unset($this->multi_attrs_all['gotoLogonScript']['count']);
foreach($this->multi_attrs_all['gotoLogonScript'] as $device){
$tmp = $tmp2 = array();
- $tmp = split("\|",$device);
+ $tmp = explode("|",$device);
$tmp2['LogonName'] = $tmp[0];
$tmp2['LogonPriority'] = $tmp[2];
if(preg_match("/O/i",$tmp[1])){
unset($this->multi_attrs['gotoLogonScript']['count']);
foreach($this->multi_attrs['gotoLogonScript'] as $device){
$tmp = $tmp2 = array();
- $tmp = split("\|",$device);
+ $tmp = explode("|",$device);
$tmp2['LogonName'] = $tmp[0];
$tmp2['LogonPriority'] = $tmp[2];
if(preg_match("/O/i",$tmp[1])){