merge commit

This commit is contained in:
robvde 2014-10-22 20:57:53 +08:00
commit 8edcd5aeb8
6 changed files with 20 additions and 3 deletions

View file

@ -4696,6 +4696,10 @@ namespace WebsitePanel.Providers.HostedSolution
ExchangeLog.LogWarning("Attemp {0} to update mail public folder {1}", attempts, folder);
System.Threading.Thread.Sleep(5000);
}
// exchange transport needs access to create new items in order to deliver email
AddPublicFolderClientPermission(runSpace, folder, "Anonymous", "CreateItems");
}
finally
{

View file

@ -25,7 +25,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<OutputPath>..\WebsitePanel.Server\bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>

View file

@ -90,6 +90,11 @@ namespace WebsitePanel.Portal.ProviderControls
private int FindAddressByText(string address)
{
if (string.IsNullOrEmpty(address))
{
return 0;
}
foreach (IPAddressInfo addressInfo in ES.Services.Servers.GetIPAddresses(IPAddressPool.General, PanelRequest.ServerId))
{
if (addressInfo.InternalIP == address || addressInfo.ExternalIP == address)