![[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 837920e3ea4e5a669bc9f03dd01789623809df36..0f47013a881e76eb534cea75ce53d47d1120e4e5 100644 (file)
var $customParameters = "";
var $orig_dn = "";
var $ignore_account = TRUE;
- var $member_of_ogroup = FALSE;
/* FAI class selection */
var $FAIclass = array();
var $FAIServRepConfig = array();
var $fai_activated = FALSE;
+ var $member_of_ogroup = FALSE;
+
+ var $o_group_dn = "";
function workstartup ($config, $dn= NULL, $parent= NULL)
{
if(!isset($this->parent->by_object['ogroup'])){
$ldap = $this->config->get_ldap_link();
$ldap->cd ($this->config->current['BASE']);
- $ldap->search("(&(objectClass=gotoWorkstationTemplate)(member=".$this->dn."))",array("cn"));
- $this->member_of_ogroup = $ldap->count() >= 1;
+ $ldap->search("(&(objectClass=gotoWorkstationTemplate)(member=".$this->dn."))",array("cn","dn"));
+ if($ldap->count()){
+ $this->member_of_ogroup = TRUE;
+ $attrs = $ldap->fetch();
+ $this->o_group_dn = $attrs['dn'];
+ }
}
/* Creating a list of valid Mirrors
"(objectClass=FAIprofile)".
"(objectClass=FAIpartitionTable))",
$ui->subtreeACL,$this->config->current['BASE'],
- array("cn","objectClass","FAIdebianSection"));
+ array("cn","objectClass","FAIdebianSection","description"));
foreach($res as $attr){
$cn = $attr['cn'][0];
$_SESSION['getAvailableClassesForThisRelease_CACHED_CLASSES'][] = $attr;
+ if(!isset($attr['description'])){
+ $attr['description'][0] = "";
+ }
+
if(in_array('FAIpackageList',$attr['objectClass'])){
$tmp2[$cn]['FAIpackageList']['obj'] = 'FAIpackageList';
$tmp2[$cn]['FAIpackageList']['kzl'] = 'Pl';
$tmp2[$cn]['FAIpackageList']['sec'] = $attr['FAIdebianSection'];
+ $tmp2[$cn]['FAIpackageList']['desc'] = $attr['description'];
$this->FAIclasses[$attr['cn'][0]]=$attr['cn'][0];
}
if(in_array('FAItemplate',$attr['objectClass'])){
$tmp2[$cn]['FAItemplate']['obj'] = 'FAItemplate';
$tmp2[$cn]['FAItemplate']['kzl'] = 'T';
+ $tmp2[$cn]['FAItemplate']['desc'] = $attr['description'];
$this->FAIclasses[$attr['cn'][0]]=$attr['cn'][0];
}
if(in_array('FAIvariable',$attr['objectClass'])){
$tmp2[$cn]['FAIvariable']['obj'] = 'FAIvariable';
$tmp2[$cn]['FAIvariable']['kzl'] = 'V';
+ $tmp2[$cn]['FAIvariable']['desc'] = $attr['description'];
$this->FAIclasses[$attr['cn'][0]]=$attr['cn'][0];
}
if(in_array('FAIscript',$attr['objectClass'])){
$tmp2[$cn]['FAIscript']['obj'] = 'FAIscript';
$tmp2[$cn]['FAIscript']['kzl'] = 'S';
+ $tmp2[$cn]['FAIscript']['desc'] = $attr['description'];
$this->FAIclasses[$attr['cn'][0]]=$attr['cn'][0];
}
if(in_array('FAIhook',$attr['objectClass'])){
$tmp2[$cn]['FAIhook']['obj'] = 'FAIhook';
$tmp2[$cn]['FAIhook']['kzl'] = 'H';
+ $tmp2[$cn]['FAIhook']['desc'] = $attr['description'];
$this->FAIclasses[$attr['cn'][0]]=$attr['cn'][0];
}
if(in_array('FAIpartitionTable',$attr['objectClass'])){
$tmp2[$cn]['FAIpartitionTable']['obj']= 'FAIpartitionTable';
$tmp2[$cn]['FAIpartitionTable']['kzl']= 'Pt';
+ $tmp2[$cn]['FAIpartitionTable']['desc'] = $attr['description'];
$this->FAIclasses[$attr['cn'][0]]=$attr['cn'][0];
}
if(in_array('FAIprofile',$attr['objectClass'])){
$tmp2[$cn]['FAIprofile']['obj']= 'FAIprofile';
$tmp2[$cn]['FAIprofile']['kzl']= 'P';
+ $tmp2[$cn]['FAIprofile']['desc'] = $attr['description'];
$this->FAIclasses[$attr['cn'][0]]=$attr['cn'][0];
}
}
/* 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){
+ if ($this->member_of_ogroup){
+ if(count($this->FAIclass)==0 && $this->FAIrelease == ""){
+ $this->FAIdebianMirror = "inherited";
+ }
if($this->fai_activated){
$map= array("gotoLdapServer","FAIclass","FAIdebianMirror","gotoBootKernel");
$map= array("gotoLdapServer","gotoBootKernel");
}
+ $ldap = $this->config->get_ldap_link();
+ $ldap->cat($this->o_group_dn);
$attrs= $ldap->fetch();
foreach ($map as $name){
$this->gotoBootKernel= "default";
}
- if(count($this->FAIclass)==0 && $this->FAIrelease == ""){
- $this->FAIdebianMirror = "inherited";
- }
}
else select the first one ..
*/
$tmp2 = $this->getFAIreleases();
+ if(!isset($tmp2[$this->FAIrelease]) || !$tmp2[$this->FAIrelease]['USE']){
+ foreach($tmp2 as $key => $data){
+ if($data['USE']){
+ $this->FAIrelease = $key;
+ }
+ }
+ }
if(!in_array($this->FAIrelease, $tmp2)){
- $this->FAIrelease = key($tmp2);
+ # $this->FAIrelease = key($tmp2);
}
/* Get all Packages for this server/release combination
*/
+
if(!isset($this->FAIServRepConfig[$this->FAIdebianMirror]['RELEASE'][$this->FAIrelease]['PACKAGES'])){
$pkgs = array();
print_red(_("There are packages in your configuration, which can't be resolved with current server/release settings."));
function execute()
{
-
/* Call parent execute */
plugin::execute();
}
}
$i ++ ;
+
+ $desc = "";
+ foreach($this->FAIclassInfo[$class] as $types ){
+ if(isset($types['desc'][0])){
+ $desc.= $types['desc'][0]." ";
+ }
+ }
+ if(!empty($desc)){
+ $desc = " [".trim($desc)."]";
+ }
$div->AddEntry(array(
- array("string"=>$class.$marker),
+ array("string"=>$class.$desc.$marker),
array("string"=>preg_replace("/\%s/",base64_encode($class),$str),"attach"=>"style='width:50px;border-right:none;'")
));
}
-
$smarty->assign("FAIScriptlist",$div->DrawList());
}
$smarty->assign($value."ACL", chkacl($this->acl, "$value"));
}
- $smarty->assign("member_of_ogroup",$this->member_of_ogroup);
-
/* Show main page */
return($smarty->fetch (get_template_path('workstationStartup.tpl', TRUE,dirname(__FILE__))));
}
function getFAIdebianMirrors()
{
$ret = array();
- $ret['inherited']="["._("inherited")."]";
- $ret['auto']=_("automatic");
+
+ /* Only add inherit option, if we are part in an object group
+ */
+ if($this->member_of_ogroup) {
+ $ret['inherited']['NAME']="["._("inherited")."]";
+ $ret['inherited']['USE'] = TRUE;
+ }
+
+ $ret['auto']['NAME']=_("automatic");
+ $ret['auto']['USE'] = TRUE;
$secs = array();
/* Walk through all available servers
*/
foreach($this->FAIServRepConfig as $mirror => $rest){
- $use = false;
+ /* Automatically selection is available everytime */
+ if($mirror == "auto"){
+ continue;
+ }
+ $use = false;
if(count($this->FAIclass) == 0){
$use = true;
}else{
$tmp = $this->getFAIreleases();
- foreach($tmp as $release){
- if(isset($rest['RELEASE'][$release])){
- $use =true;
+ foreach($tmp as $release => $data){
+ if(isset($rest['RELEASE'][$release]) && $release == $this->FAIrelease){
+ $use = $data['USE'];
}
}
}
/* If current server, doesn't support this class
remove it from list
*/
- if($use){
- $ret[$mirror] = $mirror;
- }
+ $ret[$mirror]['NAME'] = $mirror;
+ $ret[$mirror]['USE'] = $use;
}
return($ret);
}
{
$ret = array();
- if($this->FAIdebianMirror == "inherited") return(array());
+ if($this->FAIdebianMirror == "inherited") {
+ return(array());
+ }
if(!isset($this->FAIServRepConfig[$this->FAIdebianMirror])){
$this->FAIdebianMirror = "auto";
}
- $errorClasses = array();
+ $errorClasses = array();
if(isset($this->FAIServRepConfig[$this->FAIdebianMirror]['RELEASE'])) {
foreach($this->FAIServRepConfig[$this->FAIdebianMirror]['RELEASE'] as $release => $sections){
$use = true;
$errorClasses[$class] = $class;
}else{
if(isset($errorClasses[$class])){
- unset($errorClasses[$class]);
+ unset($errorClasses[$class]);
}
}
}
}
- if($use){
- $ret[$release]=$release;
- }
+ $ret[$release]['NAME']=$release;
+ $ret[$release]['USE']=$use;
}
- }
+ }
+
if((count($ret) == 0 ) && ($this->FAIdebianMirror != "auto")){
$eClasses = " ";
foreach($errorClasses as $class){
$eClasses .= $class." ";
}
-
+
$this->unresolved_classes = $errorClasses;
$this->FAIdebianMirror = "auto";
//$this->FAIclass= array();
$this->customParameters= $_POST["customParameters"];
}
- if(isset($_POST["inheritAll"])){
- $this->set_everything_to_inherited();
- }
}
return($ret);
}
-
- function set_everything_to_inherited()
- {
- $this->gotoBootKernel = "default-inherited";
- $this->gotoLdapServer = "default-inherited";
- $this->FAIdebianMirror= "inherited";
- }
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: