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

Fixed wsp-10166 enable resource attendant for resource mailboxes

Browse source 
Fixed Exchange 2010 SP2 autodetect
This commit is contained in:
robvde 2013-05-19 21:39:14 +04:00
parent 544c28a817
commit 25252051b5
3 changed files with 25 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs
View file

@ -1971,6 +1971,12 @@ namespace WebsitePanel.Providers.HostedSolution
cmd.Parameters.Add("ImapEnabled", enableIMAP); cmd.Parameters.Add("ImapEnabled", enableIMAP);
ExecuteShellCommand(runSpace, cmd); ExecuteShellCommand(runSpace, cmd);
//calendar settings
if (accountType == ExchangeAccountType.Equipment || accountType == ExchangeAccountType.Room)
{
SetCalendarSettings(runSpace, id);
}
//add to the security group //add to the security group
cmd = new Command("Add-DistributionGroupMember"); cmd = new Command("Add-DistributionGroupMember");
cmd.Parameters.Add("Identity", organizationId); cmd.Parameters.Add("Identity", organizationId);
@ -2008,6 +2014,7 @@ namespace WebsitePanel.Providers.HostedSolution
CloseRunspace(runSpace); CloseRunspace(runSpace);
} }
} }
internal virtual void SetCalendarSettings(Runspace runspace, string id) internal virtual void SetCalendarSettings(Runspace runspace, string id)
{ {

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

@ -1892,7 +1892,7 @@ namespace WebsitePanel.Providers.HostedSolution
//calendar settings //calendar settings
if (accountType == ExchangeAccountType.Equipment || accountType == ExchangeAccountType.Room) if (accountType == ExchangeAccountType.Equipment || accountType == ExchangeAccountType.Room)
{ {
//SetCalendarSettings(runSpace, id); SetCalendarSettings(runSpace, id);
} }
ret = string.Format("{0}\\{1}", GetNETBIOSDomainName(), accountName); ret = string.Format("{0}\\{1}", GetNETBIOSDomainName(), accountName);

18
WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/Exchange2010SP2.cs
View file

@ -438,6 +438,12 @@ namespace WebsitePanel.Providers.HostedSolution
cmd.Parameters.Add("ImapEnabled", enableIMAP); cmd.Parameters.Add("ImapEnabled", enableIMAP);
ExecuteShellCommand(runSpace, cmd); ExecuteShellCommand(runSpace, cmd);
//calendar settings
if (accountType == ExchangeAccountType.Equipment || accountType == ExchangeAccountType.Room)
{
SetCalendarSettings(runSpace, id);
}
//add to the security group //add to the security group
cmd = new Command("Add-DistributionGroupMember"); cmd = new Command("Add-DistributionGroupMember");
cmd.Parameters.Add("Identity", organizationId); cmd.Parameters.Add("Identity", organizationId);
@ -477,6 +483,16 @@ namespace WebsitePanel.Providers.HostedSolution
} }
internal override void SetCalendarSettings(Runspace runspace, string id)
{
ExchangeLog.LogStart("SetCalendarSettings");
Command cmd = new Command("Set-CalendarProcessing");
cmd.Parameters.Add("Identity", id);
cmd.Parameters.Add("AutomateProcessing", CalendarProcessingFlags.AutoAccept);
ExecuteShellCommand(runspace, cmd);
ExchangeLog.LogEnd("SetCalendarSettings");
}
internal override void DisableMailboxInternal(string id) internal override void DisableMailboxInternal(string id)
{ {
ExchangeLog.LogStart("DisableMailboxInternal"); ExchangeLog.LogStart("DisableMailboxInternal");
@ -803,7 +819,7 @@ namespace WebsitePanel.Providers.HostedSolution
if (value == 14) if (value == 14)
{ {
value = (int)rk.GetValue("MsiProductMinor", null); value = (int)rk.GetValue("MsiProductMinor", null);
if (value == 2) bResult = true; if ((value == 2) | (value == 3)) bResult = true;
} }
rk.Close(); rk.Close();
} }