sogo_connector.patch (11,515 bytes)
# HG changeset patch
# Date 1467128083 -7200
# Tue Jun 28 17:34:43 2016 +0200
# Branch sogo-demo
# Node ID 0b18db592166eb01743aff86dbd22c42e934d5be
# Parent 2e05bc4f07357e22c1dc7e26f8543a368f8f835e
# Parent 637f266e91afe1012557e0f70b4c4c486cafb9df
Merge with default
diff --git a/.hgtags b/.hgtags
new file mode 100644
--- /dev/null
+++ b/.hgtags
@@ -0,0 +1,4 @@
+9824d0c8dfd6a7161c546f23eabb2a308ddb71ce 31.0.1.02
+5f590f1d8ccabdffac2e076c8d517eebd94c75ae 31.0.2.03
+7e5ac997521734a80c7ddaaf842a6c2febc8c139 31.0.2.04
+297f1cec90ab9a92d14be63d6e01f94168416cda 31.0.3.04
diff --git a/chrome/content/extensions.rdf b/chrome/content/extensions.rdf
--- a/chrome/content/extensions.rdf
+++ b/chrome/content/extensions.rdf
@@ -1,27 +1,35 @@
-<?xml version="1.0"?>
-<!DOCTYPE RDF>
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:isi="http://inverse.ca/sogo-integrator/"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#"
- xmlns:NC="http://home.netscape.com/NC-rdf#">
- <Seq about="http://inverse.ca/sogo-integrator/extensions"
- isi:updateURL="http://sogo-demo.inverse.ca/plugins/updates.php?plugin=%ITEM_ID%&version=%ITEM_VERSION%&platform=%PLATFORM%">
- <li>
- <Description
- em:id="sogo-integrator@inverse.ca"
- em:name="SOGo Integrator"/>
- </li>
- <li>
- <Description
- em:id="sogo-connector@inverse.ca"
- em:name="SOGo Connector"/>
- </li>
-<!--
- <li>
- <Description
- em:id="{e2fda1a4-762b-4020-b5ad-a41df1933103}"
- em:name="Lightning"/>
- </li>
--->
- </Seq>
-</RDF>
+<?xml version="1.0"?>
+<!DOCTYPE RDF>
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:isi="http://inverse.ca/sogo-integrator/"
+ xmlns:em="http://www.mozilla.org/2004/em-rdf#"
+ xmlns:NC="http://home.netscape.com/NC-rdf#">
+ <Seq about="http://inverse.ca/sogo-integrator/extensions"
+ isi:updateURL="http://sogo.domain.local/plugins-tb45/updates.php?plugin=%ITEM_ID%&version=%ITEM_VERSION%&platform=%PLATFORM%">
+ <li>
+ <Description
+ em:id="{506d044e-41fa-4cc8-9dc6-9ff70e96eebf}"
+ em:name="StartupMaster"/>
+ </li>
+ <li>
+ <Description
+ em:id="lookout@aron.rubin"
+ em:name="LookOut"/>
+ </li>
+ <li>
+ <Description
+ em:id="sogo-integrator@inverse.ca"
+ em:name="SOGo Integrator"/>
+ </li>
+ <li>
+ <Description
+ em:id="sogo-connector@inverse.ca"
+ em:name="SOGo Connector"/>
+ </li>
+ <li>
+ <Description
+ em:id="{e2fda1a4-762b-4020-b5ad-a41df1933103}"
+ em:name="Lightning"/>
+ </li>
+ </Seq>
+</RDF>
diff --git a/chrome/content/general/custom-preferences.js b/chrome/content/general/custom-preferences.js
--- a/chrome/content/general/custom-preferences.js
+++ b/chrome/content/general/custom-preferences.js
@@ -2,3 +2,9 @@
force_int_pref("calendar.autorefresh.timeout", 30);
force_int_pref("calendar.invitations.autorefresh.timeout", 30);
force_bool_pref("sogo-integrator.disable-send-invitations-checkbox", false);
+force_bool_pref("mailnews.downloadToTempFile", true);
+force_bool_pref("mail.server.default.fetch_by_chunks", false);
+force_int_pref("mail.imap.chunk_add", 0);
+force_bool_pref("javascript.enabled", false);
+force_bool_pref("network.dns.disablePrefetch", true);
+force_bool_pref("ldap_2.autoComplete.useDirectory", false);
diff --git a/chrome/content/sogo-config.js b/chrome/content/sogo-config.js
--- a/chrome/content/sogo-config.js
+++ b/chrome/content/sogo-config.js
@@ -1,73 +1,81 @@
-/* -*- Mode: java; tab-width: 2; c-tab-always-indent: t; indent-tabs-mode: t; c-basic-offset: 2 -*- */
-var sogoConfig = { username: null, baseURL: null };
-
-function sogoUserName() {
- if (!sogoConfig['username']) {
- var mgr = Components.classes["@mozilla.org/messenger/account-manager;1"]
- .getService(Components.interfaces.nsIMsgAccountManager);
- var prefService = (Components.classes["@mozilla.org/preferences-service;1"]
- .getService(Components.interfaces.nsIPrefBranch));
- var useEmail = false;
- try {
- useEmail = prefService.getBoolPref("sogo-integrator.identification.use_email_address");
- }
- catch(e) {
- useEmail = false;
- }
- if (useEmail)
- sogoConfig['username'] = mgr.defaultAccount.defaultIdentity.email;
- else
- sogoConfig['username'] = mgr.defaultAccount.incomingServer.realUsername;
- }
-
- return sogoConfig['username'];
-}
-
-function sogoHostname() {
- var hostnameArray;
- var baseURL;
-
- baseURL = sogoBaseURL();
- hostnameArray = baseURL.split("/");
-
- return hostnameArray[0] + "//" + hostnameArray[2];
-}
-
-function sogoBaseURL() {
- if (!sogoConfig['baseURL']) {
- var rdf = Components.classes["@mozilla.org/rdf/rdf-service;1"]
- .getService(Components.interfaces.nsIRDFService);
- var extensions
- = rdf.GetResource("http://inverse.ca/sogo-integrator/extensions");
- var updateURLres
- = rdf.GetResource("http://inverse.ca/sogo-integrator/updateURL");
- var ds
- = rdf.GetDataSourceBlocking("chrome://sogo-integrator/content/extensions.rdf");
-
- var updateArray;
- try {
- var urlNode = ds.GetTarget(extensions, updateURLres, true);
- if (urlNode instanceof Components.interfaces.nsIRDFLiteral) {
- var updateURL = urlNode.Value;
- updateArray = updateURL.split("/");
- }
- }
- catch (e) {
- }
-
- var prefService = (Components.classes["@mozilla.org/preferences-service;1"]
- .getService(Components.interfaces.nsIPrefBranch));
- var sogoPrefix;
- try {
- sogoPrefix = "/" + prefService.getCharPref("sogo-integrator.sogo-prefix");
- }
- catch(e) {
- sogoPrefix = "/SOGo";
- }
-
- sogoConfig['baseURL'] = (updateArray[0] + "//" + updateArray[2]
- + sogoPrefix + "/dav/" + sogoUserName() + "/");
- }
-
- return sogoConfig['baseURL'];
-}
+/* -*- Mode: java; tab-width: 2; c-tab-always-indent: t; indent-tabs-mode: t; c-basic-offset: 2 -*- */
+var sogoConfig = { username: null, baseURL: null };
+
+function sogoUserName() {
+ if (!sogoConfig['username']) {
+ var mgr = Components.classes["@mozilla.org/messenger/account-manager;1"]
+ .getService(Components.interfaces.nsIMsgAccountManager);
+ var prefService = (Components.classes["@mozilla.org/preferences-service;1"]
+ .getService(Components.interfaces.nsIPrefBranch));
+ var useEmail = false;
+ try {
+ useEmail = prefService.getBoolPref("sogo-integrator.identification.use_email_address");
+ }
+ catch(e) {
+ useEmail = false;
+ }
+ if (useEmail)
+ sogoConfig['username'] = mgr.defaultAccount.defaultIdentity.email;
+ else {
+ var user = Components.classes["@mozilla.org/userinfo;1"].getService(Components.interfaces.nsIUserInfo);
+ sogoConfig['username'] = user.username;
+ /* Workaround für Wardy */
+ var user_johndoe = "John Doe";
+ var user_doe = "doe";
+ if (user.username.toLowerCase() == user_johndoe.toLowerCase()) {
+ sogoConfig['username'] = user_doe;
+ }
+ }
+ }
+
+ return sogoConfig['username'];
+}
+
+function sogoHostname() {
+ var hostnameArray;
+ var baseURL;
+
+ baseURL = sogoBaseURL();
+ hostnameArray = baseURL.split("/");
+
+ return hostnameArray[0] + "//" + hostnameArray[2];
+}
+
+function sogoBaseURL() {
+ if (!sogoConfig['baseURL']) {
+ var rdf = Components.classes["@mozilla.org/rdf/rdf-service;1"]
+ .getService(Components.interfaces.nsIRDFService);
+ var extensions
+ = rdf.GetResource("http://inverse.ca/sogo-integrator/extensions");
+ var updateURLres
+ = rdf.GetResource("http://inverse.ca/sogo-integrator/updateURL");
+ var ds
+ = rdf.GetDataSourceBlocking("chrome://sogo-integrator/content/extensions.rdf");
+
+ var updateArray;
+ try {
+ var urlNode = ds.GetTarget(extensions, updateURLres, true);
+ if (urlNode instanceof Components.interfaces.nsIRDFLiteral) {
+ var updateURL = urlNode.Value;
+ updateArray = updateURL.split("/");
+ }
+ }
+ catch (e) {
+ }
+
+ var prefService = (Components.classes["@mozilla.org/preferences-service;1"]
+ .getService(Components.interfaces.nsIPrefBranch));
+ var sogoPrefix;
+ try {
+ sogoPrefix = "/" + prefService.getCharPref("sogo-integrator.sogo-prefix");
+ }
+ catch(e) {
+ sogoPrefix = "/SOGo";
+ }
+
+ sogoConfig['baseURL'] = (updateArray[0] + "//" + updateArray[2]
+ + sogoPrefix + "/dav/" + sogoUserName() + "/");
+ }
+
+ return sogoConfig['baseURL'];
+}
diff --git a/chrome/locale/de-DE/global/common-dialog-overlay.properties b/chrome/locale/de-DE/global/common-dialog-overlay.properties
--- a/chrome/locale/de-DE/global/common-dialog-overlay.properties
+++ b/chrome/locale/de-DE/global/common-dialog-overlay.properties
@@ -1,2 +1,2 @@
sogo.title = Verbinde zu SOGo...
-sogo.description = Bitte geben Sie ihr Passwort ein (%u):
+sogo.description = Bitte geben Sie für SOGo ihr Windows-Passwort ein (%u):
diff --git a/chrome/locale/en-US/global/common-dialog-overlay.properties b/chrome/locale/en-US/global/common-dialog-overlay.properties
--- a/chrome/locale/en-US/global/common-dialog-overlay.properties
+++ b/chrome/locale/en-US/global/common-dialog-overlay.properties
@@ -1,2 +1,2 @@
sogo.title = Connecting to SOGo...
-sogo.description = Please enter your password (%u):
+sogo.description = For SOGo Please enter your Windows password (%u):
diff --git a/defaults/preferences/site.js b/defaults/preferences/site.js
--- a/defaults/preferences/site.js
+++ b/defaults/preferences/site.js
@@ -1,13 +1,14 @@
-pref("app.update.auto", false);
-pref("app.update.enabled", false);
-pref("autoupdate.enabled", false);
-pref("extensions.update.auto", false);
-pref("extensions.update.enabled", false);
-pref("mail.imap.mime_parts_on_demand_threshold", 300000);
-pref("mail.inline_attachments", true);
-pref("mail.mdn.report.not_in_to_cc", 0);
-pref("mail.strictly_mime.parm_folding", 0);
-pref("calendar.alarms.showmissed", false);
-pref("calendar.caldav.sched.enabled", true);
-pref("calendar.timezone.local", "/mozilla.org/20070129_1/America/Montreal");
-pref("sogo-integrator.autocomplete.server.urlid", "public");
+pref("app.update.auto", false);
+pref("app.update.enabled", false);
+pref("autoupdate.enabled", false);
+pref("extensions.update.auto", true);
+pref("extensions.update.enabled", true);
+pref("mail.imap.mime_parts_on_demand_threshold", 300000);
+pref("mail.inline_attachments", true);
+pref("mail.mdn.report.not_in_to_cc", 0);
+pref("mail.strictly_mime.parm_folding", 0);
+pref("calendar.alarms.showmissed", false);
+pref("calendar.caldav.sched.enabled", true);
+pref("calendar.timezone.local", "/mozilla.org/20070129_1/Europe/Berlin");
+pref("sogo-integrator.autocomplete.server.urlid", "directory");
+pref("mail.showCondensedAddresses", false);
diff --git a/install.rdf b/install.rdf
--- a/install.rdf
+++ b/install.rdf
@@ -11,7 +11,7 @@
<Description about="urn:mozilla:install-manifest"
em:name="Inverse SOGo Integrator"
em:id="sogo-integrator@inverse.ca"
- em:version="31.0.3"
+ em:version="31.0.3.04"
em:description="A SOGo integration plugin for Thunderbird and Lightning"
em:iconURL="chrome://sogo-integrator/skin/sogo.png"
em:creator="Inverse <support@inverse.ca>"
related to
child of
duplicate of
