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

Permission problem solved and UI-fix for IceWarp provider

Browse source
This commit is contained in:
Olov Karlsson 2014-11-11 14:00:02 +01:00
parent 2569e55609
commit 804a04c156
5 changed files with 15 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
WebsitePanel/Sources/WebsitePanel.Providers.Base/Mail/MailDomain.cs
View file

@ -368,6 +368,10 @@ namespace WebsitePanel.Providers.Mail
#region IceWarp #region IceWarp
public bool UseDomainDiskQuota { get; set; }
public bool UseDomainLimits { get; set; }
public bool UseUserLimits { get; set; }
public int MegaByteSendLimit { get; set; } public int MegaByteSendLimit { get; set; }
public int NumberSendLimit { get; set; } public int NumberSendLimit { get; set; }

5
WebsitePanel/Sources/WebsitePanel.Providers.Mail.IceWarp/IceWarp.cs
View file

@ -624,7 +624,10 @@ namespace WebsitePanel.Providers.Mail
DefaultUserQuotaInMB = Convert.ToInt32((object) domain.GetProperty("D_UserMailbox"))/1024, DefaultUserQuotaInMB = Convert.ToInt32((object) domain.GetProperty("D_UserMailbox"))/1024,
DefaultUserMaxMessageSizeMegaByte = Convert.ToInt32((object) domain.GetProperty("D_UserMsg"))/1024, DefaultUserMaxMessageSizeMegaByte = Convert.ToInt32((object) domain.GetProperty("D_UserMsg"))/1024,
DefaultUserMegaByteSendLimit = Convert.ToInt32((object) domain.GetProperty("D_UserMB")), DefaultUserMegaByteSendLimit = Convert.ToInt32((object) domain.GetProperty("D_UserMB")),
DefaultUserNumberSendLimit = Convert.ToInt32((object) domain.GetProperty("D_UserNumber")) DefaultUserNumberSendLimit = Convert.ToInt32((object) domain.GetProperty("D_UserNumber")),
UseDomainDiskQuota = Convert.ToBoolean(ProviderSettings["UseDomainDiskQuota"]),
UseDomainLimits = Convert.ToBoolean(ProviderSettings["UseDomainLimits"]),
UseUserLimits = Convert.ToBoolean(ProviderSettings["UseUserLimits"])
}; };
return mailDomain; return mailDomain;

3
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/App_LocalResources/IceWarp_EditAccount.ascx.resx
View file

@ -270,4 +270,7 @@
<data name="OlderMails.Text" xml:space="preserve"> <data name="OlderMails.Text" xml:space="preserve">
<value>Handle older mails</value> <value>Handle older mails</value>
</data> </data>
<data name="cbForwardOlder.Text" xml:space="preserve">
<value>Enable forwarding of older messages</value>
</data>
</root> </root>

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IceWarp_EditAccount.ascx
View file

@ -181,7 +181,7 @@
<table width="100%"> <table width="100%">
<tr> <tr>
<td colspan="2"> <td colspan="2">
<asp:CheckBox ID="cbForwardOlder" runat="server" meta:resourcekey="cbDeleteOlder" AutoPostBack="True" OnCheckedChanged="cbForwardOlder_CheckedChanged" <asp:CheckBox ID="cbForwardOlder" runat="server" meta:resourcekey="cbForwardOlder" AutoPostBack="True" OnCheckedChanged="cbForwardOlder_CheckedChanged"
Text="Enable forwarding of older messages"></asp:CheckBox> Text="Enable forwarding of older messages"></asp:CheckBox>
</td> </td>
</tr> </tr>

29
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IceWarp_EditDomain.ascx.cs
View file

@ -38,29 +38,6 @@ namespace WebsitePanel.Portal.ProviderControls
{ {
public partial class IceWarp_EditDomain : WebsitePanelControlBase, IMailEditDomainControl public partial class IceWarp_EditDomain : WebsitePanelControlBase, IMailEditDomainControl
{ {
private StringDictionary _serviceSettings;
private StringDictionary ServiceSettings
{
get
{
if (_serviceSettings != null)
return _serviceSettings;
_serviceSettings = new StringDictionary();
var domain = ES.Services.MailServers.GetMailDomain(PanelRequest.ItemID);
var settings = ES.Services.Servers.GetServiceSettings(domain.ServiceId);
foreach (var settingPair in settings.Select(setting => setting.Split('=')))
{
_serviceSettings.Add(settingPair[0], settingPair[1]);
}
return _serviceSettings;
}
}
protected void Page_Load(object sender, EventArgs e) protected void Page_Load(object sender, EventArgs e)
{ {
AdvancedSettingsPanel.Visible = PanelSecurity.EffectiveUser.Role == UserRole.Administrator; AdvancedSettingsPanel.Visible = PanelSecurity.EffectiveUser.Role == UserRole.Administrator;
@ -77,9 +54,9 @@ namespace WebsitePanel.Portal.ProviderControls
public void BindItem(MailDomain item) public void BindItem(MailDomain item)
{ {
// Hide/show controls when not enabled on service level // Hide/show controls when not enabled on service level
rowMaxDomainDiskSpace.Visible = ServiceSettings.ContainsKey("UseDomainDiskQuota") && Convert.ToBoolean(ServiceSettings["UseDomainDiskQuota"]); rowMaxDomainDiskSpace.Visible = item.UseDomainDiskQuota;
rowDomainLimits.Visible = ServiceSettings.ContainsKey("UseDomainLimits") && Convert.ToBoolean(ServiceSettings["UseDomainLimits"]); rowDomainLimits.Visible = item.UseDomainLimits;
rowUserLimits.Visible = ServiceSettings.ContainsKey("UseUserLimits") && Convert.ToBoolean(ServiceSettings["UseUserLimits"]); rowUserLimits.Visible = item.UseUserLimits;
txtMaxDomainDiskSpace.Text = item.MaxDomainSizeInMB.ToString(); txtMaxDomainDiskSpace.Text = item.MaxDomainSizeInMB.ToString();
txtMaxDomainUsers.Text = item.MaxDomainUsers.ToString(); txtMaxDomainUsers.Text = item.MaxDomainUsers.ToString();