Added LAST class as ever used class,

[gosa.git] / plugins / admin / fai / class_faiSummaryTab.inc

diff --git a/plugins/admin/fai/class_faiSummaryTab.inc b/plugins/admin/fai/class_faiSummaryTab.inc
index f85bffaab2b2ac462ef3c6051ac460f8540213b1..0db08e8660fcb20403e9dbc768eece4f294fd86e 100644 (file)
--- a/plugins/admin/fai/class_faiSummaryTab.inc
+++ b/plugins/admin/fai/class_faiSummaryTab.inc
@@ -55,7 +55,8 @@ class faiSummaryTab extends plugin{
     $this->Result = array();
     $_SESSION['faiSummaryTab']['UniqueID'] = 0; 
     $tmp = $this->getBranches();
-    
+   
+ 
     /* Get classes & release name 
        There are 2 different tabs which use the summary tab
        faiProfile / Workstations */
@@ -74,12 +75,20 @@ class faiSummaryTab extends plugin{
     }elseif(isset($this->parent->by_name['workstartup'])){
       $this->Classes = $this->parent->by_object['workstartup']->FAIclass;
       $this->Release = $this->parent->by_object['workstartup']->FAIrelease;
+
+      /* Append workstation class && LAST */
+      if(isset($this->parent->by_object['workgeneric']->cn)){
+        $this->Classes[] = $this->parent->by_object['workgeneric']->cn;
+      }
+  
       $tmp = array_flip($tmp);
       if(!isset($tmp[$this->Release])) {
         $this->Release = "";
       }
     }
 
+    $this->Classes[] = "LAST";
+
     /* Set all available releases */
     $this->Releases = array_flip($this->getBranches());
     $this->usedClasses = array();
@@ -97,6 +106,19 @@ class faiSummaryTab extends plugin{
   function save_object()
   {
     $once = true;
+
+    if(isset($_GET['expand']) && isset($_GET['id'])){
+      if(isset($this->Result[$_GET['id']])){
+        $this->Result[$_GET['id']]['Open'] =true  ;
+      }
+    }
+
+    if(isset($_GET['compress']) && isset($_GET['id'])){
+      if(isset($this->Result[$_GET['id']])){
+        unset($this->Result[$_GET['id']]['Open']);
+      }
+    }
+
     foreach($_POST as $name => $value ){
 
       /* check for open tag request */
@@ -151,7 +173,7 @@ class faiSummaryTab extends plugin{
 
     if(isset($_GET['show'])){
       $ldap = $this->config->get_ldap_link();
-      $ldap->cat(base64_decode($_GET['id']));
+      $ldap->cat(base64_decode($_GET['id']), array('FAIscript', 'FAIhook', 'FAItemplate'));
       $attrs = $ldap->fetch();
       if($_GET['type'] == "FAIscript"){
         $str = $attrs['FAIscript'][0];
@@ -176,7 +198,7 @@ class faiSummaryTab extends plugin{
   function createSummary($data)
   {
     /* Don't generate any output, if there is no result */ 
-    $str ="<table style='width:100%;background:#F5F5F5;'> ";
+    $str ="<table cellspacing=0 cellpadding=2 style='width:100%;background:#F5F5F5;'> ";
     if(!count($this->Result)){
       $str.="<tr><td>"; 
       $str.= (_("This object has no FAI classes assigned."));
@@ -189,13 +211,17 @@ class faiSummaryTab extends plugin{
       
       $image = "<img src='".$this->objs[$key]['Image']."' class='center' alt='".$this->objs[$key]['Name']."' border=0>";
       if(!isset($entry['Open'])){
-        $str .= "<tr><td colspan=2><input type='image' class='center' src='images/expand.png' name='open_".$key."'>&nbsp;";
+        $str .= "<tr><td colspan=2>
+                    <a href='?plug=".$_GET['plug']."&expand&id=".$key."'>
+                  <img border=0 class='center' src='images/expand.png' alt='"._("Open")."'>&nbsp;";
         $str .= $image."&nbsp;";
-        $str .= "<b>".$this->objs[$key]['Name']."</b></td></tr>";
+        $str .= "<b>".$this->objs[$key]['Name']."</b></b></td></tr>";
       }else{
-        $str .= "<tr><td colspan=2><input type='image' class='center' src='images/sort_down.png' name='close_".$key."'>&nbsp;";
+        $str .= "<tr><td colspan=2>
+                    <a href='?plug=".$_GET['plug']."&compress&id=".$key."'>
+                   <img border=0 class='center' src='images/sort_down.png' alt='"._("Close")."'>&nbsp;";
         $str .= $image."&nbsp;";
-        $str .= "<b>".$this->objs[$key]['Name']."</b></td></tr>";
+        $str .= "<b>".$this->objs[$key]['Name']."</b></a></td></tr>";
    
         /* Display FAItemplate FAIhook FAIscript entries */ 
         if(in_array($key,array("FAItemplate","FAIhook","FAIscript"))){
@@ -218,12 +244,16 @@ class faiSummaryTab extends plugin{
             
             $entry['Entries'] = $tmp;
           }else{
+            $tmp = array();
             foreach($entry['Entries'] as $script){
+              $tmp[$script['cn'][0].$script['CLASS']] = $script;
               if(!isset($nums[$script['cn'][0]])){
                 $nums[$script['cn'][0]]= 0;
               } 
               $nums[$script['cn'][0]] ++;
             }
+             ksort($tmp);
+            $entry['Entries'] = $tmp;
           }
 
           foreach($entry['Entries'] as $cn => $data){
@@ -234,7 +264,7 @@ class faiSummaryTab extends plugin{
               $str .="<tr><td style='padding-left:20px;'>";
             }
 
-            $str .= "<a target='_blank'href='?plug=".$_GET['plug']."&show&type=".$key."&id=".base64_encode($data['dn'])."'>";
+            $str .= "<a target='_blank' href='?plug=".$_GET['plug']."&show&type=".$key."&id=".base64_encode($data['dn'])."'>";
             $str .= $image."&nbsp;";
             if(isset($data['FAIpriority'][0])){
               $str .= "(".$data['FAIpriority'][0].")";
@@ -258,18 +288,18 @@ class faiSummaryTab extends plugin{
             if(isset($data['description'][0])){
               $str .= " [".$data['description'][0]."] ";
             }
-            $str .=" = '".$data['FAIvariableContent'][0]."'";
-
+            /* Only display FAIvariableContent if description dosn't contain [*] */ 
+            if(isset($data['description'][0]) && !preg_match("#\[\*\]#",$data['description'][0])){
+              $str .=" = '".$data['FAIvariableContent'][0]."'";
+            }
             $str .= "</td><td><i>".$data['CLASS']."</i>";
-            
-
             $str .="</td></tr>";
           }
         }
 
         /* Create packagelist entries */ 
         if(in_array($key,array("FAIpackageList"))) {
-//          ksort($entry['Entries']);
+          ksort($entry['Entries']);
           foreach($entry['Entries'] as $data){
             $str .="<tr><td style='padding-left:20px;'>";
             $str .= $image."&nbsp;".$data['cn'][0];
@@ -288,15 +318,15 @@ class faiSummaryTab extends plugin{
             ksort($data['partitions']);
 
             $str .= "<tr><td colspan=2  style='padding-left:20px;'>";
-            $str .= "<table cellspacing=1 style='background:#FFFFFF;'>
-                      <tr style='background-color:#BBBBBB;'>
-                       <td>"._("No.")."</td>
-                       <td>"._("Name")."</td>
-                       <td>"._("FS options")."</td>
-                       <td>"._("Mount options")."</td>
-                       <td>"._("Size in MB")."</td>
-                       <td>"._("Mount point")."</td>
-                       <td>"._("Type")."</td>
+            $str .= "<table cellspacing=0 cellpadding=2 style='background:#FFFFFF;border:1px solid #B0B0B0'>
+                      <tr style='background-color:#DBDBDB;'>
+                       <td class='tbhead'>"._("No.")."</td>
+                       <td class='tbhead'>"._("Name")."</td>
+                       <td class='tbhead'>"._("FS options")."</td>
+                       <td class='tbhead'>"._("Mount options")."</td>
+                       <td class='tbhead'>"._("Size in MB")."</td>
+                       <td class='tbhead'>"._("Mount point")."</td>
+                       <td class='tbrhead'>"._("Type")."</td>
                       </tr>";
 
             $i = 0;
@@ -305,10 +335,10 @@ class faiSummaryTab extends plugin{
 
               if($i%2 == 1){
                 $c = " class='rowxp1'";
-                $d = " class='list1' style='border:0px;'";
+                $d = " class='list1'";
               }else{
                 $c = " class='rowxp0'";
-                $d = " class='list0' style='border:0px;'";
+                $d = " class='list0'";
               }
 
               $str.="<tr $c style='height:10px;'>
@@ -318,7 +348,7 @@ class faiSummaryTab extends plugin{
                       <td $d>".$part['FAIfsOptions'][0]."</td> 
                       <td $d>".$part['FAIpartitionSize'][0]."</td> 
                       <td $d>".$part['FAImountPoint'][0]."</td> 
-                      <td $d>".$part['FAIpartitionType'][0]."</td> 
+                      <td $d style='border:none'>".$part['FAIpartitionType'][0]."</td> 
                     </tr>";
             }
             $str .="</table>";