From 29dd81ba39ca7134d1e0303acb719dfa3007b6af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= <emanuel@intevation.de>
Date: Tue, 25 Jun 2019 15:49:15 +0200
Subject: [PATCH] New email sender name and reply-to config options.

---
 openslides/users/config_variables.py | 15 +++++++++++++--
 openslides/users/models.py           |  7 ++++++-
 openslides/utils/settings.py.tpl     |  1 +
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/openslides/users/config_variables.py b/openslides/users/config_variables.py
index 0546404ff..385a7a5cf 100644
--- a/openslides/users/config_variables.py
+++ b/openslides/users/config_variables.py
@@ -108,14 +108,25 @@ def get_config_variables():
 
     yield ConfigVariable(
         name="users_email_sender",
-        default_value="noreply@example.com",
+        default_value="",
         input_type="string",
-        label="Email sender",
+        label="Sender name",
+        help_text="The sender address is defined in the OpenSlides server settings and should modified by administrator only.",
         weight=600,
         group="Participants",
         subgroup="Email",
     )
 
+    yield ConfigVariable(
+        name="users_email_replyto",
+        default_value="",
+        input_type="string",
+        label="Reply address",
+        weight=601,
+        group="Participants",
+        subgroup="Email",
+    )
+
     yield ConfigVariable(
         name="users_email_subject",
         default_value="Your login for {event_name}",
diff --git a/openslides/users/models.py b/openslides/users/models.py
index 361d47c3b..f63374181 100644
--- a/openslides/users/models.py
+++ b/openslides/users/models.py
@@ -1,6 +1,7 @@
 import smtplib
 from random import choice
 
+from django.conf import settings
 from django.contrib.auth.hashers import make_password
 from django.contrib.auth.models import (
     AbstractBaseUser,
@@ -247,7 +248,11 @@ class User(RESTModelMixin, PermissionsMixin, AbstractBaseUser):
 
         # Create an email and send it.
         email = mail.EmailMessage(
-            subject, message, config["users_email_sender"], [self.email]
+            subject,
+            message,
+            config["users_email_sender"] + " <" + settings.DEFAULT_FROM_EMAIL + ">",
+            [self.email],
+            reply_to=[config["users_email_replyto"]],
         )
         try:
             count = connection.send_messages([email])
diff --git a/openslides/utils/settings.py.tpl b/openslides/utils/settings.py.tpl
index a95771e75..39a6c44bf 100644
--- a/openslides/utils/settings.py.tpl
+++ b/openslides/utils/settings.py.tpl
@@ -47,6 +47,7 @@ EMAIL_HOST = 'localhost'
 EMAIL_PORT = 587
 EMAIL_HOST_USER = ''
 EMAIL_HOST_PASSWORD = ''
+DEFAULT_FROM_EMAIL = 'noreply@example.com'
 
 # Increasing Upload size to 100mb (default is 2.5mb)
 DATA_UPLOAD_MAX_MEMORY_SIZE = 104857600