zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed:

Browse source 
When changing primary email address, upn is changed as well. UPN is not changes
anymore

When deleting user: leaf object error. Fixed: object delete methods extended
with delete Tree

Lync Global Plans cannot be deleted, fixed
This commit is contained in:
robvde 2012-11-18 11:46:18 +04:00
parent e5156eb0cd
commit 51c9c74a2f
4 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
View file

@ -5,12 +5,21 @@
</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 -->
<add key="WebsitePanel.EnterpriseServer.WebApplicationsPath" value="~/WebApplications" />

3
WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ActiveDirectoryUtils.cs
View file

@ -113,7 +113,8 @@ namespace WebsitePanel.Providers.HostedSolution
DirectoryEntry parent = entry.Parent;
if (parent != null)
{
parent.Children.Remove(entry);
//parent.Children.Remove(entry);
entry.DeleteTree();
parent.CommitChanges();
}
}

2
WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/Exchange2007.cs
View file

@ -2591,7 +2591,7 @@ namespace WebsitePanel.Providers.HostedSolution
Command cmd = new Command("Set-Mailbox");
cmd.Parameters.Add("Identity", accountName);
cmd.Parameters.Add("PrimarySmtpAddress", primaryEmail);
cmd.Parameters.Add("UserPrincipalName", primaryEmail);
//cmd.Parameters.Add("UserPrincipalName", primaryEmail);
cmd.Parameters.Add("WindowsEmailAddress", primaryEmail);
ExecuteShellCommand(runSpace, cmd);

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsLyncUserPlansPolicy.ascx.cs
View file

@ -219,7 +219,7 @@ namespace WebsitePanel.Portal
}
result = ES.Services.ExchangeServer.DeleteExchangeMailboxPlan(orgs[0].Id, planId);
result = ES.Services.Lync.DeleteLyncUserPlan(orgs[0].Id, planId);
if (result < 0)
{
messageBox.ShowResultMessage(result);