diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql index 0231b023..df4b9e3f 100644 --- a/WebsitePanel/Database/update_db.sql +++ b/WebsitePanel/Database/update_db.sql @@ -1957,6 +1957,144 @@ WHERE RETURN GO +-- Lync Phone Numbers Quota + +IF NOT EXISTS (SELECT * FROM [dbo].[Quotas] WHERE ([QuotaName] = N'Lync.PhoneNumbers')) +BEGIN + INSERT [dbo].[Quotas] ([QuotaID], [GroupID], [QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID], [HideQuota]) VALUES (381, 41, 12, N'Lync.PhoneNumbers', N'Phone Numbers', 2, 0, NULL, NULL) +END +GO + + +ALTER FUNCTION [dbo].[CalculateQuotaUsage] +( + @PackageID int, + @QuotaID int +) +RETURNS int +AS + BEGIN + + DECLARE @QuotaTypeID int + SELECT @QuotaTypeID = QuotaTypeID FROM Quotas + WHERE QuotaID = @QuotaID + + IF @QuotaTypeID <> 2 + RETURN 0 + + DECLARE @Result int + + IF @QuotaID = 52 -- diskspace + SET @Result = dbo.CalculatePackageDiskspace(@PackageID) + ELSE IF @QuotaID = 51 -- bandwidth + SET @Result = dbo.CalculatePackageBandwidth(@PackageID) + ELSE IF @QuotaID = 53 -- domains + SET @Result = (SELECT COUNT(D.DomainID) FROM PackagesTreeCache AS PT + INNER JOIN Domains AS D ON D.PackageID = PT.PackageID + WHERE IsSubDomain = 0 AND IsInstantAlias = 0 AND IsDomainPointer = 0 AND PT.ParentPackageID = @PackageID) + ELSE IF @QuotaID = 54 -- sub-domains + SET @Result = (SELECT COUNT(D.DomainID) FROM PackagesTreeCache AS PT + INNER JOIN Domains AS D ON D.PackageID = PT.PackageID + WHERE IsSubDomain = 1 AND IsInstantAlias = 0 AND IsDomainPointer = 0 AND PT.ParentPackageID = @PackageID) + ELSE IF @QuotaID = 220 -- domain pointers + SET @Result = (SELECT COUNT(D.DomainID) FROM PackagesTreeCache AS PT + INNER JOIN Domains AS D ON D.PackageID = PT.PackageID + WHERE IsDomainPointer = 1 AND PT.ParentPackageID = @PackageID) + ELSE IF @QuotaID = 71 -- scheduled tasks + SET @Result = (SELECT COUNT(S.ScheduleID) FROM PackagesTreeCache AS PT + INNER JOIN Schedule AS S ON S.PackageID = PT.PackageID + WHERE PT.ParentPackageID = @PackageID) + ELSE IF @QuotaID = 305 -- RAM of VPS + SET @Result = (SELECT SUM(CAST(SIP.PropertyValue AS int)) FROM ServiceItemProperties AS SIP + INNER JOIN ServiceItems AS SI ON SIP.ItemID = SI.ItemID + INNER JOIN PackagesTreeCache AS PT ON SI.PackageID = PT.PackageID + WHERE SIP.PropertyName = 'RamSize' AND PT.ParentPackageID = @PackageID) + ELSE IF @QuotaID = 306 -- HDD of VPS + SET @Result = (SELECT SUM(CAST(SIP.PropertyValue AS int)) FROM ServiceItemProperties AS SIP + INNER JOIN ServiceItems AS SI ON SIP.ItemID = SI.ItemID + INNER JOIN PackagesTreeCache AS PT ON SI.PackageID = PT.PackageID + WHERE SIP.PropertyName = 'HddSize' AND PT.ParentPackageID = @PackageID) + ELSE IF @QuotaID = 309 -- External IP addresses of VPS + SET @Result = (SELECT COUNT(PIP.PackageAddressID) FROM PackageIPAddresses AS PIP + INNER JOIN IPAddresses AS IP ON PIP.AddressID = IP.AddressID + INNER JOIN PackagesTreeCache AS PT ON PIP.PackageID = PT.PackageID + WHERE PT.ParentPackageID = @PackageID AND IP.PoolID = 3) + ELSE IF @QuotaID = 100 -- Dedicated Web IP addresses + SET @Result = (SELECT COUNT(PIP.PackageAddressID) FROM PackageIPAddresses AS PIP + INNER JOIN IPAddresses AS IP ON PIP.AddressID = IP.AddressID + INNER JOIN PackagesTreeCache AS PT ON PIP.PackageID = PT.PackageID + WHERE PT.ParentPackageID = @PackageID AND IP.PoolID = 2) + ELSE IF @QuotaID = 350 -- RAM of VPSforPc + SET @Result = (SELECT SUM(CAST(SIP.PropertyValue AS int)) FROM ServiceItemProperties AS SIP + INNER JOIN ServiceItems AS SI ON SIP.ItemID = SI.ItemID + INNER JOIN PackagesTreeCache AS PT ON SI.PackageID = PT.PackageID + WHERE SIP.PropertyName = 'Memory' AND PT.ParentPackageID = @PackageID) + ELSE IF @QuotaID = 351 -- HDD of VPSforPc + SET @Result = (SELECT SUM(CAST(SIP.PropertyValue AS int)) FROM ServiceItemProperties AS SIP + INNER JOIN ServiceItems AS SI ON SIP.ItemID = SI.ItemID + INNER JOIN PackagesTreeCache AS PT ON SI.PackageID = PT.PackageID + WHERE SIP.PropertyName = 'HddSize' AND PT.ParentPackageID = @PackageID) + ELSE IF @QuotaID = 354 -- External IP addresses of VPSforPc + SET @Result = (SELECT COUNT(PIP.PackageAddressID) FROM PackageIPAddresses AS PIP + INNER JOIN IPAddresses AS IP ON PIP.AddressID = IP.AddressID + INNER JOIN PackagesTreeCache AS PT ON PIP.PackageID = PT.PackageID + WHERE PT.ParentPackageID = @PackageID AND IP.PoolID = 3) + ELSE IF @QuotaID = 319 -- BB Users + SET @Result = (SELECT COUNT(ea.AccountID) FROM ExchangeAccounts ea + INNER JOIN BlackBerryUsers bu ON ea.AccountID = bu.AccountID + INNER JOIN ServiceItems si ON ea.ItemID = si.ItemID + INNER JOIN PackagesTreeCache pt ON si.PackageID = pt.PackageID + WHERE pt.ParentPackageID = @PackageID) + ELSE IF @QuotaID = 320 -- OCS Users + SET @Result = (SELECT COUNT(ea.AccountID) FROM ExchangeAccounts ea + INNER JOIN OCSUsers ocs ON ea.AccountID = ocs.AccountID + INNER JOIN ServiceItems si ON ea.ItemID = si.ItemID + INNER JOIN PackagesTreeCache pt ON si.PackageID = pt.PackageID + WHERE pt.ParentPackageID = @PackageID) + ELSE IF @QuotaID = 206 -- HostedSolution.Users + SET @Result = (SELECT COUNT(ea.AccountID) FROM ExchangeAccounts AS ea + INNER JOIN ServiceItems si ON ea.ItemID = si.ItemID + INNER JOIN PackagesTreeCache pt ON si.PackageID = pt.PackageID + WHERE pt.ParentPackageID = @PackageID AND ea.AccountType IN (1,5,6,7)) + ELSE IF @QuotaID = 78 -- Exchange2007.Mailboxes + SET @Result = (SELECT COUNT(ea.AccountID) FROM ExchangeAccounts AS ea + INNER JOIN ServiceItems si ON ea.ItemID = si.ItemID + INNER JOIN PackagesTreeCache pt ON si.PackageID = pt.PackageID + WHERE pt.ParentPackageID = @PackageID + AND ea.AccountType IN (1) + AND ea.MailboxPlanId IS NOT NULL) + ELSE IF @QuotaID = 77 -- Exchange2007.DiskSpace + SET @Result = (SELECT SUM(B.MailboxSizeMB) FROM ExchangeAccounts AS ea + INNER JOIN ExchangeMailboxPlans AS B ON ea.MailboxPlanId = B.MailboxPlanId + INNER JOIN ServiceItems si ON ea.ItemID = si.ItemID + INNER JOIN PackagesTreeCache pt ON si.PackageID = pt.PackageID + WHERE pt.ParentPackageID = @PackageID) + ELSE IF @QuotaID = 370 -- Lync.Users + SET @Result = (SELECT COUNT(ea.AccountID) FROM ExchangeAccounts AS ea + INNER JOIN LyncUsers lu ON ea.AccountID = lu.AccountID + INNER JOIN ServiceItems si ON ea.ItemID = si.ItemID + INNER JOIN PackagesTreeCache pt ON si.PackageID = pt.PackageID + WHERE pt.ParentPackageID = @PackageID) + ELSE IF @QuotaID = 376 -- Lync.EVUsers + SET @Result = (SELECT COUNT(ea.AccountID) FROM ExchangeAccounts AS ea + INNER JOIN LyncUsers lu ON ea.AccountID = lu.AccountID + INNER JOIN LyncUserPlans lp ON lu.LyncUserPlanId = lp.LyncUserPlanId + INNER JOIN ServiceItems si ON ea.ItemID = si.ItemID + INNER JOIN PackagesTreeCache pt ON si.PackageID = pt.PackageID + WHERE pt.ParentPackageID = @PackageID AND lp.EnterpriseVoice = 1) + ELSE IF @QuotaID = 381 -- Dedicated Lync Phone Numbers + SET @Result = (SELECT COUNT(PIP.PackageAddressID) FROM PackageIPAddresses AS PIP + INNER JOIN IPAddresses AS IP ON PIP.AddressID = IP.AddressID + INNER JOIN PackagesTreeCache AS PT ON PIP.PackageID = PT.PackageID + WHERE PT.ParentPackageID = @PackageID AND IP.PoolID = 5) + ELSE + SET @Result = (SELECT COUNT(SI.ItemID) FROM Quotas AS Q + INNER JOIN ServiceItems AS SI ON SI.ItemTypeID = Q.ItemTypeID + INNER JOIN PackagesTreeCache AS PT ON SI.PackageID = PT.PackageID AND PT.ParentPackageID = @PackageID + WHERE Q.QuotaID = @QuotaID) + + RETURN @Result + END diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs index 58a410ac..dd7c2eeb 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs @@ -229,6 +229,7 @@ order by rg.groupOrder public const string LYNC_EVMOBILE = "Lync.EVMobile"; public const string LYNC_EVINTERNATIONAL = "Lync.EVInternational"; public const string LYNC_ENABLEDPLANSEDITING = "Lync.EnablePlansEditing"; + public const string LYNC_PHONE = "Lync.PhoneNumbers"; public const string HELICON_ZOO = "HeliconZoo.*"; diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Servers/ServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Servers/ServerController.cs index 39e13c75..7391b19d 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Servers/ServerController.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Servers/ServerController.cs @@ -1231,7 +1231,7 @@ namespace WebsitePanel.EnterpriseServer } // check quotas - string quotaName = GetIPAddressesQuotaByResourceGroup(groupName); + string quotaName = GetIPAddressesQuotaByResourceGroup(groupName, pool); // get maximum server IPs List ips = ServerController.GetUnallottedIPAddresses(packageId, groupName, pool); @@ -1249,15 +1249,15 @@ namespace WebsitePanel.EnterpriseServer int quotaUsed = cntx.Quotas[quotaName].QuotaUsedValue; // check the maximum allowed number - if (quotaAllocated != -1 && - (addressesNumber > (quotaAllocated - quotaUsed))) + if (addressesNumber > (quotaAllocated - quotaUsed)) { res.ErrorCodes.Add("IP_ADDRESSES_QUOTA_LIMIT_REACHED"); return res; } // check if requested more than available - if (addressesNumber > maxAvailableIPs) + if (maxAvailableIPs != -1 && + (addressesNumber > maxAvailableIPs)) addressesNumber = maxAvailableIPs; res = TaskManager.StartResultTask("IP_ADDRESS", "ALLOCATE_PACKAGE_IP", packageId); @@ -1303,7 +1303,7 @@ namespace WebsitePanel.EnterpriseServer int maxAvailableIPs = GetUnallottedIPAddresses(packageId, groupName, pool).Count; // get quota name - string quotaName = GetIPAddressesQuotaByResourceGroup(groupName); + string quotaName = GetIPAddressesQuotaByResourceGroup(groupName, pool); // get hosting plan IPs int number = 0; @@ -1415,8 +1415,11 @@ namespace WebsitePanel.EnterpriseServer return doc.InnerXml; } - private static string GetIPAddressesQuotaByResourceGroup(string groupName) + private static string GetIPAddressesQuotaByResourceGroup(string groupName, IPAddressPool pool) { + if (pool == IPAddressPool.PhoneNumbers) + return Quotas.LYNC_PHONE; + if (String.Compare(groupName, ResourceGroups.VPS, true) == 0) { return Quotas.VPS_EXTERNAL_IP_ADDRESSES_NUMBER; diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx index e6c16978..4b0e94ac 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx @@ -5323,4 +5323,7 @@ At least one Phone number must be selected. + + Phone Numbers per Organization + \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SpaceQuotas.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SpaceQuotas.ascx.resx index 54dee688..fd22fa9b 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SpaceQuotas.ascx.resx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SpaceQuotas.ascx.resx @@ -198,4 +198,7 @@ Organizations: + + Lync Phone Numbers: + \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncAddLyncUserPlan.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncAddLyncUserPlan.ascx index 3c9b8873..bf22c7d7 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncAddLyncUserPlan.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncAddLyncUserPlan.ascx @@ -90,11 +90,6 @@ - - - - -
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncAddLyncUserPlan.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncAddLyncUserPlan.ascx.cs index 684a2e06..236327ec 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncAddLyncUserPlan.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncAddLyncUserPlan.ascx.cs @@ -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; diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncAddLyncUserPlan.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncAddLyncUserPlan.ascx.designer.cs index 2b9ef0b7..9c0a6814 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncAddLyncUserPlan.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncAddLyncUserPlan.ascx.designer.cs @@ -1,11 +1,13 @@ //------------------------------------------------------------------------------ // // 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. // //------------------------------------------------------------------------------ + namespace WebsitePanel.Portal.Lync { @@ -15,8 +17,9 @@ namespace WebsitePanel.Portal.Lync { /// asyncTasks control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks; @@ -24,8 +27,9 @@ namespace WebsitePanel.Portal.Lync { /// breadcrumb control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.ExchangeServer.UserControls.Breadcrumb breadcrumb; @@ -33,8 +37,9 @@ namespace WebsitePanel.Portal.Lync { /// menu control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.ExchangeServer.UserControls.Menu menu; @@ -42,8 +47,9 @@ namespace WebsitePanel.Portal.Lync { /// Image1 control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Image Image1; @@ -51,8 +57,9 @@ namespace WebsitePanel.Portal.Lync { /// locTitle control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Localize locTitle; @@ -60,8 +67,9 @@ namespace WebsitePanel.Portal.Lync { /// messageBox control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox; @@ -69,8 +77,9 @@ namespace WebsitePanel.Portal.Lync { /// secPlan control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.CollapsiblePanel secPlan; @@ -78,8 +87,9 @@ namespace WebsitePanel.Portal.Lync { /// Plan control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Panel Plan; @@ -87,8 +97,9 @@ namespace WebsitePanel.Portal.Lync { /// txtPlan control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.TextBox txtPlan; @@ -96,8 +107,9 @@ namespace WebsitePanel.Portal.Lync { /// valRequirePlan control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.RequiredFieldValidator valRequirePlan; @@ -105,8 +117,9 @@ namespace WebsitePanel.Portal.Lync { /// secPlanFeatures control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.CollapsiblePanel secPlanFeatures; @@ -114,8 +127,9 @@ namespace WebsitePanel.Portal.Lync { /// PlanFeatures control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Panel PlanFeatures; @@ -123,8 +137,9 @@ namespace WebsitePanel.Portal.Lync { /// chkIM control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.CheckBox chkIM; @@ -132,8 +147,9 @@ namespace WebsitePanel.Portal.Lync { /// chkMobility control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.CheckBox chkMobility; @@ -141,8 +157,9 @@ namespace WebsitePanel.Portal.Lync { /// chkConferencing control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.CheckBox chkConferencing; @@ -150,8 +167,9 @@ namespace WebsitePanel.Portal.Lync { /// chkEnterpriseVoice control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.CheckBox chkEnterpriseVoice; @@ -159,8 +177,9 @@ namespace WebsitePanel.Portal.Lync { /// secPlanFeaturesFederation control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.CollapsiblePanel secPlanFeaturesFederation; @@ -168,8 +187,9 @@ namespace WebsitePanel.Portal.Lync { /// PlanFeaturesFederation control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Panel PlanFeaturesFederation; @@ -177,8 +197,9 @@ namespace WebsitePanel.Portal.Lync { /// chkFederation control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.CheckBox chkFederation; @@ -186,26 +207,19 @@ namespace WebsitePanel.Portal.Lync { /// chkRemoteUserAccess control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.CheckBox chkRemoteUserAccess; - /// - /// chkPublicIMConnectivity control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.CheckBox chkPublicIMConnectivity; - /// /// secPlanFeaturesArchiving control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.CollapsiblePanel secPlanFeaturesArchiving; @@ -213,8 +227,9 @@ namespace WebsitePanel.Portal.Lync { /// PlanFeaturesArchiving control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Panel PlanFeaturesArchiving; @@ -222,8 +237,9 @@ namespace WebsitePanel.Portal.Lync { /// locArchivingPolicy control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Localize locArchivingPolicy; @@ -231,8 +247,9 @@ namespace WebsitePanel.Portal.Lync { /// ddArchivingPolicy control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.DropDownList ddArchivingPolicy; @@ -240,8 +257,9 @@ namespace WebsitePanel.Portal.Lync { /// secPlanFeaturesMeeting control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.CollapsiblePanel secPlanFeaturesMeeting; @@ -249,8 +267,9 @@ namespace WebsitePanel.Portal.Lync { /// PlanFeaturesMeeting control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Panel PlanFeaturesMeeting; @@ -258,8 +277,9 @@ namespace WebsitePanel.Portal.Lync { /// chkAllowOrganizeMeetingsWithExternalAnonymous control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.CheckBox chkAllowOrganizeMeetingsWithExternalAnonymous; @@ -267,8 +287,9 @@ namespace WebsitePanel.Portal.Lync { /// secPlanFeaturesTelephony control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.CollapsiblePanel secPlanFeaturesTelephony; @@ -276,8 +297,9 @@ namespace WebsitePanel.Portal.Lync { /// PlanFeaturesTelephony control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Panel PlanFeaturesTelephony; @@ -285,8 +307,9 @@ namespace WebsitePanel.Portal.Lync { /// locTelephony control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Localize locTelephony; @@ -294,8 +317,9 @@ namespace WebsitePanel.Portal.Lync { /// ddTelephony control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.DropDownList ddTelephony; @@ -303,8 +327,9 @@ namespace WebsitePanel.Portal.Lync { /// pnEnterpriseVoice control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Panel pnEnterpriseVoice; @@ -312,8 +337,9 @@ namespace WebsitePanel.Portal.Lync { /// locTelephonyProvider control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Localize locTelephonyProvider; @@ -321,8 +347,9 @@ namespace WebsitePanel.Portal.Lync { /// tbTelephoneProvider control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.TextBox tbTelephoneProvider; @@ -330,8 +357,9 @@ namespace WebsitePanel.Portal.Lync { /// btnAccept control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Button btnAccept; @@ -339,8 +367,9 @@ namespace WebsitePanel.Portal.Lync { /// AcceptRequiredValidator control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.RequiredFieldValidator AcceptRequiredValidator; @@ -348,8 +377,9 @@ namespace WebsitePanel.Portal.Lync { /// locDialPlan control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Localize locDialPlan; @@ -357,8 +387,9 @@ namespace WebsitePanel.Portal.Lync { /// ddTelephonyDialPlanPolicy control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.DropDownList ddTelephonyDialPlanPolicy; @@ -366,8 +397,9 @@ namespace WebsitePanel.Portal.Lync { /// locVoicePolicy control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Localize locVoicePolicy; @@ -375,8 +407,9 @@ namespace WebsitePanel.Portal.Lync { /// ddTelephonyVoicePolicy control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.DropDownList ddTelephonyVoicePolicy; @@ -384,8 +417,9 @@ namespace WebsitePanel.Portal.Lync { /// pnServerURI control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Panel pnServerURI; @@ -393,8 +427,9 @@ namespace WebsitePanel.Portal.Lync { /// locServerURI control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Localize locServerURI; @@ -402,8 +437,9 @@ namespace WebsitePanel.Portal.Lync { /// tbServerURI control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.TextBox tbServerURI; @@ -411,8 +447,9 @@ namespace WebsitePanel.Portal.Lync { /// btnAdd control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Button btnAdd; @@ -420,8 +457,9 @@ namespace WebsitePanel.Portal.Lync { /// ValidationSummary1 control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.ValidationSummary ValidationSummary1; } diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncCreateUser.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncCreateUser.ascx.cs index 74d1e604..ddbd98ec 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncCreateUser.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncCreateUser.ascx.cs @@ -56,14 +56,18 @@ namespace WebsitePanel.Portal.Lync private void BindPhoneNumbers() { - - ddlPhoneNumber.Items.Add(new ListItem("", "")); + + 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) { diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncCreateUser.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncCreateUser.ascx.designer.cs index ee97a5d3..9960aea1 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncCreateUser.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncCreateUser.ascx.designer.cs @@ -1,9 +1,10 @@ //------------------------------------------------------------------------------ // // 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. // //------------------------------------------------------------------------------ diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncEditUser.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncEditUser.ascx.cs index 3656f917..14651246 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncEditUser.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncEditUser.ascx.cs @@ -52,14 +52,17 @@ namespace WebsitePanel.Portal.Lync private void BindPhoneNumbers() { - - ddlPhoneNumber.Items.Add(new ListItem("", "")); + + 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) { diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncEditUser.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncEditUser.ascx.designer.cs index 4d0c2b8f..0c138b8f 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncEditUser.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncEditUser.ascx.designer.cs @@ -1,9 +1,10 @@ //------------------------------------------------------------------------------ // // 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. // //------------------------------------------------------------------------------ diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/LyncAllocatePhoneNumbers.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/LyncAllocatePhoneNumbers.ascx.designer.cs index e6560c46..75726b99 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/LyncAllocatePhoneNumbers.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/LyncAllocatePhoneNumbers.ascx.designer.cs @@ -1,9 +1,10 @@ //------------------------------------------------------------------------------ // // 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. // //------------------------------------------------------------------------------ diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/LyncPhoneNumbers.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/LyncPhoneNumbers.ascx index 6d0fcca5..34a709a2 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/LyncPhoneNumbers.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/LyncPhoneNumbers.ascx @@ -20,7 +20,7 @@ - +
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/LyncPhoneNumbers.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/LyncPhoneNumbers.ascx.designer.cs index ea72d381..c1274840 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/LyncPhoneNumbers.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/LyncPhoneNumbers.ascx.designer.cs @@ -1,9 +1,10 @@ //------------------------------------------------------------------------------ // // 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. // //------------------------------------------------------------------------------ diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/PhoneNumbers.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/PhoneNumbers.ascx.designer.cs index 9e7b294c..27c0d5f2 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/PhoneNumbers.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/PhoneNumbers.ascx.designer.cs @@ -1,11 +1,11 @@ //------------------------------------------------------------------------------ // // 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. // - //------------------------------------------------------------------------------ namespace WebsitePanel.Portal { diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/PhoneNumbersAddPhoneNumber.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/PhoneNumbersAddPhoneNumber.ascx.designer.cs index 37bb6c33..83b5948b 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/PhoneNumbersAddPhoneNumber.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/PhoneNumbersAddPhoneNumber.ascx.designer.cs @@ -1,11 +1,11 @@ //------------------------------------------------------------------------------ // // 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. // - //------------------------------------------------------------------------------ namespace WebsitePanel.Portal { diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/PhoneNumbersEditPhoneNumber.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/PhoneNumbersEditPhoneNumber.ascx.designer.cs index c47738c0..988c728e 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/PhoneNumbersEditPhoneNumber.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/PhoneNumbersEditPhoneNumber.ascx.designer.cs @@ -1,11 +1,11 @@ //------------------------------------------------------------------------------ // // 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. // - //------------------------------------------------------------------------------ namespace WebsitePanel.Portal { diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsLyncUserPlansPolicy.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsLyncUserPlansPolicy.ascx index 10eae934..33213b24 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsLyncUserPlansPolicy.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsLyncUserPlansPolicy.ascx @@ -105,11 +105,6 @@ - - - - -
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsLyncUserPlansPolicy.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsLyncUserPlansPolicy.ascx.cs index b33a0ce2..ff4771f0 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsLyncUserPlansPolicy.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsLyncUserPlansPolicy.ascx.cs @@ -173,7 +173,6 @@ namespace WebsitePanel.Portal plan.VoicePolicy = LyncVoicePolicyType.None; plan.RemoteUserAccess = chkRemoteUserAccess.Checked; - plan.PublicIMConnectivity = chkPublicIMConnectivity.Checked; plan.AllowOrganizeMeetingsWithExternalAnonymous = chkAllowOrganizeMeetingsWithExternalAnonymous.Checked; @@ -314,7 +313,6 @@ namespace WebsitePanel.Portal chkEnterpriseVoice.Checked = plan.EnterpriseVoice; chkRemoteUserAccess.Checked = plan.RemoteUserAccess; - chkPublicIMConnectivity.Checked = plan.PublicIMConnectivity; chkAllowOrganizeMeetingsWithExternalAnonymous.Checked = plan.AllowOrganizeMeetingsWithExternalAnonymous; ddTelephony.SelectedIndex = plan.Telephony; @@ -437,7 +435,6 @@ namespace WebsitePanel.Portal plan.VoicePolicy = LyncVoicePolicyType.None; plan.RemoteUserAccess = chkRemoteUserAccess.Checked; - plan.PublicIMConnectivity = chkPublicIMConnectivity.Checked; plan.AllowOrganizeMeetingsWithExternalAnonymous = chkAllowOrganizeMeetingsWithExternalAnonymous.Checked; diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsLyncUserPlansPolicy.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsLyncUserPlansPolicy.ascx.designer.cs index d036ed13..c9c1b3b8 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsLyncUserPlansPolicy.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsLyncUserPlansPolicy.ascx.designer.cs @@ -1,11 +1,13 @@ //------------------------------------------------------------------------------ // // 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. // //------------------------------------------------------------------------------ + namespace WebsitePanel.Portal { @@ -15,8 +17,9 @@ namespace WebsitePanel.Portal { /// asyncTasks control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks; @@ -24,8 +27,9 @@ namespace WebsitePanel.Portal { /// messageBox control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox; @@ -33,8 +37,9 @@ namespace WebsitePanel.Portal { /// gvPlans control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.GridView gvPlans; @@ -42,8 +47,9 @@ namespace WebsitePanel.Portal { /// secPlan control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.CollapsiblePanel secPlan; @@ -51,8 +57,9 @@ namespace WebsitePanel.Portal { /// Plan control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Panel Plan; @@ -60,8 +67,9 @@ namespace WebsitePanel.Portal { /// txtPlan control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.TextBox txtPlan; @@ -69,8 +77,9 @@ namespace WebsitePanel.Portal { /// valRequirePlan control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.RequiredFieldValidator valRequirePlan; @@ -78,8 +87,9 @@ namespace WebsitePanel.Portal { /// secPlanFeatures control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.CollapsiblePanel secPlanFeatures; @@ -87,8 +97,9 @@ namespace WebsitePanel.Portal { /// PlanFeatures control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Panel PlanFeatures; @@ -96,8 +107,9 @@ namespace WebsitePanel.Portal { /// chkIM control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.CheckBox chkIM; @@ -105,8 +117,9 @@ namespace WebsitePanel.Portal { /// chkMobility control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.CheckBox chkMobility; @@ -114,8 +127,9 @@ namespace WebsitePanel.Portal { /// chkConferencing control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.CheckBox chkConferencing; @@ -123,8 +137,9 @@ namespace WebsitePanel.Portal { /// chkEnterpriseVoice control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.CheckBox chkEnterpriseVoice; @@ -132,8 +147,9 @@ namespace WebsitePanel.Portal { /// secPlanFeaturesFederation control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.CollapsiblePanel secPlanFeaturesFederation; @@ -141,8 +157,9 @@ namespace WebsitePanel.Portal { /// PlanFeaturesFederation control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Panel PlanFeaturesFederation; @@ -150,8 +167,9 @@ namespace WebsitePanel.Portal { /// chkFederation control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.CheckBox chkFederation; @@ -159,26 +177,19 @@ namespace WebsitePanel.Portal { /// chkRemoteUserAccess control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.CheckBox chkRemoteUserAccess; - /// - /// chkPublicIMConnectivity control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.CheckBox chkPublicIMConnectivity; - /// /// secPlanFeaturesArchiving control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.CollapsiblePanel secPlanFeaturesArchiving; @@ -186,8 +197,9 @@ namespace WebsitePanel.Portal { /// PlanFeaturesArchiving control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Panel PlanFeaturesArchiving; @@ -195,8 +207,9 @@ namespace WebsitePanel.Portal { /// locArchivingPolicy control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Localize locArchivingPolicy; @@ -204,8 +217,9 @@ namespace WebsitePanel.Portal { /// ddArchivingPolicy control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.DropDownList ddArchivingPolicy; @@ -213,8 +227,9 @@ namespace WebsitePanel.Portal { /// secPlanFeaturesMeeting control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.CollapsiblePanel secPlanFeaturesMeeting; @@ -222,8 +237,9 @@ namespace WebsitePanel.Portal { /// PlanFeaturesMeeting control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Panel PlanFeaturesMeeting; @@ -231,8 +247,9 @@ namespace WebsitePanel.Portal { /// chkAllowOrganizeMeetingsWithExternalAnonymous control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.CheckBox chkAllowOrganizeMeetingsWithExternalAnonymous; @@ -240,8 +257,9 @@ namespace WebsitePanel.Portal { /// secPlanFeaturesTelephony control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.CollapsiblePanel secPlanFeaturesTelephony; @@ -249,8 +267,9 @@ namespace WebsitePanel.Portal { /// PlanFeaturesTelephony control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Panel PlanFeaturesTelephony; @@ -258,8 +277,9 @@ namespace WebsitePanel.Portal { /// locTelephony control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Localize locTelephony; @@ -267,8 +287,9 @@ namespace WebsitePanel.Portal { /// ddTelephony control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.DropDownList ddTelephony; @@ -276,8 +297,9 @@ namespace WebsitePanel.Portal { /// pnEnterpriseVoice control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Panel pnEnterpriseVoice; @@ -285,8 +307,9 @@ namespace WebsitePanel.Portal { /// locTelephonyProvider control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Localize locTelephonyProvider; @@ -294,8 +317,9 @@ namespace WebsitePanel.Portal { /// tbTelephoneProvider control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.TextBox tbTelephoneProvider; @@ -303,8 +327,9 @@ namespace WebsitePanel.Portal { /// btnAccept control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Button btnAccept; @@ -312,8 +337,9 @@ namespace WebsitePanel.Portal { /// AcceptRequiredValidator control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.RequiredFieldValidator AcceptRequiredValidator; @@ -321,8 +347,9 @@ namespace WebsitePanel.Portal { /// locDialPlan control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Localize locDialPlan; @@ -330,8 +357,9 @@ namespace WebsitePanel.Portal { /// ddTelephonyDialPlanPolicy control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.DropDownList ddTelephonyDialPlanPolicy; @@ -339,8 +367,9 @@ namespace WebsitePanel.Portal { /// locVoicePolicy control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Localize locVoicePolicy; @@ -348,8 +377,9 @@ namespace WebsitePanel.Portal { /// ddTelephonyVoicePolicy control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.DropDownList ddTelephonyVoicePolicy; @@ -357,8 +387,9 @@ namespace WebsitePanel.Portal { /// pnServerURI control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Panel pnServerURI; @@ -366,8 +397,9 @@ namespace WebsitePanel.Portal { /// locServerURI control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Localize locServerURI; @@ -375,8 +407,9 @@ namespace WebsitePanel.Portal { /// tbServerURI control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.TextBox tbServerURI; @@ -384,8 +417,9 @@ namespace WebsitePanel.Portal { /// btnAddPlan control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Button btnAddPlan; @@ -393,8 +427,9 @@ namespace WebsitePanel.Portal { /// btnUpdatePlan control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Button btnUpdatePlan; @@ -402,8 +437,9 @@ namespace WebsitePanel.Portal { /// txtStatus control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.TextBox txtStatus; } diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx index 70a6bb26..fc4e2a8f 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx @@ -57,6 +57,10 @@ + + + + diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx.designer.cs index e699da6f..74220ba5 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx.designer.cs @@ -1,37 +1,10 @@ -// Copyright (c) 2012, Outercurve Foundation. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modification, -// are permitted provided that the following conditions are met: -// -// - Redistributions of source code must retain the above copyright notice, this -// list of conditions and the following disclaimer. -// -// - Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimer in the documentation -// and/or other materials provided with the distribution. -// -// - Neither the name of the Outercurve Foundation nor the names of its -// contributors may be used to endorse or promote products derived from this -// software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - //------------------------------------------------------------------------------ // // 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. // //------------------------------------------------------------------------------ @@ -44,8 +17,9 @@ namespace WebsitePanel.Portal { /// pnlDiskspace control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.HtmlControls.HtmlTableRow pnlDiskspace; @@ -53,8 +27,9 @@ namespace WebsitePanel.Portal { /// quotaDiskspace control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.Quota quotaDiskspace; @@ -62,8 +37,9 @@ namespace WebsitePanel.Portal { /// lnkViewDiskspaceDetails control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.HyperLink lnkViewDiskspaceDetails; @@ -71,8 +47,9 @@ namespace WebsitePanel.Portal { /// pnlBandwidth control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.HtmlControls.HtmlTableRow pnlBandwidth; @@ -80,8 +57,9 @@ namespace WebsitePanel.Portal { /// quotaBandwidth control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.Quota quotaBandwidth; @@ -89,8 +67,9 @@ namespace WebsitePanel.Portal { /// lnkViewBandwidthDetails control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.HyperLink lnkViewBandwidthDetails; @@ -98,8 +77,9 @@ namespace WebsitePanel.Portal { /// pnlDomains control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.HtmlControls.HtmlTableRow pnlDomains; @@ -107,8 +87,9 @@ namespace WebsitePanel.Portal { /// lblDomains control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Label lblDomains; @@ -116,8 +97,9 @@ namespace WebsitePanel.Portal { /// quotaDomains control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.Quota quotaDomains; @@ -125,8 +107,9 @@ namespace WebsitePanel.Portal { /// pnlSubDomains control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.HtmlControls.HtmlTableRow pnlSubDomains; @@ -134,8 +117,9 @@ namespace WebsitePanel.Portal { /// lblSubDomains control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Label lblSubDomains; @@ -143,8 +127,9 @@ namespace WebsitePanel.Portal { /// quotaSubDomains control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.Quota quotaSubDomains; @@ -152,8 +137,9 @@ namespace WebsitePanel.Portal { /// pnlDomainPointers control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.HtmlControls.HtmlTableRow pnlDomainPointers; @@ -161,8 +147,9 @@ namespace WebsitePanel.Portal { /// lblDomainPointers control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Label lblDomainPointers; @@ -170,8 +157,9 @@ namespace WebsitePanel.Portal { /// quotaDomainPointers control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.Quota quotaDomainPointers; @@ -179,8 +167,9 @@ namespace WebsitePanel.Portal { /// pnlOrganizations control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.HtmlControls.HtmlTableRow pnlOrganizations; @@ -188,8 +177,9 @@ namespace WebsitePanel.Portal { /// lblOrganizations control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Label lblOrganizations; @@ -197,8 +187,9 @@ namespace WebsitePanel.Portal { /// quotaOrganizations control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.Quota quotaOrganizations; @@ -206,8 +197,9 @@ namespace WebsitePanel.Portal { /// pnlUserAccounts control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.HtmlControls.HtmlTableRow pnlUserAccounts; @@ -215,8 +207,9 @@ namespace WebsitePanel.Portal { /// lblUserAccounts control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Label lblUserAccounts; @@ -224,8 +217,9 @@ namespace WebsitePanel.Portal { /// quotaUserAccounts control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.Quota quotaUserAccounts; @@ -233,8 +227,9 @@ namespace WebsitePanel.Portal { /// pnlExchangeAccounts control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.HtmlControls.HtmlTableRow pnlExchangeAccounts; @@ -242,8 +237,9 @@ namespace WebsitePanel.Portal { /// lblExchangeAccounts control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Label lblExchangeAccounts; @@ -251,8 +247,9 @@ namespace WebsitePanel.Portal { /// quotaExchangeAccounts control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.Quota quotaExchangeAccounts; @@ -260,8 +257,9 @@ namespace WebsitePanel.Portal { /// pnlExchangeStorage control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.HtmlControls.HtmlTableRow pnlExchangeStorage; @@ -269,8 +267,9 @@ namespace WebsitePanel.Portal { /// lblExchangeStorage control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Label lblExchangeStorage; @@ -278,8 +277,9 @@ namespace WebsitePanel.Portal { /// quotaExchangeStorage control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.Quota quotaExchangeStorage; @@ -287,8 +287,9 @@ namespace WebsitePanel.Portal { /// pnlMailAccounts control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.HtmlControls.HtmlTableRow pnlMailAccounts; @@ -296,8 +297,9 @@ namespace WebsitePanel.Portal { /// lblMailAccounts control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Label lblMailAccounts; @@ -305,8 +307,9 @@ namespace WebsitePanel.Portal { /// quotaMailAccounts control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.Quota quotaMailAccounts; @@ -314,8 +317,9 @@ namespace WebsitePanel.Portal { /// pnlOCSUsers control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.HtmlControls.HtmlTableRow pnlOCSUsers; @@ -323,8 +327,9 @@ namespace WebsitePanel.Portal { /// lblOCSUsers control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Label lblOCSUsers; @@ -332,8 +337,9 @@ namespace WebsitePanel.Portal { /// quotaOCSUsers control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.Quota quotaOCSUsers; @@ -341,8 +347,9 @@ namespace WebsitePanel.Portal { /// pnlLyncUsers control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.HtmlControls.HtmlTableRow pnlLyncUsers; @@ -350,8 +357,9 @@ namespace WebsitePanel.Portal { /// lblLyncUsers control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Label lblLyncUsers; @@ -359,17 +367,49 @@ namespace WebsitePanel.Portal { /// quotaLyncUsers control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.Quota quotaLyncUsers; + /// + /// pnlLyncPhone control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + + /// + protected global::System.Web.UI.HtmlControls.HtmlTableRow pnlLyncPhone; + + /// + /// Label1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + + /// + protected global::System.Web.UI.WebControls.Label Label1; + + /// + /// quotaLyncPhone control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + + /// + protected global::WebsitePanel.Portal.Quota quotaLyncPhone; + /// /// pnlBlackBerryUsers control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.HtmlControls.HtmlTableRow pnlBlackBerryUsers; @@ -377,8 +417,9 @@ namespace WebsitePanel.Portal { /// lblBlackBerryUsers control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Label lblBlackBerryUsers; @@ -386,8 +427,9 @@ namespace WebsitePanel.Portal { /// quotaBlackBerryUsers control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.Quota quotaBlackBerryUsers; @@ -395,8 +437,9 @@ namespace WebsitePanel.Portal { /// pnlSharepointSites control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.HtmlControls.HtmlTableRow pnlSharepointSites; @@ -404,8 +447,9 @@ namespace WebsitePanel.Portal { /// lblSharepointSites control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Label lblSharepointSites; @@ -413,8 +457,9 @@ namespace WebsitePanel.Portal { /// quotaSharepointSites control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.Quota quotaSharepointSites; @@ -422,8 +467,9 @@ namespace WebsitePanel.Portal { /// pnlWebSites control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.HtmlControls.HtmlTableRow pnlWebSites; @@ -431,8 +477,9 @@ namespace WebsitePanel.Portal { /// lblWebSites control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Label lblWebSites; @@ -440,8 +487,9 @@ namespace WebsitePanel.Portal { /// quotaWebSites control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.Quota quotaWebSites; @@ -449,8 +497,9 @@ namespace WebsitePanel.Portal { /// pnlFtpAccounts control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.HtmlControls.HtmlTableRow pnlFtpAccounts; @@ -458,8 +507,9 @@ namespace WebsitePanel.Portal { /// lblFtpAccounts control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Label lblFtpAccounts; @@ -467,8 +517,9 @@ namespace WebsitePanel.Portal { /// quotaFtpAccounts control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.Quota quotaFtpAccounts; @@ -476,8 +527,9 @@ namespace WebsitePanel.Portal { /// pnlDatabases control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.HtmlControls.HtmlTableRow pnlDatabases; @@ -485,8 +537,9 @@ namespace WebsitePanel.Portal { /// lblDatabases control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Label lblDatabases; @@ -494,8 +547,9 @@ namespace WebsitePanel.Portal { /// quotaDatabases control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.Quota quotaDatabases; @@ -503,8 +557,9 @@ namespace WebsitePanel.Portal { /// pnlHyperVForPC control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.HtmlControls.HtmlTableRow pnlHyperVForPC; @@ -512,8 +567,9 @@ namespace WebsitePanel.Portal { /// lblHyperVForPC control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Label lblHyperVForPC; @@ -521,8 +577,9 @@ namespace WebsitePanel.Portal { /// quotaNumberOfVm control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::WebsitePanel.Portal.Quota quotaNumberOfVm; @@ -530,8 +587,9 @@ namespace WebsitePanel.Portal { /// btnViewQuotas control. /// /// - /// Auto-generated field. + /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. + /// protected global::System.Web.UI.WebControls.Button btnViewQuotas; } diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/AllocatePackagePhoneNumbers.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/AllocatePackagePhoneNumbers.ascx.cs index 991b7a21..d08c8828 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/AllocatePackagePhoneNumbers.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/AllocatePackagePhoneNumbers.ascx.cs @@ -90,7 +90,7 @@ namespace WebsitePanel.Portal.UserControls } int quotaAllowed = -1; - string quotaName = (String.Compare(ResourceGroup, ResourceGroups.VPS, true) == 0) ? Quotas.VPS_EXTERNAL_IP_ADDRESSES_NUMBER : Quotas.WEB_IP_ADDRESSES; + string quotaName = Quotas.LYNC_PHONE; PackageContext cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId); if (cntx.Quotas.ContainsKey(quotaName)) { diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/AllocatePackagePhoneNumbers.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/AllocatePackagePhoneNumbers.ascx.designer.cs index 14339064..49a18e99 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/AllocatePackagePhoneNumbers.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/AllocatePackagePhoneNumbers.ascx.designer.cs @@ -1,9 +1,10 @@ //------------------------------------------------------------------------------ // // 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. // //------------------------------------------------------------------------------ diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/PackagePhoneNumbers.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/PackagePhoneNumbers.ascx.designer.cs index 2a0d585d..dbbb5945 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/PackagePhoneNumbers.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/PackagePhoneNumbers.ascx.designer.cs @@ -1,9 +1,10 @@ //------------------------------------------------------------------------------ // // 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. // //------------------------------------------------------------------------------