diff --git a/src/Umbraco.Web.UI/Umbraco/dashboard/UserControlProxy.aspx b/src/Umbraco.Web.UI/Umbraco/dashboard/UserControlProxy.aspx index 3d6c4750ec..1804b6032b 100644 --- a/src/Umbraco.Web.UI/Umbraco/dashboard/UserControlProxy.aspx +++ b/src/Umbraco.Web.UI/Umbraco/dashboard/UserControlProxy.aspx @@ -1,10 +1,10 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="UserControlProxy.aspx.cs" Inherits="Umbraco.Web.UI.Dashboard.UserControlProxy" %> +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="UserControlProxy.aspx.cs" Inherits="Umbraco.Web.UI.Umbraco.Dashboard.UserControlProxy" %> - +
diff --git a/src/Umbraco.Web.UI/Umbraco/dashboard/UserControlProxy.aspx.cs b/src/Umbraco.Web.UI/Umbraco/dashboard/UserControlProxy.aspx.cs index 901b612c16..ad7aa56c60 100644 --- a/src/Umbraco.Web.UI/Umbraco/dashboard/UserControlProxy.aspx.cs +++ b/src/Umbraco.Web.UI/Umbraco/dashboard/UserControlProxy.aspx.cs @@ -1,12 +1,9 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; using System.Web.UI; -using System.Web.UI.WebControls; -using umbraco.IO; +using Umbraco.Core.IO; -namespace Umbraco.Web.UI.Dashboard + +namespace Umbraco.Web.UI.Umbraco.Dashboard { public partial class UserControlProxy : Pages.UmbracoEnsuredPage { @@ -20,13 +17,13 @@ namespace Umbraco.Web.UI.Dashboard base.OnInit(e); var path = Request.QueryString["ctrl"]; - if (!string.IsNullOrEmpty(path)) + if (string.IsNullOrEmpty(path) == false) { path = IOHelper.FindFile(path); try { - Control c = LoadControl(path); + var c = LoadControl(path); container.Controls.Add(c); } catch (Exception ee) diff --git a/src/Umbraco.Web.UI/Umbraco/dashboard/UserControlProxy.aspx.designer.cs b/src/Umbraco.Web.UI/Umbraco/dashboard/UserControlProxy.aspx.designer.cs index c4bd235339..3dc563e730 100644 --- a/src/Umbraco.Web.UI/Umbraco/dashboard/UserControlProxy.aspx.designer.cs +++ b/src/Umbraco.Web.UI/Umbraco/dashboard/UserControlProxy.aspx.designer.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Umbraco.Web.UI.Dashboard { +namespace Umbraco.Web.UI.Umbraco.Dashboard { public partial class UserControlProxy { diff --git a/src/Umbraco.Web/Editors/dashboardcontroller.cs b/src/Umbraco.Web/Editors/dashboardcontroller.cs index fe43ceb2b0..3a58258236 100644 --- a/src/Umbraco.Web/Editors/dashboardcontroller.cs +++ b/src/Umbraco.Web/Editors/dashboardcontroller.cs @@ -56,7 +56,7 @@ namespace Umbraco.Web.Editors foreach (XmlNode entry in dashboard.SelectNodes("./tab")) { - if (validateAccess(entry, user)) + if (ValidateAccess(entry, user)) { i++; @@ -69,7 +69,7 @@ namespace Umbraco.Web.Editors foreach (XmlNode uc in entry.SelectNodes("./control")) { - if (validateAccess(uc, user)) + if (ValidateAccess(uc, user)) { Control ctrl = new Control(); @@ -138,7 +138,7 @@ namespace Umbraco.Web.Editors //TODO: This has to go away, jesus //for now I'm just returning true, this is likely to change anyway - private bool validateAccess(XmlNode node, IUser currentUser) + private bool ValidateAccess(XmlNode node, IUser currentUser) { return true; diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 5e3e2c93aa..d0d6b75c17 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -301,7 +301,7 @@ - + diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.cs index 51d25f6bbe..a533868c28 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.cs @@ -25,6 +25,7 @@ namespace umbraco.cms.presentation /// /// Summary description for login. /// + [Obsolete("This class is no longer used and will be removed")] public partial class login : BasePages.BasePage { [Obsolete("This property is no longer used")] diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webService.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webService.asmx.cs index f120f4e578..a297825dda 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/webService.asmx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/webService.asmx.cs @@ -14,6 +14,10 @@ using System.Linq; namespace umbraco { + + //TODO: There's no app checking security in here which means that any authorized user can query for all content and all media + // with all information exposed even when they don't have access to content or media. + /// /// Summary description for webService. ///