From b8c6bc50e4013065f9f193c7db7cfb9a6f65e711 Mon Sep 17 00:00:00 2001
From: robvde <robvde@ROBVDE913.europe.corp.microsoft.com>
Date: Sun, 21 Oct 2012 18:40:08 +0400
Subject: [PATCH] merge commit

Fixed: Simple Url configuration for Lync, refactored
---
 .../WebsitePanel.EnterpriseServer/Web.config    | 17 ++++++++++++-----
 .../Lync2010.cs                                 |  5 +----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
index 3766094f..d0debaae 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
@@ -5,11 +5,19 @@
   </configSections>
   <!-- Connection strings -->
   <connectionStrings>
-        <add name="EnterpriseServer" connectionString="Server=(local)\SQLExpress;Database=WebsitePanel;uid=sa;pwd=Password12" providerName="System.Data.SqlClient" />
+    <!--
+    <add name="EnterpriseServer" connectionString="server=HSTPROV01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=aj7ep6fyhmw3b5qeth7c;" />
+    <add name="EnterpriseServer" connectionString="server=HSTWSP01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=pserxfbnlc6hwmdedbp0;" providerName="System.Data.SqlClient" />
+    -->
+    <add name="EnterpriseServer" connectionString="server=HSTPROV01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=aj7ep6fyhmw3b5qeth7c;" />
   </connectionStrings>
   <appSettings>
-    <!-- Encryption util settings -->
-    <add key="WebsitePanel.CryptoKey" value="1234567890" />
+    <!-- A1D4KDHUE83NKHddF -->
+    <!--
+    <add key="WebsitePanel.CryptoKey" value="3x7eqt7zabc5n5afs6dg" />
+    <add key="WebsitePanel.CryptoKey" value="fr2ym4wn2gmbrj7dz336" />
+    -->
+    <add key="WebsitePanel.CryptoKey" value="3x7eqt7zabc5n5afs6dg" />
     <!-- A1D4KDHUE83NKHddF -->
     <add key="WebsitePanel.EncryptionEnabled" value="true" />
     <!-- Web Applications -->
@@ -18,8 +26,7 @@
     <!-- Maximum waiting time when sending request to the remote server
          The value is in seconds. "-1" - infinite. -->
     <add key="WebsitePanel.EnterpriseServer.ServerRequestTimeout" value="3600" />
-  </appSettings>
-  <system.web>
+  </appSettings>  <system.web>
     <!-- Disable any authentication -->
     <authentication mode="None" />
     <!-- Correct HTTP runtime settings -->
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/Lync2010.cs b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/Lync2010.cs
index 09968caf..33c56efe 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/Lync2010.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/Lync2010.cs
@@ -407,7 +407,7 @@ namespace WebsitePanel.Providers.HostedSolution
                     if (tmp.Length > 0)
                     {
                         string Url = SimpleUrlRoot + tmp[1];
-                        ActiveDirectoryUtils.SetADObjectPropertyValue(user, "msRTCSIP-BaseSimpleUrl", Url);
+                        ActiveDirectoryUtils.SetADObjectPropertyValue(user, "msRTCSIP-BaseSimpleUrl", Url.ToLower());
                     }
                     user.CommitChanges();
 
@@ -643,9 +643,6 @@ namespace WebsitePanel.Providers.HostedSolution
                 SimpleUrls.Add(simpleUrl[0]);
             }
 
-            Hashtable properties = new Hashtable();
-            properties.Add("Add", SimpleUrls);
-
             //PSListModifier
             cmd = new Command("Set-CsSimpleUrlConfiguration");
             cmd.Parameters.Add("Identity", "Global");