dbp/linamh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

correct patch

Browse Source 
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@874 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
2009-03-15 07:30:24 +00:00
parent 9417763d39
commit 083ae0a5aa
2 changed files with 53 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
www-apps/trac-acct_mgr/files/RegistrationConfirmationPatch.diff
View File

@@ -8,8 +8,8 @@ IRegistrationConfirmation extension point that enables pluggable
verifications for new user registration.
diff -Naur trac-acct_mgr-0.2.1.orig/acct_mgr/api.py trac-acct_mgr-0.2.1/acct_mgr/api.py
--- trac-acct_mgr-0.2.1.orig/acct_mgr/api.py 2009-03-15 06:40:44.875670135 +0000
+++ trac-acct_mgr-0.2.1/acct_mgr/api.py 2009-03-15 06:41:38.225188601 +0000
--- trac-acct_mgr-0.2.1.orig/acct_mgr/api.py 2009-03-15 07:26:49.412311159 +0000
+++ trac-acct_mgr-0.2.1/acct_mgr/api.py 2009-03-15 07:27:13.305249903 +0000
@@ -77,6 +77,19 @@
"""User deleted
"""
@@ -31,24 +31,41 @@ diff -Naur trac-acct_mgr-0.2.1.orig/acct_mgr/api.py trac-acct_mgr-0.2.1/acct_mgr
"""The AccountManager component handles all user account management methods
provided by the IPasswordStore interface.
diff -Naur trac-acct_mgr-0.2.1.orig/acct_mgr/templates/register.html trac-acct_mgr-0.2.1/acct_mgr/templates/register.html
--- trac-acct_mgr-0.2.1.orig/acct_mgr/templates/register.html 2009-03-15 06:40:44.873359012 +0000
+++ trac-acct_mgr-0.2.1/acct_mgr/templates/register.html 2009-03-15 06:41:38.227503636 +0000
--- trac-acct_mgr-0.2.1.orig/acct_mgr/templates/register.html 2009-03-15 07:26:49.368327943 +0000
+++ trac-acct_mgr-0.2.1/acct_mgr/templates/register.html 2009-03-15 07:27:13.305249903 +0000
@@ -43,6 +43,11 @@
class="textwidget" size="20" />
</label>
</div>
+ <py:if test="extra_required_content">
+ <div>
+ ${Markup(extra_required_content)}
+ </div>
+ </py:if>
+ <py:if test="extra_required_content">
+ <div>
+ ${Markup(extra_required_content)}
+ </div>
+ </py:if>
</fieldset>
<fieldset>
<legend>Optional</legend>
diff -Naur trac-acct_mgr-0.2.1.orig/acct_mgr/web_ui.py trac-acct_mgr-0.2.1/acct_mgr/web_ui.py
--- trac-acct_mgr-0.2.1.orig/acct_mgr/web_ui.py 2009-03-15 06:40:44.875670135 +0000
+++ trac-acct_mgr-0.2.1/acct_mgr/web_ui.py 2009-03-15 06:59:06.581876742 +0000
@@ -394,19 +394,28 @@
--- trac-acct_mgr-0.2.1.orig/acct_mgr/web_ui.py 2009-03-15 07:26:49.412311159 +0000
+++ trac-acct_mgr-0.2.1/acct_mgr/web_ui.py 2009-03-15 07:27:13.307559560 +0000
@@ -27,6 +27,7 @@
from genshi.builder import tag
from api import AccountManager
+from api import IRegistrationConfirmation
from acct_mgr.util import urandom
def _create_user(req, env, check_permissions=True):
@@ -351,6 +352,8 @@
implements(INavigationContributor, IRequestHandler, ITemplateProvider)
+ listeners = ExtensionPoint(IRegistrationConfirmation)
+
def __init__(self):
self._enable_check(log=True)
@@ -394,19 +397,28 @@
'name' : None,
'email' : None,
},
@@ -63,42 +80,41 @@ diff -Naur trac-acct_mgr-0.2.1.orig/acct_mgr/web_ui.py trac-acct_mgr-0.2.1/acct_
- formdata = getattr(e, 'acctmgr', None)
- if formdata:
- data['acctmgr'] = formdata
- else:
- raise e
- else:
- req.redirect(req.href.login())
+ for listener in self.listeners:
+ error = listener.verify_registration(req)
+ if error is not None:
+ break
+ data['registration_error'] = error
+ if error is None:
+ try:
+ _create_user(req, self.env)
+ except TracError, e:
+ data['registration_error'] = e.message
+ formdata = getattr(e, 'acctmgr', None)
+ if formdata:
+ data['acctmgr'] = formdata
+ else:
+ raise e
+ else:
+ req.redirect(req.href.login())
+ try:
+ _create_user(req, self.env)
+ except TracError, e:
+ data['registration_error'] = e.message
+ formdata = getattr(e, 'acctmgr', None)
+ if formdata:
+ data['acctmgr'] = formdata
+ else:
+ raise e
else:
- raise e
- else:
- req.redirect(req.href.login())
+ req.redirect(req.href.login())
+
data['reset_password_enabled'] = \
(self.env.is_component_enabled(AccountModule)
and NotificationSystem(self.env).smtp_enabled)
@@ -414,6 +423,14 @@
@@ -414,6 +426,14 @@
return 'register.html', data, None
+ def _get_extra_content(self, req):
+ ret = ""
+ for listener in self.listeners:
+ response = listener.pre_registration(req)
+ if response is not None:
+ ret += response
+ return ret
+ def _get_extra_content(self, req):
+ ret = ""
+ for listener in self.listeners:
+ response = listener.pre_registration(req)
+ if response is not None:
+ ret += response
+ return ret
+
# ITemplateProvider