JohnHammond
/
CTFd
mirror of https://github.com/JohnHammond/CTFd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Properly fixing mailfrom_addr

selenium-screenshot-testing
Kevin Chung 2016-09-25 13:40:18 -04:00
parent fc903dbff3
commit a49c4e6761
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CTFd/admin.py
View File

@ -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,

17
CTFd/templates/original/admin/config.html
View File

@ -46,16 +46,16 @@
</li>
</ul>
<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'
<input class="form-control" id='mailfrom_addr' name='mailfrom_addr' type='text'
placeholder="Email address used to send email"
{% if maifrom_addr is defined and maifrom_addr != None %}value="{{ maifrom_addr }}"{% endif %}>
{% 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 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'