Attachment 'user_about.patch'
Download 1 diff -r 63016f784d88 MoinMoin/user.py
2 --- a/MoinMoin/user.py Mon Apr 05 23:37:52 2010 +0200
3 +++ b/MoinMoin/user.py Wed Apr 07 13:48:08 2010 +0200
4 @@ -1011,23 +1011,29 @@
5 _ = self._request.getText
6
7 tok = self.generate_recovery_token()
8 -
9 - text = '\n' + _("""\
10 + sysadm = self._request.values.get('sysadm', '')
11 + if self.valid and sysadm and hasattr(self._cfg, "about"):
12 + text = self._request.cfg.about % {"login_name": self.name,
13 + "recovery_token": tok,
14 + "base_url": self._request.url_root,
15 + "user_name": url_quote_plus(self.name)}
16 + else:
17 + text = '\n' + _("""\
18 Login Name: %s
19
20 Password recovery token: %s
21
22 Password reset URL: %s?action=recoverpass&name=%s&token=%s
23 """) % (
24 - self.name,
25 - tok,
26 - self._request.url_root,
27 - url_quote_plus(self.name),
28 - tok, )
29 -
30 - text = _("""\
31 + self.name,
32 + tok,
33 + self._request.url_root,
34 + url_quote_plus(self.name),
35 + tok, )
36 +
37 + text = _("""\
38 Somebody has requested to email you a password recovery token.
39 -
40 +
41 If you lost your password, please go to the password reset URL below or
42 go to the password recovery page again and enter your username and the
43 recovery token.
Attached Files
To refer to attachments on a page, use attachment:filename, as shown below in the list of files. Do NOT use the URL of the [get] link, since this is subject to change and can break easily.You are not allowed to attach a file to this page.