From 3b9167e7079a0dac513643619645379f8ed861e2 Mon Sep 17 00:00:00 2001
From: Babu Vincent <bavincen.in@gmail.com>
Date: Fri, 15 Jul 2016 17:20:20 +0530
Subject: [PATCH] add new calendar support to outlook

---
 chrome/content/exchangeSettingsOverlay.js      | 18 ++++++++++++++++--
 chrome/content/exchangeSettingsOverlay.xul     | 14 ++++++++++++--
 .../de/exchangeSettingsOverlay.dtd             |  4 ++++
 .../en-US/exchangeSettingsOverlay.dtd          |  5 +++++
 .../fr-FR/exchangeSettingsOverlay.dtd          |  4 ++++
 .../ja-JP/exchangeSettingsOverlay.dtd          |  4 ++++
 .../nl/exchangeSettingsOverlay.dtd             |  4 ++++
 .../ru/exchangeSettingsOverlay.dtd             |  4 ++++
 .../sv/exchangeSettingsOverlay.dtd             |  4 ++++
 .../tr/exchangeSettingsOverlay.dtd             |  4 ++++
 10 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/chrome/content/exchangeSettingsOverlay.js b/chrome/content/exchangeSettingsOverlay.js
index 92e2f1ba..b14f94fc 100644
--- a/chrome/content/exchangeSettingsOverlay.js
+++ b/chrome/content/exchangeSettingsOverlay.js
@@ -93,7 +93,7 @@ exchSettingsOverlay.prototype = {
 	},
 
 	exchWebServicesCheckRequired: function _exchWebServicesCheckRequired() {
-
+	
 		if (!this.gexchWebServicesDetailsChecked) {
 			this._document.getElementById("exchWebService_folderbaserow").hidden = true;
 			this._document.getElementById("exchWebService_folderpathrow").hidden = true;
@@ -107,7 +107,21 @@ exchSettingsOverlay.prototype = {
 		else {
 			this._document.getElementById("exchWebService_detailschecked").setAttribute("required", false);
 		}
-
+		
+		if (this._document.getElementById("exchWebService_ectype").selectedIndex == 1 ){
+			this._document.getElementById("exchWebService_server").value = "https://outlook.office365.com/EWS/Exchange.asmx";
+			this._document.getElementById("exchWebService_autodiscover").checked = false;
+			this._document.getElementById("exchWebService_autodiscover").disabled = true;
+			
+			this.exchWebServicesgServer = this._document.getElementById("exchWebService_server").value; 
+			this.exchWebServicesgUser = this._document.getElementById("exchWebService_mailbox").value;
+			this._document.getElementById("exchWebService_windowsuser").value = this.exchWebServicesgUser;
+		}
+		else {
+			this._document.getElementById("exchWebService_server").value = "";
+			this._document.getElementById("exchWebService_autodiscover").disabled = false;  
+		} 
+	 
 		if (this._document.getElementById("exchWebService_autodiscover").checked) {
 
 			this.exchWebServicesChangeFolderbaseMenuItemAvailability(false);
diff --git a/chrome/content/exchangeSettingsOverlay.xul b/chrome/content/exchangeSettingsOverlay.xul
index a54d3bb4..ea535576 100644
--- a/chrome/content/exchangeSettingsOverlay.xul
+++ b/chrome/content/exchangeSettingsOverlay.xul
@@ -46,8 +46,17 @@
 
     <script type="application/javascript" src="chrome://exchangecalendar/content/exchangeSettingsOverlay.js"/> 
 
-	<vbox id="exchWebService-exchange-settings">
-		<checkbox label="&ecautodiscover;" id="exchWebService_autodiscover" oncommand="tmpSettingsOverlay.exchWebServicesAutodiscoverCheckbox(this);"/>
+	<vbox id="exchWebService-exchange-settings"> 
+	<groupbox>
+			<caption label="&exchWebServices.exchtype.label;"/>
+			<radiogroup id="exchWebService_ectype" oncommand="tmpSettingsOverlay.exchWebServicesAutodiscoverCheckbox(this);" >
+				<radio label="&exchWebServices.hostexch.label;" value="exchange"  checked="true"/>
+				<radio label="&exchWebServices.365exch.label;" value="office365"/> 
+			</radiogroup> 
+		</groupbox>
+		<groupbox>
+			<caption label="&exchWebServices.detail.label;"/>
+			<checkbox label="&ecautodiscover;" id="exchWebService_autodiscover" oncommand="tmpSettingsOverlay.exchWebServicesAutodiscoverCheckbox(this);"/>
         	<grid flex="1">
         	    <columns>
         	        <column/>
@@ -156,6 +165,7 @@
 			</row>
 		    </rows>
 		</grid>
+		</groupbox>
 	</vbox>
 
 </overlay>
diff --git a/locale/exchangecalendar/de/exchangeSettingsOverlay.dtd b/locale/exchangecalendar/de/exchangeSettingsOverlay.dtd
index 2e86f2e2..048c45cf 100644
--- a/locale/exchangecalendar/de/exchangeSettingsOverlay.dtd
+++ b/locale/exchangecalendar/de/exchangeSettingsOverlay.dtd
@@ -49,3 +49,7 @@
 
 <!ENTITY exchWebServices.UserAvailability.label "Die Benutzerverfügbarkeitstatus des Postfachkalenders ist nur sichtbar.">
 
+<!ENTITY exchWebServices.exchtype.label "Exchange Type">
+<!ENTITY exchWebServices.hostexch.label "Hosted Exchange">
+<!ENTITY exchWebServices.365exch.label "Microsoft Office365">
+<!ENTITY exchWebServices.detail.label "Details">
diff --git a/locale/exchangecalendar/en-US/exchangeSettingsOverlay.dtd b/locale/exchangecalendar/en-US/exchangeSettingsOverlay.dtd
index 63077b5b..446239d4 100644
--- a/locale/exchangecalendar/en-US/exchangeSettingsOverlay.dtd
+++ b/locale/exchangecalendar/en-US/exchangeSettingsOverlay.dtd
@@ -49,3 +49,8 @@
 
 <!ENTITY exchWebServices.UserAvailability.label "Only user availability status for the mailbox's calendar will be visible.">
 
+<!ENTITY exchWebServices.exchtype.label "Exchange Type">
+<!ENTITY exchWebServices.hostexch.label "Hosted Exchange">
+<!ENTITY exchWebServices.365exch.label "Microsoft Office365">
+<!ENTITY exchWebServices.detail.label "Details">
+ 
\ No newline at end of file
diff --git a/locale/exchangecalendar/fr-FR/exchangeSettingsOverlay.dtd b/locale/exchangecalendar/fr-FR/exchangeSettingsOverlay.dtd
index d2c266e2..9b36e0e2 100644
--- a/locale/exchangecalendar/fr-FR/exchangeSettingsOverlay.dtd
+++ b/locale/exchangecalendar/fr-FR/exchangeSettingsOverlay.dtd
@@ -50,3 +50,7 @@
 <!ENTITY exchWebServices.UserAvailability.label "Seul le status de disponibilité de l'utilsateur du calendrier de cette BAL sera visible.">
 
 
+<!ENTITY exchWebServices.exchtype.label "Exchange Type">
+<!ENTITY exchWebServices.hostexch.label "Hosted Exchange">
+<!ENTITY exchWebServices.365exch.label "Microsoft Office365">
+<!ENTITY exchWebServices.detail.label "Details">
diff --git a/locale/exchangecalendar/ja-JP/exchangeSettingsOverlay.dtd b/locale/exchangecalendar/ja-JP/exchangeSettingsOverlay.dtd
index 63077b5b..ffdd9a93 100644
--- a/locale/exchangecalendar/ja-JP/exchangeSettingsOverlay.dtd
+++ b/locale/exchangecalendar/ja-JP/exchangeSettingsOverlay.dtd
@@ -49,3 +49,7 @@
 
 <!ENTITY exchWebServices.UserAvailability.label "Only user availability status for the mailbox's calendar will be visible.">
 
+<!ENTITY exchWebServices.exchtype.label "Exchange Type">
+<!ENTITY exchWebServices.hostexch.label "Hosted Exchange">
+<!ENTITY exchWebServices.365exch.label "Microsoft Office365">
+<!ENTITY exchWebServices.detail.label "Details">
diff --git a/locale/exchangecalendar/nl/exchangeSettingsOverlay.dtd b/locale/exchangecalendar/nl/exchangeSettingsOverlay.dtd
index c217c97f..5ccb1286 100644
--- a/locale/exchangecalendar/nl/exchangeSettingsOverlay.dtd
+++ b/locale/exchangecalendar/nl/exchangeSettingsOverlay.dtd
@@ -52,3 +52,7 @@
 
 
 
+<!ENTITY exchWebServices.exchtype.label "Exchange Type">
+<!ENTITY exchWebServices.hostexch.label "Hosted Exchange">
+<!ENTITY exchWebServices.365exch.label "Microsoft Office365">
+<!ENTITY exchWebServices.detail.label "Details">
diff --git a/locale/exchangecalendar/ru/exchangeSettingsOverlay.dtd b/locale/exchangecalendar/ru/exchangeSettingsOverlay.dtd
index f273ce32..8c9976ec 100644
--- a/locale/exchangecalendar/ru/exchangeSettingsOverlay.dtd
+++ b/locale/exchangecalendar/ru/exchangeSettingsOverlay.dtd
@@ -49,3 +49,7 @@
 
 <!ENTITY exchWebServices.UserAvailability.label "Только состояние доступности пользователя для календаря почтового ящика будет видно, когда у вас есть права доступа.">
 
+<!ENTITY exchWebServices.exchtype.label "Exchange Type">
+<!ENTITY exchWebServices.hostexch.label "Hosted Exchange">
+<!ENTITY exchWebServices.365exch.label "Microsoft Office365">
+<!ENTITY exchWebServices.detail.label "Details">
diff --git a/locale/exchangecalendar/sv/exchangeSettingsOverlay.dtd b/locale/exchangecalendar/sv/exchangeSettingsOverlay.dtd
index 5d112287..b3046c90 100644
--- a/locale/exchangecalendar/sv/exchangeSettingsOverlay.dtd
+++ b/locale/exchangecalendar/sv/exchangeSettingsOverlay.dtd
@@ -48,3 +48,7 @@
 <!ENTITY button.label.folderbrowse "Bläddra">
 
 <!ENTITY exchWebServices.UserAvailability.label "Användarens tillgänglighetsstatus för E-postlådans kalender visas.">
+<!ENTITY exchWebServices.exchtype.label "Exchange Type">
+<!ENTITY exchWebServices.hostexch.label "Hosted Exchange">
+<!ENTITY exchWebServices.365exch.label "Microsoft Office365">
+<!ENTITY exchWebServices.detail.label "Details">
diff --git a/locale/exchangecalendar/tr/exchangeSettingsOverlay.dtd b/locale/exchangecalendar/tr/exchangeSettingsOverlay.dtd
index c6d65f0b..5f8f55b6 100644
--- a/locale/exchangecalendar/tr/exchangeSettingsOverlay.dtd
+++ b/locale/exchangecalendar/tr/exchangeSettingsOverlay.dtd
@@ -49,3 +49,7 @@
 
 <!ENTITY exchWebServices.UserAvailability.label “Yalnızca, posta kutusuna ait takvimin kullanıcı müsaitliği durumu görünür olacak.">
 
+<!ENTITY exchWebServices.exchtype.label "Exchange Type">
+<!ENTITY exchWebServices.hostexch.label "Hosted Exchange">
+<!ENTITY exchWebServices.365exch.label "Microsoft Office365">
+<!ENTITY exchWebServices.detail.label "Details">