diff --git a/plugins/admin/systems/class_terminalGeneric.inc b/plugins/admin/systems/class_terminalGeneric.inc
index 3e16aabb1e611ca76cf78ae7800c29758a2d0f36..98f247e7515a6ed32f9026a9f1b498a9f527a405 100644 (file)
var $gotoTerminalPath= "";
var $gotoSwapServer= "";
var $gotoSyslogServer= "";
+ var $gotoSyslogServers = array();
var $gotoNtpServer= array();
var $gotoNtpServers= array();
var $gotoSndModule= "";
}
/* Set inherit checkbox state */
- if(in_array("default",$this->gotoNtpServer)){
+ if((in_array("default",$this->gotoNtpServer)) || (count($this->gotoNtpServer)==0)){
$this->inheritTimeServer = true;
$this->gotoNtpServer=array();
}
$this->base= preg_replace ("/^[^,]+,[^,]+,[^,]+,/", "", $this->dn);
}
+ /* Create an array of all Syslog servers */
+ $tmp = $this->config->data['SERVERS']['SYSLOG'];
+ foreach($tmp as $server){
+ $visible = $server;
+ if($server == "default") {
+ $visible = "["._("inherited")."]";
+ }
+ $this->gotoSyslogServers[$server] = $visible;
+ }
+
$this->orig_dn= $this->dn;
}
$tmp2[$servername.":".$path]= $servername.":".$path;
}else{
- $tmp2[$server]=$server;
+ $tmp2[$server]="["._("inherited")."]";
}
}
$smarty->assign("nfsservers", $tmp2);
- $smarty->assign("syslogservers", $this->config->data['SERVERS']['SYSLOG']);
+
+
+
+ $smarty->assign("syslogservers", $this->gotoSyslogServers);
$smarty->assign("ntpservers", $this->gotoNtpServers);
/* Variables */
}
if($this->inheritTimeServer){
- $this->attrs['gotoNtpServer'] = "default";
+ $this->attrs['gotoNtpServer'] = array();
}else{
/* Set ntpServers */
$this->attrs['gotoNtpServer'] = array();
}
}
+ /* Append gosaAdministrativeUnitTag to objectClass if gosaUnitTag isset */
+ if(($this->gosaUnitTag) && (!in_array_ics("gosaAdministrativeUnitTag",$this->attrs['objectClass']))){
+ $this->attrs['objectClass'][] = "gosaAdministrativeUnitTag";
+ }
+
/* Write back to ldap */
$ldap= $this->config->get_ldap_link();
if ($this->orig_dn == 'new'){