From 3961255f525b98bc50c441d9213cb4e6e6543f73 Mon Sep 17 00:00:00 2001
From: Sacha Trauwaen <sachatrauwaen@yahoo.com>
Date: Mon, 17 Oct 2016 21:40:16 +0200
Subject: [PATCH 1/2] avoid error with DNN cachebuster ver=xxx

---
 BuildScripts/ModulePackage.targets |  4 ++--
 OpenImageProcessor.csproj          | 31 ++++++++++++++++++++++++------
 OpenImageProcessor.dnn             |  8 ++++++--
 ValidatingRequest.cs               | 29 ++++++++++++++++++++++++++++
 web.Debug.config                   | 30 +++++++++++++++++++++++++++++
 web.Release.config                 | 31 ++++++++++++++++++++++++++++++
 web.config                         | 15 +++++++++++++++
 7 files changed, 138 insertions(+), 10 deletions(-)
 create mode 100644 ValidatingRequest.cs
 create mode 100644 web.Debug.config
 create mode 100644 web.Release.config
 create mode 100644 web.config

diff --git a/BuildScripts/ModulePackage.targets b/BuildScripts/ModulePackage.targets
index 819463e..1fada5c 100644
--- a/BuildScripts/ModulePackage.targets
+++ b/BuildScripts/ModulePackage.targets
@@ -70,7 +70,7 @@
       <Output TaskParameter="Include" ItemName="ConfigFiles" />
     </CreateItem>
 
-
+    <Copy SourceFiles="$(MSBuildDnnBinPath)\$(AssemblyName).dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
     <Copy SourceFiles="$(MSBuildDnnBinPath)\ImageProcessor.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
     <Copy SourceFiles="$(MSBuildDnnBinPath)\ImageProcessor.Web.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
     <Copy SourceFiles="@(SqlDataProviderFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package\%(RecursiveDir)" />
@@ -100,7 +100,7 @@
     <RemoveDir Directories ="$(MSBuildProjectDirectory)\Package" />
     <RemoveDir Directories ="$(MSBuildProjectDirectory)\ResourcesZip" />
 
-    
+    <Copy SourceFiles="$(MSBuildDnnBinPath)\$(AssemblyName).dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
     <Copy SourceFiles="$(MSBuildDnnBinPath)\ImageProcessor.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
     <Copy SourceFiles="$(MSBuildDnnBinPath)\ImageProcessor.Web.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
     <Copy SourceFiles="@(SqlDataProviderFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package\%(RecursiveDir)" />
diff --git a/OpenImageProcessor.csproj b/OpenImageProcessor.csproj
index 5177a68..26bc9cb 100644
--- a/OpenImageProcessor.csproj
+++ b/OpenImageProcessor.csproj
@@ -11,9 +11,9 @@
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Christoc.Modules.OpenImageProcessor</RootNamespace>
-    <AssemblyName>OpenImageProcessor</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <RootNamespace>Satrabel.OpenImageProcessor</RootNamespace>
+    <AssemblyName>Satrabel.OpenImageProcessor</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <UseIISExpress>true</UseIISExpress>
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
@@ -29,6 +29,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -37,15 +38,20 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DotNetNuke, Version=7.0.2.1, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DotNetNuke, Version=7.4.1.280, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\bin\DotNetNuke.dll</HintPath>
     </Reference>
-    <Reference Include="DotNetNuke.WebUtility, Version=4.2.1.783, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DotNetNuke.Web, Version=7.4.1.280, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\bin\DotNetNuke.WebUtility.dll</HintPath>
+      <HintPath>..\..\bin\DotNetNuke.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="ImageProcessor.Web, Version=4.6.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\bin\ImageProcessor.Web.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />
@@ -61,9 +67,11 @@
     <Reference Include="System.Web.DynamicData" />
     <Reference Include="System.Web.Entity" />
     <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ValidatingRequest.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="License.txt" />
@@ -91,6 +99,17 @@
     <Content Include="Config\processing.config" />
     <Content Include="Config\security.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="web.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="web.Debug.config">
+      <DependentUpon>web.config</DependentUpon>
+    </None>
+    <None Include="web.Release.config">
+      <DependentUpon>web.config</DependentUpon>
+    </None>
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
diff --git a/OpenImageProcessor.dnn b/OpenImageProcessor.dnn
index 3f3cd2a..47b1392 100644
--- a/OpenImageProcessor.dnn
+++ b/OpenImageProcessor.dnn
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="OpenImageProcessor" type="Library" version="04.06.04">
+    <package name="OpenImageProcessor" type="Library" version="04.06.06">
       <friendlyName>OpenImageProcessor</friendlyName>
       <description>Satrabel OpenImageProcessor</description>
       <iconFile>~/Images/icon_extensions.gif</iconFile>
@@ -17,7 +17,11 @@
       </dependencies>
       <components>
         <component type="Assembly">
-          <assemblies>           
+          <assemblies>
+            <assembly>
+              <name>Satrabel.OpenImageProcessor.dll</name>
+              <path>bin</path>
+            </assembly>
             <assembly>
               <name>ImageProcessor.dll</name>
               <path>bin</path>
diff --git a/ValidatingRequest.cs b/ValidatingRequest.cs
new file mode 100644
index 0000000..fac77ca
--- /dev/null
+++ b/ValidatingRequest.cs
@@ -0,0 +1,29 @@
+using DotNetNuke.Web.Api;
+using ImageProcessor.Web.HttpModules;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace Satrabel.OpenImageProcessor
+{
+    public class ValidatingRequest : IServiceRouteMapper
+    {
+        public void RegisterRoutes(IMapRoute mapRouteManager)
+        {
+            ImageProcessingModule.ValidatingRequest += (sender, args) =>
+            {
+                if (!string.IsNullOrWhiteSpace(args.QueryString))
+                {
+                    var queryCollection = HttpUtility.ParseQueryString(args.QueryString);
+                    // ignore cachebuster
+                    if (queryCollection.AllKeys.Contains("ver"))
+                    {
+                        queryCollection.Remove("ver");
+                        args.QueryString = queryCollection.ToString();
+                    }
+                }
+            }; 
+        }
+    }
+}
\ No newline at end of file
diff --git a/web.Debug.config b/web.Debug.config
new file mode 100644
index 0000000..2e302f9
--- /dev/null
+++ b/web.Debug.config
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- For more information on using web.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 -->
+
+<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <!--
+    In the example below, the "SetAttributes" transform will change the value of 
+    "connectionString" to use "ReleaseSQLServer" only when the "Match" locator 
+    finds an attribute "name" that has a value of "MyDB".
+    
+    <connectionStrings>
+      <add name="MyDB" 
+        connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True" 
+        xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
+    </connectionStrings>
+  -->
+  <system.web>
+    <!--
+      In the example below, the "Replace" transform will replace the entire 
+      <customErrors> section of your web.config file.
+      Note that because there is only one customErrors section under the 
+      <system.web> node, there is no need to use the "xdt:Locator" attribute.
+      
+      <customErrors defaultRedirect="GenericError.htm"
+        mode="RemoteOnly" xdt:Transform="Replace">
+        <error statusCode="500" redirect="InternalError.htm"/>
+      </customErrors>
+    -->
+  </system.web>
+</configuration>
\ No newline at end of file
diff --git a/web.Release.config b/web.Release.config
new file mode 100644
index 0000000..c358444
--- /dev/null
+++ b/web.Release.config
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- For more information on using web.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 -->
+
+<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <!--
+    In the example below, the "SetAttributes" transform will change the value of 
+    "connectionString" to use "ReleaseSQLServer" only when the "Match" locator 
+    finds an attribute "name" that has a value of "MyDB".
+    
+    <connectionStrings>
+      <add name="MyDB" 
+        connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True" 
+        xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
+    </connectionStrings>
+  -->
+  <system.web>
+    <compilation xdt:Transform="RemoveAttributes(debug)" />
+    <!--
+      In the example below, the "Replace" transform will replace the entire 
+      <customErrors> section of your web.config file.
+      Note that because there is only one customErrors section under the 
+      <system.web> node, there is no need to use the "xdt:Locator" attribute.
+      
+      <customErrors defaultRedirect="GenericError.htm"
+        mode="RemoteOnly" xdt:Transform="Replace">
+        <error statusCode="500" redirect="InternalError.htm"/>
+      </customErrors>
+    -->
+  </system.web>
+</configuration>
\ No newline at end of file
diff --git a/web.config b/web.config
new file mode 100644
index 0000000..b807387
--- /dev/null
+++ b/web.config
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<configuration>
+  <!--
+    For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
+
+    The following attributes can be set on the <httpRuntime> tag.
+      <system.Web>
+        <httpRuntime targetFramework="4.5" />
+      </system.Web>
+  -->
+  <system.web>
+    <compilation debug="true" targetFramework="4.5"/>
+    <pages controlRenderingCompatibilityVersion="4.0"/>
+  </system.web>
+</configuration>
\ No newline at end of file

From 4dad27f24091e0520d6e6154f77805fdaa069720 Mon Sep 17 00:00:00 2001
From: Sacha Trauwaen <sachatrauwaen@yahoo.com>
Date: Tue, 18 Oct 2016 19:29:01 +0200
Subject: [PATCH 2/2] remove ckeditor cachebuster

---
 ValidatingRequest.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/ValidatingRequest.cs b/ValidatingRequest.cs
index fac77ca..9a33c04 100644
--- a/ValidatingRequest.cs
+++ b/ValidatingRequest.cs
@@ -16,12 +16,17 @@ public void RegisterRoutes(IMapRoute mapRouteManager)
                 if (!string.IsNullOrWhiteSpace(args.QueryString))
                 {
                     var queryCollection = HttpUtility.ParseQueryString(args.QueryString);
-                    // ignore cachebuster
+                    // ignore DNN cachebuster
                     if (queryCollection.AllKeys.Contains("ver"))
                     {
                         queryCollection.Remove("ver");
-                        args.QueryString = queryCollection.ToString();
                     }
+                    // ignore ckeditor cachebuster
+                    if (queryCollection.AllKeys.Contains("t"))
+                    {
+                        queryCollection.Remove("t");
+                    }
+                    args.QueryString = queryCollection.ToString();
                 }
             }; 
         }