From 55964c39cb582882c234d12ce6dbb16e64d8bec7 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Thu, 25 Apr 2013 21:20:27 +0200 Subject: [PATCH] The from field should not be changed. fixes #408 --- modoboa/extensions/webmail/forms.py | 1 - modoboa/extensions/webmail/lib.py | 11 ++++------- .../extensions/webmail/templates/webmail/compose.html | 3 +-- modoboa/extensions/webmail/views.py | 1 - 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/modoboa/extensions/webmail/forms.py b/modoboa/extensions/webmail/forms.py index 668fb313b..fb0ba3729 100644 --- a/modoboa/extensions/webmail/forms.py +++ b/modoboa/extensions/webmail/forms.py @@ -4,7 +4,6 @@ from django.utils.translation import ugettext_lazy as _ class ComposeMailForm(forms.Form): - from_ = forms.CharField(label=_("From")) to = forms.CharField(label=_("To")) cc = forms.CharField(label=_("Cc"), required=False) cci = forms.CharField(label=_("Cci"), required=False) diff --git a/modoboa/extensions/webmail/lib.py b/modoboa/extensions/webmail/lib.py index 80fa6373e..6ab56336d 100644 --- a/modoboa/extensions/webmail/lib.py +++ b/modoboa/extensions/webmail/lib.py @@ -327,7 +327,6 @@ class ReplyModifier(Modifier): self.textheader = "%s %s" % (self.From, _("wrote:")) - form.fields["from_"].initial = request.user.username if hasattr(self, "Message_ID"): form.fields["origmsgid"].initial = self.Message_ID if not hasattr(self, "Reply_To"): @@ -369,7 +368,6 @@ class ForwardModifier(Modifier): ) self._header() - form.fields["from_"].initial = request.user.username form.fields["subject"].initial = "Fwd: %s" % self.Subject def __getfunc(self, name): @@ -666,9 +664,9 @@ def send_mail(request, posturl=None): msg["Subject"] = Header(form.cleaned_data["subject"], 'utf8') if request.user.first_name != "" or request.user.last_name != "": fromaddress = "%s <%s>" % (Header(request.user.fullname, 'utf8').encode(), - form.cleaned_data["from_"]) + request.user.email) else: - fromaddress = form.cleaned_data["from_"] + fromaddress = request.user.email msg["From"] = fromaddress msg["To"] = prepare_addresses(form.cleaned_data["to"]) msg["Message-ID"] = make_msgid() @@ -699,7 +697,7 @@ def send_mail(request, posturl=None): s.login(request.user.username, get_password(request)) except smtplib.SMTPAuthenticationError, e: raise WebmailError(str(e)) - s.sendmail(form.cleaned_data['from_'], rcpts, msg.as_string()) + s.sendmail(request.user.email, rcpts, msg.as_string()) s.quit() sentfolder = parameters.get_user(request.user, "SENT_FOLDER") IMAPconnector(user=request.user.username, @@ -712,8 +710,7 @@ def send_mail(request, posturl=None): {"form" : form, "noerrors" : True, "body" : request.POST["id_body"].strip(), "posturl" : posturl}) - error = _("Red fields are mandatories") - return False, dict(status="ko", respmsg=error, listing=listing, editor=editormode) + return False, dict(status="ko", listing=listing, editor=editormode) class AttachmentUploadHandler(FileUploadHandler): """ diff --git a/modoboa/extensions/webmail/templates/webmail/compose.html b/modoboa/extensions/webmail/templates/webmail/compose.html index 6b8ff538c..7a413bf1a 100644 --- a/modoboa/extensions/webmail/templates/webmail/compose.html +++ b/modoboa/extensions/webmail/templates/webmail/compose.html @@ -2,11 +2,10 @@
- {% render_field form.from_ %} + {% render_field form.to %}
{% if not form.cc.value %}{% trans "Add Cc field" %}{% endif %} {% trans "Add Cci field" %}
- {% render_field form.to %} {% if form.cc.value %}{% render_field form.cc %}{% else %}{% render_and_hide_field form.cc %}{% endif %} {% render_and_hide_field form.cci %} {% render_field form.subject %} diff --git a/modoboa/extensions/webmail/views.py b/modoboa/extensions/webmail/views.py index 7f185c5cc..410530874 100644 --- a/modoboa/extensions/webmail/views.py +++ b/modoboa/extensions/webmail/views.py @@ -375,7 +375,6 @@ def compose(request): return resp form = ComposeMailForm() - form.fields["from_"].initial = request.user.username return render_compose(request, form, url, insert_signature=True) def compose_and_send(request, action, callback=None):