![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/admin/systems/class_workstationStartup.inc b/plugins/admin/systems/class_workstationStartup.inc
index 2a03e655478a2bb74cbe3bf3a94fcf66c87e30b2..88e4d38c79874a6407dc76556dfed5729f732056 100644 (file)
var $FAIrelease = "";
var $FAIdebianMirror = "auto";
+
+ /* FAI class selection */
+ var $InheritedFAIclass = array();
+ var $InheritedFAIrelease = "";
+ var $InheritedFAIdebianMirror = "auto";
+
/* Contains all possible server/release/class settings */
var $FAIServRepConfig = array();
$ldap = $this->config->get_ldap_link();
$ldap->cd($this->config->current['BASE']);
- $this->goLdapServerList= $this->config->data['SERVERS']['LDAP'];
+ foreach($this->config->data['SERVERS']['LDAP'] as $server) {
+ $this->goLdapServerList[$server]= $server; // $this->config->data['SERVERS']['LDAP'];
+ }
$_SESSION['getAvailableClassesForThisRelease_CACHE'] = array();
$_SESSION['getAvailableClassesForThisRelease_CACHED_CLASSES'] = array();
natcasesort($this->FAIclasses);
}
- $this->FAIclassInfo = $tmp2;
-
+ if(isset($tmp2)){
+ $this->FAIclassInfo = $tmp2;
+ } else {
+ $this->FAIclassInfo = array();
+ }
/* Build up an array like this one :
[$url]['SERVER'] = 'srv1-002';
/* Handle inheritance value "default" */
$this->gotoBootKernels= array("%default%" => '['._("inherited").']');
- /* 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 ($buffer != ""){
- $this->gotoBootKernels[preg_replace('/:.*$/', '', $buffer)]= $buffer;
- }
- }
- pclose($fh);
- ksort($this->gotoBootKernels);
- }
-
- }
/* 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");
+ $map= array("gotoLdapServer","FAIclass","FAIdebianMirror");
$attrs= $ldap->fetch();
foreach ($map as $name){
continue;
}
-print_a($attrs);
switch ($name){
case 'gotoLdapServer':
$this->goLdapServerList= array_merge(array('default' => _("inherited").' ['.$attrs[$name][0].']' ), $this->goLdapServerList);
break;
-# case 'gotoXColordepth':
-# $this->XColordepths= array_merge(array('default' => $attrs[$name][0].' ['._("inherited").']' ), $this->XColordepths);
-# break;
-# case 'gotoXKbModel':
-# $this->XKbModels= array_merge(array('default' => $attrs[$name][0].' ['._("inherited").']' ), $this->XKbModels);
-# break;
-# case 'gotoXKbLayout':
-# $this->XKbLayouts= array_merge(array('default' => $attrs[$name][0].' ['._("inherited").']' ), $this->XKbLayouts);
-# break;
-# case 'gotoXKbVariant':
-# $this->XKBvariants= array_merge(array('default' => $attrs[$name][0].' ['._("inherited").']' ), $this->XKbVariants);
-# break;
-# case 'gotoMouseType':
-# $this->XMouseTypes= array_merge(array('default' => $attrs[$name][0].' ['._("inherited").']' ), $this->XMouseTypes);
-# break;
-# case 'gotoMousePort':
-# $this->XMousePorts= array_merge(array('default' => $attrs[$name][0].' ['._("inherited").']' ), $this->XMousePorts);
-# break;
+
+ case 'gotoBootKernel':
+ $this->gotoBootKernels['%default%']= _("inherited").' ['.$attrs[$name][0].']' ;
+ break;
+
+ case 'FAIclass':
+ $str = split(":",$attrs[$name][0]);
+ $this->InheritedFAIclass = split("\ ",trim($str[0]));
+ $this->InheritedFAIrelease = trim($str[1]);
+ break;
+
+ case 'FAIdebianMirror':
+ $this->InheritedFAIdebianMirror = $attrs[$name][0];
+ break;
+ }
+ }
+ }
+
+ /* 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 ($buffer != ""){
+ $this->gotoBootKernels[preg_replace('/:.*$/', '', $buffer)]= $buffer;
+ }
}
+ pclose($fh);
}
}
+ if(count($this->FAIclass)==0 && $this->FAIrelease == ""){
+ $this->FAIdebianMirror = "inherited";
+ }
}
function selectFriendlyClasses(){
$tmp=array();
+ if($this->FAIdebianMirror == "inherited") return($tmp);
+
/* check if the current release exists,
else select the first one ..
*/
if((!isset($_POST['gotoShareMountPoint']))||(empty($_POST['gotoShareMountPoint']))||(preg_match("/[\|]/i",$_POST['gotoShareMountPoint']))){
print_red(_("You must specify a valid mount point."));
}else{
- $a_share = $this->gotoAvailableShares[$_POST['gotoShareSelection']];
- $s_mount = $_POST['gotoShareMountPoint'];
- /* Preparing the new assignment */
- $this->gotoShares[$a_share['name']."|".$a_share['server']]=$a_share;
- $this->gotoShares[$a_share['name']."|".$a_share['server']]['mountPoint']=$s_mount;
+ if(count($this->gotoAvailableShares)){
+ $a_share = $this->gotoAvailableShares[$_POST['gotoShareSelection']];
+ $s_mount = $_POST['gotoShareMountPoint'];
+ /* Preparing the new assignment */
+ $this->gotoShares[$a_share['name']."|".$a_share['server']]=$a_share;
+ $this->gotoShares[$a_share['name']."|".$a_share['server']]['mountPoint']=$s_mount;
+ }
}
}
}
$smarty->assign("gotoShares",$this->printOutAssignedShares());
+ $smarty->assign("gotoSharesCount",count($this->printOutAssignedShares()));
$smarty->assign("gotoShareKeys",array_flip($this->printOutAssignedShares()));
$smarty->assign("gotoBootKernels",$this->gotoBootKernels);
/* Add Entries
*/
- foreach($tmp as $server){
+ foreach($tmp as $key => $server){
$use ="";
if(($this->gotoLdapServer == $server) || ($found == false)) {
$found = true;
$SelectBoxLdapServer->AddEntry(
array(
- array("string"=>$display),
- array("string"=>"<input type='radio' name='gotoLdapServer' value='".$server."' ".$use.">",
- "attach"=>"style='border-right:0px;'")
+ array("string"=>"<input type='radio' name='gotoLdapServer' value='".$key."' ".$use.">",
+ "attach"=>"style='border-left:0px;'"),
+ array("string"=>$display)
));
}
$smarty->assign("FAIclasses",$this->selectFriendlyClasses());
$smarty->assign("FAIclassesKeys",array_flip($this->selectFriendlyClasses()));
$smarty->assign("FAIclassKeys",$this->FAIclass);
+ $smarty->assign("InheritedFAIrelease",$this->InheritedFAIrelease);
$div = new divSelectBox("WSFAIscriptClasses");
$div -> SetHeight("110");
$str_empty = " <img src='images/empty.png' alt=\"\" width='7'>";
$i = 1;
- foreach($this->FAIclass as $class){
- if($i==1){
- $str = $str_empty.$str_down.$str_remove;
- }elseif($i == count($this->FAIclass)){
- $str = $str_up.$str_empty.$str_remove;
+
+ if($this->FAIdebianMirror == "inherited"){
+ $tmp = $this->InheritedFAIclass;
+ }else{
+ $tmp = $this->FAIclass;
+ }
+
+ foreach($tmp as $class){
+
+ if($this->FAIdebianMirror == "inherited"){
+ $str = "";
}else{
- $str = $str_up.$str_down.$str_remove;
+ if($i==1){
+ $str = $str_empty.$str_down.$str_remove;
+ }elseif($i == count($this->FAIclass)){
+ $str = $str_up.$str_empty.$str_remove;
+ }else{
+ $str = $str_up.$str_down.$str_remove;
+ }
}
$i ++ ;
function getFAIdebianMirrors()
{
$ret = array();
+ $ret['inherited']="["._("inherited")."]";
$ret['auto']=_("automatic");
$secs = array();
{
$ret = array();
+ if($this->FAIdebianMirror == "inherited") return(array());
+
if(!isset($this->FAIServRepConfig[$this->FAIdebianMirror])){
$this->FAIdebianMirror = "auto";
}
if (chkacl ($this->acl, "gotoKernelParameters") == "" && isset($_POST["customParameters"])){
$this->customParameters= $_POST["customParameters"];
}
+
}
/* 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")){
$ldap= $this->config->get_ldap_link();
/* Strip relevant part from dn, keep trailing ',' */
unset( $this->attrs['FAIrelease'] );
$str = "";
- foreach($this->FAIclass as $class){
- $str .= $class." ";
- }
- $str .= ":" . $this->FAIrelease;
- $this->attrs['FAIclass']= "";
- $this->attrs['FAIclass']= trim($str);
- if(empty($this->attrs['FAIclass'])){
- $this->attrs['FAIclass'] = array();
+ if($this->FAIdebianMirror == "inherited"){
+
+ $this->attrs['FAIclass'] = $this->attrs['FAIrelease'] = $this->attrs['FAIdebianMirror'] = array();
+
+ }else{
+
+ foreach($this->FAIclass as $class){
+ $str .= $class." ";
+ }
+ $str .= ":" . $this->FAIrelease;
+ $this->attrs['FAIclass']= "";
+ $this->attrs['FAIclass']= trim($str);
+
+ if(empty($this->attrs['FAIclass'])){
+ $this->attrs['FAIclass'] = array();
+ }
}
/* Add missing arrays */
}
if(!isset($this->attrs["$val"])) $this->attrs["$val"]=array();
}
+
/* Strip out 'default' values */
if ($this->attrs['gotoLdapServer'] == "default"){
$this->attrs['gotoLdapServer']= array();
}
- if ($this->attrs['gotoBootKernel'] == "%default%" || $this->attrs['gotoBootKernel'] == "default"){
+ if (($this->attrs['gotoBootKernel'] == "default") || ($this->attrs['gotoBootKernel'] == "%default%")){
$this->attrs['gotoBootKernel']= array();
}
$this->FAIdebianMirror = "";
}
+ /* Get FAIstate from object, the generic tab could have changed it during execute */
+ $ldap= $this->config->get_ldap_link();
+ $ldap->cd($this->dn);
+ $ldap->cat($this->dn,array("FAIstate"));
+ $checkFAIstate = $ldap->fetch();
+
/* Remove FAI objects if no FAI class is selected */
- if(count($this->FAIclass)==0){
+ if((count($this->FAIclass)==0) && (!isset($checkFAIstate['FAIstate']))){
$tmp = array();
foreach($this->attrs['objectClass'] as $class){
if($class != "FAIobject"){
}
$this->attrs['gotoShare']=$tmp;
- $ldap= $this->config->get_ldap_link();
- $ldap->cd($this->dn);
$this->cleanup();
$ldap->modify ($this->attrs);