From 837892e68993902a8280d4f096797557176f96d4 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Mon, 29 Oct 2012 11:43:37 -0400
Subject: [PATCH 1/2] Merge

---
 WebsitePanel.Installer/Sources/VersionInfo.cs |   2 +-
 .../WebsitePanel.Installer/Updater.exe        | Bin 198144 -> 198144 bytes
 WebsitePanel/Sources/VersionInfo.cs           |   2 +-
 WebsitePanel/Sources/VersionInfo.vb           |   2 +-
 .../Code/WebServers/WebServerController.cs    |  12 ++++++++++++
 .../WebsitePanel.EnterpriseServer/Web.config  |  10 +++-------
 6 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/WebsitePanel.Installer/Sources/VersionInfo.cs b/WebsitePanel.Installer/Sources/VersionInfo.cs
index ee7d4a52..bc5f49ca 100644
--- a/WebsitePanel.Installer/Sources/VersionInfo.cs
+++ b/WebsitePanel.Installer/Sources/VersionInfo.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.17929
+//     Runtime Version:4.0.30319.18010
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe b/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe
index c3d6446396c7eebf31d450780eacc4f943ea5666..7812a3351959a200ec9db5483fc79d69acf87508 100644
GIT binary patch
delta 45
zcmZqZ;c4jMnb5)Pv9znPyS1BfYd6!u0s+Ir$*m85{&Z<@<EnXJb}@H*Od->fDFDZZ
B6te&T

delta 45
zcmZqZ;c4jMnb5(^@id~byS1BfYd6!u0)gi-@p?+rqdn#|gt;yME#$mCrjTjL6ac37
B63hSq

diff --git a/WebsitePanel/Sources/VersionInfo.cs b/WebsitePanel/Sources/VersionInfo.cs
index ee7d4a52..bc5f49ca 100644
--- a/WebsitePanel/Sources/VersionInfo.cs
+++ b/WebsitePanel/Sources/VersionInfo.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.17929
+//     Runtime Version:4.0.30319.18010
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/WebsitePanel/Sources/VersionInfo.vb b/WebsitePanel/Sources/VersionInfo.vb
index ded96cbd..d2c94d8f 100644
--- a/WebsitePanel/Sources/VersionInfo.vb
+++ b/WebsitePanel/Sources/VersionInfo.vb
@@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
-'     Runtime Version:4.0.30319.17929
+'     Runtime Version:4.0.30319.18010
 '
 '     Changes to this file may cause incorrect behavior and will be lost if
 '     the code is regenerated.
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs
index 5b29543a..c80f4edb 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs
@@ -29,6 +29,7 @@
 using System;
 using System.IO;
 using System.Data;
+using System.Linq;
 using System.Collections.Specialized;
 using System.Collections.Generic;
 using System.Text;
@@ -1213,6 +1214,17 @@ namespace WebsitePanel.EnterpriseServer
                         DNSServer dns = new DNSServer();
                         ServiceProviderProxy.Init(dns, zone.ServiceId);
 
+                        DnsRecord[] domainRecords = dns.GetZoneRecords(zone.Name);
+                        var duplicateRecords = (from zoneRecord in domainRecords
+                                                from resRecord in resourceRecords
+                                                where zoneRecord.RecordName == resRecord.RecordName
+                                                where zoneRecord.RecordType == resRecord.RecordType
+                                                select zoneRecord).ToArray();
+                        if (duplicateRecords != null && duplicateRecords.Count() > 0)
+                        {
+                            dns.DeleteZoneRecords(zone.Name, duplicateRecords);
+                        }
+
                         // add new resource records
                         dns.AddZoneRecords(zone.Name, resourceRecords.ToArray());
                     }
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
index 97a76d2a..3766094f 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
@@ -5,15 +5,11 @@
   </configSections>
   <!-- Connection strings -->
   <connectionStrings>
-    <add name="EnterpriseServer" connectionString="server=2012PROV01;database=WebsitePanel;uid=WebsitePanel;pwd=5qc7ftf6q42byc08z857;" providerName="System.Data.SqlClient" />
+        <add name="EnterpriseServer" connectionString="Server=(local)\SQLExpress;Database=WebsitePanel;uid=sa;pwd=Password12" providerName="System.Data.SqlClient" />
   </connectionStrings>
   <appSettings>
-    <!-- A1D4KDHUE83NKHddF -->
-    <!--
-    <add key="WebsitePanel.CryptoKey" value="3x7eqt7zabc5n5afs6dg" />
-    <add key="WebsitePanel.CryptoKey" value="fr2ym4wn2gmbrj7dz336" />
-    -->
-    <add key="WebsitePanel.CryptoKey" value="fbd61z4gwsc2m01x7xn2" />
+    <!-- Encryption util settings -->
+    <add key="WebsitePanel.CryptoKey" value="1234567890" />
     <!-- A1D4KDHUE83NKHddF -->
     <add key="WebsitePanel.EncryptionEnabled" value="true" />
     <!-- Web Applications -->

From 1615095fc2322cbbd178ed7e9feb72ba83cc7431 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Mon, 29 Oct 2012 11:54:58 -0400
Subject: [PATCH 2/2] Added tag build-2.0.0.143 for changeset 2c29a2d24954