mirror of https://github.com/evilhero/mylar
Merge branch 'development' of https://github.com/Arathen/mylar into development
IMP: Added spam reminder.
This commit is contained in:
commit
85fab87219
|
@ -5931,7 +5931,7 @@ class WebInterface(object):
|
||||||
result = email.test_notify()
|
result = email.test_notify()
|
||||||
|
|
||||||
if result == True:
|
if result == True:
|
||||||
return "Successfully sent email. Check your mailbox."
|
return "Successfully sent email. Check your mailbox (don't forget the spam!)."
|
||||||
else:
|
else:
|
||||||
logger.warn('Email test has gone horribly wrong. Variables used were [FROM: %s] [TO: %s] [SERVER: %s] [PORT: %s] [USER: %s] [PASSWORD: ********] [ENCRYPTION: %s]' % (emailfrom, emailto, emailsvr, emailport, emailuser, emailenc))
|
logger.warn('Email test has gone horribly wrong. Variables used were [FROM: %s] [TO: %s] [SERVER: %s] [PORT: %s] [USER: %s] [PASSWORD: ********] [ENCRYPTION: %s]' % (emailfrom, emailto, emailsvr, emailport, emailuser, emailenc))
|
||||||
return "Error sending test message via email"
|
return "Error sending test message via email"
|
||||||
|
|
Loading…
Reference in New Issue