Summary

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

Details

Page properties

Content

...	...	@@ -14,8 +14,7 @@
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		-## First step, display the form requesting the username
18		-#if ($userName == '' || !$services.csrf.isTokenValid($request.form_token))
	17	+#if ($userName == '')## First step, display the form requesting the username
19	19	{{translation key="xe.admin.passwordReset.instructions"/}}
20	20
21	21	{{html}}
...	...	@@ -36,15 +36,6 @@
36	36	## Check if the user exists and has a valid email address configured in his profile
37	37	#set ($userObj = '')
38	38	#set ($userObj = $userDoc.getObject('XWiki.XWikiUsers'))
39		- ## If local user does not exist check global user
40		- #if (!$userObj && ${xcontext.database} != ${xcontext.mainWikiName})
41		- #if ($userName.indexOf('.') != -1)
42		- #set ($userDoc = $xwiki.getDocumentAsAuthor("${xcontext.mainWikiName}:${userName}"))
43		- #else
44		- #set ($userDoc = $xwiki.getDocumentAsAuthor("${xcontext.mainWikiName}:XWiki.${userName}"))
45		- #end
46		- #set ($userObj = $userDoc.getObject('XWiki.XWikiUsers'))
47		- #end
48	48	#if (!$userObj)
49	49
50	50	{{warning}}$services.localization.render('xe.admin.passwordReset.error.noUser', ["//${escapetool.xml($userName)}//"]){{/warning}}
...	...	@@ -69,16 +69,15 @@
69	69	#set ($discard = $verifObj.set('verification', $verifStr))
70	70	#set ($discard = $userDoc.saveAsAuthor($services.localization.render('xe.admin.passwordReset.versionComment'), true))
71	71	## Compose the verification URL
72		- #set ($userDocRef = $escapetool.url($services.model.serialize($userDoc.documentReference, 'default')))
73		- #set ($passwordResetURL = $xwiki.getDocument("XWiki.ResetPasswordComplete").getExternalURL('view', "u=${userDocRef}&v=${verifStr}"))
	62	+ #set ($passwordResetURL = $xwiki.getDocument('XWiki.ResetPasswordComplete').getExternalURL('view', "u=${userName}&v=${verifStr}"))
74	74	## Send the email
75		- #set ($from = $services.mail.sender.configuration.fromAddress)
	64	+ #set ($from = $services.mailsender.configuration.fromAddress)
76	76	#if ("$!from" == '')
77	77	#set ($from = "no-reply@${request.serverName}")
78	78	#end
79	79	#set ($mailTemplateReference = $services.model.createDocumentReference('', 'XWiki', 'ResetPasswordMailContent'))
80	80	#set ($mailParameters = {'from' : $from, 'to' : $userEmail, 'language' : $xcontext.locale})
81		- #set ($message = $services.mail.sender.createMessage('template', $mailTemplateReference, $mailParameters))
	70	+ #set ($message = $services.mailsender.createMessage('template', $mailTemplateReference, $mailParameters))
82	82	#set ($discard = $message.setType('Reset Password'))
83	83	#macro (displayError $text)
84	84
...	...	@@ -93,14 +93,14 @@
93	93
94	94	#end
95	95	## Check for an error constructing the message!
96		- #if ($services.mail.sender.lastError)
97		- #displayError($exceptiontool.getStackTrace($services.mail.sender.lastError))
	85	+ #if ($services.mailsender.lastError)
	86	+ #displayError($exceptiontool.getStackTrace($services.mailsender.lastError))
98	98	#else
99	99	## Send the message and wait for it to be sent or for any error to be raised.
100		- #set ($mailResult = $services.mail.sender.send([$message], 'database'))
	89	+ #set ($mailResult = $services.mailsender.send([$message], 'database'))
101	101	## Check for errors during the send
102		- #if ($services.mail.sender.lastError)
103		- #displayError($exceptiontool.getStackTrace($services.mail.sender.lastError))
	91	+ #if ($services.mailsender.lastError)
	92	+ #displayError($exceptiontool.getStackTrace($services.mailsender.lastError))
104	104	#else
105	105	#set ($failedMailStatuses = $mailResult.statusResult.getAllErrors())
106	106	#if ($failedMailStatuses.hasNext())