ST added pause parametr + order changed

WebsitePanel/Database/update_db.sql

@@ -6089,6 +6089,12 @@ INSERT [dbo].[ScheduleTaskParameters] ([TaskID], [ParameterID], [DataTypeID], [D
 END
 GO
 
+IF NOT EXISTS (SELECT * FROM [dbo].[ScheduleTaskParameters] WHERE [TaskID] = N'SCHEDULE_TASK_DOMAIN_LOOKUP' AND [ParameterID]= N'PAUSE_BETWEEN_QUERIES' )
+BEGIN
+INSERT [dbo].[ScheduleTaskParameters] ([TaskID], [ParameterID], [DataTypeID], [DefaultValue], [ParameterOrder]) VALUES (N'SCHEDULE_TASK_DOMAIN_LOOKUP', N'PAUSE_BETWEEN_QUERIES', N'String', N'100', 4)
+END
+GO
+
 IF EXISTS (SELECT * FROM [dbo].[ScheduleTaskParameters] WHERE [TaskID] = N'SCHEDULE_TASK_DOMAIN_LOOKUP' AND [ParameterID]= N'SERVER_NAME' )
 BEGIN
 UPDATE [dbo].[ScheduleTaskParameters] SET [DefaultValue] = N'' WHERE [TaskID] = N'SCHEDULE_TASK_DOMAIN_LOOKUP' AND [ParameterID]= N'SERVER_NAME'

WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SchedulerTasks/DomainExpirationTask.cs

@@ -181,9 +181,11 @@ namespace WebsitePanel.EnterpriseServer
             Hashtable items = new Hashtable();
 
             items["user"] = user;
+
             items["Domains"] = domains.Select(x => new { DomainName = x.DomainName, 
                                                          ExpirationDate = x.ExpirationDate, 
-                                                         Customer = string.Format("{0} {1}", domainUsers[x.PackageId].FirstName, domainUsers[x.PackageId].LastName) });
+                                                         Customer = string.Format("{0} {1}", domainUsers[x.PackageId].FirstName, domainUsers[x.PackageId].LastName) })
+                                      .OrderBy(x => x.ExpirationDate).ThenBy(x => x.Customer).ThenBy(x => x.DomainName);
             
             items["IncludeNonExistenDomains"] = includeNonExistenDomains;
 
@@ -191,7 +193,7 @@ namespace WebsitePanel.EnterpriseServer
             {
                 DomainName = x.DomainName,
                 Customer = string.Format("{0} {1}", domainUsers[x.PackageId].FirstName, domainUsers[x.PackageId].LastName)
-            });
+            }).OrderBy(x => x.Customer).ThenBy(x => x.DomainName);
 
 
             body = PackageController.EvaluateTemplate(body, items);

WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SchedulerTasks/DomainLookupViewTask.cs

@@ -23,6 +23,7 @@ namespace WebsitePanel.EnterpriseServer
         private static readonly string MailBodyTemplateParameter = "MAIL_BODY";
         private static readonly string MailBodyDomainRecordTemplateParameter = "MAIL_DOMAIN_RECORD";
         private static readonly string ServerNameParameter = "SERVER_NAME";
+        private static readonly string PauseBetweenQueriesParameter = "PAUSE_BETWEEN_QUERIES";
 
         private const string MxRecordPattern = @"mail exchanger = (.+)";
         private const string NsRecordPattern = @"nameserver = (.+)";
@@ -40,7 +41,9 @@ namespace WebsitePanel.EnterpriseServer
             string dnsServersString = (string)topTask.GetParamValue(DnsServersParameter);
             string serverName = (string)topTask.GetParamValue(ServerNameParameter);
 
-            // check input parameters
+            int pause;
+
+                        // check input parameters
             if (String.IsNullOrEmpty(dnsServersString))
             {
                 TaskManager.WriteWarning("Specify 'DNS' task parameter.");
@@ -53,6 +56,13 @@ namespace WebsitePanel.EnterpriseServer
                 return;
             }
 
+
+            if (!int.TryParse((string)topTask.GetParamValue(PauseBetweenQueriesParameter), out pause))
+            {
+                TaskManager.WriteWarning("The 'pause between queries' parameter is not valid.");
+                return;
+            }
+
             // find server by name
             ServerInfo server = ServerController.GetServerByName(serverName);
             if (server == null)
@@ -102,8 +112,8 @@ namespace WebsitePanel.EnterpriseServer
                     //execute server
                     foreach (var dnsServer in dnsServers)
                     {
-                        var dnsMxRecords = GetDomainDnsRecords(winServer, domain.DomainName, dnsServer, DnsRecordType.MX) ?? dbDnsRecords.Where(x => x.RecordType == DnsRecordType.MX).ToList();
+                        var dnsMxRecords = GetDomainDnsRecords(winServer, domain.DomainName, dnsServer, DnsRecordType.MX, pause) ?? dbDnsRecords.Where(x => x.RecordType == DnsRecordType.MX).ToList();
-                        var dnsNsRecords = GetDomainDnsRecords(winServer, domain.DomainName, dnsServer, DnsRecordType.NS) ?? dbDnsRecords.Where(x => x.RecordType == DnsRecordType.NS).ToList();
+                        var dnsNsRecords = GetDomainDnsRecords(winServer, domain.DomainName, dnsServer, DnsRecordType.NS, pause) ?? dbDnsRecords.Where(x => x.RecordType == DnsRecordType.NS).ToList();
 
                         FillRecordData(dnsMxRecords, domain, dnsServer);
                         FillRecordData(dnsNsRecords, domain, dnsServer);
@@ -306,8 +316,10 @@ namespace WebsitePanel.EnterpriseServer
             MailHelper.SendMessage(from, mailTo, bcc, subject, body, priority, isHtml);
         }
 
-        public List<DnsRecordInfo> GetDomainDnsRecords(WindowsServer winServer, string domain, string dnsServer, DnsRecordType recordType)
+        public List<DnsRecordInfo> GetDomainDnsRecords(WindowsServer winServer, string domain, string dnsServer, DnsRecordType recordType, int pause)
         {
+            Thread.Sleep(pause);
+
             //nslookup -type=mx google.com 195.46.39.39
             var command = "nslookup";
             var args = string.Format("-type={0} {1} {2}", recordType, domain, dnsServer);

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ScheduleTaskControls/App_LocalResources/DomainLookupView.ascx.Designer.cs

@@ -79,6 +79,15 @@ namespace WebsitePanel.Portal.ScheduleTaskControls.App_LocalResources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Pause between queries (ms):.
+        /// </summary>
+        internal static string lblPause {
+            get {
+                return ResourceManager.GetString("lblPause", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Server Name:.
         /// </summary>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ScheduleTaskControls/App_LocalResources/DomainLookupView.ascx.resx

@@ -123,6 +123,9 @@
   <data name="lblDnsServersHint" xml:space="preserve">
     <value>Please enter dns servers to check.</value>
   </data>
+  <data name="lblPause" xml:space="preserve">
+    <value>Pause between queries (ms):</value>
+  </data>
   <data name="lblServerName" xml:space="preserve">
     <value>Server Name:</value>
   </data>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ScheduleTaskControls/DomainLookupView.ascx

@@ -25,4 +25,12 @@
             <asp:TextBox ID="txtMailTo" runat="server" Width="95%" CssClass="NormalTextBox" MaxLength="1000"></asp:TextBox>
          </td>
     </tr>
+    <tr>
+        <td class="SubHead" nowrap>
+            <asp:Label ID="lblPause" runat="server" meta:resourcekey="lblPause" Text="Pause between queries (ms):"></asp:Label>
+        </td>
+        <td class="Normal" width="100%">
+            <asp:TextBox ID="txtPause" runat="server" Width="95%" CssClass="NormalTextBox" MaxLength="1000"></asp:TextBox>
+         </td>
+    </tr>
 </table>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ScheduleTaskControls/DomainLookupView.ascx.cs

@@ -14,6 +14,7 @@ namespace WebsitePanel.Portal.ScheduleTaskControls
         private static readonly string DnsServersParameter = "DNS_SERVERS";
         private static readonly string MailToParameter = "MAIL_TO";
         private static readonly string ServerNameParameter = "SERVER_NAME";
+        private static readonly string PauseBetweenQueriesParameter = "PAUSE_BETWEEN_QUERIES";
 
         protected void Page_Load(object sender, EventArgs e)
         {
@@ -30,6 +31,7 @@ namespace WebsitePanel.Portal.ScheduleTaskControls
 
             this.SetParameter(this.txtDnsServers, DnsServersParameter);
             this.SetParameter(this.txtMailTo, MailToParameter);
+            this.SetParameter(this.txtPause, PauseBetweenQueriesParameter);
             this.SetParameter(this.ddlServers, ServerNameParameter);
 
             var servers = ES.Services.Servers.GetAllServers();
@@ -68,8 +70,9 @@ namespace WebsitePanel.Portal.ScheduleTaskControls
             ScheduleTaskParameterInfo dnsServers = this.GetParameter(this.txtDnsServers, DnsServersParameter);
             ScheduleTaskParameterInfo mailTo = this.GetParameter(this.txtMailTo, MailToParameter);
             ScheduleTaskParameterInfo serverName = this.GetParameter(this.ddlServers, ServerNameParameter);
+            ScheduleTaskParameterInfo pause = this.GetParameter(this.txtPause, PauseBetweenQueriesParameter);
 
-            return new ScheduleTaskParameterInfo[3] { dnsServers, mailTo, serverName };
+            return new ScheduleTaskParameterInfo[4] { dnsServers, mailTo, serverName, pause };
         }
     }
 }

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ScheduleTaskControls/DomainLookupView.ascx.designer.cs

@@ -65,5 +65,23 @@ namespace WebsitePanel.Portal.ScheduleTaskControls {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox txtMailTo;
+        
+        /// <summary>
+        /// lblPause control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblPause;
+        
+        /// <summary>
+        /// txtPause control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtPause;
     }
 }