Bug #18224 » felogin_forgetpwd.diff
| C:/Dokumente und Einstellungen/Dirk/Eigene Dateien/www/typo3_src-trunk/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'))
|
||
| ... | ... | |
|
}
|
||
|
return $pass;
|
||
|
}
|
||
|
|
||
|
/**
|
||
|
* Returns the header / message value from flexform if present, else from locallang.xml
|
||
|
*
|
||