From a0a20378139ee3d9a56982f03f38c64e09265c82 Mon Sep 17 00:00:00 2001
From: sgay <unknown@kiln.example.com>
Date: Tue, 11 Oct 2011 10:02:32 -0200
Subject: [PATCH] fix #30534 - extra <br/> tags in RTE

---
 components/editorControls/tinyMCE3/TinyMCE.cs |  34 +-
 umbraco/presentation/web.config               | 457 ++++++++++--------
 2 files changed, 258 insertions(+), 233 deletions(-)

diff --git a/components/editorControls/tinyMCE3/TinyMCE.cs b/components/editorControls/tinyMCE3/TinyMCE.cs
index 2ad013ca21..9ed2ccf766 100644
--- a/components/editorControls/tinyMCE3/TinyMCE.cs
+++ b/components/editorControls/tinyMCE3/TinyMCE.cs
@@ -324,28 +324,26 @@ namespace umbraco.editorControls.tinyMCE3
             {
                 parsedString = replaceMacroTags(parsedString).Trim();
 
-                // clean macros and add paragraph element for tidy
-                bool removeParagraphs = false;
-                if (parsedString.Length > 16 && parsedString.ToLower().Substring(0, 17) == "|||?umbraco_macro")
-                {
-                    removeParagraphs = true;
-                    parsedString = "<p>" + parsedString + "</p>";
-                }
-
-                // tidy html
-
+                // tidy html - refactored, see #30534
                 if (UmbracoSettings.TidyEditorContent)
                 {
-                    string tidyTxt = library.Tidy(parsedString, false);
+					// always wrap in a <div> - using <p> was a bad idea
+					parsedString = "<div>" + parsedString + "</div>";
+					
+					string tidyTxt = library.Tidy(parsedString, false);
                     if (tidyTxt != "[error]")
                     {
-                        // compensate for breaking macro tags by tidy
-                        parsedString = tidyTxt.Replace("/?>", "/>");
-                        if (removeParagraphs)
-                        {
-                            if (parsedString.Length - parsedString.Replace("<", "").Length == 2)
-                                parsedString = parsedString.Replace("<p>", "").Replace("</p>", "");
-                        }
+						parsedString = tidyTxt;
+
+						// remove pesky \r\n, and other empty chars
+						parsedString = parsedString.Trim(new char[] { '\r', '\n', '\t', ' ' });
+
+                        // compensate for breaking macro tags by tidy (?)
+                        parsedString = parsedString.Replace("/?>", "/>");
+
+						// remove the wrapping <div> - safer to check that it is still here
+						if (parsedString.StartsWith("<div>") && parsedString.EndsWith("</div>"))
+							parsedString = parsedString.Substring("<div>".Length, parsedString.Length - "<div></div>".Length);
                     }
                     else
                     {
diff --git a/umbraco/presentation/web.config b/umbraco/presentation/web.config
index 014c5926a6..6bccc8deed 100644
--- a/umbraco/presentation/web.config
+++ b/umbraco/presentation/web.config
@@ -1,15 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <configSections>
-    <section name="urlrewritingnet" restartOnExternalChanges="true" requirePermission="false" type="UrlRewritingNet.Configuration.UrlRewriteSection, UrlRewritingNet.UrlRewriter" />
-    <!--
+    <configSections >
+        <section name="urlrewritingnet" restartOnExternalChanges="true" requirePermission="false" type="UrlRewritingNet.Configuration.UrlRewriteSection, UrlRewritingNet.UrlRewriter" />
+        <!--
       <section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" />
     
 
       ASPNETAJAX ** DISABLED BY ALEX NORCLIFFE 2010 06 03 FOR COMPATIBILITY WITH RUNNING UNDER .NET 4
       USERS CAN ADD THIS THEMSELVES IF THEY WISH TO USE ASP.NET AJAX
       -->
-    <!--<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+
+        <!--<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
       <sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
         <section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
         <sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
@@ -20,206 +21,229 @@
         </sectionGroup>
       </sectionGroup>
     </sectionGroup>-->
-    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="umbraco.presentation.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-    </sectionGroup>
-    <section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core" requirePermission="false" />
-    <section name="Examine" type="Examine.Config.ExamineSettings, Examine" requirePermission="false" />
-    <section name="ExamineLuceneIndexSets" type="UmbracoExamine.Config.ExamineLuceneIndexes, UmbracoExamine" requirePermission="false" />
-    <!-- Added in Umbraco 4.6.2 -->
-    <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-      <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-    </sectionGroup>
-    <!-- End of added in Umbraco 4.6.2 -->
-  </configSections>
-  <urlrewritingnet configSource="config\UrlRewriting.config" />
-  <!-- <microsoft.scripting configSource="config\scripting.config" />-->
-  <clientDependency configSource="config\ClientDependency.config" />
-  <Examine configSource="config\ExamineSettings.config" />
-  <ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
-  <appSettings>
-    <add key="umbracoDbDSN" value="server=.\sqlexpress;database=v47;integrated security=false;user id=DBUSER;password=DBPASSWORD" />
-    <add key="umbracoConfigurationStatus" value="4.7.0" />
-    <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
-    <add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
-    <add key="umbracoContentXML" value="~/App_Data/umbraco.config" />
-    <add key="umbracoStorageDirectory" value="~/App_Data" />
-    <add key="umbracoPath" value="~/umbraco" />
-    <add key="umbracoEnableStat" value="false" />
-    <add key="umbracoHideTopLevelNodeFromPath" value="true" />
-    <add key="umbracoEditXhtmlMode" value="true" />
-    <add key="umbracoUseDirectoryUrls" value="false" />
-    <add key="umbracoDebugMode" value="true" />
-    <add key="umbracoTimeOutInMinutes" value="20" />
-    <add key="umbracoVersionCheckPeriod" value="7" />
-    <add key="umbracoDisableXsltExtensions" value="true" />
-    <add key="umbracoDefaultUILanguage" value="en" />
-    <add key="umbracoProfileUrl" value="profiler" />
-    <add key="umbracoUseSSL" value="false" />
-    <add key="umbracoUseMediumTrust" value="false" />
-    <!-- 
+
+        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="umbraco.presentation.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+        </sectionGroup>
+
+        <section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core" requirePermission="false"/>
+        <section name="Examine" type="Examine.Config.ExamineSettings, Examine" requirePermission="false"/>
+        <section name="ExamineLuceneIndexSets" type="UmbracoExamine.Config.ExamineLuceneIndexes, UmbracoExamine" requirePermission="false"/>
+
+        <!-- Added in Umbraco 4.6.2 -->
+        <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+            <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
+            <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
+        </sectionGroup>
+        <!-- End of added in Umbraco 4.6.2 -->
+    </configSections>
+    <urlrewritingnet configSource="config\UrlRewriting.config" />
+    <!-- <microsoft.scripting configSource="config\scripting.config" />-->
+    <clientDependency configSource="config\ClientDependency.config" />
+    <Examine configSource="config\ExamineSettings.config" />
+    <ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
+
+    <appSettings>
+        <add key="umbracoDbDSN" value="server=.\SQLEXPRESS;database=umbraco;user id=web;password=farmer" />
+        <add key="umbracoConfigurationStatus" value="4.6.0.Alpha" />
+        <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
+        <add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
+        <add key="umbracoContentXML" value="~/App_Data/umbraco.config" />
+        <add key="umbracoStorageDirectory" value="~/App_Data" />
+        <add key="umbracoPath" value="~/umbraco" />
+        <add key="umbracoEnableStat" value="false" />
+        <add key="umbracoHideTopLevelNodeFromPath" value="true" />
+        <add key="umbracoEditXhtmlMode" value="true" />
+        <add key="umbracoUseDirectoryUrls" value="false" />
+        <add key="umbracoDebugMode" value="true" />
+        <add key="umbracoTimeOutInMinutes" value="20" />
+        <add key="umbracoVersionCheckPeriod" value="7" />
+        <add key="umbracoDisableXsltExtensions" value="true" />
+        <add key="umbracoDefaultUILanguage" value="en" />
+        <add key="umbracoProfileUrl" value="profiler" />
+        <add key="umbracoUseSSL" value="false" />
+        <add key="umbracoUseMediumTrust" value="false" />
+
+        <!-- 
       Set this to true to enable storing the xml cache locally to the IIS server even if the app files are stored centrally on a SAN/NAS 
       Alex Norcliffe 2010 02 for 4.1
     -->
-    <add key="umbracoContentXMLUseLocalTemp" value="false" />
-    <!-- Added in Umbraco 4.6.2 -->
-    <add key="webpages:Enabled" value="false" />
-    <add key="enableSimpleMembership" value="false" />
-    <add key="autoFormsAuthentication" value="false" />
-    <!-- End of added in Umbraco 4.6.2 -->
-  </appSettings>
-  <system.net>
-    <mailSettings>
-      <smtp>
-        <network host="127.0.0.1" userName="username" password="password" />
-      </smtp>
-    </mailSettings>
-  </system.net>
-  <connectionStrings>
-    <remove name="LocalSqlServer" />
-    <!--<add name="LocalSqlServer" connectionString="server=.\sqlexpress;database=aspnetdb;user id=DBUSER;password=DBPASSWORD" providerName="System.Data.SqlClient"/>-->
-  </connectionStrings>
-  <system.web>
-    <httpRuntime requestValidationMode="2.0" />
-    <customErrors mode="Off" />
-    <trace enabled="true" requestLimit="10" pageOutput="false" traceMode="SortByTime" localOnly="true" />
-    <sessionState mode="InProc" stateConnectionString="tcpip=127.0.0.1:42424" sqlConnectionString="data source=127.0.0.1;Trusted_Connection=yes" cookieless="false" timeout="20" />
-    <globalization requestEncoding="UTF-8" responseEncoding="UTF-8" />
-    <xhtmlConformance mode="Strict" />
-    <pages enableEventValidation="false">
-      <!-- ASPNETAJAX -->
-      <controls>
-        <add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add tagPrefix="umbraco" namespace="umbraco.presentation.templateControls" assembly="umbraco" />
-        <add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      </controls>
-    </pages>
-    <httpModules>
-      <!-- URL REWRTIER -->
-      <add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
-      <add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
-      <!-- UMBRACO -->
-      <add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule, umbraco" />
-      <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule, umbraco" />
-      <!-- ASPNETAJAX -->
-      <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <!-- CLIENT DEPENDENCY -->
-      <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
-    </httpModules>
-    <httpHandlers>
-      <remove verb="*" path="*.asmx" />
-      <add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
-      <!-- UMBRACO CHANNELS -->
-      <add verb="*" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
-      <add verb="*" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
-      <!-- CLIENT DEPENDENCY -->
-      <add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
-      <!-- SPELL CHECKER -->
-      <add verb="GET,HEAD,POST" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
-    </httpHandlers>
-    <compilation defaultLanguage="c#" debug="true" batch="false">
-      <assemblies>
-        <!-- ASPNETAJAX -->
-        <add assembly="System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
-        <add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-        <add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-        <add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-        <add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add assembly="System.Web.Extensions.Design, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add assembly="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-        <!--<add assembly="Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" /> -->
-      </assemblies>
-      <!-- Added in Umbraco 4.6.2 -->
-      <buildProviders>
-        <add extension=".cshtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
-        <add extension=".vbhtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
-        <add extension=".razor" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
-      </buildProviders>
-      <!-- End of added in Umbraco 4.6.2 -->
-    </compilation>
-    <authentication mode="Forms">
-      <forms name="yourAuthCookie" loginUrl="login.aspx" protection="All" path="/" />
-    </authentication>
-    <authorization>
-      <allow users="?" />
-    </authorization>
-    <!-- Membership Provider -->
-    <membership defaultProvider="UmbracoMembershipProvider" userIsOnlineTimeWindow="15">
-      <providers>
-        <clear />
-        <add name="UmbracoMembershipProvider" type="umbraco.providers.members.UmbracoMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="Another Type" passwordFormat="Hashed" />
-        <add name="UsersMembershipProvider" type="umbraco.providers.UsersMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" passwordFormat="Hashed" />
-      </providers>
-    </membership>
-    <!-- added by NH to support membership providers in access layer -->
-    <roleManager enabled="true" defaultProvider="UmbracoRoleProvider">
-      <providers>
-        <clear />
-        <add name="UmbracoRoleProvider" type="umbraco.providers.members.UmbracoRoleProvider" />
-      </providers>
-    </roleManager>
-    <!-- Sitemap provider-->
-    <siteMap defaultProvider="UmbracoSiteMapProvider" enabled="true">
-      <providers>
-        <clear />
-        <add name="UmbracoSiteMapProvider" type="umbraco.presentation.nodeFactory.UmbracoSiteMapProvider" defaultDescriptionAlias="description" securityTrimmingEnabled="true" />
-      </providers>
-    </siteMap>
-  </system.web>
-  <system.webServer>
-    <validation validateIntegratedModeConfiguration="false" />
-    <modules>
-      <remove name="ScriptModule" />
-      <remove name="UrlRewriteModule" />
-      <remove name="umbracoRequestModule" />
-      <remove name="viewstateMoverModule" />
-      <remove name="umbracoBaseRequestModule" />
-      <remove name="ClientDependencyModule" />
-      <!-- Needed for login/membership to work on homepage (as per http://stackoverflow.com/questions/218057/httpcontext-current-session-is-null-when-routing-requests) -->
-      <remove name="FormsAuthentication" />
-      <add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
-      <add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
-      <add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule" />
-      <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule" />
-      <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
-      <!-- Needed for login/membership to work on homepage (as per http://stackoverflow.com/questions/218057/httpcontext-current-session-is-null-when-routing-requests) -->
-      <add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule" />
-    </modules>
-    <handlers accessPolicy="Read, Write, Script, Execute">
-      <remove name="WebServiceHandlerFactory-Integrated" />
-      <remove name="ScriptHandlerFactory" />
-      <remove name="ScriptHandlerFactoryAppServices" />
-      <remove name="ScriptResource" />
-      <remove name="Channels" />
-      <remove name="Channels_Word" />
-      <remove name="ClientDependency" />
-      <remove name="SpellChecker" />
-      <add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add verb="*" name="Channels" preCondition="integratedMode" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
-      <add verb="*" name="Channels_Word" preCondition="integratedMode" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
-      <add verb="*" name="ClientDependency" preCondition="integratedMode" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
-      <add verb="GET,HEAD,POST" preCondition="integratedMode" name="SpellChecker" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
-    </handlers>
-    <staticContent>
-      <mimeMap fileExtension=".air" mimeType="application/vnd.adobe.air-application-installer-package+zip" />
-    </staticContent>
-  </system.webServer>
-  <system.codedom>
-    <compilers>
-      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CSharp.CSharpCodeProvider,System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4">
-        <providerOption name="CompilerVersion" value="v3.5" />
-        <providerOption name="WarnAsError" value="false" />
-      </compiler>
-    </compilers>
-  </system.codedom>
-  <runtime>
-    <!--    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+        <add key="umbracoContentXMLUseLocalTemp" value="false"/>
+
+        <!-- Added in Umbraco 4.6.2 -->
+        <add key="webpages:Enabled" value="false"/>
+        <add key="enableSimpleMembership" value="false"/>
+        <add key="autoFormsAuthentication" value="false"/>
+        <!-- End of added in Umbraco 4.6.2 -->
+    </appSettings>
+    <system.net>
+        <mailSettings>
+            <smtp>
+                <network host="127.0.0.1" userName="username" password="password" />
+            </smtp>
+        </mailSettings>
+    </system.net>
+
+    <connectionStrings>
+        <remove name="LocalSqlServer" />
+        <!--<add name="LocalSqlServer" connectionString="server=.\sqlexpress;database=aspnetdb;user id=DBUSER;password=DBPASSWORD" providerName="System.Data.SqlClient"/>-->
+    </connectionStrings>
+    <system.web>
+        <httpRuntime requestValidationMode="2.0" />
+        <customErrors mode="Off" />
+        <trace enabled="true" requestLimit="10" pageOutput="false" traceMode="SortByTime" localOnly="true" />
+        <sessionState mode="InProc" stateConnectionString="tcpip=127.0.0.1:42424" sqlConnectionString="data source=127.0.0.1;Trusted_Connection=yes" cookieless="false" timeout="20" />
+        <globalization requestEncoding="UTF-8" responseEncoding="UTF-8" />
+        <xhtmlConformance mode="Strict" />
+        <pages enableEventValidation="false">
+            <!-- ASPNETAJAX -->
+            <controls>
+                <add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+                <add tagPrefix="umbraco" namespace="umbraco.presentation.templateControls" assembly="umbraco" />
+                <add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+            </controls>
+        </pages>
+        <httpModules>
+            <!-- URL REWRTIER -->
+            <add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
+            <add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
+            <!-- UMBRACO -->
+            <add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule, umbraco" />
+            <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule, umbraco" />
+            <!-- ASPNETAJAX -->
+            <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+            <!-- CLIENT DEPENDENCY -->
+            <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core"/>
+        </httpModules>
+        <httpHandlers>
+            <remove verb="*" path="*.asmx"/>
+            <add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+            <add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+            <add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false"/>
+            <!-- UMBRACO CHANNELS -->
+            <add verb="*" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
+            <add verb="*" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
+            <!-- CLIENT DEPENDENCY -->
+            <add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core "/>
+            <!-- SPELL CHECKER -->
+            <add verb="GET,HEAD,POST" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
+        </httpHandlers>
+
+        <compilation defaultLanguage="c#" debug="true" batch="false">
+            <assemblies>
+                <!-- ASPNETAJAX -->
+                <add assembly="System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
+                <add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
+
+                <add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
+                <add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
+
+                <add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+                <add assembly="System.Web.Extensions.Design, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+
+                <add assembly="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+                <!--<add assembly="Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" /> -->
+            </assemblies>
+
+            <!-- Added in Umbraco 4.6.2 -->
+            <buildProviders>
+                <add extension=".cshtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines"/>
+                <add extension=".vbhtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines"/>
+                <add extension=".razor" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines"/>
+            </buildProviders>
+            <!-- End of added in Umbraco 4.6.2 -->
+        </compilation>
+
+        <authentication mode="Forms">
+            <forms name="yourAuthCookie" loginUrl="login.aspx" protection="All" path="/" />
+        </authentication>
+        <authorization>
+            <allow users="?" />
+        </authorization>
+        <!-- Membership Provider -->
+        <membership defaultProvider="UmbracoMembershipProvider" userIsOnlineTimeWindow="15">
+            <providers>
+                <clear />
+                <add name="UmbracoMembershipProvider" type="umbraco.providers.members.UmbracoMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="Another Type" passwordFormat="Hashed" />
+                <add name="UsersMembershipProvider" type="umbraco.providers.UsersMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" passwordFormat="Hashed" />
+            </providers>
+        </membership>
+        <!-- added by NH to support membership providers in access layer -->
+        <roleManager enabled="true" defaultProvider="UmbracoRoleProvider">
+            <providers>
+                <clear />
+                <add name="UmbracoRoleProvider" type="umbraco.providers.members.UmbracoRoleProvider" />
+            </providers>
+        </roleManager>
+        <!-- Sitemap provider-->
+        <siteMap defaultProvider="UmbracoSiteMapProvider" enabled="true">
+            <providers>
+                <clear />
+                <add name="UmbracoSiteMapProvider" type="umbraco.presentation.nodeFactory.UmbracoSiteMapProvider" defaultDescriptionAlias="description" securityTrimmingEnabled="true" />
+            </providers>
+        </siteMap>
+    </system.web>
+
+    <system.webServer>
+        <validation validateIntegratedModeConfiguration="false" />
+        <modules>
+            <remove name="ScriptModule" />
+            <remove name="UrlRewriteModule" />
+            <remove name="umbracoRequestModule" />
+            <remove name="viewstateMoverModule" />
+            <remove name="umbracoBaseRequestModule" />
+            <remove name="ClientDependencyModule" />
+            <!-- Needed for login/membership to work on homepage (as per http://stackoverflow.com/questions/218057/httpcontext-current-session-is-null-when-routing-requests) -->
+            <remove name="FormsAuthentication" />
+            
+            <add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
+            <add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
+            <add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule" />
+            <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule" />
+            <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+            <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core"/>
+            <!-- Needed for login/membership to work on homepage (as per http://stackoverflow.com/questions/218057/httpcontext-current-session-is-null-when-routing-requests) -->
+            <add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule"/>
+        </modules>
+
+        <handlers accessPolicy="Read, Write, Script, Execute">
+            <remove name="WebServiceHandlerFactory-Integrated" />
+            <remove name="ScriptHandlerFactory" />
+            <remove name="ScriptHandlerFactoryAppServices" />
+            <remove name="ScriptResource" />
+            <remove name="Channels" />
+            <remove name="Channels_Word" />
+            <remove name="ClientDependency" />
+            <remove name="SpellChecker" />
+
+            <add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+            <add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+            <add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+            <add verb="*" name="Channels" preCondition="integratedMode" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
+            <add verb="*" name="Channels_Word" preCondition="integratedMode" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
+            <add verb="*" name="ClientDependency" preCondition="integratedMode" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core "/>
+            <add verb="GET,HEAD,POST" preCondition="integratedMode" name="SpellChecker" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco"/>
+        </handlers>
+
+        <staticContent>
+            <mimeMap fileExtension=".air" mimeType="application/vnd.adobe.air-application-installer-package+zip" />
+        </staticContent>
+
+    </system.webServer>
+
+
+    <system.codedom>
+        <compilers>
+            <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CSharp.CSharpCodeProvider,System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4">
+                <providerOption name="CompilerVersion" value="v3.5" />
+                <providerOption name="WarnAsError" value="false" />
+            </compiler>
+        </compilers>
+    </system.codedom>
+
+
+    <runtime>
+        <!--    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35"/>
         <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
@@ -230,17 +254,20 @@
       </dependentAssembly>
     </assemblyBinding>
 -->
-  </runtime>
-  <!-- Added in Umbraco 4.6.2 -->
-  <system.web.webPages.razor>
-    <!--<host factoryType="umbraco.MacroEngines.RazorUmbracoFactory, umbraco.MacroEngines"/>-->
-    <pages pageBaseType="umbraco.MacroEngines.DynamicNodeContext">
-      <namespaces>
-        <add namespace="Microsoft.Web.Helpers" />
-        <add namespace="umbraco" />
-        <add namespace="Examine" />
-      </namespaces>
-    </pages>
-  </system.web.webPages.razor>
-  <!-- End of added in Umbraco 4.6.2 -->
+    </runtime>
+
+    <!-- Added in Umbraco 4.6.2 -->
+    <system.web.webPages.razor>
+        <!--<host factoryType="umbraco.MacroEngines.RazorUmbracoFactory, umbraco.MacroEngines"/>-->
+        <pages pageBaseType="umbraco.MacroEngines.DynamicNodeContext">
+            <namespaces>
+                <add namespace="Microsoft.Web.Helpers" />
+                <add namespace="umbraco" />
+                <add namespace="Examine" />
+            </namespaces>
+        </pages>
+    </system.web.webPages.razor>
+    <!-- End of added in Umbraco 4.6.2 -->
+
+
 </configuration>
\ No newline at end of file