Project

General

Profile

Bug #17614 » class.tslib_pagegen2.diff

Administrator Admin, 2007-09-19 16:36

View differences:

C:\TYPO3\Typo3_4.2\typo3_src+dummy-4.2.0alpha1\typo3\sysext\cms\tslib\class.tslib_pagegen2.php 2007-09-19 17:26:51.657920000 +0300
/**
* Class for starting TypoScript page generation
*
* The class is not instantiated as an objects but called directly with the "::" operator.
* // The class is not instantiated as an objects but called directly with the "::" operator.
* The class IS instantiated as an objects to make possible XCLASS it.
* eg: TSpagegen::pagegenInit()
*
* @author Kasper Skaarhoj <kasperYYYY@typo3.com>
......
if (!is_array($GET[$val])) {
$tmpVal = rawurlencode($GET[$val]);
if ($test && !TSpagegen::isAllowedLinkVarValue($tmpVal,$test)) {
// if ($test && !TSpagegen::isAllowedLinkVarValue($tmpVal,$test)) {
if ($test && !$this->isAllowedLinkVarValue($tmpVal,$test)) {
continue; // Error: This value was not allowed for this key
}
......
if ($GLOBALS['TSFE']->config['config']['disableAllHeaderCode']) {
$GLOBALS['TSFE']->content = $pageContent;
} else {
TSpagegen::renderContentWithHeader($pageContent);
// TSpagegen::renderContentWithHeader($pageContent);
$this->renderContentWithHeader($pageContent);
}
$GLOBALS['TT']->pull($GLOBALS['TT']->LR?$GLOBALS['TSFE']->content:'');
$GLOBALS['TT']->decStackPointer();
......
}
if (count($temp_styleLines)) {
if ($GLOBALS['TSFE']->config['config']['inlineStyle2TempFile']) {
$GLOBALS['TSFE']->content.=TSpagegen::inline2TempFile(implode(chr(10),$temp_styleLines),'css');
// $GLOBALS['TSFE']->content.=TSpagegen::inline2TempFile(implode(chr(10),$temp_styleLines),'css');
$GLOBALS['TSFE']->content.=$this->inline2TempFile(implode(chr(10),$temp_styleLines),'css');
} else {
$GLOBALS['TSFE']->content.='
<style type="text/css">
......
if (trim($style)) {
if ($GLOBALS['TSFE']->config['config']['inlineStyle2TempFile']) {
$GLOBALS['TSFE']->content.=TSpagegen::inline2TempFile($style, 'css');
// $GLOBALS['TSFE']->content.=TSpagegen::inline2TempFile($style, 'css');
$GLOBALS['TSFE']->content.=$this->inline2TempFile($style, 'css');
} else {
$GLOBALS['TSFE']->content.='
<style type="text/css">
......
} else {
$GLOBALS['TSFE']->INTincScript_loadJSCode();
}
$JSef = TSpagegen::JSeventFunctions();
// $JSef = TSpagegen::JSeventFunctions();
$JSef = $this->JSeventFunctions();
// Adding default Java Script:
$_scriptCode = '
......
/*]]>*/
</script>';
} elseif ($GLOBALS['TSFE']->config['config']['removeDefaultJS']==='external') {
$GLOBALS['TSFE']->content.= TSpagegen::inline2TempFile($_scriptCode, 'js');
// $GLOBALS['TSFE']->content.= TSpagegen::inline2TempFile($_scriptCode, 'js');
$GLOBALS['TSFE']->content.= $this->inline2TempFile($_scriptCode, 'js');
}
$GLOBALS['TSFE']->content.= chr(10).implode($GLOBALS['TSFE']->additionalHeaderData,chr(10)).'
(5-5/6)