|
|
|
@ -113,16 +113,16 @@ def send_test_mail(kindle_mail):
|
|
|
|
|
org_stderr = smtplib.stderr
|
|
|
|
|
smtplib.stderr = StderrLogger()
|
|
|
|
|
|
|
|
|
|
if int(use_ssl) == 1:
|
|
|
|
|
if int(use_ssl) == 2:
|
|
|
|
|
mailserver = smtplib.SMTP_SSL(settings["mail_server"], settings["mail_port"], timeout)
|
|
|
|
|
else:
|
|
|
|
|
mailserver = smtplib.SMTP(settings["mail_server"], settings["mail_port"], timeout)
|
|
|
|
|
mailserver.set_debuglevel(1)
|
|
|
|
|
|
|
|
|
|
# if int(use_ssl) == 1:
|
|
|
|
|
# mailserver.ehlo()
|
|
|
|
|
# mailserver.starttls()
|
|
|
|
|
# mailserver.ehlo()
|
|
|
|
|
if int(use_ssl) == 1:
|
|
|
|
|
#mailserver.ehlo()
|
|
|
|
|
mailserver.starttls()
|
|
|
|
|
#mailserver.ehlo()
|
|
|
|
|
|
|
|
|
|
if settings["mail_password"]:
|
|
|
|
|
mailserver.login(settings["mail_login"], settings["mail_password"])
|
|
|
|
@ -151,8 +151,8 @@ def send_mail(book_id, kindle_mail):
|
|
|
|
|
msg = MIMEMultipart()
|
|
|
|
|
msg['From'] = settings["mail_from"]
|
|
|
|
|
msg['To'] = kindle_mail
|
|
|
|
|
msg['Subject'] = _('Send to Kindle')
|
|
|
|
|
text = _('This email has been sent via calibre web.')
|
|
|
|
|
msg['Subject'] = _(u'Send to Kindle')
|
|
|
|
|
text = _(u'This email has been sent via calibre web.')
|
|
|
|
|
msg.attach(MIMEText(text.encode('UTF-8'), 'plain', 'UTF-8'))
|
|
|
|
|
|
|
|
|
|
use_ssl = settings.get('mail_use_ssl', 0)
|
|
|
|
@ -204,16 +204,14 @@ def send_mail(book_id, kindle_mail):
|
|
|
|
|
org_stderr = smtplib.stderr
|
|
|
|
|
smtplib.stderr = StderrLogger()
|
|
|
|
|
|
|
|
|
|
if int(use_ssl) == 1:
|
|
|
|
|
mailserver = smtplib.SMTP_SSL(settings["mail_server"], settings["mail_port"],timeout)
|
|
|
|
|
if int(use_ssl) == 2:
|
|
|
|
|
mailserver = smtplib.SMTP_SSL(settings["mail_server"], settings["mail_port"], timeout)
|
|
|
|
|
else:
|
|
|
|
|
mailserver = smtplib.SMTP(settings["mail_server"], settings["mail_port"],timeout)
|
|
|
|
|
mailserver = smtplib.SMTP(settings["mail_server"], settings["mail_port"], timeout)
|
|
|
|
|
mailserver.set_debuglevel(1)
|
|
|
|
|
|
|
|
|
|
# if int(use_ssl) == 1:
|
|
|
|
|
# mailserver.ehlo()
|
|
|
|
|
# mailserver.starttls()
|
|
|
|
|
# mailserver.ehlo()
|
|
|
|
|
if int(use_ssl) == 1:
|
|
|
|
|
mailserver.starttls()
|
|
|
|
|
|
|
|
|
|
if settings["mail_password"]:
|
|
|
|
|
mailserver.login(settings["mail_login"], settings["mail_password"])
|
|
|
|
|