Attachment 'user.patch'
Download 1 diff -r f796dbb7e15b MoinMoin/config/multiconfig.py
2 --- a/MoinMoin/config/multiconfig.py Mon Sep 08 11:58:03 2008 +0200
3 +++ b/MoinMoin/config/multiconfig.py Mon Sep 08 18:59:51 2008 +0200
4 @@ -972,6 +972,9 @@
5 )),
6 # ==========================================================================
7 'various': ('Various', None, (
8 + ('superuser_mail_account_prologue', '', 'preambel of message text the superuser sends with the mail account data form in front of the login password recovery information'),
9 + ('superuser_mail_account_epilogue', '', 'epilog of message text the superuser sends with the mail account data form below the login password recovery information'),
10 +
11 ('bang_meta', True, 'if True, enable {{{!NoWikiName}}} markup'),
12 ('caching_formats', ['text_html'], "output formats that are cached; set to [] to turn off caching (useful for development)"),
13
14 diff -r f796dbb7e15b MoinMoin/user.py
15 --- a/MoinMoin/user.py Mon Sep 08 11:58:03 2008 +0200
16 +++ b/MoinMoin/user.py Mon Sep 08 18:59:51 2008 +0200
17 @@ -1018,6 +1018,7 @@
18 _ = self._request.getText
19
20 tok = self.generate_recovery_token()
21 + sysadm = self._request.form.get('sysadm', [''])[0]
22
23 text = '\n' + _("""\
24 Login Name: %s
25 @@ -1032,7 +1033,12 @@
26 url_quote_plus(self.name),
27 tok, )
28
29 - text = _("""\
30 + if self.valid and sysadm and self._request.cfg.superuser_mail_account_prologue:
31 + text = self._request.cfg.superuser_mail_account_prologue + text
32 + if self._request.cfg.superuser_mail_account_epilogue:
33 + text += self._request.cfg.superuser_mail_account_epilogue
34 + else:
35 + text = _("""\
36 Somebody has requested to email you a password recovery token.
37
38 If you lost your password, please go to the password reset URL below or
39 @@ -1040,7 +1046,6 @@
40 recovery token.
41 """) + text
42
43 -
44 subject = _('[%(sitename)s] Your wiki account data',
45 ) % {'sitename': self._cfg.sitename or "Wiki"}
46 mailok, msg = sendmail.sendmail(self._request, [self.email], subject,
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.