diff options
| author | mailman | 1998-04-08 05:38:53 +0000 |
|---|---|---|
| committer | mailman | 1998-04-08 05:38:53 +0000 |
| commit | 62512ddbe453d263792a60ab00b3e01f91e9cdfb (patch) | |
| tree | c765bc0324db51839508f8ce703f2f399858893c | |
| parent | 0deefee3d80aa7485841f0556eddf44e82883729 (diff) | |
| download | mailman-62512ddbe453d263792a60ab00b3e01f91e9cdfb.tar.gz mailman-62512ddbe453d263792a60ab00b3e01f91e9cdfb.tar.zst mailman-62512ddbe453d263792a60ab00b3e01f91e9cdfb.zip | |
| -rw-r--r-- | Mailman/MailList.py | 8 | ||||
| -rw-r--r-- | modules/maillist.py | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Mailman/MailList.py b/Mailman/MailList.py index 243f1ff49..e73f9fc1b 100644 --- a/Mailman/MailList.py +++ b/Mailman/MailList.py @@ -511,7 +511,7 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin, else: self.members.append(name) kind = "" - self.LogMsg("subscribe", "%s: new%s, %s", + self.LogMsg("subscribe", "%s: new%s %s", self._internal_name, kind, name) self.passwords[name] = password self.Save() @@ -649,7 +649,7 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin, self.forbidden_posters) if len(addrs): self.AddRequest('post', mm_utils.SnarfMessage(msg), - 'Post from a forbidden address.', + mm_err.FORBIDDEN_SENDER_MSG, msg.getheader('subject')) if len(self.posters): addrs = mm_utils.FindMatchingAddresses(sender, self.posters) @@ -681,7 +681,7 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin, if (self.require_explicit_destination and not self.HasExplicitDest(msg)): self.AddRequest('post', mm_utils.SnarfMessage(msg), - 'List is an implicit destination.', + mm_err.IMPLICIT_DEST_MSG, msg.getheader('subject')) if self.bounce_matching_headers: triggered = self.HasMatchingHeader(msg) @@ -689,7 +689,7 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin, # Darn - can't include the matching line for the admin # message because the info would also go to the sender. self.AddRequest('post', mm_utils.SnarfMessage(msg), - 'Suspicious header content.', + mm_err.SUSPICIOUS_HEADER_MSG, msg.getheader('subject')) if self.max_message_size > 0: if len(msg.body)/1024. > self.max_message_size: diff --git a/modules/maillist.py b/modules/maillist.py index 243f1ff49..e73f9fc1b 100644 --- a/modules/maillist.py +++ b/modules/maillist.py @@ -511,7 +511,7 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin, else: self.members.append(name) kind = "" - self.LogMsg("subscribe", "%s: new%s, %s", + self.LogMsg("subscribe", "%s: new%s %s", self._internal_name, kind, name) self.passwords[name] = password self.Save() @@ -649,7 +649,7 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin, self.forbidden_posters) if len(addrs): self.AddRequest('post', mm_utils.SnarfMessage(msg), - 'Post from a forbidden address.', + mm_err.FORBIDDEN_SENDER_MSG, msg.getheader('subject')) if len(self.posters): addrs = mm_utils.FindMatchingAddresses(sender, self.posters) @@ -681,7 +681,7 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin, if (self.require_explicit_destination and not self.HasExplicitDest(msg)): self.AddRequest('post', mm_utils.SnarfMessage(msg), - 'List is an implicit destination.', + mm_err.IMPLICIT_DEST_MSG, msg.getheader('subject')) if self.bounce_matching_headers: triggered = self.HasMatchingHeader(msg) @@ -689,7 +689,7 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin, # Darn - can't include the matching line for the admin # message because the info would also go to the sender. self.AddRequest('post', mm_utils.SnarfMessage(msg), - 'Suspicious header content.', + mm_err.SUSPICIOUS_HEADER_MSG, msg.getheader('subject')) if self.max_message_size > 0: if len(msg.body)/1024. > self.max_message_size: |