From 6f5e742ea15426d4d976b4f4bd698565c476972d Mon Sep 17 00:00:00 2001
From: pgregorynz <unknown@kiln.example.com>
Date: Tue, 23 Feb 2010 22:03:04 +0000
Subject: [PATCH] WORK IN PROGRESS, GET STABLE SOURCE FROM DOWNLOAD TAB Fixes
 issue #26148 Publish All in beta 4.1 resets the document template

[TFS Changeset #64148]
---
 umbraco/cms/businesslogic/web/Document.cs     |  14 +-
 .../presentation/umbraco.presentation.csproj  |   5 +-
 umbraco/presentation/web.config               | 221 ++++++++++++++++++
 umbraco/presentation/web.config.PETER-PC.xslt |  25 ++
 4 files changed, 259 insertions(+), 6 deletions(-)
 create mode 100644 umbraco/presentation/web.config
 create mode 100644 umbraco/presentation/web.config.PETER-PC.xslt

diff --git a/umbraco/cms/businesslogic/web/Document.cs b/umbraco/cms/businesslogic/web/Document.cs
index 4f978b2c0d..938b38c6b6 100644
--- a/umbraco/cms/businesslogic/web/Document.cs
+++ b/umbraco/cms/businesslogic/web/Document.cs
@@ -59,7 +59,7 @@ namespace umbraco.cms.businesslogic.web
                 ";
         private const string m_SQLOptimizedChildren = @"
                   select 
-                  	count(children.id) as children, umbracoNode.id, umbracoNode.uniqueId, umbracoNode.level, umbracoNode.parentId, cmsDocument.documentUser, umbracoNode.path, umbracoNode.sortOrder, coalesce(publishCheck.published,0) as published, umbracoNode.createDate, cmsDocument.text, cmsDocument.updateDate, cmsContentVersion.versionDate, cmsContentType.icon, cmsContentType.alias, cmsContentType.thumbnail, cmsContentType.description, cmsContentType.masterContentType, cmsContentType.nodeId as contentTypeId
+                  	count(children.id) as children, umbracoNode.id, umbracoNode.uniqueId, umbracoNode.level, umbracoNode.parentId, cmsDocument.documentUser, cmsDocument.templateId, umbracoNode.path, umbracoNode.sortOrder, coalesce(publishCheck.published,0) as published, umbracoNode.createDate, cmsDocument.text, cmsDocument.updateDate, cmsContentVersion.versionDate, cmsContentType.icon, cmsContentType.alias, cmsContentType.thumbnail, cmsContentType.description, cmsContentType.masterContentType, cmsContentType.nodeId as contentTypeId
                   from umbracoNode 
                   left join umbracoNode children on children.parentId = umbracoNode.id
                   inner join cmsContent on cmsContent.nodeId = umbracoNode.id
@@ -72,7 +72,7 @@ namespace umbraco.cms.businesslogic.web
                   inner join cmsDocument on cmsDocument.versionId = cmsContentversion.versionId
                   left join cmsDocument publishCheck on publishCheck.nodeId = cmsContent.nodeID and publishCheck.published = 1
                   where {0}
-                  group by umbracoNode.id, umbracoNode.uniqueId, umbracoNode.level, umbracoNode.parentId, cmsDocument.documentUser, umbracoNode.path, umbracoNode.sortOrder, coalesce(publishCheck.published,0), umbracoNode.createDate, cmsDocument.text, cmsDocument.updateDate, cmsContentVersion.versionDate, cmsContentType.icon, cmsContentType.alias, cmsContentType.thumbnail, cmsContentType.description, cmsContentType.masterContentType, cmsContentType.nodeId
+                  group by umbracoNode.id, umbracoNode.uniqueId, umbracoNode.level, umbracoNode.parentId, cmsDocument.documentUser, cmsDocument.templateId, umbracoNode.path, umbracoNode.sortOrder, coalesce(publishCheck.published,0), umbracoNode.createDate, cmsDocument.text, cmsDocument.updateDate, cmsContentVersion.versionDate, cmsContentType.icon, cmsContentType.alias, cmsContentType.thumbnail, cmsContentType.description, cmsContentType.masterContentType, cmsContentType.nodeId
                   order by {1}
                   ";
 
@@ -493,7 +493,9 @@ namespace umbraco.cms.businesslogic.web
                             , dr.GetString("thumbnail")
                             , dr.GetString("description")
                             , masterContentType
-                            , dr.GetInt("contentTypeId"));
+                            , dr.GetInt("contentTypeId")
+                            , dr.GetInt("templateId")
+                            );
 
                         // initialize content object
                         InitializeContent(dr.GetInt("ContentType"), dr.GetGuid("versionId"),
@@ -1242,7 +1244,8 @@ namespace umbraco.cms.businesslogic.web
                         , dr.GetString("thumbnail")
                         , dr.GetString("description")
                         , masterContentType
-                        , dr.GetInt("contentTypeId"));
+                        , dr.GetInt("contentTypeId")
+                        ,dr.GetInt("templateId"));
                     tmp.Add(d);
                 }
             }
@@ -1258,7 +1261,7 @@ namespace umbraco.cms.businesslogic.web
         private void SetupDocumentForTree(Guid uniqueId, int level, int parentId, int user, bool publish, string path,
                                           string text, DateTime createDate, DateTime updateDate,
                                           DateTime versionDate, string icon, bool hasChildren, string contentTypeAlias, string contentTypeThumb,
-                                            string contentTypeDesc, int? masterContentType, int contentTypeId)
+                                            string contentTypeDesc, int? masterContentType, int contentTypeId, int templateId)
         {
             SetupNodeForTree(uniqueId, _objectType, level, parentId, user, path, text, createDate, hasChildren);
 
@@ -1266,6 +1269,7 @@ namespace umbraco.cms.businesslogic.web
             _updated = updateDate;
             ContentType = new ContentType(contentTypeId, contentTypeAlias, icon, contentTypeThumb, masterContentType);
             ContentTypeIcon = icon;
+            Template = templateId;
             VersionDate = versionDate;
         }
 
diff --git a/umbraco/presentation/umbraco.presentation.csproj b/umbraco/presentation/umbraco.presentation.csproj
index 828327a6d3..2ff56985fe 100644
--- a/umbraco/presentation/umbraco.presentation.csproj
+++ b/umbraco/presentation/umbraco.presentation.csproj
@@ -1,6 +1,6 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{651E1350-91B6-44B7-BD60-7207006D7003}</ProjectGuid>
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
@@ -1465,6 +1465,7 @@
     <Content Include="config\splashes\booting.aspx" />
     <Content Include="config\splashes\noNodes.aspx" />
     <Content Include="config\splashes\worker.png" />
+    <Content Include="web.config.PETER-PC.xslt" />
     <Content Include="umbraco\xslt\templates\Schema2\Breadcrumb.xslt" />
     <Content Include="umbraco\xslt\templates\Schema2\Clean.xslt" />
     <Content Include="umbraco\xslt\templates\Schema2\ListSubPagesAsThumbnails.xslt" />
@@ -2801,6 +2802,7 @@
     <None Include="umbraco\schemas\umbraco.xsx">
       <DependentUpon>umbraco.xsd</DependentUpon>
     </None>
+    <Content Include="web.config" />
     <Content Include="config\UrlRewriting.config" />
   </ItemGroup>
   <ItemGroup>
@@ -2822,6 +2824,7 @@
   <ItemGroup>
     <Folder Include="css\" />
     <Folder Include="data\previews\" />
+    <Folder Include="data\preview\" />
     <Folder Include="masterpages\" />
     <Folder Include="media\" />
     <Folder Include="python\" />
diff --git a/umbraco/presentation/web.config b/umbraco/presentation/web.config
new file mode 100644
index 0000000000..a2e0224d4c
--- /dev/null
+++ b/umbraco/presentation/web.config
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <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=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" />
+    <!-- ASPNETAJAX -->
+    <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">
+          <section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere" />
+          <section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
+          <section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
+          <section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
+        </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" />
+    <section name="UmbracoExamine" type="UmbracoExamine.Core.Config.UmbracoExamineSettings, UmbracoExamine.Core" />
+    <section name="ExamineLuceneIndexSets" type="UmbracoExamine.Providers.Config.ExamineLuceneIndexes, UmbracoExamine.Providers" />
+  </configSections>
+  <urlrewritingnet configSource="config\UrlRewriting.config" />
+  <microsoft.scripting configSource="config\scripting.config" />
+  <clientDependency configSource="config\ClientDependency.config" />
+  <UmbracoExamine configSource="config\ExamineSettings.config" />
+  <ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
+  <appSettings>
+    <add key="umbracoDbDSN" value="server=.\sqlexpress;database=umbraco41;integrated security=false;user id=sa;pwd=password" />
+    <add key="umbracoConfigurationStatus" value="4.1.0.betaII" />
+    <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx" />
+    <add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
+    <add key="umbracoContentXML" value="~/data/umbraco.config" />
+    <add key="umbracoStorageDirectory" value="~/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" />
+  </appSettings>
+  <system.net>
+    <mailSettings>
+      <smtp>
+        <network host="127.0.0.1" userName="username" password="password" />
+      </smtp>
+    </mailSettings>
+  </system.net>
+  <!-- REMOVE FOR BETA -->
+  <!-- added by NH to test foreign membership providers-->
+  <connectionStrings>
+    <remove name="LocalSqlServer" />
+    <!--<add name="LocalSqlServer" connectionString="server=.\sqlexpress;database=aspnetdb;user id=DBUSER;password=DBPASSWORD" providerName="System.Data.SqlClient"/>-->
+  </connectionStrings>
+  <system.web>
+    <!-- <trust level="Medium" originUrl=".*" />-->
+    <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" />
+      <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule" />
+      <!-- ASPNETAJAX -->
+      <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+    </httpModules>
+    <httpHandlers>
+      <remove verb="*" path="*.asmx" />
+      <!-- ASPNETAJAX -->
+      <add verb="*" path="*.asmx" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
+      <add verb="*" path="*_AppService.axd" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
+      <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" />
+      <add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
+      <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.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+        <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.Design, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+      </assemblies>
+    </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>
+  <!-- ASPNETAJAX -->
+  <system.web.extensions>
+    <scripting>
+      <scriptResourceHandler enableCompression="true" enableCaching="true" />
+    </scripting>
+  </system.web.extensions>
+  <applicationSettings>
+    <umbraco.presentation.Properties.Settings>
+      <setting name="umbraco_com_regexlib_Webservices" serializeAs="String">
+        <value>http://regexlib.com/WebServices.asmx</value>
+      </setting>
+    </umbraco.presentation.Properties.Settings>
+  </applicationSettings>
+  <system.webServer>
+    <validation validateIntegratedModeConfiguration="false" />
+    <modules>
+      <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" />
+      <remove name="ScriptModule" />
+      <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+    </modules>
+    <handlers accessPolicy="Read, Write, Script, Execute">
+      <remove name="WebServiceHandlerFactory-Integrated" />
+      <remove name="ScriptHandlerFactory" />
+      <remove name="ScriptHandlerFactoryAppServices" />
+      <remove name="ScriptResource" />
+      <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" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
+      <add verb="*" name="Channels_Word" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
+      <add verb="*" name="ClientDependency" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
+      <add verb="GET,HEAD,POST" name="SpellChecker" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
+    </handlers>
+  </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>
+  <!-- 
+  <system.webServer>
+    <validation validateIntegratedModeConfiguration="false" />
+    <modules>
+      <remove name="ScriptModule" />
+      <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+    </modules>
+    <handlers>
+      <remove name="WebServiceHandlerFactory-Integrated" />
+      <remove name="ScriptHandlerFactory" />
+      <remove name="ScriptHandlerFactoryAppServices" />
+      <remove name="ScriptResource" />
+      <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" />
+    </handlers>
+  </system.webServer>
+  -->
+  <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" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/umbraco/presentation/web.config.PETER-PC.xslt b/umbraco/presentation/web.config.PETER-PC.xslt
new file mode 100644
index 0000000000..ad1838ebfa
--- /dev/null
+++ b/umbraco/presentation/web.config.PETER-PC.xslt
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxsl">
+  <xsl:output method="xml" indent="yes"/>
+
+  <!-- Set up a local connection string -->
+  <xsl:template match="/configuration/appSettings/add[@key='umbracoDbDSN']/@value">
+    <xsl:attribute name="value">server=.\sqlexpress;database=umbraco41;integrated security=false;user id=sa;pwd=password</xsl:attribute>
+  </xsl:template>
+
+  <xsl:template match="/configuration/appSettings/add[@key='umbracoConfigurationStatus']/@value">
+    <xsl:attribute name="value">4.1.0.betaII</xsl:attribute>
+  </xsl:template>
+
+  <!-- Default templates to match anything else -->
+  <xsl:template match="@*">
+    <xsl:copy/>
+  </xsl:template>
+
+  <xsl:template match="node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*"/>
+      <xsl:apply-templates/>
+    </xsl:copy>
+  </xsl:template>
+</xsl:stylesheet>