diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SettingsExchangeMailboxPlansPolicy.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SettingsExchangeMailboxPlansPolicy.ascx.resx
index 7df808f1..020ef5fe 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SettingsExchangeMailboxPlansPolicy.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SettingsExchangeMailboxPlansPolicy.ascx.resx
@@ -169,16 +169,16 @@
Keep deleted items for:
- Mailbox size:
+ Mailbox size (Mb):
- Maximum Receive Message Size:
+ Maximum Receive Message Size (Kb):
Maximum Recipients:
- Maximum Send Message Size:
+ Maximum Send Message Size (Kb):
Prohibit send at:
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/ExchangeAddMailboxPlan.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/ExchangeAddMailboxPlan.ascx.resx
index ad372d2b..0b7d21df 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/ExchangeAddMailboxPlan.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/ExchangeAddMailboxPlan.ascx.resx
@@ -151,16 +151,16 @@
Keep deleted items for:
- Mailbox size:
+ Mailbox size (Mb):
- Maximum Receive Message Size:
+ Maximum Receive Message Size (Kb):
Maximum Recipients:
- Maximum Send Message Size:
+ Maximum Send Message Size (Kb):
Prohibit send at:
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeAddMailboxPlan.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeAddMailboxPlan.ascx
index f640c175..2cfe8c89 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeAddMailboxPlan.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeAddMailboxPlan.ascx
@@ -6,6 +6,7 @@
<%@ Register Src="UserControls/DaysBox.ascx" TagName="DaysBox" TagPrefix="wsp" %>
<%@ Register Src="../UserControls/CollapsiblePanel.ascx" TagName="CollapsiblePanel" TagPrefix="wsp" %>
<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/QuotaEditor.ascx" TagName="QuotaEditor" TagPrefix="uc1" %>
@@ -101,25 +102,49 @@
|
-
+
+
+
+
|
|
-
+
+
+
+
|
|
-
+
+
+
+
|
|
-
+
+
+
+
|
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeAddMailboxPlan.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeAddMailboxPlan.ascx.cs
index 16f9ee14..a421859b 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeAddMailboxPlan.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeAddMailboxPlan.ascx.cs
@@ -46,14 +46,10 @@ namespace WebsitePanel.Portal.ExchangeServer
{
Providers.HostedSolution.ExchangeMailboxPlan plan = ES.Services.ExchangeServer.GetExchangeMailboxPlan(PanelRequest.ItemID, PanelRequest.GetInt("MailboxPlanId"));
txtMailboxPlan.Text = plan.MailboxPlan;
- if (plan.MailboxSizeMB != -1)
- mailboxSize.ValueKB = plan.MailboxSizeMB;
- if (plan.MaxRecipients != -1)
- maxRecipients.ValueKB = plan.MaxRecipients;
- if (plan.MaxSendMessageSizeKB != -1)
- maxSendMessageSizeKB.ValueKB = plan.MaxSendMessageSizeKB;
- if (plan.MaxReceiveMessageSizeKB != -1)
- maxReceiveMessageSizeKB.ValueKB = plan.MaxReceiveMessageSizeKB;
+ mailboxSize.QuotaValue = plan.MailboxSizeMB;
+ maxRecipients.QuotaValue = plan.MaxRecipients;
+ maxSendMessageSizeKB.QuotaValue = plan.MaxSendMessageSizeKB;
+ maxReceiveMessageSizeKB.QuotaValue = plan.MaxReceiveMessageSizeKB;
chkPOP3.Checked = plan.EnablePOP;
chkIMAP.Checked = plan.EnableIMAP;
chkOWA.Checked = plan.EnableOWA;
@@ -99,39 +95,24 @@ namespace WebsitePanel.Portal.ExchangeServer
switch (quota.QuotaId)
{
case 77:
- if (quota.QuotaAllocatedValue != -1)
- {
- mailboxSize.RequireValidatorEnabled = true;
- }
- else
- mailboxSize.RequireValidatorEnabled = false;
break;
case 365:
if (quota.QuotaAllocatedValue != -1)
{
- maxRecipients.ValueKB = quota.QuotaAllocatedValue;
- maxRecipients.RequireValidatorEnabled = true;
+ maxRecipients.QuotaValue = quota.QuotaAllocatedValue;
}
- else
- maxRecipients.RequireValidatorEnabled = false;
break;
case 366:
if (quota.QuotaAllocatedValue != -1)
{
- maxSendMessageSizeKB.ValueKB = quota.QuotaAllocatedValue;
- maxSendMessageSizeKB.RequireValidatorEnabled = true;
+ maxSendMessageSizeKB.QuotaValue = quota.QuotaAllocatedValue;
}
- else
- maxSendMessageSizeKB.RequireValidatorEnabled = false;
break;
case 367:
if (quota.QuotaAllocatedValue != -1)
{
- maxReceiveMessageSizeKB.ValueKB = quota.QuotaAllocatedValue;
- maxReceiveMessageSizeKB.RequireValidatorEnabled = true;
+ maxReceiveMessageSizeKB.QuotaValue = quota.QuotaAllocatedValue;
}
- else
- maxReceiveMessageSizeKB.RequireValidatorEnabled = false;
break;
case 83:
chkPOP3.Checked = Convert.ToBoolean(quota.QuotaAllocatedValue);
@@ -183,12 +164,12 @@ namespace WebsitePanel.Portal.ExchangeServer
Providers.HostedSolution.ExchangeMailboxPlan plan = new Providers.HostedSolution.ExchangeMailboxPlan();
plan.MailboxPlan = txtMailboxPlan.Text;
- plan.MailboxSizeMB = mailboxSize.ValueKB;
+ plan.MailboxSizeMB = mailboxSize.QuotaValue;
plan.IsDefault = false;
- plan.MaxRecipients = maxRecipients.ValueKB;
- plan.MaxSendMessageSizeKB = maxSendMessageSizeKB.ValueKB;
- plan.MaxReceiveMessageSizeKB = maxReceiveMessageSizeKB.ValueKB;
+ plan.MaxRecipients = maxRecipients.QuotaValue;
+ plan.MaxSendMessageSizeKB = maxSendMessageSizeKB.QuotaValue;
+ plan.MaxReceiveMessageSizeKB = maxReceiveMessageSizeKB.QuotaValue;
plan.EnablePOP = chkPOP3.Checked;
plan.EnableIMAP = chkIMAP.Checked;
plan.EnableOWA = chkOWA.Checked;
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeAddMailboxPlan.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeAddMailboxPlan.ascx.designer.cs
index 7a1b7b1d..a9b442a6 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeAddMailboxPlan.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeAddMailboxPlan.ascx.designer.cs
@@ -226,7 +226,7 @@ namespace WebsitePanel.Portal.ExchangeServer {
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::WebsitePanel.Portal.ExchangeServer.UserControls.SizeBox mailboxSize;
+ protected global::WebsitePanel.Portal.QuotaEditor mailboxSize;
///
/// locMaxRecipients control.
@@ -244,7 +244,7 @@ namespace WebsitePanel.Portal.ExchangeServer {
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::WebsitePanel.Portal.ExchangeServer.UserControls.SizeBox maxRecipients;
+ protected global::WebsitePanel.Portal.QuotaEditor maxRecipients;
///
/// locMaxSendMessageSizeKB control.
@@ -262,7 +262,7 @@ namespace WebsitePanel.Portal.ExchangeServer {
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::WebsitePanel.Portal.ExchangeServer.UserControls.SizeBox maxSendMessageSizeKB;
+ protected global::WebsitePanel.Portal.QuotaEditor maxSendMessageSizeKB;
///
/// locMaxReceiveMessageSizeKB control.
@@ -280,7 +280,7 @@ namespace WebsitePanel.Portal.ExchangeServer {
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::WebsitePanel.Portal.ExchangeServer.UserControls.SizeBox maxReceiveMessageSizeKB;
+ protected global::WebsitePanel.Portal.QuotaEditor maxReceiveMessageSizeKB;
///
/// locWhenSizeExceeds control.
@@ -398,14 +398,5 @@ namespace WebsitePanel.Portal.ExchangeServer {
/// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.WebControls.ValidationSummary ValidationSummary1;
-
- ///
- /// FormComments control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.Localize FormComments;
}
}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsExchangeMailboxPlansPolicy.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsExchangeMailboxPlansPolicy.ascx
index e5a6f9dc..f1a7dba9 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsExchangeMailboxPlansPolicy.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsExchangeMailboxPlansPolicy.ascx
@@ -4,6 +4,7 @@
<%@ Register Src="UserControls/CollapsiblePanel.ascx" TagName="CollapsiblePanel" TagPrefix="wsp" %>
<%@ Register Src="UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
<%@ Register Src="UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/QuotaEditor.ascx" TagName="QuotaEditor" TagPrefix="uc1" %>
<%@ Import Namespace="WebsitePanel.Portal" %>
@@ -128,25 +129,49 @@
|
-
+
+
+
+
|
|
-
+
+
+
+
|
|
-
+
+
+
+
|
|
-
+
+
+
+
|
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsExchangeMailboxPlansPolicy.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsExchangeMailboxPlansPolicy.ascx.cs
index c4041b0a..2ed2f52f 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsExchangeMailboxPlansPolicy.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsExchangeMailboxPlansPolicy.ascx.cs
@@ -101,12 +101,12 @@ namespace WebsitePanel.Portal
Providers.HostedSolution.ExchangeMailboxPlan plan = new Providers.HostedSolution.ExchangeMailboxPlan();
plan.MailboxPlan = txtMailboxPlan.Text;
- plan.MailboxSizeMB = mailboxSize.ValueKB;
+ plan.MailboxSizeMB = mailboxSize.QuotaValue;
plan.IsDefault = false;
- plan.MaxRecipients = maxRecipients.ValueKB;
- plan.MaxSendMessageSizeKB = maxSendMessageSizeKB.ValueKB;
- plan.MaxReceiveMessageSizeKB = maxReceiveMessageSizeKB.ValueKB;
+ plan.MaxRecipients = maxRecipients.QuotaValue;
+ plan.MaxSendMessageSizeKB = maxSendMessageSizeKB.QuotaValue;
+ plan.MaxReceiveMessageSizeKB = maxReceiveMessageSizeKB.QuotaValue;
plan.EnablePOP = chkPOP3.Checked;
plan.EnableIMAP = chkIMAP.Checked;
plan.EnableOWA = chkOWA.Checked;
@@ -204,10 +204,10 @@ namespace WebsitePanel.Portal
ViewState["MailboxPlanID"] = null;
txtMailboxPlan.Text = string.Empty;
- mailboxSize.ValueKB = -1;
- maxRecipients.ValueKB = -1;
- maxSendMessageSizeKB.ValueKB = -1;
- maxReceiveMessageSizeKB.ValueKB = 01;
+ mailboxSize.QuotaValue = 0;
+ maxRecipients.QuotaValue = 0;
+ maxSendMessageSizeKB.QuotaValue = 0;
+ maxReceiveMessageSizeKB.QuotaValue = 0;
chkPOP3.Checked = false;
chkIMAP.Checked = false;
chkOWA.Checked = false;
@@ -251,14 +251,10 @@ namespace WebsitePanel.Portal
plan = ES.Services.ExchangeServer.GetExchangeMailboxPlan(orgs[0].Id, mailboxPlanId);
txtMailboxPlan.Text = plan.MailboxPlan;
- if (plan.MailboxSizeMB != -1)
- mailboxSize.ValueKB = plan.MailboxSizeMB;
- if (plan.MaxRecipients != -1)
- maxRecipients.ValueKB = plan.MaxRecipients;
- if (plan.MaxSendMessageSizeKB != -1)
- maxSendMessageSizeKB.ValueKB = plan.MaxSendMessageSizeKB;
- if (plan.MaxReceiveMessageSizeKB != -1)
- maxReceiveMessageSizeKB.ValueKB = plan.MaxReceiveMessageSizeKB;
+ mailboxSize.QuotaValue = plan.MailboxSizeMB;
+ maxRecipients.QuotaValue = plan.MaxRecipients;
+ maxSendMessageSizeKB.QuotaValue = plan.MaxSendMessageSizeKB;
+ maxReceiveMessageSizeKB.QuotaValue = plan.MaxReceiveMessageSizeKB;
chkPOP3.Checked = plan.EnablePOP;
chkIMAP.Checked = plan.EnableIMAP;
chkOWA.Checked = plan.EnableOWA;
@@ -354,12 +350,12 @@ namespace WebsitePanel.Portal
plan.MailboxPlanId = (int)ViewState["MailboxPlanID"];
plan.MailboxPlan = txtMailboxPlan.Text;
- plan.MailboxSizeMB = mailboxSize.ValueKB;
+ plan.MailboxSizeMB = mailboxSize.QuotaValue;
plan.IsDefault = false;
- plan.MaxRecipients = maxRecipients.ValueKB;
- plan.MaxSendMessageSizeKB = maxSendMessageSizeKB.ValueKB;
- plan.MaxReceiveMessageSizeKB = maxReceiveMessageSizeKB.ValueKB;
+ plan.MaxRecipients = maxRecipients.QuotaValue;
+ plan.MaxSendMessageSizeKB = maxSendMessageSizeKB.QuotaValue;
+ plan.MaxReceiveMessageSizeKB = maxReceiveMessageSizeKB.QuotaValue;
plan.EnablePOP = chkPOP3.Checked;
plan.EnableIMAP = chkIMAP.Checked;
plan.EnableOWA = chkOWA.Checked;
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsExchangeMailboxPlansPolicy.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsExchangeMailboxPlansPolicy.ascx.designer.cs
index 6ee96139..3b862ad1 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsExchangeMailboxPlansPolicy.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsExchangeMailboxPlansPolicy.ascx.designer.cs
@@ -1,32 +1,4 @@
-// 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.
//
@@ -227,7 +199,7 @@ namespace WebsitePanel.Portal {
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::WebsitePanel.Portal.ExchangeServer.UserControls.SizeBox mailboxSize;
+ protected global::WebsitePanel.Portal.QuotaEditor mailboxSize;
///
/// locMaxRecipients control.
@@ -245,7 +217,7 @@ namespace WebsitePanel.Portal {
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::WebsitePanel.Portal.ExchangeServer.UserControls.SizeBox maxRecipients;
+ protected global::WebsitePanel.Portal.QuotaEditor maxRecipients;
///
/// locMaxSendMessageSizeKB control.
@@ -263,7 +235,7 @@ namespace WebsitePanel.Portal {
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::WebsitePanel.Portal.ExchangeServer.UserControls.SizeBox maxSendMessageSizeKB;
+ protected global::WebsitePanel.Portal.QuotaEditor maxSendMessageSizeKB;
///
/// locMaxReceiveMessageSizeKB control.
@@ -281,7 +253,7 @@ namespace WebsitePanel.Portal {
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::WebsitePanel.Portal.ExchangeServer.UserControls.SizeBox maxReceiveMessageSizeKB;
+ protected global::WebsitePanel.Portal.QuotaEditor maxReceiveMessageSizeKB;
///
/// locWhenSizeExceeds control.