From 66c2df743023ccf265f3d572084545a44ffe017e Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 13 Nov 2007 13:57:19 +0000 Subject: [PATCH] Removed image to html function git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-playground@7790 594d385d-05f5-0310-b6e9-bd551577e9d8 --- include/class_ObjectList.inc | 1 + include/class_ObjectListViewport.inc | 13 +------------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/include/class_ObjectList.inc b/include/class_ObjectList.inc index 0c86a24b0..0a63c8aea 100644 --- a/include/class_ObjectList.inc +++ b/include/class_ObjectList.inc @@ -361,6 +361,7 @@ class ObjectList implements IteratorAggregate { $tmp2 = array(); foreach($tmp as $key => $entry){ $entry['id']= $key; + $entry['_icon'] = ""; $tmp2[] = $entry; } diff --git a/include/class_ObjectListViewport.inc b/include/class_ObjectListViewport.inc index 355e3c0af..4bf3f5bc8 100644 --- a/include/class_ObjectListViewport.inc +++ b/include/class_ObjectListViewport.inc @@ -96,12 +96,6 @@ class ObjectListViewport extends GOsaGuiElement { } - /* FIXME: replace this -> not our task */ - private function getEntryIcon($entry,$alt = ""){ - return("".$alt.""); - } - - /*! \brief Renders entries from the ObjectList iterator into a string Gets the entry descriptions from the ObjectList object and renders them. \return HTML rendered list entries @@ -116,12 +110,7 @@ class ObjectListViewport extends GOsaGuiElement { if (!isset($entry[$attribute])){ throw new ObjectListViewportException(sprintf(_("Can't locate attribute '%s' to replace in entry!"), $attribute)); } else { - - if(preg_match("/_icon/i",$attribute)){ - $buffer= preg_replace('/\{'.$attribute.'\}/', $this->getEntryIcon($entry),$buffer); - }else{ - $buffer= preg_replace('/\{'.$attribute.'\}/', $entry[$attribute],$buffer); - } + $buffer= preg_replace('/\{'.$attribute.'\}/', $entry[$attribute],$buffer); } } -- 2.30.2