mirror of
https://github.com/jwinterm/modoboa.git
synced 2026-10-18 05:51:26 +02:00
@@ -512,6 +512,13 @@ class Mailbox(DatesAware):
|
||||
def full_address(self):
|
||||
return "%s@%s" % (self.address, self.domain.name)
|
||||
|
||||
@property
|
||||
def name_and_address(self):
|
||||
if self.user.first_name != "" or self.user.last_name != "":
|
||||
return "%s %s <%s>" % \
|
||||
(self.user.first_name, request.user.last_name, self.full_address)
|
||||
return self.full_address
|
||||
|
||||
@property
|
||||
def enabled(self):
|
||||
return self.user.is_active
|
||||
|
||||
@@ -2,12 +2,10 @@
|
||||
# coding: utf-8
|
||||
|
||||
import sys
|
||||
import smtplib
|
||||
from email.mime.text import MIMEText
|
||||
import datetime
|
||||
from django.core.management.base import BaseCommand, CommandError
|
||||
from modoboa.lib import parameters
|
||||
from modoboa.lib.emailutils import split_mailbox
|
||||
from modoboa.lib.emailutils import split_mailbox, sendmail_simple
|
||||
from modoboa.admin.models import Mailbox
|
||||
from modoboa.extensions.postfix_autoreply import PostfixAutoreply
|
||||
from modoboa.extensions.postfix_autoreply.models import ARmessage, ARhistoric
|
||||
@@ -32,15 +30,8 @@ def send_autoreply(sender, mailbox, armessage):
|
||||
lastar.armessage = armessage
|
||||
lastar.sender = sender
|
||||
|
||||
msg = MIMEText(armessage.content.encode('utf-8'), _charset='utf-8')
|
||||
msg['Subject'] = armessage.subject
|
||||
msg['From'] = mailbox.full_address
|
||||
msg['To'] = sender
|
||||
|
||||
s = smtplib.SMTP()
|
||||
s.connect()
|
||||
s.sendmail(mailbox.full_address, sender, msg.as_string())
|
||||
s.quit()
|
||||
sendmail_simple(mailbox.name_and_address, sender, armessage.subject,
|
||||
armessage.content.encode('utf-8'))
|
||||
|
||||
lastar.last_sent = datetime.datetime.now()
|
||||
lastar.save()
|
||||
|
||||
@@ -601,8 +601,6 @@ def send_mail(request, posturl=None):
|
||||
body = request.POST["id_body"]
|
||||
charset = "utf-8"
|
||||
|
||||
print body
|
||||
|
||||
if editormode == "html":
|
||||
msg = MIMEMultipart(_subtype="related")
|
||||
submsg = MIMEMultipart(_subtype="alternative")
|
||||
|
||||
@@ -249,7 +249,7 @@ def sendmail_simple(sender, rcpt, subject="Sample message", content="", **kwargs
|
||||
:param content: message's content
|
||||
:return: tuple
|
||||
"""
|
||||
msg = MIMEText(content)
|
||||
msg = MIMEText(content, charset='utf-8')
|
||||
msg["Subject"] = subject
|
||||
msg["From"] = sender
|
||||
msg["To"] = rcpt
|
||||
|
||||
Reference in New Issue
Block a user