summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2020-01-18 14:09:43 -0500
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-01-20 12:02:13 +0100
commit5002c657a20d4e9a9a14b6ec088e9447fbb722d9 (patch)
treea0818fc8c91dc7f93099c61eb20c10d7b7968b7e
parentea51616e31da82241c707407edbb82c20f84d319 (diff)
downloadUXP-5002c657a20d4e9a9a14b6ec088e9447fbb722d9.tar
UXP-5002c657a20d4e9a9a14b6ec088e9447fbb722d9.tar.gz
UXP-5002c657a20d4e9a9a14b6ec088e9447fbb722d9.tar.lz
UXP-5002c657a20d4e9a9a14b6ec088e9447fbb722d9.tar.xz
UXP-5002c657a20d4e9a9a14b6ec088e9447fbb722d9.zip
Issue #1358 - Default to SSL/TLS when using the Account Wizard
-rw-r--r--mailnews/base/prefs/content/aw-incoming.js5
-rw-r--r--mailnews/mailnews.js4
2 files changed, 6 insertions, 3 deletions
diff --git a/mailnews/base/prefs/content/aw-incoming.js b/mailnews/base/prefs/content/aw-incoming.js
index fcc063fed..5ea0c77ae 100644
--- a/mailnews/base/prefs/content/aw-incoming.js
+++ b/mailnews/base/prefs/content/aw-incoming.js
@@ -158,7 +158,10 @@ function setServerType()
var serverType = document.getElementById("servertype").value;
var deferStorageBox = document.getElementById("deferStorageBox");
var leaveMessages = document.getElementById("leaveMsgsOnSrvrBox");
- var port = serverType == "pop3" ? 110 : 143;
+
+ // pop3 110 (unsecure) 995 (SSL)
+ // imap 143 (unsecure) 993 (SSL)
+ var port = serverType == "pop3" ? 995 : 993;
document.getElementById("serverPort").value = port;
document.getElementById("defaultPortValue").value = port;
diff --git a/mailnews/mailnews.js b/mailnews/mailnews.js
index 705a0a08a..7ebe2eaa7 100644
--- a/mailnews/mailnews.js
+++ b/mailnews/mailnews.js
@@ -450,7 +450,7 @@ pref("mail.server.default.valid", true);
pref("mail.server.default.abbreviate", true);
pref("mail.server.default.isSecure", false);
pref("mail.server.default.authMethod", 3); // cleartext password. @see nsIMsgIncomingServer.authMethod.
-pref("mail.server.default.socketType", 0); // @see nsIMsgIncomingServer.socketType
+pref("mail.server.default.socketType", 3); // SSL/TLS. @see nsIMsgIncomingServer.socketType
pref("mail.server.default.override_namespaces", true);
pref("mail.server.default.deferred_to_account", "");
@@ -579,7 +579,7 @@ pref("mail.smtp.useMatchingDomainServer", false);
pref("mail.smtp.useMatchingHostNameServer", false);
pref("mail.smtpserver.default.authMethod", 3); // cleartext password. @see nsIMsgIncomingServer.authMethod.
-pref("mail.smtpserver.default.try_ssl", 0); // @see nsISmtpServer.socketType
+pref("mail.smtpserver.default.try_ssl", 3); // SSL/TLS. @see nsISmtpServer.socketType
// For the next 3 prefs, see <http://www.bucksch.org/1/projects/mozilla/16507>
pref("mail.display_glyph", true); // TXT->HTML :-) etc. in viewer