From fed8f51de8fbb03af6a17544169754cd8c62de01 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 5 Nov 2013 12:00:56 +0100
Subject: [PATCH] Prefixed built in controllers to better avoid conflicts with
 people's custom code

---
 .../Templates/EditProfile.cshtml              |   2 +-
 .../PartialViewMacros/Templates/Login.cshtml  |   2 +-
 .../Templates/LoginStatus.cshtml              |   2 +-
 .../Templates/RegisterMember.cshtml           |   2 +-
 .../PartialViews/Templates/EditProfile.cshtml |   2 +-
 .../PartialViews/Templates/Login.cshtml       |   2 +-
 .../PartialViews/Templates/LoginStatus.cshtml |   2 +-
 .../Templates/RegisterMember.cshtml           |   2 +-
 ...ginController.cs => UmbLoginController.cs} |  56 +++---
 ...troller.cs => UmbLoginStatusController.cs} |  68 +++----
 ...eController.cs => UmbProfileController.cs} | 100 +++++------
 ...Controller.cs => UmbRegisterController.cs} | 168 +++++++++---------
 src/Umbraco.Web/Umbraco.Web.csproj            |   8 +-
 13 files changed, 208 insertions(+), 208 deletions(-)
 rename src/Umbraco.Web/Controllers/{LoginController.cs => UmbLoginController.cs} (89%)
 rename src/Umbraco.Web/Controllers/{LoginStatusController.cs => UmbLoginStatusController.cs} (90%)
 rename src/Umbraco.Web/Controllers/{ProfileController.cs => UmbProfileController.cs} (92%)
 rename src/Umbraco.Web/Controllers/{RegisterController.cs => UmbRegisterController.cs} (95%)

diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
index 40210b9c78..735291e38c 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
@@ -21,7 +21,7 @@
 {
     @Html.RenderJsHere()
 
-    using (Html.BeginUmbracoForm<ProfileController>("HandleUpdateProfile"))
+    using (Html.BeginUmbracoForm<UmbProfileController>("HandleUpdateProfile"))
     {
         <fieldset>
             <legend>Edit profile</legend>
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
index ccfdef0f02..73b891d448 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
@@ -18,7 +18,7 @@
 
 @Html.RenderJsHere()
 
-@using (Html.BeginUmbracoForm<LoginController>("HandleLogin"))
+@using (Html.BeginUmbracoForm<UmbLoginController>("HandleLogin"))
 {
     <fieldset>
         <legend>Login</legend>
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml
index d889c67391..7d8a1ea609 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml
@@ -20,7 +20,7 @@
 {
     <p>You are currently logged in as @loginStatusModel.Name</p>
 
-    using (Html.BeginUmbracoForm<LoginStatusController>("HandleLogout"))
+    using (Html.BeginUmbracoForm<UmbLoginStatusController>("HandleLogout"))
     {
          <fieldset>
              <legend>Logout</legend>
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
index 83899fd776..386a9ad97c 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
@@ -45,7 +45,7 @@
 } 
 else 
 {   
-    using (Html.BeginUmbracoForm<RegisterController>("HandleRegisterMember"))
+    using (Html.BeginUmbracoForm<UmbRegisterController>("HandleRegisterMember"))
     {
         <fieldset>
             <legend>Register Member</legend>
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/EditProfile.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/EditProfile.cshtml
index 80fdff9e68..ed7697721e 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/EditProfile.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/EditProfile.cshtml
@@ -21,7 +21,7 @@
 {
     @Html.RenderJsHere()
 
-    using (Html.BeginUmbracoForm<ProfileController>("HandleUpdateProfile"))
+    using (Html.BeginUmbracoForm<UmbProfileController>("HandleUpdateProfile"))
     {
         <fieldset>
             <legend>Edit profile</legend>
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/Login.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/Login.cshtml
index be4e04eeae..1e2bb759cb 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/Login.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/Login.cshtml
@@ -18,7 +18,7 @@
 
 @Html.RenderJsHere()
 
-@using (Html.BeginUmbracoForm<LoginController>("HandleLogin"))
+@using (Html.BeginUmbracoForm<UmbLoginController>("HandleLogin"))
 {
     <fieldset>
         <legend>Login</legend>
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/LoginStatus.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/LoginStatus.cshtml
index 4f9b30d9c0..f0d62be7b6 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/LoginStatus.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/LoginStatus.cshtml
@@ -21,7 +21,7 @@
 {
     <p>You are currently logged in as @loginStatusModel.Name</p>
 
-    using (Html.BeginUmbracoForm<LoginStatusController>("HandleLogout"))
+    using (Html.BeginUmbracoForm<UmbLoginStatusController>("HandleLogout"))
     {
          <fieldset>
              <legend>Logout</legend>
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/RegisterMember.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/RegisterMember.cshtml
index b0a7cbcf7f..9a18684f13 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/RegisterMember.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/RegisterMember.cshtml
@@ -45,7 +45,7 @@
 } 
 else 
 {   
-    using (Html.BeginUmbracoForm<RegisterController>("HandleRegisterMember"))
+    using (Html.BeginUmbracoForm<UmbRegisterController>("HandleRegisterMember"))
     {
         <fieldset>
             <legend>Register Member</legend>
diff --git a/src/Umbraco.Web/Controllers/LoginController.cs b/src/Umbraco.Web/Controllers/UmbLoginController.cs
similarity index 89%
rename from src/Umbraco.Web/Controllers/LoginController.cs
rename to src/Umbraco.Web/Controllers/UmbLoginController.cs
index 7404138a53..194cc1c160 100644
--- a/src/Umbraco.Web/Controllers/LoginController.cs
+++ b/src/Umbraco.Web/Controllers/UmbLoginController.cs
@@ -1,28 +1,28 @@
-using System.Linq;
-using System.Web.Mvc;
-using umbraco.cms.businesslogic.member;
-using Umbraco.Web.Models;
-using Umbraco.Web.Mvc;
-
-namespace Umbraco.Web.Controllers
-{
-    public class LoginController : SurfaceController
-    {
-        [HttpPost]
-        public ActionResult HandleLogin([Bind(Prefix="loginModel")]LoginModel model)
-        {
-            // TODO: Use new Member API
-            if (ModelState.IsValid)
-            {
-                var m = Member.GetMemberFromLoginNameAndPassword(model.Username, model.Password);
-                if (m != null)
-                {
-                    Member.AddMemberToCache(m);
-                    return Redirect("/");
-                }
-            }
-
-            return CurrentUmbracoPage();
-        }
-    }
-}
+using System.Linq;
+using System.Web.Mvc;
+using umbraco.cms.businesslogic.member;
+using Umbraco.Web.Models;
+using Umbraco.Web.Mvc;
+
+namespace Umbraco.Web.Controllers
+{
+    public class UmbLoginController : SurfaceController
+    {
+        [HttpPost]
+        public ActionResult HandleLogin([Bind(Prefix="loginModel")]LoginModel model)
+        {
+            // TODO: Use new Member API
+            if (ModelState.IsValid)
+            {
+                var m = Member.GetMemberFromLoginNameAndPassword(model.Username, model.Password);
+                if (m != null)
+                {
+                    Member.AddMemberToCache(m);
+                    return Redirect("/");
+                }
+            }
+
+            return CurrentUmbracoPage();
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Controllers/LoginStatusController.cs b/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
similarity index 90%
rename from src/Umbraco.Web/Controllers/LoginStatusController.cs
rename to src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
index 31672eb925..429a3803ee 100644
--- a/src/Umbraco.Web/Controllers/LoginStatusController.cs
+++ b/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
@@ -1,34 +1,34 @@
-using System.Linq;
-using System.Web.Mvc;
-using umbraco.cms.businesslogic.member;
-using Umbraco.Web.Models;
-using Umbraco.Web.Mvc;
-
-namespace Umbraco.Web.Controllers
-{
-    public class LoginStatusController : SurfaceController
-    {
-        [HttpPost]
-        public ActionResult HandleLogout([Bind(Prefix = "loginStatusModel")]LoginStatusModel model)
-        {
-            // TODO: Use new Member API
-            if (ModelState.IsValid)
-            {
-                if (Member.IsLoggedOn())
-                {
-                    var member = Member.GetCurrentMember();
-                    if (member != null)
-                    {
-                        var memberId = member.Id;
-                        Member.RemoveMemberFromCache(memberId);
-                        Member.ClearMemberFromClient(memberId);
-                    }
-                }
-
-                return Redirect("/");                
-            }
-
-            return CurrentUmbracoPage();
-        }
-    }
-}
+using System.Linq;
+using System.Web.Mvc;
+using umbraco.cms.businesslogic.member;
+using Umbraco.Web.Models;
+using Umbraco.Web.Mvc;
+
+namespace Umbraco.Web.Controllers
+{
+    public class UmbLoginStatusController : SurfaceController
+    {
+        [HttpPost]
+        public ActionResult HandleLogout([Bind(Prefix = "loginStatusModel")]LoginStatusModel model)
+        {
+            // TODO: Use new Member API
+            if (ModelState.IsValid)
+            {
+                if (Member.IsLoggedOn())
+                {
+                    var member = Member.GetCurrentMember();
+                    if (member != null)
+                    {
+                        var memberId = member.Id;
+                        Member.RemoveMemberFromCache(memberId);
+                        Member.ClearMemberFromClient(memberId);
+                    }
+                }
+
+                return Redirect("/");                
+            }
+
+            return CurrentUmbracoPage();
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Controllers/ProfileController.cs b/src/Umbraco.Web/Controllers/UmbProfileController.cs
similarity index 92%
rename from src/Umbraco.Web/Controllers/ProfileController.cs
rename to src/Umbraco.Web/Controllers/UmbProfileController.cs
index d6a6463b41..45ca572eea 100644
--- a/src/Umbraco.Web/Controllers/ProfileController.cs
+++ b/src/Umbraco.Web/Controllers/UmbProfileController.cs
@@ -1,50 +1,50 @@
-using System.Linq;
-using System.Web.Mvc;
-using System.Xml;
-using umbraco.cms.businesslogic.member;
-using Umbraco.Web.Models;
-using Umbraco.Web.Mvc;
-
-namespace Umbraco.Web.Controllers
-{
-    public class ProfileController : SurfaceController
-    {
-        [HttpPost]
-        public ActionResult HandleUpdateProfile([Bind(Prefix="profileModel")]ProfileModel model)
-        {
-            //TODO: Use new Member API
-            if (ModelState.IsValid)
-            {
-                var member = Member.GetCurrentMember();
-                if (member != null)
-                {
-                    if (model.Name != null)
-                    {
-                        member.Text = model.Name;
-                    }
-
-                    member.Email = model.Email;
-                    member.LoginName = model.Email;
-
-                    if (model.MemberProperties != null)
-                    {
-                        foreach (var property in model.MemberProperties.Where(p => p.Value != null))
-                        {
-                            member.getProperty(property.Alias).Value = property.Value;
-                        }
-                    }
-
-                    member.Save();
-
-                    member.XmlGenerate(new XmlDocument());
-
-                    Member.AddMemberToCache(member);
-
-                    Response.Redirect("/");
-                }
-            }
-
-            return CurrentUmbracoPage();
-        }
-    }
-}
+using System.Linq;
+using System.Web.Mvc;
+using System.Xml;
+using umbraco.cms.businesslogic.member;
+using Umbraco.Web.Models;
+using Umbraco.Web.Mvc;
+
+namespace Umbraco.Web.Controllers
+{
+    public class UmbProfileController : SurfaceController
+    {
+        [HttpPost]
+        public ActionResult HandleUpdateProfile([Bind(Prefix="profileModel")]ProfileModel model)
+        {
+            //TODO: Use new Member API
+            if (ModelState.IsValid)
+            {
+                var member = Member.GetCurrentMember();
+                if (member != null)
+                {
+                    if (model.Name != null)
+                    {
+                        member.Text = model.Name;
+                    }
+
+                    member.Email = model.Email;
+                    member.LoginName = model.Email;
+
+                    if (model.MemberProperties != null)
+                    {
+                        foreach (var property in model.MemberProperties.Where(p => p.Value != null))
+                        {
+                            member.getProperty(property.Alias).Value = property.Value;
+                        }
+                    }
+
+                    member.Save();
+
+                    member.XmlGenerate(new XmlDocument());
+
+                    Member.AddMemberToCache(member);
+
+                    Response.Redirect("/");
+                }
+            }
+
+            return CurrentUmbracoPage();
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Controllers/RegisterController.cs b/src/Umbraco.Web/Controllers/UmbRegisterController.cs
similarity index 95%
rename from src/Umbraco.Web/Controllers/RegisterController.cs
rename to src/Umbraco.Web/Controllers/UmbRegisterController.cs
index ebf890fc8c..5a74e5708d 100644
--- a/src/Umbraco.Web/Controllers/RegisterController.cs
+++ b/src/Umbraco.Web/Controllers/UmbRegisterController.cs
@@ -1,84 +1,84 @@
-using System.Linq;
-using System.Web.Mvc;
-using umbraco.BusinessLogic;
-using umbraco.cms.businesslogic.member;
-using Umbraco.Web.Models;
-using Umbraco.Web.Mvc;
-
-namespace Umbraco.Web.Controllers
-{
-    public class RegisterController : SurfaceController
-    {
-        [HttpPost]
-        public ActionResult HandleRegisterMember([Bind(Prefix = "registerModel")]RegisterModel model)
-        {
-            //TODO: Use new Member API and use the MemberShipProvider variables for validating password strength etc
-            if (ModelState.IsValid)
-            {
-                model.Username = (model.UsernameIsEmail || model.Username == null) ? model.Email : model.Username;
-
-                var member = Member.GetMemberFromLoginName(model.Username);
-                if (member != null)
-                {
-                    ModelState.AddModelError((model.UsernameIsEmail || model.Username == null) 
-                                                ? "registerModel.Email" 
-                                                : "registerModel.Username",
-                                                "A member with this username already exists.");
-
-                    return CurrentUmbracoPage();
-                }
-
-                member = Member.GetMemberFromEmail(model.Email);
-                if (member != null)
-                {
-                    ModelState.AddModelError("registerModel.Email", "A member with this e-mail address already exists.");
-
-                    return CurrentUmbracoPage();
-                }
-
-                member = CreateNewMember(model);
-
-                // Log member in
-                Member.AddMemberToCache(member);
-
-                if (model.RedirectOnSucces)
-                {
-                    return Redirect(model.RedirectUrl);
-                }
-
-                TempData.Add("FormSuccess", true);
-                return RedirectToCurrentUmbracoPage();
-            }
-
-            return CurrentUmbracoPage();
-        }
-
-        private static Member CreateNewMember(RegisterModel model)
-        {
-            var user = new User(0);
-
-            var mt = MemberType.GetByAlias(model.MemberTypeAlias) ?? MemberType.MakeNew(user, model.MemberTypeAlias);
-
-            var member = Member.MakeNew(model.Username, mt, user);
-
-            if (model.Name != null)
-            {
-                member.Text = model.Name;
-            }
-
-            member.Email = model.Email;
-            member.Password = model.Password;
-
-            if (model.MemberProperties != null)
-            {
-                foreach (var property in model.MemberProperties.Where(p => p.Value != null))
-                {
-                    member.getProperty(property.Alias).Value = property.Value;
-                }
-            }
-
-            member.Save();
-            return member;
-        }
-    }
-}
+using System.Linq;
+using System.Web.Mvc;
+using umbraco.BusinessLogic;
+using umbraco.cms.businesslogic.member;
+using Umbraco.Web.Models;
+using Umbraco.Web.Mvc;
+
+namespace Umbraco.Web.Controllers
+{
+    public class UmbRegisterController : SurfaceController
+    {
+        [HttpPost]
+        public ActionResult HandleRegisterMember([Bind(Prefix = "registerModel")]RegisterModel model)
+        {
+            //TODO: Use new Member API and use the MemberShipProvider variables for validating password strength etc
+            if (ModelState.IsValid)
+            {
+                model.Username = (model.UsernameIsEmail || model.Username == null) ? model.Email : model.Username;
+
+                var member = Member.GetMemberFromLoginName(model.Username);
+                if (member != null)
+                {
+                    ModelState.AddModelError((model.UsernameIsEmail || model.Username == null) 
+                                                ? "registerModel.Email" 
+                                                : "registerModel.Username",
+                                                "A member with this username already exists.");
+
+                    return CurrentUmbracoPage();
+                }
+
+                member = Member.GetMemberFromEmail(model.Email);
+                if (member != null)
+                {
+                    ModelState.AddModelError("registerModel.Email", "A member with this e-mail address already exists.");
+
+                    return CurrentUmbracoPage();
+                }
+
+                member = CreateNewMember(model);
+
+                // Log member in
+                Member.AddMemberToCache(member);
+
+                if (model.RedirectOnSucces)
+                {
+                    return Redirect(model.RedirectUrl);
+                }
+
+                TempData.Add("FormSuccess", true);
+                return RedirectToCurrentUmbracoPage();
+            }
+
+            return CurrentUmbracoPage();
+        }
+
+        private static Member CreateNewMember(RegisterModel model)
+        {
+            var user = new User(0);
+
+            var mt = MemberType.GetByAlias(model.MemberTypeAlias) ?? MemberType.MakeNew(user, model.MemberTypeAlias);
+
+            var member = Member.MakeNew(model.Username, mt, user);
+
+            if (model.Name != null)
+            {
+                member.Text = model.Name;
+            }
+
+            member.Email = model.Email;
+            member.Password = model.Password;
+
+            if (model.MemberProperties != null)
+            {
+                foreach (var property in model.MemberProperties.Where(p => p.Value != null))
+                {
+                    member.getProperty(property.Alias).Value = property.Value;
+                }
+            }
+
+            member.Save();
+            return member;
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index f560cd8e68..bac4a484f6 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -301,8 +301,8 @@
     <Compile Include="Cache\UserTypeCacheRefresher.cs" />
     <Compile Include="Editors\AuthenticationController.cs" />
     <Compile Include="Editors\ContentController.cs" />
-    <Compile Include="Controllers\ProfileController.cs" />
-    <Compile Include="Controllers\LoginStatusController.cs" />
+    <Compile Include="Controllers\UmbProfileController.cs" />
+    <Compile Include="Controllers\UmbLoginStatusController.cs" />
     <Compile Include="Editors\ContentPostValidateAttribute.cs" />
     <Compile Include="Editors\DashboardController.cs" />
     <Compile Include="Editors\DashboardSecurity.cs" />
@@ -439,7 +439,7 @@
     <Compile Include="Editors\ContentControllerBase.cs" />
     <Compile Include="Editors\ContentTypeController.cs" />
     <Compile Include="Editors\LegacyController.cs" />
-    <Compile Include="Controllers\RegisterController.cs" />
+    <Compile Include="Controllers\UmbRegisterController.cs" />
     <Compile Include="Models\ProfileModel.cs" />
     <Compile Include="Models\LoginStatusModel.cs" />
     <Compile Include="PropertyEditors\ValueConverters\MarkdownEditorValueConverter.cs" />
@@ -637,7 +637,7 @@
     <Compile Include="umbraco.presentation\umbraco\settings\stylesheet\property\EditStyleSheetProperty.aspx.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="Controllers\LoginController.cs" />
+    <Compile Include="Controllers\UmbLoginController.cs" />
     <Compile Include="umbraco.presentation\umbraco\Trees\TranslateTreeNames.cs" />
     <Compile Include="UrlHelperExtensions.cs" />
     <Compile Include="Editors\MediaController.cs" />