Fixed bug #9681: the Wrap for forgotMessage in the subpart ###TEMPLATE_FORGOT###...
authorIngo Renner <ingo.renner@typo3.org>
Tue, 4 Nov 2008 21:50:12 +0000 (21:50 +0000)
committerIngo Renner <ingo.renner@typo3.org>
Tue, 4 Nov 2008 21:50:12 +0000 (21:50 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/branches/TYPO3_4-2@4425 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/felogin/pi1/class.tx_felogin_pi1.php

index 454e539..c77d311 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2008-11-04  Ingo Renner  <ingo@typo3.org>
+
+       * Fixed bug #9681: the Wrap for forgotMessage in the subpart ###TEMPLATE_FORGOT### does not work (credits Steffen Kamper)
 
 2008-11-04  Martin Kutschker  <masi@typo3.org>
 
index 39a580f..7360856 100644 (file)
@@ -163,7 +163,7 @@ class tx_felogin_pi1 extends tslib_pibase {
                                }
 
                                $this->cObj->sendNotifyEmail($msg, $this->piVars['forgot_email'], '', $this->conf['email_from'], $this->conf['email_fromName'], $this->conf['replyTo']);
-                               $markerArray['###STATUS_MESSAGE###'] = sprintf($this->pi_getLL('ll_forgot_message_emailSent', '', 1),'<em>' . htmlspecialchars($this->piVars['forgot_email']) .'</em>');
+                               $markerArray['###STATUS_MESSAGE###'] = $this->cObj->stdWrap(sprintf($this->pi_getLL('ll_forgot_message_emailSent', '', 1), '<em>' . htmlspecialchars($this->piVars['forgot_email']) .'</em>'), $this->conf['forgotMessage_stdWrap.']);
                                $subpartArray['###FORGOT_FORM###'] = '';
 
 
@@ -212,7 +212,7 @@ class tx_felogin_pi1 extends tslib_pibase {
 
                if ($this->redirectUrl) {
                                // use redirectUrl for action tag because of possible access restricted pages
-                       $markerArray['###ACTION_URI###'] = $this->redirectUrl;
+                       $markerArray['###ACTION_URI###'] = htmlspecialchars($this->redirectUrl);
                        $this->redirectUrl = '';
                }
                return $this->cObj->substituteMarkerArrayCached($subpart, $markerArray, $subpartArray, $linkpartArray);
@@ -293,7 +293,7 @@ class tx_felogin_pi1 extends tslib_pibase {
                $markerArray['###PASSWORD_LABEL###'] = $this->pi_getLL('password', '', 1);
                $markerArray['###STORAGE_PID###'] = $this->spid;
                $markerArray['###USERNAME_LABEL###'] = $this->pi_getLL('username', '', 1);
-               $markerArray['###REDIRECT_URL###'] = $this->redirectUrl;
+               $markerArray['###REDIRECT_URL###'] = htmlspecialchars($this->redirectUrl);
 
                if ($this->flexFormValue('showForgotPassword','sDEF') || $this->conf['showForgotPasswordLink']) {
                        $linkpartArray['###FORGOT_PASSWORD_LINK###'] = explode('|',$this->getPageLink('|',array($this->prefixId.'[forgot]'=>1)));