From 190a02758a06c649d3bc9d63aed226400436a4fe Mon Sep 17 00:00:00 2001
From: Feodor <Feodor@Feodor-PC>
Date: Mon, 24 Sep 2012 10:22:22 -0700
Subject: [PATCH] Fixed issue #374 with adding a range of IP addresses

---
 .../WebsitePanel.EnterpriseServer/Code/Common/IPAddress.cs    | 2 +-
 .../Code/Servers/ServerController.cs                          | 2 +-
 WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Common/IPAddress.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Common/IPAddress.cs
index 5135bfc6..556d173a 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Common/IPAddress.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Common/IPAddress.cs
@@ -69,7 +69,7 @@ namespace WebsitePanel.EnterpriseServer {
                 return "";
 			var s = new System.Text.StringBuilder();
 			if (!V6) {
-				var ipl = (long)Address;
+				var ipl = Address;
 				s.Append(String.Format("{0}.{1}.{2}.{3}", (ipl >> 24) & 0xFFL, (ipl >> 16) & 0xFFL, (ipl >> 8) & 0xFFL, (ipl & 0xFFL)));
 			} else if (!IsMask) {
 				
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Servers/ServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Servers/ServerController.cs
index fa1b5caf..bc4864be 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Servers/ServerController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Servers/ServerController.cs
@@ -988,7 +988,7 @@ namespace WebsitePanel.EnterpriseServer
 				if (startExternalIP.V6 != startInternalIP.V6 && (startExternalIP.V6 != endExternalIP.V6 && endExternalIP != null)) throw new NotSupportedException("All IP addresses must be either V4 or V6.");
 
                 int i = 0;
-                long step = (endExternalIP < startExternalIP) ? -1 : 1;
+                long step = ((endExternalIP - startExternalIP) > 0) ? 1 : -1;
 
                 while (true)
                 {
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
index a99cd490..3766094f 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
@@ -5,11 +5,11 @@
   </configSections>
   <!-- Connection strings -->
   <connectionStrings>
-        <add name="EnterpriseServer" connectionString="server=HSTPROV01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=aj7ep6fyhmw3b5qeth7c;" providerName="System.Data.SqlClient" />
+        <add name="EnterpriseServer" connectionString="Server=(local)\SQLExpress;Database=WebsitePanel;uid=sa;pwd=Password12" providerName="System.Data.SqlClient" />
   </connectionStrings>
   <appSettings>
     <!-- Encryption util settings -->
-    <add key="WebsitePanel.CryptoKey" value="3x7eqt7zabc5n5afs6dg" />
+    <add key="WebsitePanel.CryptoKey" value="1234567890" />
     <!-- A1D4KDHUE83NKHddF -->
     <add key="WebsitePanel.EncryptionEnabled" value="true" />
     <!-- Web Applications -->