Project

General

Profile

Download (1.68 KB)

Bug #20660 » felogin_4.3.diff

Administrator Admin, 2009-09-05 17:50

View differences:

typo3/sysext/felogin/pi1/class.tx_felogin_pi1.php (working copy)
if ($this->redirectUrl) {
// use redirectUrl for action tag because of possible access restricted pages
$markerArray['###ACTION_URI###'] = htmlspecialchars($this->redirectUrl);
$this->redirectUrl = '';
}
if (($this->conf['showPermaLogin']) && ($GLOBALS['TYPO3_CONF_VARS']['FE']['permalogin'] == 0 || $GLOBALS['TYPO3_CONF_VARS']['FE']['permalogin'] == 1) && $GLOBALS['TYPO3_CONF_VARS']['FE']['lifetime'] > 0) {
$markerArray['###PERMALOGIN###'] = $this->pi_getLL('permalogin', '', 1);
if($GLOBALS['TYPO3_CONF_VARS']['FE']['permalogin'] == 1) {
......
}
break;
}
} elseif (($this->logintype == '') && ($redirMethod == 'login') && $this->conf['redirectPageLogin']) {
// if login and page not accessible
$whereToConf['parameter'] = $this->conf['redirectPageLogin'];
$whereToConf['linkAccessRestrictedPages'] = TRUE;
$this->cObj->typolink('', $whereToConf);
$redirect_url = $this->cObj->lastTypoLinkUrl;
} elseif (($this->logintype == '') && ($redirMethod == 'logout') && $this->conf['redirectPageLogout'] && $GLOBALS['TSFE']->loginUser) {
// if logout and page not accessible
$redirect_url = $this->pi_getPageLink(intval($this->conf['redirectPageLogout']), array(), true);
} elseif ($this->logintype === 'logout') { // after logout
// Hook for general actions after after logout has been confirmed
(2-2/2)