From a9f5419a792811145ec39f0dc8147fdb48e85706 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Thu, 17 Aug 2017 13:33:01 +0200
Subject: [PATCH 01/57] Refactoring

---
 .../XmlDataProviderDocumentCache.cs           | 22 ++++++++--------
 .../XmlDataProvider/XmlDataTypeStore.cs       | 25 ++++++++-----------
 2 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/Composite/Plugins/Data/DataProviders/XmlDataProvider/Foundation/XmlDataProviderDocumentCache.cs b/Composite/Plugins/Data/DataProviders/XmlDataProvider/Foundation/XmlDataProviderDocumentCache.cs
index 8fd6e53d86..9873e2b6a5 100644
--- a/Composite/Plugins/Data/DataProviders/XmlDataProvider/Foundation/XmlDataProviderDocumentCache.cs
+++ b/Composite/Plugins/Data/DataProviders/XmlDataProvider/Foundation/XmlDataProviderDocumentCache.cs
@@ -47,10 +47,7 @@ internal static void RegisterExternalFileChangeAction(string filename, Action ac
         }
 
 
-        public static object SyncRoot
-        {
-            get { return _documentEditingSyncRoot; }
-        }
+        public static object SyncRoot => _documentEditingSyncRoot;
 
 
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Composite.IO", "Composite.DoNotUseFileClass:DoNotUseFileClass", Justification = "This is what we want, handle broken saves")]
@@ -132,7 +129,7 @@ private static List<XElement> ExtractElements(XDocument xDocument)
 
             xDocument.Root.RemoveNodes();
 
-            return result;  
+            return result;
         }
 
 
@@ -157,13 +154,15 @@ private static void SaveChanges(FileRecord fileRecord)
         /// <returns></returns>
         private static IList<C1FileInfo> GetCandidateFiles(string filePath)
         {
-            List<C1FileInfo> files = new List<C1FileInfo>();
+            var files = new List<C1FileInfo>();
             if (C1File.Exists(filePath))
             {
                 files.Add(new C1FileInfo(filePath));
             }
 
-            var tmpFilePaths = C1Directory.GetFiles(Path.GetDirectoryName(filePath), string.Format("{0}.*.tmp", Path.GetFileName(filePath)));
+            var tmpFilePaths = C1Directory.GetFiles(
+                Path.GetDirectoryName(filePath), 
+                $"{Path.GetFileName(filePath)}.*.tmp");
 
             foreach (string tmpFilePath in tmpFilePaths)
             {
@@ -331,19 +330,19 @@ private static FileRecord LoadFileRecordFromDisk(string filePath, string element
                     }
                     catch (Exception)
                     {
-                        Log.LogWarning(LogTitle, "Failed to clean up ghost file '{0}'.", filePath);
+                        Log.LogWarning(LogTitle, $"Failed to clean up ghost file '{filePath}'.");
                     }
                 }
             }
 
-            DateTime lastModifiedFileDate = usedFile != null ? usedFile.LastWriteTime : DateTime.Now;
+            DateTime lastModifiedFileDate = usedFile?.LastWriteTime ?? DateTime.Now;
 
             return new FileRecord
             {
                 FilePath = filePath,
                 ElementName = elementName,
                 RecordSet = new RecordSet { Index = index },
-                ReadOnlyElementsList = new List<XElement>(elements),
+                ReadOnlyElementsList = elements,
                 LastModified = DateTime.Now,
                 FileModificationDate = lastModifiedFileDate
             };
@@ -356,8 +355,7 @@ private static XDocument TryLoad(C1FileInfo candidateFile)
             XDocument dataDocument = null;
             try
             {
-                XmlReaderSettings xmlReaderSettings = new XmlReaderSettings();
-                xmlReaderSettings.CheckCharacters = false;
+                var xmlReaderSettings = new XmlReaderSettings { CheckCharacters = false };
 
                 using (XmlReader xmlReader = XmlReaderUtils.Create(candidateFile.FullName, xmlReaderSettings))
                 {
diff --git a/Composite/Plugins/Data/DataProviders/XmlDataProvider/XmlDataTypeStore.cs b/Composite/Plugins/Data/DataProviders/XmlDataProvider/XmlDataTypeStore.cs
index 7a3c41bf46..d9a7d52735 100644
--- a/Composite/Plugins/Data/DataProviders/XmlDataProvider/XmlDataTypeStore.cs
+++ b/Composite/Plugins/Data/DataProviders/XmlDataProvider/XmlDataTypeStore.cs
@@ -20,7 +20,7 @@ namespace Composite.Plugins.Data.DataProviders.XmlDataProvider
     /// This class contains one entry per data-scope/locale-scope that contains
     /// the filename and element name.
     /// </summary>
-    [DebuggerDisplay("{DataTypeDescriptor}")]
+    [DebuggerDisplay("{" + nameof(DataTypeDescriptor) + "}")]
     internal sealed class XmlDataTypeStore
     {
         private IXmlDataProviderHelper _helper;
@@ -30,12 +30,9 @@ internal sealed class XmlDataTypeStore
 
         public XmlDataTypeStore(DataTypeDescriptor dataTypeDescriptor, Type dataProviderHelperType, Type dataIdClassType, IEnumerable<XmlDataTypeStoreDataScope> xmlDateTypeStoreDataScopes, bool isGeneratedDataType)
         {
-            if (dataProviderHelperType == null) throw new ArgumentNullException("dataProviderHelperType");
-            if (dataIdClassType == null) throw new ArgumentNullException("dataIdClassType");
-
-            DataTypeDescriptor =  dataTypeDescriptor;
-            DataProviderHelperType = dataProviderHelperType;
-            DataIdClassType = dataIdClassType;
+            DataTypeDescriptor =  dataTypeDescriptor ?? throw new ArgumentNullException(nameof(dataTypeDescriptor));
+            DataProviderHelperType = dataProviderHelperType ?? throw new ArgumentNullException(nameof(dataProviderHelperType));
+            DataIdClassType = dataIdClassType ?? throw new ArgumentNullException(nameof(dataIdClassType));
             IsGeneratedDataType = isGeneratedDataType;
 
             _xmlDateTypeStoreDataScopes = xmlDateTypeStoreDataScopes.Evaluate();
@@ -62,17 +59,16 @@ public XmlDataTypeStore(DataTypeDescriptor dataTypeDescriptor, Type dataProvider
         }
 
 
-        public DataTypeDescriptor DataTypeDescriptor { get; private set; }
+        public DataTypeDescriptor DataTypeDescriptor { get; }
 
         /// <summary>
         /// This is a implementation of <see cref="IXmlDataProviderHelper"/> and <see cref="Composite.Plugins.Data.DataProviders.XmlDataProvider.CodeGeneration.DataProviderHelperBase"/>
         /// </summary>
-        public Type DataProviderHelperType { get; private set; }
-
-        public Type DataIdClassType { get; private set; }
+        public Type DataProviderHelperType { get; }
 
+        public Type DataIdClassType { get; }
 
-        public bool IsGeneratedDataType { get; private set; }
+        public bool IsGeneratedDataType { get; }
 
 
         public bool HasDataScopeName(DataScopeIdentifier dataScopeIdentifier)
@@ -103,8 +99,7 @@ public XmlDataTypeStoreDataScope GetDataScope(DataScopeIdentifier dataScope, Cul
             {
                 if (culture.Equals(CultureInfo.InvariantCulture) && DataLocalizationFacade.IsLocalized(type))
                 {
-                    throw new InvalidOperationException("Failed to get data for type '{0}', no localization scope is provided for a localized type."
-                        .FormatWith(type.FullName));
+                    throw new InvalidOperationException($"Failed to get data for type '{type.FullName}', no localization scope is provided for a localized type.");
                 }
 
                 throw new InvalidOperationException("Failed to get '{0}' data for data scope ({1}, {2})"
@@ -115,7 +110,7 @@ public XmlDataTypeStoreDataScope GetDataScope(DataScopeIdentifier dataScope, Cul
         }
 
 
-        internal IEnumerable<XmlDataTypeStoreDataScope> XmlDataTypeStoreDataScopes { get { return _xmlDateTypeStoreDataScopes; } }
+        internal IEnumerable<XmlDataTypeStoreDataScope> XmlDataTypeStoreDataScopes => _xmlDateTypeStoreDataScopes;
 
 
         public IXmlDataProviderHelper Helper

From 2e98ca3eae633c14f0f35c1bce6bad371a5cec65 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Fri, 18 Aug 2017 13:12:08 +0200
Subject: [PATCH 02/57] Fixing exceptions in the code handling the externally
 added workflows

---
 .../Workflow/FilePersistenceService.cs        |  2 +-
 .../C1Console/Workflow/WorkflowFacadeImpl.cs  | 35 ++++++++++---------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/Composite/C1Console/Workflow/FilePersistenceService.cs b/Composite/C1Console/Workflow/FilePersistenceService.cs
index 3f22a2f45d..cc7b6c11e0 100644
--- a/Composite/C1Console/Workflow/FilePersistenceService.cs
+++ b/Composite/C1Console/Workflow/FilePersistenceService.cs
@@ -25,7 +25,7 @@ internal class FileWorkflowPersistenceService : WorkflowPersistenceService
 
         private C1FileSystemWatcher _fileWatcher;
 
-        private readonly ConcurrentDictionary<Guid, byte> _createdWorkflows = new ConcurrentDictionary<Guid, byte>();
+        private static readonly ConcurrentDictionary<Guid, byte> _createdWorkflows = new ConcurrentDictionary<Guid, byte>();
 
         public FileWorkflowPersistenceService(string baseDirectory)
         {
diff --git a/Composite/C1Console/Workflow/WorkflowFacadeImpl.cs b/Composite/C1Console/Workflow/WorkflowFacadeImpl.cs
index d00013e8bc..2f4f3504f0 100644
--- a/Composite/C1Console/Workflow/WorkflowFacadeImpl.cs
+++ b/Composite/C1Console/Workflow/WorkflowFacadeImpl.cs
@@ -197,12 +197,12 @@ public WorkflowInstance CreateNewWorkflow(Type workflowType, Dictionary<string,
             }
             catch (WorkflowValidationFailedException exp)
             {
-                StringBuilder errors = new StringBuilder();
+                var errors = new StringBuilder();
                 foreach (ValidationError error in exp.Errors)
                 {
-
                     errors.AppendLine(error.ToString());
                 }
+
                 Log.LogError("WorkflowFacade", errors.ToString());
                 throw;
             }
@@ -1215,12 +1215,15 @@ private void OnNewWorkflowFileAdded(Guid instanceId)
             if (HostingEnvironment.ApplicationHost.ShutdownInitiated()) return;
             Log.LogInformation(LogTitle, "New workflow detected: " + instanceId);
 
-            LoadPersistedWorkflow(instanceId);
-
-            string formDataFilename = GetFormDataFileName(instanceId);
-            if (C1File.Exists(formDataFilename))
+            using (ThreadDataManager.EnsureInitialize())
             {
-                TryLoadPersistedFormData(formDataFilename);
+                LoadPersistedWorkflow(instanceId);
+
+                string formDataFilename = GetFormDataFileName(instanceId);
+                if (C1File.Exists(formDataFilename))
+                {
+                    TryLoadPersistedFormData(formDataFilename);
+                }
             }
         }
 
@@ -1429,9 +1432,7 @@ private static string SerializedWorkflowsDirectory
 
         private static bool ConsoleIdEquals(FlowControllerServicesContainer flowControllerServicesContainer, string consoleId)
         {
-            if (flowControllerServicesContainer == null) return false;
-
-            var managementConsoleMessageService = flowControllerServicesContainer.GetService<IManagementConsoleMessageService>();
+            var managementConsoleMessageService = flowControllerServicesContainer?.GetService<IManagementConsoleMessageService>();
 
             if (managementConsoleMessageService == null) return false;
 
@@ -1460,16 +1461,16 @@ public Resources()
                 this.EventHandleFilters = new Dictionary<Type, IEventHandleFilter>();
             }
 
-            public Dictionary<Guid, WorkflowInstanceStatus> WorkflowStatusDictionary { get; set; }
-            public Dictionary<Guid, FormData> FormData { get; set; }
-            public Dictionary<Guid, FlowControllerServicesContainer> FlowControllerServicesContainers { get; set; }
+            public Dictionary<Guid, WorkflowInstanceStatus> WorkflowStatusDictionary { get; }
+            public Dictionary<Guid, FormData> FormData { get; }
+            public Dictionary<Guid, FlowControllerServicesContainer> FlowControllerServicesContainers { get; }
 
-            public Dictionary<Guid, WorkflowPersistingType> WorkflowPersistingTypeDictionary { get; set; }
+            public Dictionary<Guid, WorkflowPersistingType> WorkflowPersistingTypeDictionary { get; }
 
-            public Dictionary<Guid, Semaphore> WorkflowIdleWaitSemaphores { get; set; }
-            public Dictionary<int, Exception> ExceptionFromWorkflow { get; set; }
+            public Dictionary<Guid, Semaphore> WorkflowIdleWaitSemaphores { get; private set; }
+            public Dictionary<int, Exception> ExceptionFromWorkflow { get; private set; }
 
-            public Dictionary<Type, IEventHandleFilter> EventHandleFilters { get; set; }
+            public Dictionary<Type, IEventHandleFilter> EventHandleFilters { get; }
 
             public static void InitializeResources(Resources resources)
             {

From d17e759384a85255389b4c60d6064cfef9d5de68 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Tue, 22 Aug 2017 15:21:01 +0200
Subject: [PATCH 03/57] Compatibility fix for the
 EntityToken.DoDeserialize(..., out Dictionary<string,string> dictionary)
 method

---
 Composite/C1Console/Security/EntityToken.cs | 75 +++++++++++----------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/Composite/C1Console/Security/EntityToken.cs b/Composite/C1Console/Security/EntityToken.cs
index 9c1696c816..07823a8dc7 100644
--- a/Composite/C1Console/Security/EntityToken.cs
+++ b/Composite/C1Console/Security/EntityToken.cs
@@ -88,51 +88,55 @@ protected string DoSerialize()
         }
 
 
-
         /// <exclude />
         protected static void DoDeserialize(string serializedEntityToken, out string type, out string source, out string id)
         {
-            if(CompositeJsonSerializer.IsJsonSerialized(serializedEntityToken))
+            DoDeserialize(serializedEntityToken, out type, out source, out id, 
+                          out Dictionary<string, string> _);
+        }
+
+
+        /// <exclude />
+        protected static void DoDeserialize(string serializedEntityToken, out string type, out string source, out string id, out Dictionary<string, string> dictionary)
+        {
+            if (!CompositeJsonSerializer.IsJsonSerialized(serializedEntityToken))
             {
-                var entityToken =
-                    CompositeJsonSerializer.Deserialize<Dictionary<string, string>>(serializedEntityToken);
-                if (entityToken.ContainsKey(nameof(Type)) &&
-                    entityToken.ContainsKey(nameof(Source)) &&
-                    entityToken.ContainsKey(nameof(Id)))
-                {
-                    type = entityToken[nameof(Type)];
-                    source = entityToken[nameof(Source)];
-                    id = entityToken[nameof(Id)];
-                }
-                else
-                {
-                    throw new ArgumentException("Is not a serialized entity token", nameof(serializedEntityToken));
-                }
+                DoDeserializeLegacy(serializedEntityToken, out type, out source, out id, out dictionary);
+                return;
             }
-            else
-            {
-                Dictionary<string, string> dic;
 
-                DoDeserialize(serializedEntityToken, out type, out source, out id, out dic);
+            var properties = CompositeJsonSerializer.Deserialize<Dictionary<string, string>>(serializedEntityToken);
+
+            if (!properties.TryGetValue(nameof(Type), out type)
+                || !properties.TryGetValue(nameof(Source), out source)
+                || !properties.TryGetValue(nameof(Id), out id))
+            {
+                throw new ArgumentException("Is not a serialized entity token", nameof(serializedEntityToken));
             }
-            
+
+            properties.Remove(nameof(Type));
+            properties.Remove(nameof(Source));
+            properties.Remove(nameof(Id));
+
+            dictionary = properties;
         }
 
+
         /// <exclude />
-        protected static void DoDeserialize(string serializedEntityToken, out string type, out string source, out string id, out Dictionary<string, string> dic)
+        private static void DoDeserializeLegacy(string serializedEntityToken, out string type, out string source, out string id, out Dictionary<string, string> dic)
         {
             dic = StringConversionServices.ParseKeyValueCollection(serializedEntityToken);
-
-            if (!dic.ContainsKey("_EntityToken_Type_") ||
-                !dic.ContainsKey("_EntityToken_Source_") ||
-                !dic.ContainsKey("_EntityToken_Id_"))
+            
+            if (!dic.TryGetValue("_EntityToken_Type_", out string serializedType) ||
+                !dic.TryGetValue("_EntityToken_Source_", out string serializedSource) ||
+                !dic.TryGetValue("_EntityToken_Id_", out string serializedId))
             {
                 throw new ArgumentException("Is not a serialized entity token", nameof(serializedEntityToken));
             }
 
-            type = StringConversionServices.DeserializeValueString(dic["_EntityToken_Type_"]);
-            source = StringConversionServices.DeserializeValueString(dic["_EntityToken_Source_"]);
-            id = StringConversionServices.DeserializeValueString(dic["_EntityToken_Id_"]);
+            type = StringConversionServices.DeserializeValueString(serializedType);
+            source = StringConversionServices.DeserializeValueString(serializedSource);
+            id = StringConversionServices.DeserializeValueString(serializedId);
         }
 
 
@@ -145,7 +149,7 @@ protected static void DoDeserialize(string serializedEntityToken, out string typ
         /// <exclude />
         public virtual string GetPrettyHtml(Dictionary<string, string> piggybag)
         {
-            EntityTokenHtmlPrettyfier entityTokenHtmlPrettyfier = new EntityTokenHtmlPrettyfier(this, piggybag);
+            var entityTokenHtmlPrettyfier = new EntityTokenHtmlPrettyfier(this, piggybag);
 
             OnGetPrettyHtml(entityTokenHtmlPrettyfier);
 
@@ -175,13 +179,10 @@ public virtual void OnGetPrettyHtml(EntityTokenHtmlPrettyfier entityTokenHtmlPre
         /// <exclude />
         public override bool Equals(object obj)
         {
-            EntityToken entityToken = obj as EntityToken;
-
-            if (entityToken == null) return false;
-
-            if (entityToken.GetVersionHashCode() != GetVersionHashCode()) return false;
-
-            return entityToken.VersionId == this.VersionId && EqualsWithVersionIgnore(entityToken);
+            return obj is EntityToken entityToken
+                   && entityToken.GetVersionHashCode() == GetVersionHashCode()
+                   && entityToken.VersionId == this.VersionId 
+                   && EqualsWithVersionIgnore(entityToken);
         }
 
         /// <exclude />

From 7709a55d1db7e5bc7302e173f71769efa9bc1864 Mon Sep 17 00:00:00 2001
From: Inna Boitsun <inna.boytsun.85@gmail.com>
Date: Mon, 28 Aug 2017 15:08:52 +0300
Subject: [PATCH 04/57] Add primaryColor variable to be able to use in
 different styled components

---
 Website/Composite/console/components/colors.js | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/Website/Composite/console/components/colors.js b/Website/Composite/console/components/colors.js
index a0e4f93b2b..6084a61daa 100644
--- a/Website/Composite/console/components/colors.js
+++ b/Website/Composite/console/components/colors.js
@@ -1,16 +1,22 @@
-export default {
-	baseFontColor: '#333',
+export default {
+    primaryColor: '#22B980',
+    baseFontColor: '#333',
+    mutedTextColor: '#999',
+    borderColor: '#ccc',
+    darkBackground: '#EFEFEF',
+
+	/* BUTTON */
 	buttonTextColor: '#575757',
-	borderColor: '#ccc',
-	darkBackground: '#EFEFEF',
 	buttonDropShadowColor: '#DDD',
 	buttonHighlightColor: '#22B980',
-	buttonShadingColor: '#1ea371',
+    buttonShadingColor: '#1ea371',
+	/* end BUTTON */
+
 	fieldsetBackgroundColor: '#F7F7F7',
 	fieldsetLegendColor: '#22B980',
 	fieldFocusColor: '#22B980',
 	dialogHeaderColor: '#22B980',
-	fieldLabelColor: '#999',
+    fieldLabelColor: '#999',
 	scrollbarThumbColor: '#CACACA',
 	scrollbarTrackColor: '#FAFAFA',
 	tableBorderColor: '#DDD',

From c4512745de1c58c95a151ae6da82d38a38b2e0d6 Mon Sep 17 00:00:00 2001
From: Marcus Wendt <marcus.wendt@orckestra.com>
Date: Thu, 31 Aug 2017 14:54:02 +0200
Subject: [PATCH 05/57] Update README.md

adding link to reviews
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 7474778182..f135ffcf1d 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-# C1 CMS Foundation
+# C1 CMS Foundation[![Reviews here...!](http://hackathon.composite.net/maw/github/reviews.png)](https://www.facebook.com/pg/C1CMS/reviews)
 
 C1 CMS Foundation - a .NET based Web Content Management System, open source and a bundle of joy!
 
-[![screen shots from the new C1 user interface (the C1 Console)](http://hackathon.composite.net/maw/github/6-pack-screenshots-small.png)](http://hackathon.composite.net/maw/github/6-pack-screenshots.png)
+[![screen shots from the new C1 user interface (the C1 Console)](http://hackathon.composite.net/maw/github/6-pack-screenshots-smallr.png)](http://hackathon.composite.net/maw/github/6-pack-screenshots.png)
 
 [![Join the chat at https://gitter.im/Orckestra/C1-CMS](https://badges.gitter.im/Orckestra/C1-CMS.svg)](https://gitter.im/Orckestra/C1-CMS?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 

From a4e898da43ca6d27e80003d0c3063130176ad94a Mon Sep 17 00:00:00 2001
From: Marcus Wendt <marcus.wendt@orckestra.com>
Date: Fri, 1 Sep 2017 12:47:31 +0200
Subject: [PATCH 06/57] Update README.md

Fixing bad screenshot url
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f135ffcf1d..7634b0528b 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 C1 CMS Foundation - a .NET based Web Content Management System, open source and a bundle of joy!
 
-[![screen shots from the new C1 user interface (the C1 Console)](http://hackathon.composite.net/maw/github/6-pack-screenshots-smallr.png)](http://hackathon.composite.net/maw/github/6-pack-screenshots.png)
+[![screen shots from the new C1 user interface (the C1 Console)](http://hackathon.composite.net/maw/github/6-pack-screenshots-small.png)](http://hackathon.composite.net/maw/github/6-pack-screenshots.png)
 
 [![Join the chat at https://gitter.im/Orckestra/C1-CMS](https://badges.gitter.im/Orckestra/C1-CMS.svg)](https://gitter.im/Orckestra/C1-CMS?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 

From 5ac96fadb1a9f38ecd259b9296116883adc8e294 Mon Sep 17 00:00:00 2001
From: Inna Boitsun <inna.boytsun.85@gmail.com>
Date: Tue, 5 Sep 2017 13:41:50 +0300
Subject: [PATCH 07/57] Added TextArea presantation component

---
 .../Composite/console/components/colors.js    |  6 +++--
 .../components/presentation/TextArea.js       | 27 +++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 Website/Composite/console/components/presentation/TextArea.js

diff --git a/Website/Composite/console/components/colors.js b/Website/Composite/console/components/colors.js
index 6084a61daa..16d42c1b0f 100644
--- a/Website/Composite/console/components/colors.js
+++ b/Website/Composite/console/components/colors.js
@@ -14,9 +14,11 @@
 
 	fieldsetBackgroundColor: '#F7F7F7',
 	fieldsetLegendColor: '#22B980',
-	fieldFocusColor: '#22B980',
-	dialogHeaderColor: '#22B980',
+    fieldFocusColor: '#22B980',
+    fieldBorderColor: '#ccc',
     fieldLabelColor: '#999',
+
+    dialogHeaderColor: '#22B980',
 	scrollbarThumbColor: '#CACACA',
 	scrollbarTrackColor: '#FAFAFA',
 	tableBorderColor: '#DDD',
diff --git a/Website/Composite/console/components/presentation/TextArea.js b/Website/Composite/console/components/presentation/TextArea.js
new file mode 100644
index 0000000000..8fe01c5389
--- /dev/null
+++ b/Website/Composite/console/components/presentation/TextArea.js
@@ -0,0 +1,27 @@
+import styled from 'styled-components';
+import colors from 'console/components/colors.js';
+
+const Textarea = styled.textarea`
+	box-sizing: border-box;
+	vertical-align: middle;
+	display: block;
+	border: 1px solid ${colors.fieldBorderColor};
+	border-radius: 4px;
+	padding: 5px 7px;
+	margin: 2px 0 7px 0;
+	background-color: #fff;
+	height: 90px;
+	overflow: hidden;
+	width: ${props => !props.withHelp ? '100%' : 'calc(100% - 20px)'};
+
+
+	&:focus {
+		border-color: ${colors.fieldFocusColor};
+	}
+`;
+
+Textarea.defaultProps = {
+	value: ''
+};
+
+export default Textarea;

From fc9b540b028dbcf224c881841f4b6d3a24c0fbee Mon Sep 17 00:00:00 2001
From: Inna Boitsun <inna.boytsun.85@gmail.com>
Date: Wed, 6 Sep 2017 13:32:27 +0300
Subject: [PATCH 08/57] Added TextArea to DataField presantation and use it in
 Products Sets feature

---
 .../components/presentation/DataField.js      | 49 +++++++++++--------
 .../components/presentation/HelpIcon.js       |  5 +-
 .../console/components/presentation/Input.js  | 13 ++---
 3 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/Website/Composite/console/components/presentation/DataField.js b/Website/Composite/console/components/presentation/DataField.js
index 74552d3c14..4c92d65a6f 100644
--- a/Website/Composite/console/components/presentation/DataField.js
+++ b/Website/Composite/console/components/presentation/DataField.js
@@ -1,8 +1,9 @@
-import React, { PropTypes } from 'react';
+import React, { PropTypes } from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import HelpIcon from 'console/components/presentation/HelpIcon.js';
 import Select from 'console/components/presentation/Select.js';
 import Input from 'console/components/presentation/Input.js';
+import TextArea from 'console/components/presentation/TextArea.js';
 import Checkbox from 'console/components/presentation/Checkbox.js';
 import styled from 'styled-components';
 import colors from 'console/components/colors.js';
@@ -17,8 +18,10 @@ const Headline = styled.h4`
 
 const Label = styled.label`
 	display: inline-block;
-	padding-left: 10px;
-	padding-right: 0;
+	margin: 0;
+	font-size: 12px;
+	padding: 5px 0 4px 0;
+	color: ${colors.fieldLabelColor};
 	width: calc(100% - 56px);
 `;
 
@@ -51,33 +54,37 @@ const DataField = props => {
 				clearable={false}
 				multi={false}
 				options={options}
-				onChange={handleChange}
-				placeholder={props.placeholder}>
+                onChange={handleChange}
+  				placeholder={props.placeholder}>
 			</Select>;
-		break;
+        break;
+    case 'textarea':
+            inputElement = <TextArea
+             {...props}
+             withHelp={props.help ? true : false} />;
+            break;
 	default:
-		handleChange = function (event) {
-			props.updateValue(event.target.value);
-		};
-		inputElement = <Input
-			type={props.type}
-			id={props.name}
-			value={props.value}
+            inputElement = <Input
+            {...props}
 			onContextMenu={event => {
 				event.stopPropagation(); // to ensure default context menu is shown here
-			}}
-			onChange={handleChange}/>;
+            }}
+            withHelp={props.help ? true : false}
+			/>;
 	}
 
 	return (
 		<DataFieldWrapper>
-			{props.headline ?
-				<Headline>{props.headline}</Headline> :
-				null}
-			{inputElement}
+            {
+				// props.headline ?
+				//	<Headline>{props.headline}</Headline> :
+                //	null
+            }
+			
 			{props.label ?
 				<Label htmlFor={props.name}>{props.label}</Label> :
-				null}
+                null}
+            {inputElement}
 			{props.help ? <HelpIcon text={props.help} /> : null}
 		</DataFieldWrapper>
 	);
@@ -86,7 +93,7 @@ const DataField = props => {
 DataField.propTypes = {
 	type: PropTypes.string,
 	options: ImmutablePropTypes.listOf(ImmutablePropTypes.map),
-	updateValue: PropTypes.func.isRequired,
+    updateValue: PropTypes.func,
 	name: PropTypes.string.isRequired,
 	headline: PropTypes.string,
 	label: PropTypes.string,
diff --git a/Website/Composite/console/components/presentation/HelpIcon.js b/Website/Composite/console/components/presentation/HelpIcon.js
index 0534f29706..2eb5ca41ad 100644
--- a/Website/Composite/console/components/presentation/HelpIcon.js
+++ b/Website/Composite/console/components/presentation/HelpIcon.js
@@ -1,10 +1,11 @@
-import React, { PropTypes } from 'react';
+import React, { PropTypes } from 'react';
 import styled from 'styled-components';
 import colors from 'console/components/colors.js';
 
 const Span = styled.span`
 	position: absolute;
-	right: 0;
+	right: -8px;
+	top: 20px;
 
 	&::after {
 		content: "?";
diff --git a/Website/Composite/console/components/presentation/Input.js b/Website/Composite/console/components/presentation/Input.js
index 7260054e26..4620e039c9 100644
--- a/Website/Composite/console/components/presentation/Input.js
+++ b/Website/Composite/console/components/presentation/Input.js
@@ -1,17 +1,18 @@
-import styled from 'styled-components';
+import styled from 'styled-components';
 import colors from 'console/components/colors.js';
 
 const Input = styled.input`
 	vertical-align: middle;
-	display: inline-block;
-	border: 1px solid #ccc;
-	border-radius: 5px;
+	box-sizing: border-box;
+	display: block;
+	border: 1px solid ${colors.fieldBorderColor};
+	border-radius: 4px;
 	padding: 5px 7px;
 	margin: 2px 1px 7px 2px;
 	background-color: #fff;
-	width: calc(100% - 50px);
-	height: 20px;
+	height: 30px;
 	overflow: hidden;
+	width: ${props => !props.withHelp ? '100%' : 'calc(100% - 20px)'};
 
 	&:focus {
 		border-color: ${colors.fieldFocusColor};

From ff2691b0fe15cbfb338a282909d4c9d0e54ca0f2 Mon Sep 17 00:00:00 2001
From: Inna Boitsun <inna.boytsun.85@gmail.com>
Date: Wed, 6 Sep 2017 14:04:04 +0300
Subject: [PATCH 09/57] Extracted DataFieldLabel.js and DataFieldWrapper.js to
 separate components, so it can be reused (f.e. in ProductSets)

---
 .../components/presentation/DataField.js        | 16 +++-------------
 .../components/presentation/DataFieldLabel.js   | 17 +++++++++++++++++
 .../components/presentation/DataFieldWrapper.js | 17 +++++++++++++++++
 3 files changed, 37 insertions(+), 13 deletions(-)
 create mode 100644 Website/Composite/console/components/presentation/DataFieldLabel.js
 create mode 100644 Website/Composite/console/components/presentation/DataFieldWrapper.js

diff --git a/Website/Composite/console/components/presentation/DataField.js b/Website/Composite/console/components/presentation/DataField.js
index 4c92d65a6f..1745de4d2e 100644
--- a/Website/Composite/console/components/presentation/DataField.js
+++ b/Website/Composite/console/components/presentation/DataField.js
@@ -1,5 +1,7 @@
 import React, { PropTypes } from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
+import DataFieldWrapper from 'console/components/presentation/DataFieldWrapper.js';
+import DataFieldLabel from 'console/components/presentation/DataFieldLabel.js';
 import HelpIcon from 'console/components/presentation/HelpIcon.js';
 import Select from 'console/components/presentation/Select.js';
 import Input from 'console/components/presentation/Input.js';
@@ -16,18 +18,6 @@ const Headline = styled.h4`
 	color: ${colors.fieldLabelColor};
 `;
 
-const Label = styled.label`
-	display: inline-block;
-	margin: 0;
-	font-size: 12px;
-	padding: 5px 0 4px 0;
-	color: ${colors.fieldLabelColor};
-	width: calc(100% - 56px);
-`;
-
-const DataFieldWrapper = styled.div`
-	position: relative;
-`;
 
 const DataField = props => {
 	let handleChange, defaultOption, inputElement, options;
@@ -82,7 +72,7 @@ const DataField = props => {
             }
 			
 			{props.label ?
-				<Label htmlFor={props.name}>{props.label}</Label> :
+                <DataFieldLabel htmlFor={props.name}>{props.label}</DataFieldLabel> :
                 null}
             {inputElement}
 			{props.help ? <HelpIcon text={props.help} /> : null}
diff --git a/Website/Composite/console/components/presentation/DataFieldLabel.js b/Website/Composite/console/components/presentation/DataFieldLabel.js
new file mode 100644
index 0000000000..00cf0d984a
--- /dev/null
+++ b/Website/Composite/console/components/presentation/DataFieldLabel.js
@@ -0,0 +1,17 @@
+import React, { PropTypes } from 'react';
+import styled from 'styled-components';
+import colors from 'console/components/colors.js';
+
+
+const DataFieldLabel = styled.label`
+	display: inline-block;
+	margin: 0;
+	font-size: 12px;
+	padding: 5px 0 4px 0;
+	color: ${colors.fieldLabelColor};
+	width: calc(100% - 56px);
+`;
+
+
+
+export default DataFieldLabel;
diff --git a/Website/Composite/console/components/presentation/DataFieldWrapper.js b/Website/Composite/console/components/presentation/DataFieldWrapper.js
new file mode 100644
index 0000000000..d5e95186cb
--- /dev/null
+++ b/Website/Composite/console/components/presentation/DataFieldWrapper.js
@@ -0,0 +1,17 @@
+import React, { PropTypes } from 'react';
+import styled from 'styled-components';
+
+
+const DataFieldWrapper = styled.div`
+	position: relative;
+	
+	&::after {
+		display: block;
+		content: "";
+		clear: both;
+	 }
+`;
+
+
+
+export default DataFieldWrapper;

From 920553a82d4d0a884b0968ad969f076665007d92 Mon Sep 17 00:00:00 2001
From: Inna Boitsun <inna.boytsun.85@gmail.com>
Date: Wed, 6 Sep 2017 16:06:26 +0300
Subject: [PATCH 10/57] DataFieldWrapper - small css fix

---
 .../console/components/presentation/DataFieldWrapper.js          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Website/Composite/console/components/presentation/DataFieldWrapper.js b/Website/Composite/console/components/presentation/DataFieldWrapper.js
index d5e95186cb..9f6619091c 100644
--- a/Website/Composite/console/components/presentation/DataFieldWrapper.js
+++ b/Website/Composite/console/components/presentation/DataFieldWrapper.js
@@ -4,6 +4,7 @@ import styled from 'styled-components';
 
 const DataFieldWrapper = styled.div`
 	position: relative;
+	margin-bottom: 4px;
 	
 	&::after {
 		display: block;

From 28fe1d62fc4eae8843ab9f5a0cd9ba8822a255e3 Mon Sep 17 00:00:00 2001
From: Inna Boitsun <inna.boytsun.85@gmail.com>
Date: Thu, 7 Sep 2017 11:07:57 +0300
Subject: [PATCH 11/57] Fix indentation to use tabs

---
 .../components/presentation/DataField.js      | 52 +++++++++----------
 .../presentation/DataFieldWrapper.js          |  2 +-
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/Website/Composite/console/components/presentation/DataField.js b/Website/Composite/console/components/presentation/DataField.js
index 1745de4d2e..e235877457 100644
--- a/Website/Composite/console/components/presentation/DataField.js
+++ b/Website/Composite/console/components/presentation/DataField.js
@@ -39,42 +39,42 @@ const DataField = props => {
 		options = props.options.toJS();
 		defaultOption = options.filter(option => option.value === props.value)[0];
 		inputElement = <Select
-				id={props.name}
-				value={defaultOption}
-				clearable={false}
-				multi={false}
-				options={options}
-                onChange={handleChange}
-  				placeholder={props.placeholder}>
-			</Select>;
-        break;
-    case 'textarea':
-            inputElement = <TextArea
-             {...props}
-             withHelp={props.help ? true : false} />;
-            break;
+			id={props.name}
+			value={defaultOption}
+			clearable={false}
+			multi={false}
+			options={options}
+			onChange={handleChange}
+			placeholder={props.placeholder}>
+		</Select>;
+		break;
+	case 'textarea':
+		inputElement = <TextArea
+			{...props}
+			withHelp={props.help ? true : false} />;
+		break;
 	default:
-            inputElement = <Input
-            {...props}
+		inputElement = <Input
+			{...props}
 			onContextMenu={event => {
 				event.stopPropagation(); // to ensure default context menu is shown here
-            }}
-            withHelp={props.help ? true : false}
-			/>;
+			}}
+			withHelp={props.help ? true : false}
+		/>;
 	}
 
 	return (
 		<DataFieldWrapper>
-            {
+			{
 				// props.headline ?
 				//	<Headline>{props.headline}</Headline> :
-                //	null
-            }
+				//	null
+			}
 			
 			{props.label ?
-                <DataFieldLabel htmlFor={props.name}>{props.label}</DataFieldLabel> :
-                null}
-            {inputElement}
+				<DataFieldLabel htmlFor={props.name}>{props.label}</DataFieldLabel> :
+				null}
+			{inputElement}
 			{props.help ? <HelpIcon text={props.help} /> : null}
 		</DataFieldWrapper>
 	);
@@ -83,7 +83,7 @@ const DataField = props => {
 DataField.propTypes = {
 	type: PropTypes.string,
 	options: ImmutablePropTypes.listOf(ImmutablePropTypes.map),
-    updateValue: PropTypes.func,
+	updateValue: PropTypes.func,
 	name: PropTypes.string.isRequired,
 	headline: PropTypes.string,
 	label: PropTypes.string,
diff --git a/Website/Composite/console/components/presentation/DataFieldWrapper.js b/Website/Composite/console/components/presentation/DataFieldWrapper.js
index 9f6619091c..b71f5209b0 100644
--- a/Website/Composite/console/components/presentation/DataFieldWrapper.js
+++ b/Website/Composite/console/components/presentation/DataFieldWrapper.js
@@ -5,7 +5,7 @@ import styled from 'styled-components';
 const DataFieldWrapper = styled.div`
 	position: relative;
 	margin-bottom: 4px;
-	
+
 	&::after {
 		display: block;
 		content: "";

From 48eacd4d619d5db1bf9620be11d2b38c4a8e8f5c Mon Sep 17 00:00:00 2001
From: Inna Boitsun <inna.boytsun.85@gmail.com>
Date: Fri, 8 Sep 2017 12:27:48 +0300
Subject: [PATCH 12/57] Add Error component to the DataField.js

---
 .../Composite/console/components/presentation/DataField.js  | 6 ++++++
 Website/WebSite.csproj                                      | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/Website/Composite/console/components/presentation/DataField.js b/Website/Composite/console/components/presentation/DataField.js
index e235877457..b4ba5dc1ad 100644
--- a/Website/Composite/console/components/presentation/DataField.js
+++ b/Website/Composite/console/components/presentation/DataField.js
@@ -18,6 +18,11 @@ const Headline = styled.h4`
 	color: ${colors.fieldLabelColor};
 `;
 
+const Error = styled.span`
+	color: red;
+	font-size: 12px;
+`;
+
 
 const DataField = props => {
 	let handleChange, defaultOption, inputElement, options;
@@ -76,6 +81,7 @@ const DataField = props => {
 				null}
 			{inputElement}
 			{props.help ? <HelpIcon text={props.help} /> : null}
+			{props.error ? <Error>{props.error}</Error> : null}
 		</DataFieldWrapper>
 	);
 };
diff --git a/Website/WebSite.csproj b/Website/WebSite.csproj
index ff7d6f7f38..c2189c3750 100644
--- a/Website/WebSite.csproj
+++ b/Website/WebSite.csproj
@@ -209,6 +209,8 @@
     <Content Include="Composite\console\components\presentation\ActionButton.js" />
     <Content Include="Composite\console\components\presentation\CheckboxGroup.js" />
     <Content Include="Composite\console\components\presentation\DataField.js" />
+    <Content Include="Composite\console\components\presentation\DataFieldLabel.js" />
+    <Content Include="Composite\console\components\presentation\DataFieldWrapper.js" />
     <Content Include="Composite\console\components\presentation\Dialog.js" />
     <Content Include="Composite\console\components\presentation\Fieldset.js" />
     <Content Include="Composite\console\components\presentation\FormTab.js" />

From daa87afc8a566d64b4ecd67ca0c1d9ae983490dd Mon Sep 17 00:00:00 2001
From: Taras Nakonechnyi <neexite@gmail.com>
Date: Mon, 11 Sep 2017 12:45:15 +0300
Subject: [PATCH 13/57] Added nuget configuration for React Components

---
 Package.ConsoleComponents.nuspec | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 Package.ConsoleComponents.nuspec

diff --git a/Package.ConsoleComponents.nuspec b/Package.ConsoleComponents.nuspec
new file mode 100644
index 0000000000..7e1d3a4908
--- /dev/null
+++ b/Package.ConsoleComponents.nuspec
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>C1CMS.ConsoleComponents</id>
+    <title>C1 CMS Console Components</title>
+    <version>$version$</version>
+    <authors>Orckestra A/S</authors>
+    <owners>Orckestra A/S</owners>
+    <licenseUrl>https://c1.orckestra.com/MPL11</licenseUrl>
+    <projectUrl>https://github.com/Orckestra/C1-CMS-Foundation</projectUrl>
+    <!--iconUrl></iconUrl-->
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <description>Contains React components distributed with C1 CMS.</description>
+    <releaseNotes></releaseNotes>
+    <copyright>Copyright 2017</copyright>
+    <tags>C1CMS cms</tags>
+    <dependencies>
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="Website\Composite\console\**\*.*" target="Composite\console" /> 
+    <file src="Website\jspm.config.js" target="Composite" />
+    <file src="Website\package.json" target="Composite" />
+  </files>
+</package>

From 3f0707da1e93ce5a23612d995ca91a86778dfa9e Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Wed, 13 Sep 2017 13:16:56 +0200
Subject: [PATCH 14/57] Fixing exception when installing not localized data via
 AutoInstallPackages folder

---
 .../DataPackageFragmentInstaller.cs                | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/Composite/Core/PackageSystem/PackageFragmentInstallers/DataPackageFragmentInstaller.cs b/Composite/Core/PackageSystem/PackageFragmentInstallers/DataPackageFragmentInstaller.cs
index dae6c68b27..c0024d080b 100644
--- a/Composite/Core/PackageSystem/PackageFragmentInstallers/DataPackageFragmentInstaller.cs
+++ b/Composite/Core/PackageSystem/PackageFragmentInstallers/DataPackageFragmentInstaller.cs
@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Xml.Linq;
+using Composite.C1Console.Security;
 using Composite.C1Console.Users;
 using Composite.Core.Extensions;
 using Composite.Core.IO;
@@ -116,9 +117,12 @@ public override IEnumerable<XElement> Install()
                     }
                     else if (dataType.AddToCurrentLocale)
                     {
-                        using (new DataScope(UserSettings.ActiveLocaleCultureInfo))
+                        Verify.That(UserValidationFacade.IsLoggedIn(), "Cannot add to the current locale as there's no logged in user.");
+
+                        var currentLocale = UserSettings.ActiveLocaleCultureInfo;
+                        using (new DataScope(currentLocale))
                         {
-                            XElement element = AddData(dataType, UserSettings.ActiveLocaleCultureInfo);
+                            XElement element = AddData(dataType, currentLocale);
                             typeElement.Add(element);
                         }
                     }
@@ -135,7 +139,11 @@ public override IEnumerable<XElement> Install()
                     }
                     else
                     {
-                        using (new DataScope(UserSettings.ActiveLocaleCultureInfo))
+                        var locale = UserValidationFacade.IsLoggedIn()
+                            ? UserSettings.ActiveLocaleCultureInfo
+                            : DataLocalizationFacade.DefaultLocalizationCulture;
+                        
+                        using (new DataScope(locale))
                         {
                             XElement element = AddData(dataType, null);
                             typeElement.Add(element);

From 114ae5f72092d43b825c4d677bcd5752e1db56a5 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Wed, 20 Sep 2017 17:33:17 +0200
Subject: [PATCH 15/57] File logger - closing opened file stream if is not
 written to for 10 seconds

---
 Composite/Core/Logging/LogManager.cs          |   4 +-
 .../FileLogTraceListener/FileLogger.cs        | 107 ++++++++++++------
 .../FileLogTraceListener/LogFileInfo.cs       |   2 +
 3 files changed, 78 insertions(+), 35 deletions(-)

diff --git a/Composite/Core/Logging/LogManager.cs b/Composite/Core/Logging/LogManager.cs
index c6d00a41f4..ff404f89ef 100644
--- a/Composite/Core/Logging/LogManager.cs
+++ b/Composite/Core/Logging/LogManager.cs
@@ -76,7 +76,7 @@ public static bool DeleteLogFile(DateTime date)
 
         internal static void Flush()
         {
-            FileLogger?.Flush();
+            FileLogger?.Flush(true);
         }
 
 
@@ -136,7 +136,7 @@ public static LogEntry[] GetLogEntries(DateTime timeFrom, DateTime timeTo, bool
                             {
                                 // Waiting for some time until all log files are released
                                 // This ensures that LogViewer will get all the logs from previous, currently being shutdown AppDomain(s)
-                                return new LogEntry[0];
+                                return Array.Empty<LogEntry>();
                             }
 
                             continue;
diff --git a/Composite/Plugins/Logging/LogTraceListeners/FileLogTraceListener/FileLogger.cs b/Composite/Plugins/Logging/LogTraceListeners/FileLogTraceListener/FileLogger.cs
index 9bcb40fa61..debff4ec2f 100644
--- a/Composite/Plugins/Logging/LogTraceListeners/FileLogTraceListener/FileLogger.cs
+++ b/Composite/Plugins/Logging/LogTraceListeners/FileLogTraceListener/FileLogger.cs
@@ -8,6 +8,9 @@
 using System.IO;
 using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
+using System.Web.Hosting;
+using Composite.Core.Extensions;
 using Composite.Core.IO;
 using Composite.Core.Logging;
 
@@ -25,10 +28,14 @@ internal class FileLogger : IDisposable
         private DateTime _lockFileUpdatedLast = DateTime.MinValue;
 #endif
 
+        private static readonly TimeSpan FileStreamFlushInterval = TimeSpan.FromSeconds(5);
+        private static readonly TimeSpan FileStreamCloseOnIdleInterval = TimeSpan.FromSeconds(10);
+
         private readonly string _logDirectoryPath;
         private readonly bool _flushImmediately;
 
         public static event ThreadStart OnReset;
+        private static Task _flushOnIdleTask;
 
 
         internal LogFileInfo FileConnection;
@@ -47,11 +54,50 @@ public FileLogger(string logDirectoryPath, bool flushImmediately)
             }
             _flushImmediately = flushImmediately;
 
+            _flushOnIdleTask = Task.Factory.StartNew(FlushOnIdle);
+
 #if UseLockFiles
             TouchLockFile();
 #endif
         }
-        
+
+        private void FlushOnIdle()
+        {
+            Predicate<LogFileInfo> fileShouldBeClosed = logFile =>
+                logFile.LastUsageTime != null && DateTime.Now - logFile.LastUsageTime.Value > FileStreamCloseOnIdleInterval;
+
+            Predicate<LogFileInfo> fileStreamShouldBeFlushed = logFile =>
+            {
+                var lastFlushTime = logFile.LastFlushTime ?? logFile.StartupTime;
+                return logFile.LastUsageTime != null && logFile.LastUsageTime.Value > lastFlushTime
+                       && DateTime.Now - lastFlushTime > FileStreamFlushInterval;
+            };
+
+            while (!HostingEnvironment.ApplicationHost.ShutdownInitiated())
+            {
+                Thread.Sleep(500);
+
+                var conn = this.FileConnection;
+                if (conn != null && (fileShouldBeClosed(conn) || fileStreamShouldBeFlushed(conn)))
+                {
+                    lock (SyncRoot)
+                    {
+                        conn = this.FileConnection;
+                        if (conn != null)
+                        {
+                            if (fileShouldBeClosed(conn))
+                            {
+                                CloseLogFile(true);
+                            }
+                            else if (fileStreamShouldBeFlushed(conn))
+                            {
+                                Flush(true);
+                            }
+                        }
+                    }
+                }
+            }
+        }
 
 
         public DateTime StartupTime
@@ -60,12 +106,8 @@ public DateTime StartupTime
             {
                 lock (_syncRoot)
                 {
-                    if (FileConnection != null)
-                    {
-                        return FileConnection.StartupTime;
-                    }
+                    return FileConnection?.StartupTime ?? DateTime.Now;
                 }
-                return DateTime.Now;
             }
         }
 
@@ -77,21 +119,23 @@ public void WriteEntry(LogEntry entry)
 
             byte[] bytes = Encoding.UTF8.GetBytes(logLine + "\n");
 
-            EnsureInitialize();
-
             lock (_syncRoot)
             {
-                FileConnection.NewEntries.Add(entry);
-
                 // Checking whether we should change the file after midnight
                 int dayNumber = entry.TimeStamp.Day;
 
-                if (dayNumber != FileConnection.CreationDate.Day
-                   && dayNumber == DateTime.Now.Day)
+                var now = DateTime.Now;
+
+                if (FileConnection != null && dayNumber != FileConnection.CreationDate.Day
+                   && dayNumber == now.Day)
                 {
-                    ResetInitialization();
+                    CloseLogFile(true);
                 }
 
+                EnsureInitialize();
+
+                FileConnection.NewEntries.Add(entry);
+
                 // Writing the file in the "catch" block in order to prevent chance of corrupting the file by experiencing ThreadAbortException.
                 Exception thrownException = null;
                 try
@@ -99,13 +143,15 @@ public void WriteEntry(LogEntry entry)
                 }
                 finally
                 {
+                    
                     try
                     {
                         FileConnection.FileStream.Write(bytes, 0, bytes.Length);
+                        FileConnection.LastUsageTime = now;
 
                         if (_flushImmediately)
                         {
-                            FileConnection.FileStream.Flush();
+                            Flush(false);
                         }
                     }
                     catch (Exception exception)
@@ -123,8 +169,6 @@ public void WriteEntry(LogEntry entry)
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Composite.IO", "Composite.DoNotUseDirectoryClass:DoNotUseDirectoryClass", Justification = "This is what we want, touch is used later on")]
         public LogFileReader[] GetLogFiles()
         {
-            EnsureInitialize();
-
 #if UseLockFiles
             if (MoreThanOneAppDomainRunning()) return Array.Empty<LogFileReader>();
 #endif
@@ -142,6 +186,8 @@ public LogFileReader[] GetLogFiles()
                     currentlyOpenedFileName = FileConnection.FileName;
 
                     result.Add(new CurrentFileReader(this));
+
+                    FileConnection.LastUsageTime = DateTime.Now;
                 }
             }
 
@@ -182,7 +228,7 @@ public LogFileReader[] GetLogFiles()
             return result.ToArray();
         }
 
-        internal void Flush()
+        internal void Flush(bool silent)
         {
             lock (_syncRoot)
             {
@@ -192,9 +238,11 @@ internal void Flush()
                     {
                         FileConnection.FileStream.Flush();
                     }
-                    catch (Exception)
+                    catch (Exception) when (silent)
                     {
                     }
+
+                    FileConnection.LastFlushTime = DateTime.Now;
                 }
             }
         }
@@ -374,20 +422,17 @@ private bool MoreThanOneAppDomainRunning()
         }
 #endif
 
-
-        private void ResetInitialization()
+        private void CloseLogFile(bool raiseOnResetEvent)
         {
-            lock (_syncRoot)
+            if (FileConnection != null)
             {
-                if (FileConnection != null)
-                {
-                    FileConnection.Dispose();
-                    FileConnection = null;
-                }
+                FileConnection.Dispose();
+                FileConnection = null;
+            }
 
+            if (raiseOnResetEvent)
+            {
                 OnReset?.Invoke();
-
-                EnsureInitialize();
             }
         }
 
@@ -435,11 +480,7 @@ protected virtual void Dispose(bool disposing)
             {
                 if (disposing)
                 {
-                    if (FileConnection != null)
-                    {
-                        FileConnection.Dispose();
-                        FileConnection = null;
-                    }
+                    CloseLogFile(false);
                 }
 
                 _disposed = true;
diff --git a/Composite/Plugins/Logging/LogTraceListeners/FileLogTraceListener/LogFileInfo.cs b/Composite/Plugins/Logging/LogTraceListeners/FileLogTraceListener/LogFileInfo.cs
index ffec4cce92..a6160240e8 100644
--- a/Composite/Plugins/Logging/LogTraceListeners/FileLogTraceListener/LogFileInfo.cs
+++ b/Composite/Plugins/Logging/LogTraceListeners/FileLogTraceListener/LogFileInfo.cs
@@ -12,6 +12,8 @@ internal class LogFileInfo : IDisposable
         public FileStream FileStream;
         public CircularList<LogEntry> NewEntries = new CircularList<LogEntry>(100);
         public DateTime CreationDate;
+        public DateTime? LastUsageTime;
+        public DateTime? LastFlushTime;
         public DateTime StartupTime;
 
         private bool _disposed;

From d70ad61c126a4279574aedfe8acde274d741b5ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pauli=20=C3=98ster=C3=B8?= <pauli@burningice.dk>
Date: Fri, 22 Sep 2017 11:18:59 -0200
Subject: [PATCH 16/57] Enable Scope Validation if we're running in debug mode

Implements https://github.com/Orckestra/C1-CMS-Foundation/issues/483
---
 Composite/Core/ServiceLocator.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Composite/Core/ServiceLocator.cs b/Composite/Core/ServiceLocator.cs
index 6768385221..871ef6848d 100644
--- a/Composite/Core/ServiceLocator.cs
+++ b/Composite/Core/ServiceLocator.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Web;
+using System.Web.Configuration;
 using Composite.Core.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -22,7 +23,12 @@ public static class ServiceLocator
         private static IServiceCollection _serviceCollection = new ServiceCollection();
         private static IServiceProvider _serviceProvider;
         private static ConcurrentDictionary<Type, bool> _hasTypeLookup = new ConcurrentDictionary<Type, bool>();
-        private static Func<IServiceCollection, IServiceProvider> _serviceProviderBuilder = s => s.BuildServiceProvider();
+        private static Func<IServiceCollection, IServiceProvider> _serviceProviderBuilder = s =>
+        {
+            var configurationSection = (CompilationSection)WebConfigurationManager.GetSection("system.web/compilation");
+
+            return s.BuildServiceProvider(validateScopes: configurationSection?.Debug ?? false);
+        };
 
         /// <summary>
         /// Get service of type T

From 6229a81327530a314c4d2ce531e477305ccccfc2 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Wed, 27 Sep 2017 14:42:41 +0200
Subject: [PATCH 17/57] PageObjectCache - blocking execution only when
 rendering the same element to be cached

---
 .../Utils/Caching/PageObjectCacheFunction.cs  | 38 ++++++++++++-------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/Composite/Plugins/Functions/FunctionProviders/StandardFunctionProvider/Utils/Caching/PageObjectCacheFunction.cs b/Composite/Plugins/Functions/FunctionProviders/StandardFunctionProvider/Utils/Caching/PageObjectCacheFunction.cs
index 001281f42c..239bc317a3 100644
--- a/Composite/Plugins/Functions/FunctionProviders/StandardFunctionProvider/Utils/Caching/PageObjectCacheFunction.cs
+++ b/Composite/Plugins/Functions/FunctionProviders/StandardFunctionProvider/Utils/Caching/PageObjectCacheFunction.cs
@@ -1,11 +1,13 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Concurrent;
 using System.Linq;
 using System.Web;
 using System.Xml.Linq;
-using Composite.Functions;
+using Composite.Core;
 using Composite.Core.Linq;
 using Composite.Core.WebClient.Renderings.Page;
+using Composite.Functions;
 using Composite.Plugins.Functions.FunctionProviders.StandardFunctionProvider.Foundation;
 using Composite.Data;
 using System.Threading;
@@ -55,7 +57,8 @@ protected override IEnumerable<StandardFunctionParameterProfile> StandardFunctio
         }
 
 
-        readonly object _lock = new object();
+        readonly ConcurrentDictionary<string, object> _lockCollection = new ConcurrentDictionary<string, object>();
+        bool _poteintialKeysLeakLogged = false;
 
         public override object Execute(ParameterList parameters, FunctionContextContainer context)
         {
@@ -64,14 +67,23 @@ public override object Execute(ParameterList parameters, FunctionContextContaine
                 return parameters.GetParameter<object>("ObjectToCache");
             }
 
+            var cache = HttpRuntime.Cache;
             string cacheKey = BuildCacheKey(parameters);
 
-            object result = HttpRuntime.Cache.Get(cacheKey);
+            object result = cache.Get(cacheKey);
             if (result == null)
             {
-                lock (_lock)
+                var lockObject = _lockCollection.GetOrAdd(cacheKey, key => new object());
+
+                lock (lockObject)
                 {
-                    result = HttpRuntime.Cache.Get(cacheKey);
+                    if(_lockCollection.Count > 50000 && !_poteintialKeysLeakLogged)
+                    {
+                        _poteintialKeysLeakLogged = true;
+                        Log.LogWarning(nameof(PageObjectCacheFunction), "Potential memory leak in the locks collection");
+                    }
+
+                    result = cache.Get(cacheKey);
                     if (result == null)
                     {
                         result = parameters.GetParameter<object>("ObjectToCache");
@@ -80,9 +92,9 @@ public override object Execute(ParameterList parameters, FunctionContextContaine
                         {
                             result = EvaluateLazyResult(result, context);
 
-                            int secondsToCache = parameters.GetParameter<int>("SecondsToCache"); 
+                            int secondsToCache = parameters.GetParameter<int>("SecondsToCache");
 
-                            HttpRuntime.Cache.Add(
+                            cache.Add(
                                 cacheKey, 
                                 result, 
                                 null, 
@@ -100,15 +112,15 @@ public override object Execute(ParameterList parameters, FunctionContextContaine
 
         private static object EvaluateLazyResult(object result, FunctionContextContainer context)
         {
-            if (result is XDocument)
+            if (result is XDocument document)
             {
-                PageRenderer.ExecuteEmbeddedFunctions((result as XDocument).Root, context);
+                PageRenderer.ExecuteEmbeddedFunctions(document.Root, context);
                 return result;
             }
 
-            if (result is IEnumerable<XNode>)
+            if (result is IEnumerable<XNode> xNodes)
             {
-                return EvaluateLazyResult(result as IEnumerable<XNode>, context);
+                return EvaluateLazyResult(xNodes, context);
             }
 
             return result;
@@ -126,10 +138,8 @@ private static object EvaluateLazyResult(IEnumerable<XNode> xNodes, FunctionCont
             {
                 node.Remove();
 
-                if (node is XElement)
+                if (node is XElement element)
                 {
-                    var element = (XElement)node;
-
                     if (element.Name == FunctionXName)
                     {
                         var functionTreeNode = (FunctionRuntimeTreeNode)FunctionTreeBuilder.Build(element);

From a7e09cbef5b9b9d3cca502ea78047d749df20b3a Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Fri, 29 Sep 2017 16:07:55 +0200
Subject: [PATCH 18/57] Fixing "Undo Changes" action not working for page
 folder data types

---
 .../GenericPublishProcessController.cs            | 15 ++++-----------
 .../PageElementProviderActionTokenProvider.cs     |  5 ++++-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/Composite/Data/ProcessControlled/ProcessControllers/GenericPublishProcessController/GenericPublishProcessController.cs b/Composite/Data/ProcessControlled/ProcessControllers/GenericPublishProcessController/GenericPublishProcessController.cs
index a95431fcf2..52fb6ccdcf 100644
--- a/Composite/Data/ProcessControlled/ProcessControllers/GenericPublishProcessController/GenericPublishProcessController.cs
+++ b/Composite/Data/ProcessControlled/ProcessControllers/GenericPublishProcessController/GenericPublishProcessController.cs
@@ -397,19 +397,12 @@ public List<ElementAction> GetActions(IData data, Type elementProviderType)
 
                 if (publishControlled.PublicationStatus == Draft)
                 {
-                    if (ProcessControllerAttributesFacade.IsActionIgnored(elementProviderType, GenericPublishProcessControllerActionTypeNames.UndoUnpublishedChanges) == false)
+                    if (!ProcessControllerAttributesFacade.IsActionIgnored(elementProviderType, GenericPublishProcessControllerActionTypeNames.UndoUnpublishedChanges))
                     {
-                        ActionToken actionToken;
-
                         IActionTokenProvider actionTokenProvider = ProcessControllerAttributesFacade.GetActionTokenProvider(elementProviderType, GenericPublishProcessControllerActionTypeNames.UndoUnpublishedChanges);
-                        if (actionTokenProvider != null)
-                        {
-                            actionToken = actionTokenProvider.GetActionToken(GenericPublishProcessControllerActionTypeNames.UndoUnpublishedChanges, data);
-                        }
-                        else
-                        {
-                            actionToken = new UndoPublishedChangesActionToken();
-                        }
+
+                        var actionToken = actionTokenProvider?.GetActionToken(GenericPublishProcessControllerActionTypeNames.UndoUnpublishedChanges, data)
+                                                             ?? new UndoPublishedChangesActionToken();
 
                         var undoPublishedChangesAction = new ElementAction(new ActionHandle(actionToken))
                         {
diff --git a/Composite/Plugins/Elements/ElementProviders/PageElementProvider/PageElementProviderActionTokenProvider.cs b/Composite/Plugins/Elements/ElementProviders/PageElementProvider/PageElementProviderActionTokenProvider.cs
index e1a87e25dc..5f524a1b8c 100644
--- a/Composite/Plugins/Elements/ElementProviders/PageElementProvider/PageElementProviderActionTokenProvider.cs
+++ b/Composite/Plugins/Elements/ElementProviders/PageElementProvider/PageElementProviderActionTokenProvider.cs
@@ -3,6 +3,7 @@
 using Composite.Data.ProcessControlled.ProcessControllers.GenericPublishProcessController;
 using Composite.C1Console.Security;
 using Composite.C1Console.Workflow;
+using Composite.Data.Types;
 
 
 namespace Composite.Plugins.Elements.ElementProviders.PageElementProvider
@@ -14,7 +15,9 @@ public ActionToken GetActionToken(string actionTypeName, IData data)
             switch (actionTypeName)
             {
                 case GenericPublishProcessControllerActionTypeNames.UndoUnpublishedChanges:
-                    return new WorkflowActionToken(WorkflowFacade.GetWorkflowType("Composite.Plugins.Elements.ElementProviders.PageElementProvider.UndoUnpublishedChangesWorkflow"), PageElementProvider.EditPermissionTypes);
+                    return data is IPage
+                        ? new WorkflowActionToken(WorkflowFacade.GetWorkflowType("Composite.Plugins.Elements.ElementProviders.PageElementProvider.UndoUnpublishedChangesWorkflow"), PageElementProvider.EditPermissionTypes)
+                        : null;
 
                 default:
                     return null;

From 00010ee663863728ca80a4c7ec8db6523c76487a Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Fri, 29 Sep 2017 17:38:33 +0200
Subject: [PATCH 19/57] Increasing the max size and mentioning to the config
 files for the "Page placeholders" cache; refactoring

---
 Composite/Data/Caching/Cache.cs               | 16 ++++-------
 Composite/Data/PageManager.cs                 | 28 ++++++-------------
 .../Composite/DebugBuild.Composite.config     |  1 +
 .../Composite/ReleaseBuild.Composite.config   |  1 +
 4 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/Composite/Data/Caching/Cache.cs b/Composite/Data/Caching/Cache.cs
index 622a0375e7..c7c3df3937 100644
--- a/Composite/Data/Caching/Cache.cs
+++ b/Composite/Data/Caching/Cache.cs
@@ -76,7 +76,7 @@ public class Cache
         private bool _enabled = true;
         private bool _clearOnFlush = true;
         private int _maxSize;
-        private int _defaultMaximumSize;
+        private readonly int _defaultMaximumSize;
 
 
         /// <exclude />
@@ -101,21 +101,15 @@ public Cache(string name, int defaultMaximumSize)
 
 
         /// <exclude />
-        public bool Enabled
-        {
-            get { return _enabled; }
-        }
+        public bool Enabled => _enabled;
 
 
         /// <exclude />
-        public string Name { get; private set; }
+        public string Name { get; }
 
 
         /// <exclude />
-        protected object Get(object key)
-        {
-            return _table[key];
-        }
+        protected object Get(object key) => _table[key];
 
 
         /// <exclude />
@@ -130,7 +124,7 @@ protected void Add(object key, object value)
             {
                 if (_maxSize != -1 && _table.Count > _maxSize)
                 {
-                    Log.LogWarning("Cache", "Clearing cache '{0}' as it exceeded maximum size {1} elements. Edit configuration file to increase the cache size.", Name, _maxSize);
+                    Log.LogWarning("Cache", $"Clearing cache '{Name}' as it exceeded maximum size {_maxSize} elements. Edit configuration file /App_Data/Composite/Composite.config to increase the cache size.");
                     _table.Clear();
                 }
 
diff --git a/Composite/Data/PageManager.cs b/Composite/Data/PageManager.cs
index 5162982708..30d81e121f 100644
--- a/Composite/Data/PageManager.cs
+++ b/Composite/Data/PageManager.cs
@@ -6,7 +6,6 @@
 using Composite.Core.Linq;
 using Composite.Data.Caching;
 using Composite.Data.Foundation;
-using Composite.Core.Extensions;
 using Composite.Core.Types;
 using Composite.Data.Types;
 
@@ -39,7 +38,7 @@ public PageStructureRecord(IPageStructure ps)
         private static readonly int PageCacheSize = 5000;
         private static readonly int PageStructureCacheSize = 3000;
         private static readonly int ChildrenCacheSize = 2000;
-        private static readonly int PagePlaceholderCacheSize = 500;
+        private static readonly int PagePlaceholderCacheSize = 10000;
 
         private static readonly Cache<string, IReadOnlyCollection<IPage>> _pageCache = new Cache<string, IReadOnlyCollection<IPage>>("Pages", PageCacheSize);
         private static readonly Cache<string, ReadOnlyCollection<IPagePlaceholderContent>> _placeholderCache = new Cache<string, ReadOnlyCollection<IPagePlaceholderContent>>("Page placeholders", PagePlaceholderCacheSize);
@@ -301,7 +300,7 @@ private static PageStructureRecord GetPageStructureRecord(Guid pageId)
 
             if (result == null)
             {
-                Log.LogWarning(LogTitle, "No IPageStructure entries found for Page with Id '{0}'".FormatWith(pageId));
+                Log.LogWarning(LogTitle, $"No IPageStructure entries found for Page with Id '{pageId}'");
             }
 
             _pageStructureCache.Add(cacheKey, result);
@@ -348,13 +347,10 @@ private static void OnPageStoreChanged(object sender, StoreEventArgs storeEventA
 
         private static void OnPageChanged(object sender, DataEventArgs args)
         {
-            IPage page = args.Data as IPage;
-            if (page == null)
+            if (args.Data is IPage page)
             {
-                return;
+                _pageCache.Remove(GetCacheKey(page.Id, page.DataSourceId));
             }
-
-            _pageCache.Remove(GetCacheKey(page.Id, page.DataSourceId));
         }
 
 
@@ -368,13 +364,10 @@ private static void OnPagePlaceholderStoreChanged(object sender, StoreEventArgs
 
         private static void OnPagePlaceholderChanged(object sender, DataEventArgs args)
         {
-            var placeHolder = args.Data as IPagePlaceholderContent;
-            if (placeHolder == null)
+            if (args.Data is IPagePlaceholderContent placeHolder)
             {
-                return;
+                _placeholderCache.Remove(GetCacheKey(placeHolder.PageId, placeHolder.VersionId, placeHolder.DataSourceId));
             }
-
-            _placeholderCache.Remove(GetCacheKey(placeHolder.PageId, placeHolder.VersionId, placeHolder.DataSourceId));
         }
 
 
@@ -390,14 +383,11 @@ private static void OnPageStructureStoreChanged(object sender, StoreEventArgs st
 
         private static void OnPageStructureChanged(object sender, DataEventArgs args)
         {
-            var ps = args.Data as IPageStructure;
-            if (ps == null)
+            if (args.Data is IPageStructure pageStructure)
             {
-                return;
+                _pageStructureCache.Remove(pageStructure.Id);
+                _childrenCache.Remove(pageStructure.ParentId);
             }
-
-            _pageStructureCache.Remove(ps.Id);
-            _childrenCache.Remove(ps.ParentId);
         }
 
         private static IPage CreateWrapper(IPage page)
diff --git a/Website/App_Data/Composite/DebugBuild.Composite.config b/Website/App_Data/Composite/DebugBuild.Composite.config
index f4ffdfa35e..ee99d7c2ab 100644
--- a/Website/App_Data/Composite/DebugBuild.Composite.config
+++ b/Website/App_Data/Composite/DebugBuild.Composite.config
@@ -103,6 +103,7 @@
           <add name="DataAccess" enabled="true" size="-1"/>
           <add name="Pages" enabled="true" size="20000" />
           <add name="Page structure" enabled="true" size="20000" />
+          <add name="Page placeholders" enabled="true" size="10000" />
           <add name="Child pages" enabled="true" size="20000" />
           <add name="Security permissions" enabled="true" size="1000" />
           <add name="Resource strings" enabled="true" size="5000" />
diff --git a/Website/App_Data/Composite/ReleaseBuild.Composite.config b/Website/App_Data/Composite/ReleaseBuild.Composite.config
index 843a57af4a..d90aeedf5c 100644
--- a/Website/App_Data/Composite/ReleaseBuild.Composite.config
+++ b/Website/App_Data/Composite/ReleaseBuild.Composite.config
@@ -98,6 +98,7 @@
           <add name="DataAccess" enabled="true" size="-1"/>
           <add name="Pages" enabled="true" size="20000" />
           <add name="Page structure" enabled="true" size="20000" />
+          <add name="Page placeholders" enabled="true" size="10000" />
           <add name="Child pages" enabled="true" size="20000" />
           <add name="Security permissions" enabled="true" size="1000" />
           <add name="Resource strings" enabled="true" size="5000" />

From 83d1288cd0cbee84471220efbb5974329ec205cb Mon Sep 17 00:00:00 2001
From: Taras Nakonechnyi <neexite@gmail.com>
Date: Tue, 3 Oct 2017 14:58:28 +0300
Subject: [PATCH 20/57] add .npmignore

---
 Website/.npmignore | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 Website/.npmignore

diff --git a/Website/.npmignore b/Website/.npmignore
new file mode 100644
index 0000000000..657e2c28c3
--- /dev/null
+++ b/Website/.npmignore
@@ -0,0 +1,4 @@
+*
+*.*
+*/*.*
+!/Composite/console/**/*

From 9951858bcf47e52472e929a394a08cb5d3f34122 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Tue, 17 Oct 2017 17:21:17 +0200
Subject: [PATCH 21/57] PasswordRulesPluginFacade - better missing
 configuration handling

---
 .../PluginFacades/PasswordRulePluginFacade.cs | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/Composite/C1Console/Security/Foundation/PluginFacades/PasswordRulePluginFacade.cs b/Composite/C1Console/Security/Foundation/PluginFacades/PasswordRulePluginFacade.cs
index 985d703359..cbe8330930 100644
--- a/Composite/C1Console/Security/Foundation/PluginFacades/PasswordRulePluginFacade.cs
+++ b/Composite/C1Console/Security/Foundation/PluginFacades/PasswordRulePluginFacade.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Configuration;
 using System.Linq;
@@ -7,6 +7,7 @@
 using Composite.Core.Collections.Generic;
 using Composite.Core.Configuration;
 using Composite.C1Console.Events;
+using Composite.Core;
 using Composite.Data.Types;
 
 
@@ -14,7 +15,7 @@ namespace Composite.C1Console.Security.Foundation.PluginFacades
 {
     internal static class PasswordRulePluginFacade
     {
-        private static ResourceLocker<Resources> _resourceLocker = new ResourceLocker<Resources>(new Resources(), Resources.DoInitializeResources);
+        private static readonly ResourceLocker<Resources> _resourceLocker = new ResourceLocker<Resources>(new Resources(), Resources.DoInitializeResources);
 
 
         static PasswordRulePluginFacade()
@@ -51,7 +52,7 @@ public static int PasswordExpirationTimeInDays
             get
             {
                 var settings = GetSettings();
-                return settings != null ? settings.PasswordExpirationTimeInDays : 0;
+                return settings?.PasswordExpirationTimeInDays ?? 0;
             }
         }
 
@@ -60,7 +61,7 @@ public static int PasswordHistoryLength
             get
             {
                 var settings = GetSettings();
-                return settings != null ? settings.PasswordHistoryLength : 0;
+                return settings?.PasswordHistoryLength ?? 0;
             }
         }
         
@@ -68,9 +69,7 @@ private static PasswordPolicySettings GetSettings()
         {
             var configuration = ConfigurationServices.ConfigurationSource;
 
-            if (configuration == null) return null;
-
-            return configuration.GetSection(PasswordPolicySettings.SectionName) as PasswordPolicySettings;
+            return configuration?.GetSection(PasswordPolicySettings.SectionName) as PasswordPolicySettings;
         }
 
 
@@ -91,7 +90,7 @@ private static void HandleConfigurationError(Exception ex)
         {
             Flush();
 
-            throw new ConfigurationErrorsException(string.Format("Failed to load the configuration section '{0}' from the configuration.", PasswordPolicySettings.SectionName), ex);
+            throw new ConfigurationErrorsException($"Failed to load the configuration section '{PasswordPolicySettings.SectionName}' from the configuration.", ex);
         }
 
 
@@ -99,12 +98,17 @@ private static void HandleConfigurationError(Exception ex)
         private sealed class Resources
         {
             PasswordRuleFactory Factory { get; set; }
-            public IReadOnlyCollection<IPasswordRule> PasswordRules { get; set; }
+            public IReadOnlyCollection<IPasswordRule> PasswordRules { get; private set; }
 
             public static void DoInitializeResources(Resources resources)
             {
                 var settings = GetSettings();
-                if (settings == null) return;
+                if (settings == null)
+                {
+                    Log.LogWarning(nameof(PasswordRulePluginFacade), $"Composite.config is missing '{PasswordPolicySettings.SectionName}' section");
+                    resources.PasswordRules = new IPasswordRule[0];
+                    return;
+                }
 
                 try
                 {

From 6687e3aed7c081bb145a06839e2762c3e164ffd4 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Tue, 24 Oct 2017 10:51:30 +0200
Subject: [PATCH 22/57] SqlDataProvider - logging column name when there's a
 type mismatch, refactoring

---
 .../SqlDataProvider_Stores.cs                 | 65 +++++++++----------
 1 file changed, 32 insertions(+), 33 deletions(-)

diff --git a/Composite/Plugins/Data/DataProviders/MSSqlServerDataProvider/SqlDataProvider_Stores.cs b/Composite/Plugins/Data/DataProviders/MSSqlServerDataProvider/SqlDataProvider_Stores.cs
index c1963f5589..13435d39e1 100644
--- a/Composite/Plugins/Data/DataProviders/MSSqlServerDataProvider/SqlDataProvider_Stores.cs
+++ b/Composite/Plugins/Data/DataProviders/MSSqlServerDataProvider/SqlDataProvider_Stores.cs
@@ -8,7 +8,6 @@
 using Composite.Core;
 using Composite.Core.Collections.Generic;
 using Composite.Core.Configuration;
-using Composite.Core.Extensions;
 using Composite.Core.Instrumentation;
 using Composite.Core.Linq;
 using Composite.Core.Sql;
@@ -31,7 +30,7 @@ internal partial class SqlDataProvider
         private readonly List<SqlDataTypeStoreTable> _createdSqlDataTypeStoreTables = new List<SqlDataTypeStoreTable>();
         private Assembly _compositeGeneratedAssembly;
 
-        private static readonly Hashtable<Type, bool> _typeLoadResults = new Hashtable<Type, bool>(); 
+        private static readonly Hashtable<Type, bool> _typeLoadResults = new Hashtable<Type, bool>();
 
         public void CreateStores(IReadOnlyCollection<DataTypeDescriptor> dataTypeDescriptors)
         {
@@ -61,7 +60,7 @@ public void CreateStores(IReadOnlyCollection<DataTypeDescriptor> dataTypeDescrip
                     var interfaceType = type;
                     if (!ValidateTable(interfaceType, tableName, errors))
                     {
-                        throw new InvalidOperationException("Table '{0}' already exist but isn't valid: {1}".FormatWith(tableName, errors.ToString()));
+                        throw new InvalidOperationException($"Table '{tableName}' already exists but isn't valid: {errors.ToString()}");
                     }
                 };
 
@@ -128,7 +127,7 @@ public void CreateStores(IReadOnlyCollection<DataTypeDescriptor> dataTypeDescrip
                 _createdSqlDataTypeStoreTables.RemoveAll(f => newDataTypeIds.Contains(f.DataTypeId));
 
                 var fields = _createdSqlDataTypeStoreTables.Select(s => new Tuple<string, Type>(s.DataContextFieldName, s.DataContextFieldType)).ToList();
-                
+
                 foreach (var classesInfo in generatedClassesInfo.Values)
                 {
                     fields.AddRange(classesInfo.Fields.Select(f => new Tuple<string, Type>(f.Value.FieldName, f.Value.FieldType)));
@@ -148,7 +147,7 @@ public void CreateStores(IReadOnlyCollection<DataTypeDescriptor> dataTypeDescrip
 
                 if (!generatedClassesInfo.TryGetValue(dataTypeDescriptor, out classesInfo))
                 {
-                    throw new InvalidOperationException("No generated classes for data type '{0}' found".FormatWith(dataTypeDescriptor.Name));
+                    throw new InvalidOperationException($"No generated classes for data type '{dataTypeDescriptor.Name}' found");
                 }
                 InitializeStoreResult initInfo = EmbedDataContextInfo(classesInfo, dataContextClass);
 
@@ -332,7 +331,7 @@ private static Dictionary<Guid, Type> LoadDataTypes(IEnumerable<InterfaceConfigu
                 var dataTypeDescriptor = DataMetaDataFacade.GetDataTypeDescriptor(dataTypeId, true);
                 if (dataTypeDescriptor == null)
                 {
-                    throw NewConfigurationException(element, "Failed to get a DataTypeDescriptor by id '{0}'".FormatWith(dataTypeId));
+                    throw NewConfigurationException(element, "Failed to get a DataTypeDescriptor by id '{dataTypeId}'");
                 }
 
                 dataTypeDescriptors.Add(dataTypeDescriptor);
@@ -423,10 +422,10 @@ private InitializeStoreResult EmbedDataContextInfo(InterfaceGeneratedClassesInfo
                 }
 
                 Verify.IsNotNull(fieldInfo, "Field info is missing");
-                
 
-                FieldInfo dataContextFieldInfo = dataContextType != null 
-                    ? dataContextType.GetField(fieldInfo.FieldName) 
+
+                FieldInfo dataContextFieldInfo = dataContextType != null
+                    ? dataContextType.GetField(fieldInfo.FieldName)
                     : fieldInfo.DataContextField;
 
                 Type sqlDataProvdierHelperType = fieldInfo.SqlHelperClass;
@@ -435,7 +434,7 @@ private InitializeStoreResult EmbedDataContextInfo(InterfaceGeneratedClassesInfo
 
                 var sqlDataTypeStoreTable = new SqlDataTypeStoreTable(
                     initInfo.DataTypeDescriptor.DataTypeId,
-                    dataContextFieldInfo, 
+                    dataContextFieldInfo,
                     sqlDataProviderHelper,
                     fieldInfo.FieldName,
                     fieldInfo.FieldType);
@@ -479,12 +478,12 @@ private InterfaceGeneratedClassesInfo InitializeStoreTypes(InterfaceConfiguratio
             return result;
         }
 
-        private InterfaceGeneratedClassesInfo InitializeStoreTypes(InterfaceConfigurationElement element, 
-            Dictionary<DataTypeDescriptor, IEnumerable<SqlDataTypeStoreDataScope>> allSqlDataTypeStoreDataScopes, 
+        private InterfaceGeneratedClassesInfo InitializeStoreTypes(InterfaceConfigurationElement element,
+            Dictionary<DataTypeDescriptor, IEnumerable<SqlDataTypeStoreDataScope>> allSqlDataTypeStoreDataScopes,
             Type dataContextClass,
             Dictionary<Guid, Type> dataTypes,
             bool forceCompile,
-            ref bool dataContextRecompilationNeeded, 
+            ref bool dataContextRecompilationNeeded,
             ref HelperClassesGenerationInfo helperClassesGenerationInfo)
         {
             var result = new InterfaceGeneratedClassesInfo();
@@ -510,7 +509,7 @@ private InterfaceGeneratedClassesInfo InitializeStoreTypes(InterfaceConfiguratio
             var dataTypeDescriptor = DataMetaDataFacade.GetDataTypeDescriptor(dataTypeId, true);
             if (dataTypeDescriptor == null)
             {
-                throw NewConfigurationException(element, "Failed to get a DataTypeDescriptor by id '{0}'".FormatWith(dataTypeId));
+                throw NewConfigurationException(element, $"Failed to get a DataTypeDescriptor by id '{dataTypeId}'");
             }
 
             result.DataTypeDescriptor = dataTypeDescriptor;
@@ -543,8 +542,8 @@ private InterfaceGeneratedClassesInfo InitializeStoreTypes(InterfaceConfiguratio
                 }
 
                 Dictionary<SqlDataTypeStoreTableKey, StoreTypeInfo> fields;
-                helperClassesGenerationInfo = EnsureNeededTypes(dataTypeDescriptor, 
-                    dataScopes, allSqlDataTypeStoreDataScopes, dataContextClass, 
+                helperClassesGenerationInfo = EnsureNeededTypes(dataTypeDescriptor,
+                    dataScopes, allSqlDataTypeStoreDataScopes, dataContextClass,
                     out fields, ref dataContextRecompilationNeeded, forceCompile);
 
                 result.Fields = fields;
@@ -638,7 +637,7 @@ private bool ValidateTables(InitializeStoreResult initializeStoreResult, bool is
                     && interfaceType.IsAutoUpdateble()
                     && !interfaceType.IsGenerated())
                 {
-                    Log.LogInformation(LogTitle, "Data schema for the data interface '{0}' on the SqlDataProvider '{1}' is not matching and will be updated.", 
+                    Log.LogInformation(LogTitle, "Data schema for the data interface '{0}' on the SqlDataProvider '{1}' is not matching and will be updated.",
                                         initializeStoreResult.InterfaceType, _dataProviderContext.ProviderName);
                     Log.LogInformation(LogTitle, errors.ToString());
                 }
@@ -648,7 +647,7 @@ private bool ValidateTables(InitializeStoreResult initializeStoreResult, bool is
                                      initializeStoreResult.InterfaceType, _dataProviderContext.ProviderName);
                     Log.LogCritical(LogTitle, errors.ToString());
                 }
-                
+
             }
 
             return isValid;
@@ -662,7 +661,7 @@ private bool ValidateTable(Type interfaceType, string tableName, StringBuilder e
 
             if (sqlTableInformation == null)
             {
-                errors.AppendLine("Table '{0}' does not exist".FormatWith(tableName));
+                errors.AppendLine($"Table '{tableName}' does not exist");
                 return false;
             }
 
@@ -670,7 +669,7 @@ private bool ValidateTable(Type interfaceType, string tableName, StringBuilder e
 
             if (primaryKeyCount == 0)
             {
-                errors.AppendLine(string.Format("The table '{0}' is missing a primary key", tableName));
+                errors.AppendLine($"The table '{tableName}' is missing a primary key");
                 return false;
             }
 
@@ -680,12 +679,12 @@ private bool ValidateTable(Type interfaceType, string tableName, StringBuilder e
 
             foreach (PropertyInfo property in properties)
             {
-                if (property.Name == "DataSourceId") continue;
+                if (property.Name == nameof(IData.DataSourceId)) continue;
 
                 SqlColumnInformation column = columns.Find(col => col.ColumnName == property.Name);
                 if (column == null)
                 {
-                    errors.AppendLine(string.Format("The interface property named '{0}' does not exist in the table '{1}' as a column", property.Name, sqlTableInformation.TableName));
+                    errors.AppendLine($"The interface property named '{property.Name}' does not exist in the table '{sqlTableInformation.TableName}' as a column.");
                     return false;
                 }
 
@@ -693,7 +692,7 @@ private bool ValidateTable(Type interfaceType, string tableName, StringBuilder e
                 {
                     if (column.Type != property.PropertyType)
                     {
-                        errors.AppendLine(string.Format("Type mismatch. The interface type '{0}' does not match the database type '{1}'", property.PropertyType, column.Type));
+                        errors.AppendLine($"Type mismatch for property '{property.Name}'. Type '{property.PropertyType}' does not match the database column type '{column.Type}'.");
                         return false;
                     }
                 }
@@ -782,9 +781,9 @@ public StoreTypeInfo(string fieldName, Type fieldType, Type sqlHelperType)
         /// Checks that tables related to specified data type included in current DataContext class, if not - compiles a new version of DataContext that contains them
         /// </summary>
         private HelperClassesGenerationInfo EnsureNeededTypes(
-            DataTypeDescriptor dataTypeDescriptor, 
-            IEnumerable<SqlDataTypeStoreDataScope> sqlDataTypeStoreDataScopes, 
-            Dictionary<DataTypeDescriptor, IEnumerable<SqlDataTypeStoreDataScope>> allSqlDataTypeStoreDataScopes, 
+            DataTypeDescriptor dataTypeDescriptor,
+            IEnumerable<SqlDataTypeStoreDataScope> sqlDataTypeStoreDataScopes,
+            Dictionary<DataTypeDescriptor, IEnumerable<SqlDataTypeStoreDataScope>> allSqlDataTypeStoreDataScopes,
             Type dataContextClassType,
             out Dictionary<SqlDataTypeStoreTableKey, StoreTypeInfo> fields,
             ref bool dataContextRecompileNeeded, bool forceCompile = false)
@@ -866,7 +865,7 @@ private HelperClassesGenerationInfo EnsureNeededTypes(
                         dataTypeDescriptor = DynamicTypeManager.BuildNewDataTypeDescriptor(interfaceType);
                     }
 
-                    return CompileMissingClasses(dataTypeDescriptor, allSqlDataTypeStoreDataScopes, fields, 
+                    return CompileMissingClasses(dataTypeDescriptor, allSqlDataTypeStoreDataScopes, fields,
                         storeDataScopesToCompile, storeDataScopesAlreadyCompiled);
                 }
             }
@@ -884,7 +883,7 @@ private bool TryLoadDataContextClass(Type dataContextClassType)
             bool success = true;
 
             var connection = SqlConnectionManager.GetConnection(_connectionString);
-            
+
             try
             {
                 var dataContext = (DataContext)Activator.CreateInstance(dataContextClassType, connection);
@@ -910,7 +909,7 @@ private bool TryLoadDataContextClass(Type dataContextClassType)
                 success = false;
             }
 
-            
+
             lock (_typeLoadResults)
             {
                 _typeLoadResults[dataContextClassType] = success;
@@ -928,10 +927,10 @@ private class HelperClassesGenerationInfo
 
 
 
-        private HelperClassesGenerationInfo CompileMissingClasses(DataTypeDescriptor dataTypeDescriptor, Dictionary<DataTypeDescriptor, 
+        private HelperClassesGenerationInfo CompileMissingClasses(DataTypeDescriptor dataTypeDescriptor, Dictionary<DataTypeDescriptor,
                                            IEnumerable<SqlDataTypeStoreDataScope>> allSqlDataTypeStoreDataScopes,
                                            Dictionary<SqlDataTypeStoreTableKey, StoreTypeInfo> fields,
-                                           List<SqlDataTypeStoreDataScope> storeDataScopesToCompile, 
+                                           List<SqlDataTypeStoreDataScope> storeDataScopesToCompile,
                                            List<SqlDataTypeStoreDataScope> storeDataScopesAlreadyCompiled)
         {
             return new HelperClassesGenerationInfo
@@ -1019,7 +1018,7 @@ private void UpdateCreatedSqlDataTypeStoreTables(Type newDataContextClassType)
                 }
                 else
                 {
-                    Log.LogWarning(LogTitle, "DataContext missing field newly created field '{0}'", fieldName);
+                    Log.LogWarning(LogTitle, $"DataContext missing field newly created field '{fieldName}'");
                 }
             }
         }
@@ -1036,7 +1035,7 @@ private Dictionary<DataTypeDescriptor, IEnumerable<SqlDataTypeStoreDataScope>> B
                 var dataTypeDescriptor = DataMetaDataFacade.GetDataTypeDescriptor(dataTypeId, true);
                 if (dataTypeDescriptor == null)
                 {
-                    Log.LogWarning(LogTitle, "Failed to get data type descriptor by id '{0}'".FormatWith(dataTypeId));
+                    Log.LogWarning(LogTitle, $"Failed to get data type descriptor by id '{dataTypeId}'");
                     continue;
                 }
 

From 504fd8b20088cb413f7b5a8998db7d9bdb3ac4b8 Mon Sep 17 00:00:00 2001
From: Taras Nakonechnyi <neexite@gmail.com>
Date: Tue, 24 Oct 2017 14:33:24 +0300
Subject: [PATCH 23/57] Fix #490 Transparency artifacts in Chrome

---
 Website/Composite/styles/default/_mixins.less | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Website/Composite/styles/default/_mixins.less b/Website/Composite/styles/default/_mixins.less
index 222489fc54..eac1351a29 100644
--- a/Website/Composite/styles/default/_mixins.less
+++ b/Website/Composite/styles/default/_mixins.less
@@ -5,6 +5,8 @@
 	// IE8 filter
 	@opacity-ie: (@opacity * 100);
 	filter: ~"alpha(opacity=@{opacity-ie})";
+	// fix transparency artifacts in Chrome(61)
+	-webkit-backface-visibility: hidden;
 }
 
 // Clearfix

From e332459bf4fe3afea85ef322399d4365309b4237 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Wed, 25 Oct 2017 15:53:26 +0200
Subject: [PATCH 24/57] Fixing a NullReferenceException in data types
 auto-update

---
 Composite/Data/DynamicTypes/DynamicTypeManager.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Composite/Data/DynamicTypes/DynamicTypeManager.cs b/Composite/Data/DynamicTypes/DynamicTypeManager.cs
index 9ecba39064..be98d3fe6e 100644
--- a/Composite/Data/DynamicTypes/DynamicTypeManager.cs
+++ b/Composite/Data/DynamicTypes/DynamicTypeManager.cs
@@ -390,7 +390,17 @@ internal static bool EnsureUpdateStore(Type interfaceType, string providerName,
                                                                                    .Contains(f.Name));
                     foreach (var field in customFields)
                     {
-                        newDataTypeDescriptor.Fields.Remove(newDataTypeDescriptor.Fields[field.Name]);
+                        var fieldDescriptor = newDataTypeDescriptor.Fields[field.Name];
+
+                        if (fieldDescriptor != null)
+                        {
+                            newDataTypeDescriptor.Fields.Remove(fieldDescriptor);
+                        }
+                        else
+                        {
+                            Log.LogWarning(nameof(DynamicTypeManager), $"Property '{field.Name}' was missing in the generated interface type '{interfaceType.FullName}'");
+                        }
+
                         newDataTypeDescriptor.Fields.Add(field);
                     }
                 }

From 6f26ee6a8b61e6b3b108fdeebe1455efa26b7d8a Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Mon, 30 Oct 2017 11:11:09 +0100
Subject: [PATCH 25/57] Fixing user permissions upgrade failing when there are
 permissions connected to no longer existing users/user groups.

---
 .../Compatibility/LegacySerializedEntityTokenUpgrader.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Composite/C1Console/Security/Compatibility/LegacySerializedEntityTokenUpgrader.cs b/Composite/C1Console/Security/Compatibility/LegacySerializedEntityTokenUpgrader.cs
index 4259c18d18..6d641245d2 100644
--- a/Composite/C1Console/Security/Compatibility/LegacySerializedEntityTokenUpgrader.cs
+++ b/Composite/C1Console/Security/Compatibility/LegacySerializedEntityTokenUpgrader.cs
@@ -19,6 +19,7 @@ namespace Composite.C1Console.Security.Compatibility
     [ApplicationStartup(AbortStartupOnException = false)]
     public static class LegacySerializedEntityTokenUpgrader
     {
+        const string LogTitle = nameof(LegacySerializedEntityTokenUpgrader);
         const string _configFilename = "LegacySerializedEntityTokenUpgrader.config";
         static readonly XName _docRoot = "UpgradeSettings";
         private static ILog _log;
@@ -38,7 +39,7 @@ public static void OnInitialized(ILog log)
                 }
                 catch (Exception ex)
                 {
-                    _log.LogError(nameof(LegacySerializedEntityTokenUpgrader), ex);
+                    _log.LogError(LogTitle, ex);
 
                     throw;
                 }
@@ -156,7 +157,7 @@ private static void UpgradeStoredData()
                                 }
                                 catch (Exception ex)
                                 {
-                                    _log.LogError(nameof(LegacySerializedEntityTokenUpgrader), "Failed to upgrade old token {0} from data type {1} as EntityToken.\n{2}", token, dataType.FullName, ex);
+                                    _log.LogError(LogTitle, $"Failed to upgrade old token '{token}' from data type '{dataType.FullName}' as EntityToken.\n{ex}");
                                 }
                             }
 
@@ -176,11 +177,11 @@ private static void UpgradeStoredData()
                                 }
                                 catch (Exception ex)
                                 {
-                                    _log.LogError(nameof(LegacySerializedEntityTokenUpgrader), "Failed to upgrade old token {0} from data type {1} as DataSourceId.\n{2}", token, dataType.FullName, ex);
+                                    _log.LogError(LogTitle, $"Failed to upgrade old token '{token}' from data type '{dataType.FullName}' as DataSourceId.\n{ex}");
                                 }
                             }
 
-                            if (rowChange) DataFacade.Update(rowItem);
+                            if (rowChange) DataFacade.Update(rowItem, true, false, false);
                         }
                     }
                 }

From 4afc17e949dadfe49efd6d46c5ed6e7eb32cdad1 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Mon, 13 Nov 2017 16:37:55 +0100
Subject: [PATCH 26/57] DataProviderPluginFacade - refactoring and removing
 excessive locking that limits website performance when using XmlDataProvider

---
 .../PluginFacades/DataProviderPluginFacade.cs | 125 ++++++------------
 1 file changed, 41 insertions(+), 84 deletions(-)

diff --git a/Composite/Data/Foundation/PluginFacades/DataProviderPluginFacade.cs b/Composite/Data/Foundation/PluginFacades/DataProviderPluginFacade.cs
index 501eca528a..7997679094 100644
--- a/Composite/Data/Foundation/PluginFacades/DataProviderPluginFacade.cs
+++ b/Composite/Data/Foundation/PluginFacades/DataProviderPluginFacade.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Configuration;
 using System.Globalization;
@@ -19,8 +19,6 @@ namespace Composite.Data.Foundation.PluginFacades
 {
     internal static class DataProviderPluginFacade
     {
-        internal static string UnittestDataProviderName { get { return "FallbackUnittestMemoryDataProvider"; } }
-
         private static readonly ResourceLocker<Resources> _resourceLocker = new ResourceLocker<Resources>(new Resources(), Resources.Initialize);
 
         internal static Func<IDataProviderFactory> DataProviderFactoryCreationDelegate = () => new ConfigurationDataProviderFactory();
@@ -35,8 +33,7 @@ static DataProviderPluginFacade()
 
         public static bool HasConfiguration()
         {
-            return ConfigurationServices.ConfigurationSource != null &&
-                   ConfigurationServices.ConfigurationSource.GetSection(DataProviderSettings.SectionName) != null;
+            return ConfigurationServices.ConfigurationSource?.GetSection(DataProviderSettings.SectionName) != null;
         }
 
 
@@ -67,7 +64,7 @@ public static IEnumerable<Type> GetKnownInterfaces(string providerName)
 
                     if (knownInterfaces.Contains(null))
                     {
-                        Log.LogWarning("DataProviderPluginFacade", "Data Provider '{0}' returned (null) as a known interface type. Value is ignored.", providerName);
+                        Log.LogWarning(nameof(DataProviderPluginFacade), $"Data Provider '{providerName}' returned (null) as a known interface type. Value is ignored.");
                         knownInterfaces.RemoveAll(f => f == null);
                     }
 
@@ -96,7 +93,7 @@ public static IQueryable<T> GetData<T>(string providerName)
         {
             using (TimerProfilerFacade.CreateTimerProfiler())
             {
-                return SyncronizedCall<IDataProvider, IQueryable<T>>(providerName, provider => provider.GetData<T>());
+                return Call<IDataProvider, IQueryable<T>>(providerName, provider => provider.GetData<T>());
             }
         }
 
@@ -109,7 +106,7 @@ public static T GetData<T>(string providerName, IDataId dataId)
 
             using (TimerProfilerFacade.CreateTimerProfiler())
             {
-                return SyncronizedCall<IDataProvider, T>(providerName, provider => provider.GetData<T>(dataId));
+                return Call<IDataProvider, T>(providerName, provider => provider.GetData<T>(dataId));
             }
         }
 
@@ -121,9 +118,6 @@ public static void Update(string providerName, IEnumerable<IData> dataset)
 
             using (TimerProfilerFacade.CreateTimerProfiler())
             {
-                IData firstData = dataset.FirstOrDefault();
-                if (firstData == null) return;
-
                 SyncronizedCall<IWritableDataProvider>(providerName, provider => provider.Update(dataset));
             }
         }
@@ -149,9 +143,6 @@ public static void Delete(string providerName, IEnumerable<DataSourceId> dataSou
 
             using (TimerProfilerFacade.CreateTimerProfiler())
             {
-                DataSourceId firstDataSourceId = dataSourceIds.FirstOrDefault();
-                if (firstDataSourceId == null) return;
-
                 SyncronizedCall<IWritableDataProvider>(providerName, provider => provider.Delete(dataSourceIds));
             }
         }
@@ -175,7 +166,7 @@ public static bool ValidatePath<TFile>(TFile file, string providerName, out stri
 
         public static void CreateStore(string providerName, DataTypeDescriptor typeDescriptor)
         {
-            CreateStores(providerName, new[] {typeDescriptor});
+            CreateStores(providerName, new[] { typeDescriptor });
         }
 
         public static void CreateStores(string providerName, IReadOnlyCollection<DataTypeDescriptor> typeDescriptors)
@@ -194,7 +185,7 @@ public static void CreateStores(string providerName, IReadOnlyCollection<DataTyp
 
         }
 
-        
+
         public static void AlterStore(UpdateDataTypeDescriptor updateDataTypeDescriptor, bool forceCompile)
         {
             using (TimerProfilerFacade.CreateTimerProfiler())
@@ -212,7 +203,7 @@ public static void AlterStore(UpdateDataTypeDescriptor updateDataTypeDescriptor,
         public static void DropStore(string providerName, DataTypeDescriptor typeDescriptor)
         {
             Verify.ArgumentNotNull(typeDescriptor, "typeDescriptor");
-   
+
             using (TimerProfilerFacade.CreateTimerProfiler())
             {
                 using (_resourceLocker.Locker)
@@ -251,27 +242,31 @@ public static void RemoveLocale(string providerName, CultureInfo cultureInfo)
             }
         }
 
-        private delegate void SyncronizedCallDelegate<T>(T provider) where T : class, IDataProvider;
-        private delegate TResult SyncronizedCallDelegate<T, TResult>(T provider)
-            where T : class, IDataProvider
-            where TResult : class;
+        private static TResult Call<TProvider, TResult>(string providerName, Func<TProvider, TResult> func)
+            where TProvider : class, IDataProvider
+            where TResult : class
+        {
+            var provider = GetDataProvider(providerName) as TProvider
+                ?? throw new InvalidOperationException($"The data provider '{providerName}' does not implement the interface '{typeof(TProvider).FullName}'");
 
-        private static void SyncronizedCall<TProvider>(string providerName, SyncronizedCallDelegate<TProvider> func) where TProvider : class, IDataProvider
+            return func(provider);
+        }
+
+        private static void SyncronizedCall<TProvider>(string providerName, Action<TProvider> func) where TProvider : class, IDataProvider
         {
             SyncronizedCall<TProvider, object>(providerName, provider =>
-                                                               {
-                                                                   func(provider);
-                                                                   return null;
-                                                               });
+            {
+                func(provider);
+                return null;
+            });
         }
 
-        private static TResult SyncronizedCall<TProvider, TResult>(string providerName, SyncronizedCallDelegate<TProvider, TResult> func)
+        private static TResult SyncronizedCall<TProvider, TResult>(string providerName, Func<TProvider, TResult> func)
             where TProvider : class, IDataProvider
             where TResult : class
         {
-            IDataProvider provider = GetDataProvider(providerName);
-
-            Verify.That(provider is TProvider, "The data provider {0} does not implement the interface {1}", providerName, typeof(TProvider).FullName);
+            var provider = GetDataProvider(providerName) as TProvider
+                ?? throw new InvalidOperationException($"The data provider '{providerName}' does not implement the interface '{typeof(TProvider).FullName}'");
 
             // DDZ: hardcoded for now, to be fixed
             bool syncDisabled = provider is SqlDataProvider;
@@ -284,58 +279,35 @@ private static TResult SyncronizedCall<TProvider, TResult>(string providerName,
                     scope = _resourceLocker.Locker;
                 }
 
-                return (TResult)func(provider as TProvider);
+                return func(provider);
             }
             finally
             {
-                if (scope != null)
-                {
-                    scope.Dispose();
-                }
+                scope?.Dispose();
             }
         }
 
         public static bool IsWriteableProvider(string providerName)
         {
-            var dataProvider = GetDataProvider(providerName);
-
-            return (dataProvider is IWritableDataProvider);
+            return GetDataProvider(providerName) is IWritableDataProvider;
         }
 
 
         public static bool IsDynamicProvider(string providerName)
         {
-            var dataProvider = GetDataProvider(providerName);
-
-            return (dataProvider is IDynamicDataProvider);
+            return GetDataProvider(providerName) is IDynamicDataProvider;
         }
 
 
         public static bool IsGeneratedTypesProvider(string providerName)
         {
-            using (TimerProfilerFacade.CreateTimerProfiler())
-            {
-                using (_resourceLocker.Locker)
-                {
-                    var dataProvider = GetDataProvider(providerName);
-
-                    return (dataProvider is IGeneratedTypesDataProvider);
-                }
-            }
+            return GetDataProvider(providerName) is IGeneratedTypesDataProvider;
         }
 
 
         public static bool IsLocalizedDataProvider(string providerName)
         {
-            using (TimerProfilerFacade.CreateTimerProfiler())
-            {
-                using (_resourceLocker.Locker)
-                {
-                    var dataProvider = GetDataProvider(providerName);
-
-                    return (dataProvider is ILocalizedDataProvider);
-                }
-            }
+            return GetDataProvider(providerName) is ILocalizedDataProvider;
         }
 
         /// <summary>
@@ -346,22 +318,15 @@ public static bool AllowsResultsWrapping(string providerName)
         {
             var dataProvider = GetDataProvider(providerName);
 
-            return dataProvider != null 
-                && (!(dataProvider is ISupportCachingDataProvider)
-                     || (dataProvider as ISupportCachingDataProvider).AllowResultsWrapping);
+            return (dataProvider as ISupportCachingDataProvider)?.AllowResultsWrapping ?? true;
         }
 
 
-        private static T GetDataProvider<T>(string providerName) where T: class, IDataProvider
+        private static T GetDataProvider<T>(string providerName) where T : class, IDataProvider
         {
             var provider = GetDataProvider(providerName) as T;
 
-            if (provider == null)
-            {
-                throw new InvalidOperationException(string.Format("The data provider {0} does not implement the interface {1}", providerName, typeof(T)));
-            }
-
-            return provider;
+            return provider ?? throw new InvalidOperationException($"The data provider '{providerName}' does not implement the interface '{typeof(T)}'"); ;
         }
 
 
@@ -391,11 +356,7 @@ internal static IDataProvider GetDataProvider(string providerName)
 
                     _resourceLocker.Resources.ProviderCache.Add(providerName, dataProvider);
                 }
-                catch (ArgumentException ex)
-                {
-                    HandleConfigurationError(ex);
-                }
-                catch (ConfigurationErrorsException ex)
+                catch (Exception ex) when (ex is ArgumentException || ex is ConfigurationErrorsException)
                 {
                     HandleConfigurationError(ex);
                 }
@@ -415,15 +376,15 @@ private static void HandleConfigurationError(Exception ex)
         {
             Flush();
 
-            throw new ConfigurationErrorsException(string.Format("Failed to load the configuration section '{0}' from the configuration.", DataProviderSettings.SectionName), ex);
-        }        
+            throw new ConfigurationErrorsException($"Failed to load the configuration section '{DataProviderSettings.SectionName}' from the configuration.", ex);
+        }
 
 
 
         private sealed class Resources
         {
-            public IDataProviderFactory Factory { get; set; }
-            public Hashtable<string, IDataProvider> ProviderCache { get; set; }
+            public IDataProviderFactory Factory { get; private set; }
+            public Hashtable<string, IDataProvider> ProviderCache { get; private set; }
 
             public static void Initialize(Resources resources)
             {
@@ -431,11 +392,7 @@ public static void Initialize(Resources resources)
                 {
                     resources.Factory = DataProviderFactoryCreationDelegate();
                 }
-                catch (NullReferenceException ex)
-                {
-                    HandleConfigurationError(ex);
-                }
-                catch (ConfigurationErrorsException ex)
+                catch (Exception ex) when (ex is NullReferenceException || ex is ConfigurationErrorsException)
                 {
                     HandleConfigurationError(ex);
                 }
@@ -444,4 +401,4 @@ public static void Initialize(Resources resources)
             }
         }
     }
-}
+}
\ No newline at end of file

From 16852ffc03ea5694ae04f942ca8731c932bb4f2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pauli=20=C3=98ster=C3=B8?= <pauli@burningice.dk>
Date: Thu, 16 Nov 2017 13:21:51 -0300
Subject: [PATCH 27/57] Resharping preparing to make changes to the
 ResizingOptions class

---
 .../Core/WebClient/Media/ResizingOptions.cs   | 99 +++++++------------
 1 file changed, 37 insertions(+), 62 deletions(-)

diff --git a/Composite/Core/WebClient/Media/ResizingOptions.cs b/Composite/Core/WebClient/Media/ResizingOptions.cs
index 0b88922043..66ae334dce 100644
--- a/Composite/Core/WebClient/Media/ResizingOptions.cs
+++ b/Composite/Core/WebClient/Media/ResizingOptions.cs
@@ -8,7 +8,6 @@
 using System.Xml.Linq;
 using Composite.Core.IO;
 using Composite.Core.Xml;
-using Composite.Core.Extensions;
 using Composite.Core.Configuration;
 
 namespace Composite.Core.WebClient.Media
@@ -16,8 +15,6 @@ namespace Composite.Core.WebClient.Media
     /// <summary>    
     /// Resizing options for <see ref="Composite.Core.WebClient.Media.ImageResizer" />
     /// </summary>
-    /// <exclude />
-    [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
     public class ResizingOptions
     {
         private const string ResizedImageKeys = "~/App_Data/Composite/Media/ResizingOptions.xml";
@@ -51,27 +48,12 @@ public class ResizingOptions
         /// <summary>
         /// Indicate if resizing options has a default or non-default quality setting (used when doing lossy compression). 
         /// </summary>
-        public bool CustomQuality {
-            get
-            {
-                return QualityOverride.HasValue;
-            } 
-        }
+        public bool CustomQuality => QualityOverride.HasValue;
 
         /// <summary>
         /// Image quality (when doing lossy compression)
         /// </summary>
-        public int Quality
-        {
-            get
-            {
-                if (QualityOverride.HasValue)
-                {
-                    return QualityOverride.Value;
-                }
-                return GlobalSettingsFacade.ImageQuality;
-            }
-        }
+        public int Quality => QualityOverride ?? GlobalSettingsFacade.ImageQuality;
 
         /// <summary>
         /// Resizing action
@@ -81,20 +63,10 @@ public int Quality
         /// <summary>
         /// Indicates whether any options were specified
         /// </summary>
-        public bool IsEmpty
-        {
-            get
-            {
-                return Height == null && Width == null && MaxHeight == null && MaxWidth == null && QualityOverride == null;
-            }
-        }
-
+        public bool IsEmpty => Height == null && Width == null && MaxHeight == null && MaxWidth == null && QualityOverride == null;
 
         /// <exclude />
-        public ResizingOptions()
-        {
-        }
-
+        public ResizingOptions() { }
 
         /// <summary>
         /// Parses resizing options from query string collection
@@ -115,13 +87,9 @@ public static ResizingOptions Parse(HttpServerUtility httpServerUtility, NameVal
         /// <returns>Resizing options</returns>
         public static ResizingOptions Parse(NameValueCollection queryString)
         {
-            string resizingKey = queryString["k"];
-            if (!string.IsNullOrEmpty(resizingKey))
-            {
-                return new ResizingOptions(resizingKey);
-            }
+            var resizingKey = queryString["k"];
 
-            return FromQueryString(queryString);
+            return string.IsNullOrEmpty(resizingKey) ? FromQueryString(queryString) : new ResizingOptions(resizingKey);
         }
 
         /// <exclude />
@@ -130,7 +98,7 @@ internal ResizingOptions(string predefinedOptionsName)
             //Load the xml file
             var options = GetPredefinedResizingOptions().Elements("image");
 
-            foreach (XElement e in options.Where(e => (string)e.Attribute("name") == predefinedOptionsName))
+            foreach (var e in options.Where(e => (string)e.Attribute("name") == predefinedOptionsName))
             {
                 Height = ParseOptionalIntAttribute(e, "height");
                 Width = ParseOptionalIntAttribute(e, "width");
@@ -148,8 +116,9 @@ internal ResizingOptions(string predefinedOptionsName)
 
         private static int? ParseOptionalIntAttribute(XElement element, string attributeName)
         {
-            XAttribute attribute = element.Attribute(attributeName);
-            return attribute == null ? (int?) null : int.Parse(attribute.Value);
+            var attribute = element.Attribute(attributeName);
+
+            return attribute == null ? (int?)null : int.Parse(attribute.Value);
         }
 
         /// <summary>
@@ -161,7 +130,7 @@ private static ResizingOptions FromQueryString(NameValueCollection queryString)
         {
             var result = new ResizingOptions();
 
-            string str = queryString["w"];
+            var str = queryString["w"];
             if (!string.IsNullOrEmpty(str))
             {
                 result.Width = int.Parse(str);
@@ -189,30 +158,34 @@ private static ResizingOptions FromQueryString(NameValueCollection queryString)
             if (!string.IsNullOrEmpty(str))
             {
                 result.QualityOverride = int.Parse(str);
-                if (result.QualityOverride < 1) result.QualityOverride = 1;
-                if (result.QualityOverride > 100) result.QualityOverride = 100;
+
+                if (result.QualityOverride < 1)
+                {
+                    result.QualityOverride = 1;
+                }
+
+                if (result.QualityOverride > 100)
+                {
+                    result.QualityOverride = 100;
+                }
             }
 
-            ResizingAction resizingAction;
-            string action = queryString["action"];
-            if (!action.IsNullOrEmpty() && Enum.TryParse(action, true, out resizingAction))
+            var action = queryString["action"];
+            if (!string.IsNullOrEmpty(action) && Enum.TryParse(action, true, out ResizingAction resizingAction))
             {
                 result.ResizingAction = resizingAction;
             }
             else
             {
-                result.ResizingAction = Media.ResizingAction.Stretch;
+                result.ResizingAction = ResizingAction.Stretch;
             }
 
             return result;
         }
-
         private static XElement GetPredefinedResizingOptions()
         {
-            XElement xel = HttpRuntime.Cache.Get("ResizedImageKeys") as XElement;
-
             //If it's not there, load the xml document and then add it to the cache
-            if (xel == null)
+            if (!(HttpRuntime.Cache.Get("ResizedImageKeys") is XElement xel))
             {
                 if (_resizedImageKeysFilePath == null)
                 {
@@ -221,7 +194,7 @@ private static XElement GetPredefinedResizingOptions()
 
                 if (!C1File.Exists(_resizedImageKeysFilePath))
                 {
-                    string directoryPath = Path.GetDirectoryName(_resizedImageKeysFilePath);
+                    var directoryPath = Path.GetDirectoryName(_resizedImageKeysFilePath);
                     if (!C1Directory.Exists(directoryPath)) C1Directory.CreateDirectory(directoryPath);
 
                     var config = new XElement("ResizedImages",
@@ -241,8 +214,10 @@ private static XElement GetPredefinedResizingOptions()
                 }
 
                 xel = XElementUtils.Load(_resizedImageKeysFilePath);
+
                 var cd = new CacheDependency(_resizedImageKeysFilePath);
                 var cacheExpirationTimeSpan = new TimeSpan(24, 0, 0);
+
                 HttpRuntime.Cache.Add("ResizedImageKeys", xel, cd, Cache.NoAbsoluteExpiration, cacheExpirationTimeSpan, CacheItemPriority.Default, null);
             }
 
@@ -250,26 +225,26 @@ private static XElement GetPredefinedResizingOptions()
         }
 
         /// <exclude />
-        override public string ToString()
+        public override string ToString()
         {
             var sb = new StringBuilder();
-            var parameters = new [] { Width, Height, MaxWidth, MaxHeight, QualityOverride };
+            var parameters = new[] { Width, Height, MaxWidth, MaxHeight, QualityOverride };
             var parameterNames = new[] { "w", "h", "mw", "mh", "q" };
 
-            for (int i = 0; i < parameters.Length; i++)
+            for (var i = 0; i < parameters.Length; i++)
             {
-                if (parameters[i] != null)
+                if (parameters[i] == null)
                 {
-                    sb.Append(sb.Length == 0 ? "" : "&");
-
-                    sb.Append(parameterNames[i]).Append("=").Append((int)parameters[i]);
+                    continue;
                 }
+
+                sb.Append(sb.Length == 0 ? String.Empty : "&");
+                sb.Append(parameterNames[i]).Append("=").Append((int)parameters[i]);
             }
 
             if (ResizingAction != ResizingAction.Stretch)
             {
-                sb.Append(sb.Length == 0 ? "" : "&");
-
+                sb.Append(sb.Length == 0 ? String.Empty : "&");
                 sb.Append("action=").Append(ResizingAction.ToString().ToLowerInvariant());
             }
 

From 0385338bb3e5e7e8d06fe76ea4f4d3e047a1dca5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pauli=20=C3=98ster=C3=B8?= <pauli@burningice.dk>
Date: Thu, 16 Nov 2017 13:32:00 -0300
Subject: [PATCH 28/57] Making it possible to set Quality-property on
 ResizingOptions

Fixes #482
---
 .../Core/WebClient/Media/ResizingOptions.cs   | 47 ++++++++++---------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/Composite/Core/WebClient/Media/ResizingOptions.cs b/Composite/Core/WebClient/Media/ResizingOptions.cs
index 66ae334dce..6234ec176b 100644
--- a/Composite/Core/WebClient/Media/ResizingOptions.cs
+++ b/Composite/Core/WebClient/Media/ResizingOptions.cs
@@ -20,6 +20,8 @@ public class ResizingOptions
         private const string ResizedImageKeys = "~/App_Data/Composite/Media/ResizingOptions.xml";
         private static string _resizedImageKeysFilePath;
 
+        private int? _qualityOverride;
+
         /// <summary>
         /// Image heigth
         /// </summary>
@@ -40,20 +42,33 @@ public class ResizingOptions
         /// </summary>
         public int? MaxWidth { get; set; }
 
-        /// <summary>
-        /// Image quality (when doing lossy compression)
-        /// </summary>
-        private int? QualityOverride { get; set; }
-
         /// <summary>
         /// Indicate if resizing options has a default or non-default quality setting (used when doing lossy compression). 
         /// </summary>
-        public bool CustomQuality => QualityOverride.HasValue;
+        public bool CustomQuality => _qualityOverride.HasValue;
 
         /// <summary>
         /// Image quality (when doing lossy compression)
         /// </summary>
-        public int Quality => QualityOverride ?? GlobalSettingsFacade.ImageQuality;
+        public int Quality
+        {
+            get => _qualityOverride ?? GlobalSettingsFacade.ImageQuality;
+
+            set
+            {
+                _qualityOverride = value;
+
+                if (_qualityOverride < 1)
+                {
+                    _qualityOverride = 1;
+                }
+
+                if (_qualityOverride > 100)
+                {
+                    _qualityOverride = 100;
+                }
+            }
+        }
 
         /// <summary>
         /// Resizing action
@@ -63,7 +78,7 @@ public class ResizingOptions
         /// <summary>
         /// Indicates whether any options were specified
         /// </summary>
-        public bool IsEmpty => Height == null && Width == null && MaxHeight == null && MaxWidth == null && QualityOverride == null;
+        public bool IsEmpty => Height == null && Width == null && MaxHeight == null && MaxWidth == null && _qualityOverride == null;
 
         /// <exclude />
         public ResizingOptions() { }
@@ -104,7 +119,7 @@ internal ResizingOptions(string predefinedOptionsName)
                 Width = ParseOptionalIntAttribute(e, "width");
                 MaxHeight = ParseOptionalIntAttribute(e, "maxheight");
                 MaxWidth = ParseOptionalIntAttribute(e, "maxwidth");
-                QualityOverride = ParseOptionalIntAttribute(e, "quality");
+                _qualityOverride = ParseOptionalIntAttribute(e, "quality");
 
                 var attr = e.Attribute("action");
                 if (attr != null)
@@ -157,17 +172,7 @@ private static ResizingOptions FromQueryString(NameValueCollection queryString)
             str = queryString["q"];
             if (!string.IsNullOrEmpty(str))
             {
-                result.QualityOverride = int.Parse(str);
-
-                if (result.QualityOverride < 1)
-                {
-                    result.QualityOverride = 1;
-                }
-
-                if (result.QualityOverride > 100)
-                {
-                    result.QualityOverride = 100;
-                }
+                result.Quality = int.Parse(str);
             }
 
             var action = queryString["action"];
@@ -228,7 +233,7 @@ private static XElement GetPredefinedResizingOptions()
         public override string ToString()
         {
             var sb = new StringBuilder();
-            var parameters = new[] { Width, Height, MaxWidth, MaxHeight, QualityOverride };
+            var parameters = new[] { Width, Height, MaxWidth, MaxHeight, _qualityOverride };
             var parameterNames = new[] { "w", "h", "mw", "mh", "q" };
 
             for (var i = 0; i < parameters.Length; i++)

From f78657600bf8d8f813a10f988c4ec77a3dc77183 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Mon, 27 Nov 2017 13:57:13 +0100
Subject: [PATCH 29/57] Fixing an exception in PageObjectCacheFunction

---
 .../Utils/Caching/PageObjectCacheFunction.cs                 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Composite/Plugins/Functions/FunctionProviders/StandardFunctionProvider/Utils/Caching/PageObjectCacheFunction.cs b/Composite/Plugins/Functions/FunctionProviders/StandardFunctionProvider/Utils/Caching/PageObjectCacheFunction.cs
index 239bc317a3..10b08d72e5 100644
--- a/Composite/Plugins/Functions/FunctionProviders/StandardFunctionProvider/Utils/Caching/PageObjectCacheFunction.cs
+++ b/Composite/Plugins/Functions/FunctionProviders/StandardFunctionProvider/Utils/Caching/PageObjectCacheFunction.cs
@@ -147,6 +147,11 @@ private static object EvaluateLazyResult(IEnumerable<XNode> xNodes, FunctionCont
                         var functionCallResult = functionTreeNode.GetValue(context);
                         if (functionCallResult != null)
                         {
+                            if (functionCallResult is XDocument document)
+                            {
+                                functionCallResult = document.Root;
+                            }
+
                             resultList.Add(functionCallResult);
 
                             if (functionCallResult is XObject || functionCallResult is IEnumerable<XObject>)

From ec95c1d56a737dd3311ba7497160f77bdababc29 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Wed, 29 Nov 2017 17:09:26 +0100
Subject: [PATCH 30/57] Media handler - removing unnecessary
 context.Response.Flush() call to address performance issues under heavy load

---
 Website/Renderers/ShowMedia.ashx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Website/Renderers/ShowMedia.ashx b/Website/Renderers/ShowMedia.ashx
index cc033e4911..522b545c2c 100644
--- a/Website/Renderers/ShowMedia.ashx
+++ b/Website/Renderers/ShowMedia.ashx
@@ -242,8 +242,6 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
                 
                 OutputToResponse(context, inputStream);
             }
-
-            context.Response.Flush();
         }
         catch (HttpException)
         {

From 209e499afa3ddcd253758e158e78066d81a03f0d Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Wed, 29 Nov 2017 17:11:39 +0100
Subject: [PATCH 31/57] Caching IMediaFile instances to speed-up media URLs
 rendering and media requests handling

---
 Composite/Core/WebClient/MediaUrlHelper.cs    | 53 +++++++++++++++----
 .../DefaultMediaUrlProvider.cs                | 24 +--------
 2 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/Composite/Core/WebClient/MediaUrlHelper.cs b/Composite/Core/WebClient/MediaUrlHelper.cs
index f8dd3e785d..8438422d73 100644
--- a/Composite/Core/WebClient/MediaUrlHelper.cs
+++ b/Composite/Core/WebClient/MediaUrlHelper.cs
@@ -6,7 +6,9 @@
 using System.Text.RegularExpressions;
 using Composite.Core.Extensions;
 using Composite.Core.Routing;
+using Composite.Core.Types;
 using Composite.Data;
+using Composite.Data.Caching;
 using Composite.Data.Types;
 using Composite.Plugins.Routing.InternalUrlConverters;
 
@@ -21,7 +23,31 @@ public static class MediaUrlHelper
 	{
 	    private static readonly string DefaultMediaStore = "MediaArchive";
         private static readonly Regex GuidRegex = new Regex(@"^(\{){0,1}[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}(\}){0,1}$");
-        //private static readonly string LogTitle = typeof(MediaUrlHelper).Name;
+
+	    private static readonly int MediaFileCacheSize = 2000;
+        private static readonly Cache<string, ExtendedNullable<IMediaFile>> _mediaFileCache = new Cache<string, ExtendedNullable<IMediaFile>>("Media files", MediaFileCacheSize);
+
+	    static MediaUrlHelper()
+	    {
+	        void OnMediaFileChanged(object sender, DataEventArgs args)
+	        {
+	            if (args.Data is IMediaFile mediaFile)
+	            {
+	                _mediaFileCache.Remove(GetCacheKey(mediaFile.StoreId, mediaFile.Id));
+	            }
+	        }
+
+	        DataEvents<IMediaFile>.OnAfterAdd += OnMediaFileChanged;
+	        DataEvents<IMediaFile>.OnAfterUpdate += OnMediaFileChanged;
+	        DataEvents<IMediaFile>.OnDeleted += OnMediaFileChanged;
+	        DataEvents<IMediaFile>.OnStoreChanged += (s, a) =>
+	        {
+	            if (!a.DataEventsFired)
+	            {
+	                _mediaFileCache.Clear();
+                }
+	        };
+	    }
 
         /// <exclude />
         public static string GetUrl(IMediaFile file)
@@ -131,21 +157,30 @@ public static IMediaFile GetFileFromQueryString(NameValueCollection queryParamet
             return result;
         }
 
-        private static IMediaFile GetFileById(string storeId, Guid fileId)
+        internal static string GetCacheKey(string storeId, Guid fileId) => storeId + fileId;
+
+        internal static IMediaFile GetFileById(string storeId, Guid fileId)
         {
+            string cacheKey = GetCacheKey(storeId, fileId);
+            var cachedValue = _mediaFileCache.Get(cacheKey);
+            if (cachedValue != null)
+            {
+                return cachedValue.Value;
+            }
+
             using (new DataScope(DataScopeIdentifier.Public))
             {
                 var query = DataFacade.GetData<IMediaFile>();
 
-                if (query.IsEnumerableQuery())
-                {
-                    return (query as IEnumerable<IMediaFile>)
-                        .FirstOrDefault(f => f.Id == fileId && f.StoreId == storeId);
-                }
+                var result = query.IsEnumerableQuery()
+                    ? (query as IEnumerable<IMediaFile>).FirstOrDefault(f => f.Id == fileId && f.StoreId == storeId)
+                    : query.FirstOrDefault(f => f.StoreId == storeId && f.Id == fileId);
 
-                return query
-                    .FirstOrDefault(f => f.StoreId == storeId && f.Id == fileId);
+                _mediaFileCache.Add(cacheKey, new ExtendedNullable<IMediaFile> { Value = result });
+
+                return result;
             }
+
         }
 
         private static IMediaFile GetFileByCompositePath(string storeId, string compositePath)
diff --git a/Composite/Plugins/Routing/MediaUrlProviders/DefaultMediaUrlProvider.cs b/Composite/Plugins/Routing/MediaUrlProviders/DefaultMediaUrlProvider.cs
index c98fc7a3f4..f29bf1e234 100644
--- a/Composite/Plugins/Routing/MediaUrlProviders/DefaultMediaUrlProvider.cs
+++ b/Composite/Plugins/Routing/MediaUrlProviders/DefaultMediaUrlProvider.cs
@@ -1,16 +1,12 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
 using System.Web;
 using Composite.Core;
-using Composite.Core.Extensions;
 using Composite.Core.IO;
 using Composite.Core.Routing;
 using Composite.Core.WebClient;
 using Composite.Core.WebClient.Media;
-using Composite.Data;
 using Composite.Data.Types;
 
 namespace Composite.Plugins.Routing.MediaUrlProviders
@@ -45,7 +41,7 @@ public string GetPublicMediaUrl(string storeId, Guid mediaId)
         /// <exclude />
         public string GetResizedImageUrl(string storeId, Guid mediaId, ResizingOptions resizingOptions)
         {
-            IMediaFile file = GetFileById(storeId, mediaId);
+            IMediaFile file = MediaUrlHelper.GetFileById(storeId, mediaId);
             if (file == null)
             {
                 return null;
@@ -147,24 +143,6 @@ private static string RemoveForbiddenCharactersAndNormalize(string path)
         }
 
 
-        private static IMediaFile GetFileById(string storeId, Guid fileId)
-        {
-            using (new DataScope(DataScopeIdentifier.Public))
-            {
-                var query = DataFacade.GetData<IMediaFile>();
-
-                if (query.IsEnumerableQuery())
-                {
-                    return (query as IEnumerable<IMediaFile>)
-                        .FirstOrDefault(f => f.Id == fileId && f.StoreId == storeId);
-                }
-
-                return query
-                    .FirstOrDefault(f => f.StoreId == storeId && f.Id == fileId);
-            }
-        }
-
-
         private static string RemoveFilePathIllegalCharacters(string path)
         {
             path = path.Replace('\"', ' ').Replace('<', ' ').Replace('>', ' ').Replace('|', ' ');

From f53d7777a614b386b2f845ecb08c6b64be7866e4 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Wed, 29 Nov 2017 17:13:27 +0100
Subject: [PATCH 32/57] ShowMedia.ashx - whitespace formatting

---
 Website/Renderers/ShowMedia.ashx | 87 ++++++++++++++++----------------
 1 file changed, 44 insertions(+), 43 deletions(-)

diff --git a/Website/Renderers/ShowMedia.ashx b/Website/Renderers/ShowMedia.ashx
index 522b545c2c..44390679b5 100644
--- a/Website/Renderers/ShowMedia.ashx
+++ b/Website/Renderers/ShowMedia.ashx
@@ -25,19 +25,19 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
 {
     private const int CopyBufferSize = 8192;
     private static readonly string MediaUrl_PublicPrefix = UrlUtils.PublicRootPath + "/media/";
-    
+
     private class Range
     {
-        public Range(long offset, long length) 
+        public Range(long offset, long length)
         {
             Offset = offset;
             Length = length;
         }
-        
+
         public readonly long Offset;
         public readonly long Length;
     }
-    
+
     public void ProcessRequest(HttpContext context)
     {
         using (GlobalInitializerFacade.CoreIsInitializedScope)
@@ -64,7 +64,7 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
                 {
                     throw;
                 }
-                
+
                 context.Response.StatusCode = 500;
             }
 
@@ -72,7 +72,7 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
             {
                 return;
             }
-            
+
             try
             {
                 ValidateAndSend(context, file);
@@ -112,7 +112,7 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
 
         return false;
     }
-    
+
     private static void ValidateAndSend(HttpContext context, IMediaFile file)
     {
         if (ExecuteResponseHandlers(context, file))
@@ -145,7 +145,7 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
             context.Response.Cache.SetCacheability(HttpCacheability.Public);
 
             checkIfModifiedSince = true;
-        } 
+        }
         else if (!UserValidationFacade.IsLoggedIn())
         {
             context.Response.Cache.SetExpires(DateTime.Now.AddMinutes(60));
@@ -179,13 +179,13 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
                 length = file.Length;
             }
 
-            
+
             bool canAcceptRanges = inputStream.CanSeek && length != null && length > 0;
             if (canAcceptRanges)
             {
                 context.Response.AddHeader("Accept-Ranges", "bytes");
-            }            
-            
+            }
+
             if (checkIfModifiedSince && file.LastWriteTime != null)
             {
                 var lastModified = file.LastWriteTime.Value;
@@ -211,10 +211,10 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
                 }
             }
 
-           
+
             string rangeStr = context.Request.Headers["Range"];
-            
-            if(canAcceptRanges && !rangeStr.IsNullOrEmpty())
+
+            if (canAcceptRanges && !rangeStr.IsNullOrEmpty())
             {
                 List<Range> rangeSegments = ParseRanges(rangeStr, length.Value);
 
@@ -223,9 +223,9 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
 
                 int totalLength = (int)rangeSegments.Select(rs => rs.Length).Sum();
                 Verify.That(totalLength <= length.Value, "Combined download range is bigger then stream length");
-                
+
                 context.Response.AddHeader("Content-Length", totalLength.ToString(CultureInfo.InvariantCulture));
-                
+
                 foreach (var rangeSegment in rangeSegments)
                 {
                     inputStream.Seek(rangeSegment.Offset, SeekOrigin.Begin);
@@ -239,7 +239,7 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
                 {
                     context.Response.AddHeader("Content-Length", ((int)length).ToString(CultureInfo.InvariantCulture));
                 }
-                
+
                 OutputToResponse(context, inputStream);
             }
         }
@@ -256,7 +256,7 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
             }
         }
     }
-    
+
     private static bool UrlContainsTimestamp(HttpContext context, IMediaFile file)
     {
         string url = context.Request.RawUrl;
@@ -266,22 +266,23 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
         string[] urlParts = url.Substring(MediaUrl_PublicPrefix.Length).Split('/');
 
         Guid tempGuid;
-        
-        return urlParts.Length >= 2 
+
+        return urlParts.Length >= 2
             && Guid.TryParse(urlParts[0], out tempGuid)
-            && urlParts[1].Length == 6 
+            && urlParts[1].Length == 6
             && urlParts[1] == GetTimeStampHash(file);
     }
 
-    
+
     private static string GetTimeStampHash(IMediaFile file)
     {
         int hash = file.LastWriteTime.Value.ToUniversalTime().GetHashCode();
         return Convert.ToBase64String(BitConverter.GetBytes(hash)).Substring(0, 6).Replace('+', '-').Replace('/', '_');
     }
-    
-    
-    private static void OutputToResponse(HttpContext context, Stream inputStream) {
+
+
+    private static void OutputToResponse(HttpContext context, Stream inputStream)
+    {
         var response = context.Response;
 
         byte[] buffer = new byte[CopyBufferSize];
@@ -301,14 +302,14 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
                 {
                     return;
                 }
-                
+
                 // Flushing to prevent unnecessary memory usage
                 response.Flush();
             }
         }
     }
-    
-    
+
+
     private static List<Range> ParseRanges(string rangesStr, long streamLength)
     {
         const string requiredPrefix = "bytes=";
@@ -317,7 +318,7 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
         rangesStr = rangesStr.Substring(requiredPrefix.Length);
         var result = new List<Range>();
 
-        foreach (string rangeStr in rangesStr.Split(new [] {','}, StringSplitOptions.RemoveEmptyEntries))
+        foreach (string rangeStr in rangesStr.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
         {
             try
             {
@@ -330,7 +331,7 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
                 Verify.That(beginOffset != null || endOffset != null, "Parameters missing");
 
 
-                if(beginOffset == null)
+                if (beginOffset == null)
                 {
                     Verify.That(endOffset <= streamLength, "The segment is bigger than the lenght of the file");
 
@@ -339,26 +340,26 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
                 }
 
                 Verify.That(beginOffset < streamLength, "Begin offset is out of range");
-                
-                if(endOffset == null)
+
+                if (endOffset == null)
                 {
                     result.Add(new Range(beginOffset.Value, streamLength - beginOffset.Value));
                     continue;
                 }
-                
+
                 Verify.That(beginOffset <= endOffset, "End offset should be greater than begin offset");
 
                 result.Add(new Range(beginOffset.Value, endOffset.Value - beginOffset.Value + 1));
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 throw new InvalidOperationException("Incorrect range segment '{0}'. Range: '{1}'".FormatWith(rangeStr, rangesStr), ex);
             }
-        } 
+        }
 
         return result;
     }
-    
+
     private static string BuildContentRangeResponseHeader(List<Range> rangeSegments, long length)
     {
         var contentRangeHeader = new StringBuilder();
@@ -377,7 +378,7 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
 
         return contentRangeHeader.ToString();
     }
-    
+
     private static DateTime? ParseDateTimeHeader(HttpContext context, string headerName)
     {
         string header = context.Request.Headers[headerName];
@@ -474,8 +475,8 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
         try
         {
             string resizedImageFilePath = ImageResizer.GetResizedImage(context.Server, file, resizingOptions, imgType);
-            
-            return resizedImageFilePath != null 
+
+            return resizedImageFilePath != null
                 ? new C1FileStream(resizedImageFilePath, FileMode.OpenOrCreate, FileAccess.Read)
                 : file.GetReadStream();
         }
@@ -485,7 +486,7 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
         }
         return file.GetReadStream();
     }
-    
+
     /// <summary>
     /// Allows reading only limited amount bytes from inner stream
     /// </summary>
@@ -494,14 +495,14 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
         private readonly Stream _innerStream;
         private readonly long _size;
         private long _position;
-        
+
         public LimitedStream(Stream innerStream, long size)
         {
             _innerStream = innerStream;
             _size = size;
             _position = 0;
         }
-        
+
         public override void Flush()
         {
         }
@@ -518,7 +519,7 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
 
         public override int Read(byte[] buffer, int offset, int count)
         {
-            if(_position >= _size)
+            if (_position >= _size)
             {
                 return 0;
             }

From 8830221049477ce1464a557112d6d0a9d0b8c73d Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Thu, 30 Nov 2017 10:21:26 +0100
Subject: [PATCH 33/57] Media performance - using HttpReponse.WriteFile()
 instead of OutputStream for handling media requests

---
 Website/Renderers/ShowMedia.ashx | 110 +++++++++++++++++++++++++------
 1 file changed, 91 insertions(+), 19 deletions(-)

diff --git a/Website/Renderers/ShowMedia.ashx b/Website/Renderers/ShowMedia.ashx
index 44390679b5..423a824c75 100644
--- a/Website/Renderers/ShowMedia.ashx
+++ b/Website/Renderers/ShowMedia.ashx
@@ -19,6 +19,7 @@ using Composite.Core.Extensions;
 using Composite.Core.WebClient;
 using Composite.Core.WebClient.Media;
 using Composite.Core.WebClient.Renderings;
+using Composite.Data.Plugins.DataProvider.Streams;
 
 
 public class ShowMedia : IHttpHandler, IReadOnlySessionState
@@ -38,6 +39,43 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
         public readonly long Length;
     }
 
+    private class FileOrStream
+    {
+        readonly string _fileName;
+        readonly IMediaFile _mediaFile;
+
+        public FileOrStream(string fileName)
+        {
+            _fileName = fileName;
+        }
+
+        public FileOrStream(IMediaFile mediaFile)
+        {
+            _mediaFile = mediaFile;
+
+            if (mediaFile is FileSystemFileBase)
+            {
+                _fileName = ((FileSystemFileBase) _mediaFile).SystemPath;
+            }
+        }
+
+        public bool IsFile
+        {
+            get { return _fileName != null; }
+        }
+
+        public string GetFilePath()
+        {
+            return _fileName;
+        }
+
+        public Stream OpenReadStream()
+        {
+            return _mediaFile.GetReadStream();
+        }
+    }
+
+
     public void ProcessRequest(HttpContext context)
     {
         using (GlobalInitializerFacade.CoreIsInitializedScope)
@@ -90,9 +128,9 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
         }
     }
 
-    private static bool ExecuteResponseHandlers(HttpContext context, IMediaFile file)
+    private static bool ExecuteResponseHandlers(HttpContext context, IMediaFile mediaFile)
     {
-        RenderingResponseHandlerResult responseHandling = RenderingResponseHandlerFacade.GetDataResponseHandling(file.GetDataEntityToken());
+        RenderingResponseHandlerResult responseHandling = RenderingResponseHandlerFacade.GetDataResponseHandling(mediaFile.GetDataEntityToken());
 
         if (responseHandling != null)
         {
@@ -157,30 +195,50 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
         Stream inputStream = null;
         try
         {
+            FileOrStream source;
 
             if (file.MimeType == "image/jpeg" || file.MimeType == "image/gif" || file.MimeType == "image/png"
                 || file.MimeType == "image/bmp" || file.MimeType == "image/tiff")
             {
-                inputStream = ProcessImageResizing(context, file);
+                source = ProcessImageResizing(context, file);
             }
             else
             {
-                inputStream = file.GetReadStream();
+                source = new FileOrStream(file);
             }
 
             long? length = null;
+            bool canSeek;
 
-            if (inputStream.CanSeek && inputStream.Length != 0)
+            if (source.IsFile)
             {
-                length = inputStream.Length;
+                var fileInfo = new FileInfo(source.GetFilePath());
+                if (!fileInfo.Exists)
+                {
+                    context.Response.StatusCode = 404;
+                    return;
+                }
+
+                length = fileInfo.Length;
+                canSeek = true;
             }
-            else if (file.Length.HasValue && file.Length > 0)
+            else
             {
-                length = file.Length;
-            }
+                inputStream = source.OpenReadStream();
 
+                canSeek = inputStream.CanSeek;
 
-            bool canAcceptRanges = inputStream.CanSeek && length != null && length > 0;
+                if (canSeek && inputStream.Length != 0)
+                {
+                    length = inputStream.Length;
+                }
+                else if (file.Length.HasValue && file.Length > 0)
+                {
+                    length = file.Length;
+                }
+            }
+
+            bool canAcceptRanges = canSeek && length != null && length > 0;
             if (canAcceptRanges)
             {
                 context.Response.AddHeader("Accept-Ranges", "bytes");
@@ -228,9 +286,16 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
 
                 foreach (var rangeSegment in rangeSegments)
                 {
-                    inputStream.Seek(rangeSegment.Offset, SeekOrigin.Begin);
-
-                    OutputToResponse(context, new LimitedStream(inputStream, rangeSegment.Length));
+                    if (source.IsFile)
+                    {
+                        context.Response.WriteFile(source.GetFilePath(), rangeSegment.Offset, rangeSegment.Length);
+                    }
+                    else
+                    {
+                        inputStream.Seek(rangeSegment.Offset, SeekOrigin.Begin);
+
+                        OutputToResponse(context, new LimitedStream(inputStream, rangeSegment.Length));
+                    }
                 }
             }
             else
@@ -240,7 +305,14 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
                     context.Response.AddHeader("Content-Length", ((int)length).ToString(CultureInfo.InvariantCulture));
                 }
 
-                OutputToResponse(context, inputStream);
+                if (source.IsFile)
+                {
+                    context.Response.WriteFile(source.GetFilePath());
+                }
+                else
+                {
+                    OutputToResponse(context, inputStream);
+                }
             }
         }
         catch (HttpException)
@@ -432,13 +504,13 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
         }
     }
 
-    private static Stream ProcessImageResizing(HttpContext context, IMediaFile file)
+    private static FileOrStream ProcessImageResizing(HttpContext context, IMediaFile file)
     {
         var resizingOptions = ResizingOptions.Parse(context.Server, context.Request.QueryString);
 
         if (resizingOptions == null || resizingOptions.IsEmpty)
         {
-            return file.GetReadStream();
+            return new FileOrStream(file);
         }
 
         //Determine the content type, and save
@@ -477,14 +549,14 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
             string resizedImageFilePath = ImageResizer.GetResizedImage(context.Server, file, resizingOptions, imgType);
 
             return resizedImageFilePath != null
-                ? new C1FileStream(resizedImageFilePath, FileMode.OpenOrCreate, FileAccess.Read)
-                : file.GetReadStream();
+                ? new FileOrStream(resizedImageFilePath)
+                : new FileOrStream(file);
         }
         catch (Exception ex)
         {
             Log.LogVerbose("Composite.Media.ImageResize", ex.Message);
         }
-        return file.GetReadStream();
+        return new FileOrStream(file);
     }
 
     /// <summary>

From ab3b3380a1ce6875ed9e527f53fcdc3a2f990217 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Fri, 8 Dec 2017 09:58:33 +0100
Subject: [PATCH 34/57] Adding "Media files" cache to Composite.config

---
 Website/App_Data/Composite/DebugBuild.Composite.config   | 1 +
 Website/App_Data/Composite/ReleaseBuild.Composite.config | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Website/App_Data/Composite/DebugBuild.Composite.config b/Website/App_Data/Composite/DebugBuild.Composite.config
index ee99d7c2ab..f98c37d027 100644
--- a/Website/App_Data/Composite/DebugBuild.Composite.config
+++ b/Website/App_Data/Composite/DebugBuild.Composite.config
@@ -105,6 +105,7 @@
           <add name="Page structure" enabled="true" size="20000" />
           <add name="Page placeholders" enabled="true" size="10000" />
           <add name="Child pages" enabled="true" size="20000" />
+          <add name="Media files" enabled="true" size="10000" />
           <add name="Security permissions" enabled="true" size="1000" />
           <add name="Resource strings" enabled="true" size="5000" />
           <add name="Entity token parents" enabled="true" size="50000" />
diff --git a/Website/App_Data/Composite/ReleaseBuild.Composite.config b/Website/App_Data/Composite/ReleaseBuild.Composite.config
index d90aeedf5c..12ff4cf345 100644
--- a/Website/App_Data/Composite/ReleaseBuild.Composite.config
+++ b/Website/App_Data/Composite/ReleaseBuild.Composite.config
@@ -100,6 +100,7 @@
           <add name="Page structure" enabled="true" size="20000" />
           <add name="Page placeholders" enabled="true" size="10000" />
           <add name="Child pages" enabled="true" size="20000" />
+          <add name="Media files" enabled="true" size="10000" />
           <add name="Security permissions" enabled="true" size="1000" />
           <add name="Resource strings" enabled="true" size="5000" />
           <add name="Entity token parents" enabled="true" size="50000" />

From 9b00c6536ac4ddef170466da5e80845305038d2b Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Fri, 8 Dec 2017 15:53:00 +0100
Subject: [PATCH 35/57] Converting internal->public URLs when the page content
 is still represented as XhtmlDocument

---
 Composite/Core/Routing/InternalUrls.cs        | 82 +++++++++++++++----
 .../WebClient/Renderings/Page/PageRenderer.cs |  7 +-
 2 files changed, 70 insertions(+), 19 deletions(-)

diff --git a/Composite/Core/Routing/InternalUrls.cs b/Composite/Core/Routing/InternalUrls.cs
index 22d677b49c..b24e40fe98 100644
--- a/Composite/Core/Routing/InternalUrls.cs
+++ b/Composite/Core/Routing/InternalUrls.cs
@@ -1,11 +1,11 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Text;
+using System.Xml.Linq;
 using Composite.Core.Instrumentation;
-using Composite.Core.Linq;
 using Composite.Core.WebClient;
 using Composite.Data;
 using Composite.Data.DynamicTypes.Foundation;
@@ -155,43 +155,89 @@ public static string TryConvertInternalUrlToPublic(string internalUrl, UrlSpace
             return internalUrl;
         }
 
+        private static string ResolvePrefix(string urlPrefix) => UrlUtils.PublicRootPath + "/" + urlPrefix;
+
+        private static Dictionary<string, IInternalUrlConverter> GetConvertersMap(Func<string, string> mapPrefix)
+        {
+            var result = new Dictionary<string, IInternalUrlConverter>();
+            foreach (var converter in _converters)
+            {
+                foreach (var prefix in converter.AcceptedUrlPrefixes)
+                {
+                    result[mapPrefix(prefix)] = converter;
+                }
+            }
+
+            return result;
+        }
+
+        private static bool IsLinkAttribute(XName attrName) => attrName.LocalName == "src" || attrName.LocalName == "href";
+
 
         /// <summary>
         /// Converts internal urls to public ones in a given html fragment
         /// </summary>
-        /// <param name="html"></param>
-        /// <param name="converters"></param>
+        /// <param name="document"></param>
         /// <returns></returns>
-        internal static string ConvertInternalUrlsToPublic(string html, IEnumerable<IInternalUrlConverter> converters)
+        public static void ConvertInternalUrlsToPublic(XDocument document)
         {
-            converters = converters.Evaluate();
+            Verify.ArgumentNotNull(document, nameof(document));
 
-            if (!converters.Any())
-            {
-                return html;
-            }
+            var convertersMap = GetConvertersMap(ResolvePrefix);
+            if (!convertersMap.Any()) return;
+
+            var urlSpace = new UrlSpace();
 
-            var convertersMap = new Dictionary<string, IInternalUrlConverter>();
-            foreach (var converter in converters)
+            var convertionCache = new Dictionary<string, string>();
+            foreach (var element in document.Descendants())
             {
-                foreach (var prefix in converter.AcceptedUrlPrefixes)
+                foreach (var attr in element.Attributes().Where(a => IsLinkAttribute(a.Name)))
                 {
-                    convertersMap[prefix] = converter;
+                    string link = attr.Value;
+                    if (convertionCache.TryGetValue(link, out string cachedLink))
+                    {
+                        attr.Value = cachedLink;
+                        continue;
+                    }
+
+                    foreach (var prefix in convertersMap.Keys)
+                    {
+                        if (link.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
+                        {
+                            var converter = convertersMap[prefix];
+                            var newLink = converter.ToPublicUrl(link, urlSpace);
+                            if (newLink != null && newLink != link)
+                            {
+                                convertionCache[link] = newLink;
+                                attr.Value = newLink;
+                                break;
+                            }
+                        }
+                    }
                 }
             }
+        }
+
 
+        /// <summary>
+        /// Converts internal urls to public ones in a given html fragment
+        /// </summary>
+        /// <param name="html"></param>
+        /// <param name="converters"></param>
+        /// <returns></returns>
+        internal static string ConvertInternalUrlsToPublic(string html, IEnumerable<IInternalUrlConverter> converters)
+        {
+            var convertersMap = GetConvertersMap(_ => _);
             if (!convertersMap.Any())
             {
                 return html;
             }
 
-            Func<string, string> resolvedPrefix = urlPrefix => UrlUtils.PublicRootPath + "/" + urlPrefix;
-
             // Urls, generated in UserControl-s may still have "~/" as a prefix
             foreach (var urlPrefix in convertersMap.Keys)
             {
                 string rawUrlPrefix = "~/" + urlPrefix;
-                string resolvedUrlPrefix = resolvedPrefix(urlPrefix);
+                string resolvedUrlPrefix = ResolvePrefix(urlPrefix);
 
                 html = UrlUtils.ReplaceUrlPrefix(html, rawUrlPrefix, resolvedUrlPrefix);
             }
@@ -202,7 +248,7 @@ internal static string ConvertInternalUrlsToPublic(string html, IEnumerable<IInt
 
             foreach (var pair in convertersMap)
             {
-                string internalPrefix = resolvedPrefix(pair.Key);
+                string internalPrefix = ResolvePrefix(pair.Key);
                 var converter = pair.Value;
 
                 // Bracket encoding fix
diff --git a/Composite/Core/WebClient/Renderings/Page/PageRenderer.cs b/Composite/Core/WebClient/Renderings/Page/PageRenderer.cs
index 6f578f7235..f51735a6a9 100644
--- a/Composite/Core/WebClient/Renderings/Page/PageRenderer.cs
+++ b/Composite/Core/WebClient/Renderings/Page/PageRenderer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -283,6 +283,11 @@ internal static void ProcessXhtmlDocument(XhtmlDocument xhtmlDocument, IPage pag
             {
                 LocalizationParser.Parse(xhtmlDocument);
             }
+
+            using (Profiler.Measure("Converting URLs from internal to public format (XhtmlDocument)"))
+            {
+                InternalUrls.ConvertInternalUrlsToPublic(xhtmlDocument);
+            }
         }
 
 

From 11873308b17aae619ffba269cd20e2bf20846dc8 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Tue, 12 Dec 2017 15:04:37 +0100
Subject: [PATCH 36/57] Introducing IPageContentFilter interface

---
 Composite/Composite.csproj                    |  1 +
 .../Renderings/Page/IPageContentFilter.cs     | 24 +++++++++++++++++++
 .../WebClient/Renderings/Page/PageRenderer.cs |  9 +++++++
 3 files changed, 34 insertions(+)
 create mode 100644 Composite/Core/WebClient/Renderings/Page/IPageContentFilter.cs

diff --git a/Composite/Composite.csproj b/Composite/Composite.csproj
index dde66947de..8c2174efc2 100644
--- a/Composite/Composite.csproj
+++ b/Composite/Composite.csproj
@@ -254,6 +254,7 @@
     <Compile Include="Core\Instrumentation\DisposableResourceTracer.cs" />
     <Compile Include="Core\Serialization\CompositeJsonSerializer.cs" />
     <Compile Include="Core\WebClient\PageStructureRpc.cs" />
+    <Compile Include="Core\WebClient\Renderings\Page\IPageContentFilter.cs" />
     <Compile Include="Core\WebClient\Services\WampRouter\WampRouteWrapper.cs" />
     <Compile Include="Data\Caching\CachedTable.cs" />
     <Compile Include="Data\Types\VersionedDataHelperContract.cs" />
diff --git a/Composite/Core/WebClient/Renderings/Page/IPageContentFilter.cs b/Composite/Core/WebClient/Renderings/Page/IPageContentFilter.cs
new file mode 100644
index 0000000000..c919553581
--- /dev/null
+++ b/Composite/Core/WebClient/Renderings/Page/IPageContentFilter.cs
@@ -0,0 +1,24 @@
+using Composite.Core.Xml;
+using Composite.Data.Types;
+
+namespace Composite.Core.WebClient.Renderings.Page
+{
+    /// <summary>
+    /// An interface that allows post processing of pages generated with <see cref="PageRenderer"/> class.
+    /// </summary>
+    public interface IPageContentFilter
+    {
+        /// <summary>
+        /// Filters the output.
+        /// </summary>
+        /// <param name="document">The document to be updated.</param>
+        /// <param name="page">The C1 page currently being rendered.</param>
+        /// <returns></returns>
+        void Filter(XhtmlDocument document, IPage page);
+
+        /// <summary>
+        /// Gets the execution order. Filters wil lower values will be executed first.
+        /// </summary>
+        int Order { get; }
+    }
+}
\ No newline at end of file
diff --git a/Composite/Core/WebClient/Renderings/Page/PageRenderer.cs b/Composite/Core/WebClient/Renderings/Page/PageRenderer.cs
index f51735a6a9..621490dcdb 100644
--- a/Composite/Core/WebClient/Renderings/Page/PageRenderer.cs
+++ b/Composite/Core/WebClient/Renderings/Page/PageRenderer.cs
@@ -288,6 +288,15 @@ internal static void ProcessXhtmlDocument(XhtmlDocument xhtmlDocument, IPage pag
             {
                 InternalUrls.ConvertInternalUrlsToPublic(xhtmlDocument);
             }
+
+            var filters = ServiceLocator.GetServices<IPageContentFilter>().OrderBy(f => f.Order).ToList();
+            if (filters.Any())
+            {
+                using (Profiler.Measure("Executing custom filters"))
+                {
+                    filters.ForEach(_ => _.Filter(xhtmlDocument, page));
+                }
+            }
         }
 
 

From 61f650a50e6abe1025013359e2faf7c86e8a2a36 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Thu, 14 Dec 2017 16:44:36 +0100
Subject: [PATCH 37/57] Introducing INonCachebleRequestHostnameMapper - that
 allows hostname mapping for extranet protected URLs in reverse caching proxy
 configuration

---
 Composite/Composite.csproj                    |  1 +
 .../INonCachebleRequestHostnameMapper.cs      | 15 +++++++++++
 Website/Renderers/ShowMedia.ashx              | 25 ++++++++++++++++++-
 3 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 Composite/Core/WebClient/Renderings/INonCachebleRequestHostnameMapper.cs

diff --git a/Composite/Composite.csproj b/Composite/Composite.csproj
index 8c2174efc2..4ae8562794 100644
--- a/Composite/Composite.csproj
+++ b/Composite/Composite.csproj
@@ -255,6 +255,7 @@
     <Compile Include="Core\Serialization\CompositeJsonSerializer.cs" />
     <Compile Include="Core\WebClient\PageStructureRpc.cs" />
     <Compile Include="Core\WebClient\Renderings\Page\IPageContentFilter.cs" />
+    <Compile Include="Core\WebClient\Renderings\INonCachebleRequestHostnameMapper.cs" />
     <Compile Include="Core\WebClient\Services\WampRouter\WampRouteWrapper.cs" />
     <Compile Include="Data\Caching\CachedTable.cs" />
     <Compile Include="Data\Types\VersionedDataHelperContract.cs" />
diff --git a/Composite/Core/WebClient/Renderings/INonCachebleRequestHostnameMapper.cs b/Composite/Core/WebClient/Renderings/INonCachebleRequestHostnameMapper.cs
new file mode 100644
index 0000000000..ef28d62a3b
--- /dev/null
+++ b/Composite/Core/WebClient/Renderings/INonCachebleRequestHostnameMapper.cs
@@ -0,0 +1,15 @@
+namespace Composite.Core.WebClient.Renderings
+{
+    /// <summary>
+    /// Enables redirecting hostnames for extranet protected media requests in reverse caching proxy configuration.
+    /// </summary>
+    public interface INonCachebleRequestHostnameMapper
+    {
+        /// <summary>
+        /// Gets a hostname to redirect to.
+        /// </summary>
+        /// <param name="hostname"></param>
+        /// <returns></returns>
+        string GetRedirectToHostname(string hostname);
+    }
+}
diff --git a/Website/Renderers/ShowMedia.ashx b/Website/Renderers/ShowMedia.ashx
index 423a824c75..0200cf1f37 100644
--- a/Website/Renderers/ShowMedia.ashx
+++ b/Website/Renderers/ShowMedia.ashx
@@ -1,4 +1,4 @@
-<%@ WebHandler Language="C#" Class="ShowMedia" %>
+<%@ WebHandler Language="C#" Class="ShowMedia" %>
 
 using System;
 using System.Collections.Generic;
@@ -134,6 +134,29 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
 
         if (responseHandling != null)
         {
+            if (responseHandling.PreventPublicCaching)
+            {
+                var hostname = context.Request.Url.Host;
+                var mappers = ServiceLocator.GetServices<INonCachebleRequestHostnameMapper>();
+                var newHostname = mappers
+                        .Select(m => m.GetRedirectToHostname(hostname))
+                        .FirstOrDefault(h => !string.IsNullOrWhiteSpace(h) && h != hostname);
+
+                if (newHostname != null)
+                {
+                    var url = context.Request.Url.ToString();
+                    int offset = url.IndexOf(hostname, StringComparison.OrdinalIgnoreCase);
+                    if (offset > 0)
+                    {
+                        var newUrl = url.Substring(0, offset) + newHostname + url.Substring(offset + hostname.Length);
+                        context.Response.RedirectPermanent(newUrl, false);
+                        return true;
+                    }
+                }
+
+                context.Response.Cache.SetCacheability(HttpCacheability.Private);
+            }
+
             bool redirecting = responseHandling.RedirectRequesterTo != null;
 
             if (redirecting)

From 0a22fc3e949704997cf9607baa2e2cdcecf62be1 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Mon, 18 Dec 2017 13:21:23 +0100
Subject: [PATCH 38/57] Media handler - preserving original relative URL when
 redirecting protected media to another hostname

---
 Website/Renderers/ShowMedia.ashx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Website/Renderers/ShowMedia.ashx b/Website/Renderers/ShowMedia.ashx
index 0200cf1f37..92deb0b205 100644
--- a/Website/Renderers/ShowMedia.ashx
+++ b/Website/Renderers/ShowMedia.ashx
@@ -144,7 +144,7 @@ public class ShowMedia : IHttpHandler, IReadOnlySessionState
 
                 if (newHostname != null)
                 {
-                    var url = context.Request.Url.ToString();
+                    var url = new Uri(context.Request.Url, context.Request.RawUrl).ToString();
                     int offset = url.IndexOf(hostname, StringComparison.OrdinalIgnoreCase);
                     if (offset > 0)
                     {

From e7a5815874ddad352045bbb20cebab265ccd1165 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Tue, 19 Dec 2017 13:05:42 +0100
Subject: [PATCH 39/57] Enabling IDataRenderingResponseHandler being registered
 in startup handlers

---
 .../RenderingResponseHandlerFacadeImpl.cs     | 22 +++++++++++++------
 .../RenderingResponseHandlerResult.cs         |  8 ++++---
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/Composite/Core/WebClient/Renderings/RenderingResponseHandlerFacadeImpl.cs b/Composite/Core/WebClient/Renderings/RenderingResponseHandlerFacadeImpl.cs
index a165532c6b..dd3152a9c9 100644
--- a/Composite/Core/WebClient/Renderings/RenderingResponseHandlerFacadeImpl.cs
+++ b/Composite/Core/WebClient/Renderings/RenderingResponseHandlerFacadeImpl.cs
@@ -1,6 +1,7 @@
-using Composite.Data;
+using Composite.Data;
 using Composite.Core.WebClient.Renderings.Foundation;
 using Composite.Core.WebClient.Renderings.Foundation.PluginFacades;
+using Composite.Core.WebClient.Renderings.Plugins.RenderingResponseHandler;
 
 
 namespace Composite.Core.WebClient.Renderings
@@ -11,14 +12,21 @@ public RenderingResponseHandlerResult GetDataResponseHandling(DataEntityToken re
         {
             foreach (string name in RenderingResponseHandlerRegistry.RenderingResponseHandlerNames)
             {
-                if (RenderingResponseHandlerPluginFacade.IsDataRenderingResponseHandler(name) == false) continue;
+                if (!RenderingResponseHandlerPluginFacade.IsDataRenderingResponseHandler(name)) continue;
 
-                RenderingResponseHandlerResult result = RenderingResponseHandlerPluginFacade.GetDataResponseHandling(name, requestedItemEntityToken);
+                var result = RenderingResponseHandlerPluginFacade.GetDataResponseHandling(name, requestedItemEntityToken);
 
-                if ((result != null) && 
-                    (result.PreventPublicCaching 
-                    || result.EndRequest
-                    || (result.RedirectRequesterTo != null)))
+                if (result != null && result.IsNotEmpty)
+                {
+                    return result;
+                }
+            }
+
+            foreach (var responseHandler in ServiceLocator.GetServices<IDataRenderingResponseHandler>())
+            {
+                var result = responseHandler.GetDataResponseHandling(requestedItemEntityToken);
+
+                if (result != null && result.IsNotEmpty)
                 {
                     return result;
                 }
diff --git a/Composite/Core/WebClient/Renderings/RenderingResponseHandlerResult.cs b/Composite/Core/WebClient/Renderings/RenderingResponseHandlerResult.cs
index d3c7112b8f..819993eac9 100644
--- a/Composite/Core/WebClient/Renderings/RenderingResponseHandlerResult.cs
+++ b/Composite/Core/WebClient/Renderings/RenderingResponseHandlerResult.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 
 namespace Composite.Core.WebClient.Renderings
@@ -25,6 +25,8 @@ public sealed class RenderingResponseHandlerResult
         /// <summary>
         /// When true, the request will not continue. Default is false
         /// </summary>
-        public bool EndRequest { get; set; } 
-	}
+        public bool EndRequest { get; set; }
+
+        internal bool IsNotEmpty => PreventPublicCaching || EndRequest || RedirectRequesterTo != null;
+    }
 }

From 1931335bbb11a145b877fe3acf5e0b70fc4c079c Mon Sep 17 00:00:00 2001
From: Taras Nakonechnyi <taras.nakonechnyi@orckestra.com>
Date: Tue, 19 Dec 2017 16:22:31 +0200
Subject: [PATCH 40/57] Fix #504 [Chrome] Input fields loosing focus if
 login/password information is preserved in browser

---
 .../scripts/source/top/core/KickStart.js      | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/Website/Composite/scripts/source/top/core/KickStart.js b/Website/Composite/scripts/source/top/core/KickStart.js
index 3095785a75..3f12a21726 100644
--- a/Website/Composite/scripts/source/top/core/KickStart.js
+++ b/Website/Composite/scripts/source/top/core/KickStart.js
@@ -475,4 +475,35 @@ var KickStart = new function () {
 	if ( !isQualified ) {
 		UpdateManager.isEnabled = false;
 	}
+}
+
+/*
+* Fix chrome interval focus on a username and a password for the saved password, issue #505
+*/
+if (typeof KickStart !== 'undefined' && typeof EventBroadcaster !== 'undefined' && EventBroadcaster.subscribe && /Chrome/.test(navigator.userAgent)) {
+	KickStart.subscribeToRemoveObsoluteDecks = function () {
+		if (!this.isSubscribedToRemoveObsoluteDecks) {
+			this.isSubscribedToRemoveObsoluteDecks = true;
+			EventBroadcaster.subscribe(BroadcastMessages.APPLICATION_LOGIN, {
+				handleBroadcast: function () {
+					try {
+						if (typeof top !== 'undefined' && top.bindingMap && typeof DocumentManager !== 'undefined' && DocumentManager.detachBindings) {
+							var obsoletedDecks = ["logindeck", "changepassworddeck"];
+							for (var i = 0; i < obsoletedDecks.length; i++) {
+								obsoletedDeckName = obsoletedDecks[i];
+								if (top.bindingMap[obsoletedDeckName]) {
+									obsoletedDeck = top.bindingMap[obsoletedDeckName];
+									if (obsoletedDeck && obsoletedDeck.bindingElement) {
+										DocumentManager.detachBindings(obsoletedDeck.bindingElement, true);
+										obsoletedDeck.bindingElement.innerHTML = "";
+									}
+								}
+							}
+						}
+					} catch (e) { };
+				}
+			});
+		}
+	};
+	KickStart.subscribeToRemoveObsoluteDecks();
 }
\ No newline at end of file

From e66030360a00f4c077106eb8be8ebffa294e25ea Mon Sep 17 00:00:00 2001
From: Taras Nakonechnyi <taras.nakonechnyi@orckestra.com>
Date: Wed, 20 Dec 2017 11:33:13 +0200
Subject: [PATCH 41/57] Fixing a typo

---
 Website/Composite/scripts/source/top/core/KickStart.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Website/Composite/scripts/source/top/core/KickStart.js b/Website/Composite/scripts/source/top/core/KickStart.js
index 3f12a21726..981e6725c9 100644
--- a/Website/Composite/scripts/source/top/core/KickStart.js
+++ b/Website/Composite/scripts/source/top/core/KickStart.js
@@ -478,12 +478,12 @@ var KickStart = new function () {
 }
 
 /*
-* Fix chrome interval focus on a username and a password for the saved password, issue #505
+* Fix chrome interval focus on a username and a password for the saved password, issue #504
 */
 if (typeof KickStart !== 'undefined' && typeof EventBroadcaster !== 'undefined' && EventBroadcaster.subscribe && /Chrome/.test(navigator.userAgent)) {
-	KickStart.subscribeToRemoveObsoluteDecks = function () {
-		if (!this.isSubscribedToRemoveObsoluteDecks) {
-			this.isSubscribedToRemoveObsoluteDecks = true;
+	KickStart.subscribeToRemoveObsoleteDecks = function () {
+		if (!this.isSubscribedToRemoveObsoleteDecks) {
+			this.isSubscribedToRemoveObsoleteDecks = true;
 			EventBroadcaster.subscribe(BroadcastMessages.APPLICATION_LOGIN, {
 				handleBroadcast: function () {
 					try {
@@ -505,5 +505,5 @@ if (typeof KickStart !== 'undefined' && typeof EventBroadcaster !== 'undefined'
 			});
 		}
 	};
-	KickStart.subscribeToRemoveObsoluteDecks();
+	KickStart.subscribeToRemoveObsoleteDecks();
 }
\ No newline at end of file

From 778311c414dd33d142cb26c7b1664746dd8af21d Mon Sep 17 00:00:00 2001
From: Taras Nakonechnyi <taras.nakonechnyi@orckestra.com>
Date: Thu, 21 Dec 2017 13:39:51 +0200
Subject: [PATCH 42/57] Fix #506 [Chrome 63] Function call editor - text is not
 visible in the second column input fields.

---
 Website/Composite/styles/default/_mixins.less  | 18 ++++++++++++++++++
 .../styles/default/dialogs/dialogs.less        |  4 ++--
 .../styles/default/fields/fields-base.less     |  2 ++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/Website/Composite/styles/default/_mixins.less b/Website/Composite/styles/default/_mixins.less
index eac1351a29..14ce5a82ef 100644
--- a/Website/Composite/styles/default/_mixins.less
+++ b/Website/Composite/styles/default/_mixins.less
@@ -39,3 +39,21 @@
 	-ms-user-select: @value; /* IE 10+ */
 	user-select: @value; /* Likely future */
 }
+
+.chrome63-column-input-fields-fixes() {
+	//Fix issue https://github.com/Orckestra/C1-CMS-Foundation/issues/506
+	@media screen and (-webkit-min-device-pixel-ratio:0) and (min-resolution:.001dpcm) {
+		ui|fielddata {
+			ui|datainput {
+				ui|box {
+					overflow: visible;
+					padding: 0 2px;
+
+					input {
+						padding-left: 5px;
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/Website/Composite/styles/default/dialogs/dialogs.less b/Website/Composite/styles/default/dialogs/dialogs.less
index 0239797b9d..2f423ca322 100644
--- a/Website/Composite/styles/default/dialogs/dialogs.less
+++ b/Website/Composite/styles/default/dialogs/dialogs.less
@@ -172,8 +172,6 @@ ui|dialogpage.functionview-basic {
 			display: inline-block;
 		}
 		/* IE 10, 11 */
-
-
 		ui|fielddata {
 			width: @functionsbasic-column-width;
 		}
@@ -193,6 +191,8 @@ ui|dialogpage.functionview-basic {
 		-moz-column-gap: @functionsbasic-column-gap;
 		-webkit-column-gap: @functionsbasic-column-gap;
 		column-gap: @functionsbasic-column-gap;
+
+		.chrome63-column-input-fields-fixes();
 	}
 }
 
diff --git a/Website/Composite/styles/default/fields/fields-base.less b/Website/Composite/styles/default/fields/fields-base.less
index 9789b278b8..1d70dcbe29 100644
--- a/Website/Composite/styles/default/fields/fields-base.less
+++ b/Website/Composite/styles/default/fields/fields-base.less
@@ -73,6 +73,8 @@ ui|editorpage {
 		-webkit-column-width: 430px; /* Chrome, Safari, Opera */
 		-moz-column-width: 430px; /* Firefox */
 		column-width: 430px;
+
+		.chrome63-column-input-fields-fixes();
 	}
 
 	ui|fieldgroup {

From 3a9291d0176c44ad3ae1d0082d98a22b0733a9b0 Mon Sep 17 00:00:00 2001
From: Taras Nakonechnyi <taras.nakonechnyi@orckestra.com>
Date: Tue, 26 Dec 2017 12:28:10 +0200
Subject: [PATCH 43/57] Fix align popup on inline search in the selector

---
 .../top/ui/bindings/data/selectors/SelectorBinding.js     | 8 +++-----
 .../scripts/source/top/ui/bindings/popups/PopupBinding.js | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Website/Composite/scripts/source/top/ui/bindings/data/selectors/SelectorBinding.js b/Website/Composite/scripts/source/top/ui/bindings/data/selectors/SelectorBinding.js
index ff6791f652..35baaa833d 100644
--- a/Website/Composite/scripts/source/top/ui/bindings/data/selectors/SelectorBinding.js
+++ b/Website/Composite/scripts/source/top/ui/bindings/data/selectors/SelectorBinding.js
@@ -274,13 +274,9 @@ SelectorBinding.prototype.buildDOMContent = function () {
 	this.buildSelections ();
 
 	this.bindingElement.tabIndex = 0;
-	if ( Client.isExplorer == true ) {
+	if ( Client.isExplorer === true ) {
 		this.bindingElement.hideFocus = true;
 	}
-
-	if (Client.isEdge) {
-		this.isSearchSelectionEnabled = false;
-	}
 }
 
 /**
@@ -921,6 +917,8 @@ SelectorBinding.prototype._applySearchSelection = function () {
 			*/
 			this._popupBinding._enableTab(true);
 
+			this._popupBinding.snapTo(this._buttonBinding.bindingElement);
+			this._popupBinding.fitOnScreen();
 		}
 	}
 }
diff --git a/Website/Composite/scripts/source/top/ui/bindings/popups/PopupBinding.js b/Website/Composite/scripts/source/top/ui/bindings/popups/PopupBinding.js
index 67810affa3..c048535af2 100644
--- a/Website/Composite/scripts/source/top/ui/bindings/popups/PopupBinding.js
+++ b/Website/Composite/scripts/source/top/ui/bindings/popups/PopupBinding.js
@@ -12,7 +12,7 @@ PopupBinding.POSITION_LEFT 		= "left";
 
 PopupBinding.TYPE_NORMAL		= "normal";
 PopupBinding.TYPE_FIXED			= "fixed"; // scrollbars on overflow
-PopupBinding.FIXED_MAX			= 12;
+PopupBinding.FIXED_MAX			= 7;
 PopupBinding.CLASSNAME_OVERFLOW = "overflow";
 PopupBinding.CLASSNAME_TEXTONLY = "textonly";
 
@@ -599,7 +599,7 @@ PopupBinding.prototype.fitOnScreen = function () {
 			switch ( CSSComputer.getPosition ( this.bindingElement.offsetParent )) {
 				case "absolute" :
 					y = y - h - this.targetElement.offsetHeight;
-					if ( y < 0 ) {
+					if (y < 0) {
 						y = 0;
 					}
 					break;

From c5ac6206bfaee354c096f46a32c10e57c67b17a5 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Tue, 2 Jan 2018 15:15:10 +0100
Subject: [PATCH 44/57] Link conversion - processing "srcset" attributes as
 well

---
 Composite/Core/Routing/InternalUrls.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Composite/Core/Routing/InternalUrls.cs b/Composite/Core/Routing/InternalUrls.cs
index b24e40fe98..7fcb95366c 100644
--- a/Composite/Core/Routing/InternalUrls.cs
+++ b/Composite/Core/Routing/InternalUrls.cs
@@ -171,7 +171,10 @@ private static Dictionary<string, IInternalUrlConverter> GetConvertersMap(Func<s
             return result;
         }
 
-        private static bool IsLinkAttribute(XName attrName) => attrName.LocalName == "src" || attrName.LocalName == "href";
+        private static bool IsLinkAttribute(XName attrName) =>
+            attrName.LocalName == "src"
+            || attrName.LocalName == "href"
+            || attrName.LocalName == "srcset";
 
 
         /// <summary>

From 11ce672f84d6ecd6a5e248144b9ae007515d1553 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Tue, 2 Jan 2018 16:22:59 +0100
Subject: [PATCH 45/57] Fixing the Nightwatch tests after a Chrome update

---
 Website/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Website/package.json b/Website/package.json
index 09dc109330..27c2085508 100644
--- a/Website/package.json
+++ b/Website/package.json
@@ -14,6 +14,7 @@
   "devDependencies": {
     "JSONPath": "^0.10.0",
     "autoprefixer-core": "^5.2.1",
+    "chromedriver": "^2.34.0",
     "chokidar-socket-emitter": "0.5.4",
     "csswring": "^3.0.5",
     "eslint": "3.1.1",

From 1a0cc0227b6f90f631d43e66e989f1228fa5f306 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Wed, 3 Jan 2018 10:55:00 +0100
Subject: [PATCH 46/57] Fixing Nightwatch tests broken by Chrome fix #504

---
 Website/test/e2e/pageObjects/login.js         | 2 +-
 Website/test/e2e/suite/100_login/procedure.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Website/test/e2e/pageObjects/login.js b/Website/test/e2e/pageObjects/login.js
index 0c421103e4..902bd8f757 100644
--- a/Website/test/e2e/pageObjects/login.js
+++ b/Website/test/e2e/pageObjects/login.js
@@ -35,7 +35,7 @@ module.exports = {
 					.setUsername(username || 'admin')
 					.setPassword(password || '123456')
 					.click('@submitButton')
-					.waitForElementNotVisible('@usernameField', this.api.globals.timeouts.basic);
+					.waitForElementNotPresent('@usernameField', this.api.globals.timeouts.basic);
 			}
 		}
 	]
diff --git a/Website/test/e2e/suite/100_login/procedure.js b/Website/test/e2e/suite/100_login/procedure.js
index d1f039402e..112650bc5c 100644
--- a/Website/test/e2e/suite/100_login/procedure.js
+++ b/Website/test/e2e/suite/100_login/procedure.js
@@ -8,7 +8,7 @@ module.exports = {
 			.setUsername('admin')
 			.setPassword('123456')
 			.click('@submitButton')
-			.waitForElementNotVisible('@usernameField', 5000);
+			.waitForElementNotPresent('@usernameField', 5000);
 		// Check that start screen is shown
 		browser.page.appWindow().enter();
 		startScreen.waitForElementVisible('@startFrame', 5000);

From 4b3863b566de30a9b1721ca2f0db3f64a961f4fc Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Wed, 3 Jan 2018 14:35:56 +0100
Subject: [PATCH 47/57] Fix #507 Console doesn't work if
 ~/bin/Composite.Generated.dll is missing

---
 Composite/Composite.csproj                    |  1 +
 .../Serialization/CompositeJsonSerializer.cs  | 17 ++++---
 .../CompositeSerializationBinder.cs           | 45 +++++++++++++++++++
 3 files changed, 57 insertions(+), 6 deletions(-)
 create mode 100644 Composite/Core/Serialization/CompositeSerializationBinder.cs

diff --git a/Composite/Composite.csproj b/Composite/Composite.csproj
index 4ae8562794..357a785b4c 100644
--- a/Composite/Composite.csproj
+++ b/Composite/Composite.csproj
@@ -253,6 +253,7 @@
     <Compile Include="Core\Implementation\StatelessDataConnectionImplementation.cs" />
     <Compile Include="Core\Instrumentation\DisposableResourceTracer.cs" />
     <Compile Include="Core\Serialization\CompositeJsonSerializer.cs" />
+    <Compile Include="Core\Serialization\CompositeSerializationBinder.cs" />
     <Compile Include="Core\WebClient\PageStructureRpc.cs" />
     <Compile Include="Core\WebClient\Renderings\Page\IPageContentFilter.cs" />
     <Compile Include="Core\WebClient\Renderings\INonCachebleRequestHostnameMapper.cs" />
diff --git a/Composite/Core/Serialization/CompositeJsonSerializer.cs b/Composite/Core/Serialization/CompositeJsonSerializer.cs
index 3dc82191e6..cd37ee0abc 100644
--- a/Composite/Core/Serialization/CompositeJsonSerializer.cs
+++ b/Composite/Core/Serialization/CompositeJsonSerializer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Runtime.Serialization;
@@ -40,7 +40,8 @@ public static string Serialize(object obj)
             {
                 TypeNameAssemblyFormat = System.Runtime.Serialization.Formatters.FormatterAssemblyStyle.Simple,
                 TypeNameHandling = TypeNameHandling.Auto,
-                Converters = {new JsonTypeConverter()}
+                Converters = {new JsonTypeConverter()},
+                Binder = CompositeSerializationBinder.Instance
             });
 
             return serializedData;
@@ -58,7 +59,8 @@ public static string SerializeObject(object obj)
                 TypeNameAssemblyFormat = System.Runtime.Serialization.Formatters.FormatterAssemblyStyle.Simple,
                 TypeNameHandling = TypeNameHandling.Objects,
                 Formatting = Formatting.None,
-                Converters = {new JsonTypeConverter()}
+                Converters = {new JsonTypeConverter()},
+                Binder = CompositeSerializationBinder.Instance
             });
 
             return serializedData;
@@ -128,7 +130,8 @@ public static T Deserialize<T>(string str)
         {
             var obj = JsonConvert.DeserializeObject<T>(str, new JsonSerializerSettings
             {
-                TypeNameHandling = TypeNameHandling.Auto
+                TypeNameHandling = TypeNameHandling.Auto,
+                Binder = CompositeSerializationBinder.Instance
             });
             return obj;
         }
@@ -159,7 +162,8 @@ public static T Deserialize<T>(params string[] strs)
             }
             var obj = JsonConvert.DeserializeObject<T>(combinedObj.ToString(), new JsonSerializerSettings
             {
-                TypeNameHandling = TypeNameHandling.Auto
+                TypeNameHandling = TypeNameHandling.Auto,
+                Binder = CompositeSerializationBinder.Instance
             });
             return obj;
         }
@@ -173,7 +177,8 @@ public static object Deserialize(string str)
         {
             var obj = JsonConvert.DeserializeObject(str, new JsonSerializerSettings
             {
-                TypeNameHandling = TypeNameHandling.Objects
+                TypeNameHandling = TypeNameHandling.Objects,
+                Binder = CompositeSerializationBinder.Instance
             });
             return obj;
         }
diff --git a/Composite/Core/Serialization/CompositeSerializationBinder.cs b/Composite/Core/Serialization/CompositeSerializationBinder.cs
new file mode 100644
index 0000000000..af95087ff0
--- /dev/null
+++ b/Composite/Core/Serialization/CompositeSerializationBinder.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Runtime.Serialization;
+using Composite.Core.Types;
+using Newtonsoft.Json.Serialization;
+
+namespace Composite.Core.Serialization
+{
+    /// <summary>
+    /// Removes temproraty assembly references when serializing references to generated classes.
+    /// </summary>
+    internal class CompositeSerializationBinder: DefaultSerializationBinder
+    {
+        private const string GeneratedTypesNamespacePrefix = "CompositeGenerated.";
+        private const string GeneratedTypesAssemblyName = "Composite.Generated";
+
+        public static SerializationBinder Instance { get; } = new CompositeSerializationBinder();
+
+        public override void BindToName(Type serializedType, out string assemblyName, out string typeName)
+        {
+            typeName = serializedType.FullName;
+
+            if (typeName.StartsWith(GeneratedTypesNamespacePrefix, StringComparison.OrdinalIgnoreCase)
+                && Guid.TryParse(serializedType.Assembly.GetName().Name, out _))
+            {
+                assemblyName = GeneratedTypesAssemblyName;
+            }
+            else
+            {
+                assemblyName = serializedType.Assembly.FullName;
+            }
+        }
+
+        public override Type BindToType(string assemblyName, string typeName)
+        {
+            if (assemblyName == GeneratedTypesAssemblyName
+                && typeName.StartsWith(GeneratedTypesNamespacePrefix, StringComparison.OrdinalIgnoreCase))
+            {
+                var result = TypeManager.TryGetType($"{typeName}, {assemblyName}") ?? TypeManager.TryGetType(typeName);
+                if (result != null) return result;
+            }
+
+            return base.BindToType(assemblyName, typeName);
+        }
+    }
+}

From 47d529803a1d34e5365583134dbf0d6f26185b1d Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Thu, 4 Jan 2018 10:55:36 +0100
Subject: [PATCH 48/57] Updating version moniker to 6.3

---
 Composite/Properties/SharedAssemblyInfo.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Composite/Properties/SharedAssemblyInfo.cs b/Composite/Properties/SharedAssemblyInfo.cs
index 6c5ade29e1..d6d0f99ded 100644
--- a/Composite/Properties/SharedAssemblyInfo.cs
+++ b/Composite/Properties/SharedAssemblyInfo.cs
@@ -1,16 +1,16 @@
-using System.Reflection;
+using System.Reflection;
 
 // General Information about the assemblies Composite and Composite.Workflows  
 #if !InternalBuild
-[assembly: AssemblyTitle("C1 CMS 6.2")]
+[assembly: AssemblyTitle("C1 CMS 6.3")]
 #else
-[assembly: AssemblyTitle("C1 CMS 6.2 (Internal Build)")]
+[assembly: AssemblyTitle("C1 CMS 6.3 (Internal Build)")]
 #endif
 
 [assembly: AssemblyCompany("Orckestra Inc")]
 [assembly: AssemblyProduct("C1 CMS")]
-[assembly: AssemblyCopyright("Copyright © Orckestra Inc 2017")]
+[assembly: AssemblyCopyright("Copyright © Orckestra Inc 2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("6.2.*")]
+[assembly: AssemblyVersion("6.3.*")]

From a2f670330f63b54e8c2e15279f21748fcf2f8175 Mon Sep 17 00:00:00 2001
From: Taras Nakonechnyi <taras.nakonechnyi@orckestra.com>
Date: Tue, 16 Jan 2018 12:05:06 +0200
Subject: [PATCH 49/57] Fix data input dialog for issue #506

---
 Website/Composite/styles/default/_mixins.less | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Website/Composite/styles/default/_mixins.less b/Website/Composite/styles/default/_mixins.less
index 14ce5a82ef..2841aaadc3 100644
--- a/Website/Composite/styles/default/_mixins.less
+++ b/Website/Composite/styles/default/_mixins.less
@@ -44,7 +44,8 @@
 	//Fix issue https://github.com/Orckestra/C1-CMS-Foundation/issues/506
 	@media screen and (-webkit-min-device-pixel-ratio:0) and (min-resolution:.001dpcm) {
 		ui|fielddata {
-			ui|datainput {
+			ui|datainput,
+			ui|urlinputdialog {
 				ui|box {
 					overflow: visible;
 					padding: 0 2px;

From 0d0a86406ee5c37d8e02ec4c6422df940cdee224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pauli=20=C3=98ster=C3=B8?= <pauli@burningice.dk>
Date: Thu, 18 Jan 2018 12:48:55 -0300
Subject: [PATCH 50/57] Adds overload of CompositeC1WebPage.Function which
 takes both parameters as object (anonymous object) and a
 FunctionContextContainer.

---
 Composite/AspNet/Razor/CompositeC1WebPage.cs | 26 ++++++++++++++------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/Composite/AspNet/Razor/CompositeC1WebPage.cs b/Composite/AspNet/Razor/CompositeC1WebPage.cs
index ad458023d9..fc0cdab509 100644
--- a/Composite/AspNet/Razor/CompositeC1WebPage.cs
+++ b/Composite/AspNet/Razor/CompositeC1WebPage.cs
@@ -118,13 +118,25 @@ public IHtmlString Function(string name, object parameters)
             return Function(name, Functions.ObjectToDictionary(parameters));
 		}
 
-		/// <summary>
-		/// Executes a C1 Function.
-		/// </summary>
-		/// <param name="name">Function name.</param>
-		/// <param name="parameters">The parameters.</param>
-		/// <returns></returns>
-		public IHtmlString Function(string name, IDictionary<string, object> parameters)
+        /// <summary>
+        /// Executes a C1 Function.
+        /// </summary>
+        /// <param name="name">Function name.</param>
+        /// <param name="parameters">The parameters.</param>
+        /// /// <param name="functionContextContainer">The FunctionContextContainer used to execute the function.</param>
+        /// <returns></returns>
+        public IHtmlString Function(string name, object parameters, FunctionContextContainer functionContextContainer)
+	    {
+	        return Function(name, Functions.ObjectToDictionary(parameters), functionContextContainer);
+	    }
+
+        /// <summary>
+        /// Executes a C1 Function.
+        /// </summary>
+        /// <param name="name">Function name.</param>
+        /// <param name="parameters">The parameters.</param>
+        /// <returns></returns>
+        public IHtmlString Function(string name, IDictionary<string, object> parameters)
 		{
             return Function(name, parameters, GetFunctionContext());
 		}

From daf3bea360618d1b92cdcfd163759b17b43bb79a Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Mon, 22 Jan 2018 14:25:03 +0100
Subject: [PATCH 51/57] Showing DLL version information when browsing System
 perspective

---
 .../WebsiteFileUrlToEntityTokenMapper.cs      |   6 +-
 .../services/Admin/DownloadFile.ashx          | 119 +++++++++++++++++-
 2 files changed, 120 insertions(+), 5 deletions(-)

diff --git a/Composite/Plugins/Elements/UrlToEntityToken/WebsiteFileUrlToEntityTokenMapper.cs b/Composite/Plugins/Elements/UrlToEntityToken/WebsiteFileUrlToEntityTokenMapper.cs
index f07be1eabe..2f1e21fd47 100644
--- a/Composite/Plugins/Elements/UrlToEntityToken/WebsiteFileUrlToEntityTokenMapper.cs
+++ b/Composite/Plugins/Elements/UrlToEntityToken/WebsiteFileUrlToEntityTokenMapper.cs
@@ -1,4 +1,5 @@
-using System.IO;
+using System;
+using System.IO;
 using Composite.C1Console.Elements;
 using Composite.C1Console.Security;
 using Composite.Core;
@@ -56,7 +57,8 @@ private bool FilePreviewable(FileInfo fileInfo)
             if (string.IsNullOrEmpty(mimeType)) return false;
 
             return MimeTypeInfo.IsBrowserPreviewableFile(mimeType)
-                   || (MimeTypeInfo.IsTextFile(mimeType) && fileInfo.Length < 1 << 20 /* 1 MB */);
+                   || (MimeTypeInfo.IsTextFile(mimeType) && fileInfo.Length < 1 << 20 /* 1 MB */)
+                   || fileInfo.Extension.Equals(".dll", StringComparison.OrdinalIgnoreCase);
         }
 
         public EntityToken TryGetEntityToken(string url) => null;
diff --git a/Website/Composite/services/Admin/DownloadFile.ashx b/Website/Composite/services/Admin/DownloadFile.ashx
index f4ad2f32e0..7deb4a796a 100644
--- a/Website/Composite/services/Admin/DownloadFile.ashx
+++ b/Website/Composite/services/Admin/DownloadFile.ashx
@@ -1,7 +1,10 @@
-<%@ WebHandler Language="C#" Class="DownloadFile" %>
+<%@ WebHandler Language="C#" Class="DownloadFile" %>
 
 using System;
+using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Web;
 using Composite;
 using Composite.Core.IO;
@@ -51,6 +54,8 @@ public class DownloadFile : IHttpHandler
 
         Verify.IsNotNull(fullFilePath, "Unexpected exception");
 
+        bool isDllPreview = false;
+
         if (isPreview)
         {
             var extension = Path.GetExtension(fullFilePath);
@@ -58,7 +63,11 @@ public class DownloadFile : IHttpHandler
 
             if (!MimeTypeInfo.IsBrowserPreviewableFile(mimeType))
             {
-                if (!MimeTypeInfo.IsTextFile(mimeType))
+                if (extension.Equals(".dll", StringComparison.OrdinalIgnoreCase))
+                {
+                    isDllPreview = true;
+                }
+                else if (!MimeTypeInfo.IsTextFile(mimeType))
                 {
                     return;
                 }
@@ -74,10 +83,114 @@ public class DownloadFile : IHttpHandler
             context.Response.AddHeader("Content-Disposition", "attachment;filename=" + fileName);
         }
 
-        context.Response.TransmitFile(fullFilePath);
+        if (isDllPreview)
+        {
+            OutputDllPreviewInformation(context, fullFilePath);
+        }
+        else
+        {
+            context.Response.TransmitFile(fullFilePath);
+        }
+
         context.ApplicationInstance.CompleteRequest();
     }
 
+    private void OutputDllPreviewInformation(HttpContext context, string fullFilePath)
+    {
+        FileVersionInfo fileVersion = null;
+        try
+        {
+            fileVersion = FileVersionInfo.GetVersionInfo(fullFilePath);
+        }
+        catch(Exception)
+        {
+        }
+
+        var assemblyInfo = AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(asm =>
+        {
+            try
+            {
+                return !asm.IsDynamic
+                       && !string.IsNullOrEmpty(asm.CodeBase)
+                       && ("file:///" + fullFilePath).Replace("\\", "/")
+                          .Equals(asm.CodeBase, StringComparison.InvariantCultureIgnoreCase);
+            }
+            catch
+            {
+                return false;
+            }
+        });
+
+        var fileInfo = new FileInfo(fullFilePath);
+
+        var lines = new List<string>();
+
+        if (assemblyInfo != null)
+        {
+            lines.AddRange(new []
+            {
+                "Assembly Name       : " + assemblyInfo.GetName().Name,
+                "Version             : " + assemblyInfo.GetName().Version,
+                "Is Debug Dll        : " + assemblyInfo.CustomAttributes.Any(a => a.AttributeType == typeof(DebuggableAttribute)),
+                "ImageRuntimeVersion : " + assemblyInfo.ImageRuntimeVersion,
+                "Full Name           : " + assemblyInfo.FullName
+            });
+        }
+        else
+        {
+            lines.Add("The assembly is not loaded or is not a managed assembly");
+        }
+
+        lines.Add("-----");
+
+        if (fileVersion != null)
+        {
+            if (!string.IsNullOrWhiteSpace(fileVersion.ProductName))
+            {
+                lines.Add("Product Name        : " + fileVersion.ProductName);
+            }
+
+            if (!string.IsNullOrWhiteSpace(fileVersion.CompanyName))
+            {
+                lines.Add("Company Name        : " + fileVersion.CompanyName);
+            }
+
+            lines.AddRange(new[]
+            {
+                "Product Version     : " + fileVersion.ProductVersion,
+                "File    Version     : " + fileVersion.FileVersion
+            });
+
+            if (!string.IsNullOrWhiteSpace(fileVersion.Comments))
+            {
+                lines.Add("");
+                lines.Add(fileVersion.Comments);
+                lines.Add("");
+            }
+        }
+        else
+        {
+            lines.Add("Failed to get extract FileVersionInfo");
+        }
+
+
+        lines.AddRange(new[]
+        {
+            "-----",
+            "Last Modified       : " + fileInfo.LastWriteTime.ToString("O"),
+            "Last Modified, UTC  : " + fileInfo.LastWriteTimeUtc.ToString("O"),
+            "Creation Time       : " + fileInfo.CreationTime.ToString("O"),
+            "Creation Time, UTC  : " + fileInfo.CreationTimeUtc.ToString("O")
+        });
+
+
+
+        var text = string.Join(Environment.NewLine, lines.Select(line => context.Server.HtmlEncode(line)));
+
+        context.Response.Write(text);
+    }
+
+
     private bool UserHasRightToDownload(EntityToken file)
     {
         var userToken = UserValidationFacade.GetUserToken();

From 089c1969d72acb326a1358be2f7d3867f069e0fe Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Tue, 23 Jan 2018 11:41:57 +0100
Subject: [PATCH 52/57] Refactoring

---
 .../AddNewMediaFileWorkflow.cs                | 89 ++++++++-----------
 1 file changed, 37 insertions(+), 52 deletions(-)

diff --git a/Composite.Workflows/Plugins/Elements/ElementProviders/MediaFileProviderElementProvider/AddNewMediaFileWorkflow.cs b/Composite.Workflows/Plugins/Elements/ElementProviders/MediaFileProviderElementProvider/AddNewMediaFileWorkflow.cs
index 73e547897a..d932d80890 100644
--- a/Composite.Workflows/Plugins/Elements/ElementProviders/MediaFileProviderElementProvider/AddNewMediaFileWorkflow.cs
+++ b/Composite.Workflows/Plugins/Elements/ElementProviders/MediaFileProviderElementProvider/AddNewMediaFileWorkflow.cs
@@ -1,8 +1,7 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Workflow.Activities;
-using Composite.C1Console.Actions;
 using Composite.C1Console.Forms.CoreUiControls;
 using Composite.C1Console.Workflow;
 using Composite.Core.IO;
@@ -10,7 +9,6 @@
 using Composite.Data.Types;
 using Composite.Data.Validation.ClientValidationRules;
 using Composite.Data.Transactions;
-using System.Transactions;
 
 
 namespace Composite.Plugins.Elements.ElementProviders.MediaFileProviderElementProvider
@@ -18,8 +16,6 @@ namespace Composite.Plugins.Elements.ElementProviders.MediaFileProviderElementPr
     [AllowPersistingWorkflow(WorkflowPersistingType.Never)]
     public sealed partial class AddNewMediaFileWorkflow : Composite.C1Console.Workflow.Activities.FormsWorkflow
     {
-        private static readonly string LogTitle = typeof (AddNewMediaFileWorkflow).Name;
-
         public AddNewMediaFileWorkflow()
         {
             InitializeComponent();
@@ -29,16 +25,15 @@ public AddNewMediaFileWorkflow()
 
         private void Initialize()
         {
-            if (this.EntityToken is MediaRootFolderProviderEntityToken)
+            if (this.EntityToken is MediaRootFolderProviderEntityToken token)
             {
-                MediaRootFolderProviderEntityToken token = (MediaRootFolderProviderEntityToken)this.EntityToken;
                 _storeId = token.Id;
                 _folderPath = "/";
             }
             else
             {
-                DataEntityToken token = (DataEntityToken)this.EntityToken;
-                IMediaFileFolder parentFolder = (IMediaFileFolder)token.Data;
+                var dataEntityToken = (DataEntityToken)this.EntityToken;
+                var parentFolder = (IMediaFileFolder)dataEntityToken.Data;
                 _storeId = parentFolder.StoreId;
                 _folderPath = parentFolder.Path;
             }
@@ -46,7 +41,7 @@ private void Initialize()
 
 
         [NonSerialized]
-        private string _folderPath = null;
+        private string _folderPath;
         internal string FolderPath
         {
             get
@@ -63,7 +58,7 @@ internal string FolderPath
 
 
         [NonSerialized]
-        private string _storeId = null;
+        private string _storeId;
         internal string StoreId
         {
             get
@@ -81,22 +76,16 @@ internal string StoreId
 
         private IMediaFile GetExistingFile(string folderPath, string filename)
         {
-            IMediaFile existingFile =
-                    (from file in DataFacade.GetData<IMediaFile>()
-                     where (string.Compare(file.FolderPath, folderPath, StringComparison.OrdinalIgnoreCase) == 0) &&
-                           (string.Compare(file.FileName, filename, StringComparison.OrdinalIgnoreCase) == 0)
-                     select file).FirstOrDefault();
-
-            return existingFile;
+            return DataFacade.GetData<IMediaFile>().FirstOrDefault(file =>
+                string.Compare(file.FolderPath, folderPath, StringComparison.OrdinalIgnoreCase) == 0 &&
+                string.Compare(file.FileName, filename, StringComparison.OrdinalIgnoreCase) == 0);
         }
 
 
 
         private void initializeCodeActivity_InitializeBindings_ExecuteCode(object sender, EventArgs e)
         {
-            UploadedFile file = new UploadedFile();
-
-            this.Bindings.Add("UploadedFile", file);
+            this.Bindings.Add("UploadedFile", new UploadedFile());
             this.Bindings.Add("AllowOverwrite", false);
             this.Bindings.Add("Title", "");
             this.Bindings.Add("Description", "");
@@ -109,7 +98,7 @@ private void ValidateStep1Bindings_Next(object sender, ConditionalEventArgs e)
         {
             UploadedFile uploadedFile = this.GetBinding<UploadedFile>("UploadedFile");
 
-            if (uploadedFile.HasFile == false)
+            if (!uploadedFile.HasFile)
             {
                 this.ShowFieldMessage("UploadedFile", "${Composite.Management, Website.Forms.Administrative.AddNewMediaFile.MissingUploadedFile.Message}");
                 e.Result = false;
@@ -124,7 +113,7 @@ private void ValidateStep1Bindings_Next(object sender, ConditionalEventArgs e)
         private void ValidateStep1Bindings_Finish(object sender, ConditionalEventArgs e)
         {
             ValidateStep1Bindings_Next(sender, e);
-            if (e.Result == false) return;
+            if (!e.Result) return;
 
             UploadedFile uploadedFile = this.GetBinding<UploadedFile>("UploadedFile");
             string filename = uploadedFile.FileName;
@@ -132,7 +121,7 @@ private void ValidateStep1Bindings_Finish(object sender, ConditionalEventArgs e)
             bool allowOverwrite = this.GetBinding<bool>("AllowOverwrite");
 
             IMediaFile existingFile = GetExistingFile(this.FolderPath, filename);
-            if ((existingFile != null) && (allowOverwrite == false))
+            if (existingFile != null && !allowOverwrite)
             {
                 this.ShowFieldMessage("UploadedFile", "${Composite.Management, Website.Forms.Administrative.AddNewMediaFile.FileExists.Message}");
                 e.Result = false;
@@ -154,13 +143,13 @@ private void ValidateStep1Bindings_Finish(object sender, ConditionalEventArgs e)
 
         private void step2CodeActivity_UpdateBindings_ExecuteCode(object sender, EventArgs e)
         {            
-            if (this.BindingExist("Filename") == false)
+            if (!this.BindingExist("Filename"))
             {
                 UploadedFile uploadedFile = this.GetBinding<UploadedFile>("UploadedFile");
                 this.Bindings.Add("Filename", uploadedFile.FileName);
 
                 this.BindingsValidationRules.Add("Title", new List<ClientValidationRule> { new StringLengthClientValidationRule(0, 256) });
-            }            
+            }
         }
 
 
@@ -172,7 +161,7 @@ private void ValidateStep2Bindings(object sender, ConditionalEventArgs e)
             bool allowOverwrite = this.GetBinding<bool>("AllowOverwrite");
 
             IMediaFile existingFile = GetExistingFile(this.FolderPath, filename);
-            if ((existingFile != null) && (allowOverwrite == false))
+            if (existingFile != null && !allowOverwrite)
             {
                 this.ShowFieldMessage("Filename", "${Composite.Management, Website.Forms.Administrative.AddNewMediaFile.FileExists.Message}");
                 e.Result = false;
@@ -194,21 +183,15 @@ private void ValidateStep2Bindings(object sender, ConditionalEventArgs e)
 
         private void finalizeCodeActivity_Finalize_ExecuteCode(object sender, EventArgs e)
         {
-            AddNewTreeRefresher addNewTreeRefresher = this.CreateAddNewTreeRefresher(this.EntityToken);
+            var addNewTreeRefresher = this.CreateAddNewTreeRefresher(this.EntityToken);
             DataEntityToken focusEntityToken;
 
             UploadedFile uploadedFile = this.GetBinding<UploadedFile>("UploadedFile");
-            string filename;
-            if (this.BindingExist("Filename"))
-            {
-                filename = this.GetBinding<string>("Filename");
-            }
-            else 
-            {
-                filename = uploadedFile.FileName;
-            }
+            var filename = this.BindingExist("Filename")
+                ? this.GetBinding<string>("Filename")
+                : uploadedFile.FileName;
 
-            using (TransactionScope transactionScope = TransactionsFacade.CreateNewScope())
+            using (var transactionScope = TransactionsFacade.CreateNewScope())
             {
                 IMediaFileStore store = DataFacade.GetData<IMediaFileStore>(x => x.Id == this.StoreId).First();
 
@@ -216,19 +199,21 @@ private void finalizeCodeActivity_Finalize_ExecuteCode(object sender, EventArgs
 
                 if (existingFile == null)
                 {
-                    WorkflowMediaFile mediaFile = new WorkflowMediaFile();
-                    mediaFile.FileName = System.IO.Path.GetFileName(filename);
-                    mediaFile.FolderPath = this.FolderPath;
-                    mediaFile.Title = this.GetBinding<string>("Title");
-                    mediaFile.Description = this.GetBinding<string>("Description");
-                    mediaFile.Tags = this.GetBinding<string>("Tags");
-                    mediaFile.Culture = C1Console.Users.UserSettings.ActiveLocaleCultureInfo.Name;
-                    mediaFile.Length = uploadedFile.ContentLength;
-                    mediaFile.MimeType = MimeTypeInfo.GetMimeType(uploadedFile);
-
-                    using (System.IO.Stream readStream = uploadedFile.FileStream)
+                    var mediaFile = new WorkflowMediaFile
+                    {
+                        FileName = System.IO.Path.GetFileName(filename),
+                        FolderPath = this.FolderPath,
+                        Title = this.GetBinding<string>("Title"),
+                        Description = this.GetBinding<string>("Description"),
+                        Tags = this.GetBinding<string>("Tags"),
+                        Culture = C1Console.Users.UserSettings.ActiveLocaleCultureInfo.Name,
+                        Length = uploadedFile.ContentLength,
+                        MimeType = MimeTypeInfo.GetMimeType(uploadedFile)
+                    };
+
+                    using (var readStream = uploadedFile.FileStream)
                     {
-                        using (System.IO.Stream writeStream = mediaFile.GetNewWriteStream())
+                        using (var writeStream = mediaFile.GetNewWriteStream())
                         {
                             readStream.CopyTo(writeStream);
                         }
@@ -249,9 +234,9 @@ private void finalizeCodeActivity_Finalize_ExecuteCode(object sender, EventArgs
                     fileData.MimeType = MimeTypeInfo.GetMimeType(uploadedFile);
                     fileData.Length = uploadedFile.ContentLength;
 
-                    using (System.IO.Stream readStream = uploadedFile.FileStream)
+                    using (var readStream = uploadedFile.FileStream)
                     {
-                        using (System.IO.Stream writeStream = existingFile.GetNewWriteStream())
+                        using (var writeStream = existingFile.GetNewWriteStream())
                         {
                             readStream.CopyTo(writeStream);
                         }

From 80a3f8b8aa0080acb81afb0f1ca4b0f27e670c3a Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Tue, 23 Jan 2018 14:00:56 +0100
Subject: [PATCH 53/57] Fixing compilation warnings, refactoring

---
 .../ViewAvailablePackageInfoWorkflowWorkflow.cs     |  4 +---
 .../DeletePageWorkflow.Designer.cs                  |  1 -
 .../PageElementProvider/DeletePageWorkflow.cs       | 13 ++++---------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/Composite.Workflows/Plugins/Elements/ElementProviders/PackageElementProvider/ViewAvailablePackageInfoWorkflowWorkflow.cs b/Composite.Workflows/Plugins/Elements/ElementProviders/PackageElementProvider/ViewAvailablePackageInfoWorkflowWorkflow.cs
index 3f2719dfe9..b893c8530f 100644
--- a/Composite.Workflows/Plugins/Elements/ElementProviders/PackageElementProvider/ViewAvailablePackageInfoWorkflowWorkflow.cs
+++ b/Composite.Workflows/Plugins/Elements/ElementProviders/PackageElementProvider/ViewAvailablePackageInfoWorkflowWorkflow.cs
@@ -50,8 +50,7 @@ public ViewAvailablePackageInfoWorkflowWorkflow()
 
         private void AddOnDescriptionExists(object sender, ConditionalEventArgs e)
         {
-            PackageDescription packageDescription;
-            this.TryGetBinding(BindingNames.PackageDescription, out packageDescription);
+            this.TryGetBinding(BindingNames.PackageDescription, out PackageDescription packageDescription);
             e.Result = packageDescription != null;
         }
 
@@ -84,7 +83,6 @@ where description.Id.ToString() == castedToken.Id
 
             var purchasableSubscriptions = packageDescription.AvailableInSubscriptions.Where(f => f.Purchasable).ToList();
 
-            bool showTrialInformation = false;
             var licenses = GetSubscriptionLicenses(packageDescription.AvailableInSubscriptions);
 
             var validLicense = licenses.Where(l => !l.Expired)
diff --git a/Composite.Workflows/Plugins/Elements/ElementProviders/PageElementProvider/DeletePageWorkflow.Designer.cs b/Composite.Workflows/Plugins/Elements/ElementProviders/PageElementProvider/DeletePageWorkflow.Designer.cs
index 66d56ee594..f98d412aa9 100644
--- a/Composite.Workflows/Plugins/Elements/ElementProviders/PageElementProvider/DeletePageWorkflow.Designer.cs
+++ b/Composite.Workflows/Plugins/Elements/ElementProviders/PageElementProvider/DeletePageWorkflow.Designer.cs
@@ -613,7 +613,6 @@ private void InitializeComponent()
 
 
         #endregion
-        private CodeActivity codeActivity_MultipleVersionsDeletionConfirmed;
         private StateActivity finalStateActivity;
         private SetStateActivity setStateActivity3;
         private StateInitializationActivity finalizeInitializationActivity;
diff --git a/Composite.Workflows/Plugins/Elements/ElementProviders/PageElementProvider/DeletePageWorkflow.cs b/Composite.Workflows/Plugins/Elements/ElementProviders/PageElementProvider/DeletePageWorkflow.cs
index 691b1d58b0..ab209b0f30 100644
--- a/Composite.Workflows/Plugins/Elements/ElementProviders/PageElementProvider/DeletePageWorkflow.cs
+++ b/Composite.Workflows/Plugins/Elements/ElementProviders/PageElementProvider/DeletePageWorkflow.cs
@@ -1,13 +1,10 @@
-using System;
+using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Workflow.Activities;
 using Composite.C1Console.Events;
 using Composite.Data;
-using Composite.Data.ProcessControlled;
 using Composite.Data.Types;
-using Composite.Data.Transactions;
 using Composite.C1Console.Workflow;
 using Composite.Core.Collections.Generic;
 using Texts = Composite.Core.ResourceSystem.LocalizationFiles.Composite_Plugins_PageElementProvider;
@@ -168,12 +165,10 @@ private void PageHasMultpleVersions(object sender, ConditionalEventArgs e)
 
         private void HasPageDeletionBeenConfirmed(object sender, ConditionalEventArgs e)
         {
-            Func<string, bool> isTrueBinding = bindingName =>
-                Bindings.ContainsKey(bindingName)
-                && (bool) Bindings[bindingName];
+            bool IsTrueBinding(string bindingName) => Bindings.ContainsKey(bindingName) && (bool) Bindings[bindingName];
 
-            e.Result = isTrueBinding(BindingNames.DeleteAllVersions)
-                    || isTrueBinding(BindingNames.DeleteChildrenConfirmed);
+            e.Result = IsTrueBinding(BindingNames.DeleteAllVersions)
+                    || IsTrueBinding(BindingNames.DeleteChildrenConfirmed);
         }
 
         private void DeleteCurrentVersion(object sender, EventArgs e)

From 9ff318c3e1cf97f9fa0f9bcbd45773f00385ea55 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Wed, 24 Jan 2018 10:32:36 +0100
Subject: [PATCH 54/57] Dll version information - not calculating "Is Debug
 DLL" correctly

---
 .../services/Admin/DownloadFile.ashx          | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/Website/Composite/services/Admin/DownloadFile.ashx b/Website/Composite/services/Admin/DownloadFile.ashx
index 7deb4a796a..2f2102a77a 100644
--- a/Website/Composite/services/Admin/DownloadFile.ashx
+++ b/Website/Composite/services/Admin/DownloadFile.ashx
@@ -129,19 +129,28 @@ public class DownloadFile : IHttpHandler
         {
             lines.AddRange(new []
             {
+                "--------- Version and metadata ---------",
+                "",
                 "Assembly Name       : " + assemblyInfo.GetName().Name,
                 "Version             : " + assemblyInfo.GetName().Version,
-                "Is Debug Dll        : " + assemblyInfo.CustomAttributes.Any(a => a.AttributeType == typeof(DebuggableAttribute)),
+                "Is Debug Dll        : " + assemblyInfo.CustomAttributes.Any(
+                    a => a.AttributeType == typeof(DebuggableAttribute)
+                         && a.ConstructorArguments.Any(
+                             attr => attr.ArgumentType == typeof(DebuggableAttribute.DebuggingModes)
+                                     && ((DebuggableAttribute.DebuggingModes)attr.Value & DebuggableAttribute.DebuggingModes.DisableOptimizations) > 0)
+                ),
                 "ImageRuntimeVersion : " + assemblyInfo.ImageRuntimeVersion,
                 "Full Name           : " + assemblyInfo.FullName
             });
         }
         else
         {
-            lines.Add("The assembly is not loaded or is not a managed assembly");
+            lines.Add("The dll file is not loaded in the current AppDomain or is not a managed assembly");
         }
 
-        lines.Add("-----");
+        lines.Add("");
+        lines.Add("------------- File version -------------");
+        lines.Add("");
 
         if (fileVersion != null)
         {
@@ -165,7 +174,6 @@ public class DownloadFile : IHttpHandler
             {
                 lines.Add("");
                 lines.Add(fileVersion.Comments);
-                lines.Add("");
             }
         }
         else
@@ -176,7 +184,9 @@ public class DownloadFile : IHttpHandler
 
         lines.AddRange(new[]
         {
-            "-----",
+            "",
+            "----------------------------------------",
+            "",
             "Last Modified       : " + fileInfo.LastWriteTime.ToString("O"),
             "Last Modified, UTC  : " + fileInfo.LastWriteTimeUtc.ToString("O"),
             "Creation Time       : " + fileInfo.CreationTime.ToString("O"),

From 185833ead71ac0e5caa27e8c7e52adda3215117b Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Thu, 25 Jan 2018 11:08:25 +0100
Subject: [PATCH 55/57] Fix #528 Renaming the media folder or file won't
 reflect in the URL

---
 Composite/Core/WebClient/MediaUrlHelper.cs | 29 +++++++++++++++-------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/Composite/Core/WebClient/MediaUrlHelper.cs b/Composite/Core/WebClient/MediaUrlHelper.cs
index 8438422d73..fea9f5a5d6 100644
--- a/Composite/Core/WebClient/MediaUrlHelper.cs
+++ b/Composite/Core/WebClient/MediaUrlHelper.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.IO;
@@ -35,18 +35,29 @@ void OnMediaFileChanged(object sender, DataEventArgs args)
 	            {
 	                _mediaFileCache.Remove(GetCacheKey(mediaFile.StoreId, mediaFile.Id));
 	            }
-	        }
+	            if (args.Data is IMediaFileData mediaFileData)
+	            {
+	                _mediaFileCache.Remove(GetCacheKey(DefaultMediaStore, mediaFileData.Id));
+	            }
+            }
 
-	        DataEvents<IMediaFile>.OnAfterAdd += OnMediaFileChanged;
-	        DataEvents<IMediaFile>.OnAfterUpdate += OnMediaFileChanged;
-	        DataEvents<IMediaFile>.OnDeleted += OnMediaFileChanged;
-	        DataEvents<IMediaFile>.OnStoreChanged += (s, a) =>
+	        void OnStoreChanged(object sender, StoreEventArgs storeEventArgs)
 	        {
-	            if (!a.DataEventsFired)
+	            if (!storeEventArgs.DataEventsFired)
 	            {
 	                _mediaFileCache.Clear();
-                }
-	        };
+	            }
+            }
+
+	        DataEvents<IMediaFile>.OnAfterAdd += OnMediaFileChanged;
+	        DataEvents<IMediaFile>.OnAfterUpdate += OnMediaFileChanged;
+	        DataEvents<IMediaFile>.OnDeleted += OnMediaFileChanged;
+	        DataEvents<IMediaFile>.OnStoreChanged += OnStoreChanged;
+
+            DataEvents<IMediaFileData>.OnAfterAdd += OnMediaFileChanged;
+	        DataEvents<IMediaFileData>.OnAfterUpdate += OnMediaFileChanged;
+	        DataEvents<IMediaFileData>.OnDeleted += OnMediaFileChanged;
+	        DataEvents<IMediaFileData>.OnStoreChanged += OnStoreChanged;
 	    }
 
         /// <exclude />

From b0dfa5cbfbdb5ff7c04ce48316f4ba288582d309 Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Thu, 25 Jan 2018 11:13:28 +0100
Subject: [PATCH 56/57] Refactoring

---
 Composite/Core/WebClient/MediaUrlHelper.cs | 115 +++++++++------------
 1 file changed, 50 insertions(+), 65 deletions(-)

diff --git a/Composite/Core/WebClient/MediaUrlHelper.cs b/Composite/Core/WebClient/MediaUrlHelper.cs
index fea9f5a5d6..e4c0c3543e 100644
--- a/Composite/Core/WebClient/MediaUrlHelper.cs
+++ b/Composite/Core/WebClient/MediaUrlHelper.cs
@@ -3,7 +3,6 @@
 using System.Collections.Specialized;
 using System.IO;
 using System.Linq;
-using System.Text.RegularExpressions;
 using Composite.Core.Extensions;
 using Composite.Core.Routing;
 using Composite.Core.Types;
@@ -18,61 +17,53 @@ namespace Composite.Core.WebClient
     /// <summary>    
     /// </summary>
     /// <exclude />
-    [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] 
-	public static class MediaUrlHelper
-	{
-	    private static readonly string DefaultMediaStore = "MediaArchive";
-        private static readonly Regex GuidRegex = new Regex(@"^(\{){0,1}[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}(\}){0,1}$");
+    [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+    public static class MediaUrlHelper
+    {
+        private static readonly string DefaultMediaStore = "MediaArchive";
 
-	    private static readonly int MediaFileCacheSize = 2000;
+        private static readonly int MediaFileCacheSize = 2000;
         private static readonly Cache<string, ExtendedNullable<IMediaFile>> _mediaFileCache = new Cache<string, ExtendedNullable<IMediaFile>>("Media files", MediaFileCacheSize);
 
-	    static MediaUrlHelper()
-	    {
-	        void OnMediaFileChanged(object sender, DataEventArgs args)
-	        {
-	            if (args.Data is IMediaFile mediaFile)
-	            {
-	                _mediaFileCache.Remove(GetCacheKey(mediaFile.StoreId, mediaFile.Id));
-	            }
-	            if (args.Data is IMediaFileData mediaFileData)
-	            {
-	                _mediaFileCache.Remove(GetCacheKey(DefaultMediaStore, mediaFileData.Id));
-	            }
+        static MediaUrlHelper()
+        {
+            void OnMediaFileChanged(object sender, DataEventArgs args)
+            {
+                if (args.Data is IMediaFile mediaFile)
+                {
+                    _mediaFileCache.Remove(GetCacheKey(mediaFile.StoreId, mediaFile.Id));
+                }
+                if (args.Data is IMediaFileData mediaFileData)
+                {
+                    _mediaFileCache.Remove(GetCacheKey(DefaultMediaStore, mediaFileData.Id));
+                }
             }
 
-	        void OnStoreChanged(object sender, StoreEventArgs storeEventArgs)
-	        {
-	            if (!storeEventArgs.DataEventsFired)
-	            {
-	                _mediaFileCache.Clear();
-	            }
+            void OnStoreChanged(object sender, StoreEventArgs storeEventArgs)
+            {
+                if (!storeEventArgs.DataEventsFired)
+                {
+                    _mediaFileCache.Clear();
+                }
             }
 
-	        DataEvents<IMediaFile>.OnAfterAdd += OnMediaFileChanged;
-	        DataEvents<IMediaFile>.OnAfterUpdate += OnMediaFileChanged;
-	        DataEvents<IMediaFile>.OnDeleted += OnMediaFileChanged;
-	        DataEvents<IMediaFile>.OnStoreChanged += OnStoreChanged;
+            DataEvents<IMediaFile>.OnAfterAdd += OnMediaFileChanged;
+            DataEvents<IMediaFile>.OnAfterUpdate += OnMediaFileChanged;
+            DataEvents<IMediaFile>.OnDeleted += OnMediaFileChanged;
+            DataEvents<IMediaFile>.OnStoreChanged += OnStoreChanged;
 
             DataEvents<IMediaFileData>.OnAfterAdd += OnMediaFileChanged;
-	        DataEvents<IMediaFileData>.OnAfterUpdate += OnMediaFileChanged;
-	        DataEvents<IMediaFileData>.OnDeleted += OnMediaFileChanged;
-	        DataEvents<IMediaFileData>.OnStoreChanged += OnStoreChanged;
-	    }
+            DataEvents<IMediaFileData>.OnAfterUpdate += OnMediaFileChanged;
+            DataEvents<IMediaFileData>.OnDeleted += OnMediaFileChanged;
+            DataEvents<IMediaFileData>.OnStoreChanged += OnStoreChanged;
+        }
 
         /// <exclude />
-        public static string GetUrl(IMediaFile file)
-        {
-            return GetUrl(file, true, false);
-        }
+        public static string GetUrl(IMediaFile file) => GetUrl(file, true, false);
 
 
         /// <exclude />
-        public static string GetUrl(IMediaFile file, bool isInternal)
-        {
-            return GetUrl(file, isInternal, false);
-        }
-
+        public static string GetUrl(IMediaFile file, bool isInternal) => GetUrl(file, isInternal, false);
 
 
         /// <exclude />
@@ -82,10 +73,12 @@ public static string GetUrl(IMediaFile file, bool isInternal, bool downloadableM
 
             if (!downloadableMedia) return url;
 
-            var urlBuilder = new UrlBuilder(url);
-            urlBuilder["download"] = "true";
+            var urlBuilder = new UrlBuilder(url)
+            {
+                ["download"] = "true"
+            };
 
-            return  urlBuilder.ToString();
+            return urlBuilder.ToString();
         }
 
 
@@ -93,16 +86,16 @@ public static string GetUrl(IMediaFile file, bool isInternal, bool downloadableM
         /// <exclude />
         public static IMediaFile GetFileFromQueryString(NameValueCollection queryParameters)
         {
-            Verify.ArgumentNotNull(queryParameters, "queryParameters");
+            Verify.ArgumentNotNull(queryParameters, nameof(queryParameters));
 
             string idStr = queryParameters["id"];
 
             // In order to support old-style queries, checking composite path in "i" and "src" query parameters
             string compositePath = queryParameters["i"];
-            if(compositePath.IsNullOrEmpty())
+            if (compositePath.IsNullOrEmpty())
             {
                 compositePath = queryParameters["src"];
-                if(compositePath.IsNullOrEmpty() 
+                if (compositePath.IsNullOrEmpty()
                     && idStr != null && idStr.Contains(":"))
                 {
                     compositePath = idStr;
@@ -111,8 +104,8 @@ public static IMediaFile GetFileFromQueryString(NameValueCollection queryParamet
 
             string storeId;
             IMediaFile result;
-            
-            if(!compositePath.IsNullOrEmpty())
+
+            if (!compositePath.IsNullOrEmpty())
             {
                 // Parsing a friendly media url
                 int separatorIndex = compositePath.IndexOf(":", System.StringComparison.Ordinal);
@@ -123,9 +116,7 @@ public static IMediaFile GetFileFromQueryString(NameValueCollection queryParamet
 
                 try
                 {
-                    Guid fileId; 
-
-                    if (Guid.TryParse(secondPart, out fileId))
+                    if (Guid.TryParse(secondPart, out Guid fileId))
                     {
                         result = GetFileById(storeId, fileId);
                     }
@@ -138,7 +129,7 @@ public static IMediaFile GetFileFromQueryString(NameValueCollection queryParamet
                 }
                 catch (Exception ex)
                 {
-                    throw new FileNotFoundException("File '{0}' was not found.".FormatWith(compositePath), ex);
+                    throw new FileNotFoundException($"File '{compositePath}' was not found.", ex);
                 }
             }
             else
@@ -159,13 +150,11 @@ public static IMediaFile GetFileFromQueryString(NameValueCollection queryParamet
                 }
                 catch (Exception ex)
                 {
-                    throw new FileNotFoundException("File not found. Storage: '{0}', Id: {1}".FormatWith(storeId, id), ex);
+                    throw new FileNotFoundException($"File not found. Storage: '{storeId}', Id: {id}", ex);
                 }
             }
 
-            if (result == null) throw new FileNotFoundException("File not found.");
-
-            return result;
+            return result ?? throw new FileNotFoundException("File not found.");
         }
 
         internal static string GetCacheKey(string storeId, Guid fileId) => storeId + fileId;
@@ -215,17 +204,13 @@ private static IMediaFile GetFileByCompositePath(string storeId, string composit
 
         /// <exclude />
         [Obsolete("Use Guid.TryParse()")]
-        public static bool IsValidGuid(string value)
-        {
-            Verify.ArgumentNotNull(value, "value");
+        public static bool IsValidGuid(string value) => Guid.TryParse(value, out _);
 
-            return GuidRegex.IsMatch(value);
-        }
 
         /// <exclude />
         public static string ChangeInternalMediaUrlsToPublic(string content)
         {
-            return InternalUrls.ConvertInternalUrlsToPublic(content, new[] {new MediaInternalUrlConverter()});
+            return InternalUrls.ConvertInternalUrlsToPublic(content, new[] { new MediaInternalUrlConverter() });
         }
-	}
+    }
 }

From 50fd38289041bd66d80dd6b6874865a4e1f40f7d Mon Sep 17 00:00:00 2001
From: Dmitry Dzygin <dmitriy.dzygin@gmail.com>
Date: Thu, 25 Jan 2018 13:43:37 +0100
Subject: [PATCH 57/57] Fixing nightwatch tests - tests are failing in
 scenarios when a button with the same name should be clicked consequently
 (f.e. the "Next" button)

---
 Website/test/e2e/commands/clickDialogButton.js | 1 +
 Website/test/e2e/globals.js                    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Website/test/e2e/commands/clickDialogButton.js b/Website/test/e2e/commands/clickDialogButton.js
index 1bce3a7b2d..08bebd2c3a 100644
--- a/Website/test/e2e/commands/clickDialogButton.js
+++ b/Website/test/e2e/commands/clickDialogButton.js
@@ -9,6 +9,7 @@ util.inherits(ClickOnDialogButton, events.EventEmitter);
 
 ClickOnDialogButton.prototype.command = function (button) {
     this.client.api
+        .pause(this.api.globals.timeouts.smallest)
         .selectFrame('clickbutton[label="' + button + '"]')
         .waitForElementVisible('clickbutton[label="' + button + '"]', this.api.globals.timeouts.basic)
         .click('clickbutton[label="'+button+'"]', () => this.emit('complete'))
diff --git a/Website/test/e2e/globals.js b/Website/test/e2e/globals.js
index 7ea6d9a1d3..50b0c820a2 100644
--- a/Website/test/e2e/globals.js
+++ b/Website/test/e2e/globals.js
@@ -2,6 +2,7 @@ var timeouts = {
 		basic: 10000,
 		save: 120000,
 		little: 1000,
+		smallest: 250,
 		loading: 25000,
 	};