diff --git a/plugins/admin/systems/class_terminalStartup.inc b/plugins/admin/systems/class_terminalStartup.inc
index 10ef98a06c7ccb665e069c8fcd6e3075d6594ff5..596cf2bafe009d239bcc8429f4c0a6ca0ea5b3b1 100644 (file)
/* Generic terminal attributes */
var $bootmode= "G";
var $goLdapServerList= array();
- var $gotoBootKernel= "default-inherit";
+ var $gotoBootKernel= "";
var $gotoKernelParameters= "";
var $gotoLdapServer= "";
var $gotoModules= array();
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-inherit"=>"["._("inherited")."]");
+ plugin::plugin ($config, $dn, $parent);
/* Get arrays */
foreach (array("gotoModules") as $val){
while (!feof($fh)) {
$buffer= trim(fgets($fh, 256));
- $name=$value = $buffer;
-
- if(preg_match("/:/",$buffer)){
- $name = preg_replace("/:.*$/","",$buffer);
- $value= preg_replace("/^.*:/","",$buffer);
- }
-
if(!empty($buffer)){
- $this->gotoBootKernels[$name]= $value;
+
+ $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);
$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){
case 'gotoLdapServer':
$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;
}
}
}