federico/django-mailbox
1
0
Fork 0
forked from mirror/django-mailbox
Code Activity

Allow specification of from e-mail on mailbox model.

Browse source
This commit is contained in:
Adam Coddington 2012-10-28 12:25:37 -07:00
parent 188ac8093b
commit 77acc09e2f
2 changed files with 69 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

46
django_mailbox/migrations/0010_auto__add_field_mailbox_from_email.py Normal file
View file

@ -0,0 +1,46 @@
# -*- coding: utf-8 -*-
import datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models
class Migration(SchemaMigration):
def forwards(self, orm):
# Adding field 'Mailbox.from_email'
db.add_column('django_mailbox_mailbox', 'from_email',
self.gf('django.db.models.fields.CharField')(default=None, max_length=255, null=True, blank=True),
keep_default=False)
def backwards(self, orm):
# Deleting field 'Mailbox.from_email'
db.delete_column('django_mailbox_mailbox', 'from_email')
models = {
'django_mailbox.mailbox': {
'Meta': {'object_name': 'Mailbox'},
'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'from_email': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
'uri': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'})
},
'django_mailbox.message': {
'Meta': {'object_name': 'Message'},
'body': ('django.db.models.fields.TextField', [], {}),
'from_header': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'in_reply_to': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'replies'", 'null': 'True', 'to': "orm['django_mailbox.Message']"}),
'mailbox': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'messages'", 'to': "orm['django_mailbox.Mailbox']"}),
'message_id': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
'outgoing': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'processed': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
'subject': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
'to_header': ('django.db.models.fields.TextField', [], {})
}
}
complete_apps = ['django_mailbox']

23
django_mailbox/models.py
View file

@ -4,6 +4,7 @@ import rfc822
import urllib
import urlparse
from django.conf import settings
from django.core.mail.message import make_msgid
from django.db import models
from django_mailbox.transports import Pop3Transport, ImapTransport,\
@ -35,6 +36,24 @@ class Mailbox(models.Model):
null=True,
default=None,
)
from_email = models.CharField(
max_length=255,
help_text="""
Example: MailBot <mailbot@yourdomain.com>
<br />
'From' header to set for outgoing email.
<br />
<br />
If you do not use this e-mail inbox for outgoing mail, this
setting is unnecessary.
<br />
If you send e-mail without setting this, your 'From' header will
be set to match the setting `DEFAULT_FROM_EMAIL`.
""",
blank=True,
null=True,
default=None,
)
active = models.BooleanField(
blank=True,
default=True,
@ -233,6 +252,10 @@ class Message(models.Model):
pre-set it.
"""
if self.mailbox.from_email
message.from_email = self.mailbox.from_email
else:
message.from_email = settings.DEFAULT_FROM_EMAIL
message.extra_headers['Message-ID'] = make_msgid()
message.extra_headers['Date'] = formatdate()
message.extra_headers['In-Reply-To'] = self.message_id