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

Added Lync Phone Numbers Quota

Browse source 
Remove Public IM Connectivity
This commit is contained in:
dev_amdtel 2013-08-30 04:01:59 +04:00
parent 7e8b3cce52
commit 292b813b6f
26 changed files with 521 additions and 239 deletions
Download patch file Download diff file Expand all files Collapse all files

5
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncAddLyncUserPlan.ascx
View file

@ -90,11 +90,6 @@
<asp:CheckBox ID="chkRemoteUserAccess" runat="server" meta:resourcekey="chkRemoteUserAccess" Text="Remote User access"></asp:CheckBox>
</td>
</tr>
<tr>
<td>
<asp:CheckBox ID="chkPublicIMConnectivity" runat="server" meta:resourcekey="chkPublicIMConnectivity" Text="Public IM Connectivity"></asp:CheckBox>
</td>
</tr>
</table>
<br />
</asp:Panel>

4
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncAddLyncUserPlan.ascx.cs
View file

@ -95,9 +95,8 @@ namespace WebsitePanel.Portal.Lync
*/
chkRemoteUserAccess.Checked = plan.RemoteUserAccess;
chkPublicIMConnectivity.Checked = plan.PublicIMConnectivity;
chkAllowOrganizeMeetingsWithExternalAnonymous.Checked = plan.AllowOrganizeMeetingsWithExternalAnonymous;
chkAllowOrganizeMeetingsWithExternalAnonymous.Checked = plan.AllowOrganizeMeetingsWithExternalAnonymous;
ddTelephony.SelectedIndex = plan.Telephony;
@ -257,7 +256,6 @@ namespace WebsitePanel.Portal.Lync
*/
plan.RemoteUserAccess = chkRemoteUserAccess.Checked;
plan.PublicIMConnectivity = chkPublicIMConnectivity.Checked;
plan.AllowOrganizeMeetingsWithExternalAnonymous = chkAllowOrganizeMeetingsWithExternalAnonymous.Checked;

146
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncAddLyncUserPlan.ascx.designer.cs generated
View file

@ -1,11 +1,13 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.3074
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace WebsitePanel.Portal.Lync {
@ -15,8 +17,9 @@ namespace WebsitePanel.Portal.Lync {
/// asyncTasks control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
@ -24,8 +27,9 @@ namespace WebsitePanel.Portal.Lync {
/// breadcrumb control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::WebsitePanel.Portal.ExchangeServer.UserControls.Breadcrumb breadcrumb;
@ -33,8 +37,9 @@ namespace WebsitePanel.Portal.Lync {
/// menu control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::WebsitePanel.Portal.ExchangeServer.UserControls.Menu menu;
@ -42,8 +47,9 @@ namespace WebsitePanel.Portal.Lync {
/// Image1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Image Image1;
@ -51,8 +57,9 @@ namespace WebsitePanel.Portal.Lync {
/// locTitle control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Localize locTitle;
@ -60,8 +67,9 @@ namespace WebsitePanel.Portal.Lync {
/// messageBox control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
@ -69,8 +77,9 @@ namespace WebsitePanel.Portal.Lync {
/// secPlan control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::WebsitePanel.Portal.CollapsiblePanel secPlan;
@ -78,8 +87,9 @@ namespace WebsitePanel.Portal.Lync {
/// Plan control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Panel Plan;
@ -87,8 +97,9 @@ namespace WebsitePanel.Portal.Lync {
/// txtPlan control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtPlan;
@ -96,8 +107,9 @@ namespace WebsitePanel.Portal.Lync {
/// valRequirePlan control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.RequiredFieldValidator valRequirePlan;
@ -105,8 +117,9 @@ namespace WebsitePanel.Portal.Lync {
/// secPlanFeatures control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::WebsitePanel.Portal.CollapsiblePanel secPlanFeatures;
@ -114,8 +127,9 @@ namespace WebsitePanel.Portal.Lync {
/// PlanFeatures control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Panel PlanFeatures;
@ -123,8 +137,9 @@ namespace WebsitePanel.Portal.Lync {
/// chkIM control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBox chkIM;
@ -132,8 +147,9 @@ namespace WebsitePanel.Portal.Lync {
/// chkMobility control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBox chkMobility;
@ -141,8 +157,9 @@ namespace WebsitePanel.Portal.Lync {
/// chkConferencing control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBox chkConferencing;
@ -150,8 +167,9 @@ namespace WebsitePanel.Portal.Lync {
/// chkEnterpriseVoice control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBox chkEnterpriseVoice;
@ -159,8 +177,9 @@ namespace WebsitePanel.Portal.Lync {
/// secPlanFeaturesFederation control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::WebsitePanel.Portal.CollapsiblePanel secPlanFeaturesFederation;
@ -168,8 +187,9 @@ namespace WebsitePanel.Portal.Lync {
/// PlanFeaturesFederation control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Panel PlanFeaturesFederation;
@ -177,8 +197,9 @@ namespace WebsitePanel.Portal.Lync {
/// chkFederation control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBox chkFederation;
@ -186,26 +207,19 @@ namespace WebsitePanel.Portal.Lync {
/// chkRemoteUserAccess control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBox chkRemoteUserAccess;
/// <summary>
/// chkPublicIMConnectivity control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBox chkPublicIMConnectivity;
/// <summary>
/// secPlanFeaturesArchiving control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::WebsitePanel.Portal.CollapsiblePanel secPlanFeaturesArchiving;
@ -213,8 +227,9 @@ namespace WebsitePanel.Portal.Lync {
/// PlanFeaturesArchiving control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Panel PlanFeaturesArchiving;
@ -222,8 +237,9 @@ namespace WebsitePanel.Portal.Lync {
/// locArchivingPolicy control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Localize locArchivingPolicy;
@ -231,8 +247,9 @@ namespace WebsitePanel.Portal.Lync {
/// ddArchivingPolicy control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddArchivingPolicy;
@ -240,8 +257,9 @@ namespace WebsitePanel.Portal.Lync {
/// secPlanFeaturesMeeting control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::WebsitePanel.Portal.CollapsiblePanel secPlanFeaturesMeeting;
@ -249,8 +267,9 @@ namespace WebsitePanel.Portal.Lync {
/// PlanFeaturesMeeting control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Panel PlanFeaturesMeeting;
@ -258,8 +277,9 @@ namespace WebsitePanel.Portal.Lync {
/// chkAllowOrganizeMeetingsWithExternalAnonymous control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBox chkAllowOrganizeMeetingsWithExternalAnonymous;
@ -267,8 +287,9 @@ namespace WebsitePanel.Portal.Lync {
/// secPlanFeaturesTelephony control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::WebsitePanel.Portal.CollapsiblePanel secPlanFeaturesTelephony;
@ -276,8 +297,9 @@ namespace WebsitePanel.Portal.Lync {
/// PlanFeaturesTelephony control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Panel PlanFeaturesTelephony;
@ -285,8 +307,9 @@ namespace WebsitePanel.Portal.Lync {
/// locTelephony control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Localize locTelephony;
@ -294,8 +317,9 @@ namespace WebsitePanel.Portal.Lync {
/// ddTelephony control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddTelephony;
@ -303,8 +327,9 @@ namespace WebsitePanel.Portal.Lync {
/// pnEnterpriseVoice control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Panel pnEnterpriseVoice;
@ -312,8 +337,9 @@ namespace WebsitePanel.Portal.Lync {
/// locTelephonyProvider control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Localize locTelephonyProvider;
@ -321,8 +347,9 @@ namespace WebsitePanel.Portal.Lync {
/// tbTelephoneProvider control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox tbTelephoneProvider;
@ -330,8 +357,9 @@ namespace WebsitePanel.Portal.Lync {
/// btnAccept control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnAccept;
@ -339,8 +367,9 @@ namespace WebsitePanel.Portal.Lync {
/// AcceptRequiredValidator control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.RequiredFieldValidator AcceptRequiredValidator;
@ -348,8 +377,9 @@ namespace WebsitePanel.Portal.Lync {
/// locDialPlan control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Localize locDialPlan;
@ -357,8 +387,9 @@ namespace WebsitePanel.Portal.Lync {
/// ddTelephonyDialPlanPolicy control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddTelephonyDialPlanPolicy;
@ -366,8 +397,9 @@ namespace WebsitePanel.Portal.Lync {
/// locVoicePolicy control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Localize locVoicePolicy;
@ -375,8 +407,9 @@ namespace WebsitePanel.Portal.Lync {
/// ddTelephonyVoicePolicy control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddTelephonyVoicePolicy;
@ -384,8 +417,9 @@ namespace WebsitePanel.Portal.Lync {
/// pnServerURI control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Panel pnServerURI;
@ -393,8 +427,9 @@ namespace WebsitePanel.Portal.Lync {
/// locServerURI control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Localize locServerURI;
@ -402,8 +437,9 @@ namespace WebsitePanel.Portal.Lync {
/// tbServerURI control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox tbServerURI;
@ -411,8 +447,9 @@ namespace WebsitePanel.Portal.Lync {
/// btnAdd control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnAdd;
@ -420,8 +457,9 @@ namespace WebsitePanel.Portal.Lync {
/// ValidationSummary1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ValidationSummary ValidationSummary1;
}

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

@ -56,14 +56,18 @@ namespace WebsitePanel.Portal.Lync
private void BindPhoneNumbers()
{
ddlPhoneNumber.Items.Add(new ListItem("<Select Phone>", ""));
PackageIPAddress[] ips = ES.Services.Servers.GetPackageUnassignedIPAddresses(PanelSecurity.PackageId, IPAddressPool.PhoneNumbers);
foreach (PackageIPAddress ip in ips)
if (ips.Length > 0)
{
string phone = ip.ExternalIP;
ddlPhoneNumber.Items.Add(new ListItem(phone, ip.PackageAddressID.ToString()));
ddlPhoneNumber.Items.Add(new ListItem("<Select Phone>", ""));
foreach (PackageIPAddress ip in ips)
{
string phone = ip.ExternalIP;
ddlPhoneNumber.Items.Add(new ListItem(phone, ip.PackageAddressID.ToString()));
}
}
}
@ -77,7 +81,7 @@ namespace WebsitePanel.Portal.Lync
if (plan != null)
EnterpriseVoice = plan.EnterpriseVoice;
pnEnterpriseVoice.Visible = EnterpriseVoice;
pnEnterpriseVoice.Visible = EnterpriseVoice && (ddlPhoneNumber.Items.Count>0);
if (!EnterpriseVoice)
{

3
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncCreateUser.ascx.designer.cs generated
View file

@ -1,9 +1,10 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.3074
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------

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

@ -52,14 +52,17 @@ namespace WebsitePanel.Portal.Lync
private void BindPhoneNumbers()
{
ddlPhoneNumber.Items.Add(new ListItem("<Select Phone>", ""));
PackageIPAddress[] ips = ES.Services.Servers.GetPackageUnassignedIPAddresses(PanelSecurity.PackageId, IPAddressPool.PhoneNumbers);
foreach (PackageIPAddress ip in ips)
if (ips.Length > 0)
{
string phone = ip.ExternalIP;
ddlPhoneNumber.Items.Add(new ListItem(phone, phone));
ddlPhoneNumber.Items.Add(new ListItem("<Select Phone>", ""));
foreach (PackageIPAddress ip in ips)
{
string phone = ip.ExternalIP;
ddlPhoneNumber.Items.Add(new ListItem(phone, phone));
}
}
}
@ -73,7 +76,7 @@ namespace WebsitePanel.Portal.Lync
if (plan != null)
EnterpriseVoice = plan.EnterpriseVoice;
pnEnterpriseVoice.Visible = EnterpriseVoice;
pnEnterpriseVoice.Visible = EnterpriseVoice && (ddlPhoneNumber.Items.Count>0);
if (!EnterpriseVoice)
{

3
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncEditUser.ascx.designer.cs generated
View file

@ -1,9 +1,10 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.3074
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------