Attachment 'email.activataion.1.1.4-1.6.diff'
Download 1 diff -uNr old/data/plugin/action/EmailActivation.py new/data/plugin/action/EmailActivation.py
2 --- old/data/plugin/action/EmailActivation.py 2007-11-22 22:17:56.000000000 +0100
3 +++ new/data/plugin/action/EmailActivation.py 2008-03-29 19:51:54.000000000 +0100
4 @@ -31,4 +31,4 @@
5 message, html = action(pagename, request)
6 if message:
7 pagename = request.cfg.page_front_page
8 - Page.Page(request, pagename).send_page(request, msg=message)
9 + Page.Page(request, pagename).send_page(msg=message)
10 diff -uNr old/data/plugin/action/__init__.py new/data/plugin/action/__init__.py
11 --- old/data/plugin/action/__init__.py 2007-04-09 03:24:06.000000000 +0200
12 +++ new/data/plugin/action/__init__.py 1970-01-01 01:00:00.000000000 +0100
13 @@ -1,5 +0,0 @@
14 -# -*- coding: iso-8859-1 -*-
15 -
16 -from MoinMoin.util import pysupport
17 -
18 -modules = pysupport.getPackageModules(__file__)
19 diff -uNr old/data/plugin/action/userform.py new/data/plugin/action/userform.py
20 --- old/data/plugin/action/userform.py 2007-11-22 22:17:56.000000000 +0100
21 +++ new/data/plugin/action/userform.py 2008-03-29 19:57:59.000000000 +0100
22 @@ -57,4 +57,5 @@
23 new_message = userform_action(request, u)
24 if new_message != None:
25 message = new_message
26 - Page.Page(request, pagename).send_page(request, msg=message)
27 + Page.Page(request, pagename).send_page(msg=message)
28 +
29 diff -uNr old/data/plugin/macro/EmailActivation.py new/data/plugin/macro/EmailActivation.py
30 --- old/data/plugin/macro/EmailActivation.py 2007-11-22 22:17:56.000000000 +0100
31 +++ new/data/plugin/macro/EmailActivation.py 2008-03-29 21:32:10.000000000 +0100
32 @@ -27,6 +27,7 @@
33 from MoinMoin import user
34 from MoinMoin import util
35 from MoinMoin import wikiutil
36 +from MoinMoin.mail.sendmail import sendmail
37
38 #
39 # Macro entry point.
40 @@ -78,7 +79,7 @@
41 u.disabled = 1
42 u.valid = 0
43 u.save()
44 - mailok, msg = util.mail.sendmail(
45 + mailok, msg = sendmail(
46 request, email_to, email_subject, email_text)
47 return message
48
49 @@ -137,8 +138,8 @@
50 <b>Thanks for coming back!</b>
51 </font></p>
52 <ul>
53 - <li>Name: %(user-name)s.</li>
54 - <li>Email: %(user-email)s.</li>
55 + <li>Name: %(user-name)s</li>
56 + <li>Email: %(user-email)s</li>
57 </ul>
58 <p>
59 If these details are correct then click the
60 @@ -582,7 +583,7 @@
61 email_data = emailActivation_email('activate', request, u, url)
62 if email_data != None:
63 email_to, email_subject, email_text, cookie_expire, message = email_data
64 - mailok, msg = util.mail.sendmail(
65 + mailok, msg = sendmail(
66 request, email_to, email_subject, email_text)
67 return modified
68
69 @@ -599,7 +600,7 @@
70 email_data = emailActivation_email('cancel', request, u, '')
71 if email_data != None:
72 email_to, email_subject, email_text, cookie_expire, message = email_data
73 - mailok, msg = util.mail.sendmail(
74 + mailok, msg = sendmail(
75 request, email_to, email_subject, email_text)
76 return 1
77
78 diff -uNr old/underlay/pages/EmailActivation/revisions/00000000 new/underlay/pages/EmailActivation/revisions/00000000
79 --- old/underlay/pages/EmailActivation/revisions/00000000 2007-04-09 04:05:28.000000000 +0200
80 +++ new/underlay/pages/EmailActivation/revisions/00000000 2008-03-29 19:50:19.000000000 +0100
81 @@ -1,7 +1,7 @@
82 = Activate your Wiki Account! =
83
84 -[[EmailActivation]]
85 +<<EmailActivation>>
86
87 ----
88
89 -This page was generated by the [http://moinmoin.wikiwikiweb.de/RussellStuart/EmailActivation MoinMoin EmailActivation plugin].
90 +This page was generated by the [[http://moinmo.in/RussellStuart/EmailActivation|MoinMoin EmailActivation plugin]].
91
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.