![[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 1fcae8be32a59edb37ccba7f969068dbbd69cf18..812a48982592ef4df973562f09cbee2308fc918d 100644 (file)
<?php
+
class workstartup extends plugin
{
/* CLI vars */
/* Generic terminal attributes */
var $bootmode = "G";
var $goLdapServerList = array();
- var $gotoBootKernel = "default";
+ var $gotoBootKernel = "default-inherited";
var $gotoKernelParameters = "";
- var $gotoLdapServer = "default";
+ var $gotoLdapServer = "default-inherited";
var $gotoModules = array();
var $gotoAutoFs = array();
var $gotoFilesystem = array();
/* Contains all possible server/release/class settings */
var $FAIServRepConfig = array();
- function workstartup ($config, $dn= NULL)
+ function workstartup ($config, $dn= NULL, $parent= NULL)
{
- plugin::plugin ($config, $dn);
+ plugin::plugin ($config, $dn, $parent);
/* Creating a list of valid Mirrors
* none will not be saved to ldap.
$_SESSION['getAvailableClassesForThisRelease_CACHE'] = array();
$_SESSION['getAvailableClassesForThisRelease_CACHED_CLASSES'] = array();
- /* Search all FAI objects */
- $ldap->search("(|(objectClass=FAIpackageList)(objectClass=FAItemplate)(objectClass=FAIvariable)(objectClass=FAIscript)(objectClass=FAIhook)(objectClass=FAIprofile)(objectClass=FAIpartitionTable))",array("cn","objectClass","FAIdebianSection"));
- /* Sort all entries, and attach elementtype.
- * To be able to show the types in the listbox.
- */
- while($attr = $ldap->fetch()){
+ $ui = get_userinfo();
+ $res = get_list( "(|(objectClass=FAIpackageList)".
+ "(objectClass=FAItemplate)".
+ "(objectClass=FAIvariable)".
+ "(objectClass=FAIscript)".
+ "(objectClass=FAIhook)".
+ "(objectClass=FAIprofile)".
+ "(objectClass=FAIpartitionTable))",
+ $ui->subtreeACL,$this->config->current['BASE'],
+ array("cn","objectClass","FAIdebianSection"));
+
+ foreach($res as $attr){
$cn = $attr['cn'][0];
$_SESSION['getAvailableClassesForThisRelease_CACHED_CLASSES'][] = $attr;
$this->orig_dn= $this->dn;
/* Handle inheritance value "default" */
- $this->gotoBootKernels= array("%default%" => '['._("inherited").']');
+ $this->gotoBootKernels= array();
/* Load hardware list */
$ldap->cd($this->config->current['BASE']);
$ldap->search("(&(objectClass=gotoWorkstationTemplate)(member=".$this->dn."))");
if ($ldap->count() == 1){
- $map= array("gotoLdapServer","FAIclass","FAIdebianMirror");
+ $map= array("gotoLdapServer","FAIclass","FAIdebianMirror","gotoBootKernel");
$attrs= $ldap->fetch();
foreach ($map as $name){
switch ($name){
case 'gotoLdapServer':
- $this->goLdapServerList= array_merge(array('default' => _("inherited").' ['.$attrs[$name][0].']' ), $this->goLdapServerList);
+ $this->goLdapServerList= array_merge(array('default-inherited' => _("inherited").' ['.$attrs[$name][0].']' ), $this->goLdapServerList);
break;
case 'gotoBootKernel':
- $this->gotoBootKernels['%default%']= _("inherited").' ['.$attrs[$name][0].']' ;
+ $this->gotoBootKernels['default-inherited']= _("inherited").' ['.$attrs[$name][0].']' ;
break;
case 'FAIclass':
get_class($this));
} else {
+ $first = false;
$fh= popen($command, "r");
while (!feof($fh)) {
$buffer= trim(fgets($fh, 256));
- if ($buffer != ""){
- $this->gotoBootKernels[preg_replace('/:.*$/', '', $buffer)]= $buffer;
+
+ 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($this->gotoBootKernel =="" ){
+ $this->gotoBootKernel = $name;
+ }
+
}
}
pclose($fh);
}
}
+ /* Turn to default, if we've nothing to inherit */
+ if (!isset($this->gotoBootKernels['default-inherited']) && $this->gotoBootKernel == "default-inherited"){
+ $this->gotoBootKernel= "default";
+ }
+
if(count($this->FAIclass)==0 && $this->FAIrelease == ""){
$this->FAIdebianMirror = "inherited";
}
return($_SESSION['getAvailableClassesForThisRelease_CACHE'][$release]);
}
- /* Create cache with all classes
- */
- if((!isset($_SESSION['getAvailableClassesForThisRelease_CACHED_CLASSES'])) ||
- (!is_array($_SESSION['getAvailableClassesForThisRelease_CACHED_CLASSES'])) ||
- (count($_SESSION['getAvailableClassesForThisRelease_CACHED_CLASSES']) ==0 )){
-
- /* Get ldap connection */
- $ldap = $this->config->get_ldap_link();
- $ldap->cd($this->config->current['BASE']);
-
- /* Get possible classes ...
- This would be faste with some kind of caching ...
- */
- $ldap->search("(|(objectClass=FAIpackageList)(objectClass=FAItemplate)(objectClass=FAIvariable)(objectClass=FAIscript)(objectClass=FAIhook)(objectClass=FAIprofile)(objectClass=FAIpartitionTable))",array("cn"),true);
- /* Sort all entries, and attach elementtype.
- * To be able to show the types in the listbox.
- */
- while($attr = $ldap->fetch()){
- $_SESSION['getAvailableClassesForThisRelease_CACHED_CLASSES'][] = $attr;
- }
- }
-
/* Walk through cache and get out what we need.
*
* Function od : "$this->generateDNSyn($release)"
$this->FAIdebianMirror = "auto";
}
- $errorClasses = "";
-
- foreach($this->FAIServRepConfig[$this->FAIdebianMirror]['RELEASE'] as $release => $sections){
- $use = true;
-
- if(!count($this->FAIclass) == 0){
- foreach($this->FAIclass as $class){
- if(!in_array($class, $sections['PACKAGES'])){
- $use = false;
- $errorClasses[$class] = $class;
- }else{
- if(isset($errorClasses[$class])){
- unset($errorClasses[$class]);
+ $errorClasses = array();
+ if(isset($this->FAIServRepConfig[$this->FAIdebianMirror]['RELEASE'])) {
+ foreach($this->FAIServRepConfig[$this->FAIdebianMirror]['RELEASE'] as $release => $sections){
+ $use = true;
+
+ if(!count($this->FAIclass) == 0){
+ foreach($this->FAIclass as $class){
+ if(!in_array($class, $sections['PACKAGES'])){
+ $use = false;
+ $errorClasses[$class] = $class;
+ }else{
+ if(isset($errorClasses[$class])){
+ unset($errorClasses[$class]);
+ }
}
}
}
- }
- if($use){
- $ret[$release]=$release;
+ if($use){
+ $ret[$release]=$release;
+ }
}
}
if((count($ret) == 0 ) && ($this->FAIdebianMirror != "auto")){
}
/* Strip out 'default' values */
- if ($this->attrs['gotoLdapServer'] == "default"){
+ if ($this->attrs['gotoLdapServer'] == "default-inherited"){
$this->attrs['gotoLdapServer']= array();
}
- if (($this->attrs['gotoBootKernel'] == "default") || ($this->attrs['gotoBootKernel'] == "%default%")){
+ if (($this->attrs['gotoBootKernel'] == "default-inherited") || ($this->attrs['gotoBootKernel'] == "%default%")){
$this->attrs['gotoBootKernel']= array();
}
/* Remove FAI objects if no FAI class is selected */
if((count($this->FAIclass)==0) && (!isset($checkFAIstate['FAIstate']))){
- $tmp = array();
- foreach($this->attrs['objectClass'] as $class){
- if($class != "FAIobject"){
- $tmp[] = $class;
- }
- }
- $this->attrs['objectClass'] = $tmp;
$this->attrs['FAIclass'] = array();
$this->attrs['FAIdebianMirror'] = array();
}