Project

General

Profile

Download (6.36 KB)

Bug #18224 » 20080216_felogin_forgetpwd.patch

Administrator Admin, 2008-02-16 13:32

View differences:

ChangeLog (working copy)
2008-02-15 Benjamin Mack <mack@xnos.org>
* Fixed bug #7549: FE Login: enabling forget password link via TS is not possible (thanks to Dirk Weise)
* Fixed bug #7424: Usersetup Tabs were to wide in German language (thanks to Steffen Kamper)
2008-02-14 Ingo Renner <ingo@typo3.org>
typo3/sysext/felogin/pi1/class.tx_felogin_pi1.php (working copy)
if($this->logintype === 'login') {
if($this->userIsLoggedIn) {
// login success
$markerArray['###STATUS_HEADER###'] = $this->getDisplayText('success_header',$this->conf['successHeader_stdWrap.']);
$markerArray['###STATUS_MESSAGE###'] = str_replace('###USER###',htmlspecialchars($GLOBALS['TSFE']->fe_user->user['username']),$this->getDisplayText('success_message',$this->conf['successMessage_stdWrap.']));
$markerArray['###STATUS_HEADER###'] = $this->getDisplayText('success_header',$this->conf['successHeader_stdWrap.']);
$markerArray['###STATUS_MESSAGE###'] = str_replace('###USER###',htmlspecialchars($GLOBALS['TSFE']->fe_user->user['username']),$this->getDisplayText('success_message',$this->conf['successMessage_stdWrap.']));
$subpartArray['###LOGIN_FORM###'] = '';
// Hook for general actions after after login has been confirmed (by Thomas Danzl <thomas@danzl.org>)
......
} else {
// login error
$markerArray['###STATUS_HEADER###'] = $this->getDisplayText('error_header',$this->conf['errorHeader_stdWrap.']);
$markerArray['###STATUS_MESSAGE###'] = $this->getDisplayText('error_message',$this->conf['errorMessage_stdWrap.']);
$markerArray['###STATUS_HEADER###'] = $this->getDisplayText('error_header',$this->conf['errorHeader_stdWrap.']);
$markerArray['###STATUS_MESSAGE###'] = $this->getDisplayText('error_message',$this->conf['errorMessage_stdWrap.']);
}
} else {
if($this->logintype === 'logout') {
// login form after logout
$markerArray['###STATUS_HEADER###'] = $this->getDisplayText('logout_header',$this->conf['welcomeHeader_stdWrap.']);
$markerArray['###STATUS_HEADER###'] = $this->getDisplayText('logout_header',$this->conf['welcomeHeader_stdWrap.']);
$markerArray['###STATUS_MESSAGE###'] = $this->getDisplayText('logout_message',$this->conf['welcomeMessage_stdWrap.']);
} else {
// login form
$markerArray['###STATUS_HEADER###'] = $this->getDisplayText('welcome_header',$this->conf['welcomeHeader_stdWrap.']);
$markerArray['###STATUS_HEADER###'] = $this->getDisplayText('welcome_header',$this->conf['welcomeHeader_stdWrap.']);
$markerArray['###STATUS_MESSAGE###'] = $this->getDisplayText('welcome_message',$this->conf['welcomeMessage_stdWrap.']);
}
}
......
$markerArray['###USERNAME_LABEL###'] = $this->pi_getLL('username', '', 1);
$markerArray['###REDIRECT_URL###'] = $this->redirectUrl;
if ($this->flexFormValue('showForgotPassword','sDEF')) {
if ($this->flexFormValue('showForgotPassword','sDEF') || $this->conf['showForgotPasswordLink']) {
$linkpartArray['###FORGOT_PASSWORD_LINK###'] = explode('|',$this->getPageLink('|',array($this->prefixId.'[forgot]'=>1)));
$markerArray['###FORGOT_PASSWORD###'] = $this->pi_getLL('ll_forgot_header', '', 1);
} else {
......
}
}
}
switch ($redirMethod) {
case 'logout':
if ($this->conf['redirectPageLogout']) {
......
*/
private function mergeflexFormValuesIntoConf() {
$flex = array();
if ($this->flexFormValue('showForgotPassword', 'sDEF'))
if ($this->flexFormValue('showForgotPassword', 'sDEF')) {
$flex['showForgotPassword'] = $this->flexFormValue('showForgotPassword','sDEF');
}
if ($this->flexFormValue('showPermaLogin', 'sDEF'))
if ($this->flexFormValue('showPermaLogin', 'sDEF')) {
$flex['showPermaLogin'] = $this->flexFormValue('showPermaLogin', 'sDEF');
}
if ($this->flexFormValue('pages', 'sDEF'))
if ($this->flexFormValue('pages', 'sDEF')) {
$flex['pages'] = $this->flexFormValue('pages', 'sDEF');
}
if ($this->flexFormValue('recursive', 'sDEF'))
if ($this->flexFormValue('recursive', 'sDEF')) {
$flex['recursive'] = $this->flexFormValue('recursive', 'sDEF');
]
if ($this->flexFormValue('templateFile', 'sDEF'))
if ($this->flexFormValue('templateFile', 'sDEF')) {
$flex['templateFile'] = $this->uploadDir . $this->flexFormValue('templateFile', 'sDEF');
}
if ($this->flexFormValue('redirectMode', 's_redirect'))
if ($this->flexFormValue('redirectMode', 's_redirect')) {
$flex['redirectMode'] = $this->flexFormValue('redirectMode', 's_redirect');
}
if ($this->flexFormValue('redirectFirstMethod', 's_redirect'))
if ($this->flexFormValue('redirectFirstMethod', 's_redirect')) {
$flex['redirectFirstMethod'] = $this->flexFormValue('redirectFirstMethod', 's_redirect');
}
if ($this->flexFormValue('redirectDisable', 's_redirect'))
if ($this->flexFormValue('redirectDisable', 's_redirect')) {
$flex['redirectDisable'] = $this->flexFormValue('redirectDisable', 's_redirect');
}
if ($this->flexFormValue('redirectPageLogin', 's_redirect'))
if ($this->flexFormValue('redirectPageLogin', 's_redirect')) {
$flex['redirectPageLogin'] = $this->flexFormValue('redirectPageLogin', 's_redirect');
}
if ($this->flexFormValue('redirectPageLoginError', 's_redirect'))
if ($this->flexFormValue('redirectPageLoginError', 's_redirect')) {
$flex['redirectPageLoginError'] = $this->flexFormValue('redirectPageLoginError','s_redirect');
}
if ($this->flexFormValue('redirectPageLogout', 's_redirect'))
if ($this->flexFormValue('redirectPageLogout', 's_redirect')) {
$flex['redirectPageLogout'] = $this->flexFormValue('redirectPageLogout', 's_redirect');
}
$pid = $flex['pages'] ? $this->pi_getPidList($flex['pages'], $flex['recursive']) : 0;
if ($pid > 0) {
if ($pid > 0) {
$flex['storagePid'] = $pid;
}
......
}
return $pass;
}
/**
* Returns the header / message value from flexform if present, else from locallang.xml
*
(2-2/2)