![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/admin/systems/class_terminalStartup.inc b/plugins/admin/systems/class_terminalStartup.inc
index f1bf0d3ddac92e9ab98805cdd8ee8acdffb4aaa8..ccfaa3828c57eefd01e4a17e4418c8d2ed241c8d 100644 (file)
/* Generic terminal attributes */
var $bootmode= "G";
- var $goLdapServerList= array("default");
- var $gotoBootKernel= "default";
+ var $goLdapServerList= array();
+ var $gotoBootKernel= "default-inherit";
var $gotoKernelParameters= "";
var $gotoLdapServer= "";
var $gotoModules= array();
var $gotoTerminalPath= "";
+ var $gotoBootKernels= array();
/* Share */
var $gotoShares = array();// Currently Share Option
{
plugin::plugin ($config, $dn);
+ $this->gotoBootKernels = array("default-inherit"=>"["._("inherited")."]");
+
/* Get arrays */
foreach (array("gotoModules") as $val){
if (isset($this->attrs["$val"]["count"])){
$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;
+ }
+ }
+ }
+ 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");
+ $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;
+ }
+ }
+ }
}
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()));
+ /* Create divSelectBox for ldap server selection
+ */
+ $SelectBoxLdapServer = new divSelectBox("LdapServer");
+ $SelectBoxLdapServer->SetHeight(80);
+ /* Set first entry as selected, if $this->gotoLdapServer is empty
+ * or given entry is no longer available ...
+ */
+ $found = false;
+ foreach($this->goLdapServerList as $server => $name){
+ if($this->gotoLdapServer==$server){
+ $found = true;
+ }
+ }
+
+ /* Add Entries
+ */
+ foreach($this->goLdapServerList as $server => $visible){
+ $use ="";
+ if(($this->gotoLdapServer == $server) || ($found == false)) {
+ $found = true;
+ $use = " checked ";
+ };
+
+ $SelectBoxLdapServer->AddEntry(
+ array(
+ array("string"=>"<input type='radio' name='gotoLdapServer' value='".$server."' ".$use.">",
+ "attach"=>"style='border-left:0px;'"),
+ array("string"=>$visible)
+ ));
+ }
+
+ $smarty->assign("SelectBoxLdapServer",$SelectBoxLdapServer->DrawList());
- /* Arrays */
- $smarty->assign("ldapservers", $this->config->data['SERVERS']['LDAP']);
- $smarty->assign("gotoLdapServer_select", $this->gotoLdapServer);
- $smarty->assign("gotoLdapServerACL", chkacl($this->acl, "gotoLdapServer"));
$smarty->assign("gotoShareACL", chkacl($this->acl, "gotoShareACL"));
foreach (array("gotoModules" ) as $val){
$smarty->assign("$val", $this->$val);
/* 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];
$this->gotoKernelParameters= "root=/dev/nfs nfsroot=".
$this->gotoTerminalPath.
",ro,hard,nolock,fg,rsize=8192 ".
- "ip=::::::dhcp LDAP=".$this->gotoLdapServer;
+ "ip=::::::dhcp ldap=".base64_encode($this->gotoLdapServer);
switch ($this->bootmode){
case "D":
}
/* 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(), sprintf(_("Saving of system terminal/startup with dn '%s' failed."),$this->dn));
$this->handle_post_events("modify");
}
return($a_return);
}
+ /* Return plugin informations for acl handling */
+ function plInfo()
+ {
+ return (array(
+ "plShortName" => _("Startup"),
+ "plDescription" => _("Terminal startup"),
+ "plSelfModify" => FALSE,
+ "plDepends" => array(),
+ "plPriority" => 0,
+ "plSection" => array("administration"),
+ "plCategory" => array("terminal"),
+
+ "plProvidedAcls"=> array(
+ "gotoLdapServer" => _("Ldap server"),
+ "gotoBootKernel" => _("Boot kernel"),
+ "gotoKernelParameters"=> _("Kernel parameter"))
+ ));
+ }
+
}