summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Vagelpohl <jens@netz.ooo>2005-09-20 15:46:21 +0000
committerJens Vagelpohl <jens@netz.ooo>2005-09-20 15:46:21 +0000
commit99a844ea0efe20f1d06c025b5f0b2274dd530422 (patch)
tree67786e5e61139617142a7c338c502caaf25e36c2
parent066634aaa188c2035d6a45a692e5837bcdc28ff0 (diff)
downloadCMFLDAP-99a844ea0efe20f1d06c025b5f0b2274dd530422.zip
CMFLDAP-99a844ea0efe20f1d06c025b5f0b2274dd530422.tar.gz
- Clean up unneded stuff
-rw-r--r--LDAPMemberDataTool.py19
-rw-r--r--LDAPMembershipTool.py34
-rw-r--r--skins/cmfldap/mail_password_form.pt34
-rw-r--r--skins/cmfldap/mail_password_template.dtml17
4 files changed, 1 insertions, 103 deletions
diff --git a/LDAPMemberDataTool.py b/LDAPMemberDataTool.py
index fc90fca..e25e80d 100644
--- a/LDAPMemberDataTool.py
+++ b/LDAPMemberDataTool.py
@@ -279,14 +279,6 @@ InitializeClass(LDAPMemberDataTool)
class LDAPMemberData(MemberData):
""" Member Data wrapper for the LDAP-driven Member Data Tool """
- #def __init__(self, tool, id):
- # """ class constructor """
- # self.id = id
- # # Make a temporary reference to the tool.
- # # The reference will be removed by notifyModified().
- # self._tool = tool
-
-
def setMemberProperties(self, mapping):
""" Sets the properties of the member. """
acl = self.acl_users
@@ -384,14 +376,5 @@ class LDAPMemberData(MemberData):
return pwd
-InitializeClass(LDAPMemberData)
-
-#def manage_addLDAPMemberDataTool(self, REQUEST=None):
-# """ Add an LDAP-based MemberDataTool """
-# tool_obj = LDAPMemberDataTool()
-# self._setObject(tool_obj.id, tool_obj)
-#
-# if REQUEST is not None:
-# return self.manage_main(self, REQUEST)
-#
+InitializeClass(LDAPMemberData)
diff --git a/LDAPMembershipTool.py b/LDAPMembershipTool.py
index 1490411..5081c08 100644
--- a/LDAPMembershipTool.py
+++ b/LDAPMembershipTool.py
@@ -26,10 +26,6 @@ class LDAPMembershipTool(MembershipTool):
title = 'LDAP Membership Tool'
- #def __init__(self, id='portal_membership'):
- # self.id = id
-
-
security.declarePrivate('addMember')
def addMember(self, id, password, roles, domains, properties=None):
""" Adds a new member to the user folder. Security checks will have
@@ -104,35 +100,5 @@ class LDAPMembershipTool(MembershipTool):
return tuple(member_ids)
- #security.declareProtected(View, 'memberExists')
- #def memberExists(self, properties):
- # """ Does the incoming set of data collide with an existing member? """
- # acl = self.acl_users
- # rdn_attr = acl.getProperty('_rdnattr')
- # login_attr = acl.getProperty('_login_attr')
-
- # my_rdn = properties.get(rdn_attr, None)
- # my_login = properties.get('username')
-
- # if not acl.isUnique(login_attr, my_login):
- # return 'Login name'
-
- # if not acl.isUnique(rdn_attr, my_rdn):
- # return 'Name'
-
- # return 0
-
InitializeClass(LDAPMembershipTool)
-
-
-#def manage_addLDAPMembershipTool(self, REQUEST=None):
-# """ Add an LDAP-based Membership Tool """
-#
-# tool_obj = LDAPMembershipTool()
-# self._setObject(tool_obj.id, tool_obj)
-#
-# if REQUEST is not None:
-# return self.manage_main(self, REQUEST)
-#
-
diff --git a/skins/cmfldap/mail_password_form.pt b/skins/cmfldap/mail_password_form.pt
deleted file mode 100644
index ab1afde..0000000
--- a/skins/cmfldap/mail_password_form.pt
+++ /dev/null
@@ -1,34 +0,0 @@
-<html xmlns:tal="http://xml.zope.org/namespaces/tal"
- xmlns:metal="http://xml.zope.org/namespaces/metal"
- metal:use-macro="here/main_template/macros/master">
-<body>
-<div metal:fill-slot="main">
-<div class="Desktop">
-
-<h1> Don't panic!</h1>
-
-<p> Just enter your username below, click <em>Send</em>, and your password
- will be mailed to you if you gave a valid email address when you signed on.
-</p>
-
-<p>
- The password you receive will be a new, automatically generated password.
- You can change it again after logging in.
-</p>
-
-<p> If this will not work for you (for example, if you forget your member
- name or didn't enter your email address) send email to
- <a tal:attributes="href string:mailto:${here/portal_properties/email_from_address}"
- tal:content="here/portal_properties/email_from_address"
- href="mailto:me@here.com">me@here.com</a>.
-</p>
-
- <form action="mail_password">
- <input name="userid">
- <input type="submit" value=" Send ">
- </form>
-</div>
-</div>
-</body>
-</html>
-
diff --git a/skins/cmfldap/mail_password_template.dtml b/skins/cmfldap/mail_password_template.dtml
deleted file mode 100644
index 8d75874..0000000
--- a/skins/cmfldap/mail_password_template.dtml
+++ /dev/null
@@ -1,17 +0,0 @@
-<dtml-with portal_properties>
-From: "&dtml-email_from_name;" <&dtml-email_from_address;>
-To: <dtml-var "member.mail">
-Errors-to: <&dtml-email_from_address;>
-Subject: Membership reminder
-
-Your password: <dtml-var password>
-
-This is a newly generated password.
-
-You can switch back to your old password by logging
-in with this new password and then selecting "Click here to change
-your password" on the Preferences screen.
-
-Request made by IP <dtml-var "REQUEST.REMOTE_ADDR"> at <dtml-var ZopeTime>
-</dtml-with>
-