Changes for page Forgot your password?
Last modified by superadmin on 2021/12/03 15:30
Change comment:
Install extension [org.xwiki.platform:xwiki-platform-administration-ui/12.10.10]
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -45,21 +45,10 @@ 45 45 #end 46 46 #set ($userObj = $userDoc.getObject('XWiki.XWikiUsers')) 47 47 #end 48 - #if (!$userObj) 49 - 50 - {{warning}}$services.localization.render('xe.admin.passwordReset.error.noUser', ["//${escapetool.xml($userName)}//"]){{/warning}} 51 - 52 - #elseif ($userDoc.getObject('XWiki.LDAPProfileClass')) 53 - 54 - {{warning}}$services.localization.render('xe.admin.passwordReset.error.ldapUser', ["//${escapetool.xml($userName)}//"]){{/warning}} 55 - 56 - #else 48 + #set ($errorDisplayed = false) 49 + #if ($userObj && !$userDoc.getObject('XWiki.LDAPProfileClass')) 57 57 #set ($userEmail = $userObj.getProperty('email').value) 58 - #if ("$!userEmail" == '') 59 - 60 - {{error}}{{translation key="xe.admin.passwordReset.error.noEmail"/}}{{/error}} 61 - 62 - #else 51 + #if ("$!userEmail" != '') 63 63 ## Find the object that will hold the verification string 64 64 #set ($verifObj = '') 65 65 #set ($verifObj = $userDoc.getObject($verifClass, true)) ... ... @@ -81,7 +81,7 @@ 81 81 #set ($message = $services.mail.sender.createMessage('template', $mailTemplateReference, $mailParameters)) 82 82 #set ($discard = $message.setType('Reset Password')) 83 83 #macro (displayError $text) 84 - 73 + #set ($errorDisplayed = true) 85 85 {{html}} 86 86 <div class="xwikirenderingerror" title="Click to get more details about the error" style="cursor: pointer;"> 87 87 $services.localization.render('xe.admin.passwordReset.error.emailFailed') ... ... @@ -106,15 +106,16 @@ 106 106 #if ($failedMailStatuses.hasNext()) 107 107 #set ($mailStatus = $failedMailStatuses.next()) 108 108 #displayError($mailStatus.errorDescription) 109 - #else 110 - 111 - {{info}}$services.localization.render('xe.admin.passwordReset.emailSent', ["$userDoc.display('email', $userObj)"]){{/info}} 112 - 113 113 #end 114 114 #end 115 115 #end 116 116 #end 117 117 #end 103 + #if (!$errorDisplayed) 104 + 105 + {{info}}$services.localization.render('xe.admin.passwordReset.emailSentToUsername', ["$escapetool.xml(${userName})"]){{/info}} 106 + 107 + #end 118 118 [[{{translation key="xe.admin.passwordReset.error.retry"/}}>>$doc.fullName]] | [[{{translation key="xe.admin.passwordReset.error.recoverUsername"/}}>>ForgotUsername]] | [[{{translation key="xe.admin.passwordReset.login"/}}>>path:$xwiki.getURL('XWiki.XWikiLogin', 'login')]] 119 119 #end 120 120 ## Clear private variables, so that they cannot be accessed from the rest of the page (comments, panels...)