Modifications pour le document Mot de passe oublié ?

Résumé

• Propriétés de la Page (1 modifications, 0 ajouts, 0 suppressions)

Détails

Propriétés de la Page

Contenu

...	...	@@ -35,15 +35,6 @@
35	35	## Check if the user exists and has a valid email address configured in his profile
36	36	#set ($userObj = '')
37	37	#set ($userObj = $userDoc.getObject('XWiki.XWikiUsers'))
38		- ## If local user does not exist check global user
39		- #if (!$userObj && ${xcontext.database} != ${xcontext.mainWikiName})
40		- #if ($userName.indexOf('.') != -1)
41		- #set ($userDoc = $xwiki.getDocumentAsAuthor("${xcontext.mainWikiName}:${userName}"))
42		- #else
43		- #set ($userDoc = $xwiki.getDocumentAsAuthor("${xcontext.mainWikiName}:XWiki.${userName}"))
44		- #end
45		- #set ($userObj = $userDoc.getObject('XWiki.XWikiUsers'))
46		- #end
47	47	#if (!$userObj)
48	48
49	49	{{warning}}$services.localization.render('xe.admin.passwordReset.error.noUser', ["//${escapetool.xml($userName)}//"]){{/warning}}
...	...	@@ -68,16 +68,15 @@
68	68	#set ($discard = $verifObj.set('verification', $verifStr))
69	69	#set ($discard = $userDoc.saveAsAuthor($services.localization.render('xe.admin.passwordReset.versionComment'), true))
70	70	## Compose the verification URL
71		- #set ($userDocRef = $escapetool.url($services.model.serialize($userDoc.documentReference, 'default')))
72		- #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}"))
73	73	## Send the email
74		- #set ($from = $services.mail.sender.configuration.fromAddress)
	64	+ #set ($from = $services.mailsender.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.mail.sender.createMessage('template', $mailTemplateReference, $mailParameters))
	70	+ #set ($message = $services.mailsender.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.mail.sender.lastError)
96		- #displayError($exceptiontool.getStackTrace($services.mail.sender.lastError))
	85	+ #if ($services.mailsender.lastError)
	86	+ #displayError($exceptiontool.getStackTrace($services.mailsender.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.mail.sender.send([$message], 'database'))
	89	+ #set ($mailResult = $services.mailsender.send([$message], 'database'))
100	100	## Check for errors during the send
101		- #if ($services.mail.sender.lastError)
102		- #displayError($exceptiontool.getStackTrace($services.mail.sender.lastError))
	91	+ #if ($services.mailsender.lastError)
	92	+ #displayError($exceptiontool.getStackTrace($services.mailsender.lastError))
103	103	#else
104	104	#set ($failedMailStatuses = $mailResult.statusResult.getAllErrors())
105	105	#if ($failedMailStatuses.hasNext())