Project

General

Profile

Feature #20708 » 0011460.patch

Administrator Admin, 2009-07-01 19:49

View differences:

typo3/sysext/felogin/pi1/class.tx_felogin_pi1.php (Arbeitskopie)
}
// Process the redirect
if (($this->logintype === 'login' || $this->logintype === 'logout') && $this->redirectUrl) {
if (!$GLOBALS['TSFE']->fe_user->cookieId) {
$content .= '<p style="color:red; font-weight:bold;">' . $this->pi_getLL('cookie_warning', '', 1) . '</p>';
} else {
header('Location: '.t3lib_div::locationHeaderUrl($this->redirectUrl));
exit;
if (!$this->conf['redirectOnlyOnValidSubmit'] || $this->piVars['submit']) {
// Process the redirect
if (($this->logintype === 'login' || $this->logintype === 'logout') && $this->redirectUrl) {
if (!$GLOBALS['TSFE']->fe_user->cookieId) {
$content .= '<p style="color:red; font-weight:bold;">' . $this->pi_getLL('cookie_warning', '', 1) . '</p>';
} else {
header('Location: '.t3lib_div::locationHeaderUrl($this->redirectUrl));
exit;
}
}
}
return $this->conf['wrapContentInBaseClass'] ? $this->pi_wrapInBaseClass($content) : $content;
}
......
$markerArray['###FORGOT_PASSWORD_ENTEREMAIL###'] = $this->pi_getLL('forgot_password_enterEmail', '', 1);
$markerArray['###FORGOT_EMAIL###'] = $this->prefixId.'[forgot_email]';
$markerArray['###SEND_PASSWORD###'] = $this->pi_getLL('send_password', '', 1);
$markerArray['###PREFIX_ID###'] = $this->prefixId;
$markerArray = array_merge($markerArray, $this->getUserFieldMarkers());
return $this->cObj->substituteMarkerArrayCached($subpart, $markerArray, $subpartArray, $linkpartArray);
......
$markerArray['###STORAGE_PID###'] = $this->spid;
$markerArray['###USERNAME###'] = htmlspecialchars($GLOBALS['TSFE']->fe_user->user['username']);
$markerArray['###USERNAME_LABEL###'] = $this->pi_getLL('username', '', 1);
$markerArray['###PREFIX_ID###'] = $this->prefixId;
$markerArray = array_merge($markerArray, $this->getUserFieldMarkers());
if ($this->redirectUrl) {
......
$markerArray['###STORAGE_PID###'] = $this->spid;
$markerArray['###USERNAME_LABEL###'] = $this->pi_getLL('username', '', 1);
$markerArray['###REDIRECT_URL###'] = $gpRedirectUrl ? htmlspecialchars($gpRedirectUrl) : htmlspecialchars($this->redirectUrl);
$markerArray['###PREFIX_ID###'] = $this->prefixId;
$markerArray = array_merge($markerArray, $this->getUserFieldMarkers());
if ($this->flexFormValue('showForgotPassword','sDEF') || $this->conf['showForgotPasswordLink']) {
typo3/sysext/felogin/ext_typoscript_setup.txt (Arbeitskopie)
redirectPageLogin =
redirectPageLoginError =
redirectPageLogout =
redirectOnlyOnValidSubmit =
#disable redirect with one switch
redirectDisable =
typo3/sysext/felogin/template.html (Arbeitskopie)
<li>###STORAGE_PID### - explicit enough I guess (if not : id of the page where user are stored)</li>
<li>###STATUS_HEADER### - depends of the template</li>
<li>###STATUS_MESSAGE### - depends of the template</li>
<li>###PREFIX_ID### - contains the prefixId, e.g. tx_felogin_pi1</li>
</ul>
<h2>Wrap parts</h2>
......
<!--###PERMALOGIN_VALID###-->
<div>
<input type="submit" name="submit" value="###LOGIN_LABEL###" />
<input type="submit" name="###PREFIX_ID###[submit]" value="###LOGIN_LABEL###" />
</div>
<div class="felogin-hidden">
......
###USERNAME###
</div>
<div>
<input type="submit" name="submit" value="###LOGOUT_LABEL###" />
<input type="submit" name="###PREFIX_ID###[submit]" value="###LOGOUT_LABEL###" />
</div>
<div class="felogin-hidden">
......
<input type="text" name="###FORGOT_EMAIL###" id="###FORGOT_EMAIL###" />
</div>
<div>
<input type="submit" name="submit" value="###SEND_PASSWORD###" />
<input type="submit" name="###PREFIX_ID###[submit]" value="###SEND_PASSWORD###" />
</div>
</fieldset>
</form>
(1-1/2)