Project

General

Profile

Bug #17002 » 0005010.patch

Administrator Admin, 2007-02-17 11:16

View differences:

t3lib/class.t3lib_tstemplate.php (Arbeitskopie)
$LD['no_cache'] = (trim($page['no_cache']) || $no_cache) ? '&no_cache=1' : '';
// linkVars
$LD['linkVars'] = $GLOBALS['TSFE']->linkVars.$addParams;
if ($GLOBALS['TSFE']->config['config']['uniqueLinkVars']) {
if ($addParams) {
$LD['linkVars'] = t3lib_div::implodeArrayForUrl('',t3lib_div::explodeUrl2Array($GLOBALS['TSFE']->linkVars.$addParams));
} else {
$LD['linkVars'] = $GLOBALS['TSFE']->linkVars;
}
} else {
$LD['linkVars'] = $GLOBALS['TSFE']->linkVars.$addParams;
$LD['linkVars'] = t3lib_div::implodeArrayForUrl('',t3lib_div::explodeUrl2Array($LD['linkVars']));
}
// If simulateStaticDocuments is enabled:
typo3/sysext/cms/tslib/class.tslib_pagegen.php (Arbeitskopie)
if (!is_array($GET[$val])) {
$tmpVal = rawurlencode($GET[$val]);
if ($test && !TSpagegen::isAllowedLinkVarValue($tmpVal,$test)) {
if ($val=='cHash') {
// Reusing cHash will not work - if set, remove it here and recreate it later if necessary.
if (isset($tmpVal)) {
$createCHash = true;
}
continue;
} elseif ($test && !TSpagegen::isAllowedLinkVarValue($tmpVal,$test)) {
continue; // Error: This value was not allowed for this key
}
......
}
} else continue;
$GLOBALS['TSFE']->linkVars.= $value;
$GLOBALS['TSFE']->linkVars .= $value;
}
unset($GET);
// Recreate cHash if necessary:
if ($GLOBALS['TSFE']->linkVars && $createCHash) {
// Get the array with query params, one key is the encryptionKey by default:
$pA = t3lib_div::cHashParams($GLOBALS['TSFE']->linkVars);
if (count($pA) > 1) {
$GLOBALS['TSFE']->linkVars .= '&cHash='.t3lib_div::shortMD5(serialize($pA));
}
}
} else {
$GLOBALS['TSFE']->linkVars='';
}
typo3/sysext/cms/tslib/class.tslib_content.php (Arbeitskopie)
if (substr($addQueryParams,0,1)!='&') {
$addQueryParams = '';
} elseif ($conf['useCacheHash']) { // cache hashing:
$pA = t3lib_div::cHashParams($addQueryParams.$GLOBALS['TSFE']->linkVars); // Added '.$this->linkVars' dec 2003: The need for adding the linkVars is that they will be included in the link, but not the cHash. Thus the linkVars will always be the problem that prevents the cHash from working. I cannot see what negative implications in terms of incompatibilities this could bring, but for now I hope there are none. So here we go... (- kasper)
$pA = t3lib_div::cHashParams($GLOBALS['TSFE']->linkVars.$addQueryParams); // Added '.$this->linkVars' dec 2003: The need for adding the linkVars is that they will be included in the link, but not the cHash. Thus the linkVars will always be the problem that prevents the cHash from working. I cannot see what negative implications in terms of incompatibilities this could bring, but for now I hope there are none. So here we go... (- kasper)
$addQueryParams.= '&cHash='.t3lib_div::shortMD5(serialize($pA));
}
(1-1/3)