merge commit
This commit is contained in:
commit
3572cd642b
270 changed files with 7870 additions and 4468 deletions
|
@ -27,6 +27,7 @@
|
|||
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Text;
|
||||
using System.Web.UI.WebControls;
|
||||
|
@ -48,40 +49,75 @@ namespace WebsitePanel.Portal.ExchangeServer
|
|||
chkRecursive.Visible = (PanelSecurity.SelectedUser.Role != UserRole.User);
|
||||
gvOrgs.Columns[2].Visible = gvOrgs.Columns[3].Visible = (PanelSecurity.SelectedUser.Role != UserRole.User) && chkRecursive.Checked;
|
||||
|
||||
if (PanelSecurity.LoggedUser.Role == UserRole.User)
|
||||
{
|
||||
gvOrgs.Columns[2].Visible = gvOrgs.Columns[3].Visible = gvOrgs.Columns[4].Visible = false;
|
||||
btnCreate.Enabled = false;
|
||||
}
|
||||
btnSetDefaultOrganization.Enabled = !(gvOrgs.Rows.Count < 2);
|
||||
|
||||
PackageContext cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId);
|
||||
if (cntx.Quotas.ContainsKey(Quotas.ORGANIZATIONS))
|
||||
{
|
||||
btnCreate.Enabled = (!(cntx.Quotas[Quotas.ORGANIZATIONS].QuotaAllocatedValue <= gvOrgs.Rows.Count)||(cntx.Quotas[Quotas.ORGANIZATIONS].QuotaAllocatedValue==-1));
|
||||
btnCreate.Enabled = (!(cntx.Quotas[Quotas.ORGANIZATIONS].QuotaAllocatedValue <= gvOrgs.Rows.Count) || (cntx.Quotas[Quotas.ORGANIZATIONS].QuotaAllocatedValue == -1));
|
||||
}
|
||||
|
||||
//else
|
||||
//if (gvOrgs.Rows.Count > 0) btnCreate.Enabled = false;
|
||||
|
||||
btnSetDefaultOrganization.Enabled = !(gvOrgs.Rows.Count < 2);
|
||||
if (PanelSecurity.LoggedUser.Role == UserRole.User)
|
||||
{
|
||||
gvOrgs.Columns[2].Visible = gvOrgs.Columns[3].Visible = gvOrgs.Columns[5].Visible = false;
|
||||
btnCreate.Enabled = false;
|
||||
btnSetDefaultOrganization.Enabled = false;
|
||||
}
|
||||
|
||||
if (!Page.IsPostBack)
|
||||
{
|
||||
if (Request.UrlReferrer != null && PanelSecurity.SelectedUser.Role == UserRole.User)
|
||||
{
|
||||
var queryBuilder = new StringBuilder();
|
||||
queryBuilder.AppendFormat("?pid=Home&UserID={0}", PanelSecurity.SelectedUserId);
|
||||
|
||||
if (Request.UrlReferrer.Query.Equals(queryBuilder.ToString(), StringComparison.InvariantCultureIgnoreCase) && gvOrgs.Rows.Count > 0)
|
||||
{
|
||||
if (CurrentDefaultOrgId > 0) Response.Redirect(GetOrganizationEditUrl(CurrentDefaultOrgId.ToString()));
|
||||
RedirectToRequiredOrg();
|
||||
}
|
||||
}
|
||||
|
||||
Response.Redirect(((HyperLink)gvOrgs.Rows[0].Cells[1].Controls[1]).NavigateUrl);
|
||||
private List<string> GetPossibleUrlRefferers()
|
||||
{
|
||||
List<string> urlReferrers = new List<string>();
|
||||
var queryBuilder = new StringBuilder();
|
||||
|
||||
queryBuilder.AppendFormat("?pid=Home&UserID={0}", PanelSecurity.SelectedUserId);
|
||||
|
||||
urlReferrers.Add(queryBuilder.ToString());
|
||||
urlReferrers.Add("?pid=Home");
|
||||
urlReferrers.Add("?");
|
||||
urlReferrers.Add(string.Empty);
|
||||
|
||||
queryBuilder.Clear();
|
||||
|
||||
return urlReferrers;
|
||||
}
|
||||
|
||||
private void RedirectToRequiredOrg()
|
||||
{
|
||||
if (Request.UrlReferrer != null && gvOrgs.Rows.Count > 0)
|
||||
{
|
||||
List<string> referrers = GetPossibleUrlRefferers();
|
||||
|
||||
if (PanelSecurity.SelectedUser.Role == UserRole.User)
|
||||
{
|
||||
if (Request.UrlReferrer.Query.Equals(referrers[0]))
|
||||
{
|
||||
RedirectToOrgHomePage();
|
||||
}
|
||||
}
|
||||
|
||||
if (PanelSecurity.LoggedUser.Role == UserRole.User)
|
||||
{
|
||||
if (referrers.Contains(Request.UrlReferrer.Query))
|
||||
{
|
||||
RedirectToOrgHomePage();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void RedirectToOrgHomePage()
|
||||
{
|
||||
if (CurrentDefaultOrgId > 0) Response.Redirect(GetOrganizationEditUrl(CurrentDefaultOrgId.ToString()));
|
||||
|
||||
Response.Redirect(((HyperLink)gvOrgs.Rows[0].Cells[1].Controls[1]).NavigateUrl);
|
||||
}
|
||||
|
||||
protected void btnCreate_Click(object sender, EventArgs e)
|
||||
{
|
||||
Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "create_organization"));
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="MailboxPlanSelector.ascx.cs" Inherits="WebsitePanel.Portal.ExchangeServer.UserControls.MailboxPlanSelector" %>
|
||||
<asp:DropDownList ID="ddlMailboxPlan" runat="server" CssClass="NormalTextBox" OnSelectedIndexChanged="ddlMailboxPlan_SelectedIndexChanged"></asp:DropDownList>
|
||||
<asp:DropDownList ID="ddlMailboxPlan" runat="server" OnSelectedIndexChanged="ddlMailboxPlan_SelectedIndexChanged"></asp:DropDownList>
|
|
@ -1,10 +1,10 @@
|
|||
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="MailboxTabs.ascx.cs" Inherits="WebsitePanel.Portal.ExchangeServer.UserControls.MailboxTabs" %>
|
||||
<table width="100%" cellpadding="0" cellspacing="1">
|
||||
<tr>
|
||||
<td>
|
||||
<td class="Tabs">
|
||||
|
||||
<asp:DataList ID="dlTabs" runat="server" RepeatDirection="Horizontal"
|
||||
RepeatLayout="Flow" EnableViewState="false" RepeatColumns="9" ItemStyle-Height="28px" SeparatorStyle-CssClass="Separator" SeparatorStyle-Height="22px" >
|
||||
RepeatLayout="Flow" EnableViewState="false" RepeatColumns="9" SeparatorStyle-CssClass="Separator" SeparatorStyle-Height="22px" >
|
||||
<ItemStyle Wrap="False" />
|
||||
<ItemTemplate >
|
||||
<asp:HyperLink ID="lnkTab" runat="server" CssClass="Tab" NavigateUrl='<%# Eval("Url") %>'>
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="UserTabs.ascx.cs" Inherits="WebsitePanel.Portal.ExchangeServer.UserControls.UserTabs" %>
|
||||
<table width="100%" cellpadding="0" cellspacing="1">
|
||||
<tr>
|
||||
<td>
|
||||
<td class="Tabs">
|
||||
|
||||
<asp:DataList ID="dlTabs" runat="server" RepeatDirection="Horizontal"
|
||||
RepeatLayout="Flow" EnableViewState="false" RepeatColumns="6" ItemStyle-Height="28px" SeparatorStyle-CssClass="Separator" SeparatorStyle-Height="22px" >
|
||||
RepeatLayout="Flow" EnableViewState="false" RepeatColumns="6" SeparatorStyle-CssClass="Separator" SeparatorStyle-Height="22px" >
|
||||
<ItemStyle Wrap="False" />
|
||||
<ItemTemplate >
|
||||
<asp:HyperLink ID="lnkTab" runat="server" CssClass="Tab" NavigateUrl='<%# Eval("Url") %>'>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue