Fixed bug #14923: CleanUp: getIconImage is not replaced in Core (thanks to Steffen...
authorSusanne Moog <typo3@susannemoog.de>
Sun, 11 Jul 2010 08:58:13 +0000 (08:58 +0000)
committerSusanne Moog <typo3@susannemoog.de>
Sun, 11 Jul 2010 08:58:13 +0000 (08:58 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@8154 709f56b5-9817-0410-a4d7-c38de5d9e867

22 files changed:
ChangeLog
t3lib/class.t3lib_admin.php
t3lib/class.t3lib_befunc.php
t3lib/class.t3lib_clipboard.php
t3lib/class.t3lib_positionmap.php
t3lib/class.t3lib_tceforms.php
t3lib/class.t3lib_tceforms_inline.php
typo3/alt_clickmenu.php
typo3/alt_shortcut.php
typo3/class.browse_links.php
typo3/class.db_list.inc
typo3/class.db_list_extra.inc
typo3/move_el.php
typo3/sysext/fluid/Classes/ViewHelpers/Be/PageInfoViewHelper.php
typo3/sysext/impexp/app/index.php
typo3/sysext/impexp/class.tx_impexp.php
typo3/sysext/lowlevel/dbint/index.php
typo3/sysext/opendocs/class.tx_opendocs.php
typo3/sysext/sys_action/task/class.tx_sysaction_task.php
typo3/sysext/version/cm1/index.php
typo3/sysext/wizard_crpages/class.tx_wizardcrpages_webfunc_2.php
typo3/template.php

index c1b926c..55a46b7 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-11  Susanne Moog  <typo3@susanne-moog.de>
+
+       * Fixed bug #14923: CleanUp: getIconImage is not replaced in Core (thanks to Steffen Ritter)
+
 2010-07-10  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #14896: ExtJS is not included when RTE is invoked by USER_INT frontend script
index b919ffc..a98855c 100644 (file)
@@ -167,7 +167,7 @@ class t3lib_admin {
                                $this->genTree_HTML.= $depthData.
                                        '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/ol/'.$PM.$BTM.'.gif','width="18" height="16"').' align="top" alt="" />'.
                                        $versionLabel.
-                                       t3lib_iconWorks::getIconImage('pages',$row,$this->backPath,'align="top"').
+                                       t3lib_iconWorks::getSpriteIconForRecord('pages', $row) .
                                        htmlspecialchars($row['uid'].': '.t3lib_div::fixed_lgd_cs(strip_tags($row['title']),50)).'</span></div>';
                        }
 
@@ -257,7 +257,7 @@ class t3lib_admin {
                                $this->genTree_HTML.= $depthData.
                                        '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/ol/'.$PM.$BTM.'.gif','width="18" height="16"').' align="top" alt="" />'.
                                        $versionLabel.
-                                       t3lib_iconWorks::getIconImage($table,$row,$this->backPath,'align="top" title="'.$table.'"').htmlspecialchars($row['uid'].': '.t3lib_BEfunc::getRecordTitle($table,$row)).'</span></div>';
+                                       t3lib_iconWorks::getSpriteIconForRecord($table, $row, array('title'=> $table)) . htmlspecialchars($row['uid'] . ': ' . t3lib_BEfunc::getRecordTitle($table,$row)) . '</span></div>';
                        }
 
                                // Register various data for this item:
index c6646b8..c4b0dcc 100644 (file)
@@ -4403,7 +4403,7 @@ final class t3lib_BEfunc {
                while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
                        $theRows[] = $row;
                        $out.='<span class="nobr"><a href="'.htmlspecialchars($script.'?id='.$row['uid']).'">'.
-                                       t3lib_iconWorks::getIconImage('pages', $row, $backPath, 'title="' . htmlspecialchars(self::getRecordPath($row['uid'], $perms_clause, 20)) . '" align="top"') .
+                                       t3lib_iconWorks::getSpriteIconForRecord('pages', $row, array('title' => htmlspecialchars(self::getRecordPath($row['uid'], $perms_clause, 20)))) .
                                        htmlspecialchars($row['title']).
                                        '</a></span><br />';
                }
index 8d71460..c48d589 100644 (file)
@@ -527,7 +527,7 @@ class t3lib_clipboard {
                                        $lines[]='
                                        <tr>
                                                <td class="' . $bgColClass . '">' .
-                                                       t3lib_iconWorks::getIconImage($table, $rec, $this->backPath,' style="margin-left: 38px;"') . '</td>
+                                                       t3lib_iconWorks::getSpriteIconForRecord($table, $rec, array('style' => "margin-left: 38px;")) . '</td>
                                                <td class="' . $bgColClass . '" nowrap="nowrap" width="95%">&nbsp;' . htmlspecialchars(
                                                                t3lib_div::fixed_lgd_cs(t3lib_BEfunc::getRecordTitle($table, $rec), $GLOBALS['BE_USER']->uc['titleLen'])) .
                                                                $modeData . '&nbsp;</td>
index f901b8f..ae2b231 100644 (file)
@@ -541,7 +541,7 @@ class t3lib_positionMap {
         * @return      string          HTML
         */
        function getRecordHeader($row)  {
-               $line = t3lib_iconWorks::getIconImage('tt_content',$row,$this->backPath,' align="top" title="'.htmlspecialchars(t3lib_BEfunc::getRecordIconAltText($row,'tt_content')).'"');
+               $line = t3lib_iconWorks::getSpriteIconForRecord('tt_content', $row, array('title' => htmlspecialchars(t3lib_BEfunc::getRecordIconAltText($row,'tt_content'))));
                $line.= t3lib_BEfunc::getRecordTitle('tt_content',$row,TRUE);
                return $this->wrapRecordTitle($line,$row);
        }
index 21af685..b610adb 100644 (file)
@@ -2277,7 +2277,7 @@ class t3lib_TCEforms      {
                                        $onlySingleTableAllowed = (count($tempFT) == 1);
                                        foreach ($tempFT as $theT) {
                                                $info.= '<span class="nobr">&nbsp;&nbsp;&nbsp;&nbsp;' .
-                                                               t3lib_iconWorks::getIconImage($theT, array(), $this->backPath, 'align="top"') .
+                                                               t3lib_iconWorks::getSpriteIconForRecord($theT, array()) .
                                                                htmlspecialchars($this->sL($GLOBALS['TCA'][$theT]['ctrl']['title'])) .
                                                                '</span><br />';
                                        }
@@ -4970,8 +4970,8 @@ class t3lib_TCEforms      {
                        $arr[$k] = str_replace('###RECORD_LABEL###', $rLabel, $arr[$k]);
                        $arr[$k] = str_replace('###TABLE_TITLE###',htmlspecialchars($this->sL($TCA[$table]['ctrl']['title'])),$arr[$k]);
 
-                       $titleA=t3lib_BEfunc::titleAltAttrib($this->getRecordPath($table,$rec));
-                       $arr[$k]=str_replace('###RECORD_ICON###',t3lib_iconWorks::getIconImage($table,$rec,$this->backPath,'class="absmiddle"'.$titleA),$arr[$k]);
+                       $arr[$k] = str_replace('###RECORD_ICON###', t3lib_iconWorks::getSpriteIconForRecord($table, $rec, array('title' => $this->getRecordPath($table, $rec))), $arr[$k]);
+
                }
                return $arr;
        }
index 3a96ba9..6181b97 100644 (file)
@@ -539,7 +539,7 @@ class t3lib_TCEforms_inline {
                }
 
                $altText = t3lib_BEfunc::getRecordIconAltText($rec, $foreign_table);
-               $iconImg = t3lib_iconWorks::getIconImage($foreign_table, $rec, $this->backPath, 'title="' . htmlspecialchars($altText) . '" class="absmiddle" id="' . $objectId . '_icon"');
+               $iconImg = t3lib_iconWorks::getSpriteIconForRecord($foreign_table, $rec, array('title' => htmlspecialchars($altText), 'id' => $objectId . '_icon"'));
                $label = '<span id="' . $objectId . '_label">' . $recTitle . '</span>';
                if (!$isVirtualRecord) {
                        $iconImg = $this->wrapWithAnchor($iconImg, '#', array('onclick' => $onClick));
index 78997ce..84e951e 100644 (file)
@@ -1089,7 +1089,7 @@ class clickMenu {
 
                        // Return the printed elements:
                return $this->printItems($menuItems,
-                       t3lib_iconWorks::getIconImage($table,$this->rec,$this->PH_backPath,' class="absmiddle" title="'.htmlspecialchars(t3lib_BEfunc::getRecordIconAltText($this->rec,$table)).'"').t3lib_BEfunc::getRecordTitle($table,$this->rec,TRUE)
+                       t3lib_iconWorks::getSpriteIconForRecord($table,$this->rec,array('title'=> t3lib_BEfunc::getRecordTitle($table,$this->rec,TRUE)))
                );
        }
 
index ae2b908..424c212 100644 (file)
@@ -714,7 +714,7 @@ class SC_alt_shortcut {
                }
 
                $selector.= '<a href="mod/user/ws/index.php" target="content">'.
-                                       t3lib_iconWorks::getIconImage('sys_workspace',array(),$this->doc->backPath,'align="top"').
+                                       t3lib_iconWorks::getSpriteIconForRecord('sys_workspace', array()).
                                        '</a>';
                if (count($options) > 1) {
                        $selector .= '<select name="_workspaceSelector" onchange="changeWorkspace(this.options[this.selectedIndex].value);">'.implode('',$options).'</select>';
index 9014b7e..9dedede 100644 (file)
@@ -1819,7 +1819,7 @@ class browse_links {
                                // Create header for listing, showing the page title/icon:
                        $titleLen=intval($GLOBALS['BE_USER']->uc['titleLen']);
                        $mainPageRec = t3lib_BEfunc::getRecordWSOL('pages',$expPageId);
-                       $picon = t3lib_iconWorks::getIconImage('pages', $mainPageRec, $BACK_PATH, '');
+                       $picon = t3lib_iconWorks::getSpriteIconForRecord('pages', $mainPageRec);
                        $picon.= htmlspecialchars(t3lib_div::fixed_lgd_cs($mainPageRec['title'],$titleLen));
                        $out.=$picon.'<br />';
 
@@ -1839,7 +1839,7 @@ class browse_links {
                        $c=0;
                        while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))       {
                                $c++;
-                               $icon=t3lib_iconWorks::getIconImage('tt_content',$row,$BACK_PATH,'');
+                               $icon=t3lib_iconWorks::getSpriteIconForRecord('tt_content', $row,$BACK_PATH);
                                if ($this->curUrlInfo['act']=='page' && $this->curUrlInfo['cElement']==$row['uid'])     {
                                        $arrCol='<img'.t3lib_iconWorks::skinImg($BACK_PATH,'gfx/blinkarrow_left.gif','width="5" height="9"').' class="c-blinkArrowL" alt="" />';
                                } else {
@@ -1910,7 +1910,7 @@ class browse_links {
                                $ATag_alt=substr($ATag,0,-4).",'',1);\">";
                                $ATag_e='</a>';
                        }
-                       $picon=t3lib_iconWorks::getIconImage('pages',$mainPageRec,$BACK_PATH,'');
+                       $picon=t3lib_iconWorks::getSpriteIconForRecord('pages', $mainPageRec);
                        $pBicon=$ATag2?'<img'.t3lib_iconWorks::skinImg($BACK_PATH,'gfx/plusbullet2.gif','width="18" height="16"').' alt="" />':'';
                        $pText=htmlspecialchars(t3lib_div::fixed_lgd_cs($mainPageRec['title'],$titleLen));
                        $out.=$picon.$ATag2.$pBicon.$ATag_e.$ATag.$pText.$ATag_e.'<br />';
index 4b7d55f..9f634d3 100644 (file)
@@ -386,7 +386,7 @@ class recordList extends t3lib_recordList {
                        while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result))    {
 
                                        // Create content:
-                               $iconImg = t3lib_iconWorks::getIconImage('sys_note',$row,$this->backPath,'');
+                               $iconImg = t3lib_iconWorks::getSpriteIconForRecord('sys_note', $row);
                                $subject = htmlspecialchars($row['subject']);
                                $fields = array();
                                $fields['Author:'] = htmlspecialchars($row['author'].($row['email'] && $row['author'] ? ', ':'').$row['email']);
index a5fc611..a9e683c 100644 (file)
@@ -682,7 +682,6 @@ class localRecordList extends recordList {
 
                                // The icon with link
                        $alttext = t3lib_BEfunc::getRecordIconAltText($row,$table);
-                       //$iconImg = t3lib_iconWorks::getIconImage($table,$row,$this->backPath,'title="'.htmlspecialchars($alttext).'"'.);
                        $iconImg = t3lib_iconWorks::getSpriteIconForRecord($table, $row, array('title' => htmlspecialchars($alttext), 'style' => ($indent ? ' margin-left: ' . $indent . 'px;' : '')));
 
 
index aa6adb9..6974652 100644 (file)
@@ -289,7 +289,7 @@ class SC_move_el {
                        $elRow = t3lib_BEfunc::getRecordWSOL($this->table,$this->moveUid);
 
                                // Headerline: Icon, record title:
-                       $hline = t3lib_iconWorks::getIconImage($this->table,$elRow,$BACK_PATH,' id="c-recIcon" title="'.htmlspecialchars(t3lib_BEfunc::getRecordIconAltText($elRow,$this->table)).'"');
+                       $hline = t3lib_iconWorks::getSpriteIconForRecord($this->table, $elRow, array('id' => "c-recIcon", 'title' => htmlspecialchars(t3lib_BEfunc::getRecordIconAltText($elRow,$this->table))));
                        $hline.= t3lib_BEfunc::getRecordTitle($this->table,$elRow,TRUE);
 
                                // Make-copy checkbox (clicking this will reload the page with the GET var makeCopy set differently):
@@ -324,7 +324,7 @@ class SC_move_el {
                                                                        t3lib_BEfunc::getRecordTitle('pages',$pidPageInfo,TRUE).
                                                                        '</a><br />';
                                                        } else {
-                                                               $code.= t3lib_iconWorks::getIconImage('pages',$pidPageInfo,$BACK_PATH,'').
+                                                               $code.= t3lib_iconWorks::getSpriteIconForRecord('pages', $pidPageInfo) .
                                                                        t3lib_BEfunc::getRecordTitle('pages',$pidPageInfo,TRUE).
                                                                        '<br />';
                                                        }
@@ -355,7 +355,7 @@ class SC_move_el {
                                        $posMap->cur_sys_language = $this->sys_language;
 
                                                // Headerline for the parent page: Icon, record title:
-                                       $hline = t3lib_iconWorks::getIconImage('pages',$pageinfo,$BACK_PATH,' title="'.htmlspecialchars(t3lib_BEfunc::getRecordIconAltText($pageinfo,'pages')).'"');
+                                       $hline = t3lib_iconWorks::getSpriteIconForRecord('pages', $pageinfo, array('title' => htmlspecialchars(t3lib_BEfunc::getRecordIconAltText($pageinfo, 'pages'))));
                                        $hline.= t3lib_BEfunc::getRecordTitle('pages',$pageinfo,TRUE);
 
                                                // Load SHARED page-TSconfig settings and retrieve column list from there, if applicable:
@@ -379,7 +379,7 @@ class SC_move_el {
                                                                        t3lib_BEfunc::getRecordTitle('pages',$pidPageInfo,TRUE).
                                                                        '</a><br />';
                                                        } else {
-                                                               $code.= t3lib_iconWorks::getIconImage('pages',$pidPageInfo,$BACK_PATH,'').
+                                                               $code.= t3lib_iconWorks::getSpriteIconForRecord('pages', $pidPageInfo).
                                                                        t3lib_BEfunc::getRecordTitle('pages',$pidPageInfo,TRUE).
                                                                        '<br />';
                                                        }
index 4fd6907..16a440b 100644 (file)
@@ -57,7 +57,7 @@ class Tx_Fluid_ViewHelpers_Be_PageInfoViewHelper extends Tx_Fluid_ViewHelpers_Be
                                // Add icon with clickmenu, etc:
                if ($pageRecord['uid']) {       // If there IS a real page
                        $alttext = t3lib_BEfunc::getRecordIconAltText($pageRecord, 'pages');
-                       $iconImg = t3lib_iconWorks::getIconImage('pages', $pageRecord, $this->backPath, 'class="absmiddle" title="'. htmlspecialchars($alttext) . '"');
+                       $iconImg = t3lib_iconWorks::getSpriteIconForRecord('pages', $pageRecord, array('title' => htmlspecialchars($alttext)));
                                // Make Icon:
                        $theIcon = $GLOBALS['SOBE']->doc->wrapClickMenuOnIcon($iconImg, 'pages', $pageRecord['uid']);
                } else {        // On root-level of page tree
index 72398d8..ae15068 100755 (executable)
@@ -221,7 +221,7 @@ class localPageTree extends t3lib_browseTree {
 
                if ($pid>0)     {
                        $rootRec = t3lib_befunc::getRecordWSOL('pages',$pid);
-                       $firstHtml.= $this->wrapIcon(t3lib_iconWorks::getIconImage('pages',$rootRec,$this->backPath,'align="top"'),$rootRec);
+                       $firstHtml.= $this->wrapIcon(t3lib_iconWorks::getSpriteIconForRecord('pages', $rootRec), $rootRec);
                } else {
                        $rootRec = array(
                                'title' => $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'],
@@ -537,7 +537,7 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                                        $tree = t3lib_div::makeInstance('t3lib_pageTree');
                                        $tree->init('AND '.$this->perms_clause.$this->filterPageIds($this->export->excludeMap));
 
-                                       $HTML = t3lib_iconWorks::getIconImage('pages',$sPage,$GLOBALS['BACK_PATH'],'align="top"');
+                                       $HTML = t3lib_iconWorks::getSpriteIconForRecord('pages', $sPage);
                                        $tree->tree[] = Array('row'=>$sPage,'HTML'=>$HTML);
                                        $tree->buffer_idH = array();
                                        if ($inData['pagetree']['levels']>0)    {
@@ -815,7 +815,7 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                                $row[] = '
                                <tr class="bgColor4">
                                        <td><strong>'.$LANG->getLL('makeconfig_record',1).'</strong></td>
-                                       <td>'.t3lib_iconworks::getIconImage($tName,$rec,$GLOBALS['BACK_PATH'],' align="top"').
+                                       <td>' . t3lib_iconworks::getSpriteIconForRecord($tName, $rec) .
                                                t3lib_BEfunc::getRecordTitle($tName,$rec,TRUE).
                                                '<input type="hidden" name="tx_impexp[record][]" value="'.htmlspecialchars($tName.':'.$rUid).'" /></td>
                                </tr>';
@@ -836,8 +836,8 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
 
                                if ($GLOBALS['BE_USER']->check('tables_select',$tName)) {
                                        $rec = t3lib_BEfunc::getRecordWSOL('pages', $rParts[1]);
-                                       $tblList.='Table "'.$tName.'" from '.t3lib_iconworks::getIconImage('pages',$rec,$GLOBALS['BACK_PATH'],' align="top"').
-                                       t3lib_BEfunc::getRecordTitle('pages',$rec,TRUE).
+                                       $tblList .= 'Table "' . $tName . '" from ' . t3lib_iconworks::getSpriteIconForRecord('pages', $rec) .
+                                       t3lib_BEfunc::getRecordTitle('pages', $rec, TRUE).
                                        '<input type="hidden" name="tx_impexp[list][]" value="'.htmlspecialchars($ref).'" /><br/>';
                                }
                        }
index c0addac..d0d6533 100755 (executable)
@@ -2675,7 +2675,7 @@ class tx_impexp {
                                }
                        }
 
-                       $pInfo['preCode'] = $preCode.t3lib_iconworks::getIconImage($table,$this->dat['records'][$table.':'.$uid]['data'],$GLOBALS['BACK_PATH'],'align="top" title="'.htmlspecialchars($table.':'.$uid).'"');
+                       $pInfo['preCode'] = $preCode.t3lib_iconworks::getSpriteIconForRecord($table, (array)$this->dat['records'][$table . ':' . $uid]['data'], array('title' => htmlspecialchars($table . ':' . $uid)));
                        $pInfo['title'] = htmlspecialchars($record['title']);
 
                                // View page:
@@ -2707,7 +2707,7 @@ class tx_impexp {
                        $preCode_B = $preCode.'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
                        foreach($record['softrefs'] as $info)   {
                                $pInfo = array();
-                               $pInfo['preCode'] = $preCode_A. t3lib_iconWorks::getSpriteIcon('status-reference-soft');
+                               $pInfo['preCode'] = $preCode_A. t3lib_iconWorks::getSpriteIcon('status-status-reference-soft');
                                $pInfo['title'] = '<em>'.$info['field'].', "'.$info['spKey'].'" </em>: <span title="'.htmlspecialchars($info['matchString']).'">'.htmlspecialchars(t3lib_div::fixed_lgd_cs($info['matchString'],60)).'</span>';
                                if ($info['subst']['type'])     {
                                        if (strlen($info['subst']['title']))    {
@@ -2839,7 +2839,7 @@ class tx_impexp {
                                        return;
                                }
                        }
-                       $pInfo['preCode'] = $preCode.'&nbsp;&nbsp;&nbsp;&nbsp;'.t3lib_iconWorks::getSpriteIcon('status-reference-file');
+                       $pInfo['preCode'] = $preCode.'&nbsp;&nbsp;&nbsp;&nbsp;'.t3lib_iconWorks::getSpriteIcon('status-status-reference-hard');
                        $pInfo['title'] = htmlspecialchars($fI['filename']);
                        $pInfo['ref'] = 'FILE';
                        $pInfo['size'] = $fI['filesize'];
@@ -2922,7 +2922,7 @@ class tx_impexp {
 
                                        $pInfo['showDiffContent'] = substr($this->fileIDMap[$ID],strlen(PATH_site));
 
-                                       $pInfo['preCode'] = $preCode.'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.t3lib_iconWorks::getSpriteIcon('actions-reference-file');
+                                       $pInfo['preCode'] = $preCode.'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.t3lib_iconWorks::getSpriteIcon('actions-insert-reference');
                                        $pInfo['title'] = htmlspecialchars($fI['filename']).' <em>(Resource)</em>';
                                        $pInfo['ref'] = 'FILE';
                                        $pInfo['size'] = $fI['filesize'];
index 16cd6b6..0fdf59a 100755 (executable)
@@ -538,7 +538,7 @@ class SC_mod_tools_dbint_index {
                                if ($TCA[$t]['ctrl']['hideTable']) {
                                        continue;
                                }
-                               $codeArr[$t][]=t3lib_iconWorks::getIconImage($t,array(),$BACK_PATH,'hspace="4" align="top"');
+                               $codeArr[$t][]=t3lib_iconWorks::getSpriteIconForRecord($t, array());
                                $codeArr[$t][]=$LANG->sL($TCA[$t]['ctrl']['title']);
                                $codeArr[$t][]=$t;
 
index d9b4c99..860e35d 100644 (file)
@@ -159,7 +159,7 @@ class tx_opendocs implements backend_toolbarItem {
                $uid    = $document[3]['uid'];
                $record = t3lib_BEfunc::getRecordWSOL($table, $uid);
                $label  = htmlspecialchars(strip_tags(t3lib_div::htmlspecialchars_decode($document[0])));
-               $icon   = t3lib_iconWorks::getIconImage($table, $record, $GLOBALS['BACK_PATH']);
+               $icon   = t3lib_iconWorks::getSpriteIconForRecord($table, $record);
                $link   = $GLOBALS['BACK_PATH'] . 'alt_doc.php?' . $document[2];
 
                $firstRow = '';
index ddd7a68..1fac614 100644 (file)
@@ -447,7 +447,7 @@ class tx_sysaction_task implements tx_taskcenter_Task {
 
                        // render the user records
                while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
-                       $icon = t3lib_iconworks::getIconImage('be_users', $row, $GLOBALS['BACK_PATH'], 'title="uid=' . $row['uid'] . '" hspace="2" align="top"');
+                       $icon = t3lib_iconworks::getSpriteIconForRecord('be_users', $row, array('title' => 'uid=' . $row['uid']));
                        $line = $icon . $this->action_linkUserName($row['username'], $row['realName'], $action['uid'], $row['uid']);
 
                                // selected user
@@ -773,7 +773,7 @@ class tx_sysaction_task implements tx_taskcenter_Task {
                                'description'           => t3lib_BEfunc::getRecordTitle($el['table'], $dbAnalysis->results[$el['table']][$el['id']]),
                                'descriptionHtml'       => $description,
                                'link'                          => $GLOBALS['BACK_PATH'] . 'alt_doc.php?returnUrl=' . rawurlencode(t3lib_div::getIndpEnv("REQUEST_URI")) . '&edit[' . $el['table'] . '][' . $el['id'] . ']=edit',
-                               'icon'                          => t3lib_iconworks::getIconImage($el['table'], $dbAnalysis->results[$el['table']][$el['id']], $GLOBALS['BACK_PATH'], 'hspace="2" align="top" title="' . htmlspecialchars($path) . '"')
+                               'icon'                          => t3lib_iconworks::getSpriteIconForRecord($el['table'], $dbAnalysis->results[$el['table']][$el['id']], array('title' => htmlspecialchars($path)))
                        );
                }
 
index 43f18da..4c79b36 100755 (executable)
@@ -440,7 +440,7 @@ class tx_version_cm1 extends t3lib_SCbase {
 
                        // Element:
                $record = t3lib_BEfunc::getRecord($this->table,$this->uid);
-               $recordIcon = t3lib_iconWorks::getIconImage($this->table,$record,$this->doc->backPath,'class="absmiddle"');
+               $recordIcon = t3lib_iconWorks::getSpriteIconForRecord($this->table, $record);
                $recTitle = t3lib_BEfunc::getRecordTitle($this->table,$record,TRUE);
 
                        // Display versions:
@@ -848,7 +848,7 @@ class tx_version_cm1 extends t3lib_SCbase {
 
                                                // Get CURRENT online record and icon based on "t3ver_oid":
                                        $rec_on = t3lib_BEfunc::getRecord($table,$oid);
-                                       $icon = t3lib_iconWorks::getIconImage($table, $rec_on, $this->doc->backPath,' align="top" title="'.t3lib_BEfunc::getRecordIconAltText($rec_on,$table).'"');
+                                       $icon = t3lib_iconWorks::getSpriteIconForRecord($table, $rec_on, array('title' => t3lib_BEfunc::getRecordIconAltText($rec_on,$table)));
                                        if ($GLOBALS['BE_USER']->workspace===0) {       // Only edit online records if in ONLINE workspace:
                                                $icon = $this->doc->wrapClickMenuOnIcon($icon, $table, $rec_on['uid'], 1, '', '+edit,view,info,delete');
                                        }
@@ -887,7 +887,7 @@ class tx_version_cm1 extends t3lib_SCbase {
                                                }
 
                                                // Get icon
-                                               $icon = t3lib_iconWorks::getIconImage($table, $rec_off, $this->doc->backPath, ' align="top" title="'.t3lib_BEfunc::getRecordIconAltText($rec_off,$table).'"');
+                                               $icon = t3lib_iconWorks::getSpriteIconForRecord($table, $rec_off, array('title' => t3lib_BEfunc::getRecordIconAltText($rec_off, $table)));
                                                $tempUid = ($table != 'pages' || $vType==='branch' || $GLOBALS['BE_USER']->workspace===0 ? $rec_off['uid'] : $rec_on['uid']);
                                                $icon = $this->doc->wrapClickMenuOnIcon($icon, $table, $tempUid, 1, '', '+edit,' . ($table == 'pages' ? 'view,info,' : '') . 'delete');
 
@@ -1441,7 +1441,7 @@ class tx_version_cm1 extends t3lib_SCbase {
                                                                $HTMLdata.
                                                                ($iconMode < 2 ?
                                                                        '<img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/ol/join'.($iconMode ? 'bottom' : '').'.gif','width="18" height="16"').' alt="" />'.
-                                                                       t3lib_iconWorks::getIconImage($tN, $rec, $this->doc->backPath,'') : '').
+                                                                       t3lib_iconWorks::getSpriteIconForRecord($tN, $rec) : '').
                                                                t3lib_BEfunc::getRecordTitle($tN, $rec, TRUE).
                                                        '</td>
                                                        <td class="cmdCell">'.
index 8511f14..ff41366 100755 (executable)
@@ -152,7 +152,7 @@ class tx_wizardcrpages_webfunc_2 extends t3lib_extobjbase {
                                foreach ($menuItems as $rec) {
                                        t3lib_BEfunc::workspaceOL('pages',$rec);
                                        if (is_array($rec))     {
-                                               $lines[]= '<nobr>'.t3lib_iconWorks::getIconImage('pages',$rec,$GLOBALS['BACK_PATH'],'align="top" '.t3lib_BEfunc::titleAttribForPages($rec)).
+                                               $lines[] = '<nobr>' . t3lib_iconWorks::getSpriteIconForRecord('pages', $rec, array('title' => t3lib_BEfunc::titleAttribForPages($rec , '', FALSE))) .
                                                        htmlspecialchars(t3lib_div::fixed_lgd_cs($rec['title'],$GLOBALS['BE_USER']->uc['titleLen'])).'</nobr>';
                                        }
                                }
index 06e46b2..b3b7220 100644 (file)
@@ -449,7 +449,7 @@ class template {
        function getHeader($table,$row,$path,$noViewPageIcon=0,$tWrap=array('',''))     {
                global $TCA;
                if (is_array($row) && $row['uid'])      {
-                       $iconImgTag=t3lib_iconWorks::getIconImage($table,$row,$this->backPath,'title="'.htmlspecialchars($path).'"');
+                       $iconImgTag=t3lib_iconWorks::getSpriteIconForRecord($table, $row , array('title' => htmlspecialchars($path)));
                        $title= strip_tags($row[$TCA[$table]['ctrl']['label']]);
                        $viewPage = $noViewPageIcon ? '' : $this->viewPageIcon($row['uid'],$this->backPath,'');
                        if ($table=='pages')    $path.=' - '.t3lib_BEfunc::titleAttribForPages($row,'',0);