[BUGFIX] Pootle: Multi-line labels are not rendered properly
[Packages/TYPO3.CMS.git] / typo3 / class.db_list_extra.inc
old mode 100755 (executable)
new mode 100644 (file)
index 9d9d6b0..7436836
@@ -2,7 +2,7 @@
 /*************************************************************
 *  Copyright notice
 *
-*  (c) 1999-2007 Kasper Skaarhoj (kasperYYYY@typo3.com)
+*  (c) 1999-2009 Kasper Skårhøj (kasperYYYY@typo3.com)
 *  All rights reserved
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
  * Include file extending recordList which extended t3lib_recordList
  * Used specifically for the Web>List module (db_list.php)
  *
- * $Id$
- * Revised for TYPO3 3.6 December/2003 by Kasper Skaarhoj
+ * Revised for TYPO3 3.6 December/2003 by Kasper Skårhøj
  * XHTML compliant
  *
- * @author     Kasper Skaarhoj <kasperYYYY@typo3.com>
- */
-/**
- * [CLASS/FUNCTION INDEX of SCRIPT]
- *
- *
- *
- *   91: class localRecordList extends recordList
- *  123:     function writeTop($row)
- *  304:     function getTable($table,$id,$rowlist)
- *  559:     function renderListRow($table,$row,$cc,$titleCol,$thumbsCol,$indent=0)
- *  648:     function renderListHeader($table,$currentIdList)
- *
- *              SECTION: Rendering of various elements
- *  796:     function makeControl($table,$row)
- *  986:     function makeClip($table,$row)
- * 1057:     function makeRef($table,$uid)
- * 1086:     function makeLocalizationPanel($table,$row)
- * 1148:     function fieldSelectBox($table,$formFields=1)
- *
- *              SECTION: Helper functions
- * 1231:     function linkClipboardHeaderIcon($string,$table,$cmd,$warning='')
- * 1242:     function clipNumPane()
- * 1256:     function addSortLink($code,$field,$table)
- * 1281:     function recPath($pid)
- * 1294:     function showNewRecLink($table)
- * 1304:     function makeReturnUrl()
- *
- *              SECTION: CSV related functions
- * 1329:     function initCSV()
- * 1352:     function addToCSV($row,$table)
- * 1376:     function setCsvRow($csvRow)
- * 1387:     function outputCSV($prefix)
- *
- * TOTAL FUNCTIONS: 19
- * (This index is automatically created/updated by the extension "extdeveval")
- *
+ * @author     Kasper Skårhøj <kasperYYYY@typo3.com>
  */
 
 
 /**
  * Class for rendering of Web>List module
  *
- * @author     Kasper Skaarhoj <kasperYYYY@typo3.com>
+ * @author     Kasper Skårhøj <kasperYYYY@typo3.com>
  * @package TYPO3
  * @subpackage core
  */
 class localRecordList extends recordList {
 
                // External:
-       var $alternateBgColors=FALSE;                   // If true, table rows in the list will alternate in background colors (and have background colors at all!)
+       var $alternateBgColors=FALSE;                   // If TRUE, table rows in the list will alternate in background colors (and have background colors at all!)
        var $allowedNewTables=array();                  // Used to indicate which tables (values in the array) that can have a create-new-record link. If the array is empty, all tables are allowed.
-       var $newWizards=FALSE;                                  // If true, the control panel will contain links to the create-new wizards for pages and tt_content elements (normally, the link goes to just creating a new element without the wizards!).
-
-       var $dontShowClipControlPanels=FALSE;   // If true, will disable the rendering of clipboard + control panels.
-       var $showClipboard=FALSE;                               // If true, will show the clipboard in the field list.
-       var $noControlPanels = FALSE;                   // If true, will DISABLE all control panels in lists. (Takes precedence)
-       var $clickMenuEnabled = TRUE;                   // If true, clickmenus will be rendered
+       var $deniedNewTables=array();                   // Used to indicate which tables (values in the array) that cannot have a create-new-record link. If the array is empty, all tables are allowed.
+       var $newWizards=FALSE;                                  // If TRUE, the control panel will contain links to the create-new wizards for pages and tt_content elements (normally, the link goes to just creating a new element without the wizards!).
 
+       var $dontShowClipControlPanels=FALSE;   // If TRUE, will disable the rendering of clipboard + control panels.
+       var $showClipboard=FALSE;                               // If TRUE, will show the clipboard in the field list.
+       var $noControlPanels = FALSE;                   // If TRUE, will DISABLE all control panels in lists. (Takes precedence)
+       var $clickMenuEnabled = TRUE;                   // If TRUE, clickmenus will be rendered
 
+       var $totalRowCount;                                             // count of record rows in view
 
+       var $spaceIcon;                                                 // space icon used for alignment
 
                // Internal:
        var $pageRow=array();                                   // Set to the page record (see writeTop())
 
-       var $csvLines=array();                                  // Used to accumulate CSV lines in for CSV export.
+               // Used to accumulate CSV lines for CSV export.
+       protected $csvLines = array();
+
        var $csvOutput=FALSE;                                   // If set, the listing is returned as CSV instead.
 
        /**
@@ -117,184 +84,163 @@ class localRecordList extends recordList {
        var $CBnames=array();                                   // Tracking names of elements (for clipboard use)
        var $duplicateStack=array();                    // Used to track which elements has duplicates and how many
 
-
        /**
-        * Writes the top of the full listing
+        * [$tablename][$uid] = number of references to this record
         *
-        * @param       array           Current page record
-        * @return      void            (Adds content to internal variable, $this->HTMLcode)
+        * @var array
         */
-       function writeTop($row) {
-               global $LANG;
+       protected $referenceCount = array();
 
-                       // Makes the code for the pageicon in the top
-               $this->pageRow = $row;
-               $this->counter++;
-               $alttext = t3lib_BEfunc::getRecordIconAltText($row,'pages');
-               $iconImg = t3lib_iconWorks::getIconImage('pages',$row,$this->backPath,'class="absmiddle" title="'.htmlspecialchars($alttext).'"');
-               $titleCol = 'test';     // pseudo title column name
-               $this->fieldArray = Array($titleCol,'up');              // Setting the fields to display in the list (this is of course "pseudo fields" since this is the top!)
+       var $translations;                                              // Translations of the current record
+       var $selFieldList;                                              // select fields for the query which fetches the translations of the current record
 
+       public function __construct() {
+               parent::__construct();
+       }
 
-                       // Filling in the pseudo data array:
-               $theData = Array();
-               $theData[$titleCol] = $this->widthGif;
-
-                       // Get users permissions for this row:
-               $localCalcPerms = $GLOBALS['BE_USER']->calcPerms($row);
-
-               $theData['up']=array();
+       /**
+        * Create the panel of buttons for submitting the form or otherwise perform operations.
+        *
+        * @return      array   all available buttons as an assoc. array
+        */
+       public function getButtons()    {
+               $buttons = array(
+                       'csh' => '',
+                       'view' => '',
+                       'edit' => '',
+                       'hide_unhide' => '',
+                       'move' => '',
+                       'new_record' => '',
+                       'paste' => '',
+                       'level_up' => '',
+                       'cache' => '',
+                       'reload' => '',
+                       'shortcut' => '',
+                       'back' => '',
+                       'csv' => '',
+                       'export' => ''
+               );
 
-                       // Initialize control panel for currect page ($this->id):
-                       // Some of the controls are added only if $this->id is set - since they make sense only on a real page, not root level.
-               $theCtrlPanel =array();
+                       // Get users permissions for this page record:
+               $localCalcPerms = $GLOBALS['BE_USER']->calcPerms($this->pageRow);
 
-                       // "View page" icon is added:
-               $theCtrlPanel[]='<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::viewOnClick($this->id,$this->backPath,t3lib_BEfunc::BEgetRootLine($this->id))).'">'.
-                                               '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/zoom.gif','width="12" height="12"').' title="'.$LANG->sL('LLL:EXT:lang/locallang_core.php:labels.showPage',1).'" alt="" />'.
-                                               '</a>';
+                       // CSH
+               if (!strlen($this->id)) {
+                       $buttons['csh'] = t3lib_BEfunc::cshItem('xMOD_csh_corebe', 'list_module_noId', $GLOBALS['BACK_PATH'], '', TRUE);
+               } elseif(!$this->id) {
+                       $buttons['csh'] = t3lib_BEfunc::cshItem('xMOD_csh_corebe', 'list_module_root', $GLOBALS['BACK_PATH'], '', TRUE);
+               } else {
+                       $buttons['csh'] = t3lib_BEfunc::cshItem('xMOD_csh_corebe', 'list_module', $GLOBALS['BACK_PATH'], '', TRUE);
+               }
 
-                       // If edit permissions are set (see class.t3lib_userauthgroup.php)
-               if ($localCalcPerms&2)  {
+               if (isset($this->id)) {
+                               // View  Exclude doktypes 254,255 Configuration: mod.web_list.noViewWithDokTypes = 254,255
+                       if (isset($GLOBALS['SOBE']->modTSconfig['properties']['noViewWithDokTypes'])) {
+                               $noViewDokTypes = t3lib_div::trimExplode(',', $GLOBALS['SOBE']->modTSconfig['properties']['noViewWithDokTypes'], TRUE);
+                       } else {
+                                       //default exclusion: doktype 254 (folder), 255 (recycler)
+                               $noViewDokTypes = array(t3lib_pageSelect::DOKTYPE_SYSFOLDER, t3lib_pageSelect::DOKTYPE_RECYCLER);
+                       }
 
-                               // Adding "Edit page" icon:
-                       if ($this->id)  {
-                               $params='&edit[pages]['.$row['uid'].']=edit';
-                               $theCtrlPanel[]='<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::editOnClick($params,$this->backPath,-1)).'">'.
-                                                               '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/edit2.gif','width="11" height="12"').' title="'.$LANG->getLL('editPage',1).'" alt="" />'.
-                                                               '</a>';
+                       if (!in_array($this->pageRow['doktype'], $noViewDokTypes)) {
+                               $buttons['view'] = '<a href="#" onclick="' . htmlspecialchars(t3lib_BEfunc::viewOnClick($this->id, $this->backPath, t3lib_BEfunc::BEgetRootLine($this->id))) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.showPage', TRUE) . '">' .
+                                                               t3lib_iconWorks::getSpriteIcon('actions-document-view') .
+                                                       '</a>';
                        }
 
-                               // Adding "New record" icon:
-                       if (!$GLOBALS['SOBE']->modTSconfig['properties']['noCreateRecordsLink'])        {
-                               $theCtrlPanel[]='<a href="#" onclick="'.htmlspecialchars('return jumpExt(\''.$this->backPath.'db_new.php?id='.$this->id.'\');').'">'.
-                                                               '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/new_el.gif','width="11" height="12"').' title="'.$LANG->getLL('newRecordGeneral',1).'" alt="" />'.
+                               // New record
+                       if (!$GLOBALS['SOBE']->modTSconfig['properties']['noCreateRecordsLink']) {
+                               $buttons['new_record'] = '<a href="#" onclick="' . htmlspecialchars('return jumpExt(\'' . $this->backPath . 'db_new.php?id=' . $this->id . '\');') . '" title="' . $GLOBALS['LANG']->getLL('newRecordGeneral', TRUE) . '">' .
+                                                                       t3lib_iconWorks::getSpriteIcon('actions-document-new') .
                                                                '</a>';
                        }
 
-                               // Adding "Hide/Unhide" icon:
-                       if ($this->id)  {
-                               if ($row['hidden'])     {
-                                       $params='&data[pages]['.$row['uid'].'][hidden]=0';
-                                       $theCtrlPanel[]='<a href="#" onclick="'.htmlspecialchars('return jumpToUrl(\''.$GLOBALS['SOBE']->doc->issueCommand($params,-1).'\');').'">'.
-                                                                       '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/button_unhide.gif','width="11" height="10"').' title="'.$LANG->getLL('unHidePage',1).'" alt="" />'.
+                               // If edit permissions are set (see class.t3lib_userauthgroup.php)
+                       if ($localCalcPerms&2 && !empty($this->id))     {
+
+                                       // Edit
+                               $params = '&edit[pages][' . $this->pageRow['uid'] . ']=edit';
+                               $buttons['edit'] = '<a href="#" onclick="' . htmlspecialchars(t3lib_BEfunc::editOnClick($params, $this->backPath, -1)) . '" title="' . $GLOBALS['LANG']->getLL('editPage', TRUE) . '">' .
+                                                                       t3lib_iconWorks::getSpriteIcon('actions-page-open') .
+                                                               '</a>';
+                                       // Unhide
+                               if ($this->pageRow['hidden'])   {
+                                       $params = '&data[pages][' . $this->pageRow['uid'] . '][hidden]=0';
+                                       $buttons['hide_unhide'] = '<a href="#" onclick="' . htmlspecialchars('return jumpToUrl(\'' . $GLOBALS['SOBE']->doc->issueCommand($params, -1) . '\');') . '" title="' . $GLOBALS['LANG']->getLL('unHidePage', TRUE) . '">' .
+                                                                               t3lib_iconWorks::getSpriteIcon('actions-edit-unhide') .
                                                                        '</a>';
+                                       // Hide
                                } else {
-                                       $params='&data[pages]['.$row['uid'].'][hidden]=1';
-                                       $theCtrlPanel[]='<a href="#" onclick="'.htmlspecialchars('return jumpToUrl(\''.$GLOBALS['SOBE']->doc->issueCommand($params,-1).'\');').'">'.
-                                                                       '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/button_hide.gif','width="11" height="10"').' title="'.$LANG->getLL('hidePage',1).'" alt="" />'.
+                                       $params = '&data[pages][' . $this->pageRow['uid'] . '][hidden]=1';
+                                       $buttons['hide_unhide'] = '<a href="#" onclick="' . htmlspecialchars('return jumpToUrl(\'' . $GLOBALS['SOBE']->doc->issueCommand($params, -1) . '\');') . '" title="' . $GLOBALS['LANG']->getLL('hidePage', TRUE) . '">'.
+                                                                               t3lib_iconWorks::getSpriteIcon('actions-edit-hide') .
                                                                        '</a>';
                                }
-                       }
-
-                               // Adding "move page" button:
-                       if ($this->id)  {
-                               $theCtrlPanel[]='<a href="#" onclick="'.htmlspecialchars('return jumpExt(\''.$this->backPath.'move_el.php?table=pages&uid='.$row['uid'].'\');').'">'.
-                                                               '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/move_'.($this->table=='tt_content'?'record':'page').'.gif','width="11" height="12"').' title="'.$LANG->getLL('move_page',1).'" alt="" />'.
-                                                               '</a>';
-                       }
-               }
 
-                       // "Paste into page" link:
-               if (($localCalcPerms&8) || ($localCalcPerms&16))        {
-                       $elFromTable = $this->clipObj->elFromTable('');
-                       if (count($elFromTable))        {
-                               $theCtrlPanel[]='<a href="'.htmlspecialchars($this->clipObj->pasteUrl('',$this->id)).'" onclick="'.htmlspecialchars('return '.$this->clipObj->confirmMsg('pages',$this->pageRow,'into',$elFromTable)).'">'.
-                                                               '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/clip_pasteafter.gif','width="12" height="12"').' title="'.$LANG->getLL('clip_paste',1).'" alt="" />'.
+                                       // Move
+                               $buttons['move'] = '<a href="#" onclick="' . htmlspecialchars('return jumpExt(\'' . $this->backPath . 'move_el.php?table=pages&uid=' . $this->pageRow['uid'] . '\');') . '" title="' . $GLOBALS['LANG']->getLL('move_page', TRUE) . '">' .
+                                                                       (($this->table == 'tt_content') ? t3lib_iconWorks::getSpriteIcon('actions-document-move') : t3lib_iconWorks::getSpriteIcon('actions-page-move')) .
                                                                '</a>';
-                       }
-               }
-
-                       // Finally, compile all elements of the control panel into table cells:
-               if (count($theCtrlPanel))       {
-                       $theData['up'][]='
 
-                               <!--
-                                       Control panel for page
-                               -->
-                               <table border="0" cellpadding="0" cellspacing="0" class="bgColor4" id="typo3-dblist-ctrltop">
-                                       <tr>
-                                               <td>'.implode('</td>
-                                               <td>',$theCtrlPanel).'</td>
-                                       </tr>
-                               </table>';
-               }
-
-
-                       // Add "clear-cache" link:
-               $theData['up'][]='<a href="'.htmlspecialchars($this->listURL().'&clear_cache=1').'">'.
-                                               '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/clear_cache.gif','width="14" height="14"').' title="'.$LANG->sL('LLL:EXT:lang/locallang_core.php:labels.clear_cache',1).'" alt="" />'.
-                                               '</a>';
-
-                       // Add "CSV" link, if a specific table is shown:
-               if ($this->table)       {
-                       $theData['up'][]='<a href="'.htmlspecialchars($this->listURL().'&csv=1').'">'.
-                                                       '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/csv.gif','width="27" height="14"').' title="'.$LANG->sL('LLL:EXT:lang/locallang_core.php:labels.csv',1).'" alt="" />'.
+                                       // Up one level
+                               $buttons['level_up'] = '<a href="' . htmlspecialchars($this->listURL($this->pageRow['pid'], '-1', 'firstElementNumber')) . '" onclick="setHighlight(' . $this->pageRow['pid'] . ')" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.upOneLevel', TRUE) . '">' .
+                                                               t3lib_iconWorks::getSpriteIcon('actions-view-go-up') .
                                                        '</a>';
-               }
 
-                       // Add "Export" link, if a specific table is shown:
-               if ($this->table && t3lib_extMgm::isLoaded('impexp'))   {
-                       $theData['up'][]='<a href="'.htmlspecialchars($this->backPath.'mod.php?M=xMOD_tximpexp&tx_impexp[action]=export&tx_impexp[list][]='.rawurlencode($this->table.':'.$this->id)).'">'.
-                                                       '<img'.t3lib_iconWorks::skinImg($this->backPath,t3lib_extMgm::extRelPath('impexp').'export.gif',' width="18" height="16"').' title="'.$LANG->sL('LLL:EXT:lang/locallang_core.php:rm.export',1).'" alt="" />'.
-                                                       '</a>';
-               }
-
-                       // Add "refresh" link:
-               $theData['up'][]='<a href="'.htmlspecialchars($this->listURL()).'">'.
-                                               '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/refresh_n.gif','width="14" height="14"').' title="'.$LANG->sL('LLL:EXT:lang/locallang_core.php:labels.reload',1).'" alt="" />'.
-                                               '</a>';
+                       }
 
 
-                       // Add icon with clickmenu, etc:
-               if ($this->id)  {       // If there IS a real page...:
+                               // Paste
+                       if (($localCalcPerms&8) || ($localCalcPerms&16)) {
+                               $elFromTable = $this->clipObj->elFromTable('');
+                               if (count($elFromTable)) {
+                                       $buttons['paste'] = '<a href="' . htmlspecialchars($this->clipObj->pasteUrl('', $this->id)) . '" onclick="' . htmlspecialchars('return ' . $this->clipObj->confirmMsg('pages', $this->pageRow, 'into', $elFromTable)) . '" title="' . $GLOBALS['LANG']->getLL('clip_paste', TRUE) . '">' .
+                                                                               t3lib_iconWorks::getSpriteIcon('actions-document-paste-after') .
+                                                                       '</a>';
+                               }
+                       }
 
-                               // Setting title of page + the "Go up" link:
-                       $theData[$titleCol].='<br /><span title="'.htmlspecialchars($row['_thePathFull']).'">'.htmlspecialchars(t3lib_div::fixed_lgd_cs($row['_thePath'],-$this->fixedL)).'</span>';
-                       $theData['up'][]='<a href="'.htmlspecialchars($this->listURL($row['pid'])).'" onclick="setHighlight('.$row['pid'].')">'.
-                                                       '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/i/pages_up.gif','width="18" height="16"').' title="'.$LANG->sL('LLL:EXT:lang/locallang_core.php:labels.upOneLevel',1).'" alt="" />'.
+                               // Cache
+                       $buttons['cache'] = '<a href="' . htmlspecialchars($this->listURL() . '&clear_cache=1') . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.clear_cache', TRUE) . '">' .
+                                                               t3lib_iconWorks::getSpriteIcon('actions-system-cache-clear') .
                                                        '</a>';
 
-                               // Make Icon:
-                       $theIcon = $this->clickMenuEnabled ? $GLOBALS['SOBE']->doc->wrapClickMenuOnIcon($iconImg,'pages',$this->id) : $iconImg;
-               } else {        // On root-level of page tree:
-
-                               // Setting title of root (sitename):
-                       $theData[$titleCol].='<br />'.htmlspecialchars(t3lib_div::fixed_lgd_cs($GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'],-$this->fixedL));
+                       if ($this->table) {
 
-                               // Make Icon:
-                       $theIcon = '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/i/_icon_website.gif','width="18" height="16"').' alt="" />';
-               }
+                                       // CSV
+                               $buttons['csv'] = '<a href="' . htmlspecialchars($this->listURL() . '&csv=1') . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.csv', TRUE) . '">' .
+                                                                       t3lib_iconWorks::getSpriteIcon('mimetypes-text-csv') .
+                                                               '</a>';
 
-                       // If there is a returnUrl given, add a back-link:
-               if ($this->returnUrl)   {
-                       $theData['up'][]='<a href="'.htmlspecialchars(t3lib_div::linkThisUrl($this->returnUrl,array('id'=>$this->id))).'" class="typo3-goBack">'.
-                                                       '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/goback.gif','width="14" height="14"').' title="'.$LANG->sL('LLL:EXT:lang/locallang_core.php:labels.goBack',1).'" alt="" />'.
+                                       // Export
+                               if (t3lib_extMgm::isLoaded('impexp')) {
+                                       $url = $this->backPath . t3lib_extMgm::extRelPath('impexp') . 'app/index.php?tx_impexp[action]=export';
+                                       $buttons['export'] = '<a href="' . htmlspecialchars($url . '&tx_impexp[list][]=' . rawurlencode($this->table . ':' . $this->id)) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.export', TRUE) . '">' .
+                                                               t3lib_iconWorks::getSpriteIcon('actions-document-export-t3d') .
                                                        '</a>';
-               }
+                               }
 
-                       // Finally, the "up" pseudo field is compiled into a table - has been accumulated in an array:
-               $theData['up']='
-                       <table border="0" cellpadding="0" cellspacing="0">
-                               <tr>
-                                       <td>'.implode('</td>
-                                       <td>',$theData['up']).'</td>
-                               </tr>
-                       </table>';
+                       }
 
-                       // ... and the element row is created:
-               $out.=$this->addelement(1,$theIcon,$theData,'',$this->leftMargin);
+                               // Reload
+                       $buttons['reload'] = '<a href="' . htmlspecialchars($this->listURL()) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.reload', TRUE) . '">' .
+                                                               t3lib_iconWorks::getSpriteIcon('actions-system-refresh') .
+                                                       '</a>';
 
-                       // ... and wrapped into a table and added to the internal ->HTMLcode variable:
-               $this->HTMLcode.='
+                               // Shortcut
+                       if ($GLOBALS['BE_USER']->mayMakeShortcut()) {
+                               $buttons['shortcut'] = $GLOBALS['TBE_TEMPLATE']->makeShortcutIcon('id, imagemode, pointer, table, search_field, search_levels, showLimit, sortField, sortRev', implode(',', array_keys($this->MOD_MENU)), 'web_list');
+                       }
 
+                               // Back
+                       if ($this->returnUrl) {
+                               $buttons['back'] = '<a href="' . htmlspecialchars(t3lib_div::linkThisUrl($this->returnUrl, array('id' => $this->id))) . '" class="typo3-goBack" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.goBack', TRUE) . '">' .
+                                                                       t3lib_iconWorks::getSpriteIcon('actions-view-go-back') .
+                                                               '</a>';
+                       }
+               }
 
-               <!--
-                       Page header for db_list:
-               -->
-                       <table border="0" cellpadding="0" cellspacing="0" id="typo3-dblist-top">
-                               '.$out.'
-                       </table>';
+               return $buttons;
        }
 
        /**
@@ -306,41 +252,52 @@ class localRecordList extends recordList {
         * @return      string          HTML table with the listing for the record.
         */
        function getTable($table,$id,$rowlist)  {
-               global $TCA;
-
                        // Loading all TCA details for this table:
                t3lib_div::loadTCA($table);
 
                        // Init
                $addWhere = '';
-               $titleCol = $TCA[$table]['ctrl']['label'];
-               $thumbsCol = $TCA[$table]['ctrl']['thumbnail'];
-               $l10nEnabled = $TCA[$table]['ctrl']['languageField'] && $TCA[$table]['ctrl']['transOrigPointerField'] && !$TCA[$table]['ctrl']['transOrigPointerTable'];
+               $titleCol = $GLOBALS['TCA'][$table]['ctrl']['label'];
+               $thumbsCol = $GLOBALS['TCA'][$table]['ctrl']['thumbnail'];
+               $l10nEnabled = $GLOBALS['TCA'][$table]['ctrl']['languageField'] && $GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField']
+                       && !$GLOBALS['TCA'][$table]['ctrl']['transOrigPointerTable'];
+               $tableCollapsed = (!$this->tablesCollapsed[$table]) ? FALSE : TRUE;
+
+               // prepare space icon
+               $this->spaceIcon = t3lib_iconWorks::getSpriteIcon('empty-empty', array('style' => 'background-position: 0 10px;'));
 
                        // Cleaning rowlist for duplicates and place the $titleCol as the first column always!
                $this->fieldArray=array();
+                       // title Column
                $this->fieldArray[] = $titleCol;        // Add title column
-               if ($this->localizationView && $l10nEnabled)    {
-                       $this->fieldArray[] = '_LOCALIZATION_';
-                       $this->fieldArray[] = '_LOCALIZATION_b';
-                       $addWhere.=' AND (
-                               '.$TCA[$table]['ctrl']['languageField'].'<=0
-                               OR
-                               '.$TCA[$table]['ctrl']['transOrigPointerField'].' = 0
-                       )';
-               }
+                       // Control-Panel
                if (!t3lib_div::inList($rowlist,'_CONTROL_'))   {
                        $this->fieldArray[] = '_CONTROL_';
+                       $this->fieldArray[] = '_AFTERCONTROL_';
                }
+                       // Clipboard
                if ($this->showClipboard)       {
                        $this->fieldArray[] = '_CLIPBOARD_';
                }
+                       // Ref
                if (!$this->dontShowClipControlPanels)  {
                        $this->fieldArray[]='_REF_';
+                       $this->fieldArray[]='_AFTERREF_';
                }
+                       // Path
                if ($this->searchLevels)        {
                        $this->fieldArray[]='_PATH_';
                }
+                       // Localization
+               if ($this->localizationView && $l10nEnabled)    {
+                       $this->fieldArray[] = '_LOCALIZATION_';
+                       $this->fieldArray[] = '_LOCALIZATION_b';
+                       $addWhere.=' AND (
+                               ' . $GLOBALS['TCA'][$table]['ctrl']['languageField'] . '<=0
+                               OR
+                               ' . $GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField'] . ' = 0
+                       )';
+               }
                        // Cleaning up:
                $this->fieldArray=array_unique(array_merge($this->fieldArray,t3lib_div::trimExplode(',',$rowlist,1)));
                if ($this->noControlPanels)     {
@@ -359,56 +316,101 @@ class localRecordList extends recordList {
                        if (t3lib_extMgm::isLoaded('cms'))      {
                                $selectFields[] = 'module';
                                $selectFields[] = 'extendToSubpages';
+                               $selectFields[] = 'nav_hide';
                        }
                        $selectFields[] = 'doktype';
                }
-               if (is_array($TCA[$table]['ctrl']['enablecolumns']))    {
-                       $selectFields = array_merge($selectFields,$TCA[$table]['ctrl']['enablecolumns']);
+               if (is_array($GLOBALS['TCA'][$table]['ctrl']['enablecolumns'])) {
+                       $selectFields = array_merge($selectFields, $GLOBALS['TCA'][$table]['ctrl']['enablecolumns']);
                }
-               if ($TCA[$table]['ctrl']['type'])       {
-                       $selectFields[] = $TCA[$table]['ctrl']['type'];
+               if ($GLOBALS['TCA'][$table]['ctrl']['type']) {
+                       $selectFields[] = $GLOBALS['TCA'][$table]['ctrl']['type'];
                }
-               if ($TCA[$table]['ctrl']['typeicon_column'])    {
-                       $selectFields[] = $TCA[$table]['ctrl']['typeicon_column'];
+               if ($GLOBALS['TCA'][$table]['ctrl']['typeicon_column']) {
+                       $selectFields[] = $GLOBALS['TCA'][$table]['ctrl']['typeicon_column'];
                }
-               if ($TCA[$table]['ctrl']['versioningWS'])       {
+               if ($GLOBALS['TCA'][$table]['ctrl']['versioningWS']) {
                        $selectFields[] = 't3ver_id';
                        $selectFields[] = 't3ver_state';
                        $selectFields[] = 't3ver_wsid';
                        $selectFields[] = 't3ver_swapmode';             // Filtered out when pages in makeFieldList()
                }
                if ($l10nEnabled)       {
-                       $selectFields[] = $TCA[$table]['ctrl']['languageField'];
-                       $selectFields[] = $TCA[$table]['ctrl']['transOrigPointerField'];
+                       $selectFields[] = $GLOBALS['TCA'][$table]['ctrl']['languageField'];
+                       $selectFields[] = $GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField'];
                }
-               if ($TCA[$table]['ctrl']['label_alt'])  {
-                       $selectFields = array_merge($selectFields,t3lib_div::trimExplode(',',$TCA[$table]['ctrl']['label_alt'],1));
+               if ($GLOBALS['TCA'][$table]['ctrl']['label_alt'])       {
+                       $selectFields = array_merge(
+                               $selectFields,
+                               t3lib_div::trimExplode(',', $GLOBALS['TCA'][$table]['ctrl']['label_alt'], 1)
+                       );
                }
                $selectFields = array_unique($selectFields);            // Unique list!
                $selectFields = array_intersect($selectFields,$this->makeFieldList($table,1));          // Making sure that the fields in the field-list ARE in the field-list from TCA!
                $selFieldList = implode(',',$selectFields);             // implode it into a list of fields for the SQL-statement.
+               $this->selFieldList = $selFieldList;
+
+               /**
+                * @hook                        DB-List getTable
+                * @date                        2007-11-16
+                * @request             Malte Jansen  <mail@maltejansen.de>
+                */
+               if(is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/class.db_list_extra.inc']['getTable'])) {
+                       foreach($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/class.db_list_extra.inc']['getTable'] as $classData) {
+                               $hookObject = t3lib_div::getUserObj($classData);
+
+                               if(!($hookObject instanceof t3lib_localRecordListGetTableHook)) {
+                                       throw new UnexpectedValueException('$hookObject must implement interface t3lib_localRecordListGetTableHook', 1195114460);
+                               }
+
+                               $hookObject->getDBlistQuery($table, $id, $addWhere, $selFieldList, $this);
+                       }
+               }
 
                        // Create the SQL query for selecting the elements in the listing:
-               $queryParts = $this->makeQueryArray($table, $id,$addWhere,$selFieldList);       // (API function from class.db_list.inc)
+               if ($this->csvOutput) { // do not do paging when outputting as CSV
+                       $this->iLimit = 0;
+               }
+
+               if ($this->firstElementNumber > 2 && $this->iLimit > 0) {
+                               // Get the two previous rows for sorting if displaying page > 1
+                       $this->firstElementNumber = $this->firstElementNumber - 2;
+                       $this->iLimit = $this->iLimit + 2;
+                       $queryParts = $this->makeQueryArray($table, $id,$addWhere,$selFieldList);       // (API function from class.db_list.inc)
+                       $this->firstElementNumber = $this->firstElementNumber + 2;
+                       $this->iLimit = $this->iLimit - 2;
+               } else {
+                       $queryParts = $this->makeQueryArray($table, $id,$addWhere,$selFieldList);       // (API function from class.db_list.inc)
+               }
+
                $this->setTotalItems($queryParts);              // Finding the total amount of records on the page (API function from class.db_list.inc)
 
                        // Init:
                $dbCount = 0;
                $out = '';
+               $listOnlyInSingleTableMode = $this->listOnlyInSingleTableMode && !$this->table;
 
                        // If the count query returned any number of records, we perform the real query, selecting records.
                if ($this->totalItems)  {
-                       $result = $GLOBALS['TYPO3_DB']->exec_SELECT_queryArray($queryParts);
-                       $dbCount = $GLOBALS['TYPO3_DB']->sql_num_rows($result);
+                       // Fetch records only if not in single table mode or if in multi table mode and not collapsed
+                       if ($listOnlyInSingleTableMode || (!$this->table && $tableCollapsed)) {
+                               $dbCount = $this->totalItems;
+                       } else {
+                                       // set the showLimit to the number of records when outputting as CSV
+                               if ($this->csvOutput) {
+                                       $this->showLimit = $this->totalItems;
+                                       $this->iLimit = $this->totalItems;
+                               }
+                               $result = $GLOBALS['TYPO3_DB']->exec_SELECT_queryArray($queryParts);
+                               $dbCount = $GLOBALS['TYPO3_DB']->sql_num_rows($result);
+                       }
                }
 
-               $LOISmode = $this->listOnlyInSingleTableMode && !$this->table;
-
                        // If any records was selected, render the list:
                if ($dbCount)   {
 
                                // Half line is drawn between tables:
-                       if (!$LOISmode) {
+                       if (!$listOnlyInSingleTableMode)        {
                                $theData = Array();
                                if (!$this->table && !$rowlist) {
                                        $theData[$titleCol] = '<img src="clear.gif" width="'.($GLOBALS['SOBE']->MOD_SETTINGS['bigControlPanel']?'230':'350').'" height="1" alt="" />';
@@ -421,49 +423,53 @@ class localRecordList extends recordList {
                                // Header line is drawn
                        $theData = Array();
                        if ($this->disableSingleTableView)      {
-                               $theData[$titleCol] = '<span class="c-table">'.$GLOBALS['LANG']->sL($TCA[$table]['ctrl']['title'],1).'</span> ('.$this->totalItems.')';
+                               $theData[$titleCol] = '<span class="c-table">' . t3lib_BEfunc::wrapInHelp($table, '', $GLOBALS['LANG']->sL($GLOBALS['TCA'][$table]['ctrl']['title'], TRUE)) . '</span> ('.$this->totalItems.')';
                        } else {
-                               $theData[$titleCol] = $this->linkWrapTable($table,'<span class="c-table">'.$GLOBALS['LANG']->sL($TCA[$table]['ctrl']['title'],1).'</span> ('.$this->totalItems.') <img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/'.($this->table?'minus':'plus').'bullet_list.gif','width="18" height="12"').' hspace="10" class="absmiddle" title="'.$GLOBALS['LANG']->getLL(!$this->table?'expandView':'contractView',1).'" alt="" />');
+                               $theData[$titleCol] = $this->linkWrapTable($table, '<span class="c-table">' . $GLOBALS['LANG']->sL($GLOBALS['TCA'][$table]['ctrl']['title'], TRUE) . '</span> (' . $this->totalItems . ') ' .
+                                               ($this->table ? t3lib_iconWorks::getSpriteIcon('actions-view-table-collapse', array('title' => $GLOBALS['LANG']->getLL('contractView', TRUE))) : t3lib_iconWorks::getSpriteIcon('actions-view-table-expand', array('title' => $GLOBALS['LANG']->getLL('expandView', TRUE))))
+                                       );
                        }
 
-                               // CSH:
-                       $theData[$titleCol].= t3lib_BEfunc::cshItem($table,'',$this->backPath,'',FALSE,'margin-bottom:0px; white-space: normal;');
-
-                       if ($LOISmode)  {
+                       if ($listOnlyInSingleTableMode) {
                                $out.='
                                        <tr>
-                                               <td class="c-headLineTable" style="width:95%;">'.$theData[$titleCol].'</td>
+                                               <td class="t3-row-header" style="width:95%;">' . t3lib_BEfunc::wrapInHelp($table, '', $theData[$titleCol]) . '</td>
                                        </tr>';
-
-                               if ($GLOBALS['BE_USER']->uc["edit_showFieldHelp"])      {
-                                       $GLOBALS['LANG']->loadSingleTableDescription($table);
-                                       if (isset($GLOBALS['TCA_DESCR'][$table]['columns']['']))        {
-                                               $onClick = 'vHWin=window.open(\'view_help.php?tfID='.$table.'.\',\'viewFieldHelp\',\'height=400,width=600,status=0,menubar=0,scrollbars=1\');vHWin.focus();return false;';
-                                               $out.='
-                                       <tr>
-                                               <td class="c-tableDescription">'.t3lib_BEfunc::helpTextIcon($table,'',$this->backPath,TRUE).$GLOBALS['TCA_DESCR'][$table]['columns']['']['description'].'</td>
-                                       </tr>';
-                                       }
-                               }
                        } else {
-                               $theUpIcon = ($table=='pages'&&$this->id&&isset($this->pageRow['pid'])) ? '<a href="'.htmlspecialchars($this->listURL($this->pageRow['pid'])).'" onclick="setHighlight('.$this->pageRow['pid'].')"><img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/i/pages_up.gif','width="18" height="16"').' title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.upOneLevel',1).'" alt="" /></a>':'';
-                               $out.=$this->addelement(1,$theUpIcon,$theData,' class="c-headLineTable"','');
+                               // Render collapse button if in multi table mode
+                               $collapseIcon = '';
+                               if (!$this->table) {
+                                       $collapseIcon = '<a href="' . htmlspecialchars($this->listURL() . '&collapse[' . $table . ']=' . ($tableCollapsed ? '0' : '1')) . '" title="' . ($tableCollapsed ? $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.expandTable', TRUE) : $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.collapseTable', TRUE)) . '">' .
+                                                       ($tableCollapsed ? t3lib_iconWorks::getSpriteIcon('actions-view-list-expand', array('class' => 'collapseIcon')) : t3lib_iconWorks::getSpriteIcon('actions-view-list-collapse', array('class' => 'collapseIcon'))) .
+                                               '</a>';
+                               }
+                               $out .= $this->addElement(1, $collapseIcon, $theData, ' class="t3-row-header"', '');
                        }
 
-                       If (!$LOISmode) {
+                       // Render table rows only if in multi table view and not collapsed or if in single table view
+                       if (!$listOnlyInSingleTableMode && (!$tableCollapsed || $this->table)) {
                                        // Fixing a order table for sortby tables
                                $this->currentTable = array();
                                $currentIdList = array();
-                               $doSort = ($TCA[$table]['ctrl']['sortby'] && !$this->sortField);
+                               $doSort = ($GLOBALS['TCA'][$table]['ctrl']['sortby'] && !$this->sortField);
 
                                $prevUid = 0;
                                $prevPrevUid = 0;
+
+                                       // Get first two rows and initialize prevPrevUid and prevUid if on page > 1
+                               if ($this->firstElementNumber > 2 && $this->iLimit > 0) {
+                                       $row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
+                                       $prevPrevUid = -(int) $row['uid'];
+                                       $row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
+                                       $prevUid = $row['uid'];
+                               }
+
                                $accRows = array();     // Accumulate rows here
                                while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result))    {
-                                       
+
                                                // In offline workspace, look for alternative record:
                                        t3lib_BEfunc::workspaceOL($table, $row, $GLOBALS['BE_USER']->workspace, TRUE);
-                                       
+
                                        if (is_array($row))     {
                                                $accRows[] = $row;
                                                $currentIdList[] = $row['uid'];
@@ -480,6 +486,8 @@ class localRecordList extends recordList {
                                }
                                $GLOBALS['TYPO3_DB']->sql_free_result($result);
 
+                               $this->totalRowCount = count($accRows);
+
                                        // CSV initiated
                                if ($this->csvOutput) $this->initCSV();
 
@@ -490,38 +498,27 @@ class localRecordList extends recordList {
 
                                $iOut = '';
                                $cc = 0;
-                               foreach($accRows as $row)       {
 
-                                               // Forward/Backwards navigation links:
-                                       list($flag,$code) = $this->fwd_rwd_nav($table);
-                                       $iOut.=$code;
-
-                                               // If render item, increment counter and call function
-                                       if ($flag)      {
+                               foreach($accRows as $row)       {
+                                       // Render item row if counter < limit
+                                       if ($cc < $this->iLimit) {
                                                $cc++;
+                                               $this->translations = FALSE;
                                                $iOut.= $this->renderListRow($table,$row,$cc,$titleCol,$thumbsCol);
 
                                                        // If localization view is enabled it means that the selected records are either default or All language and here we will not select translations which point to the main record:
                                                if ($this->localizationView && $l10nEnabled)    {
-
-                                                               // Look for translations of this record:
-                                                       $translations = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
-                                                               $selFieldList,
-                                                               $table,
-                                                               'pid='.$row['pid'].
-                                                                       ' AND '.$TCA[$table]['ctrl']['languageField'].'>0'.
-                                                                       ' AND '.$TCA[$table]['ctrl']['transOrigPointerField'].'='.intval($row['uid']).
-                                                                       t3lib_BEfunc::deleteClause($table).
-                                                                       t3lib_BEfunc::versioningPlaceholderClause($table)
-                                                       );
-
                                                                // For each available translation, render the record:
-                                                       if (is_array($translations)) {
-                                                               foreach($translations as $lRow) {
+                                                       if (is_array($this->translations)) {
+                                                               foreach ($this->translations as $lRow) {
+                                                                               // $lRow isn't always what we want - if record was moved we've to work with the placeholder records otherwise the list is messed up a bit
+                                                                       if ($row['_MOVE_PLH_uid'] && $row['_MOVE_PLH_pid']) {
+                                                                               $tmpRow = t3lib_BEfunc::getRecordRaw($table, 't3ver_move_id="'.intval($lRow['uid']) . '" AND pid="' . $row['_MOVE_PLH_pid'] . '" AND t3ver_wsid=' . $row['t3ver_wsid'] . t3lib_beFunc::deleteClause($table), $selFieldList);
+                                                                               $lRow = is_array($tmpRow)?$tmpRow:$lRow;
+                                                                       }
                                                                                // In offline workspace, look for alternative record:
-                                                                       t3lib_BEfunc::workspaceOL($table, $lRow, $GLOBALS['BE_USER']->workspace);
-                                                                       
-                                                                       if (is_array($lRow) && $GLOBALS['BE_USER']->checkLanguageAccess($lRow[$TCA[$table]['ctrl']['languageField']]))  {
+                                                                       t3lib_BEfunc::workspaceOL($table, $lRow, $GLOBALS['BE_USER']->workspace, TRUE);
+                                                                       if (is_array($lRow) && $GLOBALS['BE_USER']->checkLanguageAccess($lRow[$GLOBALS['TCA'][$table]['ctrl']['languageField']])) {
                                                                                $currentIdList[] = $lRow['uid'];
                                                                                $iOut.=$this->renderListRow($table,$lRow,$cc,$titleCol,$thumbsCol,18);
                                                                        }
@@ -534,12 +531,30 @@ class localRecordList extends recordList {
                                        $this->eCounter++;
                                }
 
+                                       // Record navigation is added to the beginning and end of the table if in single table mode
+                               if ($this->table) {
+                                       $iOut = $this->renderListNavigation('top') . $iOut . $this->renderListNavigation('bottom');
+                               } else {
+                                               // show that there are more records than shown
+                                       if ($this->totalItems > $this->itemsLimitPerTable) {
+                                               $countOnFirstPage = $this->totalItems > $this->itemsLimitSingleTable ? $this->itemsLimitSingleTable : $this->totalItems;
+                                               $hasMore = ($this->totalItems > $this->itemsLimitSingleTable);
+                                               $iOut .= '<tr><td colspan="' . count($this->fieldArray) . '" style="padding:5px;">
+                                                               <a href="'.htmlspecialchars($this->listURL() . '&table=' . rawurlencode($table)) . '">' .
+                                                               '<img' . t3lib_iconWorks::skinImg($this->backPath,'gfx/pildown.gif', 'width="14" height="14"') .' alt="" />'.
+                                                               ' <i>[1 - ' . $countOnFirstPage . ($hasMore ? '+' : '') . ']</i></a>
+                                                               </td></tr>';
+                                               }
+
+                               }
+
                                        // The header row for the table is now created:
-                               $out.=$this->renderListHeader($table,$currentIdList);
+                               $out .= $this->renderListHeader($table,$currentIdList);
                        }
 
                                // The list of records is added after the header:
-                       $out.=$iOut;
+                       $out .= $iOut;
+                       unset($iOut);
 
                                // ... and it is all wrapped in a table:
                        $out='
@@ -549,7 +564,7 @@ class localRecordList extends recordList {
                        <!--
                                DB listing of elements: "'.htmlspecialchars($table).'"
                        -->
-                               <table border="0" cellpadding="0" cellspacing="0" class="typo3-dblist'.($LOISmode?' typo3-dblist-overview':'').'">
+                               <table border="0" cellpadding="0" cellspacing="0" class="typo3-dblist'.($listOnlyInSingleTableMode?' typo3-dblist-overview':'').'">
                                        '.$out.'
                                </table>';
 
@@ -583,13 +598,21 @@ class localRecordList extends recordList {
                }
 
                if (is_array($row))     {
+                               // add special classes for first and last row
+                       $rowSpecial = '';
+                       if ($cc == 1 && $indent == 0) {
+                               $rowSpecial .= ' firstcol';
+                       }
+                       if ($cc == $this->totalRowCount || $cc == $this->iLimit) {
+                               $rowSpecial .= ' lastcol';
+                       }
 
                                // Background color, if any:
-                       $row_bgColor=
-                               $this->alternateBgColors ?
-                               (($cc%2)?'' :' class="db_list_alt"') :
-                               '';
-
+                       if ($this->alternateBgColors) {
+                               $row_bgColor = ($cc%2) ? ' class="db_list_normal'.$rowSpecial.'"' : ' class="db_list_alt'.$rowSpecial.'"';
+                       } else {
+                               $row_bgColor = ' class="db_list_normal'.$rowSpecial.'"';
+                       }
                                // Overriding with versions background color if any:
                        $row_bgColor = $row['_CSSCLASS'] ? ' class="'.$row['_CSSCLASS'].'"' : $row_bgColor;
 
@@ -598,7 +621,9 @@ 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).'"'.($indent ? ' style="margin-left: '.$indent.'px;"' : ''));
+                       $iconImg = t3lib_iconWorks::getSpriteIconForRecord($table, $row, array('title' => htmlspecialchars($alttext), 'style' => ($indent ? ' margin-left: ' . $indent . 'px;' : '')));
+
+
                        $theIcon = $this->clickMenuEnabled ? $GLOBALS['SOBE']->doc->wrapClickMenuOnIcon($iconImg,$table,$row['uid']) : $iconImg;
 
                                // Preparing and getting the data-array
@@ -606,27 +631,50 @@ class localRecordList extends recordList {
                        foreach($this->fieldArray as $fCol)     {
                                if ($fCol==$titleCol)   {
                                        $recTitle = t3lib_BEfunc::getRecordTitle($table,$row,FALSE,TRUE);
-                                       $theData[$fCol] = $this->linkWrapItems($table,$row['uid'],$recTitle,$row);
-                               } elseif ($fCol=='pid') {
+                                               // If the record is edit-locked by another user, we will show a little warning sign:
+                                       if (($lockInfo = t3lib_BEfunc::isRecordLocked($table, $row['uid']))) {
+                                               $warning = '<a href="#" onclick="' . htmlspecialchars('alert(' . $GLOBALS['LANG']->JScharCode($lockInfo['msg']) . '); return false;') . '" title="' . htmlspecialchars($lockInfo['msg']) . '">' .
+                                                               t3lib_iconWorks::getSpriteIcon('status-warning-in-use') .
+                                                       '</a>';
+                                       }
+                                       $theData[$fCol] = $warning . $this->linkWrapItems($table, $row['uid'], $recTitle, $row);
+
+                                               // Render thumbsnails if a thumbnail column exists and there is content in it:
+                                       if ($this->thumbs && trim($row[$thumbsCol])) {
+                                               $theData[$fCol] .= '<br />' . $this->thumbCode($row,$table,$thumbsCol);
+                                       }
+
+                                       $localizationMarkerClass = '';
+                                       if (isset($GLOBALS['TCA'][$table]['ctrl']['languageField'])
+                                       && $row[$GLOBALS['TCA'][$table]['ctrl']['languageField']] != 0
+                                       && $row[$GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField']] != 0) {
+                                                       // it's a translated record with a language parent
+                                               $localizationMarkerClass = ' localization';
+                                       }
+                               } elseif ($fCol == 'pid') {
                                        $theData[$fCol]=$row[$fCol];
-                               } elseif ($fCol=='_PATH_') {
+                               } elseif ($fCol == '_PATH_') {
                                        $theData[$fCol]=$this->recPath($row['pid']);
-                               } elseif ($fCol=='_REF_') {
-                                       $theData[$fCol]=$this->makeRef($table,$row['uid']);
-                               } elseif ($fCol=='_CONTROL_') {
+                               } elseif ($fCol == '_REF_') {
+                                       $theData[$fCol] = $this->createReferenceHtml($table, $row['uid']);
+                               } elseif ($fCol == '_CONTROL_') {
                                        $theData[$fCol]=$this->makeControl($table,$row);
-                               } elseif ($fCol=='_CLIPBOARD_') {
+                               } elseif ($fCol == '_AFTERCONTROL_' || $fCol == '_AFTERREF_') {
+                                       $theData[$fCol] = '&nbsp;';
+                               } elseif ($fCol == '_CLIPBOARD_') {
                                        $theData[$fCol]=$this->makeClip($table,$row);
-       #                               $t3lib_transl8tools = new t3lib_transl8tools;
-       #                               $theData[$fCol].=t3lib_div::view_array($t3lib_transl8tools->translationInfo($table,$row['uid']));
-                               } elseif ($fCol=='_LOCALIZATION_') {
+                               } elseif ($fCol == '_LOCALIZATION_') {
                                        list($lC1, $lC2) = $this->makeLocalizationPanel($table,$row);
                                        $theData[$fCol] = $lC1;
                                        $theData[$fCol.'b'] = $lC2;
-                               } elseif ($fCol=='_LOCALIZATION_b') {
+                               } elseif ($fCol == '_LOCALIZATION_b') {
                                        // Do nothing, has been done above.
                                } else {
-                                       $theData[$fCol] = $this->linkUrlMail(htmlspecialchars(t3lib_BEfunc::getProcessedValueExtra($table,$fCol,$row[$fCol],100,$row['uid'])),$row[$fCol]);
+                                       $tmpProc = t3lib_BEfunc::getProcessedValueExtra($table, $fCol, $row[$fCol], 100, $row['uid']);
+                                       $theData[$fCol] = $this->linkUrlMail(htmlspecialchars($tmpProc), $row[$fCol]);
+                                       if ($this->csvOutput) {
+                                               $row[$fCol] = t3lib_BEfunc::getProcessedValueExtra($table, $fCol, $row[$fCol], 0, $row['uid']);
+                                       }
                                }
                        }
 
@@ -635,33 +683,69 @@ class localRecordList extends recordList {
                        }
 
                                // Add row to CSV list:
-                       if ($this->csvOutput) $this->addToCSV($row,$table);
+                       if ($this->csvOutput) {
+                               $this->addToCSV($row,$table);
+                       }
+
+                       // Add classes to table cells
+                       $this->addElement_tdCssClass[$titleCol]         = 'col-title' . $localizationMarkerClass;
+                       if (!$this->dontShowClipControlPanels) {
+                               $this->addElement_tdCssClass['_CONTROL_']       = 'col-control';
+                               $this->addElement_tdCssClass['_AFTERCONTROL_']  = 'col-control-space';
+                               $this->addElement_tdCssClass['_CLIPBOARD_']     = 'col-clipboard';
+                       }
+                       $this->addElement_tdCssClass['_PATH_']          = 'col-path';
+                       $this->addElement_tdCssClass['_LOCALIZATION_']  = 'col-localizationa';
+                       $this->addElement_tdCssClass['_LOCALIZATION_b'] = 'col-localizationb';
 
                                // Create element in table cells:
                        $iOut.=$this->addelement(1,$theIcon,$theData,$row_bgColor);
 
-                               // Render thumbsnails if a thumbnail column exists and there is content in it:
-                       if ($this->thumbs && trim($row[$thumbsCol]))    {
-                               $iOut.=$this->addelement(4,'', Array($titleCol=>$this->thumbCode($row,$table,$thumbsCol)),$row_bgColor);
-                       }
-
                                // Finally, return table row element:
                        return $iOut;
                }
        }
 
        /**
+        * Gets the number of records referencing the record with the UID $uid in
+        * the table $tableName.
+        *
+        * @param string $tableName
+        *        table name of the referenced record, must not be empty
+        * @param integer $uid
+        *        UID of the referenced record, must be > 0
+        *
+        * @return integer the number of references to record $uid in table
+        *                 $tableName, will be >= 0
+        */
+       protected function getReferenceCount($tableName, $uid) {
+               if (!isset($this->referenceCount[$tableName][$uid])) {
+                       $numberOfReferences = $GLOBALS['TYPO3_DB']->exec_SELECTcountRows(
+                               '*',
+                               'sys_refindex',
+                               'ref_table = ' . $GLOBALS['TYPO3_DB']->fullQuoteStr(
+                                       $tableName, 'sys_refindex'
+                               ) .
+                                       ' AND ref_uid = ' . $uid .
+                                       ' AND deleted = 0'
+                       );
+
+                       $this->referenceCount[$tableName][$uid] = $numberOfReferences;
+               }
+
+               return $this->referenceCount[$tableName][$uid];
+       }
+
+       /**
         * Rendering the header row for a table
         *
         * @param       string          Table name
-        * @param       array           Array of the currectly displayed uids of the table
+        * @param       array           Array of the currently displayed uids of the table
         * @return      string          Header table row
         * @access private
         * @see getTable()
         */
-       function renderListHeader($table,$currentIdList)        {
-               global $TCA, $LANG;
-
+       function renderListHeader($table, $currentIdList)       {
                        // Init:
                $theData = Array();
 
@@ -673,16 +757,16 @@ class localRecordList extends recordList {
 
                        switch((string)$fCol)   {
                                case '_PATH_':                  // Path
-                                       $theData[$fCol] = '<i>['.$LANG->sL('LLL:EXT:lang/locallang_core.php:labels._PATH_',1).']</i>';
+                                       $theData[$fCol] = '<i>[' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels._PATH_', 1) . ']</i>';
                                break;
                                case '_REF_':                   // References
-                                       $theData[$fCol] = '<i>['.$LANG->sL('LLL:EXT:lang/locallang_mod_file_list.xml:c__REF_',1).']</i>';
+                                       $theData[$fCol] = '<i>[' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_file_list.xml:c__REF_', 1) . ']</i>';
                                break;
                                case '_LOCALIZATION_':                  // Path
-                                       $theData[$fCol] = '<i>['.$LANG->sL('LLL:EXT:lang/locallang_core.php:labels._LOCALIZATION_',1).']</i>';
+                                       $theData[$fCol] = '<i>[' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels._LOCALIZATION_', 1) . ']</i>';
                                break;
                                case '_LOCALIZATION_b':                 // Path
-                                       $theData[$fCol] = $LANG->getLL('Localize',1);
+                                       $theData[$fCol] = $GLOBALS['LANG']->getLL('Localize', 1);
                                break;
                                case '_CLIPBOARD_':             // Clipboard:
                                        $cells=array();
@@ -690,59 +774,96 @@ class localRecordList extends recordList {
                                                // If there are elements on the clipboard for this table, then display the "paste into" icon:
                                        $elFromTable = $this->clipObj->elFromTable($table);
                                        if (count($elFromTable))        {
-                                               $cells[]='<a href="'.htmlspecialchars($this->clipObj->pasteUrl($table,$this->id)).'" onclick="'.htmlspecialchars('return '.$this->clipObj->confirmMsg('pages',$this->pageRow,'into',$elFromTable)).'">'.
-                                                               '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/clip_pasteafter.gif','width="12" height="12"').' title="'.$LANG->getLL('clip_paste',1).'" alt="" />'.
-                                                               '</a>';
+                                               $cells['pasteAfter'] = '<a href="' . htmlspecialchars($this->clipObj->pasteUrl($table, $this->id)) .
+                                                       '" onclick="' . htmlspecialchars('return ' . $this->clipObj->confirmMsg('pages', $this->pageRow, 'into' ,$elFromTable)) .
+                                                       '" title="' . $GLOBALS['LANG']->getLL('clip_paste', TRUE) . '">' .
+                                                       t3lib_iconWorks::getSpriteIcon('actions-document-paste-after') . '</a>';
                                        }
 
                                                // If the numeric clipboard pads are enabled, display the control icons for that:
                                        if ($this->clipObj->current!='normal')  {
 
                                                        // The "select" link:
-                                               $cells[]=$this->linkClipboardHeaderIcon('<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/clip_copy.gif','width="12" height="12"').' title="'.$LANG->getLL('clip_selectMarked',1).'" alt="" />',$table,'setCB');
+                                               $cells['copyMarked'] = $this->linkClipboardHeaderIcon(
+                                                       t3lib_iconWorks::getSpriteIcon(
+                                                               'actions-edit-copy',
+                                                               array('title' => $GLOBALS['LANG']->getLL('clip_selectMarked', TRUE))
+                                                       ),
+                                                       $table,
+                                                       'setCB');
 
                                                        // The "edit marked" link:
                                                $editIdList = implode(',',$currentIdList);
                                                $editIdList = "'+editList('".$table."','".$editIdList."')+'";
                                                $params='&edit['.$table.']['.$editIdList.']=edit&disHelp=1';
-                                               $cells[]='<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::editOnClick($params,$this->backPath,-1)).'">'.
-                                                               '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/edit2.gif','width="11" height="12"').' title="'.$LANG->getLL('clip_editMarked',1).'" alt="" />'.
+                                               $cells['edit'] = '<a href="#" onclick="' . htmlspecialchars(t3lib_BEfunc::editOnClick($params,$this->backPath, -1)) .
+                                                               '" title="' . $GLOBALS['LANG']->getLL('clip_editMarked', TRUE) . '">' .
+                                                               t3lib_iconWorks::getSpriteIcon('actions-document-open') .
                                                                '</a>';
 
                                                        // The "Delete marked" link:
-                                               $cells[]=$this->linkClipboardHeaderIcon('<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/garbage.gif','width="11" height="12"').' title="'.$LANG->getLL('clip_deleteMarked',1).'" alt="" />',$table,'delete',sprintf($LANG->getLL('clip_deleteMarkedWarning'),$LANG->sL($TCA[$table]['ctrl']['title'])));
+                                               $cells['delete'] = $this->linkClipboardHeaderIcon(
+                                                       t3lib_iconWorks::getSpriteIcon(
+                                                               'actions-edit-delete',
+                                                               array('title' => $GLOBALS['LANG']->getLL('clip_deleteMarked', TRUE))
+                                                       ),
+                                                       $table,
+                                                       'delete',
+                                                       sprintf($GLOBALS['LANG']->getLL('clip_deleteMarkedWarning'), $GLOBALS['LANG']->sL($GLOBALS['TCA'][$table]['ctrl']['title']))
+                                               );
 
                                                        // The "Select all" link:
-                                               $cells[]='<a href="#" onclick="'.htmlspecialchars('checkOffCB(\''.implode(',',$this->CBnames).'\'); return false;').'">'.
-                                                               '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/clip_select.gif','width="12" height="12"').' title="'.$LANG->getLL('clip_markRecords',1).'" alt="" />'.
+                                               $cells['markAll'] = '<a class="cbcCheckAll" rel="" href="#" onclick="' .
+                                                               htmlspecialchars('checkOffCB(\'' . implode(',', $this->CBnames) . '\', this); return false;') .
+                                                               '" title="' . $GLOBALS['LANG']->getLL('clip_markRecords', TRUE) . '">' .
+                                                               t3lib_iconWorks::getSpriteIcon('actions-document-select') .
                                                                '</a>';
                                        } else {
-                                               $cells[]='';
+                                               $cells['empty']='';
+                                       }
+                                       /**
+                                        * @hook                        renderListHeaderActions: Allows to change the clipboard icons of the Web>List table headers
+                                        * @date                        2007-11-20
+                                        * @request             Bernhard Kraft  <krafbt@kraftb.at>
+                                        * @usage               Above each listed table in Web>List a header row is shown. This hook allows to modify the icons responsible for the clipboard functions (shown above the clipboard checkboxes when a clipboard other than "Normal" is selected), or other "Action" functions which perform operations on the listed records.
+                                        */
+                                       if(is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/class.db_list_extra.inc']['actions']))     {
+                                               foreach($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/class.db_list_extra.inc']['actions'] as $classData)    {
+                                                       $hookObject = t3lib_div::getUserObj($classData);
+                                                       if(!($hookObject instanceof localRecordList_actionsHook))       {
+                                                               throw new UnexpectedValueException('$hookObject must implement interface localRecordList_actionsHook', 1195567850);
+                                                       }
+                                                       $cells = $hookObject->renderListHeaderActions($table, $currentIdList, $cells, $this);
+                                               }
                                        }
                                        $theData[$fCol]=implode('',$cells);
                                break;
                                case '_CONTROL_':               // Control panel:
-                                       if (!$TCA[$table]['ctrl']['readOnly'])  {
+                                       if (!$GLOBALS['TCA'][$table]['ctrl']['readOnly']) {
 
                                                        // If new records can be created on this page, add links:
                                                if ($this->calcPerms&($table=='pages'?8:16) && $this->showNewRecLink($table))   {
                                                        if ($table=="tt_content" && $this->newWizards)  {
                                                                        //  If mod.web_list.newContentWiz.overrideWithExtension is set, use that extension's create new content wizard instead:
                                                                $tmpTSc = t3lib_BEfunc::getModTSconfig($this->pageinfo['uid'],'mod.web_list');
-                                                               $tmpTSc = $tmpTSc ['properties']['newContentWiz.']['overrideWithExtension'];
+                                                               $tmpTSc = $tmpTSc['properties']['newContentWiz.']['overrideWithExtension'];
                                                                $newContentWizScriptPath = $this->backPath.t3lib_extMgm::isLoaded($tmpTSc) ? (t3lib_extMgm::extRelPath($tmpTSc).'mod1/db_new_content_el.php') : 'sysext/cms/layout/db_new_content_el.php';
 
-                                                               $theData[$fCol]='<a href="#" onclick="'.htmlspecialchars('return jumpExt(\''.$newContentWizScriptPath.'?id='.$this->id.'\');').'">'.
-                                                                                               '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/new_'.($table=='pages'?'page':'el').'.gif','width="'.($table=='pages'?13:11).'" height="12"').' title="'.$LANG->getLL('new',1).'" alt="" />'.
+                                                               $icon = '<a href="#" onclick="' . htmlspecialchars('return jumpExt(\'' . $newContentWizScriptPath . '?id=' . $this->id . '\');') . '" title="' . $GLOBALS['LANG']->getLL('new', TRUE) . '">'.
+                                                                                                       ($table == 'pages' ? t3lib_iconWorks::getSpriteIcon('actions-page-new') : t3lib_iconWorks::getSpriteIcon('actions-document-new')) .
                                                                                                '</a>';
                                                        } elseif ($table=='pages' && $this->newWizards) {
-                                                               $theData[$fCol]='<a href="'.htmlspecialchars($this->backPath.'db_new.php?id='.$this->id.'&pagesOnly=1&returnUrl='.rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'))).'">'.
-                                                                                               '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/new_'.($table=='pages'?'page':'el').'.gif','width="'.($table=='pages'?13:11).'" height="12"').' title="'.$LANG->getLL('new',1).'" alt="" />'.
+                                                               $icon = '<a href="' . htmlspecialchars($this->backPath . 'db_new.php?id=' . $this->id . '&pagesOnly=1&returnUrl='.rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'))) . '" title="' . $GLOBALS['LANG']->getLL('new', TRUE) . '">'.
+                                                                                                       ($table=='pages' ? t3lib_iconWorks::getSpriteIcon('actions-page-new') : t3lib_iconWorks::getSpriteIcon('actions-document-new')) .
                                                                                                '</a>';
+
                                                        } else {
-                                                               $params='&edit['.$table.']['.$this->id.']=new';
-                                                               $theData[$fCol]='<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::editOnClick($params,$this->backPath,-1)).'">'.
-                                                                                               '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/new_'.($table=='pages'?'page':'el').'.gif','width="'.($table=='pages'?13:11).'" height="12"').' title="'.$LANG->getLL('new',1).'" alt="" />'.
+                                                               $params = '&edit['.$table.']['.$this->id.']=new';
+                                                               if ($table == 'pages_language_overlay') {
+                                                                       $params .= '&overrideVals[pages_language_overlay][doktype]=' . (int) $this->pageRow['doktype'];
+                                                               }
+                                                               $icon   = '<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::editOnClick($params, $this->backPath, -1)) . '" title="' . $GLOBALS['LANG']->getLL('new', TRUE) . '">'.
+                                                                                                       ($table=='pages' ? t3lib_iconWorks::getSpriteIcon('actions-page-new') : t3lib_iconWorks::getSpriteIcon('actions-document-new')) .
                                                                                                '</a>';
                                                        }
                                                }
@@ -751,42 +872,192 @@ class localRecordList extends recordList {
                                                if ($permsEdit && $this->table && is_array($currentIdList))     {
                                                        $editIdList = implode(',',$currentIdList);
                                                        if ($this->clipNumPane()) $editIdList = "'+editList('".$table."','".$editIdList."')+'";
-                                                       $params='&edit['.$table.']['.$editIdList.']=edit&columnsOnly='.implode(',',$this->fieldArray).'&disHelp=1';
-                                                       $theData[$fCol].='<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::editOnClick($params,$this->backPath,-1)).'">'.
-                                                                                       '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/edit2.gif','width="11" height="12"').' title="'.$LANG->getLL('editShownColumns',1).'" alt="" />'.
+                                                       $params = '&edit['.$table.']['.$editIdList.']=edit&columnsOnly='.implode(',',$this->fieldArray).'&disHelp=1';
+                                                       $icon  .= '<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::editOnClick($params, $this->backPath, -1 )) . '" title="' . $GLOBALS['LANG']->getLL('editShownColumns', TRUE) . '">' .
+                                                                                               t3lib_iconWorks::getSpriteIcon('actions-document-open') .
                                                                                        '</a>';
                                                }
+                                                       // add an empty entry, so column count fits again after moving this into $icon
+                                               $theData[$fCol] = '&nbsp;';
                                        }
                                break;
+                               case '_AFTERCONTROL_':  // space column
+                               case '_AFTERREF_':      // space column
+                                       $theData[$fCol] = '&nbsp;';
+                               break;
                                default:                        // Regular fields header:
                                        $theData[$fCol]='';
                                        if ($this->table && is_array($currentIdList))   {
 
                                                        // If the numeric clipboard pads are selected, show duplicate sorting link:
                                                if ($this->clipNumPane()) {
-                                                       $theData[$fCol].='<a href="'.htmlspecialchars($this->listURL('',-1).'&duplicateField='.$fCol).'">'.
-                                                                                       '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/select_duplicates.gif','width="11" height="11"').' title="'.$LANG->getLL('clip_duplicates',1).'" alt="" />'.
+                                                       $theData[$fCol] .= '<a href="' . htmlspecialchars($this->listURL('', -1) . '&duplicateField=' . $fCol) . '" title="' . $GLOBALS['LANG']->getLL('clip_duplicates', TRUE) . '">' .
+                                                                                               t3lib_iconWorks::getSpriteIcon('actions-document-duplicates-select') .
                                                                                        '</a>';
                                                }
 
                                                        // If the table can be edited, add link for editing THIS field for all listed records:
-                                               if (!$TCA[$table]['ctrl']['readOnly'] && $permsEdit && $TCA[$table]['columns'][$fCol])  {
+                                               if (!$GLOBALS['TCA'][$table]['ctrl']['readOnly'] && $permsEdit && $GLOBALS['TCA'][$table]['columns'][$fCol]) {
                                                        $editIdList = implode(',',$currentIdList);
                                                        if ($this->clipNumPane()) $editIdList = "'+editList('".$table."','".$editIdList."')+'";
                                                        $params='&edit['.$table.']['.$editIdList.']=edit&columnsOnly='.$fCol.'&disHelp=1';
-                                                       $iTitle = sprintf($LANG->getLL('editThisColumn'),ereg_replace(':$','',trim($LANG->sL(t3lib_BEfunc::getItemLabel($table,$fCol)))));
-                                                       $theData[$fCol].='<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::editOnClick($params,$this->backPath,-1)).'">'.
-                                                                                       '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/edit2.gif','width="11" height="12"').' title="'.htmlspecialchars($iTitle).'" alt="" />'.
+                                                       $iTitle = sprintf($GLOBALS['LANG']->getLL('editThisColumn'), rtrim(trim($GLOBALS['LANG']->sL(t3lib_BEfunc::getItemLabel($table, $fCol))), ':'));
+                                                       $theData[$fCol].='<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::editOnClick($params,$this->backPath,-1)).'" title="'.htmlspecialchars($iTitle).'">'.
+                                                                                               t3lib_iconWorks::getSpriteIcon('actions-document-open') .
                                                                                        '</a>';
                                                }
                                        }
-                                       $theData[$fCol].=$this->addSortLink($LANG->sL(t3lib_BEfunc::getItemLabel($table,$fCol,'<i>[|]</i>')),$fCol,$table);
+                                       $theData[$fCol] .= $this->addSortLink($GLOBALS['LANG']->sL(t3lib_BEfunc::getItemLabel($table, $fCol, '<i>[|]</i>')), $fCol, $table);
                                break;
                        }
+
+               }
+
+               /**
+                * @hook                        renderListHeader: Allows to change the contents of columns/cells of the Web>List table headers
+                * @date                        2007-11-20
+                * @request             Bernhard Kraft  <krafbt@kraftb.at>
+                * @usage               Above each listed table in Web>List a header row is shown. Containing the labels of all shown fields and additional icons to create new records for this table or perform special clipboard tasks like mark and copy all listed records to clipboard, etc.
+                */
+               if(is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/class.db_list_extra.inc']['actions']))     {
+                       foreach($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/class.db_list_extra.inc']['actions'] as $classData)    {
+                               $hookObject = t3lib_div::getUserObj($classData);
+                               if(!($hookObject instanceof localRecordList_actionsHook))       {
+                                       throw new UnexpectedValueException('$hookObject must implement interface localRecordList_actionsHook', 1195567855);
+                               }
+                               $theData = $hookObject->renderListHeader($table, $currentIdList, $theData, $this);
+                       }
                }
 
                        // Create and return header table row:
-               return $this->addelement(1,'',$theData,' class="c-headLine"','');
+               return $this->addelement(1, $icon, $theData, ' class="c-headLine"', '');
+       }
+
+       /**
+        * Creates a page browser for tables with many records
+        *
+        * @param       string          Distinguish between 'top' and 'bottom' part of the navigation (above or below the records)
+        * @return      string  Navigation HTML
+        *
+        */
+       protected function renderListNavigation($renderPart = 'top') {
+               $totalPages = ceil($this->totalItems / $this->iLimit);
+
+               $content = '';
+               $returnContent = '';
+
+                       // Show page selector if not all records fit into one page
+               if ($totalPages > 1) {
+                       $first = $previous = $next = $last = $reload = '';
+                       $listURL = $this->listURL('', $this->table);
+
+                               // 1 = first page
+                       $currentPage = floor(($this->firstElementNumber + 1) / $this->iLimit) + 1;
+
+                               // Compile first, previous, next, last and refresh buttons
+                       if ($currentPage > 1) {
+                               $labelFirst = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:first');
+
+                               $first = '<a href="' . $listURL . '&pointer=0">' .
+                                       t3lib_iconWorks::getSpriteIcon('actions-view-paging-first', array('title'=> $labelFirst)) .
+                               '</a>';
+                       } else {
+                               $first = t3lib_iconWorks::getSpriteIcon('actions-view-paging-first-disabled');
+                       }
+
+                       if (($currentPage - 1) > 0) {
+                               $labelPrevious = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:previous');
+
+                               $previous = '<a href="' . $listURL . '&pointer=' . (($currentPage - 2) * $this->iLimit) . '">' .
+                                       t3lib_iconWorks::getSpriteIcon('actions-view-paging-previous', array('title' => $labelPrevious)) .
+                                       '</a>';
+                       } else {
+                               $previous = t3lib_iconWorks::getSpriteIcon('actions-view-paging-previous-disabled');
+                       }
+
+                       if (($currentPage + 1) <= $totalPages) {
+                               $labelNext = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:next');
+
+                               $next = '<a href="' . $listURL . '&pointer=' . (($currentPage) * $this->iLimit) . '">' .
+                                       t3lib_iconWorks::getSpriteIcon('actions-view-paging-next', array('title' => $labelNext)) .
+                                       '</a>';
+                       } else {
+                               $next = t3lib_iconWorks::getSpriteIcon('actions-view-paging-next-disabled');
+                       }
+
+                       if ($currentPage != $totalPages) {
+                               $labelLast = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:last');
+
+                               $last = '<a href="' . $listURL . '&pointer=' . (($totalPages - 1) * $this->iLimit) . '">' .
+                                       t3lib_iconWorks::getSpriteIcon('actions-view-paging-last', array('title' => $labelLast)) .
+                                       '</a>';
+                       } else {
+                               $last = t3lib_iconWorks::getSpriteIcon('actions-view-paging-last-disabled');
+                       }
+
+                       $reload = '<a href="#" onclick="document.dblistForm.action=\''
+                               . $listURL . '&pointer=\'+calculatePointer(document.getElementById(\'jumpPage-' . $renderPart .'\').value); document.dblistForm.submit(); return true;" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:reload', TRUE) . '">' .
+                                       t3lib_iconWorks::getSpriteIcon('actions-system-refresh') .
+                               '</a>';
+
+                       if ($renderPart === 'top') {
+                                       // Add js to traverse a page select input to a pointer value
+                               $content = '
+<script type="text/JavaScript">
+/*<![CDATA[*/
+
+       function calculatePointer(page) {
+               if (page > ' . $totalPages . ') {
+                       page = ' . $totalPages . ';
+               }
+
+               if (page < 1) {
+                       page = 1;
+               }
+
+               pointer = (page - 1) * ' . $this->iLimit . ';
+
+               return pointer;
+       }
+
+/*]]>*/
+</script>
+';
+                       }
+                       $pageNumberInput = '<span>
+                               <input type="text" value="' . $currentPage
+                               . '" size="3" id="jumpPage-' . $renderPart . '" name="jumpPage-' . $renderPart . '" onkeyup="if (event.keyCode == Event.KEY_RETURN) { document.dblistForm.action=\'' . $listURL . '&pointer=\'+calculatePointer(this.value); document.dblistForm.submit(); } return true;" />
+                               </span>';
+                       $pageIndicator = '<span class="pageIndicator">'
+                               . sprintf($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_web_list.xml:pageIndicator'), $pageNumberInput, $totalPages)
+                               . '</span>';
+
+                       if ($this->totalItems > ($this->firstElementNumber + $this->iLimit)) {
+                               $lastElementNumber = $this->firstElementNumber + $this->iLimit;
+                       } else {
+                               $lastElementNumber = $this->totalItems;
+                       }
+                       $rangeIndicator = '<span class="pageIndicator">'
+                               . sprintf($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_web_list.xml:rangeIndicator'), $this->firstElementNumber + 1, $lastElementNumber)
+                               . '</span>';
+
+                       $content .= '<div id="typo3-dblist-pagination">'
+                               . $first . $previous
+                               . '<span class="bar">&nbsp;</span>'
+                               . $rangeIndicator . '<span class="bar">&nbsp;</span>'
+                               . $pageIndicator . '<span class="bar">&nbsp;</span>'
+                               . $next . $last . '<span class="bar">&nbsp;</span>'
+                               . $reload
+                               . '</div>';
+
+                       $data = Array();
+                       $titleColumn = $this->fieldArray[0];
+                       $data[$titleColumn] = $content;
+
+                       $returnContent = $this->addElement(1, '', $data);
+               } // end of if pages > 1
+
+               return $returnContent;
        }
 
 
@@ -808,7 +1079,6 @@ class localRecordList extends recordList {
         * @return      string          HTML table with the control panel (unless disabled)
         */
        function makeControl($table,$row)       {
-               global $TCA, $LANG, $SOBE;
                if ($this->dontShowClipControlPanels)   return '';
 
                        // Initialize:
@@ -826,126 +1096,173 @@ class localRecordList extends recordList {
                        // "Show" link (only pages and tt_content elements)
                if ($table=='pages' || $table=='tt_content')    {
                        $params='&edit['.$table.']['.$row['uid'].']=edit';
-                       $cells[]='<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::viewOnClick($table=='tt_content'?$this->id.'#'.$row['uid']:$row['uid'], $this->backPath)).'">'.
-                                       '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/zoom.gif','width="12" height="12"').' title="'.$LANG->sL('LLL:EXT:lang/locallang_core.php:labels.showPage',1).'" alt="" />'.
-                                       '</a>';
+                       $cells['view'] = '<a href="#" onclick="' . htmlspecialchars(t3lib_BEfunc::viewOnClick(
+                                       $table=='tt_content' ? $this->id . '#' . $row['uid'] : $row['uid'],
+                                       $this->backPath)
+                               ) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.showPage', TRUE) . '">' .
+                               t3lib_iconWorks::getSpriteIcon('actions-document-view') . '</a>';
+               } elseif(!$this->table) {
+                       $cells['view'] = $this->spaceIcon;
                }
 
                        // "Edit" link: ( Only if permissions to edit the page-record of the content of the parent page ($this->id)
                if ($permsEdit) {
                        $params='&edit['.$table.']['.$row['uid'].']=edit';
-                       $cells[]='<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::editOnClick($params,$this->backPath,-1)).'">'.
-                                       '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/edit2'.(!$TCA[$table]['ctrl']['readOnly']?'':'_d').'.gif','width="11" height="12"').' title="'.$LANG->getLL('edit',1).'" alt="" />'.
-                                       '</a>';
+                       $cells['edit'] = '<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::editOnClick($params, $this->backPath, -1)) .
+                               '" title="' . $GLOBALS['LANG']->getLL('edit', TRUE) . '">' .
+                               ( $GLOBALS['TCA'][$table]['ctrl']['readOnly'] ? t3lib_iconWorks::getSpriteIcon('actions-document-open-read-only') : t3lib_iconWorks::getSpriteIcon('actions-document-open')) .
+                               '</a>';
+               } elseif(!$this->table) {
+                       $cells['edit'] = $this->spaceIcon;
                }
 
                        // "Move" wizard link for pages/tt_content elements:
                if (($table=="tt_content" && $permsEdit) || ($table=='pages'))  {
-                       $cells[]='<a href="#" onclick="'.htmlspecialchars('return jumpExt(\''.$this->backPath.'move_el.php?table='.$table.'&uid='.$row['uid'].'\');').'">'.
-                                       '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/move_'.($table=='tt_content'?'record':'page').'.gif','width="11" height="12"').' title="'.$LANG->getLL('move_'.($table=='tt_content'?'record':'page'),1).'" alt="" />'.
+                       $cells['move'] = '<a href="#" onclick="' .
+                               htmlspecialchars(
+                                       'return jumpExt(\'' . $this->backPath . 'move_el.php?table=' . $table . '&uid='.$row['uid'] . '\');'
+                               ) .'" title="' . $GLOBALS['LANG']->getLL('move_' . ($table == 'tt_content' ? 'record' : 'page'), TRUE) . '">' .
+                                               ($table == 'tt_content' ? t3lib_iconWorks::getSpriteIcon('actions-document-move') : t3lib_iconWorks::getSpriteIcon('actions-page-move')) .
                                        '</a>';
+               } elseif(!$this->table) {
+                       $cells['move'] = $this->spaceIcon;
                }
 
                        // If the extended control panel is enabled OR if we are seeing a single table:
-               if ($SOBE->MOD_SETTINGS['bigControlPanel'] || $this->table)     {
+               if ($GLOBALS['SOBE']->MOD_SETTINGS['bigControlPanel'] || $this->table)  {
 
                                // "Info": (All records)
-                       $cells[]='<a href="#" onclick="'.htmlspecialchars('top.launchView(\''.$table.'\', \''.$row['uid'].'\'); return false;').'">'.
-                                       '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/zoom2.gif','width="12" height="12"').' title="'.$LANG->getLL('showInfo',1).'" alt="" />'.
-                                       '</a>';
+                       $cells['viewBig'] = '<a href="#" onclick="' . htmlspecialchars(
+                                       'top.launchView(\'' . $table . '\', \''.$row['uid'] . '\'); return false;'
+                               ) . '" title="' . $GLOBALS['LANG']->getLL('showInfo', TRUE) . '">'.
+                               t3lib_iconWorks::getSpriteIcon('actions-document-info') .
+                               '</a>';
 
                                // If the table is NOT a read-only table, then show these links:
-                       if (!$TCA[$table]['ctrl']['readOnly'])  {
+                       if (!$GLOBALS['TCA'][$table]['ctrl']['readOnly']) {
 
                                        // "Revert" link (history/undo)
-                               $cells[]='<a href="#" onclick="'.htmlspecialchars('return jumpExt(\''.$this->backPath.'show_rechis.php?element='.rawurlencode($table.':'.$row['uid']).'\',\'#latest\');').'">'.
-                                               '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/history2.gif','width="13" height="12"').' title="'.$LANG->getLL('history',1).'" alt="" />'.
-                                               '</a>';
+                               $cells['history'] = '<a href="#" onclick="' . htmlspecialchars(
+                                       'return jumpExt(\'' . $this->backPath . 'show_rechis.php?element=' . rawurlencode($table . ':' . $row['uid']) . '\',\'#latest\');') .
+                                       '" title="' . $GLOBALS['LANG']->getLL('history', TRUE) . '">'.
+                                       t3lib_iconWorks::getSpriteIcon('actions-document-history-open') .
+                                       '</a>';
 
                                        // Versioning:
-                               if (t3lib_extMgm::isLoaded('version') {
-                                       $vers = t3lib_BEfunc::selectVersionsOfRecord($table, $row['uid'], 'uid', $GLOBALS['BE_USER']->workspace);
+                               if (t3lib_extMgm::isLoaded('version') && !t3lib_extMgm::isLoaded('workspaces')) {
+                                       $vers = t3lib_BEfunc::selectVersionsOfRecord($table, $row['uid'], 'uid', $GLOBALS['BE_USER']->workspace, FALSE, $row);
                                        if (is_array($vers))    {       // If table can be versionized.
-                                               if (count($vers)>1)     {
-                                                       $st = 'background-color: #FFFF00; font-weight: bold;';
-                                                       $lab = count($vers)-1;
-                                               } else {
-                                                       $st = 'background-color: #9999cc; font-weight: bold;';
-                                                       $lab = 'V';
+                                               $versionIcon = 'no-version';
+                                               if (count($vers) > 1) {
+                                                       $versionIcon = count($vers) - 1;
                                                }
 
-                                               $cells[]='<a href="'.htmlspecialchars($this->backPath.t3lib_extMgm::extRelPath('version')).'cm1/index.php?table='.rawurlencode($table).'&uid='.rawurlencode($row['uid']).'" title="'.$LANG->getLL('displayVersions',1).'" style="'.htmlspecialchars($st).'">'.
-                                                               $lab.
+                                               $cells['version'] = '<a href="' . htmlspecialchars($this->backPath . t3lib_extMgm::extRelPath('version') . 'cm1/index.php?table=' . rawurlencode($table) . '&uid=' . rawurlencode($row['uid'])) . '" title="' . $GLOBALS['LANG']->getLL('displayVersions', TRUE) . '">' .
+                                                               t3lib_iconWorks::getSpriteIcon('status-version-' . $versionIcon) .
                                                                '</a>';
+                                       } elseif(!$this->table) {
+                                               $cells['version'] = $this->spaceIcon;
                                        }
                                }
 
                                        // "Edit Perms" link:
-                               if ($table=='pages' && $GLOBALS['BE_USER']->check('modules','web_perm'))        {
-                                       $cells[]='<a href="'.htmlspecialchars('mod/web/perm/index.php?id='.$row['uid'].'&return_id='.$row['uid'].'&edit=1').'">'.
-                                                       '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/perm.gif','width="7" height="12"').' title="'.$LANG->getLL('permissions',1).'" alt="" />'.
-                                                       '</a>';
+                               if ($table == 'pages' && $GLOBALS['BE_USER']->check('modules','web_perm') && t3lib_extMgm::isLoaded('perm'))    {
+                                       $cells['perms'] =
+                                               '<a href="' .
+                                                       htmlspecialchars(
+                                                               t3lib_extMgm::extRelPath('perm') . 'mod1/index.php' .
+                                                               '?id=' . $row['uid'] . '&return_id=' . $row['uid'] . '&edit=1'
+                                                       ) .
+                                                       '" title="' . $GLOBALS['LANG']->getLL('permissions', TRUE) .
+                                               '">'.
+                                                       t3lib_iconWorks::getSpriteIcon('status-status-locked') .
+                                               '</a>';
+                               } elseif(!$this->table && $GLOBALS['BE_USER']->check('modules','web_perm')) {
+                                       $cells['perms'] = $this->spaceIcon;
                                }
 
                                        // "New record after" link (ONLY if the records in the table are sorted by a "sortby"-row or if default values can depend on previous record):
-                               if ($TCA[$table]['ctrl']['sortby'] || $TCA[$table]['ctrl']['useColumnsForDefaultValues'])       {
+                               if ($GLOBALS['TCA'][$table]['ctrl']['sortby'] || $GLOBALS['TCA'][$table]['ctrl']['useColumnsForDefaultValues']) {
                                        if (
                                                ($table!='pages' && ($this->calcPerms&16)) ||   // For NON-pages, must have permission to edit content on this parent page
                                                ($table=='pages' && ($this->calcPerms&8))               // For pages, must have permission to create new pages here.
                                                )       {
                                                if ($this->showNewRecLink($table))      {
                                                        $params='&edit['.$table.']['.(-($row['_MOVE_PLH']?$row['_MOVE_PLH_uid']:$row['uid'])).']=new';
-                                                       $cells[]='<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::editOnClick($params,$this->backPath,-1)).'">'.
-                                                                       '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/new_'.($table=='pages'?'page':'el').'.gif','width="'.($table=='pages'?13:11).'" height="12"').' title="'.$LANG->getLL('new'.($table=='pages'?'Page':'Record'),1).'" alt="" />'.
-                                                                       '</a>';
+                                                       $cells['new'] = '<a href="#" onclick="' . htmlspecialchars(
+                                                               t3lib_BEfunc::editOnClick($params, $this->backPath, -1)) .
+                                                               '" title="' . $GLOBALS['LANG']->getLL('new' . ($table == 'pages '? 'Page' : 'Record'), TRUE) . '">' .
+                                                               ($table == 'pages' ? t3lib_iconWorks::getSpriteIcon('actions-page-new') : t3lib_iconWorks::getSpriteIcon('actions-document-new')) .
+                                                               '</a>';
                                                }
                                        }
+                               } elseif(!$this->table) {
+                                       $cells['new'] = $this->spaceIcon;
                                }
 
                                        // "Up/Down" links
-                               if ($permsEdit && $TCA[$table]['ctrl']['sortby']  && !$this->sortField && !$this->searchLevels) {
+                               if ($permsEdit && $GLOBALS['TCA'][$table]['ctrl']['sortby']  && !$this->sortField && !$this->searchLevels) {
                                        if (isset($this->currentTable['prev'][$row['uid']]))    {       // Up
                                                $params='&cmd['.$table.']['.$row['uid'].'][move]='.$this->currentTable['prev'][$row['uid']];
-                                               $cells[]='<a href="#" onclick="'.htmlspecialchars('return jumpToUrl(\''.$SOBE->doc->issueCommand($params,-1).'\');').'">'.
-                                                               '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/button_up.gif','width="11" height="10"').' title="'.$LANG->getLL('moveUp',1).'" alt="" />'.
+                                               $cells['moveUp'] = '<a href="#" onclick="' . htmlspecialchars(
+                                                                       'return jumpToUrl(\'' . $GLOBALS['SOBE']->doc->issueCommand($params, -1) . '\');'
+                                                               ) .'" title="'.$GLOBALS['LANG']->getLL('moveUp', TRUE) . '">' .
+                                                               t3lib_iconWorks::getSpriteIcon('actions-move-up') .
                                                                '</a>';
                                        } else {
-                                               $cells[]='<img src="clear.gif" '.t3lib_iconWorks::skinImg($this->backPath,'gfx/button_up.gif','width="11" height="10"',2).' alt="" />';
+                                               $cells['moveUp'] = $this->spaceIcon;
                                        }
                                        if ($this->currentTable['next'][$row['uid']])   {       // Down
                                                $params='&cmd['.$table.']['.$row['uid'].'][move]='.$this->currentTable['next'][$row['uid']];
-                                               $cells[]='<a href="#" onclick="'.htmlspecialchars('return jumpToUrl(\''.$SOBE->doc->issueCommand($params,-1).'\');').'">'.
-                                                               '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/button_down.gif','width="11" height="10"').' title="'.$LANG->getLL('moveDown',1).'" alt="" />'.
+                                               $cells['moveDown']='<a href="#" onclick="'.htmlspecialchars('return jumpToUrl(\''.$GLOBALS['SOBE']->doc->issueCommand($params,-1).'\');').'" title="'.$GLOBALS['LANG']->getLL('moveDown', TRUE) . '">' .
+                                                                       t3lib_iconWorks::getSpriteIcon('actions-move-down') .
                                                                '</a>';
                                        } else {
-                                               $cells[]='<img src="clear.gif" '.t3lib_iconWorks::skinImg($this->backPath,'gfx/button_down.gif','width="11" height="10"',2).' alt="" />';
+                                               $cells['moveDown'] = $this->spaceIcon;
                                        }
+                               } elseif(!$this->table) {
+                                       $cells['moveUp']  = $this->spaceIcon;
+                                       $cells['moveDown'] = $this->spaceIcon;
                                }
 
                                        // "Hide/Unhide" links:
-                               $hiddenField = $TCA[$table]['ctrl']['enablecolumns']['disabled'];
-                               if ($permsEdit && $hiddenField && $TCA[$table]['columns'][$hiddenField] && (!$TCA[$table]['columns'][$hiddenField]['exclude'] || $GLOBALS['BE_USER']->check('non_exclude_fields',$table.':'.$hiddenField)))     {
+                               $hiddenField = $GLOBALS['TCA'][$table]['ctrl']['enablecolumns']['disabled'];
+                               if ($permsEdit && $hiddenField && $GLOBALS['TCA'][$table]['columns'][$hiddenField] && (!$GLOBALS['TCA'][$table]['columns'][$hiddenField]['exclude'] || $GLOBALS['BE_USER']->check('non_exclude_fields', $table . ':' . $hiddenField))) {
                                        if ($row[$hiddenField]) {
                                                $params='&data['.$table.']['.$row['uid'].']['.$hiddenField.']=0';
-                                               $cells[]='<a href="#" onclick="'.htmlspecialchars('return jumpToUrl(\''.$SOBE->doc->issueCommand($params,-1).'\');').'">'.
-                                                               '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/button_unhide.gif','width="11" height="10"').' title="'.$LANG->getLL('unHide'.($table=='pages'?'Page':''),1).'" alt="" />'.
+                                               $cells['hide']='<a href="#" onclick="' . htmlspecialchars('return jumpToUrl(\'' . $GLOBALS['SOBE']->doc->issueCommand($params, -1) . '\');') . '" title="'.$GLOBALS['LANG']->getLL('unHide' . ($table == 'pages' ? 'Page' : ''), TRUE) . '">' .
+                                                                       t3lib_iconWorks::getSpriteIcon('actions-edit-unhide') .
                                                                '</a>';
                                        } else {
                                                $params='&data['.$table.']['.$row['uid'].']['.$hiddenField.']=1';
-                                               $cells[]='<a href="#" onclick="'.htmlspecialchars('return jumpToUrl(\''.$SOBE->doc->issueCommand($params,-1).'\');').'">'.
-                                                               '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/button_hide.gif','width="11" height="10"').' title="'.$LANG->getLL('hide'.($table=='pages'?'Page':''),1).'" alt="" />'.
+                                               $cells['hide']='<a href="#" onclick="' . htmlspecialchars('return jumpToUrl(\'' . $GLOBALS['SOBE']->doc->issueCommand($params, -1) . '\');') . '" title="' . $GLOBALS['LANG']->getLL('hide' . ($table == 'pages' ? 'Page' : ''), TRUE) . '">' .
+                                                                       t3lib_iconWorks::getSpriteIcon('actions-edit-hide') .
                                                                '</a>';
                                        }
+                               } elseif(!$this->table) {
+                                       $cells['hide'] = $this->spaceIcon;
                                }
 
                                        // "Delete" link:
-                               if (
-                                       ($table=='pages' && ($localCalcPerms&4)) || ($table!='pages' && ($this->calcPerms&16))
-                                       )       {
-                                       $params='&cmd['.$table.']['.$row['uid'].'][delete]=1';
-                                       $cells[]='<a href="#" onclick="'.htmlspecialchars('if (confirm('.$LANG->JScharCode($LANG->getLL('deleteWarning').t3lib_BEfunc::referenceCount($table,$row['uid'],' (There are %s reference(s) to this record!)')).')) {jumpToUrl(\''.$SOBE->doc->issueCommand($params,-1).'\');} return false;').'">'.
-                                                       '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/garbage.gif','width="11" height="12"').' title="'.$LANG->getLL('delete',1).'" alt="" />'.
+                               if (($table=='pages' && ($localCalcPerms&4)) || ($table!='pages' && ($this->calcPerms&16))) {
+                                       $titleOrig = t3lib_BEfunc::getRecordTitle($table,$row,FALSE,TRUE);
+                                       $title = t3lib_div::slashJS(t3lib_div::fixed_lgd_cs($titleOrig, $this->fixedL), 1);
+                                       $params = '&cmd['.$table.']['.$row['uid'].'][delete]=1';
+
+                                       $refCountMsg = t3lib_BEfunc::referenceCount(
+                                               $table,
+                                               $row['uid'],
+                                               ' ' . $GLOBALS['LANG']->sL(
+                                                       'LLL:EXT:lang/locallang_core.xml:labels.referencesToRecord'
+                                               ),
+                                               $this->getReferenceCount($table, $row['uid'])
+                                       ) .
+                                               t3lib_BEfunc::translationCount($table, $row['uid'], ' ' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.translationsOfRecord'));
+                                       $cells['delete'] = '<a href="#" onclick="' . htmlspecialchars('if (confirm(' . $GLOBALS['LANG']->JScharCode($GLOBALS['LANG']->getLL('deleteWarning') . ' "' .  $title . '" ' . $refCountMsg) . ')) {jumpToUrl(\'' . $GLOBALS['SOBE']->doc->issueCommand($params, -1) . '\');} return false;') . '" title="' . $GLOBALS['LANG']->getLL('delete', TRUE) . '">' .
+                                                       t3lib_iconWorks::getSpriteIcon('actions-edit-delete') .
                                                        '</a>';
+                               } elseif(!$this->table) {
+                                       $cells['delete'] = $this->spaceIcon;
                                }
 
                                        // "Levels" links: Moving pages into new levels...
@@ -954,8 +1271,8 @@ class localRecordList extends recordList {
                                                // Up (Paste as the page right after the current parent page)
                                        if ($this->calcPerms&8) {
                                                $params='&cmd['.$table.']['.$row['uid'].'][move]='.-$this->id;
-                                               $cells[]='<a href="#" onclick="'.htmlspecialchars('return jumpToUrl(\''.$SOBE->doc->issueCommand($params,-1).'\');').'">'.
-                                                               '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/button_left.gif','width="11" height="10"').' title="'.$LANG->getLL('prevLevel',1).'" alt="" />'.
+                                               $cells['moveLeft'] = '<a href="#" onclick="' . htmlspecialchars('return jumpToUrl(\'' . $GLOBALS['SOBE']->doc->issueCommand($params, -1) . '\');') . '" title="' . $GLOBALS['LANG']->getLL('prevLevel', TRUE) . '">' .
+                                                                       t3lib_iconWorks::getSpriteIcon('actions-move-left') .
                                                                '</a>';
                                        }
                                                // Down (Paste as subpage to the page right above)
@@ -963,35 +1280,51 @@ class localRecordList extends recordList {
                                                $localCalcPerms = $GLOBALS['BE_USER']->calcPerms(t3lib_BEfunc::getRecord('pages',$this->currentTable['prevUid'][$row['uid']]));
                                                if ($localCalcPerms&8)  {
                                                        $params='&cmd['.$table.']['.$row['uid'].'][move]='.$this->currentTable['prevUid'][$row['uid']];
-                                                       $cells[]='<a href="#" onclick="'.htmlspecialchars('return jumpToUrl(\''.$SOBE->doc->issueCommand($params,-1).'\');').'">'.
-                                                                       '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/button_right.gif','width="11" height="10"').' title="'.$LANG->getLL('nextLevel',1).'" alt="" />'.
+                                                       $cells['moveRight'] = '<a href="#" onclick="' . htmlspecialchars('return jumpToUrl(\'' . $GLOBALS['SOBE']->doc->issueCommand($params, -1) . '\');') . '" title="' . $GLOBALS['LANG']->getLL('nextLevel', TRUE) . '">' .
+                                                                               t3lib_iconWorks::getSpriteIcon('actions-move-right') .
                                                                        '</a>';
                                                } else {
-                                                       $cells[]='<img src="clear.gif" '.t3lib_iconWorks::skinImg($this->backPath,'gfx/button_right.gif','width="11" height="10"',2).' alt="" />';
+                                                       $cells['moveRight'] = $this->spaceIcon;
                                                }
                                        } else {
-                                               $cells[]='<img src="clear.gif" '.t3lib_iconWorks::skinImg($this->backPath,'gfx/button_right.gif','width="11" height="10"',2).' alt="" />';
+                                               $cells['moveRight'] = $this->spaceIcon;
                                        }
+                               } elseif(!$this->table) {
+                                       $cells['moveLeft'] = $this->spaceIcon;
+                                       $cells['moveRight'] = $this->spaceIcon;
                                }
                        }
                }
 
-                       // If the record is edit-locked by another user, we will show a little warning sign:
-               if ($lockInfo=t3lib_BEfunc::isRecordLocked($table,$row['uid'])) {
-                       $cells[] = '<a href="#" onclick="'.htmlspecialchars('alert('.$LANG->JScharCode($lockInfo['msg']).');return false;').'">'.
-                                       '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/recordlock_warning3.gif','width="17" height="12"').' title="'.htmlspecialchars($lockInfo['msg']).'" alt="" />'.
-                                       '</a>';
-               }
 
-                       // Call stats information hook
+               /**
+                * @hook                        recStatInfoHooks: Allows to insert HTML before record icons on various places
+                * @date                        2007-09-22
+                * @request             Kasper Skårhøj  <kasper2007@typo3.com>
+                */
                if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['recStatInfoHooks']))  {
                        $stat='';
                        $_params = array($table,$row['uid']);
                        foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['recStatInfoHooks'] as $_funcRef)  {
                                $stat.=t3lib_div::callUserFunction($_funcRef,$_params,$this);
                        }
-                       $cells[] = $stat;
-               }               
+                       $cells['stat'] = $stat;
+               }
+               /**
+                * @hook                        makeControl: Allows to change control icons of records in list-module
+                * @date                        2007-11-20
+                * @request             Bernhard Kraft  <krafbt@kraftb.at>
+                * @usage               This hook method gets passed the current $cells array as third parameter. This array contains values for the icons/actions generated for each record in Web>List. Each array entry is accessible by an index-key. The order of the icons is dependend on the order of those array entries.
+                */
+               if(is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/class.db_list_extra.inc']['actions'])) {
+                       foreach($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/class.db_list_extra.inc']['actions'] as $classData) {
+                               $hookObject = t3lib_div::getUserObj($classData);
+                               if(!($hookObject instanceof localRecordList_actionsHook))       {
+                                       throw new UnexpectedValueException('$hookObject must implement interface localRecordList_actionsHook', 1195567840);
+                               }
+                               $cells = $hookObject->makeControl($table, $row, $cells, $this);
+                       }
+               }
 
                        // Compile items into a DIV-element:
                return '
@@ -1007,24 +1340,24 @@ class localRecordList extends recordList {
         * @return      string          HTML table with the clipboard panel (unless disabled)
         */
        function makeClip($table,$row)  {
-               global $TCA, $LANG;
-
                        // Return blank, if disabled:
                if ($this->dontShowClipControlPanels)   return '';
                $cells=array();
 
-
+               $cells['pasteAfter'] = $cells['pasteInto'] = $this->spaceIcon;
+                       //enables to hide the copy, cut and paste icons for localized records - doesn't make much sense to perform these options for them
+               $isL10nOverlay = $this->localizationView && $table != 'pages_language_overlay' && $row[$GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField']] != 0;
                        // Return blank, if disabled:
                        // Whether a numeric clipboard pad is active or the normal pad we will see different content of the panel:
                if ($this->clipObj->current=='normal')  {       // For the "Normal" pad:
 
                                // Show copy/cut icons:
                        $isSel = (string)$this->clipObj->isSelected($table,$row['uid']);
-                       $cells[]='<a href="#" onclick="'.htmlspecialchars('return jumpSelf(\''.$this->clipObj->selUrlDB($table,$row['uid'],1,($isSel=='copy'),array('returnUrl'=>'')).'\');').'">'.
-                                       '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/clip_copy'.($isSel=='copy'?'_h':'').'.gif','width="12" height="12"').' title="'.$LANG->sL('LLL:EXT:lang/locallang_core.php:cm.copy',1).'" alt="" />'.
+                       $cells['copy'] = $isL10nOverlay ? $this->spaceIcon : '<a href="#" onclick="' . htmlspecialchars('return jumpSelf(\'' . $this->clipObj->selUrlDB($table, $row['uid'], 1, ($isSel=='copy'), array('returnUrl'=>'')) . '\');') . '" title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:cm.copy', TRUE) . '">' .
+                                               ((!$isSel=='copy') ? t3lib_iconWorks::getSpriteIcon('actions-edit-copy') : t3lib_iconWorks::getSpriteIcon('actions-edit-copy-release')) .
                                        '</a>';
-                       $cells[]='<a href="#" onclick="'.htmlspecialchars('return jumpSelf(\''.$this->clipObj->selUrlDB($table,$row['uid'],0,($isSel=='cut'),array('returnUrl'=>'')).'\');').'">'.
-                                       '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/clip_cut'.($isSel=='cut'?'_h':'').'.gif','width="12" height="12"').' title="'.$LANG->sL('LLL:EXT:lang/locallang_core.php:cm.cut',1).'" alt="" />'.
+                       $cells['cut'] = $isL10nOverlay ? $this->spaceIcon : '<a href="#" onclick="' . htmlspecialchars('return jumpSelf(\'' . $this->clipObj->selUrlDB($table, $row['uid'], 0, ($isSel == 'cut'), array('returnUrl'=>'')) . '\');') . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:cm.cut', TRUE) . '">' .
+                                               ((!$isSel=='cut') ? t3lib_iconWorks::getSpriteIcon('actions-edit-cut') : t3lib_iconWorks::getSpriteIcon('actions-edit-cut-release')) .
                                        '</a>';
 
                } else {        // For the numeric clipboard pads (showing checkboxes where one can select elements on/off)
@@ -1046,57 +1379,97 @@ class localRecordList extends recordList {
                        }
 
                                // Adding the checkbox to the panel:
-                       $cells[]='<input type="hidden" name="CBH['.$n.']" value="0" /><input type="checkbox" name="CBC['.$n.']" value="1" class="smallCheckboxes"'.$checked.' />';
+                       $cells['select'] = $isL10nOverlay ? $this->spaceIcon : '<input type="hidden" name="CBH['.$n.']" value="0" /><input type="checkbox" name="CBC['.$n.']" value="1" class="smallCheckboxes"'.$checked.' />';
                }
 
                        // Now, looking for selected elements from the current table:
                $elFromTable = $this->clipObj->elFromTable($table);
-               if (count($elFromTable) && $TCA[$table]['ctrl']['sortby'])      {       // IF elements are found and they can be individually ordered, then add a "paste after" icon:
-                       $cells[]='<a href="'.htmlspecialchars($this->clipObj->pasteUrl($table,-$row['uid'])).'" onclick="'.htmlspecialchars('return '.$this->clipObj->confirmMsg($table,$row,'after',$elFromTable)).'">'.
-                                       '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/clip_pasteafter.gif','width="12" height="12"').' title="'.$LANG->getLL('clip_pasteAfter',1).'" alt="" />'.
+               if (count($elFromTable) && $GLOBALS['TCA'][$table]['ctrl']['sortby']){
+                               // IF elements are found and they can be individually ordered, then add a "paste after" icon:
+                       $cells['pasteAfter'] = $isL10nOverlay ? $this->spaceIcon : '<a href="' . htmlspecialchars($this->clipObj->pasteUrl($table, -$row['uid'])) . '" onclick="' . htmlspecialchars('return '. $this->clipObj->confirmMsg($table, $row, 'after', $elFromTable)) . '" title="' . $GLOBALS['LANG']->getLL('clip_pasteAfter', TRUE) . '">' .
+                                               t3lib_iconWorks::getSpriteIcon('actions-document-paste-after') .
                                        '</a>';
                }
 
                        // Now, looking for elements in general:
                $elFromTable = $this->clipObj->elFromTable('');
                if ($table=='pages' && count($elFromTable))     {
-                       $cells[]='<a href="'.htmlspecialchars($this->clipObj->pasteUrl('',$row['uid'])).'" onclick="'.htmlspecialchars('return '.$this->clipObj->confirmMsg($table,$row,'into',$elFromTable)).'">'.
-                                       '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/clip_pasteinto.gif','width="12" height="12"').' title="'.$LANG->getLL('clip_pasteInto',1).'" alt="" />'.
+                       $cells['pasteInto'] = '<a href="' . htmlspecialchars($this->clipObj->pasteUrl('', $row['uid'])) . '" onclick="' . htmlspecialchars('return ' . $this->clipObj->confirmMsg($table, $row, 'into', $elFromTable)) . '" title="' . $GLOBALS['LANG']->getLL('clip_pasteInto', TRUE) . '">' .
+                                               t3lib_iconWorks::getSpriteIcon('actions-document-paste-into') .
                                        '</a>';
                }
 
+               /*
+                * @hook                        makeClip: Allows to change clip-icons of records in list-module
+                * @date                        2007-11-20
+                * @request             Bernhard Kraft  <krafbt@kraftb.at>
+                * @usage               This hook method gets passed the current $cells array as third parameter. This array contains values for the clipboard icons generated for each record in Web>List. Each array entry is accessible by an index-key. The order of the icons is dependend on the order of those array entries.
+                */
+               if(is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/class.db_list_extra.inc']['actions'])) {
+                       foreach($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/class.db_list_extra.inc']['actions'] as $classData) {
+                               $hookObject = t3lib_div::getUserObj($classData);
+                               if(!($hookObject instanceof localRecordList_actionsHook))       {
+                                       throw new UnexpectedValueException('$hookObject must implement interface localRecordList_actionsHook', 1195567845);
+                               }
+                               $cells = $hookObject->makeClip($table, $row, $cells, $this);
+                       }
+               }
+
                        // Compile items into a DIV-element:
                return '                                                        <!-- CLIPBOARD PANEL: '.$table.':'.$row['uid'].' -->
                                                                                        <div class="typo3-clipCtrl">'.implode('',$cells).'</div>';
        }
 
        /**
-        * Make reference count
+        * Creates the HTML for a reference count for the record with the UID $uid
+        * in the table $tableName.
         *
-        * @param       string          Table name
-        * @param       integer         UID of record
-        * @return      string          HTML-table
+        * @param string $tableName
+        *        table name of the referenced record, must not be empty
+        * @param integer $uid
+        *        UID of the referenced record, must be > 0
+        *
+        * @return string HTML of reference a link, will be empty if there are no
+        *                references to the corresponding record
         */
-       function makeRef($table,$uid)   {
+       protected function createReferenceHtml($tableName, $uid) {
+               $referenceCount = $this->getReferenceCount($tableName, $uid);
+               if ($referenceCount == 0) {
+                       return '';
+               }
 
-                       // Look up the path:
-               $rows = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
-                       '*',
+               $queryResult = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+                       'tablename, recuid, field',
                        'sys_refindex',
-                       'ref_table='.$GLOBALS['TYPO3_DB']->fullQuoteStr($table,'sys_refindex').
-                               ' AND ref_uid='.intval($uid).
-                               ' AND deleted=0'
+                       'ref_table = ' . $GLOBALS['TYPO3_DB']->fullQuoteStr(
+                               $tableName, 'sys_refindex'
+                       ) .
+                               ' AND ref_uid = ' . $uid .
+                               ' AND deleted = 0',
+                       '',
+                       '',
+                       '0,20'
                );
 
-                       // Compile information for title tag:
-               $infoData=array();
-               if (is_array($rows)) {
-                       foreach($rows as $row)  {
-                               $infoData[]=$row['tablename'].':'.$row['recuid'].':'.$row['field'];
+               $referenceTitles = array();
+
+               while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($queryResult)) {
+                       $referenceTitles[] = $row['tablename'] . ':' . $row['recuid'] .
+                               ':' . $row['field'];
+                       if (strlen(implode(' / ', $referenceTitles)) >= 100) {
+                               break;
                        }
                }
-
-               return count($infoData) ? '<a href="#" onclick="'.htmlspecialchars('top.launchView(\''.$table.'\', \''.$uid.'\'); return false;').'" title="'.htmlspecialchars(t3lib_div::fixed_lgd(implode(' / ',$infoData),100)).'">'.count($infoData).'</a>' : '';
+               $GLOBALS['TYPO3_DB']->sql_free_result($queryResult);
+
+               return '<a href="#" ' .
+                       'onclick="' . htmlspecialchars(
+                               'top.launchView(\'' . $tableName . '\', \'' . $uid .
+                               '\'); return false;'
+                       ) . '" ' .
+                       'title="' . htmlspecialchars(
+                               t3lib_div::fixed_lgd_cs(implode(' / ', $referenceTitles), 100)
+                       ) . '">' . $referenceCount . '</a>';
        }
 
        /**
@@ -1107,18 +1480,16 @@ class localRecordList extends recordList {
         * @return      array           Array with key 0/1 with content for column 1 and 2
         */
        function makeLocalizationPanel($table,$row)     {
-               global $TCA,$LANG;
-
                $out = array(
                        0 => '',
                        1 => '',
                );
 
-               $t8Tools = t3lib_div::makeInstance('t3lib_transl8tools');
-               $translations = $t8Tools->translationInfo($table,$row['uid']);
+               $translations = $this->translateTools->translationInfo($table, $row['uid'], 0, $row, $this->selFieldList);
+               $this->translations = $translations['translations'];
 
                        // Language title and icon:
-               $out[0] = $this->languageFlag($row[$TCA[$table]['ctrl']['languageField']]);
+               $out[0] = $this->languageFlag($row[$GLOBALS['TCA'][$table]['ctrl']['languageField']]);
 
                if (is_array($translations))    {
 
@@ -1126,20 +1497,25 @@ class localRecordList extends recordList {
                        $lNew = '';
                        foreach($this->pageOverlays as $lUid_OnPage => $lsysRec)        {
                                if (!isset($translations['translations'][$lUid_OnPage]) && $GLOBALS['BE_USER']->checkLanguageAccess($lUid_OnPage))      {
-                                       $href = $GLOBALS['TBE_TEMPLATE']->issueCommand(
-                                               '&cmd['.$table.']['.$row['uid'].'][localize]='.$lUid_OnPage,
-                                               $this->listURL().'&justLocalized='.rawurlencode($table.':'.$row['uid'].':'.$lUid_OnPage)
+                                       $url = substr($this->listURL(), strlen($this->backPath));
+                                       $href = $GLOBALS['SOBE']->doc->issueCommand(
+                                               '&cmd[' . $table . '][' . $row['uid'] . '][localize]=' . $lUid_OnPage,
+                                               $url . '&justLocalized=' . rawurlencode($table . ':' . $row['uid'] . ':' . $lUid_OnPage)
                                        );
-
-                                       $lC = ($this->languageIconTitles[$lUid_OnPage]['flagIcon'] ? '<img src="'.$this->languageIconTitles[$lUid_OnPage]['flagIcon'].'" class="absmiddle" alt="" />' : $this->languageIconTitles[$lUid_OnPage]['title']);
-                                       $lC = '<a href="'.htmlspecialchars($href).'">'.$lC.'</a> ';
+                                       $language = t3lib_BEfunc::getRecord('sys_language', $lUid_OnPage, 'title');
+                                       if ($this->languageIconTitles[$lUid_OnPage]['flagIcon']) {
+                                               $lC = t3lib_iconWorks::getSpriteIcon($this->languageIconTitles[$lUid_OnPage]['flagIcon']);
+                                       } else {
+                                               $lC = $this->languageIconTitles[$lUid_OnPage]['title'];
+                                       }
+                                       $lC = '<a href="' . htmlspecialchars($href) . '" title="' . htmlspecialchars($language['title']) . '">' . $lC . '</a> ';
 
                                        $lNew.=$lC;
                                }
                        }
 
                        if ($lNew)      $out[1].= $lNew;
-               } else {
+               } elseif ($row['l18n_parent']) {
                        $out[0] = '&nbsp;&nbsp;&nbsp;&nbsp;'.$out[0];
                }
 
@@ -1151,11 +1527,10 @@ class localRecordList extends recordList {
         * Create the selector box for selecting fields to display from a table:
         *
         * @param       string          Table name
-        * @param       boolean         If true, form-fields will be wrapped around the table.
+        * @param       boolean         If TRUE, form-fields will be wrapped around the table.
         * @return      string          HTML table with the selector box (name: displayFields['.$table.'][])
         */
        function fieldSelectBox($table,$formFields=1)   {
-               global $TCA, $LANG;
 
                        // Init:
                t3lib_div::loadTCA($table);
@@ -1168,11 +1543,9 @@ class localRecordList extends recordList {
                $setFields=is_array($this->setFields[$table]) ? $this->setFields[$table] : array();
 
                        // Request fields from table:
-               $fields = $this->makeFieldList($table);
+               $fields = $this->makeFieldList($table, FALSE, TRUE);
 
                        // Add pseudo "control" fields
-               $fields[]='tstamp';
-               $fields[]='crdate';
                $fields[]='_PATH_';
                $fields[]='_REF_';
                $fields[]='_LOCALIZATION_';
@@ -1183,14 +1556,17 @@ class localRecordList extends recordList {
                $opt=array();
                $opt[] = '<option value=""></option>';
                foreach($fields as $fN) {
-                       $fL = is_array($TCA[$table]['columns'][$fN]) ? ereg_replace(':$','',$LANG->sL($TCA[$table]['columns'][$fN]['label'])) : '['.$fN.']';    // Field label
+                               // Field label
+                       $fL = (is_array($GLOBALS['TCA'][$table]['columns'][$fN])
+                               ? rtrim($GLOBALS['LANG']->sL($GLOBALS['TCA'][$table]['columns'][$fN]['label']), ':')
+                               : '[' . $fN . ']');
                        $opt[] = '
                                                                                        <option value="'.$fN.'"'.(in_array($fN,$setFields)?' selected="selected"':'').'>'.htmlspecialchars($fL).'</option>';
                }
 
                        // Compile the options into a multiple selector box:
                $lMenu = '
-                                                                               <select size="'.t3lib_div::intInRange(count($fields)+1,3,20).'" multiple="multiple" name="displayFields['.$table.'][]">'.implode('',$opt).'
+                                                                               <select size="'.t3lib_utility_Math::forceIntegerInRange(count($fields)+1,3,20).'" multiple="multiple" name="displayFields['.$table.'][]">'.implode('',$opt).'
                                                                                </select>
                                ';
 
@@ -1201,10 +1577,10 @@ class localRecordList extends recordList {
                                <!--
                                        Field selector for extended table view:
                                -->
-                               <table border="0" cellpadding="0" cellspacing="0" class="bgColor4" id="typo3-dblist-fieldSelect">
+                               <table border="0" cellpadding="0" cellspacing="0" id="typo3-dblist-fieldSelect">
                                        <tr>
                                                <td>'.$lMenu.'</td>
-                                               <td><input type="submit" name="search" value="'.$LANG->sL('LLL:EXT:lang/locallang_core.php:labels.setFields',1).'" /></td>
+                                               <td><input type="submit" name="search" value="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.setFields', 1) . '" /></td>
                                        </tr>
                                </table>
                        '.$formElements[1];
@@ -1244,7 +1620,7 @@ class localRecordList extends recordList {
        }
 
        /**
-        * Returns true if a numeric clipboard pad is selected/active
+        * Returns TRUE if a numeric clipboard pad is selected/active
         *
         * @return      boolean
         */
@@ -1271,7 +1647,7 @@ class localRecordList extends recordList {
                if ($field=='_PATH_')   $field=pid;
 
                        //       Create the sort link:
-               $sortUrl = $this->listURL('',-1,'sortField,sortRev,table').'&table='.$table.'&sortField='.$field.'&sortRev='.($this->sortRev || ($this->sortField!=$field)?0:1);
+               $sortUrl = $this->listURL('', -1, 'sortField,sortRev,table,firstElementNumber') . '&table=' . $table . '&sortField=' . $field . '&sortRev=' . ($this->sortRev || ($this->sortField != $field) ? 0 : 1);
                $sortArrow = ($this->sortField==$field?'<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/red'.($this->sortRev?'up':'down').'.gif','width="7" height="4"').' alt="" />':'');
 
                        // Return linked field:
@@ -1295,13 +1671,23 @@ class localRecordList extends recordList {
        }
 
        /**
-        * Returns true if a link for creating new records should be displayed for $table
+        * Returns TRUE if a link for creating new records should be displayed for $table
         *
         * @param       string          Table name
-        * @return      boolean
+        * @return      boolean         Returns TRUE if a link for creating new records should be displayed for $table
+        * @see         SC_db_new::showNewRecLink
         */
        function showNewRecLink($table) {
-               return !count($this->allowedNewTables) || in_array($table,$this->allowedNewTables);
+                       // No deny/allow tables are set:
+               if (!count($this->allowedNewTables) && !count($this->deniedNewTables)) {
+                       return TRUE;
+                       // If table is not denied (which takes precedence over allowed tables):
+               } elseif (!in_array($table, $this->deniedNewTables) && (!count($this->allowedNewTables) || in_array($table, $this->allowedNewTables))) {
+                       return TRUE;
+                       // If table is denied or allowed tables are set, but table is not part of:
+               } else {
+                       return FALSE;
+               }
        }
 
        /**
@@ -1335,47 +1721,54 @@ class localRecordList extends recordList {
         *
         * @return      void
         */
-       function initCSV()      {
-
-                       // Reset:
-               $this->csvLines=array();
-
-                       // Getting header line with field names:
-               $csvRow=array();
-               foreach($this->fieldArray as $fN)       {
-                       $csvRow[]=$fN;
-               }
+       protected function initCSV() {
+               $this->addHeaderRowToCSV();
+       }
 
-                       // Set the header + an empty row:
-               $this->setCsvRow($csvRow);
-               $this->csvLines[]='';
+       /**
+        * Add header line with field names as CSV line
+        *
+        * @return void
+        */
+       protected function addHeaderRowToCSV() {
+                       // Add header row, control fields will be reduced inside addToCSV()
+               $this->addToCSV(array_combine($this->fieldArray, $this->fieldArray));
        }
 
        /**
-        * Adds the content of input array $row to the CSV list:
+        * Adds selected columns of one table row as CSV line.
         *
         * @param       array           Record array, from which the values of fields found in $this->fieldArray will be listed in the CSV output.
-        * @param       string          Table name
         * @return      void
         */
-       function addToCSV($row,$table)  {
-
-                       // Traversing fields, adding values from $row:
-               $csvRow=array();
-               foreach($this->fieldArray as $fN)       {
-                       if ($fN=='_PATH_')      {
-                               $csvRow[]=$this->recPath($row['pid']);
-                       } elseif ($fN=='_REF_') {
-                               $csvRow[]=$this->makeRef($table, $row['uid']);
-                       } else {
-                               $csvRow[]=$row[$fN];
-                       }
-               }
+       protected function addToCSV(array $row = array()) {
+               $rowReducedByControlFields = self::removeControlFieldsFromFieldRow($row);
+               $rowReducedToSelectedColumns = array_intersect_key($rowReducedByControlFields, array_flip($this->fieldArray));
+               $this->setCsvRow($rowReducedToSelectedColumns);
+       }
 
-                       // Set the values in the CSV list
-               $this->setCsvRow($csvRow);
+       /**
+        * Remove control fields from row for CSV export
+        *
+        * @param array fieldNames => fieldValues
+        * @return array Input array reduces by control fields
+        */
+       protected static function removeControlFieldsFromFieldRow(array $row = array()) {
+                       // Possible control fields in a list row
+               $controlFields = array(
+                       '_PATH_',
+                       '_REF_',
+                       '_CONTROL_',
+                       '_AFTERCONTROL_',
+                       '_AFTERREF_',
+                       '_CLIPBOARD_',
+                       '_LOCALIZATION_',
+                       '_LOCALIZATION_b',
+               );
+               return array_diff_key($row, array_flip($controlFields));
        }
 
+
        /**
         * Adds input row of values to the internal csvLines array as a CSV formatted line
         *
@@ -1413,7 +1806,8 @@ class localRecordList extends recordList {
 
 
 
-if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/class.db_list_extra.inc'])  {
-       include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/class.db_list_extra.inc']);
+if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['typo3/class.db_list_extra.inc'])) {
+       include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['typo3/class.db_list_extra.inc']);
 }
+
 ?>