X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_terminalStartup.inc;h=f8f27fb61b229883ef5bdf23a57713e7ba306a9a;hb=14a1125842be8515bd8b8f7117081e00f40470b5;hp=f1bf0d3ddac92e9ab98805cdd8ee8acdffb4aaa8;hpb=2304649c2c57b79131339b8bd6fa6359a87de877;p=gosa.git diff --git a/plugins/admin/systems/class_terminalStartup.inc b/plugins/admin/systems/class_terminalStartup.inc index f1bf0d3dd..f8f27fb61 100644 --- a/plugins/admin/systems/class_terminalStartup.inc +++ b/plugins/admin/systems/class_terminalStartup.inc @@ -1,19 +1,15 @@ "Eins ist toll", "zwei" => "Zwei ist noch besser"); - /* 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 @@ -23,7 +19,7 @@ class termstartup extends plugin /* attribute list for save action */ - var $attributes= array("gotoLdapServer", "gotoBootKernel", "gotoKernelParameters"); + var $attributes= array("gotoLdapServer", "gotoBootKernel", "gotoKernelParameters","gotoModules"); var $objectclasses= array("GOhard"); /* Helper */ @@ -31,19 +27,21 @@ class termstartup extends plugin 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){ - if (isset($this->attrs["$val"]["count"])){ - for ($i= 0; $i<$this->attrs["count"]; $i++){ - if (isset($this->attrs["$val"][$i])){ - array_push($this->$val, $this->attrs["$val"][$i]); + $tmp =array(); + if (isset($this->attrs[$val]["count"])){ + for ($i= 0; $i<$this->attrs[$val]["count"]; $i++){ + if (isset($this->attrs[$val][$i])){ + $tmp[] = $this->attrs["$val"][$i]; } } } + $this->$val = $tmp; sort ($this->$val); $this->$val= array_unique($this->$val); } @@ -81,16 +79,87 @@ class termstartup extends plugin $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() { - /* Call parent execute */ - plugin::execute(); + /* Call parent execute */ + plugin::execute(); /* Do we need to flip is_account state? */ if (isset($_POST['modify_state'])){ - $this->is_account= !$this->is_account; + + /* Only change account state if allowed */ + if($this->is_account && $this->acl == "#all#"){ + $this->is_account= !$this->is_account; + }elseif(!$this->is_account && chkacl($this->acl,"create") == ""){ + $this->is_account= !$this->is_account; + } } /* Do we represent a valid terminal? */ @@ -110,7 +179,7 @@ class termstartup extends plugin /* Delete module */ if (isset ($_POST['delete_module'])){ if (count($_POST['modules_list']) && chkacl ($this->acl, "gotoModule") == ""){ - $this->del_list ($this->gotoModules, $_POST['modules_list']); + $this->gotoModules = $this->del_list($this->gotoModules, $_POST['modules_list']); } } @@ -124,11 +193,12 @@ class termstartup extends plugin */ $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 */ - if(isset($_POST['gotoShareAdd'])){ + if(isset($_POST['gotoShareAdd']) && chkacl($this->acl,"gotoShare") == ""){ /* We assign a share to this user, if we don't know where to mount the share */ if((!isset($_POST['gotoShareMountPoint']))||(empty($_POST['gotoShareMountPoint']))||(preg_match("/[\|]/i",$_POST['gotoShareMountPoint']))){ print_red(_("You must specify a valid mount point.")); @@ -144,19 +214,49 @@ class termstartup extends plugin /* if the Post gotoShareDel is set, someone asked GOsa to delete the selected entry (if there is one selected) * If there is no defined share selected, we will abort the deletion without any message */ - if((isset($_POST['gotoShareDel']))&&(isset($_POST['gotoShare']))){ + if((isset($_POST['gotoShareDel']))&&(isset($_POST['gotoShare'])) && chkacl($this->acl,"gotoShare") == ""){ unset($this->gotoShares[$_POST['gotoShare']]); } $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 "; + }; + + $use .= chkacl($this->acl,"gotoLdapServer"); + + $SelectBoxLdapServer->AddEntry( + array( + array("string"=>"", + "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); @@ -223,7 +323,7 @@ class termstartup extends plugin /* 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 ',' */ @@ -236,7 +336,7 @@ class termstartup extends plugin $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]; @@ -255,7 +355,7 @@ class termstartup extends plugin $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": @@ -276,13 +376,16 @@ class termstartup extends plugin if (isset ($this->$val) && count ($this->$val) != 0){ $this->attrs["$val"]= array_unique($this->$val); + }else{ + $this->attrs["$val"]=array(); } - if(!isset($this->attrs["$val"])) $this->attrs["$val"]=array(); } /* 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 */ @@ -298,9 +401,9 @@ class termstartup extends plugin $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"); } @@ -316,7 +419,7 @@ $ldap->modify ($this->attrs); /* Delete value to array, check if unique */ - function del_list (&$array, $list) + function del_list ($array, $list) { $tmp= array(); foreach ($array as $mod){ @@ -324,7 +427,7 @@ $ldap->modify ($this->attrs); $tmp[]= $mod; } } - $array= $tmp; + return($tmp); } /* Generate ListBox frindly output for the defined shares