diff --git a/plugins/admin/systems/class_terminalGeneric.inc b/plugins/admin/systems/class_terminalGeneric.inc
index 7f07d2e8ea1d5fc612fecd3b35f5572d1f595a54..c3f08d653b3d4d01f3f8a645c41e20e2043383e1 100644 (file)
$ldap->cd($this->dn);
$ldap->modify($attrs);
- show_ldap_error($ldap->get_error());
+ show_ldap_error($ldap->get_error(), sprintf(_("Saving of system terminal/generic (FAIstate) with dn '%s' failed."),$this->dn));
switch($_POST['saction']){
case 'wake':
foreach($_POST as $name => $value){
if(preg_match("/^chooseBase/",$name) && $once){
$once = false;
- $this->dialog = new baseSelectDialog($this->config);
+ $this->dialog = new baseSelectDialog($this->config,$this);
$this->dialog->setCurrentBase($this->base);
}
}
}
$smarty->assign("nfsservers", $tmp2);
+ $smarty->assign("syslogservers", $this->gotoSyslogServers);
+ $tmp = array();
+ foreach($this->gotoNtpServers as $server){
+ if(!in_array($server,$this->gotoNtpServer)){
+ $tmp[$server] = $server;
+ }
+ }
-
- $smarty->assign("syslogservers", $this->gotoSyslogServers);
- $smarty->assign("ntpservers", $this->gotoNtpServers);
+ $smarty->assign("ntpservers", $tmp);
/* Variables */
foreach(array("base", "gotoMode", "gotoTerminalPath", "gotoSwapServer",
if($ldap->count()){
$this->netConfigDNS->remove_from_parent();
$ldap->rmDir($this->dn);
- show_ldap_error($ldap->get_error(), _("Removing terminal failed"));
+ show_ldap_error($ldap->get_error(), sprintf(_("Removing of object system terminal/generic with dn '%s' failed."),$this->dn));
/* Optionally execute a command after we're done */
$this->handle_post_events("remove", array("macAddress" => $this->netConfigDNS->macAddress));
}
$this->netConfigDNS->cn = $this->cn;
$this->netConfigDNS->save($this->dn);
- show_ldap_error($ldap->get_error(), _("Saving terminal failed"));
+ show_ldap_error($ldap->get_error(), sprintf(_("Saving of object system terminal/generic with dn '%s' failed."),$this->dn));
/* Optionally execute a command after we're done */
$this->postcreate();