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.8]
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -45,10 +45,21 @@ 45 45 #end 46 46 #set ($userObj = $userDoc.getObject('XWiki.XWikiUsers')) 47 47 #end 48 - #set ($errorDisplayed = false) 49 - #if ($userObj && !$userDoc.getObject('XWiki.LDAPProfileClass')) 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 50 50 #set ($userEmail = $userObj.getProperty('email').value) 51 - #if ("$!userEmail" != '') 58 + #if ("$!userEmail" == '') 59 + 60 + {{error}}{{translation key="xe.admin.passwordReset.error.noEmail"/}}{{/error}} 61 + 62 + #else 52 52 ## Find the object that will hold the verification string 53 53 #set ($verifObj = '') 54 54 #set ($verifObj = $userDoc.getObject($verifClass, true)) ... ... @@ -70,7 +70,7 @@ 70 70 #set ($message = $services.mail.sender.createMessage('template', $mailTemplateReference, $mailParameters)) 71 71 #set ($discard = $message.setType('Reset Password')) 72 72 #macro (displayError $text) 73 - #set ($errorDisplayed = true)84 + 74 74 {{html}} 75 75 <div class="xwikirenderingerror" title="Click to get more details about the error" style="cursor: pointer;"> 76 76 $services.localization.render('xe.admin.passwordReset.error.emailFailed') ... ... @@ -95,16 +95,15 @@ 95 95 #if ($failedMailStatuses.hasNext()) 96 96 #set ($mailStatus = $failedMailStatuses.next()) 97 97 #displayError($mailStatus.errorDescription) 109 + #else 110 + 111 + {{info}}$services.localization.render('xe.admin.passwordReset.emailSent', ["$userDoc.display('email', $userObj)"]){{/info}} 112 + 98 98 #end 99 99 #end 100 100 #end 101 101 #end 102 102 #end 103 - #if (!$errorDisplayed) 104 - 105 - {{info}}$services.localization.render('xe.admin.passwordReset.emailSentToUsername', ["$escapetool.xml(${userName})"]){{/info}} 106 - 107 - #end 108 108 [[{{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')]] 109 109 #end 110 110 ## Clear private variables, so that they cannot be accessed from the rest of the page (comments, panels...)