diff --git a/plugins/admin/systems/class_terminalGeneric.inc b/plugins/admin/systems/class_terminalGeneric.inc
index 6b7d04b4fb9797191eb49971c061fbc62ba7bc7b..f129061de5e9610d6aa45e04810c3a156d14c82c 100644 (file)
function termgeneric (&$config, $dn= NULL, $parent= NULL)
{
/* Check if FAI is activated */
- $tmp = search_config($config->data,"faiManagement","CLASS");
+ $tmp= $config->search("faiManagement", "CLASS",array('menu','tabs'));
if(!empty($tmp)){
$this->fai_activated = TRUE;
}
switch($_POST['saction']){
case 'wake':
- $cmd= search_config($this->config->data['TABS'], "termgeneric", "WAKECMD");
+ $cmd= $this->config->search("termgeneric", "WAKECMD",array('tabs'));
+
if ($cmd == ""){
print_red(_("No WAKECMD definition found in your gosa.conf"));
} else {
break;
case 'reboot':
- $cmd= search_config($this->config->data['TABS'], "termgeneric", "REBOOTCMD");
+ $cmd= $this->config->search("termgeneric", "REBOOTCMD",array('tabs'));
if ($cmd == ""){
print_red(_("No REBOOTCMD definition found in your gosa.conf"));
} else {
break;
case 'halt':
- $cmd= search_config($this->config->data['TABS'], "termgeneric", "HALTCMD");
+ $cmd= $this->config->search("termgeneric", "HALTCMD",array('tabs'));
if ($cmd == ""){
print_red(_("No HALTCMD definition found in your gosa.conf"));
} else {
$smarty->assign("member_of_ogroup",$this->member_of_ogroup);
/* Show main page */
- $smarty->assign("netconfig", $this->netConfigDNS->execute());
+ $str = $this->netConfigDNS->execute();
+ if(is_object($this->netConfigDNS->dialog)){
+ return($str);
+ }
+ $smarty->assign("netconfig", $str);
return($smarty->fetch (get_template_path('terminal.tpl', TRUE)));
}
$message[]= _("The required field 'Terminal name' is not set.");
}
+ /* Check if given name is a valid host/dns name */
+ if(!is_dns_name($this->cn) ){
+ $message[] = _("Please specify a valid name for this object.");
+ }
+
if ($this->orig_dn == 'new'){
$ldap= $this->config->get_ldap_link();
$ldap->cd ($this->base);