case 4017
This commit is contained in:
Binary file not shown.
Binary file not shown.
@@ -62,4 +62,4 @@ using System.Runtime.InteropServices;
|
|||||||
[assembly: log4net.Config.XmlConfigurator(ConfigFile="Log4Net.config",Watch=true)]
|
[assembly: log4net.Config.XmlConfigurator(ConfigFile="Log4Net.config",Watch=true)]
|
||||||
//[assembly: log4net.Config.XmlConfigurator(Watch=true)]
|
//[assembly: log4net.Config.XmlConfigurator(Watch=true)]
|
||||||
[assembly: ComVisibleAttribute(false)]
|
[assembly: ComVisibleAttribute(false)]
|
||||||
[assembly: AssemblyFileVersionAttribute("7.6.8.0")]
|
[assembly: AssemblyFileVersionAttribute("7.6.14.0")]
|
||||||
|
|||||||
@@ -1842,10 +1842,10 @@ namespace AyaNova
|
|||||||
#if(DEBUG)
|
#if(DEBUG)
|
||||||
dlg = new Login("manager", "letmein");
|
dlg = new Login("manager", "letmein");
|
||||||
#else
|
#else
|
||||||
if(AyaBizUtils.Trial)
|
if (AyaBizUtils.Trial)
|
||||||
dlg = new Login("manager","letmein");
|
dlg = new Login("manager", "letmein");
|
||||||
else
|
else
|
||||||
dlg = new Login("","");
|
dlg = new Login("", "");
|
||||||
#endif
|
#endif
|
||||||
dlg.ShowDialog(this);
|
dlg.ShowDialog(this);
|
||||||
bDoLogin = dlg.LoggingIn;
|
bDoLogin = dlg.LoggingIn;
|
||||||
@@ -3918,6 +3918,7 @@ namespace AyaNova
|
|||||||
|
|
||||||
//Check if we are running as a standalone firebird database,
|
//Check if we are running as a standalone firebird database,
|
||||||
//if so then we need to do the notification and PM processing ourselves
|
//if so then we need to do the notification and PM processing ourselves
|
||||||
|
|
||||||
if (AyaBizUtils.AyaNovaConnectionSetting.SingleUserConnection)
|
if (AyaBizUtils.AyaNovaConnectionSetting.SingleUserConnection)
|
||||||
{
|
{
|
||||||
//case 1039 //log.Debug("Re-generate (PM & Notifications)");
|
//case 1039 //log.Debug("Re-generate (PM & Notifications)");
|
||||||
@@ -3956,7 +3957,7 @@ namespace AyaNova
|
|||||||
timer1.Interval = 30000;
|
timer1.Interval = 30000;
|
||||||
#else
|
#else
|
||||||
//5 minutes
|
//5 minutes
|
||||||
timer1.Interval=300000;
|
timer1.Interval = 300000;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -64,4 +64,4 @@ using System.Security.Permissions;
|
|||||||
// Configure log4net using the .config file
|
// 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: log4net.Config.XmlConfigurator( ConfigFile="Log4Net.config",Watch=true )]
|
//[assembly: log4net.Config.XmlConfigurator( ConfigFile="Log4Net.config",Watch=true )]
|
||||||
[assembly: AssemblyFileVersionAttribute("7.6.12.0")]
|
[assembly: AssemblyFileVersionAttribute("7.6.14.0")]
|
||||||
|
|||||||
@@ -45,11 +45,13 @@ namespace GZTW.AyaNova.BLL
|
|||||||
if (GZTW.AyaNova.BLL.AyaBizUtils.GlobalSettings.NotifySMTPUseTLS)
|
if (GZTW.AyaNova.BLL.AyaBizUtils.GlobalSettings.NotifySMTPUseTLS)
|
||||||
mailman.StartTLS = true;
|
mailman.StartTLS = true;
|
||||||
|
|
||||||
|
|
||||||
mailman.SmtpUsername = GZTW.AyaNova.BLL.AyaBizUtils.GlobalSettings.NotifySMTPAccount;
|
mailman.SmtpUsername = GZTW.AyaNova.BLL.AyaBizUtils.GlobalSettings.NotifySMTPAccount;
|
||||||
mailman.SmtpPassword = GZTW.AyaNova.BLL.AyaBizUtils.GlobalSettings.NotifySMTPPassword;
|
mailman.SmtpPassword = GZTW.AyaNova.BLL.AyaBizUtils.GlobalSettings.NotifySMTPPassword;
|
||||||
|
|
||||||
//case 1382
|
//case 1382
|
||||||
//if can't use smtp server then log and conditionally abort
|
//if can't use smtp server then log and conditionally abort
|
||||||
|
//## NOTE: this operation sets up what tls level is being used etc
|
||||||
if (!mailman.SmtpNoop())
|
if (!mailman.SmtpNoop())
|
||||||
{
|
{
|
||||||
//case 1608
|
//case 1608
|
||||||
@@ -166,6 +168,9 @@ namespace GZTW.AyaNova.BLL
|
|||||||
// Send mail.
|
// Send mail.
|
||||||
bool success;
|
bool success;
|
||||||
success = mailman.SendEmail(email);
|
success = mailman.SendEmail(email);
|
||||||
|
#if(DEBUG)
|
||||||
|
NotifyDeliveryLog.LogSMTPDeliveryMessage("POST TLS version: " + mailman.TlsVersion);
|
||||||
|
#endif
|
||||||
if (success)
|
if (success)
|
||||||
{
|
{
|
||||||
NotifyDeliveryLog.LogClientDelivery(n.ClientID, true, "");
|
NotifyDeliveryLog.LogClientDelivery(n.ClientID, true, "");
|
||||||
|
|||||||
@@ -37,6 +37,8 @@ namespace GZTW.AyaNova.BLL
|
|||||||
if (GZTW.AyaNova.BLL.AyaBizUtils.GlobalSettings.NotifySMTPUseTLS)
|
if (GZTW.AyaNova.BLL.AyaBizUtils.GlobalSettings.NotifySMTPUseTLS)
|
||||||
mailman.StartTLS = true;
|
mailman.StartTLS = true;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
mailman.SmtpUsername=Login;
|
mailman.SmtpUsername=Login;
|
||||||
mailman.SmtpPassword=Password;
|
mailman.SmtpPassword=Password;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user