diff --git a/plugins/admin/systems/class_terminalStartup.inc b/plugins/admin/systems/class_terminalStartup.inc
index 35b521d49017d7f58a3f8469f8eff43db334b6b1..596cf2bafe009d239bcc8429f4c0a6ca0ea5b3b1 100644 (file)
/* Generic terminal attributes */
var $bootmode= "G";
- var $goLdapServerList= array("default");
- var $gotoBootKernel= "default";
+ var $goLdapServerList= array();
+ var $gotoBootKernel= "";
var $gotoKernelParameters= "";
var $gotoLdapServer= "";
var $gotoModules= array();
var $gotoTerminalPath= "";
+ var $gotoBootKernels= array();
/* Share */
var $gotoShares = array();// Currently Share Option
var $orig_dn= "";
var $ignore_account= TRUE;
- function termstartup ($config, $dn= NULL)
+ function termstartup ($config, $dn= NULL, $parent= NULL)
{
- plugin::plugin ($config, $dn);
+ plugin::plugin ($config, $dn, $parent);
/* Get arrays */
foreach (array("gotoModules") as $val){
$this->gotoAvailableShares= $config->getShareList(false);
$this->orig_dn= $this->dn;
+
+ /* Get list of boot kernels */
+ if (isset($this->config->data['TABS'])){
+ $command= search_config($this->config->data['TABS'], get_class($this), "KERNELS");
+
+ if (!check_command($command)){
+ $message[]= sprintf(_("Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to exist."), $command,
+ get_class($this));
+ } else {
+ $fh= popen($command, "r");
+ while (!feof($fh)) {
+ $buffer= trim(fgets($fh, 256));
+
+ if(!empty($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-inherit"){
+ $visible = "["._("inherited")."]";
+ }
+ $this->goLdapServerList[$server] = $visible;
+ }
+
+ /* Load hardware list */
+ $ldap= $this->config->get_ldap_link();
+ $ldap->cd($this->config->current['BASE']);
+ $ldap->search("(&(objectClass=gotoWorkstationTemplate)(member=".$this->dn."))");
+ if ($ldap->count() == 1){
+ $map= array("gotoLdapServer","gotoBootKernel");
+ $attrs= $ldap->fetch();
+
+ foreach ($map as $name){
+ if (!isset($attrs[$name][0])){
+ continue;
+ }
+
+ switch ($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;
+ }
+ }
+ }
}
function execute()
*/
$smarty->assign("gotoShareSelections", $this->gotoShareSelections);
$smarty->assign("gotoShareSelectionKeys", array_flip($this->gotoShareSelections));
+ $smarty->assign("gotoBootKernels",$this->gotoBootKernels);
/* if $_POST['gotoShareAdd'] is set, we will try to add a new entry
* This entry will be, a combination of mountPoint and sharedefinitions
$smarty->assign("gotoShares",$this->printOutAssignedShares());
$smarty->assign("gotoShareKeys",array_flip($this->printOutAssignedShares()));
- /* Arrays */
- $tmp = $this->config->data['SERVERS']['LDAP'];
-
/* Create divSelectBox for ldap server selection
*/
$SelectBoxLdapServer = new divSelectBox("LdapServer");
* or given entry is no longer available ...
*/
$found = false;
- foreach($tmp as $server){
+ foreach($this->goLdapServerList as $server => $name){
if($this->gotoLdapServer==$server){
$found = true;
}
/* Add Entries
*/
- foreach($tmp as $server){
+ foreach($this->goLdapServerList as $server => $visible){
$use ="";
if(($this->gotoLdapServer == $server) || ($found == false)) {
$found = true;
$SelectBoxLdapServer->AddEntry(
array(
- array("string"=>$server),
array("string"=>"<input type='radio' name='gotoLdapServer' value='".$server."' ".$use.">",
- "attach"=>"style='border-right:0px;'")
+ "attach"=>"style='border-left:0px;'"),
+ array("string"=>$visible)
));
}
/* 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 ',' */
$tmp= preg_replace ("/^[^,]+,/", "", $tmp);
$ldap->cat("cn=default,ou=terminals,ou=systems,$tmp".
- $this->config->current['BASE']);
+ $this->config->current['BASE'], array('gotoTerminalPath'));
$attrs= $ldap->fetch();
if (isset($attrs['gotoTerminalPath'])){
$this->gotoTerminalPath= $attrs['gotoTerminalPath'][0];
}
/* Strip out 'default' values */
- if ($this->attrs['gotoLdapServer'] == "default"){
- unset ($this->attrs['gotoLdapServer']);
+ foreach(array("gotoBootKernel","gotoLdapServer") as $value){
+ if (!isset($this->attrs[$value]) || $this->attrs[$value] == "default-inherit"){
+ $this->attrs[$value] = array();
+ }
}
/* prepare share settings */
$ldap= $this->config->get_ldap_link();
$ldap->cd($this->dn);
$this->cleanup();
-$ldap->modify ($this->attrs);
+ $ldap->modify ($this->attrs);
- show_ldap_error($ldap->get_error());
+ show_ldap_error($ldap->get_error(), _("Saving terminal startup settings failed"));
$this->handle_post_events("modify");
}