From c2eeff6e47cdad4c8842dfcf383d544c14c1ddbf Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 8 Sep 2016 10:37:03 +0200
Subject: [PATCH 1/3] U4-8954 - fix WhereIn issue with non-value-types

---
 .../Persistence/PetaPocoSqlExtensions.cs      | 34 ++++++++++--------
 .../Persistence/PetaPocoExpresionsTests.cs    | 36 +++++++++++++++++++
 src/Umbraco.Tests/Umbraco.Tests.csproj        |  1 +
 .../config/umbracoSettings.config             |  7 ++--
 4 files changed, 59 insertions(+), 19 deletions(-)
 create mode 100644 src/Umbraco.Tests/Persistence/PetaPocoExpresionsTests.cs

diff --git a/src/Umbraco.Core/Persistence/PetaPocoSqlExtensions.cs b/src/Umbraco.Core/Persistence/PetaPocoSqlExtensions.cs
index 04f4147155..f5c0e0e616 100644
--- a/src/Umbraco.Core/Persistence/PetaPocoSqlExtensions.cs
+++ b/src/Umbraco.Core/Persistence/PetaPocoSqlExtensions.cs
@@ -34,11 +34,27 @@ namespace Umbraco.Core.Persistence
             return sql.Where(whereExpression, expresionist.GetSqlParameters());
         }
 
+        private static string GetFieldName<T>(Expression<Func<T, object>> fieldSelector, ISqlSyntaxProvider sqlSyntax)
+        {
+            var field = ExpressionHelper.FindProperty(fieldSelector) as PropertyInfo;
+            var fieldName = field.GetColumnName();
+
+            var type = typeof(T);
+            var tableName = type.GetTableName();
+
+            return sqlSyntax.GetQuotedTableName(tableName) + "." + sqlSyntax.GetQuotedColumnName(fieldName);
+        }
+
+        [Obsolete("Use the overload specifying ISqlSyntaxProvider instead")]
         public static Sql WhereIn<T>(this Sql sql, Expression<Func<T, object>> fieldSelector, IEnumerable values)
         {
-            var expresionist = new PocoToSqlExpressionHelper<T>();
-            var fieldExpression = expresionist.Visit(fieldSelector);
-            return sql.Where(fieldExpression + " IN (@values)", new {@values = values});
+            return sql.WhereIn(fieldSelector, values, SqlSyntaxContext.SqlSyntaxProvider);
+        }
+
+        public static Sql WhereIn<T>(this Sql sql, Expression<Func<T, object>> fieldSelector, IEnumerable values, ISqlSyntaxProvider sqlSyntax)
+        {
+            var fieldName = GetFieldName(fieldSelector, sqlSyntax);
+            return sql.Where(fieldName + " IN (@values)", new { values });
         }
 
         [Obsolete("Use the overload specifying ISqlSyntaxProvider instead")]
@@ -49,17 +65,7 @@ namespace Umbraco.Core.Persistence
 
         public static Sql OrderBy<TColumn>(this Sql sql, Expression<Func<TColumn, object>> columnMember, ISqlSyntaxProvider sqlSyntax)
         {
-            var column = ExpressionHelper.FindProperty(columnMember) as PropertyInfo;
-            var columnName = column.GetColumnName();
-
-            var type = typeof(TColumn);
-            var tableName = type.GetTableName();
-
-            //need to ensure the order by is in brackets, see: https://github.com/toptensoftware/PetaPoco/issues/177
-            var syntax = string.Format("({0}.{1})",
-                sqlSyntax.GetQuotedTableName(tableName),
-                sqlSyntax.GetQuotedColumnName(columnName));
-
+            var syntax = "(" + GetFieldName(columnMember, sqlSyntax) + ")";
             return sql.OrderBy(syntax);
         }
 
diff --git a/src/Umbraco.Tests/Persistence/PetaPocoExpresionsTests.cs b/src/Umbraco.Tests/Persistence/PetaPocoExpresionsTests.cs
new file mode 100644
index 0000000000..e788a833bc
--- /dev/null
+++ b/src/Umbraco.Tests/Persistence/PetaPocoExpresionsTests.cs
@@ -0,0 +1,36 @@
+using NUnit.Framework;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.SqlSyntax;
+
+namespace Umbraco.Tests.Persistence
+{
+    [TestFixture]
+    public class PetaPocoExpresionsTests
+    {
+        [Test]
+        public void WhereInValueFieldTest()
+        {
+            var syntax = SqlSyntaxContext.SqlSyntaxProvider = new SqlCeSyntaxProvider();
+            var sql = new Sql()
+                .Select("*")
+                .From<NodeDto>(syntax)
+                .WhereIn<NodeDto>(x => x.NodeId, new[] { 1, 2, 3 }, syntax);
+            Assert.AreEqual("SELECT *\nFROM [umbracoNode]\nWHERE ([umbracoNode].[id] IN (@0,@1,@2))", sql.SQL);
+        }
+
+        [Test]
+        public void WhereInObjectFieldTest()
+        {
+            // this test used to fail because x => x.Text was evaluated as a lambda
+            // and returned "[umbracoNode].[text] = @0"... had to fix WhereIn.
+
+            var syntax = SqlSyntaxContext.SqlSyntaxProvider = new SqlCeSyntaxProvider();
+            var sql = new Sql()
+                .Select("*")
+                .From<NodeDto>(syntax)
+                .WhereIn<NodeDto>(x => x.Text, new[] { "a", "b", "c" }, syntax);
+            Assert.AreEqual("SELECT *\nFROM [umbracoNode]\nWHERE ([umbracoNode].[text] IN (@0,@1,@2))", sql.SQL);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index a38e951434..9ccbe1ce6b 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -177,6 +177,7 @@
   <ItemGroup>
     <Compile Include="Migrations\MigrationIssuesTests.cs" />
     <Compile Include="Persistence\Migrations\MigrationStartupHandlerTests.cs" />
+    <Compile Include="Persistence\PetaPocoExpresionsTests.cs" />
     <Compile Include="Persistence\Repositories\RedirectUrlRepositoryTests.cs" />
     <Compile Include="TestHelpers\Entities\MockedPropertyTypes.cs" />
     <Compile Include="TryConvertToTests.cs" />
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
index dd47cd5570..fb402fcc68 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <settings>
   <content>
     <imaging>
@@ -310,10 +310,7 @@
         Configure it here if you need anything specific. Needs to be a complete url with scheme and umbraco
         path, eg http://mysite.com/umbraco. NOT just "mysite.com" or "mysite.com/umbraco" or "http://mysite.com".
   -->
-  <web.routing
-    trySkipIisCustomErrors="false"
-    internalRedirectPreservesTemplate="false" disableAlternativeTemplates="false" disableFindContentByIdPath="false"
-    umbracoApplicationUrl="">
+  <web.routing trySkipIisCustomErrors="false" internalRedirectPreservesTemplate="false" disableAlternativeTemplates="false" disableFindContentByIdPath="false" umbracoApplicationUrl="" disableRedirectUrlTracking="true">
   </web.routing>
 
 </settings>
\ No newline at end of file

From 5afeb315ba9312d35ce2a31a496b8c550910ac93 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 8 Sep 2016 10:39:56 +0200
Subject: [PATCH 2/3] U4-8954 - rename file

---
 .../{PetaPocoExpresionsTests.cs => PetaPocoExpressionsTests.cs} | 2 +-
 src/Umbraco.Tests/Umbraco.Tests.csproj                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename src/Umbraco.Tests/Persistence/{PetaPocoExpresionsTests.cs => PetaPocoExpressionsTests.cs} (96%)

diff --git a/src/Umbraco.Tests/Persistence/PetaPocoExpresionsTests.cs b/src/Umbraco.Tests/Persistence/PetaPocoExpressionsTests.cs
similarity index 96%
rename from src/Umbraco.Tests/Persistence/PetaPocoExpresionsTests.cs
rename to src/Umbraco.Tests/Persistence/PetaPocoExpressionsTests.cs
index e788a833bc..4412c25e5f 100644
--- a/src/Umbraco.Tests/Persistence/PetaPocoExpresionsTests.cs
+++ b/src/Umbraco.Tests/Persistence/PetaPocoExpressionsTests.cs
@@ -6,7 +6,7 @@ using Umbraco.Core.Persistence.SqlSyntax;
 namespace Umbraco.Tests.Persistence
 {
     [TestFixture]
-    public class PetaPocoExpresionsTests
+    public class PetaPocoExpressionsTests
     {
         [Test]
         public void WhereInValueFieldTest()
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 9ccbe1ce6b..c2c6e785ec 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -177,7 +177,7 @@
   <ItemGroup>
     <Compile Include="Migrations\MigrationIssuesTests.cs" />
     <Compile Include="Persistence\Migrations\MigrationStartupHandlerTests.cs" />
-    <Compile Include="Persistence\PetaPocoExpresionsTests.cs" />
+    <Compile Include="Persistence\PetaPocoExpressionsTests.cs" />
     <Compile Include="Persistence\Repositories\RedirectUrlRepositoryTests.cs" />
     <Compile Include="TestHelpers\Entities\MockedPropertyTypes.cs" />
     <Compile Include="TryConvertToTests.cs" />

From 8091d9a098f426fd5a026387ebab8ec780d130b0 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Fri, 16 Sep 2016 11:04:50 +0100
Subject: [PATCH 3/3] Resetting UmbracoSettings file in this PR back to what it
 was previously - seems to have been committed by mistake

---
 .../config/umbracoSettings.config             | 633 +++++++++---------
 1 file changed, 318 insertions(+), 315 deletions(-)

diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
index fb402fcc68..9eb3f135e9 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -1,316 +1,319 @@
-<?xml version="1.0" encoding="utf-8"?>
-<settings>
-  <content>
-    <imaging>
-      <!-- what file extension that should cause umbraco to create thumbnails -->
-      <imageFileTypes>jpeg,jpg,gif,bmp,png,tiff,tif</imageFileTypes>
-      <!-- what attributes that are allowed in the editor on an img tag -->
-      <allowedAttributes>src,alt,border,class,style,align,id,name,onclick,usemap</allowedAttributes>
-      <!-- automatically updates dimension, filesize and extension attributes on upload -->
-      <autoFillImageProperties>
-        <uploadField alias="umbracoFile">
-          <widthFieldAlias>umbracoWidth</widthFieldAlias>
-          <heightFieldAlias>umbracoHeight</heightFieldAlias> 
-          <lengthFieldAlias>umbracoBytes</lengthFieldAlias>
-          <extensionFieldAlias>umbracoExtension</extensionFieldAlias>
-        </uploadField>
-      </autoFillImageProperties>
-      
-    </imaging>
-    <scripteditor>
-      <!-- Path to script folder - no ending "/" -->
-      <scriptFolderPath>/scripts</scriptFolderPath>
-      <!-- what files can be opened/created in the script editor -->
-      <scriptFileTypes>js,xml</scriptFileTypes>
-      <!-- disable the codemirror editor and use a simple textarea instead -->
-      <scriptDisableEditor>false</scriptDisableEditor>
-    </scripteditor>
-
-    <!-- should umbraco store the uploaded files like /media/xxx/filename.ext or like /media/xxx-filename.ext
-		should be set to false if the application pool's user account hasn't got readrights of the driveroot up to the /media directory -->
-    <UploadAllowDirectories>True</UploadAllowDirectories>
-    <errors>
-      <!-- the id of the page that should be shown if the page is not found -->
-      <!--<error404>
-                   <errorPage culture="default">1</errorPage>
-                   <errorPage culture="en-US">200</errorPage>
-            </error404>-->
-      <error404>
-        <errorPage culture="default">1</errorPage>
-        <errorPage culture="fr-FR">1079</errorPage>
-        <errorPage culture="en-US">1080</errorPage>
-      </error404>
-    </errors>
-    <notifications>
-      <!-- the email that should be used as from mail when umbraco sends a notification -->
-      <email>your@email.here</email>
-    </notifications>
-
-    <!-- if true umbraco will ensure that no page under the same parent has an identical name -->
-    <ensureUniqueNaming>True</ensureUniqueNaming>
-
-    <!-- clean editor content with use of tidy -->
-    <TidyEditorContent>False</TidyEditorContent>
-
-    <!-- the encoding type for tidy. Default is UTF8, options are ASCII, Raw, Latin1, UTF8, ISO2022, MacroMan-->
-    <TidyCharEncoding>UTF8</TidyCharEncoding>
-
-    <!-- to enable new content schema, this needs to be false -->
-    <UseLegacyXmlSchema>false</UseLegacyXmlSchema>
-
-    <!-- Whether to force safe aliases (no spaces, no special characters) at businesslogic level on contenttypes and propertytypes -->
-    <!-- HIGHLY recommend to keep this to true to ensure valid and beautiful XML Schemas -->
-    <ForceSafeAliases>true</ForceSafeAliases>
-
-    <!-- Enable / disable xml content cache -->
-    <XmlCacheEnabled>True</XmlCacheEnabled>
-
-    <!-- Update disk cache every time content has changed -->
-    <ContinouslyUpdateXmlDiskCache>True</ContinouslyUpdateXmlDiskCache>
-
-    <!-- Update in-memory cache if xml file is changed -->
-    <XmlContentCheckForDiskChanges>False</XmlContentCheckForDiskChanges>
-
-    <!-- Show the /config/splashes/booting.aspx page while initializing content -->
-    <EnableSplashWhileLoading>False</EnableSplashWhileLoading>
-
-    <!-- Show property descriptions in editing view "icon|text|none" -->
-    <PropertyContextHelpOption>text</PropertyContextHelpOption>
-
-    <!-- The html injected into a (x)html page if Umbraco is running in preview mode -->
-    <PreviewBadge>
-      <![CDATA[<a id="umbracoPreviewBadge" style="position: absolute; top: 0; right: 0; border: 0; width: 149px; height: 149px; background: url('{1}/preview/previewModeBadge.png') no-repeat;" href="#" OnClick="javascript:window.top.location.href = '{0}/endPreview.aspx?redir={2}'"><span style="display:none;">In Preview Mode - click to end</span></a>
-    ]]></PreviewBadge>
-
-    <!-- Cache cycle of Media and Member data fetched from the umbraco.library methods -->
-    <!-- In seconds. 0 will disable cache -->
-    <UmbracoLibraryCacheDuration>1800</UmbracoLibraryCacheDuration>
-
-    <!-- Url Resolving ensures that all links works if you run Umbraco in virtual directories -->
-    <!-- Setting this to true can increase render time for pages with a large number of links -->
-    <!-- If running Umbraco in virtual directory this *must* be set to true! -->
-    <ResolveUrlsFromTextString>false</ResolveUrlsFromTextString>
-
-    <!-- How Umbraco should handle errors during macro execution. Can be one of the following values:
-         - inline - show an inline error within the macro but allow the page to continue rendering. Historial Umbraco behaviour.
-         - silent - Silently suppress the error and do not render the offending macro.
-         - throw  - Throw an exception which can be caught by the global error handler defined in Application_OnError. If no such
-                    error handler is defined then you'll see the Yellow Screen Of Death (YSOD) error page.
-         Note the error can also be handled by the umbraco.macro.Error event, where you can log/alarm with your own code and change the behaviour per event. -->
-    <MacroErrors>throw</MacroErrors>
-    
-    <!-- These file types will not be allowed to be uploaded via the upload control for media and content -->
-    <disallowedUploadFiles>ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd,swf,xml,html,htm,svg,php,htaccess</disallowedUploadFiles>
-
-    <!-- Defines the default document type property used when adding properties in the back-office (if missing or empty, defaults to Textstring -->
-    <defaultDocumentTypeProperty>Textstring</defaultDocumentTypeProperty>
-    
-  </content>
-
-  <security>
-    <!-- set to true to auto update login interval (and there by disabling the lock screen -->
-    <keepUserLoggedIn>true</keepUserLoggedIn>
-
-    <!-- change in 4.8: Disabled users are now showed dimmed and last in the tree. If you prefer not to display them set this to true -->
-    <hideDisabledUsersInBackoffice>false</hideDisabledUsersInBackoffice>
-    
-    <!-- set to true to enable the UI and API to allow back-office users to reset their passwords -->
-    <allowPasswordReset>true</allowPasswordReset>  
-    
-  </security>
-
-  <requestHandler>
-    <!-- this will ensure that urls are unique when running with multiple root nodes -->
-    <useDomainPrefixes>false</useDomainPrefixes>
-    <!-- this will add a trailing slash (/) to urls when in directory url mode -->
-    <addTrailingSlash>true</addTrailingSlash>
-    <urlReplacing removeDoubleDashes="true">
-      <char org=" ">-</char>
-      <char org="&quot;"></char>
-      <char org="'"></char>
-      <char org="%"></char>
-      <char org="."></char>
-      <char org=";"></char>
-      <char org="/"></char>
-      <char org="\"></char>
-      <char org=":"></char>
-      <char org="#"></char>
-      <char org="+">plus</char>
-      <char org="*">star</char>
-      <char org="&amp;"></char>
-      <char org="?"></char>
-      <char org="æ">ae</char>
-      <char org="ø">oe</char>
-      <char org="Ã¥">aa</char>
-      <char org="ä">ae</char>
-      <char org="ö">oe</char>
-      <char org="ü">ue</char>
-      <char org="ß">ss</char>
-      <char org="Ä">ae</char>
-      <char org="Ö">oe</char>
-      <char org="|">-</char>
-      <char org="&lt;"></char>
-      <char org="&gt;"></char>
-    </urlReplacing>
-  </requestHandler>
-
-  <templates>
-    <!-- If you want to switch to Mvc then do NOT change useAspNetMasterPages to false -->
-    <!-- This (old!) setting is still used to control how macros are inserted into your pages -->
-    <useAspNetMasterPages>true</useAspNetMasterPages>
-
-    <!-- To switch the default rendering engine to MVC, change this value from WebForms to Mvc -->
-    <!-- Do not set useAspNetMasterPages to false, it is not relevant to MVC usage -->
-    <defaultRenderingEngine>Mvc</defaultRenderingEngine>
-  </templates>
-
-
-  <!-- this is used by Umbraco to determine if there's valid classes in the /App_Code folder to be used for Rest/XSLT extensions -->
-  <developer>
-    <appCodeFileExtensions>
-      <ext>cs</ext>
-      <ext>vb</ext>
-    </appCodeFileExtensions>
-  </developer>
-
-  <scripting>
-    <razor>
-      <!-- razor DynamicNode typecasting detects XML and returns DynamicXml - Root elements that won't convert to DynamicXml -->
-      <notDynamicXmlDocumentElements>
-        <element>p</element>
-        <element>div</element>
-        <element>ul</element>
-        <element>span</element>
-      </notDynamicXmlDocumentElements>
-      <dataTypeModelStaticMappings>
-        <!--
-            <mapping dataTypeGuid="00000000-0000-0000-0000-000000000000">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
-            <mapping documentTypeAlias="textPage" nodeTypeAlias="propertyAlias">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
-            <mapping dataTypeGuid="00000000-0000-0000-0000-000000000000" documentTypeAlias="textPage" nodeTypeAlias="propertyAlias">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
-            <mapping dataTypeGuid="00000000-0000-0000-0000-000000000000" documentTypeAlias="textPage">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
-            <mapping dataTypeGuid="00000000-0000-0000-0000-000000000000" nodeTypeAlias="propertyAlias">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
-            <mapping nodeTypeAlias="propertyAlias">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
-            -->
-      </dataTypeModelStaticMappings>
-    </razor>
-  </scripting>
-
-  <!-- This moves the asp.net viewstate data to the end of the html document instead of having it in the beginning-->
-  <viewstateMoverModule enable="false" />
-
-  <!-- 
-		Now that we have Log4Net logging enabled, this section is only used for what gets logged to the umbracoLog table
-		which currently logs items used in the audit trail and roll back scenarios.
-		-->
-  <logging>
-    <enableLogging>true</enableLogging>
-    <enableAsyncLogging>true</enableAsyncLogging>
-    <disabledLogTypes>
-      <!-- <logTypeAlias>[alias-of-log-type-in-lowercase]</logTypeAlias> -->
-    </disabledLogTypes>
-    <!-- You can add your own logging tool by implementing the umbraco.BusinessLogic.Interfaces.ILog interface and add the reference here -->
-    <!-- The external logger can also act as the audit trail storage by setting the logAuditTrail attribute to true -->
-    <!--<externalLogger assembly="~/bin/assemblyFileName.dll" type="fully.qualified.namespace.and.type" logAuditTrail="false" /> -->
-  </logging>
-
-  <scheduledTasks>
-    <!-- add tasks that should be called with an interval (seconds) -->
-    <!--    <task log="true" alias="test60" interval="60" url="http://localhost/umbraco/test.aspx"/>-->
-  </scheduledTasks>
-
-  <!-- distributed calls must be enabled when using Umbraco in a load balanced environment -->
-  <distributedCall enable="false">
-    <!-- the id of the user who's making the calls -->
-    <!-- needed for security, umbraco will automatically look up correct login and passwords -->
-    <user>0</user>
-
-    <!--
-    When distributed call is enabled, you need to add all of the servers part taking in load balancing
-    to the server list below. 
-    -->
-
-    <servers>
-
-      <!-- 
-      Add ip number or hostname, make sure that it can be reached from all servers
-      you can also add optional attributes to force a protocol or port number.
-      
-      Examples:
-      
-      <server>127.0.0.1</server>
-      <server forceProtocol="http|https" forcePortnumber="80|443">127.0.0.1</server>
-      
-      Generally when setting up load balancing you will designate a 'master' server, 
-      Umbraco will always assume that the FIRST server listed in this list is the 'master'.
-      (NOTE: Not all load balancing scenarios have a 'master', depends on how you are setting it up)
-      
-      In order for scheduled tasks (including scheduled publishing) to work properly when load balancing, each 
-      server in the load balanced environment needs to know if it is the 'master'. In order for servers
-      to know this or not, they need to compare some values against the servers listed. These values
-      are either: serverName or appId. You should not enter both values but appId will always supersede serverName.
-      The serverName is the easiest and will work so long as you are not load balancing your site on the same server.
-      If you are doing this, then you will need to use appId which is equivalent to the value returned from
-      HttpRuntime.AppDomainAppId. It is recommended that you set either the serverName or appId for all servers 
-      registered here if possible, not just the first one.
-      
-      Examples:
-      
-      <server serverName="MyServer">server1.mysite.com</server>      
-      <server appId="/LM/W3SVC/69/ROOT">server1.mysite.com</server>      
-      -->
-     
-      
-    </servers>
-  </distributedCall>
-
-  <!-- Configuration for repositories -->
-  <!-- Add or remove repositories here. You will need the repository's unique key to be able to connect to it.-->
-  <repositories>
-    <repository name="Umbraco package Repository" guid="65194810-1f85-11dd-bd0b-0800200c9a66" />
-  </repositories>
-
-  <providers>
-    <users>
-      <!-- if you wish to use your own membershipprovider for authenticating to the umbraco back office -->
-      <!-- specify it here (remember to add it to the web.config as well) -->
-      <DefaultBackofficeProvider>UsersMembershipProvider</DefaultBackofficeProvider>
-    </users>
-  </providers>
-
-  <!-- Maps language, usertype, application and application_url to help pages -->
-  <help defaultUrl="http://our.umbraco.org/wiki/umbraco-help/{0}/{1}">
-    <!-- Add links that should open custom help pages -->
-    <!--<link application="content" applicationUrl="dashboard.aspx"  language="en" userType="Administrators" helpUrl="http://www.xyz.no?{0}/{1}/{2}/{3}" /> -->
-  </help>
-
-  <!-- 
-    web.routing
-      @trySkipIisCustomErrors
-        Tries to skip IIS custom errors.
-        Starting with IIS 7.5, this must be set to true for Umbraco 404 pages to show. Else, IIS will take
-        over and render its built-in error page. See MS doc for HttpResponseBase.TrySkipIisCustomErrors.
-        The default value is false, for backward compatibility reasons, which means that IIS _will_ take
-        over, and _prevent_ Umbraco 404 pages to show.
-      @internalRedirectPreservesTemplate
-        By default as soon as we're not displaying the initial document, we reset the template set by the
-        finder or by the alt. template. Set this option to true to preserve the template set by the finder
-        or by the alt. template, in case of an internal redirect.
-        (false by default, and in fact should remain false unless you know what you're doing)
-      @disableAlternativeTemplates
-        By default you can add a altTemplate querystring or append a template name to the current URL which
-        will make Umbraco render the content on the current page with the template you requested, for example:
-        http://mysite.com/about-us/?altTemplate=Home and http://mysite.com/about-us/Home would render the 
-        "About Us" page with a template with the alias Home. Setting this setting to true stops that behavior        
-      @disableFindContentByIdPath
-        By default you can call any content Id in the url and show the content with that id, for example:
-        http://mysite.com/1092 or http://mysite.com/1092.aspx would render the content with id 1092. Setting 
-        this setting to true stops that behavior
-      @umbracoApplicationUrl
-        The url of the Umbraco application. By default, Umbraco will figure it out from the first request.
-        Configure it here if you need anything specific. Needs to be a complete url with scheme and umbraco
-        path, eg http://mysite.com/umbraco. NOT just "mysite.com" or "mysite.com/umbraco" or "http://mysite.com".
-  -->
-  <web.routing trySkipIisCustomErrors="false" internalRedirectPreservesTemplate="false" disableAlternativeTemplates="false" disableFindContentByIdPath="false" umbracoApplicationUrl="" disableRedirectUrlTracking="true">
-  </web.routing>
-
+<?xml version="1.0" encoding="utf-8" ?>
+<settings>
+  <content>
+    <imaging>
+      <!-- what file extension that should cause umbraco to create thumbnails -->
+      <imageFileTypes>jpeg,jpg,gif,bmp,png,tiff,tif</imageFileTypes>
+      <!-- what attributes that are allowed in the editor on an img tag -->
+      <allowedAttributes>src,alt,border,class,style,align,id,name,onclick,usemap</allowedAttributes>
+      <!-- automatically updates dimension, filesize and extension attributes on upload -->
+      <autoFillImageProperties>
+        <uploadField alias="umbracoFile">
+          <widthFieldAlias>umbracoWidth</widthFieldAlias>
+          <heightFieldAlias>umbracoHeight</heightFieldAlias> 
+          <lengthFieldAlias>umbracoBytes</lengthFieldAlias>
+          <extensionFieldAlias>umbracoExtension</extensionFieldAlias>
+        </uploadField>
+      </autoFillImageProperties>
+      
+    </imaging>
+    <scripteditor>
+      <!-- Path to script folder - no ending "/" -->
+      <scriptFolderPath>/scripts</scriptFolderPath>
+      <!-- what files can be opened/created in the script editor -->
+      <scriptFileTypes>js,xml</scriptFileTypes>
+      <!-- disable the codemirror editor and use a simple textarea instead -->
+      <scriptDisableEditor>false</scriptDisableEditor>
+    </scripteditor>
+
+    <!-- should umbraco store the uploaded files like /media/xxx/filename.ext or like /media/xxx-filename.ext
+		should be set to false if the application pool's user account hasn't got readrights of the driveroot up to the /media directory -->
+    <UploadAllowDirectories>True</UploadAllowDirectories>
+    <errors>
+      <!-- the id of the page that should be shown if the page is not found -->
+      <!--<error404>
+                   <errorPage culture="default">1</errorPage>
+                   <errorPage culture="en-US">200</errorPage>
+            </error404>-->
+      <error404>
+        <errorPage culture="default">1</errorPage>
+        <errorPage culture="fr-FR">1079</errorPage>
+        <errorPage culture="en-US">1080</errorPage>
+      </error404>
+    </errors>
+    <notifications>
+      <!-- the email that should be used as from mail when umbraco sends a notification -->
+      <email>your@email.here</email>
+    </notifications>
+
+    <!-- if true umbraco will ensure that no page under the same parent has an identical name -->
+    <ensureUniqueNaming>True</ensureUniqueNaming>
+
+    <!-- clean editor content with use of tidy -->
+    <TidyEditorContent>False</TidyEditorContent>
+
+    <!-- the encoding type for tidy. Default is UTF8, options are ASCII, Raw, Latin1, UTF8, ISO2022, MacroMan-->
+    <TidyCharEncoding>UTF8</TidyCharEncoding>
+
+    <!-- to enable new content schema, this needs to be false -->
+    <UseLegacyXmlSchema>false</UseLegacyXmlSchema>
+
+    <!-- Whether to force safe aliases (no spaces, no special characters) at businesslogic level on contenttypes and propertytypes -->
+    <!-- HIGHLY recommend to keep this to true to ensure valid and beautiful XML Schemas -->
+    <ForceSafeAliases>true</ForceSafeAliases>
+
+    <!-- Enable / disable xml content cache -->
+    <XmlCacheEnabled>True</XmlCacheEnabled>
+
+    <!-- Update disk cache every time content has changed -->
+    <ContinouslyUpdateXmlDiskCache>True</ContinouslyUpdateXmlDiskCache>
+
+    <!-- Update in-memory cache if xml file is changed -->
+    <XmlContentCheckForDiskChanges>False</XmlContentCheckForDiskChanges>
+
+    <!-- Show the /config/splashes/booting.aspx page while initializing content -->
+    <EnableSplashWhileLoading>False</EnableSplashWhileLoading>
+
+    <!-- Show property descriptions in editing view "icon|text|none" -->
+    <PropertyContextHelpOption>text</PropertyContextHelpOption>
+
+    <!-- The html injected into a (x)html page if Umbraco is running in preview mode -->
+    <PreviewBadge>
+      <![CDATA[<a id="umbracoPreviewBadge" style="position: absolute; top: 0; right: 0; border: 0; width: 149px; height: 149px; background: url('{1}/preview/previewModeBadge.png') no-repeat;" href="#" OnClick="javascript:window.top.location.href = '{0}/endPreview.aspx?redir={2}'"><span style="display:none;">In Preview Mode - click to end</span></a>
+    ]]></PreviewBadge>
+
+    <!-- Cache cycle of Media and Member data fetched from the umbraco.library methods -->
+    <!-- In seconds. 0 will disable cache -->
+    <UmbracoLibraryCacheDuration>1800</UmbracoLibraryCacheDuration>
+
+    <!-- Url Resolving ensures that all links works if you run Umbraco in virtual directories -->
+    <!-- Setting this to true can increase render time for pages with a large number of links -->
+    <!-- If running Umbraco in virtual directory this *must* be set to true! -->
+    <ResolveUrlsFromTextString>false</ResolveUrlsFromTextString>
+
+    <!-- How Umbraco should handle errors during macro execution. Can be one of the following values:
+         - inline - show an inline error within the macro but allow the page to continue rendering. Historial Umbraco behaviour.
+         - silent - Silently suppress the error and do not render the offending macro.
+         - throw  - Throw an exception which can be caught by the global error handler defined in Application_OnError. If no such
+                    error handler is defined then you'll see the Yellow Screen Of Death (YSOD) error page.
+         Note the error can also be handled by the umbraco.macro.Error event, where you can log/alarm with your own code and change the behaviour per event. -->
+    <MacroErrors>throw</MacroErrors>
+    
+    <!-- These file types will not be allowed to be uploaded via the upload control for media and content -->
+    <disallowedUploadFiles>ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd,swf,xml,html,htm,svg,php,htaccess</disallowedUploadFiles>
+
+    <!-- Defines the default document type property used when adding properties in the back-office (if missing or empty, defaults to Textstring -->
+    <defaultDocumentTypeProperty>Textstring</defaultDocumentTypeProperty>
+    
+  </content>
+
+  <security>
+    <!-- set to true to auto update login interval (and there by disabling the lock screen -->
+    <keepUserLoggedIn>true</keepUserLoggedIn>
+
+    <!-- change in 4.8: Disabled users are now showed dimmed and last in the tree. If you prefer not to display them set this to true -->
+    <hideDisabledUsersInBackoffice>false</hideDisabledUsersInBackoffice>
+    
+    <!-- set to true to enable the UI and API to allow back-office users to reset their passwords -->
+    <allowPasswordReset>true</allowPasswordReset>  
+    
+  </security>
+
+  <requestHandler>
+    <!-- this will ensure that urls are unique when running with multiple root nodes -->
+    <useDomainPrefixes>false</useDomainPrefixes>
+    <!-- this will add a trailing slash (/) to urls when in directory url mode -->
+    <addTrailingSlash>true</addTrailingSlash>
+    <urlReplacing removeDoubleDashes="true">
+      <char org=" ">-</char>
+      <char org="&quot;"></char>
+      <char org="'"></char>
+      <char org="%"></char>
+      <char org="."></char>
+      <char org=";"></char>
+      <char org="/"></char>
+      <char org="\"></char>
+      <char org=":"></char>
+      <char org="#"></char>
+      <char org="+">plus</char>
+      <char org="*">star</char>
+      <char org="&amp;"></char>
+      <char org="?"></char>
+      <char org="æ">ae</char>
+      <char org="ø">oe</char>
+      <char org="Ã¥">aa</char>
+      <char org="ä">ae</char>
+      <char org="ö">oe</char>
+      <char org="ü">ue</char>
+      <char org="ß">ss</char>
+      <char org="Ä">ae</char>
+      <char org="Ö">oe</char>
+      <char org="|">-</char>
+      <char org="&lt;"></char>
+      <char org="&gt;"></char>
+    </urlReplacing>
+  </requestHandler>
+
+  <templates>
+    <!-- If you want to switch to Mvc then do NOT change useAspNetMasterPages to false -->
+    <!-- This (old!) setting is still used to control how macros are inserted into your pages -->
+    <useAspNetMasterPages>true</useAspNetMasterPages>
+
+    <!-- To switch the default rendering engine to MVC, change this value from WebForms to Mvc -->
+    <!-- Do not set useAspNetMasterPages to false, it is not relevant to MVC usage -->
+    <defaultRenderingEngine>Mvc</defaultRenderingEngine>
+  </templates>
+
+
+  <!-- this is used by Umbraco to determine if there's valid classes in the /App_Code folder to be used for Rest/XSLT extensions -->
+  <developer>
+    <appCodeFileExtensions>
+      <ext>cs</ext>
+      <ext>vb</ext>
+    </appCodeFileExtensions>
+  </developer>
+
+  <scripting>
+    <razor>
+      <!-- razor DynamicNode typecasting detects XML and returns DynamicXml - Root elements that won't convert to DynamicXml -->
+      <notDynamicXmlDocumentElements>
+        <element>p</element>
+        <element>div</element>
+        <element>ul</element>
+        <element>span</element>
+      </notDynamicXmlDocumentElements>
+      <dataTypeModelStaticMappings>
+        <!--
+            <mapping dataTypeGuid="00000000-0000-0000-0000-000000000000">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
+            <mapping documentTypeAlias="textPage" nodeTypeAlias="propertyAlias">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
+            <mapping dataTypeGuid="00000000-0000-0000-0000-000000000000" documentTypeAlias="textPage" nodeTypeAlias="propertyAlias">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
+            <mapping dataTypeGuid="00000000-0000-0000-0000-000000000000" documentTypeAlias="textPage">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
+            <mapping dataTypeGuid="00000000-0000-0000-0000-000000000000" nodeTypeAlias="propertyAlias">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
+            <mapping nodeTypeAlias="propertyAlias">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
+            -->
+      </dataTypeModelStaticMappings>
+    </razor>
+  </scripting>
+
+  <!-- This moves the asp.net viewstate data to the end of the html document instead of having it in the beginning-->
+  <viewstateMoverModule enable="false" />
+
+  <!-- 
+		Now that we have Log4Net logging enabled, this section is only used for what gets logged to the umbracoLog table
+		which currently logs items used in the audit trail and roll back scenarios.
+		-->
+  <logging>
+    <enableLogging>true</enableLogging>
+    <enableAsyncLogging>true</enableAsyncLogging>
+    <disabledLogTypes>
+      <!-- <logTypeAlias>[alias-of-log-type-in-lowercase]</logTypeAlias> -->
+    </disabledLogTypes>
+    <!-- You can add your own logging tool by implementing the umbraco.BusinessLogic.Interfaces.ILog interface and add the reference here -->
+    <!-- The external logger can also act as the audit trail storage by setting the logAuditTrail attribute to true -->
+    <!--<externalLogger assembly="~/bin/assemblyFileName.dll" type="fully.qualified.namespace.and.type" logAuditTrail="false" /> -->
+  </logging>
+
+  <scheduledTasks>
+    <!-- add tasks that should be called with an interval (seconds) -->
+    <!--    <task log="true" alias="test60" interval="60" url="http://localhost/umbraco/test.aspx"/>-->
+  </scheduledTasks>
+
+  <!-- distributed calls must be enabled when using Umbraco in a load balanced environment -->
+  <distributedCall enable="false">
+    <!-- the id of the user who's making the calls -->
+    <!-- needed for security, umbraco will automatically look up correct login and passwords -->
+    <user>0</user>
+
+    <!--
+    When distributed call is enabled, you need to add all of the servers part taking in load balancing
+    to the server list below. 
+    -->
+
+    <servers>
+
+      <!-- 
+      Add ip number or hostname, make sure that it can be reached from all servers
+      you can also add optional attributes to force a protocol or port number.
+      
+      Examples:
+      
+      <server>127.0.0.1</server>
+      <server forceProtocol="http|https" forcePortnumber="80|443">127.0.0.1</server>
+      
+      Generally when setting up load balancing you will designate a 'master' server, 
+      Umbraco will always assume that the FIRST server listed in this list is the 'master'.
+      (NOTE: Not all load balancing scenarios have a 'master', depends on how you are setting it up)
+      
+      In order for scheduled tasks (including scheduled publishing) to work properly when load balancing, each 
+      server in the load balanced environment needs to know if it is the 'master'. In order for servers
+      to know this or not, they need to compare some values against the servers listed. These values
+      are either: serverName or appId. You should not enter both values but appId will always supersede serverName.
+      The serverName is the easiest and will work so long as you are not load balancing your site on the same server.
+      If you are doing this, then you will need to use appId which is equivalent to the value returned from
+      HttpRuntime.AppDomainAppId. It is recommended that you set either the serverName or appId for all servers 
+      registered here if possible, not just the first one.
+      
+      Examples:
+      
+      <server serverName="MyServer">server1.mysite.com</server>      
+      <server appId="/LM/W3SVC/69/ROOT">server1.mysite.com</server>      
+      -->
+     
+      
+    </servers>
+  </distributedCall>
+
+  <!-- Configuration for repositories -->
+  <!-- Add or remove repositories here. You will need the repository's unique key to be able to connect to it.-->
+  <repositories>
+    <repository name="Umbraco package Repository" guid="65194810-1f85-11dd-bd0b-0800200c9a66" />
+  </repositories>
+
+  <providers>
+    <users>
+      <!-- if you wish to use your own membershipprovider for authenticating to the umbraco back office -->
+      <!-- specify it here (remember to add it to the web.config as well) -->
+      <DefaultBackofficeProvider>UsersMembershipProvider</DefaultBackofficeProvider>
+    </users>
+  </providers>
+
+  <!-- Maps language, usertype, application and application_url to help pages -->
+  <help defaultUrl="http://our.umbraco.org/wiki/umbraco-help/{0}/{1}">
+    <!-- Add links that should open custom help pages -->
+    <!--<link application="content" applicationUrl="dashboard.aspx"  language="en" userType="Administrators" helpUrl="http://www.xyz.no?{0}/{1}/{2}/{3}" /> -->
+  </help>
+
+  <!-- 
+    web.routing
+      @trySkipIisCustomErrors
+        Tries to skip IIS custom errors.
+        Starting with IIS 7.5, this must be set to true for Umbraco 404 pages to show. Else, IIS will take
+        over and render its built-in error page. See MS doc for HttpResponseBase.TrySkipIisCustomErrors.
+        The default value is false, for backward compatibility reasons, which means that IIS _will_ take
+        over, and _prevent_ Umbraco 404 pages to show.
+      @internalRedirectPreservesTemplate
+        By default as soon as we're not displaying the initial document, we reset the template set by the
+        finder or by the alt. template. Set this option to true to preserve the template set by the finder
+        or by the alt. template, in case of an internal redirect.
+        (false by default, and in fact should remain false unless you know what you're doing)
+      @disableAlternativeTemplates
+        By default you can add a altTemplate querystring or append a template name to the current URL which
+        will make Umbraco render the content on the current page with the template you requested, for example:
+        http://mysite.com/about-us/?altTemplate=Home and http://mysite.com/about-us/Home would render the 
+        "About Us" page with a template with the alias Home. Setting this setting to true stops that behavior        
+      @disableFindContentByIdPath
+        By default you can call any content Id in the url and show the content with that id, for example:
+        http://mysite.com/1092 or http://mysite.com/1092.aspx would render the content with id 1092. Setting 
+        this setting to true stops that behavior
+      @umbracoApplicationUrl
+        The url of the Umbraco application. By default, Umbraco will figure it out from the first request.
+        Configure it here if you need anything specific. Needs to be a complete url with scheme and umbraco
+        path, eg http://mysite.com/umbraco. NOT just "mysite.com" or "mysite.com/umbraco" or "http://mysite.com".
+  -->
+  <web.routing
+    trySkipIisCustomErrors="false"
+    internalRedirectPreservesTemplate="false" disableAlternativeTemplates="false" disableFindContentByIdPath="false"
+    umbracoApplicationUrl="">
+  </web.routing>
+
 </settings>
\ No newline at end of file