Summary

• Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

...	...	@@ -14,7 +14,8 @@
14	14	## The name of the class used for storing password reset verification data.
15	15	#set ($verifClass = 'XWiki.ResetPasswordRequestClass')
16	16	#set ($userName = "$!request.get('u')")
17		-#if ($userName == '')## First step, display the form requesting the username
	17	+## First step, display the form requesting the username
	18	+#if ($userName == '' || !$services.csrf.isTokenValid($request.form_token))
18	18	{{translation key="xe.admin.passwordReset.instructions"/}}
19	19
20	20	{{html}}
...	...	@@ -71,13 +71,13 @@
71	71	#set ($userDocRef = $escapetool.url($services.model.serialize($userDoc.documentReference, 'default')))
72	72	#set ($passwordResetURL = $xwiki.getDocument("XWiki.ResetPasswordComplete").getExternalURL('view', "u=${userDocRef}&v=${verifStr}"))
73	73	## Send the email
74		- #set ($from = $services.mailsender.configuration.fromAddress)
	75	+ #set ($from = $services.mail.sender.configuration.fromAddress)
75	75	#if ("$!from" == '')
76	76	#set ($from = "no-reply@${request.serverName}")
77	77	#end
78	78	#set ($mailTemplateReference = $services.model.createDocumentReference('', 'XWiki', 'ResetPasswordMailContent'))
79	79	#set ($mailParameters = {'from' : $from, 'to' : $userEmail, 'language' : $xcontext.locale})
80		- #set ($message = $services.mailsender.createMessage('template', $mailTemplateReference, $mailParameters))
	81	+ #set ($message = $services.mail.sender.createMessage('template', $mailTemplateReference, $mailParameters))
81	81	#set ($discard = $message.setType('Reset Password'))
82	82	#macro (displayError $text)
83	83
...	...	@@ -92,14 +92,14 @@
92	92
93	93	#end
94	94	## Check for an error constructing the message!
95		- #if ($services.mailsender.lastError)
96		- #displayError($exceptiontool.getStackTrace($services.mailsender.lastError))
	96	+ #if ($services.mail.sender.lastError)
	97	+ #displayError($exceptiontool.getStackTrace($services.mail.sender.lastError))
97	97	#else
98	98	## Send the message and wait for it to be sent or for any error to be raised.
99		- #set ($mailResult = $services.mailsender.send([$message], 'database'))
	100	+ #set ($mailResult = $services.mail.sender.send([$message], 'database'))
100	100	## Check for errors during the send
101		- #if ($services.mailsender.lastError)
102		- #displayError($exceptiontool.getStackTrace($services.mailsender.lastError))
	102	+ #if ($services.mail.sender.lastError)
	103	+ #displayError($exceptiontool.getStackTrace($services.mail.sender.lastError))
103	103	#else
104	104	#set ($failedMailStatuses = $mailResult.statusResult.getAllErrors())
105	105	#if ($failedMailStatuses.hasNext())