Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #9195 (It is not possible to use an SMTP server without username and password)

Browse Source
This commit is contained in:
Kovid Goyal 2011-03-12 10:11:04 -07:00
commit 8cf1726340
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/calibre/gui2/wizard/send_email.py
View File

@ -92,7 +92,8 @@ class SendEmail(QWidget, Ui_Form):
pa = self.preferred_to_address() pa = self.preferred_to_address()
to_set = pa is not None to_set = pa is not None
if self.set_email_settings(to_set): if self.set_email_settings(to_set):
if question_dialog(self, _('OK to proceed?'), opts = smtp_prefs().parse()
if not opts.relay_password or question_dialog(self, _('OK to proceed?'),
_('This will display your email password on the screen' _('This will display your email password on the screen'
'. Is it OK to proceed?'), show_copy_button=False): '. Is it OK to proceed?'), show_copy_button=False):
TestEmail(pa, self).exec_() TestEmail(pa, self).exec_()
@ -204,19 +205,32 @@ class SendEmail(QWidget, Ui_Form):
username = unicode(self.relay_username.text()).strip() username = unicode(self.relay_username.text()).strip()
password = unicode(self.relay_password.text()).strip() password = unicode(self.relay_password.text()).strip()
host = unicode(self.relay_host.text()).strip() host = unicode(self.relay_host.text()).strip()
if host and not (username and password): enc_method = ('TLS' if self.relay_tls.isChecked() else 'SSL'
error_dialog(self, _('Bad configuration'), if self.relay_ssl.isChecked() else 'NONE')
_('You must set the username and password for ' if host:
'the mail server.')).exec_() # Validate input
return False if ((username and not password) or (not username and password)):
error_dialog(self, _('Bad configuration'),
_('You must either set both the username <b>and</b> password for '
'the mail server or no username and no password at all.')).exec_()
return False
if not username and not password and enc_method != 'NONE':
error_dialog(self, _('Bad configuration'),
_('Please enter a username and password or set'
' encryption to None ')).exec_()
return False
if not (username and password) and not question_dialog(self,
_('Are you sure?'),
_('No username and password set for mailserver. Most '
' mailservers need a username and password. Are you sure?')):
return False
conf = smtp_prefs() conf = smtp_prefs()
conf.set('from_', from_) conf.set('from_', from_)
conf.set('relay_host', host if host else None) conf.set('relay_host', host if host else None)
conf.set('relay_port', self.relay_port.value()) conf.set('relay_port', self.relay_port.value())
conf.set('relay_username', username if username else None) conf.set('relay_username', username if username else None)
conf.set('relay_password', hexlify(password)) conf.set('relay_password', hexlify(password))
conf.set('encryption', 'TLS' if self.relay_tls.isChecked() else 'SSL' conf.set('encryption', enc_method)
if self.relay_ssl.isChecked() else 'NONE')
return True return True