[FIX] plugin_outlook: Removed method check_connectivity as it is removed from server...

bzr revid: rgo@tinyerp.com-20130920085123-j622oabndu1zjisy

diff --git a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPClient/OpenERPConnect.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPClient/OpenERPConnect.cs
index d667282..f9314ad 100644 (file)
--- a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPClient/OpenERPConnect.cs
+++ b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPClient/OpenERPConnect.cs
@@ -377,20 +377,6 @@ namespace OpenERPClient
             return version;\r
         }\r
 \r
-        public bool check_connectivity()\r
-        {\r
-            /*\r
-            It will check connection on given server url.\r
-               \r
-            :return : True or False.\r
-            */\r
-\r
-            this.Open(OpenERPClient.OpenERPService.Common);\r
-            bool flag = this.rpcclient.check_connectivity();\r
-            this.Close();\r
-            return flag;\r
-        }\r
-\r
 \r
     }\r
 \r

diff --git a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPClient/XMLRPCClient.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPClient/XMLRPCClient.cs
index ebe9ec1..23768b0 100644 (file)
--- a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPClient/XMLRPCClient.cs
+++ b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPClient/XMLRPCClient.cs
@@ -47,10 +47,6 @@ namespace OpenERPClient
         [XmlRpcMethod("server_version")]\r
         string ServerVersion();\r
 \r
-        [XmlRpcMethod("check_connectivity")]\r
-        bool check_connectivity();\r
-\r
-\r
     }\r
     public interface Ixmlrpcconnect : IOpenERPCommon, IOpenERPDB, IOpenERPObject\r
     {\r
@@ -84,11 +80,6 @@ namespace OpenERPClient
         {\r
             return rpcclient.ServerVersion();\r
         }\r
-\r
-        public bool check_connectivity()\r
-        {\r
-            return rpcclient.check_connectivity();\r
-        }\r
         #endregion\r
 \r
 \r

diff --git a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.Designer.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.Designer.cs
index aeca33d..ce88d2e 100644 (file)
--- a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.Designer.cs
+++ b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.Designer.cs
@@ -64,6 +64,7 @@
             this.chkSSL.TabIndex = 19;\r
             this.chkSSL.Text = "SSL (https)";\r
             this.chkSSL.UseVisualStyleBackColor = true;\r
+            this.chkSSL.CheckedChanged += new System.EventHandler(this.chkSSL_CheckedChanged);\r
             // \r
             // txt_server_port\r
             // \r

diff --git a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.cs
index 1c663f5..5e09fc1 100644 (file)
--- a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.cs
+++ b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.cs
@@ -20,6 +20,13 @@
 using System;\r
 using System.Windows.Forms;\r
 using OpenERPClient;\r
+using System.Net;\r
+using System.IO;\r
+using System.Text;\r
+using System.Security;\r
+using System.Net;\r
+using System.Security.Cryptography.X509Certificates;\r
+using System.Net.Security;\r
 \r
 namespace OpenERPOutlookPlugin\r
 {\r
@@ -50,6 +57,15 @@ namespace OpenERPOutlookPlugin
             }\r
         }\r
 \r
+        public static bool ValidateServerCertificate(\r
+                      object sender,\r
+                      X509Certificate certificate,\r
+                      X509Chain chain,\r
+                      SslPolicyErrors sslPolicyErrors)\r
+        {\r
+            // Somehow the cert always has PolicyErrors so I am returning true regardless.\r
+            return true;\r
+        }\r
 \r
         private void btn_server_ok_Click(object sender, EventArgs e)\r
         {\r
@@ -59,7 +75,10 @@ namespace OpenERPOutlookPlugin
                 OpenERPConnect openerp_connect = openerp_outlook.Connection;\r
                 string url = Tools.JoinURL(this.txt_server_host.Text, this.txt_server_port.Text, this.chkSSL.Checked);\r
                 this.txtServerURL.Text = url;\r
-                openerp_connect.check_connectivity();\r
+                if (this.chkSSL.Checked)\r
+                {\r
+                   ServicePointManager.ServerCertificateValidationCallback += new RemoteCertificateValidationCallback(ValidateServerCertificate);\r
+                }\r
                 this.Close();\r
             }\r
             catch (Exception ex)\r
@@ -74,6 +93,16 @@ namespace OpenERPOutlookPlugin
             this.Close();\r
         }\r
 \r
-\r
+        private void chkSSL_CheckedChanged(object sender, EventArgs e)\r
+        {\r
+            if (this.chkSSL.Checked)\r
+            {\r
+                txt_server_port.Text = "443";\r
+            }\r
+            else\r
+            {\r
+                txt_server_port.Text = "8069";\r
+            }\r
+        }\r
     }\r
 }\r

diff --git a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi
index 9d9dd5d..64f54f2 100644 (file)
Binary files a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi and b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi differ

diff --git a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi
index 0c2fa88..3b91daf 100644 (file)
Binary files a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi and b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi differ