From a75d481f604e0b882db1e267dee0fa13a0995b29 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Fri, 5 Aug 2022 19:22:17 +0200
Subject: [PATCH] add a 2nd email account for WPD

---
 files/__main__.py                      | 10 ++++++++--
 files/mail/__init__.py                 |  2 +-
 files/templates/settings_security.html |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/files/__main__.py b/files/__main__.py
index dedc1c8725..a47da1b061 100644
--- a/files/__main__.py
+++ b/files/__main__.py
@@ -16,6 +16,7 @@ import time
 from sys import stdout, argv
 import faulthandler
 import json
+import random
 
 app = Flask(__name__, template_folder='templates')
 app.url_map.strict_slashes = False
@@ -43,8 +44,13 @@ app.config["CACHE_REDIS_URL"] = environ.get("REDIS_URL", "redis://localhost")
 app.config['MAIL_SERVER'] = 'smtp.gmail.com'
 app.config['MAIL_PORT'] = 587
 app.config['MAIL_USE_TLS'] = True
-app.config['MAIL_USERNAME'] = environ.get("MAIL_USERNAME", "").strip()
-app.config['MAIL_PASSWORD'] = environ.get("MAIL_PASSWORD", "").strip()
+
+if environ.get("MAIL_USERNAME2") and random.random() < 0.5:
+	app.config['MAIL_USERNAME'] = environ.get("MAIL_USERNAME2", "").strip()
+	app.config['MAIL_PASSWORD'] = environ.get("MAIL_PASSWORD2", "").strip()
+else:
+	app.config['MAIL_USERNAME'] = environ.get("MAIL_USERNAME", "").strip()
+	app.config['MAIL_PASSWORD'] = environ.get("MAIL_PASSWORD", "").strip()
 
 app.config['SETTINGS'] = {}
 
diff --git a/files/mail/__init__.py b/files/mail/__init__.py
index 5392e61a33..c6e054f075 100644
--- a/files/mail/__init__.py
+++ b/files/mail/__init__.py
@@ -14,7 +14,7 @@ from flask_mail import Message
 
 def send_mail(to_address, subject, html):
 
-	msg = Message(html=html, subject=subject, sender=f"{SITE_NAME}@{SITE}", recipients=[to_address])
+	msg = Message(html=html, subject=subject, sender=app.config['MAIL_USERNAME'], recipients=[to_address])
 	mail.send(msg)
 
 
diff --git a/files/templates/settings_security.html b/files/templates/settings_security.html
index b410bb2865..773d304c9f 100644
--- a/files/templates/settings_security.html
+++ b/files/templates/settings_security.html
@@ -18,7 +18,7 @@
 
 		<p class="text-small text-muted">Change the email address used to sign in to your account.</p>
 		<div class="settings-section rounded">
-			<form	action="/settings/security" method="post">
+			<form action="/settings/security" method="post">
 				<input type="hidden" name="formkey" value="{{v.formkey}}">
 				<div class="body">
 					<div class="d-lg-flex">