[BUGFIX] Regression: filelistFolderTree constructor is recursive
[Packages/TYPO3.CMS.git] / typo3 / template.php
index 92056a5..c3e0f25 100644 (file)
@@ -2,7 +2,7 @@
 /***************************************************************
 *  Copyright notice
 *
-*  (c) 1999-2009 Kasper Skaarhoj (kasperYYYY@typo3.com)
+*  (c) 1999-2011 Kasper Skårhøj (kasperYYYY@typo3.com)
 *  All rights reserved
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
 /**
  * Contains class with layout/output function for TYPO3 Backend Scripts
  *
- * $Id$
- * Revised for TYPO3 3.6 2/2003 by Kasper Skaarhoj
+ * Revised for TYPO3 3.6 2/2003 by Kasper Skårhøj
  * XHTML-trans compliant
  *
- * @author     Kasper Skaarhoj <kasperYYYY@typo3.com>
- */
-/**
- * [CLASS/FUNCTION INDEX of SCRIPT]
- *
- *  145: function fw($str)
- *
- *
- *  169: class template
- *  224:     function template()
- *
- *              SECTION: EVALUATION FUNCTIONS
- *  298:     function wrapClickMenuOnIcon($str,$table,$uid='',$listFr=1,$addParams='',$enDisItems='', $returnOnClick=FALSE)
- *  315:     function viewPageIcon($id,$backPath,$addParams='hspace="3"')
- *  341:     function issueCommand($params,$rUrl='')
- *  356:     function isCMlayers()
- *  366:     function thisBlur()
- *  376:     function helpStyle()
- *  393:     function getHeader($table,$row,$path,$noViewPageIcon=0,$tWrap=array('',''))
- *  419:     function getFileheader($title,$path,$iconfile)
- *  434:     function makeShortcutIcon($gvList,$setList,$modName,$motherModName="")
- *  467:     function makeShortcutUrl($gvList,$setList)
- *  488:     function formWidth($size=48,$textarea=0,$styleOverride='')
- *  513:     function formWidthText($size=48,$styleOverride='',$wrap='')
- *  530:     function redirectUrls($thisLocation='')
- *  554:     function formatTime($tstamp,$type)
- *  571:     function parseTime()
- *
- *              SECTION: PAGE BUILDING FUNCTIONS.
- *  604:     function startPage($title)
- *  686:     function endPage()
- *  720:     function header($text)
- *  741:     function section($label,$text,$nostrtoupper=FALSE,$sH=FALSE,$type=0,$allowHTMLinHeader=FALSE)
- *  765:     function divider($dist)
- *  781:     function spacer($dist)
- *  800:     function sectionHeader($label,$sH=FALSE,$addAttrib='')
- *  817:     function sectionBegin()
- *  838:     function sectionEnd()
- *  858:     function middle()
- *  867:     function endPageJS()
- *  884:     function docBodyTagBegin()
- *  894:     function docStyle()
- *  936:     function insertStylesAndJS($content)
- *  956:     function initCharset()
- *  968:     function generator()
- *
- *              SECTION: OTHER ELEMENTS
- * 1001:     function icons($type, $styleAttribValue='')
- * 1030:     function t3Button($onClick,$label)
- * 1041:     function dfw($string)
- * 1051:     function rfw($string)
- * 1061:     function wrapInCData($string)
- * 1078:     function wrapScriptTags($string, $linebreak=TRUE)
- * 1117:     function table($arr, $layout='')
- * 1159:     function menuTable($arr1,$arr2=array(), $arr3=array())
- * 1192:     function funcMenu($content,$menu)
- * 1210:     function clearCacheMenu($id,$addSaveOptions=0)
- * 1246:     function getContextMenuCode()
- * 1251:     function showClickmenu(table, uid, listFr, enDisItems, backPath, addParams)
- * 1280:     function showClickmenu_noajax(url)
- * 1287:     function showClickmenu_ajax(t3ajax)
- * 1472:     function getDragDropCode($table)
- * 1483:     function cancelDragEvent(event)
- * 1496:     function mouseMoveEvent (event)
- * 1509:     function dragElement(id,elementID)
- * 1528:     function dropElement(id)
- * 1577:     function getTabMenu($mainParams,$elementName,$currentValue,$menuItems,$script='',$addparams='')
- * 1607:     function getTabMenuRaw($menuItems)
- * 1676:     function getDynTabMenu($menuItems,$identString,$toggle=0,$foldout=FALSE,$newRowCharLimit=50,$noWrap=1,$fullWidth=FALSE,$defaultTabIndex=1)
- * 1801:     function getDynTabMenuJScode()
- * 1892:     function getVersionSelector($id,$noAction=FALSE)
- *
- *
- * 2060: class bigDoc extends template
- *
- *
- * 2069: class noDoc extends template
- *
- *
- * 2078: class smallDoc extends template
- *
- *
- * 2087: class mediumDoc extends template
- *
- * TOTAL FUNCTIONS: 57
- * (This index is automatically created/updated by the extension "extdeveval")
- *
+ * @author     Kasper Skårhøj <kasperYYYY@typo3.com>
  */
 
 
@@ -126,19 +39,6 @@ if (!defined('TYPO3_MODE')) die("Can't include this file directly.");
 
 
 /**
- * Deprecated fontwrap function. Is just transparent now.
- *
- * @param      string          Input string
- * @return     string          Output string (in the old days this was wrapped in <font> tags)
- * @deprecated since TYPO3 3.6
- */
-function fw($str) {
-       t3lib_div::logDeprecatedFunction();
-       return $str;
-}
-
-
-/**
  * TYPO3 Backend Template Class
  *
  * This class contains functions for starting and ending the HTML of backend modules
@@ -153,7 +53,7 @@ function fw($str) {
  *
  * Please refer to Inside TYPO3 for a discussion of how to use this API.
  *
- * @author     Kasper Skaarhoj <kasperYYYY@typo3.com>
+ * @author     Kasper Skårhøj <kasperYYYY@typo3.com>
  * @package TYPO3
  * @subpackage core
  */
@@ -169,6 +69,7 @@ class template {
        var $postCode='';                               // Additional 'page-end' code could be accommulated in this var. It will be outputted at the end of page before </body> and some other internal page-end code.
        var $docType = '';                              // Doc-type used in the header. Default is xhtml_trans. You can also set it to 'html_3', 'xhtml_strict' or 'xhtml_frames'.
        var $moduleTemplate = '';               // HTML template with markers for module
+       protected $moduleTemplateFilename = ''; // the base file (not overlaid by TBE_STYLES) for the current module, useful for hooks when finding out which modules is rendered currently
 
                // Other vars you can change, but less frequently used:
        var $scriptID='';                               // Script ID.
@@ -181,7 +82,7 @@ class template {
        var $endJS=1;                                   // If set, then a JavaScript section will be outputted in the bottom of page which will try and update the top.busy session expiry object.
 
                // TYPO3 Colorscheme.
-               // If you want to change this, please do so through a skin using the global var $TBE_STYLES
+               // If you want to change this, please do so through a skin using the global var $GLOBALS['TBE_STYLES']
        var $bgColor = '#F7F3EF';               // Light background color
        var $bgColor2 = '#9BA1A8';              // Steel-blue
        var $bgColor3 = '#F6F2E6';              // dok.color
@@ -195,11 +96,18 @@ class template {
        var $backGroundImage = '';              // Background image of page (relative to PATH_typo3)
        var $inDocStyles_TBEstyle = ''; // Inline css styling set from TBE_STYLES array
 
+       /**
+        * Whether to use the X-UA-Compatible meta tag
+        * @var boolean
+        */
+       protected $useCompatibilityTag = TRUE;
+
                // Skinning
                // stylesheets from core
        protected $stylesheetsCore = array(
                'structure' => 'stylesheets/structure/',
                'visual' => 'stylesheets/visual/',
+               'generatedSprites' => '../typo3temp/sprites/',
        );
 
                // include these CSS directories from skins by default
@@ -208,8 +116,16 @@ class template {
                'visual' => 'stylesheets/visual/',
        );
 
+       /**
+        * JavaScript files loaded for every page in the Backend
+        * @var array
+        */
+       protected $jsFiles = array(
+               'modernizr' => 'contrib/modernizr/modernizr.min.js',
+       );
+
                // DEV:
-       var $parseTimeFlag = 0;                 // Will output the parsetime of the scripts in milliseconds (for admin-users). Set this to false when releasing TYPO3. Only for dev.
+       var $parseTimeFlag = 0;                 // Will output the parsetime of the scripts in milliseconds (for admin-users). Set this to FALSE when releasing TYPO3. Only for dev.
 
                // INTERNAL
        var $charset = 'iso-8859-1';    // Default charset. see function initCharset()
@@ -220,7 +136,7 @@ class template {
        var $pageHeaderBlock = '';
        var $endOfPageJsBlock = '';
 
-       var $hasDocheader = true;
+       var $hasDocheader = TRUE;
 
        /**
         * @var t3lib_PageRenderer
@@ -228,6 +144,8 @@ class template {
        protected $pageRenderer;
        protected $pageHeaderFooterTemplateFile = '';   // alternative template file
 
+       protected $extDirectStateProvider = FALSE;
+
        /**
         * Whether flashmessages should be rendered or not
         *
@@ -237,13 +155,11 @@ class template {
 
        /**
         * Constructor
-        * Imports relevant parts from global $TBE_STYLES (colorscheme)
+        * Imports relevant parts from global $GLOBALS['TBE_STYLES'] (colorscheme)
         *
         * @return      void
         */
-       function template()     {
-               global $TBE_STYLES;
-
+       function __construct()  {
                        // Initializes the page rendering object:
                $this->getPageRenderer();
 
@@ -260,27 +176,27 @@ class template {
                $this->bodyTagId = preg_replace('/[^A-Za-z0-9-]/','-',$this->scriptID);
 
                        // Individual configuration per script? If so, make a recursive merge of the arrays:
-               if (is_array($TBE_STYLES['scriptIDindex'][$this->scriptID]))    {
-                       $ovr = $TBE_STYLES['scriptIDindex'][$this->scriptID];           // Make copy
-                       $TBE_STYLES = t3lib_div::array_merge_recursive_overrule($TBE_STYLES,$ovr);              // merge styles.
-                       unset($TBE_STYLES['scriptIDindex'][$this->scriptID]);   // Have to unset - otherwise the second instantiation will do it again!
+               if (is_array($GLOBALS['TBE_STYLES']['scriptIDindex'][$this->scriptID])) {
+                       $ovr = $GLOBALS['TBE_STYLES']['scriptIDindex'][$this->scriptID];                // Make copy
+                       $GLOBALS['TBE_STYLES'] = t3lib_div::array_merge_recursive_overrule($GLOBALS['TBE_STYLES'],$ovr);                // merge styles.
+                       unset($GLOBALS['TBE_STYLES']['scriptIDindex'][$this->scriptID]);        // Have to unset - otherwise the second instantiation will do it again!
                }
 
                        // Color scheme:
-               if ($TBE_STYLES['mainColors']['bgColor'])       $this->bgColor=$TBE_STYLES['mainColors']['bgColor'];
-               if ($TBE_STYLES['mainColors']['bgColor1'])      $this->bgColor1=$TBE_STYLES['mainColors']['bgColor1'];
-               if ($TBE_STYLES['mainColors']['bgColor2'])      $this->bgColor2=$TBE_STYLES['mainColors']['bgColor2'];
-               if ($TBE_STYLES['mainColors']['bgColor3'])      $this->bgColor3=$TBE_STYLES['mainColors']['bgColor3'];
-               if ($TBE_STYLES['mainColors']['bgColor4'])      $this->bgColor4=$TBE_STYLES['mainColors']['bgColor4'];
-               if ($TBE_STYLES['mainColors']['bgColor5'])      $this->bgColor5=$TBE_STYLES['mainColors']['bgColor5'];
-               if ($TBE_STYLES['mainColors']['bgColor6'])      $this->bgColor6=$TBE_STYLES['mainColors']['bgColor6'];
-               if ($TBE_STYLES['mainColors']['hoverColor'])    $this->hoverColor=$TBE_STYLES['mainColors']['hoverColor'];
+               if ($GLOBALS['TBE_STYLES']['mainColors']['bgColor'])    $this->bgColor=$GLOBALS['TBE_STYLES']['mainColors']['bgColor'];
+               if ($GLOBALS['TBE_STYLES']['mainColors']['bgColor1'])   $this->bgColor1=$GLOBALS['TBE_STYLES']['mainColors']['bgColor1'];
+               if ($GLOBALS['TBE_STYLES']['mainColors']['bgColor2'])   $this->bgColor2=$GLOBALS['TBE_STYLES']['mainColors']['bgColor2'];
+               if ($GLOBALS['TBE_STYLES']['mainColors']['bgColor3'])   $this->bgColor3=$GLOBALS['TBE_STYLES']['mainColors']['bgColor3'];
+               if ($GLOBALS['TBE_STYLES']['mainColors']['bgColor4'])   $this->bgColor4=$GLOBALS['TBE_STYLES']['mainColors']['bgColor4'];
+               if ($GLOBALS['TBE_STYLES']['mainColors']['bgColor5'])   $this->bgColor5=$GLOBALS['TBE_STYLES']['mainColors']['bgColor5'];
+               if ($GLOBALS['TBE_STYLES']['mainColors']['bgColor6'])   $this->bgColor6=$GLOBALS['TBE_STYLES']['mainColors']['bgColor6'];
+               if ($GLOBALS['TBE_STYLES']['mainColors']['hoverColor']) $this->hoverColor=$GLOBALS['TBE_STYLES']['mainColors']['hoverColor'];
 
                        // Main Stylesheets:
-               if ($TBE_STYLES['stylesheet'])  $this->styleSheetFile = $TBE_STYLES['stylesheet'];
-               if ($TBE_STYLES['stylesheet2']) $this->styleSheetFile2 = $TBE_STYLES['stylesheet2'];
-               if ($TBE_STYLES['styleSheetFile_post']) $this->styleSheetFile_post = $TBE_STYLES['styleSheetFile_post'];
-               if ($TBE_STYLES['inDocStyles_TBEstyle'])        $this->inDocStyles_TBEstyle = $TBE_STYLES['inDocStyles_TBEstyle'];
+               if ($GLOBALS['TBE_STYLES']['stylesheet'])       $this->styleSheetFile = $GLOBALS['TBE_STYLES']['stylesheet'];
+               if ($GLOBALS['TBE_STYLES']['stylesheet2'])      $this->styleSheetFile2 = $GLOBALS['TBE_STYLES']['stylesheet2'];
+               if ($GLOBALS['TBE_STYLES']['styleSheetFile_post'])      $this->styleSheetFile_post = $GLOBALS['TBE_STYLES']['styleSheetFile_post'];
+               if ($GLOBALS['TBE_STYLES']['inDocStyles_TBEstyle'])     $this->inDocStyles_TBEstyle = $GLOBALS['TBE_STYLES']['inDocStyles_TBEstyle'];
 
                        // include all stylesheets
                foreach ($this->getSkinStylesheetDirectories() as $stylesheetDirectory) {
@@ -288,9 +204,21 @@ class template {
                }
 
                        // Background image
-               if ($TBE_STYLES['background'])  $this->backGroundImage = $TBE_STYLES['background'];
+               if ($GLOBALS['TBE_STYLES']['background'])       $this->backGroundImage = $GLOBALS['TBE_STYLES']['background'];
        }
 
+       /**
+        * Compatibility constructor.
+        *
+        * @deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8. Use __construct() instead.
+        */
+       public function template() {
+               t3lib_div::logDeprecatedFunction();
+                       // Note: we cannot call $this->__construct() here because it would call the derived class constructor and cause recursion
+                       // This code uses official PHP behavior (http://www.php.net/manual/en/language.oop5.basic.php) when $this in the
+                       // statically called non-static method inherits $this from the caller's scope.
+               template::__construct();
+       }
 
        /**
         * Gets instance of PageRenderer
@@ -305,13 +233,30 @@ class template {
                        );
                        $this->pageRenderer->setLanguage($GLOBALS['LANG']->lang);
                        $this->pageRenderer->enableConcatenateFiles();
+                       $this->pageRenderer->enableCompressCss();
+                       $this->pageRenderer->enableCompressJavascript();
+
+                               // add all JavaScript files defined in $this->jsFiles to the PageRenderer
+                       foreach ($this->jsFiles as $file) {
+                               $this->pageRenderer->addJsFile($GLOBALS['BACK_PATH'] . $file);
+                       }
+               }
+               if (intval($GLOBALS['TYPO3_CONF_VARS']['BE']['debug']) === 1) {
+                       $this->pageRenderer->enableDebugMode();
                }
                return $this->pageRenderer;
        }
 
 
 
-
+   /**
+        * Sets inclusion of StateProvider
+        *
+        * @return void
+        */
+       public function setExtDirectStateProvider() {
+               $this->extDirectStateProvider = TRUE;
+       }
 
 
 
@@ -334,7 +279,7 @@ class template {
         * The link will load the top frame with the parameter "&item" which is the table,uid and listFr arguments imploded by "|": rawurlencode($table.'|'.$uid.'|'.$listFr)
         *
         * @param       string          String to be wrapped in link, typ. image tag.
-        * @param       string          Table name/File path. If the icon is for a database record, enter the tablename from $TCA. If a file then enter the absolute filepath
+        * @param       string          Table name/File path. If the icon is for a database record, enter the tablename from $GLOBALS['TCA']. If a file then enter the absolute filepath
         * @param       integer         If icon is for database record this is the UID for the record from $table
         * @param       boolean         Tells the top frame script that the link is coming from a "list" frame which means a frame from within the backend content frame.
         * @param       string          Additional GET parameters for the link to alt_clickmenu.php
@@ -360,15 +305,16 @@ class template {
         * @return      string          HTML string with linked icon(s)
         */
        function viewPageIcon($id,$backPath,$addParams='hspace="3"')    {
-               global $BE_USER;
-               $str = '';
+
                        // If access to Web>List for user, then link to that module.
-               if ($BE_USER->check('modules','web_list'))      {
-                       $href=$backPath.'db_list.php?id='.$id.'&returnUrl='.rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'));
-                       $str.= '<a href="'.htmlspecialchars($href).'">'.
-                                       '<img'.t3lib_iconWorks::skinImg($backPath,'gfx/list.gif','width="11" height="11"').' title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.showList',1).'"'.($addParams?' '.trim($addParams):'').' alt="" />'.
-                                       '</a>';
-               }
+               $str = t3lib_BEfunc::getListViewLink(
+                       array(
+                               'id' => $id,
+                               'returnUrl' => t3lib_div::getIndpEnv('REQUEST_URI'),
+                       ),
+                       $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.showList')
+               );
+
                        // Make link to view page
                $str.= '<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::viewOnClick($id,$backPath,t3lib_BEfunc::BEgetRootLine($id))).'">'.
                                '<img'.t3lib_iconWorks::skinImg($backPath,'gfx/zoom.gif','width="12" height="12"').' title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.showPage',1).'"'.($addParams?' '.trim($addParams):"").' hspace="3" alt="" />'.
@@ -387,15 +333,18 @@ class template {
         */
        function issueCommand($params,$rUrl='') {
                $rUrl = $rUrl ? $rUrl : t3lib_div::getIndpEnv('REQUEST_URI');
-               return $this->backPath.'tce_db.php?'.
-                               $params.
-                               '&redirect='.($rUrl==-1?"'+T3_THIS_LOCATION+'":rawurlencode($rUrl)).
-                               '&vC='.rawurlencode($GLOBALS['BE_USER']->veriCode()).
+               $commandUrl = $this->backPath.'tce_db.php?' .
+                               $params .
+                               '&redirect=' . ($rUrl==-1 ? "'+T3_THIS_LOCATION+'" : rawurlencode($rUrl)) .
+                               '&vC='.rawurlencode($GLOBALS['BE_USER']->veriCode()) .
+                               t3lib_BEfunc::getUrlToken('tceAction') .
                                '&prErr=1&uPT=1';
+
+               return $commandUrl;
        }
 
        /**
-        * Returns true if click-menu layers can be displayed for the current user/browser
+        * Returns TRUE if click-menu layers can be displayed for the current user/browser
         * Use this to test if click-menus (context sensitive menus) can and should be displayed in the backend.
         *
         * @return      boolean
@@ -409,8 +358,10 @@ class template {
         * Use this in links to remove the underlining after being clicked
         *
         * @return      string
+        * @deprecated since TYPO3 4.5, will be removed in TYPO3 4.7
         */
        function thisBlur()     {
+               t3lib_div::logDeprecatedFunction();
                return ($GLOBALS['CLIENT']['FORMSTYLE']?'this.blur();':'');
        }
 
@@ -419,8 +370,10 @@ class template {
         * Use for <a>-links to help texts
         *
         * @return      string
+        * @deprecated since TYPO3 4.5, will be removed in TYPO3 4.7
         */
        function helpStyle()    {
+               t3lib_div::logDeprecatedFunction();
                return $GLOBALS['CLIENT']['FORMSTYLE'] ? ' style="cursor:help;"':'';
        }
 
@@ -433,19 +386,18 @@ class template {
         * @param       string          Table name
         * @param       array           Record row
         * @param       string          Alt text
-        * @param       boolean         Set $noViewPageIcon true if you don't want a magnifier-icon for viewing the page in the frontend
+        * @param       boolean         Set $noViewPageIcon TRUE if you don't want a magnifier-icon for viewing the page in the frontend
         * @param       array           $tWrap is an array with indexes 0 and 1 each representing HTML-tags (start/end) which will wrap the title
         * @return      string          HTML content
         */
        function getHeader($table,$row,$path,$noViewPageIcon=0,$tWrap=array('',''))     {
-               global $TCA;
                if (is_array($row) && $row['uid'])      {
-                       $iconImgTag=t3lib_iconWorks::getIconImage($table,$row,$this->backPath,'title="'.htmlspecialchars($path).'"');
-                       $title= strip_tags($row[$TCA[$table]['ctrl']['label']]);
+                       $iconImgTag=t3lib_iconWorks::getSpriteIconForRecord($table, $row , array('title' => htmlspecialchars($path)));
+                       $title = strip_tags(t3lib_BEfunc::getRecordTitle($table, $row));
                        $viewPage = $noViewPageIcon ? '' : $this->viewPageIcon($row['uid'],$this->backPath,'');
                        if ($table=='pages')    $path.=' - '.t3lib_BEfunc::titleAttribForPages($row,'',0);
                } else {
-                       $iconImgTag='<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/i/_icon_website.gif',$wHattribs='width="18" height="16"').' title="'.htmlspecialchars($path).'" alt="" />';
+                       $iconImgTag = t3lib_iconWorks::getSpriteIcon('apps-pagetree-page-domain', array('title' => htmlspecialchars($path)));
                        $title=$GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'];
                }
 
@@ -465,7 +417,7 @@ class template {
         */
        function getFileheader($title,$path,$iconfile)  {
                $fileInfo = t3lib_div::split_fileref($title);
-               $title = htmlspecialchars(t3lib_div::fixed_lgd_cs($fileInfo['path'],-35)).'<b>'.htmlspecialchars($fileInfo['file']).'</b>';
+               $title = htmlspecialchars(t3lib_div::fixed_lgd_cs($fileInfo['path'],-35)).'<strong>'.htmlspecialchars($fileInfo['file']).'</strong>';
                return '<span class="typo3-moduleHeader"><img'.t3lib_iconWorks::skinImg($this->backPath,$iconfile,'width="18" height="16"').' title="'.htmlspecialchars($path).'" alt="" />'.$title.'</span>';
        }
 
@@ -495,13 +447,14 @@ class template {
                } else $mMN='';
 
                $onClick = 'top.ShortcutManager.createShortcut('
-                       .$GLOBALS['LANG']->JScharCode($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.makeShortcut')).', '
+                       .$GLOBALS['LANG']->JScharCode($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.makeBookmark')).', '
                        .'\''.$backPath.'\', '
                        .'\''.rawurlencode($modName).'\', '
                        .'\''.rawurlencode($pathInfo['path']."?".$storeUrl).$mMN.'\''
                .');return false;';
 
-               $sIcon = '<a href="#" onclick="'.htmlspecialchars($onClick).'"><img'.t3lib_iconWorks::skinImg($backPath,'gfx/shortcut.gif','width="14" height="14"').' title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.makeShortcut',1).'" alt="" /></a>';
+               $sIcon = '<a href="#" onclick="' . htmlspecialchars($onClick).'" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.makeBookmark', TRUE) . '">'
+                       . t3lib_iconworks::getSpriteIcon('actions-system-shortcut-new') . '</a>';
                return $sIcon;
        }
 
@@ -588,7 +541,7 @@ class template {
                ));
 
                $out ="
-       var T3_RETURN_URL = '".str_replace('%20','',rawurlencode(t3lib_div::_GP('returnUrl')))."';
+       var T3_RETURN_URL = '".str_replace('%20','',rawurlencode(t3lib_div::sanitizeLocalUrl(t3lib_div::_GP('returnUrl'))))."';
        var T3_THIS_LOCATION = '".str_replace('%20','',rawurlencode($thisLocation))."';
                ";
                return $out;
@@ -626,6 +579,16 @@ class template {
                }
        }
 
+       /**
+        * Defines whether to use the X-UA-Compatible meta tag.
+        *
+        * @param boolean $useCompatibilityTag Whether to use the tag
+        * @return void
+        */
+       public function useCompatibilityTag($useCompatibilityTag = TRUE) {
+               $this->useCompatibilityTag = (bool) $useCompatibilityTag;
+       }
+
 
 
 
@@ -649,10 +612,11 @@ class template {
         * This includes the proper header with charset, title, meta tag and beginning body-tag.
         *
         * @param       string          HTML Page title for the header
+        * @param       boolean         flag for including CSH
         * @return      string          Returns the whole header section of a HTML-document based on settings in internal variables (like styles, javascript code, charset, generator and docType)
         * @see endPage()
         */
-       function startPage($title)      {
+       function startPage($title, $includeCsh = TRUE) {
                        // hook pre start page
                if (isset($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/template.php']['preStartPageHook'])) {
                        $preStartPageHook =& $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/template.php']['preStartPageHook'];
@@ -683,12 +647,14 @@ class template {
                header ('Content-Type:text/html;charset='.$this->charset);
 
                        // Standard HTML tag
-               $this->pageRenderer->setHtmlTag('<html xmlns="http://www.w3.org/1999/xhtml">');
+               $htmlTag = '<html xmlns="http://www.w3.org/1999/xhtml">';
 
                switch($this->docType)  {
                        case 'html_3':
                                $headerStart = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">';
                                $htmlTag = '<html>';
+                               // disable rendering of XHTML tags
+                               $this->getPageRenderer()->setRenderXhtml(FALSE);
                                break;
                        case 'xhtml_strict':
                                $headerStart = '<!DOCTYPE html
@@ -697,23 +663,37 @@ class template {
                                break;
                        case 'xhtml_frames':
                                $headerStart = '<!DOCTYPE html
-     PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">';
+       PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
+       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">';
                                break;
-                       // The fallthrough is intended as XHTML 1.0 transitional is the default for the BE.
                        case 'xhtml_trans':
-                       default:
                                $headerStart = '<!DOCTYPE html
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">';
+                               break;
+                       case 'html5':
+                       default:
+                                       // The fallthrough is intended as HTML5, as this is the default for the BE since TYPO3 4.5
+                               $headerStart = '<!DOCTYPE html>' . LF;
+                               $htmlTag = '<html>';
+                               // disable rendering of XHTML tags
+                               $this->getPageRenderer()->setRenderXhtml(FALSE);
+                               break;
                }
 
+               $this->pageRenderer->setHtmlTag($htmlTag);
+
                // This loads the tabulator-in-textarea feature. It automatically modifies
                // every textarea which is found.
                if (!$GLOBALS['BE_USER']->uc['disableTabInTextarea']) {
                        $this->loadJavascriptLib('tab.js');
                }
 
+                       // include the JS for the Context Sensitive Help
+               if ($includeCsh) {
+                       $this->loadCshJavascript();
+               }
+
                        // Get the browser info
                $browserInfo = t3lib_utility_Client::getBrowserInfo(t3lib_div::getIndpEnv('HTTP_USER_AGENT'));
 
@@ -724,7 +704,7 @@ class template {
                $xmlStylesheet = '<?xml-stylesheet href="#internalStyle" type="text/css"?>';
 
                        // Add the XML prologue for XHTML doctypes
-               if ($this->docType !== 'html_3') {
+               if (strpos($this->docType, 'xhtml') !== FALSE) {
                                // Put the XML prologue before or after the doctype declaration according to browser
                        if ($browserInfo['browser'] === 'msie' && $browserInfo['version'] < 7) {
                                $headerStart = $headerStart . LF . $xmlPrologue;
@@ -742,14 +722,39 @@ class template {
                $this->pageRenderer->setHeadTag('<head>' . LF. '<!-- TYPO3 Script ID: '.htmlspecialchars($this->scriptID).' -->');
                $this->pageRenderer->setCharSet($this->charset);
                $this->pageRenderer->addMetaTag($this->generator());
-               $this->pageRenderer->addMetaTag($this->xUaCompatible());
+               if ($this->useCompatibilityTag) {
+                       $this->pageRenderer->addMetaTag($this->xUaCompatible());
+               }
                $this->pageRenderer->setTitle($title);
 
                // add docstyles
                $this->docStyle();
 
+          if ($this->extDirectStateProvider) {
+                       $this->pageRenderer->addJsFile($this->backPath . '../t3lib/js/extjs/ExtDirect.StateProvider.js');
+               }
+
+                       // add jsCode for overriding the console with a debug panel connection
+               $this->pageRenderer->addJsInlineCode(
+                       'consoleOverrideWithDebugPanel',
+                       'if (typeof top.Ext === "object") {
+                               top.Ext.onReady(function() {
+                                       if (typeof console === "undefined") {
+                                               if (top && top.TYPO3 && top.TYPO3.Backend && top.TYPO3.Backend.DebugConsole) {
+                                                       console = top.TYPO3.Backend.DebugConsole;
+                                               } else {
+                                                       console = {
+                                                               log: Ext.log,
+                                                               info: Ext.log,
+                                                               warn: Ext.log,
+                                                               error: Ext.log
+                                                       };
+                                               }
+                                       }
+                               });
+                       }
+               ');
 
-               // add jsCode - has to go to headerData as it may contain the script tags already
                $this->pageRenderer->addHeaderData($this->JScode);
 
                foreach ($this->JScodeArray as $name => $code) {
@@ -766,6 +771,19 @@ class template {
                        $this->pageRenderer->addExtOnReadyCode($this->extJScode);
                }
 
+                       // hook for additional headerData
+               if (isset($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/template.php']['preHeaderRenderHook'])) {
+                       $preHeaderRenderHook =& $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/template.php']['preHeaderRenderHook'];
+                       if (is_array($preHeaderRenderHook)) {
+                               $hookParameters = array(
+                                       'pageRenderer' => &$this->pageRenderer,
+                               );
+                               foreach ($preHeaderRenderHook as $hookFunction) {
+                                       t3lib_div::callUserFunction($hookFunction, $hookParameters, $this);
+                               }
+                       }
+               }
+
                        // Construct page header.
                $str = $this->pageRenderer->render(t3lib_PageRenderer::PART_HEADER);
 
@@ -782,8 +800,8 @@ $str.=$this->docBodyTagBegin().
 ($this->divClass?'
 
 <!-- Wrapping DIV-section for whole page BEGIN -->
-<div class="'.$this->divClass.'">
-':'').trim($this->form);
+<div class="' . $this->divClass . '">
+' : '' ) . trim($this->form);
                return $str;
        }
 
@@ -807,23 +825,38 @@ $str.=$this->docBodyTagBegin().
                        header('Content-Encoding: None');
                }
 
-               if ($this->docType!='xhtml_frames') {
+               if ($this->docType !== 'xhtml_frames') {
 
                        $str .= ($this->divClass?'
 
 <!-- Wrapping DIV-section for whole page END -->
 </div>':'') . $this->endOfPageJsBlock ;
-
                }
 
 
                        // Logging: Can't find better place to put it:
-               if (TYPO3_DLOG) t3lib_div::devLog('END of BACKEND session', 'template', 0, array('_FLUSH' => true));
+               if (TYPO3_DLOG) t3lib_div::devLog('END of BACKEND session', 'template', 0, array('_FLUSH' => TRUE));
 
                return $str;
        }
 
        /**
+        * Shortcut for render the complete page of a module
+        *
+        * @param  $title  page title
+        * @param  $content  page content
+        * @param bool $includeCsh  flag for including csh code
+        * @return string complete page
+        */
+       public function render($title, $content, $includeCsh = TRUE)  {
+               $pageContent = $this->startPage($title, $includeCsh);
+               $pageContent .= $content;
+               $pageContent .= $this->endPage();
+
+               return $this->insertStylesAndJS($pageContent);
+       }
+
+       /**
         * Returns the header-bar in the top of most backend modules
         * Closes section if open.
         *
@@ -925,7 +958,7 @@ $str.=$this->docBodyTagBegin().
 
        /**
         * Begins an output section.
-        * Returns the <div>-begin tag AND sets the ->sectionFlag true (if the ->sectionFlag is not already set!)
+        * Returns the <div>-begin tag AND sets the ->sectionFlag TRUE (if the ->sectionFlag is not already set!)
         * You can call this function even if a section is already begun since the function will only return something if the sectionFlag is not already set!
         *
         * @return      string          HTML content
@@ -964,19 +997,8 @@ $str.=$this->docBodyTagBegin().
        }
 
        /**
-        * Originally it printed a kind of divider.
-        * Deprecated. Just remove function calls to it or call the divider() function instead.
-        *
-        * @return      void
-        * @internal
-        * @deprecated since TYPO3 3.6
-        */
-       function middle()       {
-       }
-
-       /**
         * If a form-tag is defined in ->form then and end-tag for that <form> element is outputted
-        * Further a JavaScript section is outputted which will update the top.busy session-expiry object (unless $this->endJS is set to false)
+        * Further a JavaScript section is outputted which will update the top.busy session-expiry object (unless $this->endJS is set to FALSE)
         *
         * @return      string          HTML content (<script> tag section)
         */
@@ -1113,7 +1135,7 @@ $str.=$this->docBodyTagBegin().
                                $skinStylesheetDirs = $this->stylesheetsSkins;
 
                                        // skins can add custom stylesheetDirectories using
-                                       // $TBE_STYLES['skins'][$_EXTKEY]['stylesheetDirectories']
+                                       // $GLOBALS['TBE_STYLES']['skins'][$_EXTKEY]['stylesheetDirectories']
                                if (is_array($skin['stylesheetDirectories'])) {
                                        $skinStylesheetDirs = array_merge($skinStylesheetDirs, $skin['stylesheetDirectories']);
                                }
@@ -1156,19 +1178,18 @@ $str.=$this->docBodyTagBegin().
         * @return      string          <meta> tag with name "generator"
         */
        function generator()    {
-               $str = 'TYPO3 '.TYPO3_branch.', http://typo3.com, &#169; Kasper Sk&#229;rh&#248;j 1998-2009, extensions are copyright of their respective owners.';
+               $str = 'TYPO3 '.TYPO3_branch.', ' . TYPO3_URL_GENERAL . ', &#169; Kasper Sk&#229;rh&#248;j 1998-2009, extensions are copyright of their respective owners.';
                return '<meta name="generator" content="'.$str .'" />';
        }
 
        /**
         * Returns X-UA-Compatible meta tag
         *
+        * @param       string          $content Content of the compatible tag (default: IE-8)
         * @return      string          <meta http-equiv="X-UA-Compatible" content="???" />
         */
-       function xUaCompatible() {
-                       // the most recent version if Internet Explorer, in which the Backend works
-               $str = "IE=8";
-               return '<meta http-equiv="X-UA-Compatible" content="' . $str . '" />';
+       public function xUaCompatible($content = 'IE=8') {
+               return '<meta http-equiv="X-UA-Compatible" content="' . $content . '" />';
        }
 
 
@@ -1201,22 +1222,22 @@ $str.=$this->docBodyTagBegin().
        function icons($type, $styleAttribValue='')     {
                switch($type)   {
                        case '3':
-                               $icon = 'gfx/icon_fatalerror.gif';
+                               $icon = 'status-dialog-error';
                        break;
                        case '2':
-                               $icon = 'gfx/icon_warning.gif';
+                               $icon = 'status-dialog-warning';
                        break;
                        case '1':
-                               $icon = 'gfx/icon_note.gif';
+                               $icon = 'status-dialog-notification';
                        break;
                        case '-1':
-                               $icon = 'gfx/icon_ok.gif';
+                               $icon = 'status-dialog-ok';
                        break;
                        default:
                        break;
                }
                if ($icon)      {
-                       return '<img'.t3lib_iconWorks::skinImg($this->backPath,$icon,'width="18" height="16"').' class="absmiddle"'.($styleAttribValue ? ' style="'.htmlspecialchars($styleAttribValue).'"' : '').' alt="" />';
+                       return t3lib_iconWorks::getSpriteIcon($icon);
                }
        }
 
@@ -1304,7 +1325,7 @@ $str.=$this->docBodyTagBegin().
                )
        );
        var $table_TR = '<tr>';
-       var $table_TABLE = '<table border="0" cellspacing="0" cellpadding="0" id="typo3-tmpltable">';
+       var $table_TABLE = '<table border="0" cellspacing="0" cellpadding="0" class="typo3-dblist" id="typo3-tmpltable">';
 
        /**
         * Returns a table based on the input $data
@@ -1410,28 +1431,37 @@ $str.=$this->docBodyTagBegin().
         * @return      string          <select> tag with content - a selector box for clearing the cache
         */
        function clearCacheMenu($id,$addSaveOptions=0)  {
-               global $BE_USER;
                $opt=array();
                if ($addSaveOptions)    {
                        $opt[]='<option value="">'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.menu',1).'</option>';
                        $opt[]='<option value="TBE_EDITOR.checkAndDoSubmit(1);">'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.saveDoc',1).'</option>';
                        $opt[]='<option value="document.editform.closeDoc.value=-2; TBE_EDITOR.checkAndDoSubmit(1);">'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.saveCloseDoc',1).'</option>';
-                       if ($BE_USER->uc['allSaveFunctions'])   $opt[]='<option value="document.editform.closeDoc.value=-3; TBE_EDITOR.checkAndDoSubmit(1);">'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.saveCloseAllDocs',1).'</option>';
+                       if ($GLOBALS['BE_USER']->uc['allSaveFunctions']) {
+                               $opt[] = '<option value="document.editform.closeDoc.value=-3; TBE_EDITOR.checkAndDoSubmit(1);">' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.saveCloseAllDocs', 1) . '</option>';
+                       }
                        $opt[]='<option value="document.editform.closeDoc.value=2; document.editform.submit();">'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.closeDoc',1).'</option>';
                        $opt[]='<option value="document.editform.closeDoc.value=3; document.editform.submit();">'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.closeAllDocs',1).'</option>';
                        $opt[]='<option value=""></option>';
                }
                $opt[]='<option value="">[ '.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.clearCache_clearCache',1).' ]</option>';
                if ($id) $opt[]='<option value="'.$id.'">'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.clearCache_thisPage',1).'</option>';
-               if ($BE_USER->isAdmin() || $BE_USER->getTSConfigVal('options.clearCache.pages')) $opt[]='<option value="pages">'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.clearCache_pages',1).'</option>';
-               if ($BE_USER->isAdmin() || $BE_USER->getTSConfigVal('options.clearCache.all')) $opt[]='<option value="all">'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.clearCache_all',1).'</option>';
+               if ($GLOBALS['BE_USER']->isAdmin() || $GLOBALS['BE_USER']->getTSConfigVal('options.clearCache.pages')) {
+                       $opt[] = '<option value="pages">' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.clearCache_pages', 1) . '</option>';
+               }
+               if ($GLOBALS['BE_USER']->isAdmin() || $GLOBALS['BE_USER']->getTSConfigVal('options.clearCache.all')) {
+                       $opt[] = '<option value="all">' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.clearCache_all', 1) . '</option>';
+               }
 
                $onChange = 'if (!this.options[this.selectedIndex].value) {
                                this.selectedIndex=0;
                        } else if (this.options[this.selectedIndex].value.indexOf(\';\')!=-1) {
                                eval(this.options[this.selectedIndex].value);
-                       }else{
-                               window.location.href=\''.$this->backPath.'tce_db.php?vC='.$BE_USER->veriCode().'&redirect='.rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI')).'&cacheCmd=\'+this.options[this.selectedIndex].value;
+                       } else {
+                               window.location.href=\'' . $this->backPath .
+                                               'tce_db.php?vC=' . $GLOBALS['BE_USER']->veriCode() .
+                                               t3lib_BEfunc::getUrlToken('tceAction') .
+                                               '&redirect=' . rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI')) .
+                                               '&cacheCmd=\'+this.options[this.selectedIndex].value;
                        }';
                $af_content = '<select name="cacheCmd" onchange="'.htmlspecialchars($onChange).'">'.implode('',$opt).'</select>';
 
@@ -1496,6 +1526,16 @@ $str.=$this->docBodyTagBegin().
               return array('','','');
        }
 
+        /**
+        * This loads everything needed for the Context Sensitive Help (CSH)
+        *
+        * @return void
+        */
+       protected function loadCshJavascript() {
+               $this->pageRenderer->loadExtJS();
+               $this->pageRenderer->addJsFile($this->backPath .'../t3lib/js/extjs/contexthelp.js');
+               $this->pageRenderer->addExtDirectCode();
+       }
 
        /**
         * Creates a tab menu from an array definition
@@ -1510,7 +1550,7 @@ $str.=$this->docBodyTagBegin().
         * @param       string          $script is the script to send the &id to, if empty it's automatically found
         * @param       string          $addParams is additional parameters to pass to the script.
         * @return      string          HTML code for tab menu
-        * @author      Rene Fritz <r.fritz@colorcube.de>
+        * @author      René Fritz <r.fritz@colorcube.de>
         */
        function getTabMenu($mainParams,$elementName,$currentValue,$menuItems,$script='',$addparams='') {
                $content='';
@@ -1559,7 +1599,6 @@ $str.=$this->docBodyTagBegin().
                        $widthAct = $widthNo + $addToAct;
                        $widthRight = 100 - ($widthLeft + ($count*$widthNo) + $addToAct);
 
-                       $first=true;
                        foreach($menuItems as $id => $def) {
                                $isActive = $def['isActive'];
                                $class = $isActive ? 'tabact' : 'tab';
@@ -1570,14 +1609,7 @@ $str.=$this->docBodyTagBegin().
                                $url = htmlspecialchars($def['url']);
                                $params = $def['addParams'];
 
-                               if($first) {
-                                       $options.= '
-                                                       <td width="'.$width.'%" class="'.$class.'" style="border-left: solid #000 1px;"><a href="'.$url.'" style="padding-left:5px;padding-right:2px;" '.$params.'>'.$label.'</a></td>';
-                               } else {
-                                       $options.='
-                                                       <td width="'.$width.'%" class="'.$class.'"><a href="'.$url.'" '.$params.'>'.$label.'</a></td>';
-                               }
-                               $first=false;
+                               $options .= '<td width="' . $width . '%" class="' . $class . '"><a href="' . $url . '" ' . $params . '>' . $label . '</a></td>';
                        }
 
                        if ($options)   {
@@ -1605,15 +1637,15 @@ $str.=$this->docBodyTagBegin().
         * @param       string          Identification string. This should be unique for every instance of a dynamic menu!
         * @param       integer         If "1", then enabling one tab does not hide the others - they simply toggles each sheet on/off. This makes most sense together with the $foldout option. If "-1" then it acts normally where only one tab can be active at a time BUT you can click a tab and it will close so you have no active tabs.
         * @param       boolean         If set, the tabs are rendered as headers instead over each sheet. Effectively this means there is no tab menu, but rather a foldout/foldin menu. Make sure to set $toggle as well for this option.
-        * @param       integer         Character limit for a new row.
+        * @param       integer         Character limit for a new row, 0 by default, because this parameter is deprecated since TYPO3 4.5
         * @param       boolean         If set, tab table cells are not allowed to wrap their content
         * @param       boolean         If set, the tabs will span the full width of their position
         * @param       integer         Default tab to open (for toggle <=0). Value corresponds to integer-array index + 1 (index zero is "1", index "1" is 2 etc.). A value of zero (or something non-existing) will result in no default tab open.
         * @param       integer         If set to '1' empty tabs will be remove, If set to '2' empty tabs will be disabled
         * @return      string          JavaScript section for the HTML header.
         */
-       function getDynTabMenu($menuItems,$identString,$toggle=0,$foldout=FALSE,$newRowCharLimit=50,$noWrap=1,$fullWidth=FALSE,$defaultTabIndex=1,$dividers2tabs=2)     {
-               // load the static code, if not already done with the function below
+       public function getDynTabMenu($menuItems, $identString, $toggle = 0, $foldout = FALSE, $newRowCharLimit = 0, $noWrap = 1, $fullWidth = FALSE, $defaultTabIndex = 1, $dividers2tabs = 2) {
+                       // load the static code, if not already done with the function below
                $this->loadJavascriptLib('js/tabmenu.js');
 
                $content = '';
@@ -1632,10 +1664,12 @@ $str.=$this->docBodyTagBegin().
                        $tabRows=0;
                        $titleLenCount = 0;
                        foreach($menuItems as $index => $def) {
-                               $index+=1;      // Need to add one so checking for first index in JavaScript is different than if it is not set at all.
+                                       // Need to add one so checking for first index in JavaScript
+                                       // is different than if it is not set at all.
+                               $index += 1;
 
                                        // Switch to next tab row if needed
-                               if (!$foldout && ($titleLenCount>$newRowCharLimit | ($def['newline'] === true && $titleLenCount > 0))) {
+                               if (!$foldout && (($newRowCharLimit > 0 && $titleLenCount > $newRowCharLimit) | ($def['newline'] === TRUE && $titleLenCount > 0))) {
                                        $titleLenCount=0;
                                        $tabRows++;
                                        $options[$tabRows] = array();
@@ -1649,7 +1683,7 @@ $str.=$this->docBodyTagBegin().
 
                                $isEmpty = !(strcmp(trim($def['content']),'') || strcmp(trim($def['icon']),''));
 
-                               // "Removes" empty tabs
+                                       // "Removes" empty tabs
                                if ($isEmpty && $dividers2tabs == 1) {
                                        continue;
                                }
@@ -1759,12 +1793,12 @@ $str.=$this->docBodyTagBegin().
         * (as long as it is called before $this->startPage())
         * The return value is not needed anymore
         *
-        * @return      string          JavaScript section for the HTML header. (return value is deprecated since TYPO3 4.3, will be removed in TYPO3 4.5)
+        * @deprecated since TYPO3 4.5, as the getDynTabMenu() function includes the function automatically since TYPO3 4.3
+        * @return      void
         */
-       function getDynTabMenuJScode()  {
+       function getDynTabMenuJScode() {
+               t3lib_div::logDeprecatedFunction();
                $this->loadJavascriptLib('js/tabmenu.js');
-               // return value deprecated since TYPO3 4.3
-               return '';
        }
 
        /**
@@ -1775,156 +1809,10 @@ $str.=$this->docBodyTagBegin().
         * @param       boolean         If set, there will be no button for swapping page.
         * @return      void
         */
-       function getVersionSelector($id,$noAction=FALSE)        {
-
-               if ($id>0)      {
-                       if (t3lib_extMgm::isLoaded('version') && $GLOBALS['BE_USER']->workspace==0)     {
-
-                                       // Get Current page record:
-                               $curPage = t3lib_BEfunc::getRecord('pages',$id);
-                                       // If the selected page is not online, find the right ID
-                               $onlineId = ($curPage['pid']==-1 ? $curPage['t3ver_oid'] : $id);
-                                       // Select all versions of online version:
-                               $versions = t3lib_BEfunc::selectVersionsOfRecord('pages', $onlineId, 'uid,pid,t3ver_label,t3ver_oid,t3ver_wsid,t3ver_id');
-
-                                       // If more than one was found...:
-                               if (count($versions)>1) {
-
-                                               // Create selector box entries:
-                                       $opt = array();
-                                       foreach($versions as $vRow)     {
-                                               $opt[] = '<option value="'.htmlspecialchars(t3lib_div::linkThisScript(array('id'=>$vRow['uid']))).'"'.($id==$vRow['uid']?' selected="selected"':'').'>'.
-                                                               htmlspecialchars($vRow['t3ver_label'].' [v#'.$vRow['t3ver_id'].', WS:'.$vRow['t3ver_wsid'].']'.($vRow['uid']==$onlineId ? ' =>'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.online').'<=':'')).
-                                                               '</option>';
-                                       }
-
-                                               // Add management link:
-                                       $opt[] = '<option value="'.htmlspecialchars(t3lib_div::linkThisScript(array('id'=>$id))).'">---</option>';
-                                       $opt[] = '<option value="'.htmlspecialchars($this->backPath.t3lib_extMgm::extRelPath('version').'cm1/index.php?table=pages&uid='.$onlineId).'">'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.mgm',1).'</option>';
-
-                                               // Create onchange handler:
-                                       $onChange = "window.location.href=this.options[this.selectedIndex].value;";
-
-                                               // Controls:
-                                       if ($id==$onlineId)     {
-                                               $controls = '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/blinkarrow_left.gif','width="5" height="9"').' class="absmiddle" alt="" /> <b>'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.online',1).'</b>';
-                                       } elseif (!$noAction) {
-                                               $controls = '<a href="'.$this->issueCommand('&cmd[pages]['.$onlineId.'][version][swapWith]='.$id.'&cmd[pages]['.$onlineId.'][version][action]=swap',t3lib_div::linkThisScript(array('id'=>$onlineId))).'" class="nobr">'.
-                                                               '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/insert1.gif','width="14" height="14"').' style="margin-right: 2px;" class="absmiddle" alt="" title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.swapPage',1).'" />'.
-                                                               '<b>'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.swap',1).'</b></a>';
-                                       }
-
-                                               // Write out HTML code:
-                                       return '
-
-                                               <!--
-                                                       Version selector:
-                                               -->
-                                               <table border="0" cellpadding="0" cellspacing="0" id="typo3-versionSelector">
-                                                       <tr>
-                                                               <td>'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.selVer',1).'</td>
-                                                               <td>
-                                                                       <select onchange="'.htmlspecialchars($onChange).'">
-                                                                               '.implode('',$opt).'
-                                                                       </select></td>
-                                                               <td>'.$controls.'</td>
-                                                       </tr>
-                                               </table>
-                                       ';
-                               }
-                       } elseif ($GLOBALS['BE_USER']->workspace!==0) {
-
-                                       // Write out HTML code:
-                               switch($GLOBALS['BE_USER']->workspace)  {
-                                       case 0:
-                                               $wsTitle = 'LIVE';
-                                       break;
-                                       case -1:
-                                               $wsTitle = 'Draft';
-                                       break;
-                                       default:
-                                               $wsTitle = $GLOBALS['BE_USER']->workspaceRec['title'];
-                                       break;
-                               }
-
-                               if (t3lib_BEfunc::isPidInVersionizedBranch($id)=='branchpoint') {
-                                       return '
-
-                                               <!--
-                                                       Version selector:
-                                               -->
-                                               <table border="0" cellpadding="0" cellspacing="0" id="typo3-versionSelector">
-                                                       <tr>
-                                                               <td>Workspace: "'.htmlspecialchars($wsTitle).'"</td>
-                                                               <td><em>Inside branch, no further versioning possible</em></td>
-                                                       </tr>
-                                               </table>
-                                       ';
-                               } else {
-                                               // Get Current page record:
-                                       $curPage = t3lib_BEfunc::getRecord('pages',$id);
-                                               // If the selected page is not online, find the right ID
-                                       $onlineId = ($curPage['pid']==-1 ? $curPage['t3ver_oid'] : $id);
-                                               // The version of page:
-                                       $verPage = t3lib_BEfunc::getWorkspaceVersionOfRecord($GLOBALS['BE_USER']->workspace, 'pages', $onlineId);
-
-                                       if (!$verPage)  {
-
-                                               if (!count(t3lib_BEfunc::countVersionsOfRecordsOnPage($GLOBALS['BE_USER']->workspace, $onlineId)))      {
-                                                       if ($GLOBALS['BE_USER']->workspaceVersioningTypeAccess(0))      {
-
-                                                               $onClick = $this->issueCommand('&cmd[pages]['.$onlineId.'][version][action]=new&cmd[pages]['.$onlineId.'][version][treeLevels]=0',t3lib_div::linkThisScript(array('id'=>$onlineId)));
-                                                               $onClick = 'window.location.href=\''.$onClick.'\'; return false;';
-                                                                       // Write out HTML code:
-                                                               return '
-
-                                                                       <!--
-                                                                               No version yet, create one?
-                                                                       -->
-                                                                       <table border="0" cellpadding="0" cellspacing="0" id="typo3-versionSelector">
-                                                                               <tr>
-                                                                                       <td>Workspace: "'.htmlspecialchars($wsTitle).'"</td>
-                                                                                       <td>
-                                                                                               <input type="submit" value="New version of page" name="_" onclick="'.htmlspecialchars($onClick).'" /></td>
-                                                                               </tr>
-                                                                       </table>
-                                                               ';
-                                                       }
-                                               } else {
-                                                       return '
-
-                                                               <!--
-                                                                       Version selector:
-                                                               -->
-                                                               <table border="0" cellpadding="0" cellspacing="0" id="typo3-versionSelector">
-                                                                       <tr>
-                                                                               <td>Workspace: "'.htmlspecialchars($wsTitle).'"</td>
-                                                                               <td><em>Versions found on page, no "Page" versioning possible</em></td>
-                                                                       </tr>
-                                                               </table>
-                                                       ';
-                                               }
-                                       } elseif ($verPage['t3ver_swapmode']==0) {
-                                               $onClick = $this->issueCommand('&cmd[pages]['.$onlineId.'][version][action]=swap&cmd[pages]['.$onlineId.'][version][swapWith]='.$verPage['uid'],t3lib_div::linkThisScript(array('id'=>$onlineId)));
-                                               $onClick = 'window.location.href=\''.$onClick.'\'; return false;';
-
-                                                       // Write out HTML code:
-                                               return '
-
-                                                       <!--
-                                                               Version selector:
-                                                       -->
-                                                       <table border="0" cellpadding="0" cellspacing="0" id="typo3-versionSelector">
-                                                               <tr>
-                                                                       <td>Workspace: "'.htmlspecialchars($wsTitle).'"</td>
-                                                                       <td>
-                                                                               <input type="submit" value="Publish page" name="_" onclick="'.htmlspecialchars($onClick).'" /></td>
-                                                               </tr>
-                                                       </table>
-                                               ';
-                                       }
-                               }
-                       }
+       public function getVersionSelector($id, $noAction = FALSE) {
+               if (t3lib_extMgm::isLoaded('version')) {
+                       $versionGuiObj = t3lib_div::makeInstance('tx_version_gui');
+                       return $versionGuiObj->getVersionSelector($id, $noAction);
                }
        }
 
@@ -1936,15 +1824,24 @@ $str.=$this->docBodyTagBegin().
         * @return      string          HTML of template
         */
        function getHtmlTemplate($filename)     {
+                       // setting the name of the original HTML template
+               $this->moduleTemplateFilename = $filename;
+
                if ($GLOBALS['TBE_STYLES']['htmlTemplates'][$filename]) {
                        $filename = $GLOBALS['TBE_STYLES']['htmlTemplates'][$filename];
                }
-               if (substr($filename,0,4) != 'EXT:') {
+               if (t3lib_div::isFirstPartOfStr($filename, 'EXT:')) {
+                       $filename = t3lib_div::getFileAbsFileName($filename, TRUE, TRUE);
+               } elseif (!t3lib_div::isAbsPath($filename)) {
                        $filename = t3lib_div::resolveBackPath($this->backPath . $filename);
-               } else {
-                       $filename = t3lib_div::getFileAbsFileName($filename, true, true);
+               } elseif (!t3lib_div::isAllowedAbsPath($filename)) {
+                       $filename = '';
+               }
+               $htmlTemplate = '';
+               if ($filename !== '') {
+                       $htmlTemplate = t3lib_div::getUrl($filename);
                }
-               return t3lib_div::getURL($filename);
+               return $htmlTemplate;
        }
 
        /**
@@ -1952,7 +1849,7 @@ $str.=$this->docBodyTagBegin().
         *
         * @param       string          filename
         */
-       function setModuleTemplate($filename) {
+       public function setModuleTemplate($filename) {
                        // Load Prototype lib for IE event
                $this->pageRenderer->loadPrototype();
                $this->loadJavascriptLib('js/iecompatibility.js');
@@ -1973,20 +1870,7 @@ $str.=$this->docBodyTagBegin().
                $moduleBody = t3lib_parsehtml::getSubpart($this->moduleTemplate, '###FULLDOC###');
                        // Add CSS
                $this->inDocStylesArray[] = 'html { overflow: hidden; }';
-                       // Add JS code to the <head> for IE
-               $this->JScode.= $this->wrapScriptTags('
-                               // workaround since IE6 cannot deal with relative height for scrolling elements
-                       function resizeDocBody()        {
-                               $("typo3-docbody").style.height = (document.body.offsetHeight - parseInt($("typo3-docheader").getStyle("height")));
-                       }
-                       if (Prototype.Browser.IE) {
-                               var version = parseFloat(navigator.appVersion.split(\';\')[1].strip().split(\' \')[1]);
-                               if (version == 6) {
-                                       Event.observe(window, "resize", resizeDocBody, false);
-                                       Event.observe(window, "load", resizeDocBody, false);
-                               }
-                       }
-               ');
+
                        // Get the page path for the docheader
                $markerArray['PAGEPATH'] = $this->getPagePath($pageRecord);
                        // Get the page info for the docheader
@@ -2000,27 +1884,35 @@ $str.=$this->docBodyTagBegin().
                        $moduleBody = t3lib_parsehtml::substituteSubpart($moduleBody, $marker, $content);
                }
 
+                       // adding flash messages
                if ($this->showFlashMessages) {
-                               // adding flash messages
                        $flashMessages = t3lib_FlashMessageQueue::renderFlashMessages();
                        if (!empty($flashMessages)) {
-                               $flashMessages = '<div id="typo3-messages">' . $flashMessages . '</div>';
+                               $markerArray['FLASHMESSAGES'] = '<div id="typo3-messages">' . $flashMessages . '</div>';
+
+                                       // if there is no dedicated marker for the messages present
+                                       // then force them to appear before the content
+                               if (strpos($moduleBody, '###FLASHMESSAGES###') === FALSE) {
+                                       $moduleBody = str_replace(
+                                               '###CONTENT###',
+                                               '###FLASHMESSAGES######CONTENT###',
+                                               $moduleBody
+                                       );
+                               }
                        }
+               }
 
-                       if (strstr($moduleBody, '###FLASHMESSAGES###')) {
-                                       // either replace a dedicated marker for the messages if present
-                               $moduleBody = str_replace(
-                                       '###FLASHMESSAGES###',
-                                       $flashMessages,
-                                       $moduleBody
-                               );
-                       } else {
-                                       // or force them to appear before the content
-                               $moduleBody = str_replace(
-                                       '###CONTENT###',
-                                       $flashMessages . '###CONTENT###',
-                                       $moduleBody
-                               );
+                       // Hook for adding more markers/content to the page, like the version selector
+               if (isset($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/template.php']['moduleBodyPostProcess'])) {
+                       $params = array(
+                               'moduleTemplateFilename' => &$this->moduleTemplateFilename,
+                               'moduleTemplate' => &$this->moduleTemplate,
+                               'moduleBody' => &$moduleBody,
+                               'markers' => &$markerArray,
+                               'parentObject' => &$this
+                       );
+                       foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/template.php']['moduleBodyPostProcess'] as $funcRef) {
+                               t3lib_div::callUserFunction($funcRef, $params, $this);
                        }
                }
 
@@ -2043,7 +1935,7 @@ $str.=$this->docBodyTagBegin().
                                // Get the template for each float
                        $buttonTemplate = t3lib_parsehtml::getSubpart($this->moduleTemplate, '###BUTTON_GROUPS_' . strtoupper($key) . '###');
                                // Fill the button markers in this float
-                       $buttonTemplate = t3lib_parsehtml::substituteMarkerArray($buttonTemplate, $buttons, '###|###', true);
+                       $buttonTemplate = t3lib_parsehtml::substituteMarkerArray($buttonTemplate, $buttons, '###|###', TRUE);
                                // getting the wrap for each group
                        $buttonWrap = t3lib_parsehtml::getSubpart($this->moduleTemplate, '###BUTTON_GROUP_WRAP###');
                                // looping through the groups (max 6) and remove the empty groups
@@ -2085,10 +1977,16 @@ $str.=$this->docBodyTagBegin().
        protected function getPagePath($pageRecord) {
                        // Is this a real page
                if ($pageRecord['uid']) {
-                       $title = $pageRecord['_thePathFull'];
+                       $title = substr($pageRecord['_thePathFull'], 0, -1);
+                               // remove current page title
+                       $pos = strrpos($title, '/');
+                       if ($pos !== FALSE) {
+                               $title = substr($title, 0, $pos) . '/';
+                       }
                } else {
-                       $title = $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'];
+                       $title = '';
                }
+
                        // Setting the path of the page
                $pagePath = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.path', 1) . ': <span class="typo3-docheader-pagePath">';
 
@@ -2111,35 +2009,99 @@ $str.=$this->docBodyTagBegin().
         * @return      string  Page info
         */
        protected function getPageInfo($pageRecord) {
-               global $BE_USER;
+
                                // Add icon with clickmenu, etc:
                if ($pageRecord['uid']) {       // If there IS a real page
                        $alttext = t3lib_BEfunc::getRecordIconAltText($pageRecord, 'pages');
-                       $iconImg = t3lib_iconWorks::getIconImage('pages', $pageRecord, $this->backPath, 'class="absmiddle" title="'. htmlspecialchars($alttext) . '"');
+                       $iconImg = t3lib_iconWorks::getSpriteIconForRecord('pages', $pageRecord, array('title'=>$alttext));
                                // Make Icon:
                        $theIcon = $GLOBALS['SOBE']->doc->wrapClickMenuOnIcon($iconImg, 'pages', $pageRecord['uid']);
-                       $pid = $pageRecord['uid'];
+                       $uid = $pageRecord['uid'];
+                       $title = t3lib_BEfunc::getRecordTitle('pages', $pageRecord);
                } else {        // On root-level of page tree
                                // Make Icon
-                       $iconImg = '<img' . t3lib_iconWorks::skinImg($this->backPath, 'gfx/i/_icon_website.gif') . ' alt="' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'] . '" />';
-                       if($BE_USER->user['admin']) {
+                       $iconImg = t3lib_iconWorks::getSpriteIcon('apps-pagetree-root', array('title' => htmlspecialchars($GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'])));
+                       if ($GLOBALS['BE_USER']->user['admin']) {
                                $theIcon = $GLOBALS['SOBE']->doc->wrapClickMenuOnIcon($iconImg, 'pages', 0);
                        } else {
                                $theIcon = $iconImg;
                        }
-                       $pid = '0 (root)';
+                       $uid = '0';
+                       $title = $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'];
                }
 
                        // Setting icon with clickmenu + uid
-               $pageInfo = $theIcon . '<em>[pid: ' . $pid . ']</em>';
+               $pageInfo = $theIcon . '<strong>' . htmlspecialchars($title) . '&nbsp;[' . $uid . ']</strong>';
                return $pageInfo;
        }
 
+       /**
+        * Makes a collapseable section. See reports module for an example
+        *
+        * @param  string  $title
+        * @param  string  $html
+        * @param  string  $id
+        * @param  string $saveStatePointer
+        * @return string
+        */
+       public function collapseableSection($title, $html, $id, $saveStatePointer = '') {
+               $hasSave = $saveStatePointer ? TRUE : FALSE;
+               $collapsedStyle =  $collapsedClass = '';
+
+               if ($hasSave) {
+                       /** @var $settings extDirect_DataProvider_BackendUserSettings */
+                       $settings = t3lib_div::makeInstance('extDirect_DataProvider_BackendUserSettings');
+                       $value = $settings->get($saveStatePointer . '.' . $id);
+                       if ($value) {
+                               $collapsedStyle = ' style="display: none"';
+                               $collapsedClass = ' collapsed';
+                       } else {
+                               $collapsedStyle = '';
+                               $collapsedClass = ' expanded';
+                       }
+               }
 
+               $this->pageRenderer->loadExtJS();
+               $this->pageRenderer->addExtOnReadyCode('
+                       Ext.select("h2.section-header").each(function(element){
+                               element.on("click", function(event, tag) {
+                                       var state = 0,
+                                               el = Ext.fly(tag),
+                                               div = el.next("div"),
+                                               saveKey = el.getAttribute("rel");
+                                       if (el.hasClass("collapsed")) {
+                                               el.removeClass("collapsed").addClass("expanded");
+                                               div.slideIn("t", {
+                                                       easing: "easeIn",
+                                                       duration: .5
+                                               });
+                                       } else {
+                                               el.removeClass("expanded").addClass("collapsed");
+                                               div.slideOut("t", {
+                                                       easing: "easeOut",
+                                                       duration: .5,
+                                                       remove: false,
+                                                       useDisplay: true
+                                               });
+                                               state = 1;
+                                       }
+                                       if (saveKey) {
+                                               try {
+                                                       top.TYPO3.BackendUserSettings.ExtDirect.set(saveKey + "." + tag.id, state, function(response) {});
+                                               } catch(e) {}
+                                       }
+                               });
+                       });
+               ');
+               return '
+                 <h2 id="' . $id . '" class="section-header' . $collapsedClass . '" rel="' . $saveStatePointer . '"> ' . $title . '</h2>
+                 <div' . $collapsedStyle  . '>' . $html . '</div>
+               ';
 
+       }
 
 
-               }
+}
 
 
 // ******************************
@@ -2228,8 +2190,8 @@ class frontendDoc extends template {
 }
 
 
-if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/template.php'])     {
-       include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/template.php']);
+if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['typo3/template.php'])) {
+       include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['typo3/template.php']);
 }
 
 
@@ -2239,4 +2201,5 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/templ
 // ******************************
 $GLOBALS['TBE_TEMPLATE'] = t3lib_div::makeInstance('template');
 
+
 ?>