From fdeee8c5a086b0260d34ef0f8f9d9125e9a62978 Mon Sep 17 00:00:00 2001 From: CBWhiz Date: Sun, 6 May 2012 22:12:12 -0300 Subject: [PATCH 1/2] add List.admin_url_part, default = 'admin'. My servers need 'admin.cgi'. --- django_mailman/models.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/django_mailman/models.py b/django_mailman/models.py index fc0aecd..f843049 100644 --- a/django_mailman/models.py +++ b/django_mailman/models.py @@ -7,6 +7,7 @@ from django.utils.translation import ugettext_lazy as _ from webcall import MultipartPostHandler +from django.conf import settings # Mailman-Messages for a successfull subscription SUBSCRIBE_MSG = ( @@ -105,6 +106,7 @@ class List(models.Model): password = models.CharField(max_length=50) email = models.EmailField(unique=True) main_url = models.URLField(verify_exists=False) + admin_url_part = models.CharField(max_length=20, default='admin') encoding = models.CharField(max_length=20, choices=LANGUAGES) class Meta: @@ -163,7 +165,7 @@ def get_admin_moderation_url(self): def subscribe(self, email, first_name=u'', last_name=u'', send_welcome_msg=False): from email.Utils import formataddr - url = '%s/admin/%s/members/add' % (self.main_url, self.name) + url = '%s/%s/%s/members/add' % (self.main_url, self.admin_url_part, self.name) first_name = check_encoding(first_name, self.encoding) last_name = check_encoding(last_name, self.encoding) @@ -182,7 +184,7 @@ def subscribe(self, email, first_name=u'', last_name=u'', send_welcome_msg=False raise Exception(error.encode(self.encoding)) def unsubscribe(self, email): - url = '%s/admin/%s/members/remove' % (self.main_url, self.name) + url = '%s/%s/%s/members/remove' % (self.main_url, self.admin_url_part, self.name) email = check_encoding(email, self.encoding) UNSUBSCRIBE_DATA['adminpw'] = self.password @@ -196,7 +198,7 @@ def unsubscribe(self, email): raise Exception(error.encode(self.encoding)) def get_all_members(self): - url = '%s/admin/%s/members/list' % (self.main_url, self.name) + url = '%s/%s/%s/members/list' % (self.main_url, self.admin_url_part, self.name) data = { 'adminpw': self.password } opener = urllib2.build_opener(MultipartPostHandler(self.encoding)) From 070d814867e8db5e91ad949fa723075ce50b4bab Mon Sep 17 00:00:00 2001 From: CBWhiz Date: Sun, 6 May 2012 22:22:10 -0300 Subject: [PATCH 2/2] Add admindb_url_part. My servers need admindb.cgi. --- django_mailman/models.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/django_mailman/models.py b/django_mailman/models.py index f843049..28986d4 100644 --- a/django_mailman/models.py +++ b/django_mailman/models.py @@ -107,6 +107,7 @@ class List(models.Model): email = models.EmailField(unique=True) main_url = models.URLField(verify_exists=False) admin_url_part = models.CharField(max_length=20, default='admin') + admindb_url_part = models.CharField(max_length=20, default='admindb') encoding = models.CharField(max_length=20, choices=LANGUAGES) class Meta: @@ -159,7 +160,7 @@ def __parse_member_content(self, content, encoding='iso-8859-1'): return (letters, members, chunks) def get_admin_moderation_url(self): - return '%s/admindb/%s/?adminpw=%s' % (self.main_url, self.name, + return '%s/%s/%s/?adminpw=%s' % (self.main_url, self.admindb_url_part, self.name, self.password) def subscribe(self, email, first_name=u'', last_name=u'', send_welcome_msg=False):