diff --git a/plugins/admin/systems/class_terminalStartup.inc b/plugins/admin/systems/class_terminalStartup.inc
index 589f89a7832aa69f718edcf7f2c78f34c08e3f85..7a02964f21b2b15e9cac8df5a262bdbd8d7a387f 100644 (file)
/* Generic terminal attributes */
var $bootmode= "G";
- var $goLdapServerList= array("default");
+ var $goLdapServerList= array();
var $gotoBootKernel= "";
var $gotoKernelParameters= "";
var $gotoLdapServer= "";
var $gotoModules= array();
var $gotoTerminalPath= "";
- var $gotoBootKernels= array("default");
+ var $gotoBootKernels= array();
/* Share */
var $gotoShares = array();// Currently Share Option
{
plugin::plugin ($config, $dn);
+ $this->gotoBootKernels = array("default"=>"["._("inherited")."]");
+
/* Get arrays */
foreach (array("gotoModules") as $val){
if (isset($this->attrs["$val"]["count"])){
$fh= popen($command, "r");
while (!feof($fh)) {
$buffer= fgets($fh, 256);
- $this->gotoBootKernels[]= $buffer;
+ if(!empty($buffer)){
+ $this->gotoBootKernels[]= $buffer;
+ }
}
pclose($fh);
- sort($this->gotoBootKernels);
}
}
+ $tmp = $this->config->data['SERVERS']['LDAP'];
+ foreach($tmp as $server){
+ $visible = $server;
+ if($server == "default"){
+ $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");
+ $attrs= $ldap->fetch();
+
+ foreach ($map as $name){
+ if (!isset($attrs[$name][0])){
+ continue;
+ }
+ switch ($name){
+ case 'gotoLdapServer':
+ $this->goLdapServerList= array_merge(array('default' => _("inherited").' ['.$attrs[$name][0].']' ), $this->goLdapServerList);
+ break;
+ }
+ }
+ }
}
function execute()
$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)
));
}
}
/* 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"){
+ $this->attrs[$value] = array();
+ }
}
/* prepare share settings */