Added row labeling

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17978 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/include/class_listing.inc b/gosa-core/include/class_listing.inc
index e05d5ca5aacb62bba570acc4dfa364a019d25661..d6f037db521143fc3fdc66d823b0aaaae506ce25 100644 (file)
--- a/gosa-core/include/class_listing.inc
+++ b/gosa-core/include/class_listing.inc
@@ -401,6 +401,16 @@ 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']);
+      }
+
       // Apply custom class to row?
       if (preg_match("/<rowClass:([a-z0-9_-]*)\/>/i", $entry['_rendered'], $matches)) {
         $result.="<tr class='".$matches[1]."'>\n";
@@ -847,7 +857,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;
       }

diff --git a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc
index cb12ae26bcc3dcb2246c940612077eca79df4a03..217e391d3191d919194187064217c821b5dadd22 100644 (file)
--- a/gosa-core/plugins/admin/users/class_userManagement.inc
+++ b/gosa-core/plugins/admin/users/class_userManagement.inc
@@ -738,7 +738,7 @@ class userManagement extends management
     $label= "";
     if(isset($userPassword[0]) && preg_match("/^\{[^\}]/",$userPassword[0])){
       if(preg_match("/^[^\}]*+\}!/",$userPassword[0])){
-        $label= _("Unlock account")."<rowClass:entry-locked/>";
+        $label= _("Unlock account")."<rowClass:entry-locked/><rowLabel:locked/>";
       }else{
         $label= _("Lock account");
       }