diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc
index da078940e67b70fa7af1270f424e09f8bed2fc26..f0e66df31ab213b490719df46d3acfcdc46f0fc8 100644 (file)
"1400x1050" => "1400x1050",
"1600x1200" => "1600x1200");
- if(isset($this->config->data['MAIN']['RESOLUTIONS'])){
- $file = $this->config->data['MAIN']['RESOLUTIONS'];
+ 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);
}
}
}else{
- msg_dialog(_("Configuration error"), msgPool::cannotReadFile($file), WARNING_DIALOG);
+ msg_dialog::display(_("Configuration error"), msgPool::cannotReadFile($file), WARNING_DIALOG);
}
}
/* Load phone hardware list
*/
- $tmp = get_sub_list("(objectClass=goFonHardware)","",array(get_ou("phoneou")),
+ $tmp = get_sub_list("(objectClass=goFonHardware)","",array(get_ou("phoneRDN")),
$this->config->current['BASE'],array("cn","description"), GL_NO_ACL_CHECK);
foreach($tmp as $attrs){
$cn= $attrs['cn'][0];
$deps_a = array(
get_people_ou(),
get_ou("ogroupou"),
- get_ou("serverou"),
- get_ou("terminalou"),
- get_ou("workstationou"),
- get_ou("printerou"),
- get_ou("componentou"),
- get_ou("phoneou"));
+ get_ou("serverRDN"),
+ get_ou("terminalRDN"),
+ get_ou("workstationRDN"),
+ get_ou("printerRDN"),
+ get_ou("componentRDN"),
+ get_ou("phoneRDN"));
$tmp = get_sub_list("(goFonHardware=*)","",$deps_a,$this->config->current['BASE'],
array('cn','dn','goFonHardware'),GL_NO_ACL_CHECK);
/* Do we represent a valid terminal? */
if (!$this->is_account && $this->parent === NULL){
- $display= "<img alt=\"\" src=\"images/stop.png\" align=\"middle\"> <b>".
+ $display= "<img alt=\"\" src=\"images/small-error.png\" align=\"middle\"> <b>".
_("This 'dn' has no terminal features.")."</b>";
return ($display);
}
{
new log("remove","terminal/".get_class($this),$this->dn,array_keys($this->attrs));
$this->handle_post_events("remove");
-
- plugin::remove_from_parent();
- $ldap = $this->config->get_ldap_link();
- $ldap->cd($this->dn);
- $ldap->modify($this->attrs);
- if (!$ldap->success()){
- msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, LDAP_MOD, get_class()));
- }
}