X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_listing.inc;h=46f427a28fe732500b423f6719494035226369bd;hb=9c309d6fc3d3ff65caf535b6f53ea3177433d29b;hp=c49320984f65053bd1346afb14141bb25bd7ecba;hpb=c1afefdafd7148a79da1e9173c711839aa5be8ea;p=gosa.git

diff --git a/gosa-core/include/class_listing.inc b/gosa-core/include/class_listing.inc
index c49320984..46f427a28 100644
--- a/gosa-core/include/class_listing.inc
+++ b/gosa-core/include/class_listing.inc
@@ -401,6 +401,17 @@ class listing {
     $entryIterator= new listingSortIterator($this->entries, $this->sortDirection[$this->sortColumn], "_sort".$this->sortColumn, $this->sortType);
     foreach ($entryIterator as $row => $entry){
 
+      // Apply label to objecttype icon?
+       if (preg_match("/<objectType:([^:]+):(.*)\/>/i", $entry['_rendered'], $matches)){
+           if (preg_match("/<rowLabel:([a-z0-9_-]*)\/>/i", $entry['_rendered'], $m)) {
+               $objectType= image($matches[1]."[".$m[1]."]", null, LDAP::fix(base64_decode($matches[2])));
+           } else {
+               $objectType= image($matches[1], null, LDAP::fix(base64_decode($matches[2])));
+           }
+           $entry['_rendered']= preg_replace("/<objectType[^>]+>/", $objectType, $entry['_rendered']);
+           $entry['_rendered']= preg_replace("/<rowLabel[^>]+>/", '', $entry['_rendered']);
+      }
+
       // Apply custom class to row?
       if (preg_match("/<rowClass:([a-z0-9_-]*)\/>/i", $entry['_rendered'], $matches)) {
         $result.="<tr class='".$matches[1]."'>\n";
@@ -460,7 +471,7 @@ class listing {
     $result.= '</script>';
 
     $smarty= get_smarty();
-    $smarty->assign("usePrototype", "true");
+
     $smarty->assign("FILTER", $this->filter->render());
     $smarty->assign("SIZELIMIT", print_sizelimit_warning());
     $smarty->assign("LIST", $result);
@@ -847,7 +858,7 @@ class listing {
     $objectType= $this->getObjectType($this->objectTypes, $classes);
     if ($objectType) {
       $this->objectDnMapping[$dn]= $objectType["objectClass"];
-      $result= image($objectType["image"], null, LDAP::fix($dn));
+      $result= "<objectType:".$objectType["image"].":".base64_encode(LDAP::fix($dn))."/>";
       if (!isset($this->objectTypeCount[$objectType['label']])) {
         $this->objectTypeCount[$objectType['label']]= 0;
       }
@@ -1582,7 +1593,6 @@ class listing {
 
   function getEntry($dn)
   {
-    $dn = LDAP::fix($dn);
     foreach ($this->entries as $entry) {
       if (isset($entry['dn']) && strcasecmp($dn, $entry['dn']) == 0){
         return $entry;