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

Commit changes from Robdve

Browse source
This commit is contained in:
omara_vworks 2012-07-19 11:44:03 -04:00
commit 3b81883a25
6 changed files with 169 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
View file

@ -2697,6 +2697,9 @@
<data name="AuditLogTask.EXCHANGE_DELETE_MAILBOX" xml:space="preserve">
<value>Delete mailbox</value>
</data>
<data name="AuditLogTask.EXCHANGE_DELETE_MAILBOXPLAN" xml:space="preserve">
<value>Delete mailboxplan</value>
</data>
<data name="AuditLogTask.EXCHANGE_DELETE_MAILBOX_ADDRESSES" xml:space="preserve">
<value>Delete mailbox e-mail addresses</value>
</data>
@ -2889,6 +2892,9 @@
<data name="Error.EXCHANGE_DELETE_MAILBOX" xml:space="preserve">
<value>Error deleting mailbox. See audit log for more details.</value>
</data>
<data name="Error.EXCHANGE_DELETE_MAILBOXPLAN" xml:space="preserve">
<value>Unable to delete mailboxplan. Make sure the mailbox plan is not assigned to any mailbox</value>
</data>
<data name="Error.EXCHANGE_DELETE_ORG" xml:space="preserve">
<value>Error deleting Exchange organization. See audit log for more details.</value>
</data>

4
WebsitePanel/Sources/WebsitePanel.WebPortal/Code/SecureSessionModule.cs
View file

@ -72,6 +72,8 @@ namespace WebsitePanel.WebPortal
{
FormsAuthentication.SignOut();
HttpContext.Current.Response.Redirect(DefaultPage.GetPageUrl(PortalConfiguration.SiteSettings["DefaultPage"]));
cookie.Value = GetSessionIDMac(cookie.Value, request.UserHostAddress, request.UserAgent, _ValidationKey);
return;
}
// Separate the session ID and the MAC
@ -87,6 +89,8 @@ namespace WebsitePanel.WebPortal
{
FormsAuthentication.SignOut();
HttpContext.Current.Response.Redirect(DefaultPage.GetPageUrl(PortalConfiguration.SiteSettings["DefaultPage"]));
cookie.Value = GetSessionIDMac(cookie.Value, request.UserHostAddress, request.UserAgent, _ValidationKey);
}
// Strip the MAC from the cookie before ASP.NET sees it

1
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/MailboxPlanSelector.ascx.cs
View file

@ -35,7 +35,6 @@ namespace WebsitePanel.Portal.ExchangeServer.UserControls
{
private string mailboxPlanToSelect;
private bool addNone;
public string MailboxPlanId
{

7
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountDetails.ascx.cs
View file

@ -97,8 +97,11 @@ namespace WebsitePanel.Portal
lnkChangePassword.Visible = !((PanelSecurity.SelectedUserId == PanelSecurity.EffectiveUserId) && PanelSecurity.LoggedUser.IsPeer);
lnkDelete.NavigateUrl = EditUrl("UserID", PanelSecurity.SelectedUserId.ToString(), "delete");
if ((PanelSecurity.LoggedUser.Role != UserRole.Reseller) | (PanelSecurity.LoggedUser.Role != UserRole.Administrator)) lnkDelete.Visible = false;
else lnkDelete.Visible = (PanelSecurity.SelectedUserId != PanelSecurity.EffectiveUserId);
if (!((PanelSecurity.LoggedUser.Role == UserRole.Reseller) | (PanelSecurity.LoggedUser.Role == UserRole.Administrator)))
lnkDelete.Visible = false;
else
lnkDelete.Visible = (PanelSecurity.SelectedUserId != PanelSecurity.EffectiveUserId);
}
}