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

Merge

Browse source
This commit is contained in:
vfedosevich 2015-02-04 22:52:09 -08:00
commit a6b57486bd
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
WebsitePanel/Sources/WebsitePanel.Providers.Mail.hMail5/hMailServer5.vb
View file

@ -377,7 +377,7 @@ Public Class hMailServer5
objAccount.Password = mailbox.Password objAccount.Password = mailbox.Password
objAccount.MaxSize = mailbox.MaxMailboxSize objAccount.MaxSize = mailbox.MaxMailboxSize
objAccount.PersonFirstName = mailbox.FirstName objAccount.PersonFirstName = mailbox.FirstName
objAccount.PersonLastName = mailbox.FirstName objAccount.PersonLastName = mailbox.LastName
objAccount.SignatureEnabled = mailbox.SignatureEnabled objAccount.SignatureEnabled = mailbox.SignatureEnabled
objAccount.SignaturePlainText = mailbox.Signature objAccount.SignaturePlainText = mailbox.Signature
objAccount.SignatureHTML = mailbox.SignatureHTML objAccount.SignatureHTML = mailbox.SignatureHTML
@ -397,9 +397,12 @@ Public Class hMailServer5
'set forwarding address 'set forwarding address
If mailbox.ForwardingEnabled Then If mailbox.ForwardingEnabled Then
objAccount.ForwardAddress = mailbox.ForwardingAddresses(0) If Not String.IsNullOrEmpty(mailbox.ForwardingAddresses(0)) Then
objAccount.ForwardEnabled = True 'Log.WriteInfo("forwarding enabled on creation of email account")
objAccount.ForwardKeepOriginal = mailbox.RetainLocalCopy objAccount.ForwardAddress = mailbox.ForwardingAddresses(0)
objAccount.ForwardEnabled = True
objAccount.ForwardKeepOriginal = mailbox.RetainLocalCopy
End If
End If End If
objAccount.Save() objAccount.Save()

BIN
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Images/logo.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

Before After
Before After

4
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUsers.ascx.cs
View file

@ -136,7 +136,7 @@ namespace WebsitePanel.Portal.HostedSolution
var accountType = (ExchangeAccountType)gvUsers.DataKeys[rowIndex][1]; var accountType = (ExchangeAccountType)gvUsers.DataKeys[rowIndex][1];
if (cntx.Quotas.ContainsKey(Quotas.ORGANIZATION_DELETED_USERS) && accountType != ExchangeAccountType.User) if (Utils.CheckQouta(Quotas.ORGANIZATION_DELETED_USERS, cntx) && accountType != ExchangeAccountType.User)
{ {
chkEnableForceArchiveMailbox.Visible = true; chkEnableForceArchiveMailbox.Visible = true;
@ -362,7 +362,7 @@ namespace WebsitePanel.Portal.HostedSolution
{ {
int result = 0; int result = 0;
if (cntx.Quotas.ContainsKey(Quotas.ORGANIZATION_DELETED_USERS)) if (Utils.CheckQouta(Quotas.ORGANIZATION_DELETED_USERS, cntx))
{ {
result = ES.Services.Organizations.SetDeletedUser(PanelRequest.ItemID, int.Parse(hdAccountId.Value), chkEnableForceArchiveMailbox.Checked); result = ES.Services.Organizations.SetDeletedUser(PanelRequest.ItemID, int.Parse(hdAccountId.Value), chkEnableForceArchiveMailbox.Checked);
} }