From 7216de0bf63521ab8868499bdf6d056b4398add2 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 30 Sep 2009 15:19:13 +0000
Subject: [PATCH] Fixed fai class listing in workstation startup

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14425 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../goto/admin/systems/goto/class_workstationStartup.inc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc
index 134ec2556..6d2c6bb2c 100644
--- a/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc
@@ -651,9 +651,10 @@ class workstartup extends plugin
            */  
           $desc = ""; 
           if(isset($this->cache['CLASSES'][$this->FAIrelease][$class])){
+            $desc ="";
             foreach($this->cache['CLASSES'][$this->FAIrelease][$class] as $types ){
-              if(isset($types['Desc'])){
-                $desc= $types['Desc'];
+              if(isset($types['Abbr'])){
+                $desc.= $types['Abbr']." ";
                 if($types['Type'] == "FAIprofile"){
                   break;
                 }
@@ -1108,6 +1109,7 @@ class workstartup extends plugin
        */
       $o_queue = new gosaSupportDaemon();
       $tmp = $o_queue->FAI_get_classes($release);
+
       $this->cache['CLASSES'][$release] = array();
       if($o_queue->is_error()){
         msg_dialog::display(_("Service infrastructure"),msgPool::siError($o_queue->get_error()),ERROR_DIALOG);
@@ -1117,7 +1119,7 @@ class workstartup extends plugin
       }else{
         foreach($tmp as $entry){
           $class = $entry['CLASS'];
-          $this->cache['CLASSES'][$release][$class] = $this->analyse_fai_object($entry); 
+          $this->cache['CLASSES'][$release][$class][] = $this->analyse_fai_object($entry); 
         }
       }
 
@@ -1227,6 +1229,7 @@ class workstartup extends plugin
     $ret= array();
     foreach($classes as $class_name => $class_types){
       if(!in_array($class_name,$this->FAIclass)){
+        $Abbr = "";
         foreach($class_types as $type){
           if(!preg_match("/".$type['Abbr']."/",$Abbr)){
             $Abbr .= $type['Abbr']." ";
-- 
2.30.2