Index: t3lib/class.t3lib_tstemplate.php
===================================================================
--- t3lib/class.t3lib_tstemplate.php	(Revision 5716)
+++ t3lib/class.t3lib_tstemplate.php	(Arbeitskopie)
@@ -241,7 +241,10 @@
 				$this->allowedPaths[] = $p;
 			}
 		}
+		if (!$GLOBALS['USE_TIMETRACK']) {
+			$this->tt_track = 0;
 	}
+	}
 
 	/**
 	 * Fetches the "currentPageData" array from cache
Index: typo3/sysext/openid/sv1/class.tx_openid_sv1.php
===================================================================
--- typo3/sysext/openid/sv1/class.tx_openid_sv1.php	(Revision 5716)
+++ typo3/sysext/openid/sv1/class.tx_openid_sv1.php	(Arbeitskopie)
@@ -453,7 +453,7 @@
 		}
 		if (TYPO3_MODE == 'BE') {
 			t3lib_div::sysLog($message, $this->extKey, 1);
-		} else {
+		} elseif ($GLOBALS['USE_TIMETRACK']) {
 			$GLOBALS['TT']->setTSlogMessage($message);
 		}
 		if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['enable_DLOG']) {
Index: typo3/sysext/cms/tslib/media/scripts/fe_adminLib.inc
===================================================================
--- typo3/sysext/cms/tslib/media/scripts/fe_adminLib.inc	(Revision 5716)
+++ typo3/sysext/cms/tslib/media/scripts/fe_adminLib.inc	(Arbeitskopie)
@@ -1393,7 +1393,9 @@
 	 * @return	void
 	 */
 	function compileMail($key, $DBrows, $recipient, $setFixedConfig=array())	{
+		if ($GLOBALS['USE_TIMETRACK']) {
 		$GLOBALS['TT']->push('compileMail');
+		}
 		$mailContent='';
 		$key = $this->emailMarkPrefix.$key;
 
@@ -1421,11 +1423,15 @@
 			$recipient=$fe_userRec['email'];
 		}
 
+		if ($GLOBALS['USE_TIMETRACK']) {
 		$GLOBALS['TT']->setTSlogMessage('Template key: ###'.$key.'###, userContentLength: '.strlen($userContent['final']).', adminContentLength: '.strlen($adminContent['final']));
+		}
 
 		$this->sendMail($recipient, $this->conf['email.']['admin'], $userContent['final'], $adminContent['final']);
+		if ($GLOBALS['USE_TIMETRACK']) {
 		$GLOBALS['TT']->pull();
 	}
+	}
 
 	/**
 	 * Actually sends the requested mails (through $this->cObj->sendNotifyEmail or through $this->sendHTMLMail).
Index: typo3/sysext/cms/tslib/class.tslib_fe.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_fe.php	(Revision 5716)
+++ typo3/sysext/cms/tslib/class.tslib_fe.php	(Arbeitskopie)
@@ -405,6 +405,7 @@
 	protected $pageCache;
 	protected $pageCacheTags = array();
 
+	protected $tt_track = FALSE;	// use the timetrack object to log parsetimes and messages
 
 	/**
 	 * Class constructor
@@ -429,10 +430,15 @@
 		$this->TYPO3_CONF_VARS = $TYPO3_CONF_VARS;
 		$this->id = $id;
 		$this->type = $type;
+		if ($GLOBALS['USE_TIMETRACK']) {
+			$this->tt_track = TRUE;
+		}
 		if ($no_cache) {
 			if ($this->TYPO3_CONF_VARS['FE']['disableNoCacheParameter']) {
 				$warning = '&no_cache=1 has been ignored because $TYPO3_CONF_VARS[\'FE\'][\'disableNoCacheParameter\'] is set!';
+				if ($this->tt_track) {
 				$GLOBALS['TT']->setTSlogMessage($warning,2);
+				}
 			} else {
 				$warning = '&no_cache=1 has been supplied, so caching is disabled! URL: "'.t3lib_div::getIndpEnv('TYPO3_REQUEST_URL').'"';
 				$this->no_cache = $no_cache ? 1 : 0;
@@ -574,7 +580,9 @@
 	 * @return	void
 	 */
 	protected function initCaches() {
+		if ($this->tt_track) {
 		$GLOBALS['TT']->push('Initializing the Caching System','');
+		}
 
 		$GLOBALS['typo3CacheManager'] = t3lib_div::makeInstance('t3lib_cache_Manager');
 		$GLOBALS['typo3CacheFactory'] = t3lib_div::makeInstance('t3lib_cache_Factory');
@@ -595,8 +603,10 @@
 		t3lib_cache::initPageSectionCache();
 		t3lib_cache::initContentHashCache();
 
+		if ($this->tt_track) {
 		$GLOBALS['TT']->pull();
 	}
+	}
 
 	/**
 	 * Initializes the front-end login user.
@@ -740,7 +750,9 @@
 		$this->setIDfromArgV();
 
 			// If there is a Backend login we are going to check for any preview settings:
+		if ($this->tt_track) {
 		$GLOBALS['TT']->push('beUserLogin','');
+		}
 		if ($this->beUserLogin || $this->doWorkspacePreview())	{
 
 				// Backend user preview features:
@@ -809,7 +821,9 @@
 				$this->set_no_cache();
 			}
 		}
+		if ($this->tt_track) {
 		$GLOBALS['TT']->pull();
+		}
 
 			// Now, get the id, validate access etc:
 		$this->fetch_the_id();
@@ -871,7 +885,9 @@
 	 * @access private
 	 */
 	function fetch_the_id()	{
+		if ($this->tt_track) {
 		$GLOBALS['TT']->push('fetch_the_id initialize/','');
+		}
 
 			// Initialize the page-select functions.
 		$this->sys_page = t3lib_div::makeInstance('t3lib_pageSelect');
@@ -904,10 +920,14 @@
 			// The id and type is set to the integer-value - just to be sure...
 		$this->id = intval($this->id);
 		$this->type = intval($this->type);
+		if ($this->tt_track) {
 		$GLOBALS['TT']->pull();
+		}
 
 			// We find the first page belonging to the current domain
+		if ($this->tt_track) {
 		$GLOBALS['TT']->push('fetch_the_id domain/','');
+		}
 		$this->domainStartPage = $this->findDomainRecord($this->TYPO3_CONF_VARS['SYS']['recursiveDomainSearch']);	// the page_id of the current domain
 		if (!$this->id)	{
 			if ($this->domainStartPage)	{
@@ -929,12 +949,18 @@
 				}
 			}
 		}
+		if ($this->tt_track) {
 		$GLOBALS['TT']->pull();
+		}
 
+		if ($this->tt_track) {
 		$GLOBALS['TT']->push('fetch_the_id rootLine/','');
+		}
 		$requestedId = $this->id;		// We store the originally requested id
 		$this->getPageAndRootlineWithDomain($this->domainStartPage);
+		if ($this->tt_track) {
 		$GLOBALS['TT']->pull();
+		}
 
 		if ($this->pageNotFound && $this->TYPO3_CONF_VARS['FE']['pageNotFound_handling'])	{
 			$pNotFoundMsg = array(
@@ -1748,11 +1774,13 @@
 					$this->pageNotFoundAndExit('Request parameters could not be validated (&cHash comparison failed)');
 				} else {
 					$this->set_no_cache();
+					if ($this->tt_track) {
 					$GLOBALS['TT']->setTSlogMessage('The incoming cHash "'.$this->cHash.'" and calculated cHash "'.$cHash_calc.'" did not match, so caching was disabled. The fieldlist used was "'.implode(',',array_keys($this->cHash_array)).'"',2);
 				}
 			}
 		}
 	}
+	}
 
 	/**
 	 * Will disable caching if the cHash value was not set.
@@ -1768,10 +1796,12 @@
 				$this->pageNotFoundAndExit('Request parameters could not be validated (&cHash empty)');
 			} else {
 				$this->set_no_cache();
+				if ($this->tt_track) {
 				$GLOBALS['TT']->setTSlogMessage('TSFE->reqCHash(): No &cHash parameter was sent for GET vars though required so caching is disabled',2);
 			}
 		}
 	}
+	}
 
 	/**
 	 * Splits the input query-parameters into an array with certain parameters filtered out.
@@ -1843,7 +1873,9 @@
 			if ($this->all) {
 				$this->newHash = $this->getHash();
 
+				if ($this->tt_track) {
 				$GLOBALS['TT']->push('Cache Row','');
+				}
 					$row = $this->getFromCache_queryRow();
 
 					if (!is_array($row)) {
@@ -1875,7 +1907,9 @@
 							$this->content.= chr(10).'<!-- Cached page generated '.date($dateFormat.' '.$timeFormat, $row['tstamp']).'. Expires '.Date($dateFormat.' '.$timeFormat, $row['expires']).' -->';
 						}
 					}
+					if ($this->tt_track) {
 				$GLOBALS['TT']->pull();
+					}
 
 			} else {
 				$this->acquirePageGenerationLock($this->pages_lockObj, $lockHash);
@@ -1889,9 +1923,13 @@
 	 * @return	array		Cached row, if any. Otherwise void.
 	 */
 	function getFromCache_queryRow() {
+		if ($this->tt_track) {
 		$GLOBALS['TT']->push('Cache Query', '');
+		}
 		$cachedPage = $this->pageCache->get($this->newHash);
+		if ($this->tt_track) {
 		$GLOBALS['TT']->pull();
+		}
 
 		return $cachedPage;
 	}
@@ -1978,17 +2016,23 @@
 		$setStatPageName = false;
 
 		if (!is_array($this->config) || is_array($this->config['INTincScript']) || $this->forceTemplateParsing)	{	// If config is not set by the cache (which would be a major mistake somewhere) OR if INTincScripts-include-scripts have been registered, then we must parse the template in order to get it
+			if ($this->tt_track) {
 				$GLOBALS['TT']->push('Parse template','');
+			}
 
 				// Force parsing, if set?:
 			$this->tmpl->forceTemplateParsing = $this->forceTemplateParsing;
 
 				// Start parsing the TS template. Might return cached version.
 			$this->tmpl->start($this->rootLine);
+			if ($this->tt_track) {
 				$GLOBALS['TT']->pull();
+			}
 
 			if ($this->tmpl->loaded)	{
+				if ($this->tt_track) {
 				$GLOBALS['TT']->push('Setting the config-array','');
+				}
 			//	t3lib_div::print_array($this->tmpl->setup);
 				$this->sPre = $this->tmpl->setup['types.'][$this->type];	// toplevel - objArrayName
 				$this->pSetup = $this->tmpl->setup[$this->sPre.'.'];
@@ -2042,7 +2086,9 @@
 					$this->config['FEData'] = $this->tmpl->setup['FEData'];
 					$this->config['FEData.'] = $this->tmpl->setup['FEData.'];
 				}
+				if ($this->tt_track) {
 				$GLOBALS['TT']->pull();
+				}
 			} else {
 				if ($this->checkPageUnavailableHandler())	{
 					$this->pageUnavailableAndExit('No TypoScript template found!');
@@ -2108,7 +2154,9 @@
 	function getCompressedTCarray()	{
 		global $TCA;
 
+		if ($this->tt_track) {
 		$GLOBALS['TT']->push('Get Compressed TC array');
+		}
 		if (!$this->TCAloaded)	{
 				// Create hash string for storage / retrieval of cached content:
 			$tempHash = md5('tables.php:'.
@@ -2151,8 +2199,10 @@
 				}
 			}
 		}
+		if ($this->tt_track) {
 		$GLOBALS['TT']->pull();
 	}
+	}
 
 	/**
 	 * Includes TCA definitions from loaded extensions (ext_table.php files).
@@ -2319,10 +2369,12 @@
 
 				$this->localeCharset = $this->csConvObj->get_locale_charset($this->config['config']['locale_all']);
 			} else {
+				if ($this->tt_track) {
 				$GLOBALS['TT']->setTSlogMessage('Locale "'.htmlspecialchars($this->config['config']['locale_all']).'" not found.', 3);
 			}
 		}
 	}
+	}
 
 	/**
 	 * checks whether a translated shortcut page has a different shortcut
@@ -2376,11 +2428,15 @@
 					} elseif ($formtype_db && is_array($_POST['data']))	{
 						$ret = 'fe_tce';
 					}
+					if ($this->tt_track) {
 					$GLOBALS['TT']->setTSlogMessage('"Check Data Submission": Return value: '.$ret,0);
+					}
 					return $ret;
 				}
-			} else $GLOBALS['TT']->setTSlogMessage('"Check Data Submission": HTTP_HOST and REFERER HOST did not match when processing submitted formdata!',3);
+			} elseif ($this->tt_track) {
+				$GLOBALS['TT']->setTSlogMessage('"Check Data Submission": HTTP_HOST and REFERER HOST did not match when processing submitted formdata!',3);
 		}
+		}
 
 			// Hook for processing data submission to extensions:
 		if (is_array($this->TYPO3_CONF_VARS['SC_OPTIONS']['tslib/class.tslib_fe.php']['checkDataSubmission']))	{
@@ -2418,9 +2474,13 @@
 		if (!$locData[1] ||  $this->sys_page->checkRecord($locData[1],$locData[2],1))	{
 			if (count($this->sys_page->getPage($locData[0])))	{	// $locData[1] -check means that a record is checked only if the locationData has a value for a record else than the page.
 				return 1;
-			} else $GLOBALS['TT']->setTSlogMessage('LocationData Error: The page pointed to by location data ('.$locationData.') was not accessible.',2);
-		} else $GLOBALS['TT']->setTSlogMessage('LocationData Error: Location data ('.$locationData.') record pointed to was not accessible.',2);
+			} elseif ($this->tt_track) {
+				$GLOBALS['TT']->setTSlogMessage('LocationData Error: The page pointed to by location data ('.$locationData.') was not accessible.',2);
 	}
+		} elseif ($this->tt_track) {
+			$GLOBALS['TT']->setTSlogMessage('LocationData Error: Location data ('.$locationData.') record pointed to was not accessible.',2);
+		}
+	}
 
 	/**
 	 * Sends the emails from the formmail content object.
@@ -2447,13 +2507,17 @@
 					if ($res = $this->codeString($EMAIL_VARS[$fieldKey], TRUE))	{	// Decode...
 						$EMAIL_VARS[$fieldKey] = $res;	// Set value if OK
 					} elseif ($integrityCheck)	{	// Otherwise abort:
+						if ($this->tt_track) {
 						$GLOBALS['TT']->setTSlogMessage('"Formmail" discovered a field ('.$fieldKey.') which could not be decoded to a valid string. Sending formmail aborted due to security reasons!',3);
+						}
 						return false;
 					} else {
+						if ($this->tt_track) {
 						$GLOBALS['TT']->setTSlogMessage('"Formmail" discovered a field ('.$fieldKey.') which could not be decoded to a valid string. The security level accepts this, but you should consider a correct coding though!',2);
 					}
 				}
 			}
+			}
 		} else	{
 			$locData = explode(':',$locationData);
 			$record = $this->sys_page->checkRecord($locData[1],$locData[2],1);
@@ -2471,8 +2535,10 @@
 
 		$formmail->start($EMAIL_VARS);
 		$formmail->sendtheMail();
+		if ($this->tt_track) {
 		$GLOBALS['TT']->setTSlogMessage('"Formmail" invoked, sending mail to '.$EMAIL_VARS['recipient'],0);
 	}
+	}
 
 	/**
 	 * Extracts the value of recipient copy field from a formmail CE bodytext
@@ -2933,25 +2999,37 @@
 
 			// Tidy up the code, if flag...
 		if ($this->TYPO3_CONF_VARS['FE']['tidy_option'] == 'all') {
+			if ($this->tt_track) {
 			$GLOBALS['TT']->push('Tidy, all','');
+			}
 				$this->content = $this->tidyHTML($this->content);
+			if ($this->tt_track) {
 			$GLOBALS['TT']->pull();
 		}
+		}
 
 			// XHTML-clean the code, if flag set
 		if ($this->doXHTML_cleaning() == 'all') {
+			if ($this->tt_track) {
 			$GLOBALS['TT']->push('XHTML clean, all','');
+			}
 				$XHTML_clean = t3lib_div::makeInstance('t3lib_parsehtml');
 				$this->content = $XHTML_clean->XHTML_clean($this->content);
+				if ($this->tt_track) {
 			$GLOBALS['TT']->pull();
 		}
+		}
 
 			// Fix local anchors in links, if flag set
 		if ($this->doLocalAnchorFix() == 'all') {
+			if ($this->tt_track) {
 			$GLOBALS['TT']->push('Local anchor fix, all','');
+			}
 				$this->prefixLocalAnchorsWithScript();
+				if ($this->tt_track) {
 			$GLOBALS['TT']->pull();
 		}
+		}
 
 			// Hook for post-processing of page content cached/non-cached:
 		if (is_array($this->TYPO3_CONF_VARS['SC_OPTIONS']['tslib/class.tslib_fe.php']['contentPostProc-all'])) {
@@ -2965,23 +3043,35 @@
 		if (!$this->no_cache) {
 					// Tidy up the code, if flag...
 			if ($this->TYPO3_CONF_VARS['FE']['tidy_option'] == 'cached') {
+				if ($this->tt_track) {
 				$GLOBALS['TT']->push('Tidy, cached','');
+				}
 					$this->content = $this->tidyHTML($this->content);
+					if ($this->tt_track) {
 				$GLOBALS['TT']->pull();
 			}
+			}
 				// XHTML-clean the code, if flag set
 			if ($this->doXHTML_cleaning() == 'cached')		{
+				if ($this->tt_track) {
 				$GLOBALS['TT']->push('XHTML clean, cached','');
+				}
 					$XHTML_clean = t3lib_div::makeInstance('t3lib_parsehtml');
 					$this->content = $XHTML_clean->XHTML_clean($this->content);
+					if ($this->tt_track) {
 				$GLOBALS['TT']->pull();
 			}
+			}
 				// Fix local anchors in links, if flag set
 			if ($this->doLocalAnchorFix() == 'cached')		{
+				if ($this->tt_track) {
 				$GLOBALS['TT']->push('Local anchor fix, cached','');
+				}
 					$this->prefixLocalAnchorsWithScript();
+					if ($this->tt_track) {
 				$GLOBALS['TT']->pull();
 			}
+			}
 
 				// Hook for post-processing of page content before being cached:
 			if (is_array($this->TYPO3_CONF_VARS['SC_OPTIONS']['tslib/class.tslib_fe.php']['contentPostProc-cached']))	{
@@ -3042,13 +3132,17 @@
 			$reprocess = (count($INTiS_config) ? true : false);
 		} while($reprocess);
 
+		if ($this->tt_track) {
 		$GLOBALS['TT']->push('Substitute header section');
+		}
 		$this->INTincScript_loadJSCode();
 		$this->content = str_replace('<!--HD_'.$this->config['INTincScript_ext']['divKey'].'-->', $this->convOutputCharset(implode(chr(10),$this->additionalHeaderData),'HD'), $this->content);
 		$this->content = str_replace('<!--TDS_'.$this->config['INTincScript_ext']['divKey'].'-->', $this->convOutputCharset($this->divSection,'TDS'), $this->content);
 		$this->setAbsRefPrefix();
+		if ($this->tt_track) {
 		$GLOBALS['TT']->pull();
 	}
+	}
 
 	/**
 	 * Include libraries for uncached objects.
@@ -3074,16 +3168,22 @@
 	 * @see		INTincScript()
 	 */
 	protected function INTincScript_process($INTiS_config)	{
+		if ($this->tt_track) {
 		$GLOBALS['TT']->push('Split content');
+		}
 		$INTiS_splitC = explode('<!--INT_SCRIPT.',$this->content);			// Splits content with the key.
 		$this->content = '';
+		if ($this->tt_track) {
 		$GLOBALS['TT']->setTSlogMessage('Parts: '.count($INTiS_splitC));
 		$GLOBALS['TT']->pull();
+		}
 
 		foreach($INTiS_splitC as $INTiS_c => $INTiS_cPart)	{
 			if (substr($INTiS_cPart,32,3)=='-->')	{	// If the split had a comment-end after 32 characters it's probably a split-string
 				$INTiS_key = 'INT_SCRIPT.'.substr($INTiS_cPart,0,32);
+				if ($this->tt_track) {
 				$GLOBALS['TT']->push('Include '.$INTiS_config[$INTiS_key]['file'],'');
+				}
 				$incContent='';
 				if (is_array($INTiS_config[$INTiS_key]))	{
 					$INTiS_cObj = unserialize($INTiS_config[$INTiS_key]['cObj']);
@@ -3106,7 +3206,9 @@
 				}
 				$this->content.= $this->convOutputCharset($incContent,'INC-'.$INTiS_c);
 				$this->content.= substr($INTiS_cPart,35);
+				if ($this->tt_track) {
 				$GLOBALS['TT']->pull($incContent);
+				}
 			} else {
 				$this->content.= ($INTiS_c?'<!--INT_SCRIPT.':'').$INTiS_cPart;
 			}
@@ -3266,23 +3368,35 @@
 
 			// Tidy up the code, if flag...
 		if ($this->TYPO3_CONF_VARS['FE']['tidy_option'] == 'output') {
+			if ($this->tt_track) {
 			$GLOBALS['TT']->push('Tidy, output','');
+			}
 				$this->content = $this->tidyHTML($this->content);
+				if ($this->tt_track) {
 			$GLOBALS['TT']->pull();
 		}
+		}
 			// XHTML-clean the code, if flag set
 		if ($this->doXHTML_cleaning() == 'output')		{
+			if ($this->tt_track) {
 			$GLOBALS['TT']->push('XHTML clean, output','');
+			}
 				$XHTML_clean = t3lib_div::makeInstance('t3lib_parsehtml');
 				$this->content = $XHTML_clean->XHTML_clean($this->content);
+				if ($this->tt_track) {
 			$GLOBALS['TT']->pull();
 		}
+		}
 			// Fix local anchors in links, if flag set
 		if ($this->doLocalAnchorFix() == 'output')		{
+			if ($this->tt_track) {
 			$GLOBALS['TT']->push('Local anchor fix, output','');
+			}
 				$this->prefixLocalAnchorsWithScript();
+				if ($this->tt_track) {
 			$GLOBALS['TT']->pull();
 		}
+		}
 
 			// Hook for post-processing of page content before output:
 		if (is_array($this->TYPO3_CONF_VARS['SC_OPTIONS']['tslib/class.tslib_fe.php']['contentPostProc-output']))	{
@@ -3352,17 +3466,21 @@
 				// Now, if a backend user is logged in, tell him in the Admin Panel log what the caching status would have been:
 			if ($this->beUserLogin) {
 				if ($doCache)	{
+					if ($this->tt_track) {
 					$GLOBALS['TT']->setTSlogMessage('Cache-headers with max-age "'.($this->cacheExpires - $GLOBALS['EXEC_TIME']).'" would have been sent');
+					}
 				} else {
 					$reasonMsg = '';
 					$reasonMsg.= !$this->no_cache ? '' : 'Caching disabled (no_cache). ';
 					$reasonMsg.= !$this->isINTincScript() ? '' : '*_INT object(s) on page. ';
 					$reasonMsg.= !$this->isEXTincScript() ? '' : '*_EXT object(s) on page. ';
 					$reasonMsg.= !is_array($this->fe_user->user) ? '' : 'Frontend user logged in. ';
+					if ($this->tt_track) {
 					$GLOBALS['TT']->setTSlogMessage('Cache-headers would disable proxy caching! Reason(s): "'.$reasonMsg.'"',1);
 				}
 			}
 		}
+		}
 
 			// Send headers:
 		foreach($headers as $hL)	{
@@ -3465,10 +3583,12 @@
 	 */
 	function setParseTime()	{
 			// Compensates for the time consumed with Back end user initialization.
+		if ($this->tt_track) {
 		$this->scriptParseTime = $GLOBALS['TT']->convertMicrotime($GLOBALS['TYPO3_MISC']['microtime_end'])
 								- $GLOBALS['TT']->convertMicrotime($GLOBALS['TYPO3_MISC']['microtime_start'])
 								- ($GLOBALS['TT']->convertMicrotime($GLOBALS['TYPO3_MISC']['microtime_BE_USER_end'])-$GLOBALS['TT']->convertMicrotime($GLOBALS['TYPO3_MISC']['microtime_BE_USER_start']));
 	}
+	}
 
 	/**
 	 * Initialize file-based statistics handling: Check filename and permissions, and create the logfile if it does not exist yet.
@@ -3497,10 +3617,12 @@
 					$this->config['stat_vars']['logFile'] = $theLogFile;
 					$setStatPageName = true;	// Set page name later on
 				} else {
+					if ($this->tt_track) {
 					$GLOBALS['TT']->setTSlogMessage('Could not set logfile path. Check filepath and permissions.',3);
 				}
 			}
 		}
+		}
 
 		return $setStatPageName;
 	}
@@ -3582,7 +3704,9 @@
 				(!$this->config['config']['stat_excludeBEuserHits'] || !$this->beUserLogin) &&
 				(!$this->config['config']['stat_excludeIPList'] || !t3lib_div::cmpIP(t3lib_div::getIndpEnv('REMOTE_ADDR'),str_replace(' ','',$this->config['config']['stat_excludeIPList'])))) {
 
+					if ($this->tt_track) {
 			$GLOBALS['TT']->push('Stat');
+					}
 				if (t3lib_extMgm::isLoaded('sys_stat') && $this->config['config']['stat_mysql'])	{
 
 						// Jumpurl:
@@ -3637,10 +3761,14 @@
 					}
 
 
+					if ($this->tt_track) {
 					$GLOBALS['TT']->push('Store SQL');
+					}
 					$GLOBALS['TYPO3_DB']->exec_INSERTquery('sys_stat', $insertFields);
+					if ($this->tt_track) {
 					$GLOBALS['TT']->pull();
 				}
+				}
 
 					// Apache:
 				if ($this->config['config']['stat_apache'] && $this->config['stat_vars']['pageName'])	{
@@ -3664,20 +3792,27 @@
 							$LogLine.= ' "'.($referer ? $referer : '-').'" "'.t3lib_div::getIndpEnv('HTTP_USER_AGENT').'"';
 						}
 
+						if ($this->tt_track) {
 						$GLOBALS['TT']->push('Write to log file (fputs)');
+						}
 							$logfilehandle = fopen($this->config['stat_vars']['logFile'], 'a');
 							fputs($logfilehandle, $LogLine.chr(10));
 							@fclose($logfilehandle);
+							if ($this->tt_track) {
 						$GLOBALS['TT']->pull();
-
 						$GLOBALS['TT']->setTSlogMessage('Writing to logfile: OK',0);
+							}
 					} else {
+						if ($this->tt_track) {
 						$GLOBALS['TT']->setTSlogMessage('Writing to logfile: Error - logFile did not exist!',3);
 					}
 				}
+				}
+			if ($this->tt_track) {
 			$GLOBALS['TT']->pull();
 		}
 	}
+	}
 
 	/**
 	 * Outputs preview info.
@@ -4083,7 +4218,9 @@
 	 * @see t3lib_div::deprecationLog(), t3lib_timeTrack::setTSlogMessage()
 	 */
 	function logDeprecatedTyposcript($msg) {
+		if ($this->tt_track) {
 		$GLOBALS['TT']->setTSlogMessage($msg . ' is deprecated.', 2);
+		}
 		t3lib_div::deprecationLog('TypoScript ' . $msg);
 	}
 
@@ -4119,10 +4256,14 @@
 			$content = implode(chr(10),$output);
 			if (!trim($content))	{
 				$content = $oldContent;	// Restore old content due empty return value.
+				if ($this->tt_track) {
 				$GLOBALS['TT']->setTSlogMessage('"tidy" returned an empty value!',2);
 			}
+			}
+			if ($this->tt_track) {
 			$GLOBALS['TT']->setTSlogMessage('"tidy" content lenght: '.strlen($content),0);
 		}
+		}
 		return $content;
 	}
 
@@ -4203,20 +4344,26 @@
 	public function includeLibraries(array $libraries) {
 		global $TYPO3_CONF_VARS;
 
+		if ($this->tt_track) {
 		$GLOBALS['TT']->push('Include libraries');
 		$GLOBALS['TT']->setTSlogMessage('Files for inclusion: "' . implode(', ', $libraries) . '"');
+		}
 
 		foreach ($libraries as $library) {
 			$file = $GLOBALS['TSFE']->tmpl->getFileName($library);
 			if ($file) {
 				include_once('./' . $file);
 			} else {
+				if ($this->tt_track) {
 				$GLOBALS['TT']->setTSlogMessage('Include file "' . $file . '" did not exist!', 2);
 			}
 		}
+		}
 
+		if ($this->tt_track) {
 		$GLOBALS['TT']->pull();
 	}
+	}
 
 
 
@@ -4409,7 +4556,9 @@
 		$warning = '$TSFE->set_no_cache() was triggered by '.$trigger.'. ';
 		if ($this->TYPO3_CONF_VARS['FE']['disableNoCacheParameter']) {
 			$warning.= 'However $TYPO3_CONF_VARS[\'FE\'][\'disableNoCacheParameter\'] is set, so it will be ignored!';
+			if ($this->tt_track) {
 			$GLOBALS['TT']->setTSlogMessage($warning,2);
+			}
 		} else {
 			$warning.= 'Caching is disabled!';
 			$this->no_cache = 1;
Index: typo3/sysext/cms/tslib/class.tslib_menu.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_menu.php	(Revision 5716)
+++ typo3/sysext/cms/tslib/class.tslib_menu.php	(Arbeitskopie)
@@ -347,7 +347,9 @@
 
 			$retVal = TRUE;
 		} else {
+			if ($GLOBALS['USE_TIMETRACK']) {
 			$GLOBALS['TT']->setTSlogMessage('ERROR in menu',3);
+			}
 			$retVal = FALSE;
 		}
 		return $retVal;
Index: typo3/sysext/cms/tslib/pagegen.php
===================================================================
--- typo3/sysext/cms/tslib/pagegen.php	(Revision 5716)
+++ typo3/sysext/cms/tslib/pagegen.php	(Arbeitskopie)
@@ -39,7 +39,9 @@
 
 
 if (!is_object($TSFE))	{die('You cannot execute this file directly. It\'s meant to be included from index_ts.php');}
+if ($USE_TIMETRACK) {
 $TT->push('pagegen.php, initialize');
+}
 
 
 // *********************************
@@ -64,7 +66,9 @@
 }
 
 
+if ($USE_TIMETRACK) {
 $TT->pull();
+}
 
 
 // *******************
@@ -73,10 +77,14 @@
 
 // If this is an array, it's a sign that this script is included in order to include certain PHP_SCRIPT_INT-scripts
 if (!$GLOBALS['TSFE']->isINTincScript())		{
+	if ($USE_TIMETRACK) {
 	$TT->push('pagegen.php, render');
+	}
 	TSpagegen::renderContent();
 	$GLOBALS['TSFE']->setAbsRefPrefix();
+	if ($USE_TIMETRACK) {
 	$TT->pull();
 }
+}
 
 ?>
\ No newline at end of file
Index: typo3/sysext/cms/tslib/class.tslib_pagegen.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_pagegen.php	(Revision 5716)
+++ typo3/sysext/cms/tslib/class.tslib_pagegen.php	(Arbeitskopie)
@@ -316,8 +316,11 @@
 	 */
 	public static function renderContent() {
 			// PAGE CONTENT
+
+		if ($GLOBALS['USE_TIMETRACK']) {
 		$GLOBALS['TT']->incStackPointer();
 		$GLOBALS['TT']->push($GLOBALS['TSFE']->sPre, 'PAGE');
+		}
 			$pageContent = $GLOBALS['TSFE']->cObj->cObjGet($GLOBALS['TSFE']->pSetup);
 
 			if ($GLOBALS['TSFE']->pSetup['wrap'])	{$pageContent = $GLOBALS['TSFE']->cObj->wrap($pageContent, $GLOBALS['TSFE']->pSetup['wrap']);}
@@ -331,9 +334,11 @@
 		} else {
 			TSpagegen::renderContentWithHeader($pageContent);
 		}
+		if ($GLOBALS['USE_TIMETRACK']) {
 		$GLOBALS['TT']->pull($GLOBALS['TT']->LR?$GLOBALS['TSFE']->content:'');
 		$GLOBALS['TT']->decStackPointer();
 	}
+	}
 
 	/**
 	 * Rendering normal HTML-page with header by wrapping the generated content ($pageContent) in body-tags and setting the header accordingly.
@@ -783,15 +788,19 @@
 			$minifyErrorScript = $minifyErrorInline = '';
 			$_scriptCode = t3lib_div::minifyJavaScript($_scriptCode,$minifyErrorScript);
 			if ($minifyErrorScript) {
+				if ($GLOBALS['USE_TIMETRACK']) {
 				$GLOBALS['TT']->setTSlogMessage($minifyErrorScript, 3);
 			}
+			}
 			if ($_inlineJS) {
 				$_inlineJS = t3lib_div::minifyJavaScript($_inlineJS,$minifyErrorInline);
 				if ($minifyErrorInline) {
+					if ($GLOBALS['USE_TIMETRACK']) {
 					$GLOBALS['TT']->setTSlogMessage($minifyErrorInline, 3);
 				}
 			}
 		}
+		}
 
 		if (!$GLOBALS['TSFE']->config['config']['removeDefaultJS']) {
 				// inlude default and inlineJS
Index: typo3/sysext/cms/tslib/class.tslib_content.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_content.php	(Revision 5716)
+++ typo3/sysext/cms/tslib/class.tslib_content.php	(Arbeitskopie)
@@ -363,6 +363,8 @@
 	 */
 	const OBJECTTYPE_USER = 2;
 
+	protected $tt_track = FALSE;
+
 	/**
 	 * Class constructor.
 	 * Well, it has to be called manually since it is not a real constructor function.
@@ -377,6 +379,9 @@
 		$this->data = $data;
 		$this->currentRecord = $table ? $table.':'.$this->data['uid'] : '';
 		$this->parameters = Array();
+		if ($GLOBALS['USE_TIMETRACK']) {
+			$this->tt_track = TRUE;
+		}
 		if (is_array ($TYPO3_CONF_VARS['SC_OPTIONS']['tslib/class.tslib_content.php']['cObjTypeAndClass'])) {
 			foreach ($TYPO3_CONF_VARS['SC_OPTIONS']['tslib/class.tslib_content.php']['cObjTypeAndClass'] as $classArr) {
 				$this->cObjHookObjectsArr[$classArr[0]] = &t3lib_div::getUserObj($classArr[1]);
@@ -487,7 +492,9 @@
 		$GLOBALS['TSFE']->cObjectDepthCounter--;
 		if ($GLOBALS['TSFE']->cObjectDepthCounter>0)	{
 			$name = trim($name);
-			if ($GLOBALS['TT']->LR) $GLOBALS['TT']->push($TSkey, $name);
+			if ($this->tt_track && $GLOBALS['TT']->LR) {
+				$GLOBALS['TT']->push($TSkey, $name);
+			}
 
 				// Checking if the COBJ is a reference to another object. (eg. name of 'blabla.blabla = < styles.something')
 			if (substr($name,0,1)=='<')	{
@@ -500,9 +507,13 @@
 					$conf = $this->joinTSarrays($conf,$old_conf);
 				}
 					// Getting the cObject
+				if ($this->tt_track) {
 				$GLOBALS['TT']->incStackPointer();
+				}
 					$content.=$this->cObjGetSingle($name,$conf,$key);
+					if ($this->tt_track) {
 				$GLOBALS['TT']->decStackPointer();
+					}
 			} else {
 
 				$hooked = false;
@@ -621,8 +632,10 @@
 					}
 				}
 			}
-			if ($GLOBALS['TT']->LR) $GLOBALS['TT']->pull($content);
+			if ($this->tt_track && $GLOBALS['TT']->LR) {
+				$GLOBALS['TT']->pull($content);
 		}
+		}
 			// Increasing on exit...
 		$GLOBALS['TSFE']->cObjectDepthCounter++;
 		return $content;
@@ -718,9 +731,11 @@
 			}
 			return $content;
 		} else {
+			if ($this->tt_track) {
 			$GLOBALS['TT']->setTSlogMessage('No elements in this content object array (COBJ_ARRAY, COA, COA_INT).', 2);
 		}
 	}
+	}
 
 	/**
 	 * Rendering the cObject, USER and USER_INT
@@ -782,9 +797,11 @@
 	 */
 	public function convertToUserIntObject() {
 		if ($this->userObjectType !== self::OBJECTTYPE_USER) {
+			if ($this->tt_track) {
 			$GLOBALS['TT']->setTSlogMessage('tslib_cObj::convertToUserIntObject() ' .
 				'is called in the wrong context or for the wrong object type', 2);
 		}
+		}
 		else {
 			$this->doConvertToUserIntObject = true;
 		}
@@ -1290,10 +1307,14 @@
 			do {
 				$res = $this->exec_getQuery($conf['table'],$conf['select.']);
 				if ($error = $GLOBALS['TYPO3_DB']->sql_error()) {
+					if ($this->tt_track) {
 					$GLOBALS['TT']->setTSlogMessage($error,3);
+					}
 				} else {
 					$this->currentRecordTotal = $GLOBALS['TYPO3_DB']->sql_num_rows($res);
+					if ($this->tt_track) {
 					$GLOBALS['TT']->setTSlogMessage('NUMROWS: '.$GLOBALS['TYPO3_DB']->sql_num_rows($res));
+					}
 					$cObj =t3lib_div::makeInstance('tslib_cObj');
 					$cObj->setParent($this->data,$this->currentRecord);
 					$this->currentRecordNumber=0;
@@ -2349,7 +2370,9 @@
 				$theValue = $this->cObjGetSingle($conf['noResultObj'], $conf['noResultObj.'],'noResultObj');
 			}
 
+			if ($this->tt_track) {
 			$GLOBALS['TT']->setTSlogMessage('Search in fields:   '.$search->listOfSearchFields);
+			}
 
 				// wrapping
 			$content=$theValue;
@@ -3113,7 +3136,9 @@
 	 * @see substituteSubpart(), substituteMarker(), substituteMarkerInObject(), TEMPLATE()
 	 */
 	public function substituteMarkerArrayCached($content, array $markContentArray = NULL, array $subpartContentArray = NULL, array $wrappedSubpartContentArray = NULL) {
+		if ($this->tt_track) {
 		$GLOBALS['TT']->push('substituteMarkerArrayCached');
+		}
 
 			// If not arrays then set them
 		if (is_null($markContentArray))	$markContentArray=array();	// Plain markers
@@ -3124,14 +3149,18 @@
 		$wPkeys = array_keys($wrappedSubpartContentArray);
 		$aKeys = array_merge(array_keys($markContentArray),$sPkeys,$wPkeys);
 		if (!count($aKeys))	{
+			if ($this->tt_track) {
 			$GLOBALS['TT']->pull();
+			}
 			return $content;
 		}
 		asort($aKeys);
 		$storeKey = md5('substituteMarkerArrayCached_storeKey:'.serialize(array($content,$aKeys)));
 		if ($this->substMarkerCache[$storeKey])	{
 			$storeArr = $this->substMarkerCache[$storeKey];
+			if ($this->tt_track) {
 			$GLOBALS['TT']->setTSlogMessage('Cached',0);
+			}
 		} else {
 			$storeArrDat = $GLOBALS['TSFE']->sys_page->getHash($storeKey);
 			if (!isset($storeArrDat))	{
@@ -3166,15 +3195,19 @@
 					// Storing the cached data:
 				$GLOBALS['TSFE']->sys_page->storeHash($storeKey, serialize($storeArr), 'substMarkArrayCached');
 
+				if ($this->tt_track) {
 				$GLOBALS['TT']->setTSlogMessage('Parsing',0);
+				}
 			} else {
 					// Unserializing
 				$storeArr = unserialize($storeArrDat);
 					// Setting cache:
 				$this->substMarkerCache[$storeKey] = $storeArr;
+				if ($this->tt_track) {
 				$GLOBALS['TT']->setTSlogMessage('Cached from DB',0);
 			}
 		}
+		}
 
 			// Substitution/Merging:
 			// Merging content types together, resetting
@@ -3195,7 +3228,9 @@
 		}
 		$content.=$storeArr['c'][count($storeArr['k'])];
 
+		if ($this->tt_track) {
 		$GLOBALS['TT']->pull();
+		}
 		return $content;
 	}
 
@@ -3534,7 +3569,9 @@
 		$res = $this->exec_getQuery($conf['table'],$conf['select.']);
 
 		if ($error = $GLOBALS['TYPO3_DB']->sql_error())	{
+			if ($this->tt_track) {
 			$GLOBALS['TT']->setTSlogMessage($error,3);
+			}
 		} else {
 			$row = $GLOBALS['TYPO3_DB']->sql_fetch_row($res);
 			$result = intval($row[0]);
@@ -4829,12 +4866,16 @@
 
 							if ($fileArray['sample'])	{
 								$gifCreator->scalecmd = '-sample';
+								if ($this->tt_track) {
 								$GLOBALS['TT']->setTSlogMessage('Sample option: Images are scaled with -sample.');
 							}
+							}
 							if ($fileArray['alternativeTempPath'] && t3lib_div::inList($GLOBALS['TYPO3_CONF_VARS']['FE']['allowedTempPaths'],$fileArray['alternativeTempPath']))	{
 								$gifCreator->tempPath = $fileArray['alternativeTempPath'];
+								if ($this->tt_track) {
 								$GLOBALS['TT']->setTSlogMessage('Set alternativeTempPath: '.$fileArray['alternativeTempPath']);
 							}
+							}
 
 							if (!trim($fileArray['ext'])){$fileArray['ext']='web';}
 							$options = Array();
@@ -5430,7 +5471,9 @@
 						$finalTagParts['TYPE'] = 'file';
 						$finalTagParts['aTagParams'].=$this->extLinkATagParams($finalTagParts['url'], $finalTagParts['TYPE']);
 					} else {
+						if ($this->tt_track) {
 						$GLOBALS['TT']->setTSlogMessage("typolink(): File '".$splitLinkParam[0]."' did not exist, so '".$linktxt."' was not linked.",1);
+						}
 						return $linktxt;
 					}
 	 			} else {	// integer or alias (alias is without slashes or periods or commas, that is 'nospace,alphanum_x,lower,unique' according to definition in $TCA!)
@@ -5477,7 +5520,9 @@
 						if (is_array($mount_info) && $mount_info['overlay'])	{
 							$page = $GLOBALS['TSFE']->sys_page->getPage($mount_info['mount_pid'],$disableGroupAccessCheck);
 							if (!count($page))	{
+								if ($this->tt_track) {
 								$GLOBALS['TT']->setTSlogMessage("typolink(): Mount point '".$mount_info['mount_pid']."' was not available, so '".$linktxt."' was not linked.",1);
+								}
 								return $linktxt;
 							}
 							$MPvarAcc['re-map'] = $mount_info['MPvar'];
@@ -5625,7 +5670,9 @@
 						$finalTagParts['targetParams']=$targetPart;
 						$finalTagParts['TYPE']='page';
 					} else {
+						if ($this->tt_track) {
 						$GLOBALS['TT']->setTSlogMessage("typolink(): Page id '".$link_param."' was not found, so '".$linktxt."' was not linked.",1);
+						}
 						return $linktxt;
 					}
 				}
@@ -6056,7 +6103,9 @@
 			!t3lib_div::isFirstPartOfStr(trim($funcName),$pre) &&
 			!t3lib_div::isFirstPartOfStr(trim($funcName),'tx_')
 			)	{
+				if ($this->tt_track) {
 			$GLOBALS['TT']->setTSlogMessage('Function "'.$funcName.'" was not prepended with "'.$pre.'"',3);
+				}
 			return $content;
 		}
 			// Split parts
@@ -6069,18 +6118,24 @@
 					$classObj->cObj = &$this;
 				 	$content = call_user_func_array(array($classObj, $parts[1]), array($content, $conf));
 				} else {
+					if ($this->tt_track) {
 					$GLOBALS['TT']->setTSlogMessage('Method "' . $parts[1] . '" did not exist in class "' . $parts[0] . '"', 3);
 				}
+				}
 			} else {
+				if ($this->tt_track) {
 				$GLOBALS['TT']->setTSlogMessage('Class "' . $parts[0] . '" did not exist', 3);
 			}
+			}
 		} else {	// Function
 			if (function_exists($funcName))	{
 			 	$content = call_user_func($funcName, $content, $conf);
 			} else {
+				if ($this->tt_track) {
 				$GLOBALS['TT']->setTSlogMessage('Function "'.$funcName.'" did not exist',3);
 			}
 		}
+		}
 		return $content;
 	}
 
@@ -7104,7 +7159,9 @@
 			if (strstr(strtolower($conf['begin'].$conf['max']),'total'))	{
 				$res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('count(*)', $table, $queryParts['WHERE'], $queryParts['GROUPBY']);
 				if ($error = $GLOBALS['TYPO3_DB']->sql_error())	{
+					if ($this->tt_track) {
 					$GLOBALS['TT']->setTSlogMessage($error);
+					}
 				} else {
 					$row = $GLOBALS['TYPO3_DB']->sql_fetch_row($res);
 					$conf['max'] = str_ireplace('total', $row[0], $conf['max']);
@@ -7273,7 +7330,9 @@
 			}
 			$res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('uid', 'pages', 'uid IN ('.implode(',',$listArr).')'.$this->enableFields('pages').' AND doktype NOT IN ('.$this->checkPid_badDoktypeList.')');
 			if ($error = $GLOBALS['TYPO3_DB']->sql_error())	{
+				if ($this->tt_track) {
 				$GLOBALS['TT']->setTSlogMessage($error.': '.$query,3);
+				}
 			} else {
 				while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))	{
 					$outArr[] = $row['uid'];
Index: typo3/sysext/cms/tslib/index_ts.php
===================================================================
--- typo3/sysext/cms/tslib/index_ts.php	(Revision 5716)
+++ typo3/sysext/cms/tslib/index_ts.php	(Arbeitskopie)
@@ -85,24 +85,34 @@
 // *********************
 require_once(PATH_t3lib.'class.t3lib_timetrack.php');
 $TT = new t3lib_timeTrack;
+$USE_TIMETRACK = FALSE;
+if ($_COOKIE['be_typo_user'] || $TYPO3_CONF_VARS['FE']['forceTimetracking']) {
+
 $TT->start();
 $TT->push('','Script start');
+	$USE_TIMETRACK = TRUE;
+}
 
-
 // *********************
 // Mandatory libraries included
 // *********************
+if ($USE_TIMETRACK) {
 $TT->push('Include class t3lib_db, t3lib_div, t3lib_extmgm','');
+}
 	require_once(PATH_t3lib.'class.t3lib_div.php');
 	require_once(PATH_t3lib.'class.t3lib_extmgm.php');
+if ($USE_TIMETRACK) {
 $TT->pull();
+}
 
 
 
 // **********************
 // Include configuration
 // **********************
+if ($USE_TIMETRACK) {
 $TT->push('Include config files','');
+}
 require(PATH_t3lib.'config_default.php');
 if (!defined ('TYPO3_db')) 	die ('The configuration file was not included.');	// the name of the TYPO3 database is stored in this constant. Here the inclusion of the config-file is verified by checking if this var is set.
 if (!t3lib_extMgm::isLoaded('cms'))	die('<strong>Error:</strong> The main frontend extension "cms" was not loaded. Enable it in the extension manager in the backend.');
@@ -115,17 +125,23 @@
 // *********************
 // Autoloader
 // *********************
+if ($USE_TIMETRACK) {
 $TT->push('Register Autoloader', '');
+}
 	require_once(PATH_t3lib . 'class.t3lib_autoloader.php');
 	t3lib_autoloader::registerAutoloader();
+if ($USE_TIMETRACK) {
 $TT->pull();
+}
 
 
 $TYPO3_DB = t3lib_div::makeInstance('t3lib_DB');
 $TYPO3_DB->debugOutput = $TYPO3_CONF_VARS['SYS']['sqlDebug'];
 
 $CLIENT = t3lib_div::clientInfo();				// Set to the browser: net / msie if 4+ browsers
+if ($USE_TIMETRACK) {
 $TT->pull();
+}
 
 
 // *******************************
@@ -133,13 +149,17 @@
 // *******************************
 if (isset($_POST['GLOBALS']) || isset($_GET['GLOBALS']))	die('You cannot set the GLOBALS-array from outside the script.');
 if (!get_magic_quotes_gpc())	{
+	if ($USE_TIMETRACK) {
 	$TT->push('Add slashes to GET/POST arrays','');
+	}
 	t3lib_div::addSlashesOnArray($_GET);
 	t3lib_div::addSlashesOnArray($_POST);
 	$HTTP_GET_VARS = $_GET;
 	$HTTP_POST_VARS = $_POST;
+	if ($USE_TIMETRACK) {
 	$TT->pull();
 }
+}
 
 
 // Hook to preprocess the current request:
@@ -225,10 +245,14 @@
 // *********
 // FE_USER
 // *********
+if ($USE_TIMETRACK) {
 $TT->push('Front End user initialized','');
+}
 	/* @var $TSFE tslib_fe */
 	$TSFE->initFEuser();
+	if ($USE_TIMETRACK) {
 $TT->pull();
+	}
 
 // ****************
 // PRE BE_USER HOOK
@@ -293,7 +317,9 @@
 // Process the ID, type and other parameters
 // After this point we have an array, $page in TSFE, which is the page-record of the current page, $id
 // *****************************************
+if ($USE_TIMETRACK) {
 $TT->push('Process ID','');
+}
 		// Initialize admin panel since simulation settings are required here:
 	if ($TSFE->beUserLogin) {
 		$BE_USER->initializeAdminPanel();
@@ -316,7 +342,9 @@
 		$TSFE->determineId();
 	}
 	$TSFE->makeCacheHash();
+	if ($USE_TIMETRACK) {
 $TT->pull();
+	}
 
 // *****************************************
 // Admin Panel & Frontend editing
@@ -342,17 +370,25 @@
 // ********************************
 // Starts the template
 // *******************************
+if ($USE_TIMETRACK) {
 $TT->push('Start Template','');
+}
 	$TSFE->initTemplate();
+if ($USE_TIMETRACK) {
 $TT->pull();
+}
 
 
 // ********************************
 // Get from cache
 // *******************************
+if ($USE_TIMETRACK) {
 $TT->push('Get Page from cache','');
+}
 	$TSFE->getFromCache();
+	if ($USE_TIMETRACK) {
 $TT->pull();
+	}
 
 
 // ******************************************************
@@ -370,10 +406,14 @@
 // *******************************************
 // Setting language and locale
 // *******************************************
+if ($USE_TIMETRACK) {
 $TT->push('Setting language and locale','');
+}
 	$TSFE->settingLanguage();
 	$TSFE->settingLocale();
+	if ($USE_TIMETRACK) {
 $TT->pull();
+	}
 
 
 // ********************************
@@ -393,9 +433,13 @@
 	break;
 	case 'fe_tce':
 		$TSFE->includeTCA();
+		if ($USE_TIMETRACK) {
 		$TT->push('fe_tce','');
+		}
 		$TSFE->fe_tce();
+		if ($USE_TIMETRACK) {
 		$TT->pull();
+		}
 	break;
 }
 
@@ -405,7 +449,9 @@
 // *******************************
 $TSFE->setUrlIdToken();
 
+if ($USE_TIMETRACK) {
 $TT->push('Page generation','');
+}
 	if ($TSFE->isGeneratePage()) {
 		$TSFE->generatePage_preProcessing();
 		$temp_theScript=$TSFE->generatePage_whichScript();
@@ -419,30 +465,40 @@
 	} elseif ($TSFE->isINTincScript()) {
 		include(PATH_tslib.'pagegen.php');
 	}
+	if ($USE_TIMETRACK) {
 $TT->pull();
+	}
 
 
 // ********************************
 // $TSFE->config['INTincScript']
 // *******************************
 if ($TSFE->isINTincScript())		{
+	if ($USE_TIMETRACK) {
 	$TT->push('Non-cached objects','');
+	}
 		$TSFE->INTincScript();
+		if ($USE_TIMETRACK) {
 	$TT->pull();
 }
+}
 
 // ***************
 // Output content
 // ***************
 if ($TSFE->isOutputting())	{
+	if ($USE_TIMETRACK) {
 	$TT->push('Print Content','');
+	}
 	$TSFE->processOutput();
 
 	// ***************************************
 	// Outputs content / Includes EXT scripts
 	// ***************************************
 	if ($TSFE->isEXTincScript())	{
+		if ($USE_TIMETRACK) {
 		$TT->push('External PHP-script','');
+		}
 				// Important global variables here are $EXTiS_*, they must not be overridden in include-scripts!!!
 			$EXTiS_config = $TSFE->config['EXTincScript'];
 			$EXTiS_splitC = explode('<!--EXT_SCRIPT.',$TSFE->content);	// Splits content with the key
@@ -473,12 +529,16 @@
 				}
 			}
 
+			if ($USE_TIMETRACK) {
 		$TT->pull();
+			}
 	} else {
 		echo $TSFE->content;
 	}
+	if ($USE_TIMETRACK) {
 	$TT->pull();
 }
+}
 
 
 // ********************************
@@ -530,7 +590,9 @@
 // ********************
 // Finish timetracking
 // ********************
+if ($USE_TIMETRACK) {
 $TT->pull();
+}
 
 
 // ******************
Index: typo3/sysext/cms/tslib/class.tslib_fetce.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_fetce.php	(Revision 5716)
+++ typo3/sysext/cms/tslib/class.tslib_fetce.php	(Arbeitskopie)
@@ -133,7 +133,9 @@
 							$doublePostCheckKey = $this->calcDoublePostKey($this->newData[$table][$id]);
 							if ($this->checkDoublePostExist($table,$dPC_field,$doublePostCheckKey))	{
 								unset($this->newData[$table][$id]);	// Unsetting the whole thing, because it's not going to be saved.
+								if ($GLOBALS['USE_TIMETRACK']) {
 								$GLOBALS['TT']->setTSlogMessage('"FEData": Submitted record to table $table was doublePosted (key: $doublePostCheckKey). Nothing saved.',2);
+								}
 							} else {
 								$this->newData[$table][$id][$dPC_field] = $doublePostCheckKey;	// Setting key value
 								$this->extraList.=','.$dPC_field;
@@ -216,10 +218,14 @@
 		while(list($incFile_table,$incFile)=each($this->extScripts))	{
 			if (@is_file($incFile) && $GLOBALS['TSFE']->checkFileInclude($incFile))	{
 				include($incFile);	// Always start the incFiles with a check of the object fe_tce.  is_object($this);
+				if ($GLOBALS['USE_TIMETRACK']) {
 				$GLOBALS['TT']->setTSlogMessage('Included '.$incFile,0);
-			} else $GLOBALS['TT']->setTSlogMessage('"'.$incFile.'" was not found!',2);
 		}
+			} elseif ($GLOBALS['USE_TIMETRACK']) {
+				$GLOBALS['TT']->setTSlogMessage('"'.$incFile.'" was not found!',2);
 	}
+		}
+	}
 
 	/**
 	 * Method available to the submit scripts for creating insert queries.
Index: typo3/sysext/indexed_search/pi/class.tx_indexedsearch.php
===================================================================
--- typo3/sysext/indexed_search/pi/class.tx_indexedsearch.php	(Revision 5716)
+++ typo3/sysext/indexed_search/pi/class.tx_indexedsearch.php	(Arbeitskopie)
@@ -565,9 +565,13 @@
 	function getResultRows($sWArr,$freeIndexUid=-1)	{
 
 			// Getting SQL result pointer:
+		if ($GLOBALS['USE_TIMETRACK']) {
 			$GLOBALS['TT']->push('Searching result');
+		}
 		$res = $this->getResultRows_SQLpointer($sWArr,$freeIndexUid);
+		if ($GLOBALS['USE_TIMETRACK']) {
 			$GLOBALS['TT']->pull();
+		}
 
 			// Organize and process result:
 		if ($res)	{
@@ -645,9 +649,13 @@
 			// Perform SQL Search / collection of result rows array:
 		if ($list)	{
 				// Do the search:
+			if ($GLOBALS['USE_TIMETRACK']) {
 			$GLOBALS['TT']->push('execFinalQuery');
+			}
 			$res = $this->execFinalQuery($list,$freeIndexUid);
+			if ($GLOBALS['USE_TIMETRACK']) {
 			$GLOBALS['TT']->pull();
+			}
 			return $res;
 		} else {
 			return FALSE;
@@ -665,7 +673,9 @@
 	function getDisplayResults($sWArr, $resData, $freeIndexUid=-1)	{
 			// Perform display of result rows array:
 		if ($resData)	{
+			if ($GLOBALS['USE_TIMETRACK']) {
 			$GLOBALS['TT']->push('Display Final result');
+			}
 
 				// Set first selected row (for calculation of ranking later)
 			$this->firstRow = $resData['firstRow'];
@@ -691,7 +701,9 @@
 				$content = '<p'.$this->pi_classParam('noresults').'>'.$this->pi_getLL('noResults','',1).'</p>';
 			}
 
+			if ($GLOBALS['USE_TIMETRACK']) {
 			$GLOBALS['TT']->pull();
+			}
 		} else {
 			$content.='<p'.$this->pi_classParam('noresults').'>'.$this->pi_getLL('noResults','',1).'</p>';
 		}
@@ -830,7 +842,9 @@
 			$theType = (string)$this->piVars['type'];
 			if (strstr($sWord,' '))	$theType = 20;	// If there are spaces in the search-word, make a full text search instead.
 
+			if ($GLOBALS['USE_TIMETRACK']) {
 			$GLOBALS['TT']->push('SearchWord "'.$sWord.'" - $theType='.$theType);
+			}
 
 			$res = '';
 			$wSel='';
@@ -903,7 +917,9 @@
 				}
 			}
 
+			if ($GLOBALS['USE_TIMETRACK']) {
 			$GLOBALS['TT']->pull();
+			}
 			$c++;
 		}