Commit 89d1c8ea authored by Ethan Lin's avatar Ethan Lin Committed by GitHub

Merge pull request #3 from janeczku/master

merge from master
parents 4bf5c05b fd9740f7
...@@ -105,7 +105,7 @@ class Identifiers(Base): ...@@ -105,7 +105,7 @@ class Identifiers(Base):
if self.type == "amazon": if self.type == "amazon":
return u"https://amzn.com/{0}".format(self.val) return u"https://amzn.com/{0}".format(self.val)
elif self.type == "isbn": elif self.type == "isbn":
return u"http://http://www.worldcat.org/isbn/{0}".format(self.val) return u"http://www.worldcat.org/isbn/{0}".format(self.val)
elif self.type == "doi": elif self.type == "doi":
return u"http://dx.doi.org/{0}".format(self.val) return u"http://dx.doi.org/{0}".format(self.val)
elif self.type == "goodreads": elif self.type == "goodreads":
......
...@@ -113,16 +113,16 @@ def send_test_mail(kindle_mail): ...@@ -113,16 +113,16 @@ def send_test_mail(kindle_mail):
org_stderr = smtplib.stderr org_stderr = smtplib.stderr
smtplib.stderr = StderrLogger() smtplib.stderr = StderrLogger()
if int(use_ssl) == 1: if int(use_ssl) == 2:
mailserver = smtplib.SMTP_SSL(settings["mail_server"], settings["mail_port"], timeout) mailserver = smtplib.SMTP_SSL(settings["mail_server"], settings["mail_port"], timeout)
else: 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) mailserver.set_debuglevel(1)
# if int(use_ssl) == 1: if int(use_ssl) == 1:
# mailserver.ehlo() #mailserver.ehlo()
# mailserver.starttls() mailserver.starttls()
# mailserver.ehlo() #mailserver.ehlo()
if settings["mail_password"]: if settings["mail_password"]:
mailserver.login(settings["mail_login"], settings["mail_password"]) mailserver.login(settings["mail_login"], settings["mail_password"])
...@@ -151,8 +151,8 @@ def send_mail(book_id, kindle_mail): ...@@ -151,8 +151,8 @@ def send_mail(book_id, kindle_mail):
msg = MIMEMultipart() msg = MIMEMultipart()
msg['From'] = settings["mail_from"] msg['From'] = settings["mail_from"]
msg['To'] = kindle_mail msg['To'] = kindle_mail
msg['Subject'] = _('Send to Kindle') msg['Subject'] = _(u'Send to Kindle')
text = _('This email has been sent via calibre web.') text = _(u'This email has been sent via calibre web.')
msg.attach(MIMEText(text.encode('UTF-8'), 'plain', 'UTF-8')) msg.attach(MIMEText(text.encode('UTF-8'), 'plain', 'UTF-8'))
use_ssl = settings.get('mail_use_ssl', 0) use_ssl = settings.get('mail_use_ssl', 0)
...@@ -204,16 +204,14 @@ def send_mail(book_id, kindle_mail): ...@@ -204,16 +204,14 @@ def send_mail(book_id, kindle_mail):
org_stderr = smtplib.stderr org_stderr = smtplib.stderr
smtplib.stderr = StderrLogger() smtplib.stderr = StderrLogger()
if int(use_ssl) == 1: if int(use_ssl) == 2:
mailserver = smtplib.SMTP_SSL(settings["mail_server"], settings["mail_port"],timeout) mailserver = smtplib.SMTP_SSL(settings["mail_server"], settings["mail_port"], timeout)
else: 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) mailserver.set_debuglevel(1)
# if int(use_ssl) == 1: if int(use_ssl) == 1:
# mailserver.ehlo() mailserver.starttls()
# mailserver.starttls()
# mailserver.ehlo()
if settings["mail_password"]: if settings["mail_password"]:
mailserver.login(settings["mail_login"], settings["mail_password"]) mailserver.login(settings["mail_login"], settings["mail_password"])
......
...@@ -8,12 +8,16 @@ ...@@ -8,12 +8,16 @@
<input type="text" class="form-control" name="mail_server" id="mail_server" value="{{content.mail_server}}"> <input type="text" class="form-control" name="mail_server" id="mail_server" value="{{content.mail_server}}">
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="mail_port">{{_('SMTP port (usually 25 for plain SMTP and 587 for SSL)')}}</label> <label for="mail_port">{{_('SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)')}}</label>
<input type="text" class="form-control" name="mail_port" id="mail_port" value="{{content.mail_port}}"> <input type="text" class="form-control" name="mail_port" id="mail_port" value="{{content.mail_port}}">
</div> </div>
<div class="form-group"> <div class="form-group">
<input type="checkbox" name="mail_use_ssl" id="mail_use_ssl" {% if content.mail_use_ssl %}checked{% endif %}> <label for="mail_use_ssl">{{_('Encryption')}}</label>
<label for="mail_use_ssl">{{_('Server uses SSL (StartTLS)')}}</label> <select name="mail_use_ssl" id="mail_use_ssl" class="form-control">
<option value="0" {% if content.mail_use_ssl == 0 %}selected{% endif %}>{{ _('None') }}</option>
<option value="1" {% if content.mail_use_ssl == 1 %}selected{% endif %}>{{ _('STARTTLS') }}</option>
<option value="2" {% if content.mail_use_ssl == 2 %}selected{% endif %}>{{ _('SSL/TLS') }}</option>
</select>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="mail_login">{{_('SMTP login')}}</label> <label for="mail_login">{{_('SMTP login')}}</label>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -426,6 +426,7 @@ def feed_osd(): ...@@ -426,6 +426,7 @@ def feed_osd():
return response return response
@app.route("/opds/search/<query>") @app.route("/opds/search/<query>")
@requires_basic_auth_if_no_ano
def feed_cc_search(query): def feed_cc_search(query):
return feed_search(query.strip()) return feed_search(query.strip())
...@@ -956,6 +957,7 @@ def stats(): ...@@ -956,6 +957,7 @@ def stats():
@app.route("/shutdown") @app.route("/shutdown")
@login_required
def shutdown(): def shutdown():
# logout_user() # logout_user()
# add restart command to queue # add restart command to queue
...@@ -1560,10 +1562,7 @@ def edit_mailsettings(): ...@@ -1560,10 +1562,7 @@ def edit_mailsettings():
content.mail_login = to_save["mail_login"] content.mail_login = to_save["mail_login"]
content.mail_password = to_save["mail_password"] content.mail_password = to_save["mail_password"]
content.mail_from = to_save["mail_from"] content.mail_from = to_save["mail_from"]
if "mail_use_ssl" in to_save: content.mail_use_ssl = int(to_save["mail_use_ssl"])
content.mail_use_ssl = 1
else:
content.mail_use_ssl = 0
try: try:
ub.session.commit() ub.session.commit()
flash(_(u"Mail settings updated"), category="success") flash(_(u"Mail settings updated"), category="success")
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment