diff --git a/plugins/admin/systems/class_terminalStartup.inc b/plugins/admin/systems/class_terminalStartup.inc
index 836e733a8a7d5095d77eb066f4b315f8e0370d60..596cf2bafe009d239bcc8429f4c0a6ca0ea5b3b1 100644 (file)
var $orig_dn= "";
var $ignore_account= TRUE;
- function termstartup ($config, $dn= NULL)
+ function termstartup ($config, $dn= NULL, $parent= NULL)
{
- plugin::plugin ($config, $dn);
-
- $this->gotoBootKernels = array("default"=>"["._("inherited")."]");
+ plugin::plugin ($config, $dn, $parent);
/* Get arrays */
foreach (array("gotoModules") as $val){
} else {
$fh= popen($command, "r");
while (!feof($fh)) {
- $buffer= fgets($fh, 256);
+ $buffer= trim(fgets($fh, 256));
+
if(!empty($buffer)){
- $this->gotoBootKernels[]= $buffer;
+
+ $name=$value = $buffer;
+
+ if(preg_match("/:/",$buffer)){
+ $name = preg_replace("/:.*$/","",$buffer);
+ $value= preg_replace("/^.*:/","",$buffer);
+ $this->gotoBootKernels[$name]= $name.":".$value;
+ }else{
+ $this->gotoBootKernels[$name]= $value;
+ }
+ if(empty($this->gotoBootKernel)){
+ $this->gotoBootKernel = $name;
+ }
}
}
pclose($fh);
$tmp = $this->config->data['SERVERS']['LDAP'];
foreach($tmp as $server){
$visible = $server;
- if($server == "default"){
+ if($server == "default-inherit"){
$visible = "["._("inherited")."]";
}
$this->goLdapServerList[$server] = $visible;
$ldap->cd($this->config->current['BASE']);
$ldap->search("(&(objectClass=gotoWorkstationTemplate)(member=".$this->dn."))");
if ($ldap->count() == 1){
- $map= array("gotoLdapServer");
+ $map= array("gotoLdapServer","gotoBootKernel");
$attrs= $ldap->fetch();
foreach ($map as $name){
switch ($name){
case 'gotoLdapServer':
- $this->goLdapServerList= array_merge(array('default' => _("inherited").' ['.$attrs[$name][0].']' ), $this->goLdapServerList);
+ $this->goLdapServerList= array_merge(array('default-inherit' => _("inherited").' ['.$attrs[$name][0].']' ), $this->goLdapServerList);
+ break;
+ case 'gotoBootKernel':
+ $this->gotoBootKernels= array_merge(array('default-inherit' => _("inherited").' ['.$attrs[$name][0].']' ), $this->gotoBootKernels);
break;
}
}
/* Find proper terminal path for tftp configuration
FIXME: This is suboptimal when the default has changed to
another location! */
- if ($this->gotoTerminalPath == "default"){
+ if ($this->gotoTerminalPath == "default-inherit"){
$ldap= $this->config->get_ldap_link();
/* Strip relevant part from dn, keep trailing ',' */
/* Strip out 'default' values */
foreach(array("gotoBootKernel","gotoLdapServer") as $value){
- if ($this->attrs[$value] == "default"){
+ if (!isset($this->attrs[$value]) || $this->attrs[$value] == "default-inherit"){
$this->attrs[$value] = array();
}
}