added missing warning and are you sure prompts from v8-migrate

also some left over bare linefeeds stuff that turned out to be AVG antivirus but whatever it's done
This commit is contained in:
2022-08-27 20:55:11 +00:00
parent 6aafe4b826
commit e77a457f19
6 changed files with 14 additions and 13 deletions

View File

@@ -442,8 +442,8 @@ Global
{3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}.Default|x86.Build.0 = Debug|Any CPU
{3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}.Release|.NET.ActiveCfg = Release|Any CPU
{3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}.Release|.NET.Build.0 = Release|Any CPU
{3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}.Release|Any CPU.ActiveCfg = Release|x86
{3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}.Release|Any CPU.Build.0 = Release|x86
{3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}.Release|Any CPU.Build.0 = Release|Any CPU
{3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}.Release|WBI.ActiveCfg = Release|Any CPU

View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("8.0.1.0")]
[assembly: AssemblyFileVersion("8.0.1.0")]
[assembly: AssemblyVersion("8.0.2.0")]
[assembly: AssemblyFileVersion("8.0.2.0")]

View File

@@ -35,7 +35,7 @@ namespace AyaNova.PlugIn.V8
public string PluginVersion
{
get { return "8.0.1"; }
get { return "8.0.2"; }
}
public string About
@@ -164,8 +164,9 @@ namespace AyaNova.PlugIn.V8
util.InitClient();
//here because we logged in fine and can proceed
//MessageBox.Show("Login successful! JWT is " + util.JWT);
if (MessageBox.Show("Warning: if you continue the AyaNova 8 destination server's database will be erased.\r\nAre you sure you want to continue?", "Erase data warning", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) return;
if (MessageBox.Show("Last chance: the next step will start migration and the AyaNova 8 target server's data will be erased.\r\nAre you sure you want to proceed?", "Continue migration", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) return;
//Only one command
DoExport();
}

View File

@@ -62,4 +62,4 @@ using System.Runtime.InteropServices;
[assembly: log4net.Config.XmlConfigurator(ConfigFile="Log4Net.config",Watch=true)]
//[assembly: log4net.Config.XmlConfigurator(Watch=true)]
[assembly: ComVisibleAttribute(false)]
[assembly: AssemblyFileVersionAttribute("7.6.16.0")]
[assembly: AssemblyFileVersionAttribute("7.6.17.0")]

View File

@@ -64,4 +64,4 @@ using System.Security.Permissions;
// Configure log4net using the .config file
//[assembly: log4net.Config.XmlConfigurator(ConfigFile="Log4Net.config",Watch=true)]
//[assembly: log4net.Config.XmlConfigurator( ConfigFile="Log4Net.config",Watch=true )]
[assembly: AssemblyFileVersionAttribute("7.6.16.0")]
[assembly: AssemblyFileVersionAttribute("7.6.17.0")]

View File

@@ -88,12 +88,12 @@ namespace GZTW.AyaNova.BLL
Chilkat.Email email = new Chilkat.Email();
//email.SetFromMimeText(n.GetContentAsString);
email.Mailer = "AyaNova service management software licensed to " + AyaBizUtils.REGTO;
email.Mailer = AyaBizUtils.ReplaceBareLineFeeds("AyaNova service management software licensed to " + AyaBizUtils.REGTO);
email.Body = AyaBizUtils.ReplaceBareLineFeeds(sMessageFields[1]);//case 4180
email.Subject = sMessageFields[2];
email.Subject = AyaBizUtils.ReplaceBareLineFeeds(sMessageFields[2]);
//case 1601
string ToAddress = sMessageFields[3];
string ToAddress = AyaBizUtils.ReplaceBareLineFeeds(sMessageFields[3]);
//case 3808
@@ -117,7 +117,7 @@ namespace GZTW.AyaNova.BLL
else
email.AddTo("", ToAddress);
email.From = sMessageFields[4];
email.From = AyaBizUtils.ReplaceBareLineFeeds(sMessageFields[4]);
if (nFieldCount > 5)
{