admin/ayanova7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

case 3649

Browse Source
This commit is contained in:
John Cardinal
2018-08-22 23:11:19 +00:00
parent 610964d4b3
commit c0fa396b65
8 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/Plugins/AyaNova.Plugin.PTI/MainForm.cs
View File

@@ -654,7 +654,7 @@ namespace AyaNova.PlugIn.PTI
break; break;
case "Contents": // case "Contents": //
Util.OpenWebURL("http://www.ayanova.com/pti7webhelp/index.html"); Util.OpenWebURL("https://www.ayanova.com/PTI7webHelp/index.html");//case 3649
break; break;
case "Technical support": // ButtonTool case "Technical support": // ButtonTool
@@ -662,7 +662,7 @@ namespace AyaNova.PlugIn.PTI
break; break;
case "Check for updates": // ButtonTool case "Check for updates": // ButtonTool
Util.OpenWebURL("http://www.ayanova.com/download.htm"); Util.OpenWebURL("https://www.ayanova.com/download.htm");
break; break;
case "About": // ButtonTool case "About": // ButtonTool

6
source/Plugins/AyaNova.Plugin.QBI/MainForm.cs
View File

@@ -675,7 +675,8 @@ namespace AyaNova.PlugIn.QBI
break; break;
case "Contents": // case "Contents": //
Util.OpenWebURL("http://www.ayanova.com/qbi7webhelp/index.html"); //case 3649
Util.OpenWebURL("https://www.ayanova.com/QBI7webHelp/index.html");
break; break;
case "Technical support": // ButtonTool case "Technical support": // ButtonTool
@@ -683,7 +684,8 @@ namespace AyaNova.PlugIn.QBI
break; break;
case "Check for updates": // ButtonTool case "Check for updates": // ButtonTool
Util.OpenWebURL("http://www.ayanova.com/download.htm"); //case 3649
Util.OpenWebURL("https://www.ayanova.com/download.htm");
break; break;
case "About": // ButtonTool case "About": // ButtonTool

2
source/Plugins/AyaNova.Plugin.QBOI/MainForm.cs
View File

@@ -666,7 +666,7 @@ namespace AyaNova.PlugIn.QBOI
break; break;
case "Contents": // case "Contents": //
Util.OpenWebURL("http://www.ayanova.com/qboi7webhelp/index.html"); Util.OpenWebURL("https://www.ayanova.com/QBOI7WebHelp/index.html");
break; break;
case "Technical support": // ButtonTool case "Technical support": // ButtonTool

2
source/WinFormApp/AddressForm.cs
View File

@@ -840,7 +840,7 @@ namespace AyaNova
private void btnCountryCode_Click(object sender, System.EventArgs e) private void btnCountryCode_Click(object sender, System.EventArgs e)
{ {
//case 1039 //log.Debug("btnCountryCode_Click"); //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");
} }

16
source/WinFormApp/Form1.cs
View File

@@ -3637,8 +3637,8 @@ namespace AyaNova
break; break;
case "QuickStart": // case 1306 case "QuickStart": // case 1306
//case 3649
Util.OpenWebURL(Util.BaseHelpUrl + "QuickStart_for_Beginners.htm"); Util.OpenWebURL(Util.BaseHelpUrl + "index.html?quickstart_for_beginners.htm");
break; break;
@@ -3661,15 +3661,21 @@ namespace AyaNova
System.Diagnostics.FileVersionInfo fileVersion = System.Diagnostics.FileVersionInfo.GetVersionInfo(a.Location); System.Diagnostics.FileVersionInfo fileVersion = System.Diagnostics.FileVersionInfo.GetVersionInfo(a.Location);
string surl = CheckForUpdate.UpdateUrl((AyaBizUtils.Lite ? "AyaNovaLite" : "AyaNovaFull"), fileVersion.FileVersion); string surl = CheckForUpdate.UpdateUrl((AyaBizUtils.Lite ? "AyaNovaLite" : "AyaNovaFull"), fileVersion.FileVersion);
if (!string.IsNullOrEmpty(surl)) 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); Util.Error("CheckForUpdate failed", surl);
else else
Util.OpenWebURL(surl); Util.OpenWebURL(surl);
}
else else
MessageBox.Show("Up to date!"); MessageBox.Show("Up to date!");
//Util.OpenWebURL("http://www.ayanova.com/download.htm");
break; break;
case "LT:UI.Help.PurchaseLicenses": // StateButtonTool case "LT:UI.Help.PurchaseLicenses": // StateButtonTool

4
source/WinFormApp/TrialExpire.cs
View File

@@ -18,8 +18,8 @@ namespace AyaNova
private void lblQuickStart_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) 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(); // this.Close();
} }

2
source/WinFormApp/TrialExpired.cs
View File

@@ -19,7 +19,7 @@ namespace AyaNova
private void lblQuickStart_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) 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; //this.WindowState = FormWindowState.Minimized;
} }

11
source/WinFormApp/Util.cs
View File

@@ -5499,10 +5499,13 @@ At first I was happy to find your code that solved my problem, but I did not lik
try 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); System.Diagnostics.Process.Start(sUrl);
else else
System.Diagnostics.Process.Start("http://" + sUrl); System.Diagnostics.Process.Start("https://" + sUrl);//was http before case 3649
} }
catch(Exception ex) 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 get
{ {
if(AyaBizUtils.Lite) 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 #endregion help url