From a49c4e6761e334745589f91420aa8e7e0fd5c3e3 Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@nyu.edu>
Date: Sun, 25 Sep 2016 13:40:18 -0400
Subject: [PATCH] Properly fixing mailfrom_addr

---
 CTFd/admin.py                             |  2 ++
 CTFd/templates/original/admin/config.html | 21 +++++++--------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/CTFd/admin.py b/CTFd/admin.py
index 624456b..b71562a 100644
--- a/CTFd/admin.py
+++ b/CTFd/admin.py
@@ -121,6 +121,7 @@ def admin_config():
     mail_username = get_config('mail_username')
     mail_password = get_config('mail_password')
 
+    mailfrom_addr = get_config('mailfrom_addr')
     mg_api_key = get_config('mg_api_key')
     mg_base_url = get_config('mg_base_url')
     if not max_tries:
@@ -178,6 +179,7 @@ def admin_config():
                            view_challenges_unregistered=view_challenges_unregistered,
                            view_scoreboard_if_authed=view_scoreboard_if_authed,
                            prevent_registration=prevent_registration,
+                           mailfrom_addr=mailfrom_addr,
                            mg_base_url=mg_base_url,
                            mg_api_key=mg_api_key,
                            prevent_name_change=prevent_name_change,
diff --git a/CTFd/templates/original/admin/config.html b/CTFd/templates/original/admin/config.html
index b314f4c..2abeae5 100644
--- a/CTFd/templates/original/admin/config.html
+++ b/CTFd/templates/original/admin/config.html
@@ -46,16 +46,16 @@
                 </li>
             </ul>
 
+            <div class="form-group">
+                <label for="start">Mail From Address:</label>
+                <input class="form-control" id='mailfrom_addr' name='mailfrom_addr' type='text'
+                       placeholder="Email address used to send email"
+                       {% if mailfrom_addr is defined and mailfrom_addr != None %}value="{{ mailfrom_addr }}"{% endif %}>
+            </div>
+
             <div class="tab-content">
                 <div role="tabpanel" class="tab-pane active" id="mailserver">
 
-                    <div class="form-group">
-                        <label for="start">Mail From Address:</label>
-                        <input class="form-control" id='maifrom_addr' name='maifrom_addr' type='text'
-                               placeholder="Email address used to send email"
-                               {% if maifrom_addr is defined and maifrom_addr != None %}value="{{ maifrom_addr }}"{% endif %}>
-                    </div>
-
                     <div class="form-group">
                         <label for="start">Mail Server Address:</label>
                         <input class="form-control" id='mail_server' name='mail_server' type='text'
@@ -96,13 +96,6 @@
                 </div>
                 <div role="tabpanel" class="tab-pane" id="mailgun">
 
-                    <div class="form-group">
-                        <label for="start">Mail From Address:</label>
-                        <input class="form-control" id='maifrom_addr' name='maifrom_addr' type='text'
-                               placeholder="Email address used to send email"
-                               {% if maifrom_addr is defined and maifrom_addr != None %}value="{{ maifrom_addr }}"{% endif %}>
-                    </div>
-
                     <div class="form-group">
                         <label for="start">Mailgun API Base URL:</label>
                         <input class="form-control" id='mg_base_url' name='mg_base_url' type='text'