Updated class filter and listing.

[gosa.git] / gosa-core / include / class_listing.inc

diff --git a/gosa-core/include/class_listing.inc b/gosa-core/include/class_listing.inc
index 3af94e18f995405171b30086a6d5cb215d3860e3..d4f972d3da2c5357fdb2f11ed6fe0c502125e3f3 100644 (file)
--- a/gosa-core/include/class_listing.inc
+++ b/gosa-core/include/class_listing.inc
@@ -123,6 +123,7 @@ class listing {
 
   function setFilter($filter)
   {
+    $filter->setCategories($this->categories);
     $this->filter= &$filter;
     if ($this->departmentBrowser){
       $this->departments= $this->getDepartments();
@@ -238,21 +239,21 @@ class listing {
             isset($config['sortType'])) {
           $this->sortAttribute= $config['sortAttribute'];
           $this->sortType= $config['sortType'];
-          $sorter= "&nbsp;<img border='0' title='".($this->sortDirection[$index]?_("Up"):_("Down"))."' src='images/lists/sort-".($this->sortDirection[$index]?"up":"down").".png' align='top'>";
+          $sorter= "&nbsp;".image("images/lists/sort-".($this->sortDirection[$index]?"up":"down").".png", null, $this->sortDirection[$index]?_("Up"):_("Down"), "text-top");
         }
         $sortable= (isset($config['sortAttribute']));
 
         $link= "href='?plug=".$_GET['plug']."&amp;PID=".$this->pid."&amp;act=SORT_$index'";
         if (isset($config['label'])) {
           if ($sortable) {
-            $this->header[$index]= "<td class='listheader' ".$this->colprops[$index]."><a $link>"._($config['label'])."$sorter</a></td>";
+            $this->header[$index]= "<td class='listheader' ".$this->colprops[$index]."><a $link>"._($config['label'])."</a>$sorter</td>";
           } else {
             $this->header[$index]= "<td class='listheader' ".$this->colprops[$index].">"._($config['label'])."</td>";
           }
           $this->plainHeader[]= _($config['label']);
         } else {
           if ($sortable) {
-            $this->header[$index]= "<td class='listheader' ".$this->colprops[$index]."><a $link>&nbsp;$sorter</a></td>";
+            $this->header[$index]= "<td class='listheader' ".$this->colprops[$index]."><a $link>&nbsp;</a>$sorter</td>";
           } else {
             $this->header[$index]= "<td class='listheader' ".$this->colprops[$index].">&nbsp;</td>";
           }
@@ -416,7 +417,7 @@ class listing {
       foreach ($this->objectTypes as $objectType) {
         if (isset($this->objectTypeCount[$objectType['label']])) {
           $label= _($objectType['label']);
-          $result.= image($objectType['image'], null, null, $label)."&nbsp;".$this->objectTypeCount[$objectType['label']]."&nbsp;&nbsp;";
+          $result.= image($objectType['image'], null, $label)."&nbsp;".$this->objectTypeCount[$objectType['label']]."&nbsp;&nbsp;";
         }
       }
 
@@ -818,7 +819,7 @@ class listing {
     $objectType= $this->getObjectType($this->objectTypes, $classes);
     if ($objectType) {
       $this->objectDnMapping[$dn]= $objectType["objectClass"];
-      $result= "<img class='center' title='".LDAP::fix($dn)."' src='".$objectType["image"]."'>";
+      $result= image($objectType["image"], null, LDAP::fix($dn));
       if (!isset($this->objectTypeCount[$objectType['label']])) {
         $this->objectTypeCount[$objectType['label']]= 0;
       }
@@ -839,10 +840,15 @@ class listing {
     // Go thru all actions
     $result= "";
     $actions= $this->xmlData['actiontriggers']['action'];
+
+    // Ensure we've a valid actions array, if there is only one action in the actiontriggers col
+    //  then we've to create a valid array here.
+    if(isset($actions['name'])) $actions = array($actions);
+
     foreach($actions as $action) {
       // Skip the entry completely if there's no permission to execute it
       if (!$this->hasActionPermission($action, $dn, $classes)) {
-        $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+        $result.= image('images/empty.png');
         continue;
       }
 
@@ -852,12 +858,12 @@ class listing {
         if (preg_match('/^(.*)!$/', $fa, $m)){
           $fa= $m[1];
           if (isset($this->entries[$row][$fa]) && $this->entries[$row][$fa][0] == $fv) {
-            $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+            $result.= image('images/empty.png');
             continue;
           }
         } else {
           if (!isset($this->entries[$row][$fa]) && !$this->entries[$row][$fa][0] == $fv) {
-            $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+            $result.= image('images/empty.png');
             continue;
           }
         }
@@ -871,17 +877,17 @@ class listing {
         if (preg_match('/^!(.*)$/', $objectclass, $m)){
           $objectclass= $m[1];
           if(in_array($objectclass, $classes)) {
-            $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+            $result.= image('images/empty.png');
             continue;
           }
         } elseif (is_string($objectclass)) {
           if(!in_array($objectclass, $classes)) {
-            $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+            $result.= image('images/empty.png');
             continue;
           }
         } elseif (is_array($objectclass)) {
           if(count(array_intersect($objectclass, $classes)) != count($objectclass)){
-            $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+            $result.= image('images/empty.png');
             continue;
           }
         }
@@ -891,8 +897,7 @@ class listing {
       if ($action['type'] == "entry") {
         $label= $this->processElementFilter($action['label'], $this->entries[$row], $row);
         $image= $this->processElementFilter($action['image'], $this->entries[$row], $row);
-        $result.="<input class='center' type='image' src='$image' title='$label' ".
-                 "name='listing_".$action['name']."_$row' style='padding:1px'>";
+        $result.= image($image, "listing_".$action['name']."_$row", $label);
       }
 
       // Handle special types
@@ -986,29 +991,29 @@ class listing {
 
     /* Draw root button */
     if($enableRoot){
-      $result["ROOT"]= image('images/lists/root.png', null, 'ROOT', _("Root"));
+      $result["ROOT"]= image('images/lists/root.png', 'ROOT', _("Root"));
     }else{
-      $result["ROOT"]= image('images/lists/root-grey.png', null, null, _("Root"));
+      $result["ROOT"]= image('images/lists/root-grey.png', null, _("Root"));
     }
 
     /* Draw back button */
     if($enableBack){
-      $result["BACK"]= image('images/lists/back.png', null, 'BACK', _("Go up one department"));
+      $result["BACK"]= image('images/lists/back.png', 'BACK', _("Go up one department"));
     }else{
-      $result["BACK"]= image('images/lists/back-grey.png', null, null, _("Go up one department"));
+      $result["BACK"]= image('images/lists/back-grey.png', null, _("Go up one department"));
     }
 
     /* Draw home button */
    /* Draw home button */
     if($enableHome){
-      $result["HOME"]= image('images/lists/home.png', null, 'HOME', _("Go to users department"));
+      $result["HOME"]= image('images/lists/home.png', 'HOME', _("Go to users department"));
     }else{
-      $result["HOME"]= image('images/lists/home-grey.png', null, null, _("Go to users department"));
+      $result["HOME"]= image('images/lists/home-grey.png', null, _("Go to users department"));
     }
 
 
     /* Draw reload button, this button is enabled everytime */
-    $result["RELOAD"]= image('images/lists/reload.png', null, 'REFRESH', _("Reload list"));
+    $result["RELOAD"]= image('images/lists/reload.png', 'REFRESH', _("Reload list"));
 
     return ($result);
   }
@@ -1103,8 +1108,7 @@ class listing {
     // Load shortcut
     $actions= &$this->xmlData['actionmenu']['action'];
     $result= "<input type='hidden' name='act' id='actionmenu' value=''><div style='display:none'><input type='submit' name='exec_act' id='exec_act' value=''></div>".
-             "<ul class='level1' id='root'><li><a href='#'>"._("Actions")."&nbsp;<img ".
-             "border=0 class='center' src='images/lists/sort-down.png'></a>";
+             "<ul class='level1' id='root'><li><a href='#'>"._("Actions")."&nbsp;".image("images/lists/sort-down.png")."</a>";
 
     // Build ul/li list
     $result.= $this->recurseActions($actions);
@@ -1140,7 +1144,7 @@ class listing {
       // Fill image if set
       $img= "";
       if (isset($action['image'])){
-        $img= "<img border='0' class='center' src='".$action['image']."'>&nbsp;";
+        $img= image($action['image'])."&nbsp;";
       }
 
       if ($action['type'] == "separator"){
@@ -1152,7 +1156,7 @@ class listing {
       if ($action['type'] == "sub" && isset($action['action'])) {
         $level++;
         if (isset($action['label'])){
-          $result.= "<li$separator><a href='#'>$img"._($action['label'])."&nbsp;<img border='0' src='images/forward-arrow.png'></a>";
+          $result.= "<li$separator><a href='#'>$img"._($action['label'])."&nbsp;".image('images/forward-arrow.png')."</a>";
         }
 
         // Ensure we've an array of actions, this enables sub menus with only one action.
@@ -1374,13 +1378,13 @@ class listing {
 
       // Copy entry
       if($copy){
-        $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"copy\";document.getElementById(\"exec_act\").click();'><img src='images/lists/copy.png' alt='' border='0' class='center'>&nbsp;"._("Copy")."</a></li>";
+        $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"copy\";document.getElementById(\"exec_act\").click();'>".image('images/lists/copy.png')."&nbsp;"._("Copy")."</a></li>";
         $separator= "";
       }
 
       // Cut entry
       if($cut){
-        $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"cut\";document.getElementById(\"exec_act\").click();'><img src='images/lists/cut.png' alt='' border='0' class='center'>&nbsp;"._("Cut")."</a></li>";
+        $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"cut\";document.getElementById(\"exec_act\").click();'>".image("images/lists/cut.png")."&nbsp;"._("Cut")."</a></li>";
         $separator= "";
       }
     }
@@ -1388,9 +1392,9 @@ class listing {
     // Draw entries that allow pasting entries
     if($paste){
       if($this->copyPasteHandler->entries_queued()){
-        $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"paste\";document.getElementById(\"exec_act\").click();'><img src='images/lists/paste.png' alt='' border='0' class='center'>&nbsp;"._("Paste")."</a></li>";
+        $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"paste\";document.getElementById(\"exec_act\").click();'>".image("images/lists/paste.png")."&nbsp;"._("Paste")."</a></li>";
       }else{
-        $result.= "<li$separator><a href='#'><img src='images/lists/paste-grey.png' alt='' border='0' class='center'>&nbsp;"._("Paste")."</a></li>";
+        $result.= "<li$separator><a href='#'>".image('images/lists/paste-grey.png')."&nbsp;"._("Paste")."</a></li>";
       }
     }
     
@@ -1413,20 +1417,18 @@ class listing {
     // Render cut entries
     if($cut){
       if($ui->is_cutable($dn, $category, $class)){
-        $result .= "<input class='center' type='image'
-          src='images/lists/cut.png' alt='"._("Cut")."' name='listing_cut_$row' title='"._("Cut this entry")."' style='padding:1px'>";
+        $result.= image('images/lists/cut.png', "listing_cut_$row", _("Cut this entry"));
       }else{
-        $result.="<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+        $result.= image('images/empty.png');
       }
     }
 
     // Render copy entries
     if($copy){
       if($ui->is_copyable($dn, $category, $class)){
-        $result.= "<input class='center' type='image'
-          src='images/lists/copy.png' alt='"._("Copy")."' name='listing_copy_$row' title='"._("Copy this entry")."' style='padding:1px'>";
+        $result.= image('images/lists/copy.png', "listing_copy_$row", _("Copy this entry"));
       }else{
-        $result.="<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+        $result.= image('images/empty.png');
       }
     }
 
@@ -1456,9 +1458,9 @@ class listing {
 
       // Draw icons according to the restore flag
       if($restore){
-        $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"restore\";document.getElementById(\"exec_act\").click();'><img src='images/lists/restore.png' alt='' border='0' class='center'>&nbsp;"._("Restore snapshots")."</a></li>";
+        $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"restore\";document.getElementById(\"exec_act\").click();'>".image('images/lists/restore.png')."&nbsp;"._("Restore snapshots")."</a></li>";
       }else{
-        $result.= "<li$separator><a href='#'><img src='images/lists/restore_grey.png' alt='' border='0' class='center'>&nbsp;"._("Restore snapshots")."</a></li>";
+        $result.= "<li$separator><a href='#'>".image('images/lists/restore-grey.png')."&nbsp;"._("Restore snapshots")."</a></li>";
       }
     }
 
@@ -1472,11 +1474,11 @@ class listing {
     $result = "";
 
     // Draw entries
-    $result.= "<li$separator><a href='#'><img border='0' class='center' src='images/lists/export.png'>&nbsp;"._("Export list")."&nbsp;<img border='0' src='images/forward-arrow.png'></a><ul class='level3'>";
+    $result.= "<li$separator><a href='#'>".image('images/lists/export.png')."&nbsp;"._("Export list")."&nbsp;".image("images/forward-arrow.png")."</a><ul class='level3'>";
 
     // Export CVS as build in exporter
     foreach ($this->exporter as $action => $exporter) {
-      $result.= "<li><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"$action\";document.getElementById(\"exec_act\").click();'><img border='0' class='center' src='".$exporter['image']."'>&nbsp;".$exporter['label']."</a></li>";
+      $result.= "<li><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"$action\";document.getElementById(\"exec_act\").click();'>".image($exporter['image'])."&nbsp;".$exporter['label']."</a></li>";
     }
 
     // Finalize list
@@ -1506,21 +1508,17 @@ class listing {
 
         // Do we have snapshots for this dn?
         if($this->snapshotHandler->hasSnapshots($dn)){
-          $result.= "<input class='center' type='image' src='images/lists/restore.png' ".
-                     "alt='"._("Restore snapshot")."' name='listing_restore_$row' title='".
-                     _("Restore snapshot")."' style='padding:1px'>";
+          $result.= image('images/lists/restore.png', "listing_restore_$row", _("Restore snapshot"));
         } else {
-          $result.= "<img src='images/lists/restore_grey.png' alt=' ' class='center' style='padding:1px'>";
+          $result.= image('images/lists/restore-grey.png');
         }
       }
 
       // Draw snapshot button
       if($ui->allow_snapshot_create($dn, $category)){
-          $result.= "<input class='center' type='image' src='images/snapshot.png' ".
-                     "alt='"._("Create snapshot")."' name='listing_snapshot_$row' title='".
-                     _("Create a new snapshot from this object")."' style='padding:1px'>";
+          $result.= image('images/snapshot.png', "listing_snapshot_$row", _("Create a new snapshot from this object"));
       }else{
-          $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+          $result.= image('images/empty.png');
       }
     }