![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/admin/systems/class_terminalGeneric.inc b/plugins/admin/systems/class_terminalGeneric.inc
index 1526e213eb69a7f2ed2c5a44c4ef00b0a7c2b625..f129061de5e9610d6aa45e04810c3a156d14c82c 100644 (file)
var $fai_activated = FALSE;
var $view_logged = FALSE;
- function termgeneric ($config, $dn= NULL, $parent= NULL)
+ var $member_of_ogroup = FALSE;
+
+ 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;
}
plugin::plugin ($config, $dn, $parent);
- $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses);
+
+ if(!isset($this->parent->by_object['ogroup'])){
+ $ldap = $this->config->get_ldap_link();
+ $ldap->cd ($this->config->current['BASE']);
+ $ldap->search("(&(objectClass=gotoWorkstationTemplate)(member=".$this->dn."))",array("cn"));
+ $this->member_of_ogroup = $ldap->count() >= 1;
+ }
+
+ $this->netConfigDNS = new termDNS($this->config,$this,$this->objectclasses);
/* Read arrays */
foreach (array("ghNetNic", "ghIdeDev", "ghScsiDev") as $val){
if (!isset($this->attrs[$val])){
$this->gotoNtpServer=array();
}
+ /* You can't inherit the NTP service, if we are not member in an object group */
+ if(!$this->member_of_ogroup){
+ $this->inheritTimeServer = FALSE;
+ }
+
/* Create available ntp options */
$this->gotoNtpServers = $this->config->data['SERVERS']['NTP'];
foreach($this->gotoNtpServers as $key => $server){
$tmp = $this->config->data['SERVERS']['SYSLOG'];
foreach($tmp as $server){
$visible = $server;
- if($server == "default") {
+ if($server == "default" && $this->member_of_ogroup) {
$visible = "["._("inherited")."]";
}
$this->gotoSyslogServers[$server] = $visible;
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 {
}
/* 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 terminal features.")."</b>";
return($display);
if($server != "default"){
$tmp2[$server]= $server;
}else{
- $tmp2[$server]="["._("inherited")."]";
+ if($this->member_of_ogroup){
+ $tmp2[$server]="["._("inherited")."]";
+ }
}
}
$smarty->assign($val."_select", $this->$val);
}
+ $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)));
}
}
if(isset($_POST['termgeneric_posted'])){
- if(isset($_POST["inheritTimeServer"])){
+ if(isset($_POST["inheritTimeServer"]) && $this->member_of_ogroup){
$this->inheritTimeServer = true;
}else{
$this->inheritTimeServer = false;
}
}
+
+ if(isset($_POST["inheritAll"])){
+ $this->set_everything_to_inherited();
+ }
+
}
$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);
}
if ($ldap->count() != 0){
while ($attrs= $ldap->fetch()){
- if (preg_match ("/,ou=incoming,/", $ldap->getDN())){
+ if (preg_match("/cn=dhcp,/",$attrs['dn']) || preg_match ("/,ou=incoming,/", $ldap->getDN())){
continue;
} else {
if ($attrs['dn'] != $this->orig_dn){
}
$this->netConfigDNS->cn = $this->cn;
- $this->netConfigDNS->save($this->dn);
+ $this->netConfigDNS->save();
show_ldap_error($ldap->get_error(), sprintf(_("Saving of object system terminal/generic with dn '%s' failed."),$this->dn));
}
"FAIstate" => _("Action flag"))
));
}
+
+
+ function set_everything_to_inherited()
+ {
+ $this->gotoTerminalPath = "default";
+ $this->gotoSwapServer = "default" ;
+ $this->gotoSyslogServer = "default";
+ $this->inheritTimeServer = TRUE;
+
+ /* Set workstation service attributes to inherited */
+ if($this->member_of_ogroup && isset($this->parent->by_object['termservice'])){
+ foreach(array("gotoXKbLayout","gotoXKbModel","gotoXKbVariant",
+ "gotoXResolution","gotoXColordepth","gotoXMouseType","gotoXMouseport") as $name){
+ $this->parent->by_object['termservice']->$name = "default";
+ }
+ }
+
+ /* Set workstation startup attributes to inherited */
+ if($this->member_of_ogroup && isset($this->parent->by_object['termstartup'])){
+ $this->parent->by_object['termstartup']->gotoBootKernel = "default-inherited";
+ $this->parent->by_object['termstartup']->gotoLdapServer = "default-inherited";
+ }
+ }
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: