From c0fa396b65b90743ccf1aa86dc86fc0095700238 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 22 Aug 2018 23:11:19 +0000 Subject: [PATCH] case 3649 --- source/Plugins/AyaNova.Plugin.PTI/MainForm.cs | 4 ++-- source/Plugins/AyaNova.Plugin.QBI/MainForm.cs | 6 ++++-- source/Plugins/AyaNova.Plugin.QBOI/MainForm.cs | 2 +- source/WinFormApp/AddressForm.cs | 2 +- source/WinFormApp/Form1.cs | 16 +++++++++++----- source/WinFormApp/TrialExpire.cs | 4 ++-- source/WinFormApp/TrialExpired.cs | 2 +- source/WinFormApp/Util.cs | 11 +++++++---- 8 files changed, 29 insertions(+), 18 deletions(-) diff --git a/source/Plugins/AyaNova.Plugin.PTI/MainForm.cs b/source/Plugins/AyaNova.Plugin.PTI/MainForm.cs index b4b8600..1c13f57 100644 --- a/source/Plugins/AyaNova.Plugin.PTI/MainForm.cs +++ b/source/Plugins/AyaNova.Plugin.PTI/MainForm.cs @@ -654,7 +654,7 @@ namespace AyaNova.PlugIn.PTI break; case "Contents": // - Util.OpenWebURL("http://www.ayanova.com/pti7webhelp/index.html"); + Util.OpenWebURL("https://www.ayanova.com/PTI7webHelp/index.html");//case 3649 break; case "Technical support": // ButtonTool @@ -662,7 +662,7 @@ namespace AyaNova.PlugIn.PTI break; case "Check for updates": // ButtonTool - Util.OpenWebURL("http://www.ayanova.com/download.htm"); + Util.OpenWebURL("https://www.ayanova.com/download.htm"); break; case "About": // ButtonTool diff --git a/source/Plugins/AyaNova.Plugin.QBI/MainForm.cs b/source/Plugins/AyaNova.Plugin.QBI/MainForm.cs index eba15de..d6deabd 100644 --- a/source/Plugins/AyaNova.Plugin.QBI/MainForm.cs +++ b/source/Plugins/AyaNova.Plugin.QBI/MainForm.cs @@ -675,7 +675,8 @@ namespace AyaNova.PlugIn.QBI break; case "Contents": // - Util.OpenWebURL("http://www.ayanova.com/qbi7webhelp/index.html"); + //case 3649 + Util.OpenWebURL("https://www.ayanova.com/QBI7webHelp/index.html"); break; case "Technical support": // ButtonTool @@ -683,7 +684,8 @@ namespace AyaNova.PlugIn.QBI break; case "Check for updates": // ButtonTool - Util.OpenWebURL("http://www.ayanova.com/download.htm"); + //case 3649 + Util.OpenWebURL("https://www.ayanova.com/download.htm"); break; case "About": // ButtonTool diff --git a/source/Plugins/AyaNova.Plugin.QBOI/MainForm.cs b/source/Plugins/AyaNova.Plugin.QBOI/MainForm.cs index 22c516c..88224ab 100644 --- a/source/Plugins/AyaNova.Plugin.QBOI/MainForm.cs +++ b/source/Plugins/AyaNova.Plugin.QBOI/MainForm.cs @@ -666,7 +666,7 @@ namespace AyaNova.PlugIn.QBOI break; case "Contents": // - Util.OpenWebURL("http://www.ayanova.com/qboi7webhelp/index.html"); + Util.OpenWebURL("https://www.ayanova.com/QBOI7WebHelp/index.html"); break; case "Technical support": // ButtonTool diff --git a/source/WinFormApp/AddressForm.cs b/source/WinFormApp/AddressForm.cs index 3e14594..11c97c1 100644 --- a/source/WinFormApp/AddressForm.cs +++ b/source/WinFormApp/AddressForm.cs @@ -840,7 +840,7 @@ namespace AyaNova private void btnCountryCode_Click(object sender, System.EventArgs e) { //case 1039 //log.Debug("btnCountryCode_Click"); - Util.OpenWebURL("http://www.iso.org/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html"); + Util.OpenWebURL("https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2"); } diff --git a/source/WinFormApp/Form1.cs b/source/WinFormApp/Form1.cs index 0ee0bdd..fa2ee77 100644 --- a/source/WinFormApp/Form1.cs +++ b/source/WinFormApp/Form1.cs @@ -3637,8 +3637,8 @@ namespace AyaNova break; case "QuickStart": // case 1306 - - Util.OpenWebURL(Util.BaseHelpUrl + "QuickStart_for_Beginners.htm"); + //case 3649 + Util.OpenWebURL(Util.BaseHelpUrl + "index.html?quickstart_for_beginners.htm"); break; @@ -3661,15 +3661,21 @@ namespace AyaNova System.Diagnostics.FileVersionInfo fileVersion = System.Diagnostics.FileVersionInfo.GetVersionInfo(a.Location); string surl = CheckForUpdate.UpdateUrl((AyaBizUtils.Lite ? "AyaNovaLite" : "AyaNovaFull"), fileVersion.FileVersion); - + if (!string.IsNullOrEmpty(surl)) - if (!surl.StartsWith("http:")) + { + //case 3649 + if (surl.StartsWith("http:")) + surl = surl.Replace("http:", "https:"); + + if (!surl.StartsWith("https:")) Util.Error("CheckForUpdate failed", surl); else Util.OpenWebURL(surl); + } else MessageBox.Show("Up to date!"); - //Util.OpenWebURL("http://www.ayanova.com/download.htm"); + break; case "LT:UI.Help.PurchaseLicenses": // StateButtonTool diff --git a/source/WinFormApp/TrialExpire.cs b/source/WinFormApp/TrialExpire.cs index 6a24bec..ac4b049 100644 --- a/source/WinFormApp/TrialExpire.cs +++ b/source/WinFormApp/TrialExpire.cs @@ -18,8 +18,8 @@ namespace AyaNova private void lblQuickStart_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - - Util.OpenWebURL(Util.BaseHelpUrl + "index.html?QuickStart_for_Beginners.htm"); + + Util.OpenWebURL(Util.BaseHelpUrl + "index.html?quickstart_for_beginners.htm"); // this.Close(); } diff --git a/source/WinFormApp/TrialExpired.cs b/source/WinFormApp/TrialExpired.cs index 882c115..ece1d4e 100644 --- a/source/WinFormApp/TrialExpired.cs +++ b/source/WinFormApp/TrialExpired.cs @@ -19,7 +19,7 @@ namespace AyaNova private void lblQuickStart_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - Util.OpenWebURL( "http://www.ayanova.com/purchase.htm"); + Util.OpenWebURL( "https://www.ayanova.com/purchase.htm"); //this.WindowState = FormWindowState.Minimized; } diff --git a/source/WinFormApp/Util.cs b/source/WinFormApp/Util.cs index 2edc308..428fbee 100644 --- a/source/WinFormApp/Util.cs +++ b/source/WinFormApp/Util.cs @@ -5499,10 +5499,13 @@ At first I was happy to find your code that solved my problem, but I did not lik try { - if(sUrl.ToLower().StartsWith("http://")) + //case 3649 changed this block to handle https urls + if (sUrl.ToLower().StartsWith("https://")) + System.Diagnostics.Process.Start(sUrl); + else if(sUrl.ToLower().StartsWith("http://")) System.Diagnostics.Process.Start(sUrl); else - System.Diagnostics.Process.Start("http://" + sUrl); + System.Diagnostics.Process.Start("https://" + sUrl);//was http before case 3649 } catch(Exception ex) @@ -8514,9 +8517,9 @@ At first I was happy to find your code that solved my problem, but I did not lik get { if(AyaBizUtils.Lite) - return "http://www.ayanova.com/AyaNovaLite7webHelp/"; + return @"https://www.ayanova.com/AyaNovaLite7webHelp/"; - return "http://www.ayanova.com/AyaNova7webHelp/"; + return @"https://www.ayanova.com/AyaNova7webHelp/"; } } #endregion help url