Project

General

Profile

Download (8.15 KB)

Feature #18226 » felogin_disableForgotPwdView.diff

Administrator Admin, 2008-02-16 03:47

View differences:

C:/Dokumente und Einstellungen/Dirk/Eigene Dateien/www/typo3_src-trunk/typo3/sysext/felogin/locallang_db.xml (working copy)
<label index="tt_content.pi_flexform.sheet_redirect">Redirect Options</label>
<label index="tt_content.pi_flexform.sheet_messages">Messages</label>
<label index="tt_content.pi_flexform.show_forgot_password">Show &quot;Forgot password?&quot; link:</label>
<label index="tt_content.pi_flexform.disable_forgot_password_view">Disable &quot;Forgot password?&quot; view:</label>
<label index="tt_content.pi_flexform.show_permalogin">Show &quot;Stay logged in&quot; checkbox (if switched on for the installation):</label>
<label index="tt_content.pi_flexform.groupSelectmode">FE group select mode:</label>
<label index="tt_content.pi_flexform.groupSelectmode_showAll">Show all</label>
......
<label index="tt_content.pi_flexform.redirectPageLoginError">After login with error redirect to page:</label>
<label index="tt_content.pi_flexform.redirectPageLogout">After logout redirect to page:</label>
<label index="tt_content.pi_flexform.template_file">Template file:</label>
</languageKey>
<languageKey index="dk" type="array">
......
<label index="tt_content.pi_flexform.sheet_status">Status</label>
<label index="tt_content.pi_flexform.sheet_logout">Abmelden</label>
<label index="tt_content.pi_flexform.show_forgot_password">&quot;Passwort vergessen?&quot; Link anzeigen:</label>
<label index="tt_content.pi_flexform.disable_forgot_password_view">&quot;Passwort vergessen?&quot; Ansicht deaktivieren:</label>
<label index="tt_content.pi_flexform.show_permalogin">&quot;Eingeloggt bleiben&quot; checkbox anzeigen (wenn auf dem System verfügbar:</label>
<label index="tt_content.pi_flexform.groupSelectmode">FE-Gruppen Auswahlmodus:</label>
<label index="tt_content.pi_flexform.groupSelectmode_showAll">Alle anzeigen</label>
......
<label index="tt_content.pi_flexform.redirectPageLogin">Nach erfolgreichem Login auf folgende Seite weiterleiten:</label>
<label index="tt_content.pi_flexform.template_file">Template:</label>
<label index="felogin_redirPid">Beim Login weiterleiten zur Seite...</label>
</languageKey>
<languageKey index="no" type="array">
<label index="tt_content.pi_flexform.header">Overskrift:</label>
C:/Dokumente und Einstellungen/Dirk/Eigene Dateien/www/typo3_src-trunk/typo3/sysext/felogin/flexform.xml (working copy)
</config>
</TCEforms>
</showForgotPassword>
<disableForgotPasswordView>
<TCEforms>
<label>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.disable_forgot_password_view</label>
<config>
<type>check</type>
</config>
</TCEforms>
</disableForgotPasswordView>
<showPermaLogin>
<TCEforms>
<label>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.show_permalogin</label>
......
</config>
</TCEforms>
</templateFile>
</el>
</el>
</ROOT>
</sDEF>
<s_redirect>
C:/Dokumente und Einstellungen/Dirk/Eigene Dateien/www/typo3_src-trunk/typo3/sysext/felogin/pi1/class.tx_felogin_pi1.php (working copy)
// What to display
$content='';
if ($this->piVars['forgot']) {
if ($this->piVars['forgot'] && !$this->conf['disableForgotPasswordView']) {
$content .= $this->showForgot();
} else {
if($this->userIsLoggedIn && !$this->logintype) {
......
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->piVars['forgot'] && $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('disableForgotPasswordView', 'sDEF'))
$flex['disableForgotPasswordView'] = $this->flexFormValue('disableForgotPasswordView','sDEF');
if ($this->flexFormValue('showPermaLogin', 'sDEF'))
$flex['showPermaLogin'] = $this->flexFormValue('showPermaLogin', 'sDEF');
......
}
return $pass;
}
/**
* Returns the header / message value from flexform if present, else from locallang.xml
*
    (1-1/1)