Mirrors/WGDashboard
1
0
Fork 0
mirror of https://github.com/donaldzou/WGDashboard.git synced 2025-06-28 01:06:58 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #703 from donaldzou/fix-#702

Browse Source 
Fix #702 and #699
This commit is contained in:
Donald Zou 2025-04-25 14:15:33 +08:00 committed by GitHub
commit a4d5b41ca7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/modules/Email.py
View File

@ -11,8 +11,8 @@ class EmailSender:
def __init__(self, DashboardConfig): def __init__(self, DashboardConfig):
self.smtp = None self.smtp = None
self.DashboardConfig = DashboardConfig self.DashboardConfig = DashboardConfig
if not os.path.exists('../attachments'): if not os.path.exists('./attachments'):
os.mkdir('../attachments') os.mkdir('./attachments')
def Server(self): def Server(self):
return self.DashboardConfig.GetConfig("Email", "server")[1] return self.DashboardConfig.GetConfig("Email", "server")[1]
@ -33,8 +33,7 @@ class EmailSender:
return self.DashboardConfig.GetConfig("Email", "send_from")[1] return self.DashboardConfig.GetConfig("Email", "send_from")[1]
def ready(self): def ready(self):
print(self.Server()) return len(self.Server()) > 0 and len(self.Port()) > 0 and len(self.Encryption()) > 0 and len(self.Username()) > 0 and len(self.Password()) > 0 and len(self.SendFrom())
return len(self.Server()) > 0 and len(self.Port()) > 0 and len(self.Encryption()) > 0 and len(self.Username()) > 0 and len(self.Password()) > 0
def send(self, receiver, subject, body, includeAttachment = False, attachmentName = ""): def send(self, receiver, subject, body, includeAttachment = False, attachmentName = ""):
if self.ready(): if self.ready():
@ -46,7 +45,7 @@ class EmailSender:
self.smtp.login(self.Username(), self.Password()) self.smtp.login(self.Username(), self.Password())
message = MIMEMultipart() message = MIMEMultipart()
message['Subject'] = subject message['Subject'] = subject
message['From'] = formataddr((Header(self.SendFrom()).encode(), self.Username())) message['From'] = self.SendFrom()
message["To"] = receiver message["To"] = receiver
message.attach(MIMEText(body, "plain")) message.attach(MIMEText(body, "plain"))
@ -62,7 +61,7 @@ class EmailSender:
else: else:
self.smtp.close() self.smtp.close()
return False, "Attachment does not exist" return False, "Attachment does not exist"
self.smtp.sendmail(self.Username(), receiver, message.as_string()) self.smtp.sendmail(self.SendFrom(), receiver, message.as_string())
self.smtp.close() self.smtp.close()
return True, None return True, None
except Exception as e: except Exception as e: