From 99ae94a82f5a948c8a5d452088654d9a0672518a Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 20 Nov 2013 16:40:30 +1100
Subject: [PATCH 01/18] Ensures that members are auto-approved if creating a
 member via the legacy members API.

---
 .../members/MembersMembershipProvider.cs      | 39 ++++++++++++++++++-
 .../umbraco.providers.csproj                  |  4 ++
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/umbraco.providers/members/MembersMembershipProvider.cs b/src/umbraco.providers/members/MembersMembershipProvider.cs
index b9dc4872a7..40c5564040 100644
--- a/src/umbraco.providers/members/MembersMembershipProvider.cs
+++ b/src/umbraco.providers/members/MembersMembershipProvider.cs
@@ -880,7 +880,16 @@ namespace umbraco.providers.members
                     string approveStatus = GetMemberProperty(m, m_ApprovedPropertyTypeAlias, true);
                     if (!String.IsNullOrEmpty(approveStatus))
                     {
-                        bool.TryParse(approveStatus, out isApproved);
+                        //try parsing as bool first (just in case)
+                        if (bool.TryParse(approveStatus, out isApproved) == false)
+                        {
+                            int intStatus;
+                            //if that fails, try parsing as int (since its normally stored as 0 or 1)
+                            if (int.TryParse(approveStatus, out intStatus))
+                            {
+                                isApproved = intStatus != 0;
+                            }
+                        }
                     }
                 }
             }
@@ -1019,4 +1028,32 @@ namespace umbraco.providers.members
 
         #endregion
     }
+
+    /// <summary>
+    /// Adds some event handling
+    /// </summary>
+    public class MembershipEventHandler : ApplicationEventHandler
+    {
+        protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
+        {
+            Member.New += Member_New;
+        }
+
+        void Member_New(Member sender, NewEventArgs e)
+        {
+            //This is a bit of a hack to ensure that the member is approved when created since many people will be using
+            // this old api to create members on the front-end and they need to be approved - which is based on whether or not 
+            // the Umbraco membership provider is configured.
+            var provider = Membership.Provider as UmbracoMembershipProvider;
+            if (provider != null)
+            {
+                var approvedField = provider.ApprovedPropertyTypeAlias;
+                var property = sender.getProperty(approvedField);
+                if (property != null)
+                {
+                    property.Value = 1;
+                }
+            }            
+        }
+    }
 }
diff --git a/src/umbraco.providers/umbraco.providers.csproj b/src/umbraco.providers/umbraco.providers.csproj
index 7c6f3892eb..2a8c4503be 100644
--- a/src/umbraco.providers/umbraco.providers.csproj
+++ b/src/umbraco.providers/umbraco.providers.csproj
@@ -105,6 +105,10 @@
       <Project>{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}</Project>
       <Name>umbraco.datalayer</Name>
     </ProjectReference>
+    <ProjectReference Include="..\umbraco.interfaces\umbraco.interfaces.csproj">
+      <Project>{511F6D8D-7717-440A-9A57-A507E9A8B27F}</Project>
+      <Name>umbraco.interfaces</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">

From b13c3aa3b976a62f3feef3cd5109f9b4ce52a76c Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 20 Nov 2013 16:59:41 +1100
Subject: [PATCH 02/18] Fixes: U4-3610 When adding another tab to a member type
 no members will load and result in a YSOD

Conflicts:
	src/Umbraco.Core/Persistence/Relators/PropertyTypePropertyGroupRelator.cs
---
 .../Relators/PropertyTypePropertyGroupRelator.cs   | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Relators/PropertyTypePropertyGroupRelator.cs b/src/Umbraco.Core/Persistence/Relators/PropertyTypePropertyGroupRelator.cs
index f02ca8e1b1..a1b226d65b 100644
--- a/src/Umbraco.Core/Persistence/Relators/PropertyTypePropertyGroupRelator.cs
+++ b/src/Umbraco.Core/Persistence/Relators/PropertyTypePropertyGroupRelator.cs
@@ -19,11 +19,17 @@ namespace Umbraco.Core.Persistence.Relators
             // Is this the same MemberTypeReadOnlyDto as the current one we're processing
             if (Current != null && Current.UniqueId == a.UniqueId)
             {
-                // Yes, just add this PropertyTypeReadOnlyDto to the current MemberTypeReadOnlyDto's collection
-                Current.PropertyTypes.Add(p);
-
+                //This property may already be added so we need to check for that
+                if (p.Id.HasValue && Current.PropertyTypes.Any(x => x.Id == p.Id.Value) == false)
+                {
+                    // Add this PropertyTypeReadOnlyDto to the current MemberTypeReadOnlyDto's collection
+                    Current.PropertyTypes.Add(p);
+                }
+                
                 if (g.Id.HasValue && Current.PropertyTypeGroups != null && Current.PropertyTypeGroups.Any(x => x.Id == g.Id.Value) == false)
+                {
                     Current.PropertyTypeGroups.Add(g);
+                }
 
                 // Return null to indicate we're not done with this MemberTypeReadOnlyDto yet
                 return null;
@@ -46,7 +52,9 @@ namespace Umbraco.Core.Persistence.Relators
 
             Current.PropertyTypeGroups = new List<PropertyTypeGroupReadOnlyDto>();
             if (g.Id.HasValue)
+            {
                 Current.PropertyTypeGroups.Add(g);
+            }
 
             // Return the now populated previous MemberTypeReadOnlyDto (or null if first time through)
             return prev;

From 416a9ed064c4e0aefb1d6e09bcb65756236e6842 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 20 Nov 2013 17:10:15 +1100
Subject: [PATCH 03/18] Comments out backported code - need to wait till we
 merge in the custom membership branch.

---
 .../members/MembersMembershipProvider.cs      | 54 ++++++++++---------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/umbraco.providers/members/MembersMembershipProvider.cs b/src/umbraco.providers/members/MembersMembershipProvider.cs
index 40c5564040..b18f3f0583 100644
--- a/src/umbraco.providers/members/MembersMembershipProvider.cs
+++ b/src/umbraco.providers/members/MembersMembershipProvider.cs
@@ -1029,31 +1029,33 @@ namespace umbraco.providers.members
         #endregion
     }
 
-    /// <summary>
-    /// Adds some event handling
-    /// </summary>
-    public class MembershipEventHandler : ApplicationEventHandler
-    {
-        protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
-        {
-            Member.New += Member_New;
-        }
+    //TODO: We need to re-enable this in 6.2, but need to back port most of the membership provider changes (still in a custom branch atm)
 
-        void Member_New(Member sender, NewEventArgs e)
-        {
-            //This is a bit of a hack to ensure that the member is approved when created since many people will be using
-            // this old api to create members on the front-end and they need to be approved - which is based on whether or not 
-            // the Umbraco membership provider is configured.
-            var provider = Membership.Provider as UmbracoMembershipProvider;
-            if (provider != null)
-            {
-                var approvedField = provider.ApprovedPropertyTypeAlias;
-                var property = sender.getProperty(approvedField);
-                if (property != null)
-                {
-                    property.Value = 1;
-                }
-            }            
-        }
-    }
+    ///// <summary>
+    ///// Adds some event handling
+    ///// </summary>
+    //public class MembershipEventHandler : ApplicationEventHandler
+    //{
+    //    protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
+    //    {
+    //        Member.New += Member_New;
+    //    }
+
+    //    void Member_New(Member sender, NewEventArgs e)
+    //    {
+    //        //This is a bit of a hack to ensure that the member is approved when created since many people will be using
+    //        // this old api to create members on the front-end and they need to be approved - which is based on whether or not 
+    //        // the Umbraco membership provider is configured.
+    //        var provider = Membership.Provider as UmbracoMembershipProvider;
+    //        if (provider != null)
+    //        {
+    //            var approvedField = provider.ApprovedPropertyTypeAlias;
+    //            var property = sender.getProperty(approvedField);
+    //            if (property != null)
+    //            {
+    //                property.Value = 1;
+    //            }
+    //        }            
+    //    }
+    //}
 }

From 5a928aa459b5cd926633b2d85018daca8e5846ae Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 20 Nov 2013 17:28:33 +1100
Subject: [PATCH 04/18] FIxes installer when duplicate conflicts: U4-3612
 Cannot install Txt starter kit in the back office

Conflicts:
	src/umbraco.cms/businesslogic/Packager/Installer.cs
---
 .../businesslogic/Packager/Installer.cs         | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/umbraco.cms/businesslogic/Packager/Installer.cs b/src/umbraco.cms/businesslogic/Packager/Installer.cs
index d099849b0f..4c9b2587e9 100644
--- a/src/umbraco.cms/businesslogic/Packager/Installer.cs
+++ b/src/umbraco.cms/businesslogic/Packager/Installer.cs
@@ -857,9 +857,14 @@ namespace umbraco.cms.businesslogic.packager
                     {
                         var m = new Macro(alias);
                         this._containsMacroConflict = true;
-                        this._conflictingMacroAliases.Add(m.Name, alias);
+
+                        if (_conflictingMacroAliases.ContainsKey(m.Name) == false)
+                        {
+                            _conflictingMacroAliases.Add(m.Name, alias);    
+                        }
                     }
                     catch (IndexOutOfRangeException) { } //thrown when the alias doesn't exist in the DB, ie - macro not there
+                    }                    
                 }
             }
 
@@ -872,7 +877,10 @@ namespace umbraco.cms.businesslogic.packager
                     if (t != null)
                     {
                         this._containsTemplateConflict = true;
-                        this._conflictingTemplateAliases.Add(t.Text, alias);
+                        if (_conflictingTemplateAliases.ContainsKey(t.Text) == false)
+                        {
+                            _conflictingTemplateAliases.Add(t.Text, alias);
+                        }
                     }
                 }
             }
@@ -886,7 +894,10 @@ namespace umbraco.cms.businesslogic.packager
                     if (s != null)
                     {
                         this._containsStyleSheetConflict = true;
-                        this._conflictingStyleSheetNames.Add(s.Text, alias);
+                        if (_conflictingStyleSheetNames.ContainsKey(s.Text) == false)
+                        {
+                            _conflictingStyleSheetNames.Add(s.Text, alias);   
+                        }                        
                     }
                 }
             }

From 369f6ac935439691e76994831ccfa28689dbe870 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 20 Nov 2013 18:15:11 +1100
Subject: [PATCH 05/18] fixes merge issue

---
 src/umbraco.cms/businesslogic/Packager/Installer.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/umbraco.cms/businesslogic/Packager/Installer.cs b/src/umbraco.cms/businesslogic/Packager/Installer.cs
index 4c9b2587e9..dc73fd9f10 100644
--- a/src/umbraco.cms/businesslogic/Packager/Installer.cs
+++ b/src/umbraco.cms/businesslogic/Packager/Installer.cs
@@ -860,11 +860,12 @@ namespace umbraco.cms.businesslogic.packager
 
                         if (_conflictingMacroAliases.ContainsKey(m.Name) == false)
                         {
-                            _conflictingMacroAliases.Add(m.Name, alias);    
+                            _conflictingMacroAliases.Add(m.Name, alias);
                         }
                     }
-                    catch (IndexOutOfRangeException) { } //thrown when the alias doesn't exist in the DB, ie - macro not there
-                    }                    
+                    catch (IndexOutOfRangeException)
+                    {
+                    } //thrown when the alias doesn't exist in the DB, ie - macro not there
                 }
             }
 

From 474dcd07548e6643d53d449955b878c6cf5fdff3 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 20 Nov 2013 18:24:44 +1100
Subject: [PATCH 06/18] Fixes: U4-3587 Can't delete a member when there is a
 group assigned

Conflicts:
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
---
 src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
index b8024939b0..d52526aa5b 100644
--- a/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
@@ -165,6 +165,7 @@ namespace Umbraco.Core.Persistence.Repositories
                                "DELETE FROM umbracoRelation WHERE childId = @Id",
                                "DELETE FROM cmsTagRelationship WHERE nodeId = @Id",
                                "DELETE FROM cmsPropertyData WHERE contentNodeId = @Id",
+                               "DELETE FROM cmsMember2MemberGroup WHERE Member = @Id",
                                "DELETE FROM cmsMember WHERE nodeId = @Id",
                                "DELETE FROM cmsContentVersion WHERE ContentId = @Id",
                                "DELETE FROM cmsContentXml WHERE nodeID = @Id",

From e6ae88c016fed481746fc82fdfa2e5a33c3e2555 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 21 Nov 2013 14:45:52 +1100
Subject: [PATCH 07/18] Fixes hash generation and checking with the
 trees.config file - since this is changed during startup our plugin cache was
 never active :(

---
 src/Umbraco.Core/PluginManager.cs       | 39 ++++++++++++++++++-------
 src/Umbraco.Tests/PluginManagerTests.cs |  8 ++---
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Core/PluginManager.cs b/src/Umbraco.Core/PluginManager.cs
index 485602f23f..84d45dc220 100644
--- a/src/Umbraco.Core/PluginManager.cs
+++ b/src/Umbraco.Core/PluginManager.cs
@@ -171,17 +171,18 @@ namespace Umbraco.Core
                 if (_currentAssembliesHash != -1)
                     return _currentAssembliesHash;
 
-                _currentAssembliesHash = GetAssembliesHash(
-                    new FileSystemInfo[]
+                _currentAssembliesHash = GetFileHash(
+                    new List<Tuple<FileSystemInfo, bool>>
 						{
 							//add the bin folder and everything in it
-							new DirectoryInfo(IOHelper.MapPath(SystemDirectories.Bin)),
+							new Tuple<FileSystemInfo, bool>(new DirectoryInfo(IOHelper.MapPath(SystemDirectories.Bin)), false),
 							//add the app code folder and everything in it
-							new DirectoryInfo(IOHelper.MapPath("~/App_Code")),
+							new Tuple<FileSystemInfo, bool>(new DirectoryInfo(IOHelper.MapPath("~/App_Code")), false),
 							//add the global.asax (the app domain also monitors this, if it changes will do a full restart)
-							new FileInfo(IOHelper.MapPath("~/global.asax")),
-                            //add the trees.config
-                            new FileInfo(IOHelper.MapPath(SystemDirectories.Config + "/trees.config"))
+							new Tuple<FileSystemInfo, bool>(new FileInfo(IOHelper.MapPath("~/global.asax")), false),
+
+                            //add the trees.config - use the contents to create the has since this gets resaved on every app startup!
+                            new Tuple<FileSystemInfo, bool>(new FileInfo(IOHelper.MapPath(SystemDirectories.Config + "/trees.config")), true)
 						}
                     );
                 return _currentAssembliesHash;
@@ -200,18 +201,34 @@ namespace Umbraco.Core
         /// <summary>
         /// Returns a unique hash for the combination of FileInfo objects passed in
         /// </summary>
-        /// <param name="filesAndFolders"></param>
+        /// <param name="filesAndFolders">
+        /// A collection of files and whether or not to use their file contents to determine the hash or the file's properties 
+        /// (true will make a hash based on it's contents)
+        /// </param>
         /// <returns></returns>
-        internal static long GetAssembliesHash(IEnumerable<FileSystemInfo> filesAndFolders)
+        internal static long GetFileHash(IEnumerable<Tuple<FileSystemInfo, bool>> filesAndFolders)
         {
             using (DisposableTimer.TraceDuration<PluginManager>("Determining hash of code files on disk", "Hash determined"))
             {
                 var hashCombiner = new HashCodeCombiner();
-                //add each unique folder to the hash
-                foreach (var i in filesAndFolders.DistinctBy(x => x.FullName))
+
+                //get the file info's to check
+                var fileInfos = filesAndFolders.Where(x => x.Item2 == false).ToArray();
+                var fileContents = filesAndFolders.Except(fileInfos);
+                
+                //add each unique folder/file to the hash
+                foreach (var i in fileInfos.Select(x => x.Item1).DistinctBy(x => x.FullName))
                 {
                     hashCombiner.AddFileSystemItem(i);
                 }
+
+                //add each unique file's contents to the hash
+                foreach (var i in fileContents.Select(x => x.Item1).DistinctBy(x => x.FullName))
+                {
+                    var content = File.ReadAllText(i.FullName).Replace("\r\n", string.Empty).Replace("\n", string.Empty).Replace("\r", string.Empty);
+                    hashCombiner.AddCaseInsensitiveString(content);
+                }
+
                 return ConvertPluginsHashFromHex(hashCombiner.GetCombinedHashCode());
             }
         }
diff --git a/src/Umbraco.Tests/PluginManagerTests.cs b/src/Umbraco.Tests/PluginManagerTests.cs
index 861b598c1e..a67ce74627 100644
--- a/src/Umbraco.Tests/PluginManagerTests.cs
+++ b/src/Umbraco.Tests/PluginManagerTests.cs
@@ -242,16 +242,16 @@ namespace Umbraco.Tests
             var list3 = new[] { f1, f3, f5, f7 };
 
             //Act
-            var hash1 = PluginManager.GetAssembliesHash(list1);
-            var hash2 = PluginManager.GetAssembliesHash(list2);
-            var hash3 = PluginManager.GetAssembliesHash(list3);
+            var hash1 = PluginManager.GetFileHash(list1);
+            var hash2 = PluginManager.GetFileHash(list2);
+            var hash3 = PluginManager.GetFileHash(list3);
 
             //Assert
             Assert.AreNotEqual(hash1, hash2);
             Assert.AreNotEqual(hash1, hash3);
             Assert.AreNotEqual(hash2, hash3);
 
-            Assert.AreEqual(hash1, PluginManager.GetAssembliesHash(list1));
+            Assert.AreEqual(hash1, PluginManager.GetFileHash(list1));
         }
 
         [Test]

From f41f82adc544a423709f481d0dcad2b88315a622 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 21 Nov 2013 14:46:18 +1100
Subject: [PATCH 08/18] Changes locker to be static

---
 src/Umbraco.Core/PluginManager.cs | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/PluginManager.cs b/src/Umbraco.Core/PluginManager.cs
index 84d45dc220..b8c4ca6ff4 100644
--- a/src/Umbraco.Core/PluginManager.cs
+++ b/src/Umbraco.Core/PluginManager.cs
@@ -233,6 +233,21 @@ namespace Umbraco.Core
             }
         }
 
+        internal static long GetFileHash(IEnumerable<FileSystemInfo> filesAndFolders)
+        {
+            using (DisposableTimer.TraceDuration<PluginManager>("Determining hash of code files on disk", "Hash determined"))
+            {
+                var hashCombiner = new HashCodeCombiner();
+
+                //add each unique folder/file to the hash
+                foreach (var i in filesAndFolders.DistinctBy(x => x.FullName))
+                {
+                    hashCombiner.AddFileSystemItem(i);
+                }
+                return ConvertPluginsHashFromHex(hashCombiner.GetCombinedHashCode());
+            }
+        }
+
         /// <summary>
         /// Converts the hash value of current plugins to long from string
         /// </summary>
@@ -435,7 +450,7 @@ namespace Umbraco.Core
 
         #endregion
 
-        private readonly ReaderWriterLockSlim _lock = new ReaderWriterLockSlim();
+        private static readonly ReaderWriterLockSlim Locker = new ReaderWriterLockSlim();
         private readonly HashSet<TypeList> _types = new HashSet<TypeList>();
         private IEnumerable<Assembly> _assemblies;
 
@@ -609,7 +624,7 @@ namespace Umbraco.Core
             TypeResolutionKind resolutionType,
             bool cacheResult)
         {
-            using (var readLock = new UpgradeableReadLock(_lock))
+            using (var readLock = new UpgradeableReadLock(Locker))
             {
                 var typesFound = new List<Type>();
 

From d04f2a98b9bf39d9311458d4110a2c6f0fa6cf67 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 21 Nov 2013 17:47:57 +1100
Subject: [PATCH 09/18] Fixes tests

---
 src/Umbraco.Core/PluginManager.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/PluginManager.cs b/src/Umbraco.Core/PluginManager.cs
index b8c4ca6ff4..705a2bae2a 100644
--- a/src/Umbraco.Core/PluginManager.cs
+++ b/src/Umbraco.Core/PluginManager.cs
@@ -225,8 +225,12 @@ namespace Umbraco.Core
                 //add each unique file's contents to the hash
                 foreach (var i in fileContents.Select(x => x.Item1).DistinctBy(x => x.FullName))
                 {
-                    var content = File.ReadAllText(i.FullName).Replace("\r\n", string.Empty).Replace("\n", string.Empty).Replace("\r", string.Empty);
-                    hashCombiner.AddCaseInsensitiveString(content);
+                    if (File.Exists(i.FullName))
+                    {
+                        var content = File.ReadAllText(i.FullName).Replace("\r\n", string.Empty).Replace("\n", string.Empty).Replace("\r", string.Empty);
+                        hashCombiner.AddCaseInsensitiveString(content);    
+                    }
+                    
                 }
 
                 return ConvertPluginsHashFromHex(hashCombiner.GetCombinedHashCode());

From 20813ef20789392a2cff46ef6f78bb6213c3b4a6 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 25 Nov 2013 13:25:01 +1100
Subject: [PATCH 10/18] Fixes: U4-3673 Creating content with Services API
 always sets created by to admin

Conflicts:
	src/Umbraco.Tests/Services/ContentServiceTests.cs
---
 src/Umbraco.Core/Services/ContentService.cs   |  8 +++++++
 .../Services/ContentServiceTests.cs           | 22 +++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs
index 616b528024..d3b38ebb67 100644
--- a/src/Umbraco.Core/Services/ContentService.cs
+++ b/src/Umbraco.Core/Services/ContentService.cs
@@ -1602,6 +1602,10 @@ namespace Umbraco.Core.Services
                 using (var repository = _repositoryFactory.CreateContentRepository(uow))
                 {
                     //Since this is the Save and Publish method, the content should be saved even though the publish fails or isn't allowed
+                    if (content.HasIdentity == false)
+                    {
+                        content.CreatorId = userId;
+                    }
                     content.WriterId = userId;
 
                     repository.AddOrUpdate(content);
@@ -1662,6 +1666,10 @@ namespace Umbraco.Core.Services
                 var uow = _uowProvider.GetUnitOfWork();
                 using (var repository = _repositoryFactory.CreateContentRepository(uow))
                 {
+                    if (content.HasIdentity == false)
+                    {
+                        content.CreatorId = userId;
+                    }
                     content.WriterId = userId;
 
                     //Only change the publish state if the "previous" version was actually published or marked as unpublished
diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index e15f05817d..047fc202ed 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Threading;
 using NUnit.Framework;
 using Umbraco.Core.Models;
+using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.UnitOfWork;
@@ -78,6 +79,27 @@ namespace Umbraco.Tests.Services
             Assert.That(content.CreatorId, Is.EqualTo(0));//Default to zero/administrator
         }
 
+        [Test]
+        public void Can_Save_New_Content_With_Explicit_User()
+        {
+            var user = new User(ServiceContext.UserService.GetUserTypeByAlias("admin"))
+                {
+                    Name = "Test",
+                    Email = "test@test.com",
+                    Username = "test",
+                    Password = "test"
+                };
+            ServiceContext.UserService.SaveUser(user);
+            var content = new Content("Test", -1, ServiceContext.ContentTypeService.GetContentType("umbTextpage"));
+
+            // Act
+            ServiceContext.ContentService.Save(content, (int)user.Id);
+
+            // Assert
+            Assert.That(content.CreatorId, Is.EqualTo(user.Id));
+            Assert.That(content.WriterId, Is.EqualTo(user.Id));
+        }
+
         [Test]
         public void Cannot_Create_Content_With_Non_Existing_ContentType_Alias()
         {

From 58fc51ae939129ab372cf780d8ba9aad09502a8e Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 28 Nov 2013 09:30:50 +1100
Subject: [PATCH 11/18] Fixes: U4-3736 Unit test Can_Get_File_Dates() now
 testing correctly, disregarding local (nont-UTC) time.

---
 src/Umbraco.Tests/IO/AbstractFileSystemTests.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Tests/IO/AbstractFileSystemTests.cs b/src/Umbraco.Tests/IO/AbstractFileSystemTests.cs
index 0121e128e1..120b1f9a4f 100644
--- a/src/Umbraco.Tests/IO/AbstractFileSystemTests.cs
+++ b/src/Umbraco.Tests/IO/AbstractFileSystemTests.cs
@@ -122,11 +122,11 @@ namespace Umbraco.Tests.IO
 
             Assert.AreEqual(DateTime.Today.Year, created.Year);
             Assert.AreEqual(DateTime.Today.Month, created.Month);
-            Assert.AreEqual(DateTime.Today.Date, created.Date);
+            Assert.AreEqual(DateTime.UtcNow.Date, created.Date);
 
             Assert.AreEqual(DateTime.Today.Year, modified.Year);
             Assert.AreEqual(DateTime.Today.Month, modified.Month);
-            Assert.AreEqual(DateTime.Today.Date, modified.Date);
+            Assert.AreEqual(DateTime.UtcNow.Date, modified.Date);
 
             _fileSystem.DeleteFile("test.txt");
         }

From af29f614786a4eec91b1af7c7b18fa77e11d4360 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 29 Nov 2013 11:10:25 +1100
Subject: [PATCH 12/18] Fixes csrf issue

---
 .../config/ClientDependency.config            |  2 +-
 src/Umbraco.Web.UI/install/Default.aspx.cs    |  4 +++-
 src/Umbraco.Web.UI/umbraco/logout.aspx        | 17 +++-----------
 src/Umbraco.Web.UI/umbraco/umbraco.aspx       | 13 +++++++----
 .../Application/UmbracoApplicationActions.js  | 21 +++++++++++------
 .../UI/Pages/UmbracoEnsuredPage.cs            |  4 ++--
 .../install/LegacyClasses.cs                  |  2 +-
 .../umbraco/logout.aspx.cs                    | 23 ++++++++++++++-----
 .../BasePages/BasePage.cs                     | 12 ++++++++++
 .../BasePages/UmbracoEnsuredPage.cs           |  4 ++--
 src/umbraco.cms/Actions/ActionQuit.cs         |  1 +
 11 files changed, 65 insertions(+), 38 deletions(-)

diff --git a/src/Umbraco.Web.UI/config/ClientDependency.config b/src/Umbraco.Web.UI/config/ClientDependency.config
index a95c67b06d..3b80c0d7dd 100644
--- a/src/Umbraco.Web.UI/config/ClientDependency.config
+++ b/src/Umbraco.Web.UI/config/ClientDependency.config
@@ -10,7 +10,7 @@ NOTES:
 * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
 * A new version will invalidate both client and server cache and create new persisted files
 -->
-<clientDependency version="8" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
+<clientDependency version="9" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
 
   <!-- 
     This section is used for Web Forms only, the enableCompositeFiles="true" is optional and by default is set to true.
diff --git a/src/Umbraco.Web.UI/install/Default.aspx.cs b/src/Umbraco.Web.UI/install/Default.aspx.cs
index a53429c2b6..345a0bc841 100644
--- a/src/Umbraco.Web.UI/install/Default.aspx.cs
+++ b/src/Umbraco.Web.UI/install/Default.aspx.cs
@@ -67,7 +67,9 @@ namespace Umbraco.Web.UI.Install
                 
                 if (result == ValidateRequestAttempt.FailedTimedOut || result == ValidateRequestAttempt.FailedNoPrivileges)
                 {
-                    Response.Redirect(SystemDirectories.Umbraco + "/logout.aspx?redir=" + Server.UrlEncode(Request.RawUrl));
+                    Response.Redirect(
+                        //We must add the token to prevent CSRF attacks since the logout occurs on a GET not a POST
+                        SystemDirectories.Umbraco + "/logout.aspx?redir=" + Server.UrlEncode(Request.RawUrl) + "&t=" + Security.UmbracoUserContextId);
                 }
             }
 
diff --git a/src/Umbraco.Web.UI/umbraco/logout.aspx b/src/Umbraco.Web.UI/umbraco/logout.aspx
index 7828fb3d8e..cb01b76af6 100644
--- a/src/Umbraco.Web.UI/umbraco/logout.aspx
+++ b/src/Umbraco.Web.UI/umbraco/logout.aspx
@@ -1,21 +1,10 @@
-<%@ Page language="c#" Codebehind="logout.aspx.cs" AutoEventWireup="True" Inherits="umbraco.logout" %>
+<%@ Page language="c#" AutoEventWireup="True" Inherits="umbraco.logout" %>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" > 
 
 <html>
   <head>
-    <title>logout</title>
-    <meta name="GENERATOR" Content="Microsoft Visual Studio .NET 7.1">
-    <meta name="CODE_LANGUAGE" Content="C#">
-    <meta name=vs_defaultClientScript content="JavaScript">
-    <meta name=vs_targetSchema content="http://schemas.microsoft.com/intellisense/ie5">
+    <title>Logout</title>
   </head>
-  <body MS_POSITIONING="GridLayout">
-	
-    <form id="Form1" method="post" runat="server">
-		<script>
-			window.top.location.href='login.aspx?redir=<%=Server.UrlEncode(Request["redir"]) %>';
-		</script>
-     </form>
-	
+  <body>	
   </body>
 </html>
diff --git a/src/Umbraco.Web.UI/umbraco/umbraco.aspx b/src/Umbraco.Web.UI/umbraco/umbraco.aspx
index 0bcb810d20..409896d3e5 100644
--- a/src/Umbraco.Web.UI/umbraco/umbraco.aspx
+++ b/src/Umbraco.Web.UI/umbraco/umbraco.aspx
@@ -91,14 +91,19 @@
                 </div>
             </asp:Panel>
             <div class="topBarButtons">
+                
                 <button onclick="UmbClientMgr.appActions().launchAbout();" class="topBarButton">
                     <img src="images/aboutNew.png" alt="about" /><span><%=umbraco.ui.Text("general", "about")%></span></button>
                 <button onclick="UmbClientMgr.appActions().launchHelp('<%=UmbracoUser.Language%>', '<%=UmbracoUser.UserType.Name%>');"
                     class="topBarButton">
                     <img src="images/help.png" alt="Help" /><span><%=umbraco.ui.Text("general", "help")%></span></button>
-                <button onclick="UmbClientMgr.appActions().logout();" class="topBarButton">
-                    <img src="images/logout.png" alt="Log out" /><span><%=umbraco.ui.Text("general", "logout")%>:
-                        <%=UmbracoUser.Name%></span></button>
+                <form action="logout.aspx" method="get" style="display: inline;" >
+                    <button class="topBarButton" type="submit">
+                        <img src="images/logout.png" alt="Log out" />
+                        <span><%=umbraco.ui.Text("general", "logout")%>:<%=UmbracoUser.Name%></span>
+                    </button>
+                    <input type="hidden" value="<%=Security.UmbracoUserContextId %>" name="t" id="t"/>
+                </form>
             </div>
         </div>
     </div>
@@ -341,7 +346,7 @@
         function umbracoSessionLogout() {
 
             //alert('Session has expired on server - can\'t renew. Logging out!');
-            top.document.location.href = 'logout.aspx';
+            top.document.location.href = 'logout.aspx?t=<%=Security.UmbracoUserContextId%>';
         }
 
         function blink($target) {
diff --git a/src/Umbraco.Web.UI/umbraco_client/Application/UmbracoApplicationActions.js b/src/Umbraco.Web.UI/umbraco_client/Application/UmbracoApplicationActions.js
index 0e9b508784..4920173642 100644
--- a/src/Umbraco.Web.UI/umbraco_client/Application/UmbracoApplicationActions.js
+++ b/src/Umbraco.Web.UI/umbraco_client/Application/UmbracoApplicationActions.js
@@ -10,7 +10,7 @@ Umbraco.Application.Actions = function () {
     /// <summary>
     /// Application actions actions for the context menu, help dialogs, logout, etc...
     /// This class supports an event listener model. Currently the available events are:
-    /// "nodeDeleting","nodeDeleted","nodeRefresh","beforeLogout"
+    /// "nodeDeleting","nodeDeleted","nodeRefresh"
     /// </summary>
 
     return {
@@ -75,13 +75,17 @@ Umbraco.Application.Actions = function () {
                 alert('Not supported - please create by right clicking the parentnode and choose new...');
         },
 
-        logout: function () {
-            /// <summary>Logs the user out</summary>
+        logout: function (t) {
+            
+            if (!t) {
+                throw "The security token must be set in order to log a user out using this method";
+            }
+
             if (confirm(UmbClientMgr.uiKeys()["defaultdialogs_confirmlogout"])) {
                 //raise beforeLogout event
                 jQuery(window.top).trigger("beforeLogout", []);
 
-                document.location.href = 'logout.aspx';
+                document.location.href = 'logout.aspx?t=' + t;
             }
             return false;
         },
@@ -240,11 +244,14 @@ Umbraco.Application.Actions = function () {
             }
         },
 
-        actionQuit: function () {
-            /// <summary></summary>
+        actionQuit: function (t) {
+            
+            if (!t) {
+                throw "The security token must be set in order to log a user out using this method";
+            }
 
             if (confirm(uiKeys['defaultdialogs_confirmlogout'] + '\n\n'))
-                document.location.href = 'logout.aspx';
+                document.location.href = 'logout.aspx?t=' + t;
         },
 
         actionRePublish: function () {
diff --git a/src/Umbraco.Web/UI/Pages/UmbracoEnsuredPage.cs b/src/Umbraco.Web/UI/Pages/UmbracoEnsuredPage.cs
index be55343696..5f138bad1e 100644
--- a/src/Umbraco.Web/UI/Pages/UmbracoEnsuredPage.cs
+++ b/src/Umbraco.Web/UI/Pages/UmbracoEnsuredPage.cs
@@ -46,9 +46,9 @@ namespace Umbraco.Web.UI.Pages
 
                 // Some umbraco pages should not be loaded on timeout, but instead reload the main application in the top window. Like the treeview for instance
                 if (RedirectToUmbraco)
-                    Response.Redirect(SystemDirectories.Umbraco + "/logout.aspx?", true);
+                    Response.Redirect(SystemDirectories.Umbraco + "/logout.aspx?t=" + Security.UmbracoUserContextId, true);
                 else
-                    Response.Redirect(SystemDirectories.Umbraco + "/logout.aspx?redir=" + Server.UrlEncode(Request.RawUrl), true);
+                    Response.Redirect(SystemDirectories.Umbraco + "/logout.aspx?redir=" + Server.UrlEncode(Request.RawUrl) + "&t=" + Security.UmbracoUserContextId, true);
             }
         }
 
diff --git a/src/Umbraco.Web/umbraco.presentation/install/LegacyClasses.cs b/src/Umbraco.Web/umbraco.presentation/install/LegacyClasses.cs
index 9e04a183ea..d901951eae 100644
--- a/src/Umbraco.Web/umbraco.presentation/install/LegacyClasses.cs
+++ b/src/Umbraco.Web/umbraco.presentation/install/LegacyClasses.cs
@@ -113,7 +113,7 @@ namespace umbraco.presentation.install
 				}
 				catch (Exception)
 				{
-					Response.Redirect(SystemDirectories.Umbraco + "/logout.aspx?redir=" + Server.UrlEncode(Request.RawUrl));
+					Response.Redirect(SystemDirectories.Umbraco + "/logout.aspx?redir=" + Server.UrlEncode(Request.RawUrl) + "&t=" + umbracoUserContextID);
 				}
 
 				//set the first step to upgrade.
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/logout.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/logout.aspx.cs
index 15f8be030f..10ace87f60 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/logout.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/logout.aspx.cs
@@ -8,21 +8,32 @@ using System.Web.SessionState;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 using System.Web.UI.HtmlControls;
+using Umbraco.Web;
+using Umbraco.Core;
 
 namespace umbraco
 {
     /// <summary>
     /// Summary description for logout.
     /// </summary>
-    public partial class logout : BasePages.BasePage
+    public class logout : BasePages.BasePage
     {
-        protected void Page_Load(object sender, System.EventArgs e)
+        protected override void OnInit(EventArgs e)
         {
-            // Put user code to initialize the page here
-            if (umbracoUserContextID != "")
-                base.ClearLogin();
+            base.OnInit(e);
+
+            //We need to check the token in the URL to ensure it is correct otherwise malicious GET requests using CSRF attacks
+            // can easily just log the user out.
+            var token = Request["t"];
+            //only perform the logout if the token matches
+            if (token.IsNullOrWhiteSpace() == false && token == umbracoUserContextID)
+            {
+                ClearLogin();
+            }
+
+            //redirect home
+            Response.Redirect("Login.aspx?redir=" + Server.UrlEncode(Request["redir"]));
         }
 
-        protected System.Web.UI.HtmlControls.HtmlForm Form1;
     }
 }
diff --git a/src/umbraco.businesslogic/BasePages/BasePage.cs b/src/umbraco.businesslogic/BasePages/BasePage.cs
index c2aec995ce..1375c000fc 100644
--- a/src/umbraco.businesslogic/BasePages/BasePage.cs
+++ b/src/umbraco.businesslogic/BasePages/BasePage.cs
@@ -441,6 +441,18 @@ namespace umbraco.BasePages
             warning
         }
 
+        protected override void OnInit(EventArgs e)
+        {
+            base.OnInit(e);
+
+            //This must be set on each page to mitigate CSRF attacks which ensures that this unique token 
+            // is added to the viewstate of each request
+            if (umbracoUserContextID.IsNullOrWhiteSpace() == false)
+            {
+                ViewStateUserKey = umbracoUserContextID;
+            }
+        }
+
         /// <summary>
         /// Raises the <see cref="E:System.Web.UI.Control.Load"></see> event.
         /// </summary>
diff --git a/src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs b/src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs
index 4fa4a3fea3..e2ec0448b9 100644
--- a/src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs
+++ b/src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs
@@ -104,9 +104,9 @@ namespace umbraco.BasePages
 
                 // Some umbraco pages should not be loaded on timeout, but instead reload the main application in the top window. Like the treeview for instance
                 if (RedirectToUmbraco)
-                    Response.Redirect(SystemDirectories.Umbraco + "/logout.aspx?", true);
+                    Response.Redirect(SystemDirectories.Umbraco + "/logout.aspx?t=" + umbracoUserContextID, true);
                 else
-                    Response.Redirect(SystemDirectories.Umbraco + "/logout.aspx?redir=" + Server.UrlEncode(Request.RawUrl), true);
+                    Response.Redirect(SystemDirectories.Umbraco + "/logout.aspx?redir=" + Server.UrlEncode(Request.RawUrl) + "&t=" + umbracoUserContextID, true);
             }
         }
     }
diff --git a/src/umbraco.cms/Actions/ActionQuit.cs b/src/umbraco.cms/Actions/ActionQuit.cs
index e9213ed7b5..93da6f4e8d 100644
--- a/src/umbraco.cms/Actions/ActionQuit.cs
+++ b/src/umbraco.cms/Actions/ActionQuit.cs
@@ -7,6 +7,7 @@ namespace umbraco.BusinessLogic.Actions
 	/// <summary>
 	/// This action is invoked when a user logs out
 	/// </summary>
+	[Obsolete("This should not be used and will be removed from the codebase in future versions")]
 	public class ActionQuit : IAction
 	{
 		//create singleton

From e981776e6da574899e20ca4b77d1a0308393fbb2 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 29 Nov 2013 17:41:38 +1100
Subject: [PATCH 13/18] Created new EnsurePublishedContentRequestAttribute for
 custom routing to still be able to render macros.

---
 .../EnsurePublishedContentRequestAttribute.cs | 157 ++++++++++++++++++
 .../Routing/PublishedContentRequest.cs        |  14 ++
 .../Routing/PublishedContentRequestEngine.cs  |  35 +++-
 src/Umbraco.Web/Umbraco.Web.csproj            |   1 +
 4 files changed, 200 insertions(+), 7 deletions(-)
 create mode 100644 src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs

diff --git a/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs b/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
new file mode 100644
index 0000000000..bb7b883ba6
--- /dev/null
+++ b/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
@@ -0,0 +1,157 @@
+using System;
+using System.Globalization;
+using System.Linq;
+using System.Web.Mvc;
+using Umbraco.Core.Models;
+using Umbraco.Web.Routing;
+using Umbraco.Core;
+using Language = umbraco.cms.businesslogic.language.Language;
+
+namespace Umbraco.Web.Mvc
+{
+    /// <summary>
+    /// Used for custom routed pages that are being integrated with the Umbraco data but are not
+    /// part of the umbraco request pipeline. This allows umbraco macros to be able to execute in this scenario.
+    /// </summary>
+    /// <remarks>
+    /// This is inspired from this discussion:
+    /// http://our.umbraco.org/forum/developers/extending-umbraco/41367-Umbraco-6-MVC-Custom-MVC-Route?p=3
+    /// 
+    /// which is based on custom routing found here:
+    /// http://shazwazza.com/post/Custom-MVC-routing-in-Umbraco
+    /// </remarks>
+    public class EnsurePublishedContentRequestAttribute : ActionFilterAttribute
+    {
+        private readonly string _dataTokenName;
+        private readonly string _culture;
+        private UmbracoContext _umbracoContext;
+        private readonly int? _contentId;
+        private UmbracoHelper _helper;
+
+        /// <summary>
+        /// Constructor - can be used for testing
+        /// </summary>
+        /// <param name="umbracoContext"></param>
+        /// <param name="contentId"></param>
+        /// <param name="culture"></param>
+        public EnsurePublishedContentRequestAttribute(UmbracoContext umbracoContext, int contentId, string culture = null)
+        {
+            if (umbracoContext == null) throw new ArgumentNullException("umbracoContext");
+            _umbracoContext = umbracoContext;
+            _contentId = contentId;
+            _culture = culture;
+        }
+
+        /// <summary>
+        /// A constructor used to set an explicit content Id to the PublishedContentRequest that will be created
+        /// </summary>
+        /// <param name="contentId"></param>
+        public EnsurePublishedContentRequestAttribute(int contentId)
+        {
+            _contentId = contentId;
+        }
+
+        /// <summary>
+        /// A constructor used to set the data token key name that contains a reference to a PublishedContent instance
+        /// </summary>
+        /// <param name="dataTokenName"></param>
+        public EnsurePublishedContentRequestAttribute(string dataTokenName)
+        {
+            _dataTokenName = dataTokenName;
+        }
+
+        /// <summary>
+        /// Constructor - can be used for testing
+        /// </summary>
+        /// <param name="umbracoContext"></param>
+        /// <param name="dataTokenName"></param>
+        /// <param name="culture"></param>
+        public EnsurePublishedContentRequestAttribute(UmbracoContext umbracoContext, string dataTokenName, string culture = null)
+        {
+            if (umbracoContext == null) throw new ArgumentNullException("umbracoContext");
+            _umbracoContext = umbracoContext;
+            _dataTokenName = dataTokenName;
+            _culture = culture;
+        }
+
+        /// <summary>
+        /// Exposes the UmbracoContext
+        /// </summary>
+        protected UmbracoContext UmbracoContext
+        {
+            get { return _umbracoContext ?? (_umbracoContext = UmbracoContext.Current); }
+        }
+
+        /// <summary>
+        /// Exposes an UmbracoHelper
+        /// </summary>
+        protected UmbracoHelper Umbraco
+        {
+            get { return _helper ?? (_helper = new UmbracoHelper(UmbracoContext.Current)); }
+        }
+
+        public override void OnActionExecuted(ActionExecutedContext filterContext)
+        {
+            base.OnActionExecuted(filterContext);
+
+            //First we need to check if the pcr has been set, if it has we're going to ignore this and not actually do anything
+            if (UmbracoContext.Current.PublishedContentRequest != null)
+            {
+                return;
+            }
+
+            UmbracoContext.Current.PublishedContentRequest =
+                new PublishedContentRequest(
+                    UmbracoContext.Current.CleanedUmbracoUrl, UmbracoContext.Current.RoutingContext);
+
+            ConfigurePublishedContentRequest(UmbracoContext.Current.PublishedContentRequest, filterContext);
+        }
+
+        /// <summary>
+        /// This assigns the published content to the request, developers can override this to specify 
+        /// any other custom attributes required.
+        /// </summary>
+        /// <param name="pcr"></param>
+        /// <param name="filterContext"></param>
+        protected virtual void ConfigurePublishedContentRequest(PublishedContentRequest pcr, ActionExecutedContext filterContext)
+        {
+            if (_contentId.HasValue)
+            {
+                var content = Umbraco.TypedContent(_contentId);
+                if (content == null)
+                {
+                    throw new InvalidOperationException("Could not resolve content with id " + _contentId);
+                }
+                pcr.PublishedContent = content;
+            }
+            else if (_dataTokenName.IsNullOrWhiteSpace() == false)
+            {
+                var result = filterContext.RouteData.DataTokens[_dataTokenName];
+                if (result == null)
+                {
+                    throw new InvalidOperationException("No data token could be found with the name " + _dataTokenName);
+                }
+                if ((result is IPublishedContent) == false)
+                {
+                    throw new InvalidOperationException("The data token resolved with name " + _dataTokenName + " was not an instance of " + typeof(IPublishedContent));
+                }
+                pcr.PublishedContent = (IPublishedContent) result;
+            }
+
+            //need to set the culture for this to work
+            if (_culture.IsNullOrWhiteSpace())
+            {
+                //none specified so get the default
+                var defaultLanguage = Language.GetAllAsList().FirstOrDefault();
+                pcr.Culture = defaultLanguage == null ? CultureInfo.CurrentUICulture : new CultureInfo(defaultLanguage.CultureAlias);
+            }
+            else
+            {
+                pcr.Culture = new CultureInfo(_culture);
+            }
+            
+            pcr.ConfigureRequest();
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Routing/PublishedContentRequest.cs b/src/Umbraco.Web/Routing/PublishedContentRequest.cs
index ae65bc5fb1..424ffa1b52 100644
--- a/src/Umbraco.Web/Routing/PublishedContentRequest.cs
+++ b/src/Umbraco.Web/Routing/PublishedContentRequest.cs
@@ -59,8 +59,22 @@ namespace Umbraco.Web.Routing
 		internal void Prepare()
 		{
 			_engine.PrepareRequest();
+		    ConfigureRequest();
 		}
 
+        /// <summary>
+        /// Called after the request is prepared - after content, templates, etc... have been assigned.
+        /// </summary>
+        /// <remarks>
+        /// This method must be called for the PCR to work, it is automatically called after the PCR is prepared.
+        /// This method has been exposed in case developers need to configure the request manually if they've manually assigned
+        /// a content instance to the PCR. (i.e. in EnsurePublishedContentRequestAttribute )
+        /// </remarks>
+        public void ConfigureRequest()
+        {
+            _engine.ConfigureRequest();
+        }
+
 		/// <summary>
 		/// Updates the request when there is no template to render the content.
 		/// </summary>
diff --git a/src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs b/src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
index c4c9b9f775..45de9c2f8b 100644
--- a/src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
+++ b/src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
@@ -84,18 +84,39 @@ namespace Umbraco.Web.Routing
             // we don't take care of anything so if the content has changed, it's up to the user
             // to find out the appropriate template
 
-            // set the culture on the thread -- again, 'cos it might have changed in the event handler
-			Thread.CurrentThread.CurrentUICulture = Thread.CurrentThread.CurrentCulture = _pcr.Culture;
+            //complete the PCR and assign the remaining values
+		    ConfigureRequest();
+		}
 
-			// if request has been flagged to redirect, or has no content to display,
+        /// <summary>
+        /// Called by PrepareRequest once everything has been discovered, resolved and assigned to the PCR. This method
+        /// finalizes the PCR with the values assigned.
+        /// </summary>
+        /// <remarks>
+        /// This method logic has been put into it's own method in case developers have created a custom PCR or are assigning their own values
+        /// but need to finalize it themselves.
+        /// 
+        /// This method will throw an exception if no content has been assigned
+        /// </remarks>
+        public void ConfigureRequest()
+        {
+            if (_pcr.HasPublishedContent == false)
+            {
+                throw new InvalidOperationException("Cannot configure the request if there is not content assigned");
+            }
+
+            // set the culture on the thread -- again, 'cos it might have changed in the event handler
+            Thread.CurrentThread.CurrentUICulture = Thread.CurrentThread.CurrentCulture = _pcr.Culture;
+
+            // if request has been flagged to redirect, or has no content to display,
             // then return - whoever called us is in charge of actually redirecting
             if (_pcr.IsRedirect || !_pcr.HasPublishedContent)
-				return;
+                return;
 
             // we may be 404 _and_ have a content
 
-			// can't go beyond that point without a PublishedContent to render
-			// it's ok not to have a template, in order to give MVC a chance to hijack routes
+            // can't go beyond that point without a PublishedContent to render
+            // it's ok not to have a template, in order to give MVC a chance to hijack routes
 
             // note - the page() ctor below will cause the "page" to get the value of all its
             // "elements" ie of all the IPublishedContent property. If we use the object value,
@@ -111,7 +132,7 @@ namespace Umbraco.Web.Routing
             // used by many legacy objects
             _routingContext.UmbracoContext.HttpContext.Items["pageID"] = _pcr.PublishedContent.Id;
             _routingContext.UmbracoContext.HttpContext.Items["pageElements"] = _pcr.UmbracoPage.Elements;
-		}
+        }
 
 		/// <summary>
 		/// Updates the request when there is no template to render the content.
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 3a3c3ee136..ca1ca85347 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -296,6 +296,7 @@
     <Compile Include="Editors\MediaController.cs" />
     <Compile Include="Models\IRenderModel.cs" />
     <Compile Include="Models\RenderModelOfTContent.cs" />
+    <Compile Include="Mvc\EnsurePublishedContentRequestAttribute.cs" />
     <Compile Include="Mvc\UmbracoTemplatePageOfTContent.cs" />
     <Compile Include="Mvc\UmbracoViewPage.cs" />
     <Compile Include="Models\ContentEditing\ContentSortOrder.cs" />

From a7e32e97e3c432855e0666a2f1f279c3dbafb939 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 3 Dec 2013 15:40:12 +1100
Subject: [PATCH 14/18] Fixes xss issue

---
 src/Umbraco.Core/StringExtensions.cs          |   8 +-
 src/Umbraco.Web.UI/umbraco/Umbraco.aspx.cs    |  35 ++-
 src/Umbraco.Web.UI/umbraco/dashboard.aspx     |   2 +-
 src/Umbraco.Web.UI/umbraco/umbraco.aspx       |  10 +-
 src/Umbraco.Web/HttpRequestExtensions.cs      |  15 ++
 .../umbraco/dashboard.aspx.cs                 | 232 +++++++++---------
 .../umbraco/umbraco.aspx.cs                   |  69 +++---
 7 files changed, 212 insertions(+), 159 deletions(-)

diff --git a/src/Umbraco.Core/StringExtensions.cs b/src/Umbraco.Core/StringExtensions.cs
index eebd7ff1e8..abdae894c4 100644
--- a/src/Umbraco.Core/StringExtensions.cs
+++ b/src/Umbraco.Core/StringExtensions.cs
@@ -842,7 +842,7 @@ namespace Umbraco.Core
         /// This allows you to replace strings like &amp; , etc.. with your replacement character before the automatic
         /// reduction.
         /// </remarks>
-        [UmbracoWillObsolete("This method should be removed. Use ToUrlSegment instead.")]
+        [Obsolete("This method should be removed. Use ToUrlSegment instead.")]
         public static string ToUrlAlias(this string value, IDictionary<string, string> charReplacements, bool replaceDoubleDashes, bool stripNonAscii, bool urlEncode)
         {
             var helper = ShortStringHelper;
@@ -866,7 +866,7 @@ namespace Umbraco.Core
         ///  and <c>UmbracoSettings.RemoveDoubleDashesFromUrlReplacing</c>.</para>
         /// <para>Other helpers may use different parameters.</para>
         /// </remarks>
-        [UmbracoWillObsolete("This method should be removed. Use ToUrlSegment instead.")]
+        [Obsolete("This method should be removed. Use ToUrlSegment instead.")]
         public static string FormatUrl(this string url)
         {
             var helper = ShortStringHelper;
@@ -933,7 +933,7 @@ namespace Umbraco.Core
         /// <param name="removeSpaces">Indicates whether spaces should be removed. THIS PARAMETER IS IGNORED.</param>
         /// <returns>The safe alias.</returns>
         /// <remarks>CamelCase, and remove spaces, whatever the parameters.</remarks>
-        [UmbracoWillObsolete("This method should be removed. Use ToSafeAlias instead.")]
+        [Obsolete("This method should be removed. Use ToSafeAlias instead.")]
         public static string ToUmbracoAlias(this string phrase, StringAliasCaseType caseType = StringAliasCaseType.CamelCase, bool removeSpaces = false)
         {
             var helper = ShortStringHelper;
@@ -978,7 +978,7 @@ namespace Umbraco.Core
         /// <para>This is the legacy method, so we can't really change it, although it has issues (see unit tests).</para>
         /// <para>It does more than "converting the case", and also remove spaces, etc.</para>
         /// </remarks>
-        [UmbracoWillObsolete("This method should be removed. Use CleanString instead.")]
+        [Obsolete("This method should be removed. Use CleanString instead.")]
         public static string ConvertCase(this string phrase, StringAliasCaseType cases)
         {
             var helper = ShortStringHelper;
diff --git a/src/Umbraco.Web.UI/umbraco/Umbraco.aspx.cs b/src/Umbraco.Web.UI/umbraco/Umbraco.aspx.cs
index 02b0feee92..1d41199625 100644
--- a/src/Umbraco.Web.UI/umbraco/Umbraco.aspx.cs
+++ b/src/Umbraco.Web.UI/umbraco/Umbraco.aspx.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -6,8 +7,11 @@ using System.Text.RegularExpressions;
 using System.Web;
 using System.Web.UI;
 using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Strings;
 using umbraco;
 using Umbraco.Core;
+using umbraco.BusinessLogic;
 
 namespace Umbraco.Web.UI.Umbraco
 {
@@ -15,7 +19,36 @@ namespace Umbraco.Web.UI.Umbraco
 	{        
         public string DefaultApp { get; private set; }
 
-        protected void Page_Load(object sender, System.EventArgs e)
+        protected string InitApp
+        {
+            get
+            {
+                var app = Request.GetCleanedItem("app");
+                //validate the app
+                if (global::umbraco.BusinessLogic.Application.getAll().Any(x => x.alias.InvariantEquals(app)) == false)
+                {
+                    LogHelper.Warn<Umbraco>("A requested app: " + Request.GetItemAsString("app") + " was not found");
+                    return string.Empty;
+                }
+                return app;
+            }
+        }
+
+        protected string RightAction
+        {
+            get
+            {
+                //manually clean the string, we need to allow / and other url chars but ensure to strip any other potential xss chars.
+                return Request.GetItemAsString("rightAction").StripHtml().ExceptChars(new HashSet<char>("(){}[];:<>\\'\"".ToCharArray()));
+            }
+        }
+
+        protected string RightActionId
+        {
+            get { return Request.GetCleanedItem("id").ReplaceNonAlphanumericChars('-'); }
+        }
+
+        protected void Page_Load(object sender, EventArgs e)
         {
             var apps = UmbracoUser.Applications.ToList();
             bool userHasAccesstodefaultApp = apps.Any(x => x.alias == Constants.Applications.Content);
diff --git a/src/Umbraco.Web.UI/umbraco/dashboard.aspx b/src/Umbraco.Web.UI/umbraco/dashboard.aspx
index 91a4de4c0d..f931e86efc 100644
--- a/src/Umbraco.Web.UI/umbraco/dashboard.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dashboard.aspx
@@ -1,4 +1,4 @@
-<%@ Page language="c#" MasterPageFile="masterpages/umbracoPage.Master" Title="dashboard" Codebehind="dashboard.aspx.cs" AutoEventWireup="True" Inherits="umbraco.cms.presentation.dashboard" trace="false" validateRequest="false"%>
+<%@ Page language="c#" MasterPageFile="masterpages/umbracoPage.Master" Title="dashboard" AutoEventWireup="True" Inherits="umbraco.cms.presentation.dashboard" trace="false" validateRequest="false"%>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 
 <asp:Content ContentPlaceHolderID="body" ID="ContentBody" runat="server">
diff --git a/src/Umbraco.Web.UI/umbraco/umbraco.aspx b/src/Umbraco.Web.UI/umbraco/umbraco.aspx
index 2df8d2a6d3..7229b80853 100644
--- a/src/Umbraco.Web.UI/umbraco/umbraco.aspx
+++ b/src/Umbraco.Web.UI/umbraco/umbraco.aspx
@@ -159,13 +159,13 @@
     <script type="text/javascript">
 
         //used for deeplinking to specific content whilst still showing the tree
-        var initApp = '<%=umbraco.presentation.UmbracoContext.Current.Request.QueryString["app"]%>';
-        var rightAction = '<%=umbraco.presentation.UmbracoContext.Current.Request.QueryString["rightAction"]%>';
-        var rightActionId = '<%=umbraco.presentation.UmbracoContext.Current.Request.QueryString["id"]%>';
+        var initApp = '<%=InitApp%>';
+        var rightAction = '<%=RightAction%>';
+        var rightActionId = '<%=RightActionId%>';
         var base = '<%=string.Format("{0}/", Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco))%>';
-        var url = ''
+        var url = '';
         if (rightActionId && rightActionId != '') {
-            url = base + rightAction + ".aspx?id=" + rightActionId
+            url = base + rightAction + ".aspx?id=" + rightActionId;
         } else {
             url = base + rightAction;
         }
diff --git a/src/Umbraco.Web/HttpRequestExtensions.cs b/src/Umbraco.Web/HttpRequestExtensions.cs
index 238ac06523..b9ab1c6993 100644
--- a/src/Umbraco.Web/HttpRequestExtensions.cs
+++ b/src/Umbraco.Web/HttpRequestExtensions.cs
@@ -11,6 +11,21 @@ namespace Umbraco.Web
 	/// </summary>
 	public static class HttpRequestExtensions
 	{
+        /// <summary>
+        /// Extracts the value from the query string and cleans it to prevent xss attacks.
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="key"></param>
+        /// <returns></returns>        
+        public static string GetCleanedItem(this HttpRequest request, string key)
+        {
+            var item = request.GetItemAsString(key);
+            //remove any html
+            item = item.StripHtml();
+            //strip out any potential chars involved with XSS
+            return item.ExceptChars(new HashSet<char>("(){}[];:%<>/\\|&'\"".ToCharArray()));
+        }
+
 		/// <summary>
 		/// Safely get a request item as string, if the item does not exist, an empty string is returned.
 		/// </summary>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs
index 52da532b8d..f9b34e665a 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs
@@ -12,6 +12,7 @@ using System.Web.UI.HtmlControls;
 using System.IO;
 using System.Xml;
 using System.Xml.XPath;
+using Umbraco.Web;
 using umbraco.uicontrols;
 using Umbraco.Core.IO;
 using umbraco.cms.helpers;
@@ -28,15 +29,15 @@ namespace umbraco.cms.presentation
 
         private string _section = "";
 
-        protected void Page_Load(object sender, System.EventArgs e)
+        protected void Page_Load(object sender, EventArgs e)
         {
             // Put user code to initialize the page here
-            Panel2.Text = ui.Text("dashboard", "welcome", base.getUser()) + " " + this.getUser().Name;
+            Panel2.Text = ui.Text("dashboard", "welcome", UmbracoUser) + " " + UmbracoUser.Name;
         }
 
-        private Control CreateDashBoardWrapperControl(Control control)
+        private static Control CreateDashBoardWrapperControl(Control control)
         {
-            PlaceHolder placeHolder = new PlaceHolder();
+            var placeHolder = new PlaceHolder();
             placeHolder.Controls.Add(new LiteralControl("<br/><fieldSet style=\"padding: 5px\">"));
             placeHolder.Controls.Add(control);
             placeHolder.Controls.Add(new LiteralControl("</fieldSet>"));
@@ -48,78 +49,89 @@ namespace umbraco.cms.presentation
 
             base.OnInit(e);
             // Load dashboard content
-            if (helper.Request("app") != "")
-                _section = helper.Request("app");
-            else if (getUser().Applications.Length > 0)
+            if (Request.GetItemAsString("app") != "")
+            {
+                _section = Request.GetItemAsString("app");
+            }
+            else if (UmbracoUser.Applications.Length > 0)
+            {
                 _section = "default";
+            }
             else
-                _section = getUser().Applications[0].alias;
+            {
+                _section = UmbracoUser.Applications[0].alias;
+            }
 
-            XmlDocument dashBoardXml = new XmlDocument();
+            var dashBoardXml = new XmlDocument();
             dashBoardXml.Load(IOHelper.MapPath(SystemFiles.DashboardConfig));
 
             // test for new tab interface
-            foreach (XmlNode section in dashBoardXml.DocumentElement.SelectNodes("//section [areas/area = '" + _section.ToLower() + "']"))
+            if (dashBoardXml.DocumentElement == null) return;
+            var nodeList = dashBoardXml.DocumentElement.SelectNodes("//section [areas/area = '" + _section.ToLower() + "']");
+            if (nodeList == null) return;
+
+            foreach (XmlNode section in nodeList)
             {
-                if (section != null && validateAccess(section))
+                if (section != null && ValidateAccess(section))
                 {
                     Panel2.Visible = false;
                     dashboardTabs.Visible = true;
 
-                    foreach (XmlNode entry in section.SelectNodes("./tab"))
+                    var xmlNodeList = section.SelectNodes("./tab");
+                    if (xmlNodeList != null)
                     {
-                        if (validateAccess(entry))
+                        foreach (XmlNode entry in xmlNodeList)
                         {
-                            TabPage tab = dashboardTabs.NewTabPage(entry.Attributes.GetNamedItem("caption").Value);
+                            if (ValidateAccess(entry) == false) continue;
+                            if (entry.Attributes == null) continue;
+                            var tab = dashboardTabs.NewTabPage(entry.Attributes.GetNamedItem("caption").Value);
                             tab.HasMenu = true;
                             tab.Style.Add("padding", "0 10px");
 
-                            foreach (XmlNode uc in entry.SelectNodes("./control"))
+                            var selectNodes = entry.SelectNodes("./control");
+                            if (selectNodes == null) continue;
+
+                            foreach (XmlNode uc in selectNodes)
                             {
-                                if (validateAccess(uc))
+                                if (ValidateAccess(uc) == false) continue;
+
+                                var control = GetFirstText(uc).Trim(' ', '\r', '\n');
+                                var path = IOHelper.FindFile(control);
+
+                                try
                                 {
-                                    string control = getFirstText(uc).Trim(' ', '\r', '\n');
-                                    string path = IOHelper.FindFile(control);
+                                    var c = LoadControl(path);
 
-
-                                    try
+                                    // set properties
+                                    var type = c.GetType();
+                                    if (uc.Attributes != null)
                                     {
-                                        Control c = LoadControl(path);
-
-                                        // set properties
-                                        Type type = c.GetType();
-                                        if (type != null)
+                                        foreach (XmlAttribute att in uc.Attributes)
                                         {
-                                            foreach (XmlAttribute att in uc.Attributes)
+                                            var attributeName = att.Name;
+                                            var attributeValue = ParseControlValues(att.Value).ToString();
+                                            // parse special type of values
+
+                                            var prop = type.GetProperty(attributeName);
+                                            if (prop == null)
                                             {
-                                                string attributeName = att.Name;
-                                                string attributeValue = parseControlValues(att.Value).ToString();
-                                                // parse special type of values
-
-
-                                                PropertyInfo prop = type.GetProperty(attributeName);
-                                                if (prop == null)
-                                                {
-                                                    continue;
-                                                }
-
-                                                prop.SetValue(c, Convert.ChangeType(attributeValue, prop.PropertyType),
-                                                              null);
-
+                                                continue;
                                             }
-                                        }
 
-                                        //resolving files from dashboard config which probably does not map to a virtual fi
-                                        tab.Controls.Add(AddPanel(uc, c));
-                                    }
-                                    catch (Exception ee)
-                                    {
-                                        tab.Controls.Add(
-                                            new LiteralControl(
-                                                "<p class=\"umbracoErrorMessage\">Could not load control: '" + path +
-                                                "'. <br/><span class=\"guiDialogTiny\"><strong>Error message:</strong> " +
-                                                ee.ToString() + "</span></p>"));
+                                            prop.SetValue(c, Convert.ChangeType(attributeValue, prop.PropertyType), null);
+
+                                        }
                                     }
+                                    //resolving files from dashboard config which probably does not map to a virtual fi
+                                    tab.Controls.Add(AddPanel(uc, c));
+                                }
+                                catch (Exception ee)
+                                {
+                                    tab.Controls.Add(
+                                        new LiteralControl(
+                                            "<p class=\"umbracoErrorMessage\">Could not load control: '" + path +
+                                            "'. <br/><span class=\"guiDialogTiny\"><strong>Error message:</strong> " +
+                                            ee + "</span></p>"));
                                 }
                             }
                         }
@@ -127,44 +139,45 @@ namespace umbraco.cms.presentation
                 }
                 else
                 {
-
-
-                    foreach (
-                        XmlNode entry in dashBoardXml.SelectNodes("//entry [@section='" + _section.ToLower() + "']"))
+                    var xmlNodeList = dashBoardXml.SelectNodes("//entry [@section='" + _section.ToLower() + "']");
+                    if (xmlNodeList != null)
                     {
-                        PlaceHolder placeHolder = new PlaceHolder();
-                        if (entry == null || entry.FirstChild == null)
+                        foreach (XmlNode entry in xmlNodeList)
                         {
-                            placeHolder.Controls.Add(
-                                CreateDashBoardWrapperControl(new LiteralControl("Error loading DashBoard Content")));
-                        }
-                        else
-                        {
-                            string path = IOHelper.FindFile(entry.FirstChild.Value);
+                            var placeHolder = new PlaceHolder();
+                            if (entry == null || entry.FirstChild == null)
+                            {
+                                placeHolder.Controls.Add(
+                                    CreateDashBoardWrapperControl(new LiteralControl("Error loading DashBoard Content")));
+                            }
+                            else
+                            {
+                                var path = IOHelper.FindFile(entry.FirstChild.Value);
 
-                            try
-                            {
-                                placeHolder.Controls.Add(CreateDashBoardWrapperControl(LoadControl(path)));
-                            }
-                            catch (Exception err)
-                            {
-                                Trace.Warn("Dashboard", string.Format("error loading control '{0}'",
-                                                                      path), err);
-                                placeHolder.Controls.Clear();
-                                placeHolder.Controls.Add(CreateDashBoardWrapperControl(new LiteralControl(string.Format(
-                                    "Error loading DashBoard Content '{0}'; {1}", path,
-                                    err.Message))));
+                                try
+                                {
+                                    placeHolder.Controls.Add(CreateDashBoardWrapperControl(LoadControl(path)));
+                                }
+                                catch (Exception err)
+                                {
+                                    Trace.Warn("Dashboard", string.Format("error loading control '{0}'",
+                                                                          path), err);
+                                    placeHolder.Controls.Clear();
+                                    placeHolder.Controls.Add(CreateDashBoardWrapperControl(new LiteralControl(string.Format(
+                                        "Error loading DashBoard Content '{0}'; {1}", path,
+                                        err.Message))));
+                                }
                             }
+                            dashBoardContent.Controls.Add(placeHolder);
                         }
-                        dashBoardContent.Controls.Add(placeHolder);
                     }
                 }
             }
         }
 
-        private object parseControlValues(string value)
+        private static object ParseControlValues(string value)
         {
-            if (!String.IsNullOrEmpty(value))
+            if (string.IsNullOrEmpty(value) == false)
             {
                 if (value.StartsWith("[#"))
                 {
@@ -190,18 +203,18 @@ namespace umbraco.cms.presentation
             return value;
         }
 
-        private Control AddPanel(XmlNode node, Control c)
+        private static Control AddPanel(XmlNode node, Control c)
         {
-            LiteralControl hide = AddShowOnceLink(node);
+            var hide = AddShowOnceLink(node);
             if (node.Attributes.GetNamedItem("addPanel") != null &&
                 node.Attributes.GetNamedItem("addPanel").Value == "true")
             {
-                Pane p = new Pane();
-                PropertyPanel pp = new PropertyPanel();
+                var p = new Pane();
+                var pp = new PropertyPanel();
                 if (node.Attributes.GetNamedItem("panelCaption") != null &&
-                    !String.IsNullOrEmpty(node.Attributes.GetNamedItem("panelCaption").Value))
+                    string.IsNullOrEmpty(node.Attributes.GetNamedItem("panelCaption").Value) == false)
                 {
-                    string panelCaption = node.Attributes.GetNamedItem("panelCaption").Value;
+                    var panelCaption = node.Attributes.GetNamedItem("panelCaption").Value;
                     if (panelCaption.StartsWith("#"))
                     {
                         panelCaption = ui.Text(panelCaption.Substring(1));
@@ -209,7 +222,7 @@ namespace umbraco.cms.presentation
                     pp.Text = panelCaption;
                 }
                 // check for hide in the future link
-                if (!String.IsNullOrEmpty(hide.Text))
+                if (string.IsNullOrEmpty(hide.Text) == false)
                 {
                     pp.Controls.Add(hide);
                 }
@@ -218,47 +231,46 @@ namespace umbraco.cms.presentation
                 return p;
             }
 
-            if (!String.IsNullOrEmpty(hide.Text))
+            if (string.IsNullOrEmpty(hide.Text) == false)
             {
-                PlaceHolder ph = new PlaceHolder();
+                var ph = new PlaceHolder();
                 ph.Controls.Add(hide);
                 ph.Controls.Add(c);
                 return ph;
             }
-            else
-            {
-                return c;
-            }
+            return c;
         }
 
-        private LiteralControl AddShowOnceLink(XmlNode node)
+        private static LiteralControl AddShowOnceLink(XmlNode node)
         {
-            LiteralControl onceLink = new LiteralControl();
+            var onceLink = new LiteralControl();
             if (node.Attributes.GetNamedItem("showOnce") != null &&
                 node.Attributes.GetNamedItem("showOnce").Value.ToLower() == "true")
             {
-                onceLink.Text = "<a class=\"dashboardHideLink\" onclick=\"if(confirm('Are you sure you want remove this dashboard item?')){jQuery.cookie('" + generateCookieKey(node) + "','true'); jQuery(this).closest('.propertypane').fadeOut();return false;}\">" + ui.Text("dashboard", "dontShowAgain") + "</a>";
+                onceLink.Text = "<a class=\"dashboardHideLink\" onclick=\"if(confirm('Are you sure you want remove this dashboard item?')){jQuery.cookie('" + GenerateCookieKey(node) + "','true'); jQuery(this).closest('.propertypane').fadeOut();return false;}\">" + ui.Text("dashboard", "dontShowAgain") + "</a>";
             }
             return onceLink;
         }
 
-        private string getFirstText(XmlNode node)
+        private static string GetFirstText(XmlNode node)
         {
             foreach (XmlNode n in node.ChildNodes)
             {
                 if (n.NodeType == XmlNodeType.Text)
+                {
                     return n.Value;
+                }
             }
 
             return "";
         }
 
-        private string generateCookieKey(XmlNode node)
+        private static string GenerateCookieKey(XmlNode node)
         {
-            string key = String.Empty;
+            var key = String.Empty;
             if (node.Name.ToLower() == "control")
             {
-                key = node.FirstChild.Value + "_" + generateCookieKey(node.ParentNode);
+                key = node.FirstChild.Value + "_" + GenerateCookieKey(node.ParentNode);
             }
             else if (node.Name.ToLower() == "tab")
             {
@@ -268,11 +280,11 @@ namespace umbraco.cms.presentation
             return Casing.SafeAlias(key.ToLower());
         }
 
-        private bool validateAccess(XmlNode node)
+        private static bool ValidateAccess(XmlNode node)
         {
             // check if this area should be shown at all
-            string onlyOnceValue = StateHelper.GetCookieValue(generateCookieKey(node));
-            if (!String.IsNullOrEmpty(onlyOnceValue))
+            var onlyOnceValue = StateHelper.GetCookieValue(GenerateCookieKey(node));
+            if (string.IsNullOrEmpty(onlyOnceValue) == false)
             {
                 return false;
             }
@@ -282,13 +294,13 @@ namespace umbraco.cms.presentation
             {
                 return true;
             }
-            else if (node != null)
+            if (node != null)
             {
-                XmlNode accessRules = node.SelectSingleNode("access");
-                bool retVal = true;
+                var accessRules = node.SelectSingleNode("access");
+                var retVal = true;
                 if (accessRules != null && accessRules.HasChildNodes)
                 {
-                    string currentUserType = CurrentUser.UserType.Alias.ToLowerInvariant();
+                    var currentUserType = CurrentUser.UserType.Alias.ToLowerInvariant();
                     
                     //Update access rules so we'll be comparing lower case to lower case always
 
@@ -304,14 +316,14 @@ namespace umbraco.cms.presentation
                         grant.InnerText = grant.InnerText.ToLowerInvariant();
                     }
 
-                    string allowedSections = ",";
-                    foreach (BusinessLogic.Application app in CurrentUser.Applications)
+                    var allowedSections = ",";
+                    foreach (Application app in CurrentUser.Applications)
                     {
                         allowedSections += app.alias.ToLower() + ",";
                     }
-                    XmlNodeList grantedTypes = accessRules.SelectNodes("grant");
-                    XmlNodeList grantedBySectionTypes = accessRules.SelectNodes("grantBySection");
-                    XmlNodeList deniedTypes = accessRules.SelectNodes("deny");
+                    var grantedTypes = accessRules.SelectNodes("grant");
+                    var grantedBySectionTypes = accessRules.SelectNodes("grantBySection");
+                    var deniedTypes = accessRules.SelectNodes("deny");
 
                     // if there's a grant type, everyone who's not granted is automatically denied
                     if (grantedTypes.Count > 0 || grantedBySectionTypes.Count > 0)
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/umbraco.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/umbraco.aspx.cs
index 978837416d..4188787acf 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/umbraco.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/umbraco.aspx.cs
@@ -1,23 +1,15 @@
 using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
+using System.Globalization;
 using System.IO;
 using System.Web;
-using System.Web.SessionState;
 using System.Web.UI;
 using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
 using umbraco.BasePages;
-using System.Xml;
-using System.Xml.XPath;
-using umbraco.BusinessLogic.Actions;
-using ClientDependency.Core;
 using Umbraco.Core.IO;
+using Umbraco.Core;
+using Umbraco.Web;
 using System.Linq;
 using System.Text;
-using ClientDependency.Core.Controls;
 using System.Text.RegularExpressions;
 
 namespace umbraco.cms.presentation
@@ -25,48 +17,49 @@ namespace umbraco.cms.presentation
     /// <summary>
     /// The back office rendering page
     /// </summary>
+    [Obsolete("This class is no longer used and will be removed from the codebase in future versions")]
     public class _umbraco : UmbracoEnsuredPage
     {
         [Obsolete("This property is no longer used")]
         protected umbWindow UmbWindow1;
-        protected System.Web.UI.WebControls.PlaceHolder bubbleText;
+        protected PlaceHolder bubbleText;
 
         public string DefaultApp { get; private set; }
 
-        protected void Page_Load(object sender, System.EventArgs e)
+        protected void Page_Load(object sender, EventArgs e)
         {
-            var apps = this.getUser().Applications.ToList();
-            bool userHasAccesstodefaultApp = apps.Where(x => x.alias == Umbraco.Core.Constants.Applications.Content).Count() > 0;
+            var apps = UmbracoUser.Applications.ToList();
+            var userHasAccesstodefaultApp = apps.Any(x => x.alias == Umbraco.Core.Constants.Applications.Content);
 
             // Load user module icons ..
             if (apps.Count() > 1)
             {
 
-                var JSEvents = new StringBuilder();
+                var jsEvents = new StringBuilder();
 
-                PlaceHolderAppIcons.Text = ui.Text("main", "sections", base.getUser());
+                PlaceHolderAppIcons.Text = ui.Text("main", "sections", UmbracoUser);
                 plcIcons.Text = "";
-                foreach (BusinessLogic.Application a in apps.OrderBy(x => x.sortOrder))
+                foreach (var a in apps.OrderBy(x => x.sortOrder))
                 {
 
-                    string appClass = a.icon.StartsWith(".") ? a.icon.Substring(1, a.icon.Length - 1) : a.alias;
+                    var appClass = a.icon.StartsWith(".") ? a.icon.Substring(1, a.icon.Length - 1) : a.alias;
 
                     //adds client side event handlers to the icon buttons
-                    JSEvents.Append(@"jQuery('." + appClass + "').click(function() { appClick.call(this, '" + a.alias + "'); } );");
-                    JSEvents.Append(@"jQuery('." + appClass + "').dblclick(function() { appDblClick.call(this, '" + a.alias + "'); } );");
+                    jsEvents.Append(@"jQuery('." + appClass + "').click(function() { appClick.call(this, '" + a.alias + "'); } );");
+                    jsEvents.Append(@"jQuery('." + appClass + "').dblclick(function() { appDblClick.call(this, '" + a.alias + "'); } );");
 
-                    string iconElement = String.Format("<li><a class=\"{0}\" title=\"" + ui.Text("sections", a.alias, base.getUser()) + "\" href=\"javascript:void(0);\">", appClass);
+                    var iconElement = String.Format("<li><a class=\"{0}\" title=\"" + ui.Text("sections", a.alias, UmbracoUser) + "\" href=\"javascript:void(0);\">", appClass);
                     if (a.icon.StartsWith("."))
                         iconElement +=
                             "<img src=\"images/nada.gif\" class=\"trayHolder\" alt=\"\" /></a></li>";
                     else
-                        iconElement += "<img src=\"images/tray/" + a.icon + "\" class=\"trayIcon\" alt=\"" + ui.Text("sections", a.alias, base.getUser()) + "\"></a></li>";
+                        iconElement += "<img src=\"images/tray/" + a.icon + "\" class=\"trayIcon\" alt=\"" + ui.Text("sections", a.alias, UmbracoUser) + "\"></a></li>";
                     plcIcons.Text += iconElement;
 
                 }
 
                 //registers the jquery event handlers.
-                Page.ClientScript.RegisterStartupScript(this.GetType(), "AppIcons", "jQuery(document).ready(function() { " + JSEvents.ToString() + " } );", true);
+                Page.ClientScript.RegisterStartupScript(GetType(), "AppIcons", "jQuery(document).ready(function() { " + jsEvents + " } );", true);
 
             }
             else
@@ -75,7 +68,7 @@ namespace umbraco.cms.presentation
 
             //if user does not have access to content (ie, he's probably a translator)...
             //then change the default tree app
-            if (!userHasAccesstodefaultApp)
+            if (userHasAccesstodefaultApp == false)
             {
                 JTree.App = apps[0].alias;
                 DefaultApp = apps[0].alias;
@@ -87,21 +80,21 @@ namespace umbraco.cms.presentation
 
 
             // Load globalized labels
-            treeWindow.Text = ui.Text("main", "tree", base.getUser());
+            treeWindow.Text = ui.Text("main", "tree", UmbracoUser);
 
-            RenderActionJS();
+            RenderActionJs();
 
             // Version check goes here!
 
             // zb-00004 #29956 : refactor cookies names & handling
-            var updChkCookie = new umbraco.BusinessLogic.StateHelper.Cookies.Cookie("UMB_UPDCHK", GlobalSettings.VersionCheckPeriod); // was "updateCheck"
-            string updateCheckCookie = updChkCookie.HasValue ? updChkCookie.GetValue() : "";
+            var updChkCookie = new BusinessLogic.StateHelper.Cookies.Cookie("UMB_UPDCHK", GlobalSettings.VersionCheckPeriod); // was "updateCheck"
+            var updateCheckCookie = updChkCookie.HasValue ? updChkCookie.GetValue() : "";
 
-            if (GlobalSettings.VersionCheckPeriod > 0 && String.IsNullOrEmpty(updateCheckCookie) && base.getUser().UserType.Alias == "admin")
+            if (GlobalSettings.VersionCheckPeriod > 0 && String.IsNullOrEmpty(updateCheckCookie) && UmbracoUser.UserType.Alias == "admin")
             {
 
                 // Add scriptmanager version check
-                ScriptManager sm = ScriptManager.GetCurrent(Page);
+                var sm = ScriptManager.GetCurrent(Page);
                 sm.Scripts.Add(new ScriptReference(SystemDirectories.Umbraco + "/js/umbracoUpgradeChecker.js"));
                 sm.Services.Add(new ServiceReference(SystemDirectories.WebServices + "/CheckForUpgrade.asmx"));
 
@@ -118,7 +111,7 @@ namespace umbraco.cms.presentation
         {
             if (Request.Browser.Browser == "IE" && Request.Browser.MajorVersion == 9)
             {
-                StringBuilder metadata = new StringBuilder();
+                var metadata = new StringBuilder();
                 metadata.AppendFormat(
     @"<link rel='icon' href='{0}' type='image/x-icon'>
                 <link rel='shortcut icon' href='{0}' type='image/x-icon'> 
@@ -129,7 +122,7 @@ namespace umbraco.cms.presentation
     IOHelper.ResolveUrl(SystemDirectories.Umbraco + "/images/pinnedIcons/umb.ico"),
     HttpContext.Current.Request.Url.Host.ToLower().Replace("www.", ""));
 
-                var user = base.getUser();
+                var user = UmbracoUser;
                 if (user != null && user.Applications != null && user.Applications.Length > 0)
                 {
                     foreach (var app in user.Applications)
@@ -154,10 +147,10 @@ namespace umbraco.cms.presentation
         /// <summary>
         /// Renders out all JavaScript references that have bee declared in IActions
         /// </summary>
-        private void RenderActionJS()
+        private void RenderActionJs()
         {
             var item = 0;
-            foreach (var jsFile in umbraco.BusinessLogic.Actions.Action.GetJavaScriptFileReferences())
+            foreach (var jsFile in BusinessLogic.Actions.Action.GetJavaScriptFileReferences())
             {
                 //validate that this is a url, if it is not, we'll assume that it is a text block and render it as a text
                 //block instead.
@@ -185,7 +178,7 @@ namespace umbraco.cms.presentation
                     if (isValid)
                     {
                         //add to page
-                        Page.ClientScript.RegisterClientScriptInclude(this.GetType(), item.ToString(), jsFile);
+                        Page.ClientScript.RegisterClientScriptInclude(GetType(), item.ToString(), jsFile);
                     }
                 }
                 catch (UriFormatException)
@@ -193,11 +186,11 @@ namespace umbraco.cms.presentation
                     isValid = false;
                 }
 
-                if (!isValid)
+                if (isValid == false)
                 {
                     //it is invalid, let's render it as a script block instead as devs may have written real Javascript instead
                     //of a JS path
-                    Page.ClientScript.RegisterClientScriptBlock(this.GetType(), item.ToString(), jsFile, true);
+                    Page.ClientScript.RegisterClientScriptBlock(GetType(), item.ToString(CultureInfo.InvariantCulture), jsFile, true);
                 }
 
                 item++;

From 037e7e079759b0d23b492137cdc37479d4754d0d Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 3 Dec 2013 15:56:50 +1100
Subject: [PATCH 15/18] Fixes remaining xslt injection U4-3175

---
 .../umbraco/dashboard.aspx.cs                 | 58 +++++++++++++------
 1 file changed, 40 insertions(+), 18 deletions(-)

diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs
index f9b34e665a..f5784c16f1 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs
@@ -3,6 +3,7 @@ using System.Collections;
 using System.ComponentModel;
 using System.Data;
 using System.Drawing;
+using System.Linq;
 using System.Reflection;
 using System.Web;
 using System.Web.SessionState;
@@ -12,6 +13,8 @@ using System.Web.UI.HtmlControls;
 using System.IO;
 using System.Xml;
 using System.Xml.XPath;
+using Umbraco.Core;
+using Umbraco.Core.Logging;
 using Umbraco.Web;
 using umbraco.uicontrols;
 using Umbraco.Core.IO;
@@ -25,9 +28,41 @@ namespace umbraco.cms.presentation
     /// </summary>
     public partial class dashboard : BasePages.UmbracoEnsuredPage
     {
+        private string _section;
 
-
-        private string _section = "";
+        protected string Section
+        {
+            get
+            {
+                if (_section == null)
+                {
+                    var qry = Request.GetCleanedItem("app");
+                    // Load dashboard content
+                    if (qry.IsNullOrWhiteSpace() == false)
+                    {
+                        //validate the app
+                        if (BusinessLogic.Application.getAll().Any(x => x.alias.InvariantEquals(qry)) == false)
+                        {
+                            LogHelper.Warn<dashboard>("A requested app: " + Request.GetItemAsString("app") + " was not found");
+                            _section = "default";
+                        }
+                        else
+                        {
+                            _section = qry;
+                        }
+                    }
+                    else if (UmbracoUser.Applications.Length > 0)
+                    {
+                        _section = "default";
+                    }
+                    else
+                    {
+                        _section = UmbracoUser.Applications[0].alias;
+                    }
+                }
+                return _section;
+            }
+        }
 
         protected void Page_Load(object sender, EventArgs e)
         {
@@ -48,26 +83,13 @@ namespace umbraco.cms.presentation
         {
 
             base.OnInit(e);
-            // Load dashboard content
-            if (Request.GetItemAsString("app") != "")
-            {
-                _section = Request.GetItemAsString("app");
-            }
-            else if (UmbracoUser.Applications.Length > 0)
-            {
-                _section = "default";
-            }
-            else
-            {
-                _section = UmbracoUser.Applications[0].alias;
-            }
-
+           
             var dashBoardXml = new XmlDocument();
             dashBoardXml.Load(IOHelper.MapPath(SystemFiles.DashboardConfig));
 
             // test for new tab interface
             if (dashBoardXml.DocumentElement == null) return;
-            var nodeList = dashBoardXml.DocumentElement.SelectNodes("//section [areas/area = '" + _section.ToLower() + "']");
+            var nodeList = dashBoardXml.DocumentElement.SelectNodes("//section [areas/area = '" + Section.ToLower() + "']");
             if (nodeList == null) return;
 
             foreach (XmlNode section in nodeList)
@@ -139,7 +161,7 @@ namespace umbraco.cms.presentation
                 }
                 else
                 {
-                    var xmlNodeList = dashBoardXml.SelectNodes("//entry [@section='" + _section.ToLower() + "']");
+                    var xmlNodeList = dashBoardXml.SelectNodes("//entry [@section='" + Section.ToLower() + "']");
                     if (xmlNodeList != null)
                     {
                         foreach (XmlNode entry in xmlNodeList)

From 601eb0bf38c9251e7c87bc22af657bc4039c57c8 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 3 Dec 2013 16:28:51 +1100
Subject: [PATCH 16/18] Fixes a few other potential xss entry points and cleans
 up some legacy webforms files

---
 .../developer/Xslt/xsltChooseExtension.aspx   |  27 ++-
 .../developer/Xslt/xsltInsertValueOf.aspx     |   5 +-
 .../umbraco/dialogs/AssignDomain.aspx         |   5 +-
 .../umbraco/dialogs/create.aspx               |  13 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |  26 +--
 .../umbraco/dialogs/AssignDomain.aspx         |  48 -----
 .../umbraco/dialogs/AssignDomain.aspx.cs      | 180 ++++++++++++++----
 .../dialogs/AssignDomain.aspx.designer.cs     | 123 ------------
 .../umbraco/dialogs/create.aspx               |  66 -------
 .../umbraco/dialogs/create.aspx.cs            | 151 +++++++++++----
 .../umbraco/dialogs/create.aspx.designer.cs   |  79 --------
 11 files changed, 293 insertions(+), 430 deletions(-)
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx.designer.cs
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.designer.cs

diff --git a/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltChooseExtension.aspx b/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltChooseExtension.aspx
index a127ead2d5..2540c5290a 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltChooseExtension.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltChooseExtension.aspx
@@ -1,23 +1,22 @@
 <%@ Page Language="c#" Codebehind="xsltChooseExtension.aspx.cs" MasterPageFile="../../masterpages/umbracoDialog.Master"  AutoEventWireup="True"
   Inherits="umbraco.developer.xsltChooseExtension" %>
-  <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Import Namespace="Umbraco.Web" %>  <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
   
 <asp:Content ContentPlaceHolderID="head" runat="server">
     <script type="text/javascript">
-      function returnResult() {
-        result = document.getElementById('<%= assemblies.ClientID %>').value + ":" + document.getElementById('selectedMethod').value + "(";
-        for (var i = 0; i < document.forms[0].length - 1; i++) {
-          if (document.forms[0][i].name.indexOf('param') > -1)
-            result = result + "'" + document.forms[0][i].value + "', "
+        function returnResult() {
+            var result = document.getElementById('<%= assemblies.ClientID %>').value + ":" + document.getElementById('selectedMethod').value + "(";
+            for (var i = 0; i < document.forms[0].length - 1; i++) {
+                if (document.forms[0][i].name.indexOf('param') > -1)
+                    result = result + "'" + document.forms[0][i].value + "', ";
+            }
+            if (result.substring(result.length - 1, result.length) == " ")
+                result = result.substring(0, result.length - 2);
+            result = result + ")";
+            
+            document.location = 'xsltInsertValueOf.aspx?objectId=<%=Request.GetCleanedItem("objectId")%>&value=' + result;
         }
-        if (result.substring(result.length - 1, result.length) == " ")
-          result = result.substring(0, result.length - 2);
-        result = result + ")"
-
-
-        document.location = 'xsltInsertValueOf.aspx?objectId=<%=umbraco.helper.Request("objectId")%>&value=' + result;
-      }
-</script>
+    </script>
 
 <style type="text/css">
 div.code{padding: 7px 0px 7px 0px;  font-family: Consolas,courier;}
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltInsertValueOf.aspx b/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltInsertValueOf.aspx
index f5188b41ac..4a206a04b2 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltInsertValueOf.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltInsertValueOf.aspx
@@ -1,4 +1,5 @@
 <%@ Page Language="c#" MasterPageFile="../../masterpages/umbracoDialog.Master" Codebehind="xsltInsertValueOf.aspx.cs" AutoEventWireup="True"  Inherits="umbraco.developer.xsltInsertValueOf" %>
+<%@ Import Namespace="Umbraco.Web" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
 
@@ -13,13 +14,13 @@
     result = '<xsl:value-of select="' + document.getElementById('<%= valueOf.ClientID %>').value + '"' + checked + '/>';
 
     UmbClientMgr.contentFrame().focus();
-    UmbClientMgr.contentFrame().UmbEditor.Insert(result, '', '<%=umbraco.helper.Request("objectId")%>');
+    UmbClientMgr.contentFrame().UmbEditor.Insert(result, '', '<%=Request.GetCleanedItem("objectId")%>');
 
     UmbClientMgr.closeModalWindow();
   }
 
   function getExtensionMethod() {
-    document.location = 'xsltChooseExtension.aspx?objectId=<%=umbraco.helper.Request("objectId")%>';
+    document.location = 'xsltChooseExtension.aspx?objectId=<%=Request.GetCleanedItem("objectId")%>';
   }
 
   function recieveExtensionMethod(theValue) {
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/AssignDomain.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/AssignDomain.aspx
index a2ecac4be2..8bee1cd9b4 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/AssignDomain.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/AssignDomain.aspx
@@ -1,9 +1,9 @@
-<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" Codebehind="AssignDomain.aspx.cs" AutoEventWireup="True" Inherits="umbraco.dialogs.AssignDomain" %>
+<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="True" Inherits="umbraco.dialogs.AssignDomain" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
 <script type="text/javascript">
-	function doSubmit() {document.Form1["ok"].click()}
+    function doSubmit() { document.Form1["ok"].click(); }
 	var functionsFrame = this;
 	var tabFrame = this;
 	var isDialog = true;
@@ -14,7 +14,6 @@
 </asp:Content>
 
 <asp:Content ContentPlaceHolderID="body" runat="server">
-    <input type="hidden" name="domainId" value="<%=umbraco.helper.Request("editDomain")%>" />
     
     <cc1:Feedback ID="FeedBackMessage" runat="server" />
     
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/create.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/create.aspx
index 92e1b86ed3..17b231f923 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/create.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/create.aspx
@@ -1,6 +1,7 @@
-<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" CodeBehind="create.aspx.cs"
+<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" 
     AutoEventWireup="True" Inherits="umbraco.dialogs.create" %>
 
+<%@ Import Namespace="Umbraco.Web" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register Src="../controls/Tree/TreeControl.ascx" TagName="TreeControl" TagPrefix="umbraco" %>
 <asp:Content ContentPlaceHolderID="head" runat="server">
@@ -20,10 +21,10 @@
 			document.getElementById("ok").disabled = false;
 			// Get node name by xmlrequest
 			if (id > 0) {
-			    umbraco.presentation.webservices.CMSNode.GetNodeName('<%=umbraco.BasePages.BasePage.umbracoUserContextID%>', id, updateName);
+			    umbraco.presentation.webservices.CMSNode.GetNodeName('<%=umbracoUserContextID%>', id, updateName);
 				}
 			else			
-				pageName.html("<p><strong><%=umbraco.ui.Text(umbraco.helper.Request("app"))%></strong> <%= umbraco.ui.Text("moveOrCopy","nodeSelected") %></p>");
+				pageName.html("<p><strong><%=umbraco.ui.Text(App)%></strong> <%= umbraco.ui.Text("moveOrCopy","nodeSelected") %></p>");
 				pageNameHolder.attr("class","success");
 		}
 		
@@ -33,17 +34,17 @@
 		}
 		
 		function onNodeSelectionConfirmed() {
-		    document.location.href = 'create.aspx?nodeType=<%=umbraco.helper.Request("nodeType")%>&app=<%=umbraco.helper.Request("app")%>&nodeId=' + document.getElementById('nodeId').value
+		    document.location.href = 'create.aspx?nodeType=<%=Request.GetCleanedItem("nodeType")%>&app=<%=App%>&nodeId=' + document.getElementById('nodeId').value
 		}
 	
     </script>
 
 </asp:Content>
 <asp:Content ContentPlaceHolderID="body" runat="server">
-    <input type="hidden" id="nodeId" name="nodeId" value="<%=umbraco.helper.Request("nodeId")%>" />
+    <input type="hidden" id="nodeId" name="nodeId" value="<%=Request.GetCleanedItem("nodeId")%>" />
     <input type="hidden" id="path" name="path" value="" runat="server" />
     <cc1:Pane ID="pane_chooseNode" runat="server" Style="overflow: auto; height: 250px;">
-        <umbraco:TreeControl runat="server" ID="JTree" App='<%#umbraco.helper.Request("app") %>'
+        <umbraco:TreeControl runat="server" ID="JTree" App='<%#App %>'
             IsDialog="true" DialogMode="id" ShowContextMenu="false" FunctionToCall="dialogHandler"
             Height="230"></umbraco:TreeControl>
     </cc1:Pane>
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index ca1ca85347..6592cfd264 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -399,6 +399,12 @@
     <Compile Include="umbraco.presentation\umbraco\developer\Packages\directoryBrowser.aspx.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\create.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\AssignDomain.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
     <Compile Include="umbraco.presentation\umbraco\dialogs\AssignDomain2.aspx.cs">
       <DependentUpon>AssignDomain2.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -1261,20 +1267,6 @@
     <Compile Include="umbraco.presentation\umbraco\dialogs\about.aspx.designer.cs">
       <DependentUpon>about.aspx</DependentUpon>
     </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\AssignDomain.aspx.cs">
-      <DependentUpon>AssignDomain.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\AssignDomain.aspx.designer.cs">
-      <DependentUpon>AssignDomain.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\create.aspx.cs">
-      <DependentUpon>create.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\create.aspx.designer.cs">
-      <DependentUpon>create.aspx</DependentUpon>
-    </Compile>
     <Compile Include="umbraco.presentation\umbraco\dialogs\cruds.aspx.cs">
       <DependentUpon>cruds.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -1881,12 +1873,6 @@
     <Content Include="umbraco.presentation\umbraco\dialogs\about.aspx">
       <SubType>ASPXCodeBehind</SubType>
     </Content>
-    <Content Include="umbraco.presentation\umbraco\dialogs\AssignDomain.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="umbraco.presentation\umbraco\dialogs\create.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
     <Content Include="umbraco.presentation\umbraco\dialogs\cruds.aspx" />
     <Content Include="umbraco.presentation\umbraco\dialogs\emptyTrashcan.aspx" />
     <Content Include="umbraco.presentation\umbraco\dialogs\exportDocumenttype.aspx" />
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx
deleted file mode 100644
index a2ecac4be2..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx
+++ /dev/null
@@ -1,48 +0,0 @@
-<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" Codebehind="AssignDomain.aspx.cs" AutoEventWireup="True" Inherits="umbraco.dialogs.AssignDomain" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
-
-<asp:Content ContentPlaceHolderID="head" runat="server">
-<script type="text/javascript">
-	function doSubmit() {document.Form1["ok"].click()}
-	var functionsFrame = this;
-	var tabFrame = this;
-	var isDialog = true;
-	var submitOnEnter = true;
-	</script>
-
-
-</asp:Content>
-
-<asp:Content ContentPlaceHolderID="body" runat="server">
-    <input type="hidden" name="domainId" value="<%=umbraco.helper.Request("editDomain")%>" />
-    
-    <cc1:Feedback ID="FeedBackMessage" runat="server" />
-    
-    <cc1:Pane runat="server" ID="pane_addnew">
-      <cc1:PropertyPanel runat="server" ID="prop_domain" Text="Domain">
-         <asp:TextBox ID="DomainName" runat="server" Width="252px"></asp:TextBox>
-         <asp:RequiredFieldValidator ControlToValidate="DomainName" ErrorMessage="*" ID="DomainValidator" runat="server" Display="Dynamic" />
-         <asp:RegularExpressionValidator ControlToValidate="DomainName" ErrorMessage="*" ID="DomainValidator2" runat="server" Display="Dynamic" /> 
-         <br /><small><%= umbraco.ui.Text("assignDomain", "domainHelp") %></small>
-      </cc1:PropertyPanel>
-      
-      <cc1:PropertyPanel ID="prop_lang" runat="server" Text="language">
-        <asp:DropDownList ID="Languages" runat="server" />
-        <asp:RequiredFieldValidator ControlToValidate="Languages" ErrorMessage="*" ID="LanguageValidator" runat="server" Display="Dynamic" />
-      </cc1:PropertyPanel>
-      
-      <cc1:PropertyPanel runat="server" Text=" ">
-        <asp:Button ID="ok" runat="server" OnClick="SaveDomain"></asp:Button> 
-      </cc1:PropertyPanel>
-    </cc1:Pane>
-    
-    <cc1:Pane ID="pane_edit" runat="server">
-      <cc1:PropertyPanel runat="server">
-                <asp:Literal ID="allDomains" runat="server" />
-      </cc1:PropertyPanel> 
-    </cc1:Pane>
-    
-    <p>
-      <a href="#" onclick="UmbClientMgr.closeModalWindow()"><%= umbraco.ui.Text("defaultdialogs", "closeThisWindow")%></a>
-    </p>
-</asp:Content>
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx.cs
index 27d0742baa..0507a6e321 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx.cs
@@ -1,5 +1,7 @@
-using System;
+using System;
+using System.Globalization;
 using System.Web.UI.WebControls;
+using Umbraco.Web;
 using umbraco.BasePages;
 using umbraco.BusinessLogic;
 using umbraco.cms.businesslogic.language;
@@ -22,23 +24,22 @@ namespace umbraco.dialogs
 
         protected void Page_Load(object sender, EventArgs e)
         {
-            _currentId = int.Parse(helper.Request("id"));
-            prop_domain.Text = ui.Text("assignDomain", "domain", this.getUser());
-            prop_lang.Text = ui.Text("general", "language", this.getUser());
-            pane_addnew.Text = ui.Text("assignDomain", "addNew", this.getUser());
-            pane_edit.Text = ui.Text("assignDomain", "orEdit", this.getUser());
-            
-            // Put user code to initialize the page here
-            if (helper.Request("editDomain").Trim() != "")
+            _currentId = Request.GetItemAs<int>("id");
+            prop_domain.Text = ui.Text("assignDomain", "domain", UmbracoUser);
+            prop_lang.Text = ui.Text("general", "language", UmbracoUser);
+            pane_addnew.Text = ui.Text("assignDomain", "addNew", UmbracoUser);
+            pane_edit.Text = ui.Text("assignDomain", "orEdit", UmbracoUser);
+
+            if (Request.GetItemAsString("editDomain").Trim() != "")
             {
-                _editDomain = int.Parse(helper.Request("editDomain"));
+                _editDomain = Request.GetItemAs<int>("editDomain");
             }
 
-            if (helper.Request("delDomain").Trim() != "")
+            if (Request.GetItemAsString("delDomain").Trim() != "")
             {
-                var d = new Domain(int.Parse(helper.Request("delDomain")));
+                var d = new Domain(Request.GetItemAs<int>("delDomain"));
                 FeedBackMessage.type = uicontrols.Feedback.feedbacktype.success;
-                FeedBackMessage.Text = ui.Text("assignDomain", "domainDeleted", d.Name, getUser());
+                FeedBackMessage.Text = ui.Text("assignDomain", "domainDeleted", d.Name, UmbracoUser);
                 d.Delete();
                 UpdateDomainList();
             }
@@ -46,8 +47,8 @@ namespace umbraco.dialogs
             if (!IsPostBack)
             {
                 // Add caption to button
-                ok.Text = ui.Text("assignDomain", "addNew", getUser());
-              
+                ok.Text = ui.Text("assignDomain", "addNew", UmbracoUser);
+
                 var selectedLanguage = -1;
 
                 // Maybe add editing info - not the best way this is made ;-)
@@ -55,24 +56,24 @@ namespace umbraco.dialogs
                 {
                     var d = new Domain(_editDomain);
                     selectedLanguage = d.Language.id;
-					DomainName.Text = d.Name.StartsWith("*") ? "*" : d.Name;
-                    ok.Text = ui.Text("general", "update", getUser());
+                    DomainName.Text = d.Name.StartsWith("*") ? "*" : d.Name;
+                    ok.Text = ui.Text("general", "update", UmbracoUser);
                 }
 
                 // Add caption to language validator
-                LanguageValidator.ErrorMessage = ui.Text("defaultdialogs", "requiredField", base.getUser()) + "<br/>";
-                DomainValidator.ErrorMessage = ui.Text("defaultdialogs", "requiredField", base.getUser());
+                LanguageValidator.ErrorMessage = ui.Text("defaultdialogs", "requiredField", UmbracoUser) + "<br/>";
+                DomainValidator.ErrorMessage = ui.Text("defaultdialogs", "requiredField", UmbracoUser);
 
-				DomainValidator2.ErrorMessage = ui.Text("assignDomain", "invalidDomain", base.getUser());
-				//DomainValidator2.ValidationExpression = @"^(?i:http[s]?://)?([-\w]+(\.[-\w]+)*)(:\d+)?(/[-\w]*)?$";
-				DomainValidator2.ValidationExpression = @"^(\*|((?i:http[s]?://)?([-\w]+(\.[-\w]+)*)(:\d+)?(/[-\w]*)?))$";
+                DomainValidator2.ErrorMessage = ui.Text("assignDomain", "invalidDomain", UmbracoUser);
+                //DomainValidator2.ValidationExpression = @"^(?i:http[s]?://)?([-\w]+(\.[-\w]+)*)(:\d+)?(/[-\w]*)?$";
+                DomainValidator2.ValidationExpression = @"^(\*|((?i:http[s]?://)?([-\w]+(\.[-\w]+)*)(:\d+)?(/[-\w]*)?))$";
 
-                Languages.Items.Add(new ListItem(ui.Text("general", "choose", base.getUser()), ""));
-                foreach (var l in Language.getAll)
+                Languages.Items.Add(new ListItem(ui.Text("general", "choose", UmbracoUser), ""));
+                foreach (var l in Language.GetAllAsList())
                 {
                     var li = new ListItem();
                     li.Text = l.FriendlyName;
-                    li.Value = l.id.ToString();
+                    li.Value = l.id.ToString(CultureInfo.InvariantCulture);
                     if (selectedLanguage == l.id)
                         li.Selected = true;
                     Languages.Items.Add(li);
@@ -84,7 +85,7 @@ namespace umbraco.dialogs
 
         private void UpdateDomainList()
         {
-            
+
             var domainList = Domain.GetDomainsById(_currentId);
 
             if (domainList.Length > 0)
@@ -95,9 +96,9 @@ namespace umbraco.dialogs
                 {
                     var name = d.Name.StartsWith("*") ? "*" : d.Name;
                     allDomains.Text += "<tr><td>" + name + "</td><td>(" + d.Language.CultureAlias + ")</td><td><a href=\"?id=" + _currentId + "&editDomain=" +
-                                       d.Id.ToString() + "\">" + ui.Text("edit") + "</a></td><td><a href=\"?id=" + _currentId +
-                                       "&delDomain=" + d.Id.ToString() + "\" onClick=\"return confirm('" +
-                                       ui.Text("defaultdialogs", "confirmdelete", base.getUser()) +
+                                       d.Id.ToString(CultureInfo.InvariantCulture) + "\">" + ui.Text("edit") + "</a></td><td><a href=\"?id=" + _currentId +
+                                       "&delDomain=" + d.Id.ToString(CultureInfo.InvariantCulture) + "\" onClick=\"return confirm('" +
+                                       ui.Text("defaultdialogs", "confirmdelete", UmbracoUser) +
                                        "');\" style=\"color: red\">" + ui.Text("delete") + "</a></td></tr>";
                 }
 
@@ -107,7 +108,7 @@ namespace umbraco.dialogs
             else
             {
                 pane_edit.Visible = false;
-            }            
+            }
         }
 
         protected void SaveDomain(object sender, EventArgs e)
@@ -120,7 +121,7 @@ namespace umbraco.dialogs
                     d.Language = new Language(int.Parse(Languages.SelectedValue));
                     d.Name = DomainName.Text.ToLower();
                     FeedBackMessage.type = uicontrols.Feedback.feedbacktype.success;
-                    FeedBackMessage.Text = ui.Text("assignDomain", "domainUpdated", DomainName.Text, getUser());
+                    FeedBackMessage.Text = ui.Text("assignDomain", "domainUpdated", DomainName.Text, UmbracoUser);
                     d.Save();
 
                     DomainName.Text = "";
@@ -132,14 +133,14 @@ namespace umbraco.dialogs
                 }
                 else
                 {
-					// have to handle wildcard
+                    // have to handle wildcard
                     var domainName = DomainName.Text.Trim();
-					domainName = domainName == "*" ? ("*" + _currentId.ToString()) : domainName;
+                    domainName = domainName == "*" ? ("*" + _currentId.ToString(CultureInfo.InvariantCulture)) : domainName;
 
                     if (!Domain.Exists(domainName.ToLower()))
                     {
                         Domain.MakeNew(domainName, _currentId, int.Parse(Languages.SelectedValue));
-                        FeedBackMessage.Text = ui.Text("assignDomain", "domainCreated", domainName, getUser());
+                        FeedBackMessage.Text = ui.Text("assignDomain", "domainCreated", domainName, UmbracoUser);
                         FeedBackMessage.type = uicontrols.Feedback.feedbacktype.success;
 
                         DomainName.Text = "";
@@ -151,12 +152,119 @@ namespace umbraco.dialogs
                     }
                     else
                     {
-                        FeedBackMessage.Text = ui.Text("assignDomain", "domainExists", DomainName.Text.Trim(), getUser());
+                        FeedBackMessage.Text = ui.Text("assignDomain", "domainExists", DomainName.Text.Trim(), UmbracoUser);
                         FeedBackMessage.type = uicontrols.Feedback.feedbacktype.error;
                     }
-                }   
+                }
             }
         }
 
+        /// <summary>
+        /// FeedBackMessage control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::umbraco.uicontrols.Feedback FeedBackMessage;
+
+        /// <summary>
+        /// pane_addnew control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::umbraco.uicontrols.Pane pane_addnew;
+
+        /// <summary>
+        /// prop_domain control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::umbraco.uicontrols.PropertyPanel prop_domain;
+
+        /// <summary>
+        /// DomainName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox DomainName;
+
+        /// <summary>
+        /// DomainValidator control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.RequiredFieldValidator DomainValidator;
+
+        /// <summary>
+        /// DomainValidator2 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.RegularExpressionValidator DomainValidator2;
+
+        /// <summary>
+        /// prop_lang control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::umbraco.uicontrols.PropertyPanel prop_lang;
+
+        /// <summary>
+        /// Languages control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.DropDownList Languages;
+
+        /// <summary>
+        /// LanguageValidator control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.RequiredFieldValidator LanguageValidator;
+
+        /// <summary>
+        /// ok control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button ok;
+
+        /// <summary>
+        /// pane_edit control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::umbraco.uicontrols.Pane pane_edit;
+
+        /// <summary>
+        /// allDomains control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Literal allDomains;
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx.designer.cs
deleted file mode 100644
index 07464f0501..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx.designer.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated. 
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace umbraco.dialogs {
-    
-    
-    public partial class AssignDomain {
-        
-        /// <summary>
-        /// FeedBackMessage control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.Feedback FeedBackMessage;
-        
-        /// <summary>
-        /// pane_addnew control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.Pane pane_addnew;
-        
-        /// <summary>
-        /// prop_domain control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.PropertyPanel prop_domain;
-        
-        /// <summary>
-        /// DomainName control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox DomainName;
-        
-        /// <summary>
-        /// DomainValidator control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.RequiredFieldValidator DomainValidator;
-        
-        /// <summary>
-        /// DomainValidator2 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.RegularExpressionValidator DomainValidator2;
-        
-        /// <summary>
-        /// prop_lang control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.PropertyPanel prop_lang;
-        
-        /// <summary>
-        /// Languages control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.DropDownList Languages;
-        
-        /// <summary>
-        /// LanguageValidator control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.RequiredFieldValidator LanguageValidator;
-        
-        /// <summary>
-        /// ok control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Button ok;
-        
-        /// <summary>
-        /// pane_edit control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.Pane pane_edit;
-        
-        /// <summary>
-        /// allDomains control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Literal allDomains;
-    }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx
deleted file mode 100644
index 92e1b86ed3..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx
+++ /dev/null
@@ -1,66 +0,0 @@
-<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" CodeBehind="create.aspx.cs"
-    AutoEventWireup="True" Inherits="umbraco.dialogs.create" %>
-
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
-<%@ Register Src="../controls/Tree/TreeControl.ascx" TagName="TreeControl" TagPrefix="umbraco" %>
-<asp:Content ContentPlaceHolderID="head" runat="server">
-
-    <script language="javascript" type="text/javascript">
-        
-        var pageNameHolder = null;
-        var pageName = null;
-        
-        jQuery(document).ready(function() {
-            pageNameHolder = jQuery("#<%=PageNameHolder.ClientID%>");
-		    pageName = pageNameHolder.find("p");    
-        });
-        
-		function dialogHandler(id) {
-			document.getElementById("nodeId").value = id;
-			document.getElementById("ok").disabled = false;
-			// Get node name by xmlrequest
-			if (id > 0) {
-			    umbraco.presentation.webservices.CMSNode.GetNodeName('<%=umbraco.BasePages.BasePage.umbracoUserContextID%>', id, updateName);
-				}
-			else			
-				pageName.html("<p><strong><%=umbraco.ui.Text(umbraco.helper.Request("app"))%></strong> <%= umbraco.ui.Text("moveOrCopy","nodeSelected") %></p>");
-				pageNameHolder.attr("class","success");
-		}
-		
-		function updateName(result) {			  
-		    pageName.html("<p><strong>" + result + "</strong> <%= umbraco.ui.Text("moveOrCopy","nodeSelected") %></p>");
-			pageNameHolder.attr("class","success");
-		}
-		
-		function onNodeSelectionConfirmed() {
-		    document.location.href = 'create.aspx?nodeType=<%=umbraco.helper.Request("nodeType")%>&app=<%=umbraco.helper.Request("app")%>&nodeId=' + document.getElementById('nodeId').value
-		}
-	
-    </script>
-
-</asp:Content>
-<asp:Content ContentPlaceHolderID="body" runat="server">
-    <input type="hidden" id="nodeId" name="nodeId" value="<%=umbraco.helper.Request("nodeId")%>" />
-    <input type="hidden" id="path" name="path" value="" runat="server" />
-    <cc1:Pane ID="pane_chooseNode" runat="server" Style="overflow: auto; height: 250px;">
-        <umbraco:TreeControl runat="server" ID="JTree" App='<%#umbraco.helper.Request("app") %>'
-            IsDialog="true" DialogMode="id" ShowContextMenu="false" FunctionToCall="dialogHandler"
-            Height="230"></umbraco:TreeControl>
-    </cc1:Pane>
-    <asp:Panel runat="server" ID="panel_buttons">
-        <cc1:Feedback runat="server" ID="PageNameHolder" type="notice" Style="margin-top: 10px;"
-            Text='<%#umbraco.ui.Text("moveOrCopy","noNodeSelected")%>' />
-        <div style="padding-top: 10px;" class="guiDialogNormal">
-            <input type="button" id="ok" value="<%=umbraco.ui.Text("ok")%>" onclick="onNodeSelectionConfirmed();"
-                disabled="true" style="width: 100px" />
-            &nbsp; <em>
-                <%= umbraco.ui.Text("or") %></em>&nbsp; <a href="#" style="color: blue" onclick="UmbClientMgr.closeModalWindow()">
-                    <%=umbraco.ui.Text("cancel")%></a>
-        </div>
-    </asp:Panel>
-    <cc1:Pane ID="pane_chooseName" Visible="false" runat="server">
-        <cc1:PropertyPanel runat="server">
-            <asp:PlaceHolder ID="phCreate" runat="server"></asp:PlaceHolder>
-        </cc1:PropertyPanel>
-    </cc1:Pane>
-</asp:Content>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.cs
index 7bc9354816..761c9cbe2c 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.cs
@@ -1,8 +1,10 @@
-using System;
+using System;
 using System.Collections;
 using System.ComponentModel;
 using System.Data;
 using System.Drawing;
+using System.Globalization;
+using System.Linq;
 using System.Web;
 using System.Web.SessionState;
 using System.Web.UI;
@@ -10,7 +12,10 @@ using System.Web.UI.WebControls;
 using System.Web.UI.HtmlControls;
 using System.Xml;
 using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
+using Umbraco.Web;
 using umbraco.cms.businesslogic;
+using umbraco.cms.presentation;
 using umbraco.presentation;
 using umbraco.BusinessLogic.Actions;
 using umbraco.BasePages;
@@ -19,31 +24,47 @@ using Umbraco.Core;
 
 namespace umbraco.dialogs
 {
-	/// <summary>
-	/// Summary description for create.
-	/// </summary>
-	public partial class create : BasePages.UmbracoEnsuredPage
-	{
-		protected System.Web.UI.WebControls.Button ok;
+    /// <summary>
+    /// Summary description for create.
+    /// </summary>
+    public partial class create : UmbracoEnsuredPage
+    {
+        protected Button ok;
 
-		protected void Page_Load(object sender, System.EventArgs e)
-		{
-			// Put user code to initialize the page here
-			if (helper.Request("nodeId") == "") 
-			{
-			
-				string appType = ui.Text("sections", helper.Request("app")).ToLower();
-                pane_chooseNode.Text = ui.Text("create", "chooseNode", appType, this.getUser()) + "?";
+        private string _app;
+        protected string App
+        {
+            get
+            {
+                if (_app == null)
+                {
+                    _app = Request.GetCleanedItem("app");
+                    //validate the app
+                    if (BusinessLogic.Application.getAll().Any(x => x.alias.InvariantEquals(_app)) == false)
+                    {
+                        throw new InvalidOperationException("A requested app: " + Request.GetItemAsString("app") + " was not found");
+                    }
+                }
+                return _app;
+            }
+        }
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            // Put user code to initialize the page here
+            if (Request.GetItemAsString("nodeId") == "")
+            {
+                var appType = ui.Text("sections", App).ToLower();
+                pane_chooseNode.Text = ui.Text("create", "chooseNode", appType, UmbracoUser) + "?";
 
                 DataBind();
-			} 
-			else 
-			{
-                int nodeId = int.Parse(helper.Request("nodeId"));
+            }
+            else
+            {
+                int nodeId = Request.GetItemAs<int>("nodeId");
                 //ensure they have access to create under this node!!
-                if (helper.Request("app") == Constants.Applications.Media || CheckCreatePermissions(nodeId))
+                if (App.InvariantEquals(Constants.Applications.Media) || CheckCreatePermissions(nodeId))
                 {
-                    //pane_chooseName.Text = ui.Text("create", "updateData", this.getUser());
                     var c = new CMSNode(nodeId);
                     path.Value = c.Path;
                     pane_chooseNode.Visible = false;
@@ -55,31 +76,95 @@ namespace umbraco.dialogs
                     defReader.Close();
 
                     // Find definition for current nodeType
-                    XmlNode def = createDef.SelectSingleNode("//nodeType [@alias = '" + Request.QueryString["app"] + "']");
+                    XmlNode def = createDef.SelectSingleNode("//nodeType [@alias = '" + App + "']");
                     phCreate.Controls.Add(new UserControl().LoadControl(IOHelper.ResolveUrl(SystemDirectories.Umbraco) + def.SelectSingleNode("./usercontrol").FirstChild.Value));
                 }
                 else
-                {                    
-                    PageNameHolder.type = umbraco.uicontrols.Feedback.feedbacktype.error;
+                {
+                    PageNameHolder.type = uicontrols.Feedback.feedbacktype.error;
                     PageNameHolder.Text = ui.GetText("rights") + " " + ui.GetText("error");
                     JTree.DataBind();
                 }
-			}
-                        
-		}
+            }
 
-        protected override void OnPreRender(EventArgs e) {
+        }
+
+        protected override void OnPreRender(EventArgs e)
+        {
             base.OnPreRender(e);
 
-            ScriptManager.GetCurrent(Page).Services.Add(new ServiceReference( IOHelper.ResolveUrl( SystemDirectories.WebServices) +"/cmsnode.asmx"));
-            ScriptManager.GetCurrent(Page).Services.Add(new ServiceReference( IOHelper.ResolveUrl( SystemDirectories.WebServices) +"/legacyAjaxCalls.asmx"));
+            ScriptManager.GetCurrent(Page).Services.Add(new ServiceReference(IOHelper.ResolveUrl(SystemDirectories.WebServices) + "/cmsnode.asmx"));
+            ScriptManager.GetCurrent(Page).Services.Add(new ServiceReference(IOHelper.ResolveUrl(SystemDirectories.WebServices) + "/legacyAjaxCalls.asmx"));
         }
 
         private bool CheckCreatePermissions(int nodeId)
         {
-            return UmbracoEnsuredPage.CurrentUser.GetPermissions(new CMSNode(nodeId).Path)
-                .Contains(ActionNew.Instance.Letter.ToString());
+            return CurrentUser.GetPermissions(new CMSNode(nodeId).Path)
+                .Contains(ActionNew.Instance.Letter.ToString(CultureInfo.InvariantCulture));
         }
 
-	}
+
+        /// <summary>
+        /// path control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputHidden path;
+
+        /// <summary>
+        /// pane_chooseNode control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::umbraco.uicontrols.Pane pane_chooseNode;
+
+        /// <summary>
+        /// JTree control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::umbraco.controls.Tree.TreeControl JTree;
+
+        /// <summary>
+        /// panel_buttons control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Panel panel_buttons;
+
+        /// <summary>
+        /// PageNameHolder control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::umbraco.uicontrols.Feedback PageNameHolder;
+
+        /// <summary>
+        /// pane_chooseName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::umbraco.uicontrols.Pane pane_chooseName;
+
+        /// <summary>
+        /// phCreate control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.PlaceHolder phCreate;
+    }
 }
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.designer.cs
deleted file mode 100644
index 980534866e..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.designer.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4200
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace umbraco.dialogs {
-    
-    
-    public partial class create {
-        
-        /// <summary>
-        /// path control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlInputHidden path;
-        
-        /// <summary>
-        /// pane_chooseNode control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.Pane pane_chooseNode;
-        
-        /// <summary>
-        /// JTree control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.controls.Tree.TreeControl JTree;
-        
-        /// <summary>
-        /// panel_buttons control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Panel panel_buttons;
-        
-        /// <summary>
-        /// PageNameHolder control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.Feedback PageNameHolder;
-        
-        /// <summary>
-        /// pane_chooseName control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.Pane pane_chooseName;
-        
-        /// <summary>
-        /// phCreate control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.PlaceHolder phCreate;
-    }
-}

From 6b7a495d19de5801c34a46bb0bc7aa6b9018d9c3 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 3 Dec 2013 16:38:58 +1100
Subject: [PATCH 17/18] Fixes a few other potential xss entry points and cleans
 up some legacy webforms files

---
 .../umbraco/dialogs/emptyTrashcan.aspx        | 13 +--
 src/Umbraco.Web/Umbraco.Web.csproj            | 11 +--
 .../umbraco/dialogs/emptyTrashcan.aspx        | 82 -------------------
 .../umbraco/dialogs/emptyTrashcan.aspx.cs     | 37 ++++++++-
 .../dialogs/emptyTrashcan.aspx.designer.cs    | 34 --------
 5 files changed, 45 insertions(+), 132 deletions(-)
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/emptyTrashcan.aspx
 delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/emptyTrashcan.aspx.designer.cs

diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/emptyTrashcan.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/emptyTrashcan.aspx
index 8570f00910..a6bcd4084b 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/emptyTrashcan.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/emptyTrashcan.aspx
@@ -1,11 +1,12 @@
-<%@ Page Language="C#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="true" CodeBehind="emptyTrashcan.aspx.cs" Inherits="umbraco.presentation.dialogs.emptyTrashcan" %>
+<%@ Page Language="C#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="true" Inherits="umbraco.presentation.dialogs.emptyTrashcan" %>
+<%@ Import Namespace="System.Globalization" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
 		<script type="text/javascript">
 		
-		    var recycleBinType = '<%=umbraco.helper.Request("type")%>';
-		    var emptyTotal = '<%= umbraco.cms.businesslogic.RecycleBin.Count((umbraco.cms.businesslogic.RecycleBin.RecycleBinType) Enum.Parse(typeof(umbraco.cms.businesslogic.RecycleBin.RecycleBinType), umbraco.helper.Request("type"), true)).ToString()%>';
+		    var recycleBinType = '<%=BinType.ToString()%>';
+		    var emptyTotal = '<%= umbraco.cms.businesslogic.RecycleBin.Count(BinType).ToString(CultureInfo.InvariantCulture)%>';
 		    
 		    function emptyRecycleBin() {
     			jQuery('#formDiv').hide();
@@ -60,19 +61,19 @@
 		
 		<cc1:ProgressBar ID="progbar" runat="server" Title="Please wait..." />
 		<br />
-		<span class="guiDialogTiny" id="statusLabel"><%=umbraco.ui.Text("deleting", this.getUser())%></span>
+		<span class="guiDialogTiny" id="statusLabel"><%=umbraco.ui.Text("deleting", UmbracoUser)%></span>
 		</div>
 	  	  	  
 	  <div id="formDiv">
 	    <p><%= umbraco.ui.Text("defaultdialogs", "recycleBinWarning")%></p>
-		   <input type="checkbox" id="confirmDelete" onclick="$get('ok').disabled = !this.checked;" /> <label for="confirmDelete"><%=umbraco.ui.Text("defaultdialogs", "confirmEmptyTrashcan", umbraco.cms.businesslogic.RecycleBin.Count((umbraco.cms.businesslogic.RecycleBin.RecycleBinType)Enum.Parse(typeof(umbraco.cms.businesslogic.RecycleBin.RecycleBinType), umbraco.helper.Request("type"), true)).ToString(), this.getUser())%></label>
+		   <input type="checkbox" id="confirmDelete" onclick="$get('ok').disabled = !this.checked;" /> <label for="confirmDelete"><%=umbraco.ui.Text("defaultdialogs", "confirmEmptyTrashcan", umbraco.cms.businesslogic.RecycleBin.Count(BinType).ToString(CultureInfo.InvariantCulture), UmbracoUser)%></label>
 		</div>
 	  </cc1:PropertyPanel>
 	  </cc1:Pane>
 	  
 		<br />
 		<div id="buttons">
-		<input type="button" ID="ok" value="<%=umbraco.ui.Text("actions", "emptyTrashcan", this.getUser()) %>" class="guiInputButton" onclick="if ($get('confirmDelete').checked) {emptyRecycleBin();}" disabled="true" />  
+		<input type="button" ID="ok" value="<%=umbraco.ui.Text("actions", "emptyTrashcan", UmbracoUser) %>" class="guiInputButton" onclick="if ($get('confirmDelete').checked) {emptyRecycleBin();}" disabled="true" />  
 		<em><%= umbraco.ui.Text("or") %></em> 
     <a href="#" onclick="UmbClientMgr.closeModalWindow();">
       <%=umbraco.ui.Text("cancel")%>
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 6592cfd264..c9a8e14740 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -399,6 +399,9 @@
     <Compile Include="umbraco.presentation\umbraco\developer\Packages\directoryBrowser.aspx.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
+    <Compile Include="umbraco.presentation\umbraco\dialogs\emptyTrashcan.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
     <Compile Include="umbraco.presentation\umbraco\dialogs\create.aspx.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
@@ -1274,13 +1277,6 @@
     <Compile Include="umbraco.presentation\umbraco\dialogs\cruds.aspx.designer.cs">
       <DependentUpon>cruds.aspx</DependentUpon>
     </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\emptyTrashcan.aspx.cs">
-      <DependentUpon>emptyTrashcan.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\emptyTrashcan.aspx.designer.cs">
-      <DependentUpon>emptyTrashcan.aspx</DependentUpon>
-    </Compile>
     <Compile Include="umbraco.presentation\umbraco\dialogs\exportDocumenttype.aspx.cs">
       <DependentUpon>exportDocumenttype.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -1874,7 +1870,6 @@
       <SubType>ASPXCodeBehind</SubType>
     </Content>
     <Content Include="umbraco.presentation\umbraco\dialogs\cruds.aspx" />
-    <Content Include="umbraco.presentation\umbraco\dialogs\emptyTrashcan.aspx" />
     <Content Include="umbraco.presentation\umbraco\dialogs\exportDocumenttype.aspx" />
     <Content Include="umbraco.presentation\umbraco\dialogs\imageViewer.aspx" />
     <Content Include="umbraco.presentation\umbraco\dialogs\importDocumenttype.aspx" />
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/emptyTrashcan.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/emptyTrashcan.aspx
deleted file mode 100644
index 8570f00910..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/emptyTrashcan.aspx
+++ /dev/null
@@ -1,82 +0,0 @@
-<%@ Page Language="C#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="true" CodeBehind="emptyTrashcan.aspx.cs" Inherits="umbraco.presentation.dialogs.emptyTrashcan" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
-
-<asp:Content ContentPlaceHolderID="head" runat="server">
-		<script type="text/javascript">
-		
-		    var recycleBinType = '<%=umbraco.helper.Request("type")%>';
-		    var emptyTotal = '<%= umbraco.cms.businesslogic.RecycleBin.Count((umbraco.cms.businesslogic.RecycleBin.RecycleBinType) Enum.Parse(typeof(umbraco.cms.businesslogic.RecycleBin.RecycleBinType), umbraco.helper.Request("type"), true)).ToString()%>';
-		    
-		    function emptyRecycleBin() {
-    			jQuery('#formDiv').hide();
-    			jQuery('#buttons').hide(); 
-	    		jQuery('#animation').show(); 
-		    	jQuery('#anim').attr("src","<%=umbraco.GlobalSettings.ClientPath%>/images/progressBar.gif");
-		    	
-		    	// call the empty trashcan webservice
-		    	umbraco.presentation.webservices.trashcan.EmptyTrashcan(recycleBinType);
-
-         // wait one second to start the status update
-         setTimeout('updateStatus();', 1000);
-		    }
-		    
-		    function updateStatus() {
-		        umbraco.presentation.webservices.trashcan.GetTrashStatus(updateStatusLabel, failure);
-		    }
-		    
-		    function failure(retVal) {
-		        alert('error: ' + retVal);
-		    }
-		    
-		    function updateStatusLabel(retVal) {
-                jQuery('#statusLabel').html("<strong>" + retVal + " <%=umbraco.ui.Text("remaining")%></strong>");            
-
-                if (retVal != '' && retVal != '0') {
-                    setTimeout('updateStatus();', 500);
-                } else {
-                    jQuery('#div_form').hide();
-                    jQuery('#notification').show();
-                    jQuery('#notification').html("<p><%=umbraco.ui.Text("defaultdialogs", "recycleBinIsEmpty")%> </p> <p><a href='#' onclick='UmbClientMgr.closeModalWindow()'><%= umbraco.ui.Text("defaultdialogs", "closeThisWindow")%></a></p>");
-                    UmbClientMgr.mainTree().reloadActionNode();
-                }
-                
-		    }
-		</script>
-</asp:Content>
-
-<asp:Content runat="server" ContentPlaceHolderID="body">
-    
- 		
-  	<div class="success" id="notification" style="display: none;"></div>
-		
-		<div id="div_form">
-		<cc1:Pane id="pane_form" runat="server">
-		<cc1:PropertyPanel runat="server">
-		
-		
-		
-		<div id="animation" align="center" style="display: none;">
-		<p><%= umbraco.ui.Text("defaultdialogs", "recycleBinDeleting")%></p>
-		
-		<cc1:ProgressBar ID="progbar" runat="server" Title="Please wait..." />
-		<br />
-		<span class="guiDialogTiny" id="statusLabel"><%=umbraco.ui.Text("deleting", this.getUser())%></span>
-		</div>
-	  	  	  
-	  <div id="formDiv">
-	    <p><%= umbraco.ui.Text("defaultdialogs", "recycleBinWarning")%></p>
-		   <input type="checkbox" id="confirmDelete" onclick="$get('ok').disabled = !this.checked;" /> <label for="confirmDelete"><%=umbraco.ui.Text("defaultdialogs", "confirmEmptyTrashcan", umbraco.cms.businesslogic.RecycleBin.Count((umbraco.cms.businesslogic.RecycleBin.RecycleBinType)Enum.Parse(typeof(umbraco.cms.businesslogic.RecycleBin.RecycleBinType), umbraco.helper.Request("type"), true)).ToString(), this.getUser())%></label>
-		</div>
-	  </cc1:PropertyPanel>
-	  </cc1:Pane>
-	  
-		<br />
-		<div id="buttons">
-		<input type="button" ID="ok" value="<%=umbraco.ui.Text("actions", "emptyTrashcan", this.getUser()) %>" class="guiInputButton" onclick="if ($get('confirmDelete').checked) {emptyRecycleBin();}" disabled="true" />  
-		<em><%= umbraco.ui.Text("or") %></em> 
-    <a href="#" onclick="UmbClientMgr.closeModalWindow();">
-      <%=umbraco.ui.Text("cancel")%>
-    </a>
-		</div>
-		</div>
-</asp:Content>
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/emptyTrashcan.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/emptyTrashcan.aspx.cs
index 8eb2f2c9ab..998a171d71 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/emptyTrashcan.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/emptyTrashcan.aspx.cs
@@ -1,18 +1,33 @@
-using System;
+using System;
 using System.Web.UI;
+using Umbraco.Core;
+using Umbraco.Web;
 using umbraco.BasePages;
+using umbraco.cms.businesslogic;
 
 namespace umbraco.presentation.dialogs
 {
     public partial class emptyTrashcan : UmbracoEnsuredPage
     {
+        private RecycleBin.RecycleBinType? _binType;
+        protected RecycleBin.RecycleBinType BinType
+        {
+            get
+            {
+                if (_binType == null)
+                {
+                    _binType = Enum<RecycleBin.RecycleBinType>.Parse(Request.GetItemAsString("type"), true);
+                }
+                return _binType.Value;
+            }
+        }
 
         protected override void OnInit(EventArgs e)
         {
             base.OnInit(e);
 
             var recycleBinType = helper.Request("type");
-            if (!ValidateUserApp(recycleBinType))
+            if (ValidateUserApp(recycleBinType) == false)
             {
                 throw new InvalidOperationException("The user does not have access to the requested app");
             }
@@ -29,5 +44,23 @@ namespace umbraco.presentation.dialogs
             ScriptManager.GetCurrent(Page).Services.Add(new ServiceReference("../webservices/trashcan.asmx"));
             ScriptManager.GetCurrent(Page).Services.Add(new ServiceReference("../webservices/legacyAjaxCalls.asmx"));
         }
+
+        /// <summary>
+        /// pane_form control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::umbraco.uicontrols.Pane pane_form;
+
+        /// <summary>
+        /// progbar control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::umbraco.uicontrols.ProgressBar progbar;
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/emptyTrashcan.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/emptyTrashcan.aspx.designer.cs
deleted file mode 100644
index bddf439773..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/emptyTrashcan.aspx.designer.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4927
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace umbraco.presentation.dialogs {
-    
-    
-    public partial class emptyTrashcan {
-        
-        /// <summary>
-        /// pane_form control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.Pane pane_form;
-        
-        /// <summary>
-        /// progbar control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.ProgressBar progbar;
-    }
-}

From d4514844f87c31fcb924ed9b3ab347b53f8d894e Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 3 Dec 2013 17:58:42 +1100
Subject: [PATCH 18/18] Fixes a few other potential xss entry points

---
 .../Modules/SkinModule/ModuleInjector.aspx          |  3 ++-
 src/Umbraco.Web.UI/umbraco/dialogs/insertMacro.aspx | 13 +++++++------
 src/Umbraco.Web.UI/umbraco/dialogs/moveOrCopy.aspx  | 13 +++++++------
 src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx        |  7 ++++---
 .../umbraco/dialogs/umbracoField.aspx               |  5 +++--
 .../umbraco/plugins/tinymce3/insertMacro.aspx       | 13 +++++++------
 6 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx
index d953aa81f4..9c9e7cc631 100644
--- a/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx
+++ b/src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx
@@ -1,5 +1,6 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ModuleInjector.aspx.cs" Inherits="umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule.ModuleInjector" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
+<%@ Import Namespace="Umbraco.Web" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -108,7 +109,7 @@
 
             top.jQuery('.umbModalBoxIframe').closest(".umbModalBox").ModalWindowAPI().close();
 
-            top.umbInsertModule('<%=umbraco.helper.Request("target")%>',macroString,'<%=umbraco.helper.Request("type")%>');
+            top.umbInsertModule('<%=Request.GetCleanedItem("target")%>',macroString,'<%=Request.GetCleanedItem("type")%>');
 		}
 
 		function pseudoHtmlEncode(text) {
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/insertMacro.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/insertMacro.aspx
index e34536f1b0..eeacb6a936 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/insertMacro.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/insertMacro.aspx
@@ -1,5 +1,6 @@
 <%@ Page Language="c#" MasterPageFile="../masterpages/umbracoPage.Master" ValidateRequest="false" Codebehind="insertMacro.aspx.cs" AutoEventWireup="True"
   Inherits="umbraco.dialogs.insertMacro" Trace="false" %>
+<%@ Import Namespace="Umbraco.Web" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
@@ -72,8 +73,8 @@
     
     <%if (Request["macroID"] != null || Request["macroAlias"] != null) {%>
     
-    <input type="hidden" name="macroID" value="<%=umbraco.helper.Request("macroID")%>" />
-    <input type="hidden" name="macroAlias" value="<%=umbraco.helper.Request("macroAlias")%>" />
+    <input type="hidden" name="macroID" value="<%=Request.GetCleanedItem("macroID")%>" />
+    <input type="hidden" name="macroAlias" value="<%=Request.GetCleanedItem("macroAlias")%>" />
     
     <div class="macroProperties">
       <cc1:Pane id="pane_edit" runat="server">
@@ -81,9 +82,9 @@
       </cc1:Pane>
     </div>
     <p>
-    <input type="button" value="<%=umbraco.ui.Text("general", "ok", this.getUser())%>" onclick="updateMacro()" />
+    <input type="button" value="<%=umbraco.ui.Text("general", "ok", UmbracoUser)%>" onclick="updateMacro()" />
     &nbsp; <em> or </em> &nbsp;
-     <a href="#" style="color: blue"  onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
+     <a href="#" style="color: blue"  onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("general", "cancel", UmbracoUser)%></a>
     </p>
     <%} else {%>
     
@@ -93,9 +94,9 @@
       </cc1:PropertyPanel>
     </cc1:Pane>
     <p>
-    <input type="submit" value="<%=umbraco.ui.Text("general", "ok", this.getUser())%>" />
+    <input type="submit" value="<%=umbraco.ui.Text("general", "ok", UmbracoUser)%>" />
     &nbsp; <em> or </em> &nbsp;
-     <a href="#" style="color: blue"  onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
+     <a href="#" style="color: blue"  onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("general", "cancel", UmbracoUser)%></a>
     </p>
     
     <%}%>
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/moveOrCopy.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/moveOrCopy.aspx
index ea5cef2a8a..683b940f99 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/moveOrCopy.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/moveOrCopy.aspx
@@ -1,5 +1,6 @@
 <%@ Page Language="c#" CodeBehind="moveOrCopy.aspx.cs" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="True" Inherits="Umbraco.Web.UI.Umbraco.Dialogs.MoveOrCopy" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
+<%@ Import Namespace="Umbraco.Web" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register Src="../controls/Tree/TreeControl.ascx" TagName="TreeControl" TagPrefix="umbraco" %>
 
@@ -13,11 +14,11 @@
 				
 				// Get node name by xmlrequest
 				if (id > 0)
-						umbraco.presentation.webservices.CMSNode.GetNodeName('<%=umbraco.BasePages.BasePage.umbracoUserContextID%>', id, updateName);
+						umbraco.presentation.webservices.CMSNode.GetNodeName('<%=umbracoUserContextID%>', id, updateName);
 				else{
-					//document.getElementById("pageNameContent").innerHTML = "'<strong><%=umbraco.ui.Text(umbraco.helper.Request("app"))%></strong>' <%= umbraco.ui.Text("moveOrCopy","nodeSelected") %>";
+					//document.getElementById("pageNameContent").innerHTML = "'<strong><%=umbraco.ui.Text(Request.GetCleanedItem("app"))%></strong>' <%= umbraco.ui.Text("moveOrCopy","nodeSelected") %>";
 			    
-					jQuery("#pageNameContent").html("<strong><%=umbraco.ui.Text(umbraco.helper.Request("app"))%></strong> <%= umbraco.ui.Text("moveOrCopy","nodeSelected") %>");
+					jQuery("#pageNameContent").html("<strong><%=umbraco.ui.Text(Request.GetCleanedItem("app"))%></strong> <%= umbraco.ui.Text("moveOrCopy","nodeSelected") %>");
 					jQuery("#pageNameHolder").attr("class","success");
 			  }
 			}
@@ -58,7 +59,7 @@
 	<cc1:Feedback ID="feedback" runat="server" />
 	<cc1:Pane ID="pane_form" runat="server" Visible="false">
 		<cc1:PropertyPanel runat="server" Style="overflow: auto; height: 220px;position: relative;">
-			<umbraco:TreeControl runat="server" ID="JTree" App='<%#umbraco.helper.Request("app") %>'
+			<umbraco:TreeControl runat="server" ID="JTree" App='<%#Request.GetCleanedItem("app") %>'
                 IsDialog="true" DialogMode="id" ShowContextMenu="false" FunctionToCall="dialogHandler"
                 Height="200"></umbraco:TreeControl>
 		</cc1:PropertyPanel>
@@ -84,8 +85,8 @@
 		<p>
 			<asp:Button ID="ok" runat="server" CssClass="guiInputButton" OnClick="HandleMoveOrCopy"></asp:Button>
 			&nbsp; <em>
-				<%=umbraco.ui.Text("general", "or", this.getUser())%></em> &nbsp; <a href="#" style="color: blue" onclick="UmbClientMgr.closeModalWindow()">
-					<%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
+				<%=umbraco.ui.Text("general", "or", UmbracoUser)%></em> &nbsp; <a href="#" style="color: blue" onclick="UmbClientMgr.closeModalWindow()">
+					<%=umbraco.ui.Text("general", "cancel", UmbracoUser)%></a>
 		</p>
 	</asp:Panel>
 </asp:Content>
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
index 430b1578fd..76db9b819f 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
@@ -2,6 +2,7 @@
 
 <%@ Import Namespace="System.Globalization" %>
 <%@ Import Namespace="Umbraco.Core.IO" %>
+<%@ Import Namespace="Umbraco.Web" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
 
@@ -57,7 +58,7 @@
         <br />
         <p>
             <input id="submitButton" type="button" value="<%=umbraco.ui.Text("save") %>" />
-            <em>or </em><a id="closeWindowButton" href="#" style="color: blue"><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
+            <em>or </em><a id="closeWindowButton" href="#" style="color: blue"><%=umbraco.ui.Text("general", "cancel", UmbracoUser)%></a>
         </p>
     </div>
 
@@ -69,8 +70,8 @@
                 submitButton: jQuery("#submitButton"),
                 closeWindowButton : jQuery("#closeWindowButton"),
                 dateTimeFormat: "<%=CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern%> <%=CultureInfo.CurrentCulture.DateTimeFormat.ShortTimePattern%>",
-                currentId: "<%=umbraco.helper.Request("ID")%>",
-                serviceUrl: "<%= IOHelper.ResolveUrl(SystemDirectories.Umbraco)%>/WebServices/NodeSorter.asmx/UpdateSortOrder?app=<%=umbraco.helper.Request("app")%>"
+                currentId: "<%=Request.GetCleanedItem("ID")%>",
+                serviceUrl: "<%= IOHelper.ResolveUrl(SystemDirectories.Umbraco)%>/WebServices/NodeSorter.asmx/UpdateSortOrder?app=<%=Request.GetCleanedItem("app")%>"
             });
 
             sortDialog.init();
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/umbracoField.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/umbracoField.aspx
index 596d8df017..9df80dd370 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/umbracoField.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/umbracoField.aspx
@@ -1,6 +1,7 @@
 <%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" CodeBehind="umbracoField.aspx.cs"
     AutoEventWireup="True" Inherits="umbraco.dialogs.umbracoField" %>
 
+<%@ Import Namespace="Umbraco.Web" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
 <asp:Content ContentPlaceHolderID="head" runat="server">
@@ -24,7 +25,7 @@
                     submitButton: $("#submitButton"),
                     form: document.forms[0],
                     tagName: document.forms[0].<%= tagName.ClientID %>.value,
-                    objectId: '<%=umbraco.helper.Request("objectId")%>'
+                    objectId: '<%=Request.GetCleanedItem("objectId")%>'
                 });
                 umbracoField.init();
             });            
@@ -126,5 +127,5 @@
     <br />
     <input id="submitButton" type="button" name="gem" value="<%=umbraco.ui.Text("insert")%>" />
     &nbsp; <em>or </em>&nbsp; <a id="cancelButton" href="#" style="color: blue">
-        <%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
+        <%=umbraco.ui.Text("general", "cancel", UmbracoUser)%></a>
 </asp:Content>
diff --git a/src/Umbraco.Web.UI/umbraco/plugins/tinymce3/insertMacro.aspx b/src/Umbraco.Web.UI/umbraco/plugins/tinymce3/insertMacro.aspx
index ca3e9f2bcd..0e935b4ed5 100644
--- a/src/Umbraco.Web.UI/umbraco/plugins/tinymce3/insertMacro.aspx
+++ b/src/Umbraco.Web.UI/umbraco/plugins/tinymce3/insertMacro.aspx
@@ -1,6 +1,7 @@
 <%@ Page Language="c#" ValidateRequest="false" CodeBehind="insertMacro.aspx.cs" AutoEventWireup="True"
     Inherits="umbraco.presentation.tinymce3.insertMacro" Trace="false" %>
 
+<%@ Import Namespace="Umbraco.Web" %>
 <%@ Register TagPrefix="ui" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
 <%@ Register TagPrefix="asp" Namespace="System.Web.UI" Assembly="System.Web" %>
@@ -105,8 +106,8 @@
     <input type="hidden" name="macroMode" value="<%=Request["mode"]%>" />
     <%if (Request["umb_macroID"] != null || Request["umb_macroAlias"] != null)
       {%>
-    <input type="hidden" name="umb_macroID" value="<%=umbraco.helper.Request("umb_macroID")%>" />
-    <input type="hidden" name="umb_macroAlias" value="<%=umbraco.helper.Request("umb_macroAlias")%>" />
+    <input type="hidden" name="umb_macroID" value="<%=Request.GetCleanedItem("umb_macroID")%>" />
+    <input type="hidden" name="umb_macroAlias" value="<%=Request.GetCleanedItem("umb_macroAlias")%>" />
     <% }%>
     <ui:Pane ID="pane_edit" runat="server" Visible="false">
         <div class="macroPane">
@@ -118,7 +119,7 @@
             <asp:Button ID="bt_renderMacro" OnClick="renderMacro_Click" runat="server" Text="ok">
             </asp:Button>
             <em>or </em><a id="cancelbtn" href="#" style="color: blue" onclick="tinyMCEPopup.close();">
-                <%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
+                <%=umbraco.ui.Text("general", "cancel", UmbracoUser)%></a>
         </p>
     </asp:Panel>
     <ui:Pane ID="pane_insert" runat="server">
@@ -128,16 +129,16 @@
     </ui:Pane>
     <asp:Panel ID="insert_buttons" runat="server">
         <p>
-            <input type="submit" value="<%=umbraco.ui.Text("general", "ok", this.getUser())%>" />
+            <input type="submit" value="<%=umbraco.ui.Text("general", "ok", UmbracoUser)%>" />
             <em>or </em><a href="#" style="color: blue" onclick="tinyMCEPopup.close();">
-                <%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
+                <%=umbraco.ui.Text("general", "cancel", UmbracoUser)%></a>
         </p>
     </asp:Panel>
     <div id="renderContent" style="display: none">
         <asp:PlaceHolder ID="renderHolder" runat="server"></asp:PlaceHolder>
     </div>
     </form>
-    <script type="text/javascript" language="javascript">
+    <script type="text/javascript" >
         var inst; // =  tinyMCEPopup.editor;
         var elm; // = inst.selection.getNode();