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

Existing Lync 2013 renamed to Enterprise

Browse source 
Lync 2013 HP provider implmentement
Portal issue fixed when no phone numbers are allocated
This commit is contained in:
robvde 2013-10-20 15:29:39 +04:00
parent 9247943323
commit 0aa18dc88a
14 changed files with 1703 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
WebsitePanel/Database/update_db.sql
View file

@ -450,6 +450,18 @@ INSERT [dbo].[Providers] ([ProviderID], [GroupID], [ProviderName], [DisplayName]
VALUES (1401, 41, N'Lync2013', N'Microsoft Lync Server 2013 Multitenant Hosting Pack', N'WebsitePanel.Providers.HostedSolution.Lync2013, WebsitePanel.Providers.HostedSolution.Lync2013', N'Lync', NULL)
END
GO
UPDATE Providers SET DisplayName = N'Microsoft Lync Server 2013 Enterprise Edition' WHERE ProviderID = 1401
GO
IF NOT EXISTS (SELECT * FROM [dbo].[Providers] WHERE [ProviderName] = 'Lync2013HP')
BEGIN
INSERT [dbo].[Providers] ([ProviderID], [GroupID], [ProviderName], [DisplayName], [ProviderType], [EditorControl], [DisableAutoDiscovery])
VALUES (1402, 41, N'Lync2013HP', N'Microsoft Lync Server 2013 Multitenant Hosting Pack', N'WebsitePanel.Providers.HostedSolution.Lync2013HP, WebsitePanel.Providers.HostedSolution.Lync2013HP', N'Lync', NULL)
END
GO
-- add Application Pools Restart Quota
IF NOT EXISTS (SELECT * FROM [dbo].[Quotas] WHERE ([QuotaName] = N'Web.AppPoolsRestart'))

BIN
WebsitePanel/Lib/References/Microsoft/Lync2013HP/Microsoft.Rtc.Management.Core.dll Normal file
View file

Binary file not shown.

BIN
WebsitePanel/Lib/References/Microsoft/Lync2013HP/Microsoft.Rtc.Management.Hosted.dll Normal file
View file

Binary file not shown.

BIN
WebsitePanel/Lib/References/Microsoft/Lync2013HP/Microsoft.Rtc.Management.WritableConfig.dll Normal file
View file

Binary file not shown.

1546
WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Lync2013HP/Lync2013HP.cs Normal file
View file

File diff suppressed because it is too large Load diff

36
WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Lync2013HP/Properties/AssemblyInfo.cs Normal file
View file

@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("WebsitePanel.Providers.HostedSolution.Lync2013HP")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("WebsitePanel.Providers.HostedSolution.Lync2013HP")]
[assembly: AssemblyCopyright("Copyright © 2013")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("dbed0719-736c-43ff-b172-088d89fa403a")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

79
WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Lync2013HP/WebsitePanel.Providers.HostedSolution.Lync2013HP.csproj Normal file
View file

@ -0,0 +1,79 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{D92F6235-8E5D-47C1-B96A-A2BE40E17889}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>WebsitePanel.Providers.HostedSolution.Lync2013HP</RootNamespace>
<AssemblyName>WebsitePanel.Providers.HostedSolution.Lync2013HP</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\WebsitePanel.Server\bin\Lync2013\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\WebsitePanel.Server\bin\Lync2013\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Rtc.Management.Core">
<HintPath>..\..\Lib\References\Microsoft\Lync2013HP\Microsoft.Rtc.Management.Core.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.Rtc.Management.WritableConfig">
<HintPath>..\..\Lib\References\Microsoft\Lync2013HP\Microsoft.Rtc.Management.WritableConfig.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.DirectoryServices" />
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\Windows\assembly\GAC_MSIL\System.Management.Automation\1.0.0.0__31bf3856ad364e35\System.Management.Automation.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="WebsitePanel.Providers.Base">
<HintPath>..\..\Bin\WebsitePanel.Providers.Base.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="WebsitePanel.Providers.HostedSolution">
<HintPath>..\WebsitePanel.Server\bin\WebsitePanel.Providers.HostedSolution.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="WebsitePanel.Server.Utils">
<HintPath>..\WebsitePanel.Server.Utils\bin\Debug\WebsitePanel.Server.Utils.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Lync2013HP.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

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

@ -63,7 +63,7 @@ namespace WebsitePanel.Providers.HostedSolution
LyncRegistryPath = "SOFTWARE\\Microsoft\\Real-Time Communications";
}
internal static string LyncRegistryPath
public static string LyncRegistryPath
{
get;
set;

12
WebsitePanel/Sources/WebsitePanel.Server.sln
View file

@ -138,6 +138,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebsitePanel.Providers.Remo
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebsitePanel.Providers.EnterpriseStorage.Windows2012", "WebsitePanel.Providers.EnterpriseStorage.Windows2012\WebsitePanel.Providers.EnterpriseStorage.Windows2012.csproj", "{D435AB26-3AE1-4AAA-B423-50372B2C16F3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebsitePanel.Providers.HostedSolution.Lync2013HP", "WebsitePanel.Providers.HostedSolution.Lync2013HP\WebsitePanel.Providers.HostedSolution.Lync2013HP.csproj", "{D92F6235-8E5D-47C1-B96A-A2BE40E17889}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -708,6 +710,16 @@ Global
{D435AB26-3AE1-4AAA-B423-50372B2C16F3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{D435AB26-3AE1-4AAA-B423-50372B2C16F3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{D435AB26-3AE1-4AAA-B423-50372B2C16F3}.Release|x86.ActiveCfg = Release|Any CPU
{D92F6235-8E5D-47C1-B96A-A2BE40E17889}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D92F6235-8E5D-47C1-B96A-A2BE40E17889}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D92F6235-8E5D-47C1-B96A-A2BE40E17889}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{D92F6235-8E5D-47C1-B96A-A2BE40E17889}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{D92F6235-8E5D-47C1-B96A-A2BE40E17889}.Debug|x86.ActiveCfg = Debug|Any CPU
{D92F6235-8E5D-47C1-B96A-A2BE40E17889}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D92F6235-8E5D-47C1-B96A-A2BE40E17889}.Release|Any CPU.Build.0 = Release|Any CPU
{D92F6235-8E5D-47C1-B96A-A2BE40E17889}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{D92F6235-8E5D-47C1-B96A-A2BE40E17889}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{D92F6235-8E5D-47C1-B96A-A2BE40E17889}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

2
WebsitePanel/Sources/WebsitePanel.Server/Web.config
View file

@ -168,7 +168,7 @@
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<probing privatePath="bin/Crm2011;bin/Exchange2013;bin/Sharepoint2013;bin/Lync2013" />
<probing privatePath="bin/Crm2011;bin/Exchange2013;bin/Sharepoint2013;bin/Lync2013;bin/Lync2013HP" />
</assemblyBinding>
</runtime>
</configuration>

8
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageSpaces.ascx.cs
View file

@ -101,7 +101,7 @@ namespace WebsitePanel.Portal.ExchangeServer
}
// rebind domains
BindDomainNames();
//BindDomainNames();
BindStats();
}
@ -132,7 +132,7 @@ namespace WebsitePanel.Portal.ExchangeServer
}
// rebind domains
BindDomainNames();
//BindDomainNames();
BindStats();
}
@ -155,12 +155,12 @@ namespace WebsitePanel.Portal.ExchangeServer
{
messageBox.ShowResultMessage(result);
if (BusinessErrorCodes.ERROR_USER_ACCOUNT_DEMO == result)
BindDomainNames();
//BindDomainNames();
return;
}
// rebind domains
BindDomainNames();
//BindDomainNames();
}
catch (Exception ex)
{

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncCreateUser.ascx.cs
View file

@ -122,7 +122,7 @@ namespace WebsitePanel.Portal.Lync
bool enterpriseVoiceQuota = Utils.CheckQouta(Quotas.LYNC_ENTERPRISEVOICE, cntx);
string lineUri = "";
if (enterpriseVoiceQuota) lineUri = ddlPhoneNumber.SelectedItem.Text + ":" + tbPin.Text;
if ((enterpriseVoiceQuota) & (ddlPhoneNumber.Items.Count != 0)) lineUri = ddlPhoneNumber.SelectedItem.Text + ":" + tbPin.Text;
//#1
LyncUser lyncUser = ES.Services.Lync.GetLyncUserGeneralSettings(PanelRequest.ItemID, accountId);

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncEditUser.ascx.cs
View file

@ -130,7 +130,7 @@ namespace WebsitePanel.Portal.Lync
bool enterpriseVoiceQuota = Utils.CheckQouta(Quotas.LYNC_ENTERPRISEVOICE, cntx);
string lineUri = "";
if (enterpriseVoiceQuota) lineUri = ddlPhoneNumber.SelectedItem.Text + ":" + tbPin.Text;
if ((enterpriseVoiceQuota) & (ddlPhoneNumber.Items.Count != 0)) lineUri = ddlPhoneNumber.SelectedItem.Text + ":" + tbPin.Text;
LyncUserResult res = ES.Services.Lync.SetUserLyncPlan(PanelRequest.ItemID, PanelRequest.AccountID, Convert.ToInt32(planSelector.planId));
if (res.IsSuccess && res.ErrorCodes.Count == 0)

12
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
View file

@ -524,6 +524,13 @@
<Compile Include="UserControls\OrgIdPolicyEditor.ascx.designer.cs">
<DependentUpon>OrgIdPolicyEditor.ascx</DependentUpon>
</Compile>
<Compile Include="UserControls\OrgPolicyEditor.ascx.cs">
<DependentUpon>OrgPolicyEditor.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="UserControls\OrgPolicyEditor.ascx.designer.cs">
<DependentUpon>OrgPolicyEditor.ascx</DependentUpon>
</Compile>
<Compile Include="UserControls\PackagePhoneNumbers.ascx.cs">
<DependentUpon>PackagePhoneNumbers.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@ -4039,6 +4046,7 @@
<Content Include="SettingsLyncUserPlansPolicy.ascx" />
<Content Include="UserControls\EditFeedsList.ascx" />
<Content Include="UserControls\OrgIdPolicyEditor.ascx" />
<Content Include="UserControls\OrgPolicyEditor.ascx" />
<Content Include="UserControls\PackagePhoneNumbers.ascx" />
<Content Include="UserControls\AllocatePackagePhoneNumbers.ascx" />
<Content Include="VPSForPC\MonitoringPage.aspx" />
@ -5225,8 +5233,8 @@
<SubType>Designer</SubType>
</Content>
<Content Include="ProviderControls\App_LocalResources\EnterpriseStorage_Settings.ascx.resx" />
<Content Include="ExchangeServer\App_LocalResources\EnterpriseStorageSpaces.ascx.resx">
<Content Include="UserControls\App_LocalResources\OrgPolicyEditor.ascx.resx" />
<Content Include="ExchangeServer\App_LocalResources\EnterpriseStorageSpaces.ascx.resx" />
<Content Include="UserControls\App_LocalResources\OrgPolicyEditor.ascx.resx">
<SubType>Designer</SubType>
</Content>
<EmbeddedResource Include="UserControls\App_LocalResources\EditDomainsList.ascx.resx">