diff --git a/plugins/admin/systems/class_workstationGeneric.inc b/plugins/admin/systems/class_workstationGeneric.inc
index a61bf95991f0b290a7afb98fb82dbde6bd90e65b..14641c0b7617a239781a3e90249338d17245ec3b 100644 (file)
function workgeneric (&$config, $dn= NULL, $parent= NULL)
{
- $tmp = search_config($config->data,"faiManagement","CLASS");
+ $tmp= $config->search("faiManagement", "CLASS",array('menu','tabs'));
if(!empty($tmp)){
$this->fai_activated = TRUE;
}
$this->member_of_ogroup = $ldap->count() >= 1;
}
- $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses);
+ $this->netConfigDNS = new termDNS($this->config,$this,$this->objectclasses);
/* Read arrays */
foreach (array("ghNetNic", "ghIdeDev", "ghScsiDev") as $val){
}
if ((isset($_POST['action'])) && ($this->acl_is_writeable("FAIstate"))){
- $cmd= search_config($this->config->data['TABS'], "workgeneric", "ACTIONCMD");
+ $cmd= $this->config->search("workgeneric", "ACTIONCMD",array('tabs'));
if ($cmd == ""){
print_red(_("No ACTIONCMD definition found in your gosa.conf"));
} else {
}
/* Do we represent a valid terminal? */
- if (!$this->is_account && $this->parent == NULL){
+ if (!$this->is_account && $this->parent === NULL){
$display= "<img alt=\"\" src=\"images/stop.png\" align=middle> <b>".
_("This 'dn' has no workstation features.")."</b>";
return($display);
$smarty->assign("inheritTimeServer",$this->inheritTimeServer);
$smarty->assign("member_of_ogroup",$this->member_of_ogroup);
+ $str = $this->netConfigDNS->execute();
+ if(is_object($this->netConfigDNS->dialog)){
+ return($str);
+ }
+ $smarty->assign("netconfig", $str);
+
/* Show main page */
- $smarty->assign("netconfig", $this->netConfigDNS->execute());
return($smarty->fetch (get_template_path('workstation.tpl', TRUE)));
}
$message[]= _("The required field 'Workstation 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 != $this->dn){
$ldap= $this->config->get_ldap_link();
$ldap->cd ($this->base);
}
$this->netConfigDNS->cn = $this->cn;
- $this->netConfigDNS->save($this->dn);
+ $this->netConfigDNS->save();
show_ldap_error($ldap->get_error(), sprintf(_("Saving of system workstation/generic with dn '%s' failed."),$this->dn));
}
/* Return plugin informations for acl handling
#FIXME FAIscript seams to ununsed within this class... */
- function plInfo()
+ static function plInfo()
{
return (array(
"plShortName" => _("Generic"),