diff --git a/WebsitePanel/Lib/References/Whois.NET/WhoisClient.dll b/WebsitePanel/Lib/References/Whois.NET/WhoisClient.dll index 27a75771..5abd0505 100644 Binary files a/WebsitePanel/Lib/References/Whois.NET/WhoisClient.dll and b/WebsitePanel/Lib/References/Whois.NET/WhoisClient.dll differ diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SchedulerTasks/DomainLookupViewTask.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SchedulerTasks/DomainLookupViewTask.cs index bd3eca9b..a1a49534 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SchedulerTasks/DomainLookupViewTask.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SchedulerTasks/DomainLookupViewTask.cs @@ -302,7 +302,7 @@ namespace WebsitePanel.EnterpriseServer var dnsRecord = new DnsRecordInfo { - Value = match.Groups[1].Value != null ? match.Groups[1].Value.Replace("\r\n", "").Replace("\r", "").Replace("\n", "").Trim() : null, + Value = match.Groups[1].Value != null ? match.Groups[1].Value.Replace("\r\n", "").Replace("\r", "").Replace("\n", "").ToLowerInvariant().Trim() : null, RecordType = recordType, DnsServer = dnsServer }; diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Servers/ServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Servers/ServerController.cs index bde9b20a..507ae075 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Servers/ServerController.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Servers/ServerController.cs @@ -54,12 +54,14 @@ namespace WebsitePanel.EnterpriseServer private static List _createdDatePatterns = new List { @"Creation Date:(.+)", // base @"created:(.+)", + @"Created On:(.+) UTC", @"Created On:(.+)", @"Domain Registration Date:(.+)", @"Domain Create Date:(.+)", @"Registered on:(.+)"}; - private static List _expiredDatePatterns = new List { @"Expiration Date:(.+)", // base + private static List _expiredDatePatterns = new List { @"Expiration Date:(.+) UTC", //base UTC + @"Expiration Date:(.+)", // base @"Registry Expiry Date:(.+)", //.org @"paid-till:(.+)", //.ru @"Expires On:(.+)", //.name @@ -2682,7 +2684,7 @@ namespace WebsitePanel.EnterpriseServer { DataProvider.UpdateDomainLastUpdateDate(domain.DomainId, DateTime.Now); - var whoisResult = WhoisClient.Query(domain.DomainName); + var whoisResult = WhoisClient.Query(domain.DomainName.ToLowerInvariant()); var createdDate = GetDomainInfoDate(whoisResult.Raw, _createdDatePatterns); var expiredDate = GetDomainInfoDate(whoisResult.Raw, _expiredDatePatterns);