Updated DB Dump, ParserHelper.cs and Global.asax.cs

MacdonaldRobinson · Feb 2, 2017 · aa4b355 · aa4b355
1 parent 0b9ac4b
commit aa4b355
Show file tree

Hide file tree

Showing 18 changed files with 74 additions and 24 deletions.
diff --git a/FrameworkLibrary/Helpers/ParserHelper.cs b/FrameworkLibrary/Helpers/ParserHelper.cs
@@ -261,8 +261,10 @@ public static string ParseData(string data, object obj, bool compileRazor = true
                 }
                 else
                 {
-                    if (!string.IsNullOrEmpty(tagValue))
+                    if (data != tagValue && !data.StartsWith("@"))
+                    {
                         data = tagValue;
+                    }
                 }
             }
 

diff --git a/TinyFileManager.NET-master/TinyFileManager.NET/bin/TinyFileManager.dll b/TinyFileManager.NET-master/TinyFileManager.NET/bin/TinyFileManager.dll
diff --git a/TinyFileManager.NET-master/TinyFileManager.NET/bin/TinyFileManager.pdb b/TinyFileManager.NET-master/TinyFileManager.NET/bin/TinyFileManager.pdb
diff --git a/WebApplication/Admin/Views/PageHandlers/AdminTools/Default.aspx b/WebApplication/Admin/Views/PageHandlers/AdminTools/Default.aspx
@@ -15,7 +15,7 @@
                 <div class="clear"></div>
             </div>
         </div>
-<%--        <div>
+        <div>
             <h3>Clear All Cache & Delete All History Versions</h3>
             This tool will delete all history versions currently saved in the database and will clear all the cache at the same time<br />
             <div class="buttons">
@@ -24,7 +24,7 @@
                 Delete any saved Drafts as well
                 <div class="clear"></div>
             </div>
-        </div>--%>
+        </div>
     </fieldset>
 
     <fieldset>

diff --git a/WebApplication/Admin/Views/PageHandlers/AdminTools/Default.aspx.cs b/WebApplication/Admin/Views/PageHandlers/AdminTools/Default.aspx.cs
@@ -92,7 +92,7 @@ protected void ClearAllCache_OnClick(object sender, EventArgs e)
             FileCacheHelper.ClearAllCache();
         }
 
-        /*protected void DeleteAllHistoryAndClearAllCache_Click(object sender, EventArgs e)
+        protected void DeleteAllHistoryAndClearAllCache_Click(object sender, EventArgs e)
         {
             try
             {
@@ -116,7 +116,7 @@ protected void ClearAllCache_OnClick(object sender, EventArgs e)
 
                 DisplayErrorMessage("Error Clearing All Cache", ErrorHelper.CreateError(ex));
             }
-        }*/
+        }
 
         /*protected void EmailLog_PageIndexChanging(object sender, System.Web.UI.WebControls.GridViewPageEventArgs e)
         {

diff --git a/WebApplication/Admin/Views/PageHandlers/AdminTools/Default.aspx.designer.cs b/WebApplication/Admin/Views/PageHandlers/AdminTools/Default.aspx.designer.cs
diff --git a/WebApplication/Global.asax.cs b/WebApplication/Global.asax.cs
@@ -29,7 +29,7 @@ private void Application_BeginRequest(Object source, EventArgs e)
                     Response.Redirect(installerPath);
             }
 
-            if (!AppSettings.IsRunningOnDev && !Request.Url.Host.StartsWith("www."))
+            if (!AppSettings.IsRunningOnDev && (!Request.Url.Host.StartsWith("www.") && !Request.Url.Host.Contains("localhost")))
                 Response.RedirectPermanent(Request.Url.AbsoluteUri.Replace("://", "://www."));
 
             BaseService.AddResponseHeaders();

diff --git a/WebApplication/Installer/SqlFiles/CreateAndDelete_FlexDotnetCMS.sql b/WebApplication/Installer/SqlFiles/CreateAndDelete_FlexDotnetCMS.sql
diff --git a/WebApplication/Web.config b/WebApplication/Web.config
@@ -220,8 +220,8 @@
       <remove name="PassportAuthentication" />
       <remove name="UrlAuthentication" />
       <remove name="FileAuthentication" />
-      <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" />
-    </httpModules>
+
+    <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" /></httpModules>
     <authentication mode="Forms">
       <forms loginUrl="~/login/" name="adAuthCookie" timeout="2880" slidingExpiration="true" />
     </authentication>
@@ -249,8 +249,8 @@
       <remove name="PassportAuthentication" />
       <remove name="UrlAuthentication" />
       <remove name="FileAuthentication" />
-      <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" />
-    </modules>
+
+    <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" /></modules>
     <handlers>
       <add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
       <add name="UrlRoutingHandler" preCondition="integratedMode" verb="*" path="UrlRouting.axd" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
@@ -268,8 +268,8 @@
       <mimeMap fileExtension=".woff2" mimeType="application/octet-stream" />
     </staticContent>
 
-    <validation validateIntegratedModeConfiguration="false" />
-  </system.webServer>
+
+  <validation validateIntegratedModeConfiguration="false" /></system.webServer>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
       <parameters>
@@ -281,4 +281,19 @@
     </providers>
   </entityFramework>
 
+  <runtime>
+
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+
+      <dependentAssembly>
+
+        <assemblyIdentity name="System.Net.Http.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+
+        <bindingRedirect oldVersion="0.0.0.0-4.2.29.0" newVersion="4.2.29.0" />
+
+      </dependentAssembly>
+
+    </assemblyBinding>
+
+  </runtime>
 </configuration>
diff --git a/WebApplication/WebApplication.csproj b/WebApplication/WebApplication.csproj
@@ -84,14 +84,14 @@
       <HintPath>..\packages\HtmlAgilityPack.1.4.9.5\lib\Net45\HtmlAgilityPack.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ImageProcessor, Version=2.5.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="ImageProcessor, Version=2.5.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ImageProcessor.2.5.1\lib\net45\ImageProcessor.dll</HintPath>
+      <HintPath>..\packages\ImageProcessor.2.5.2\lib\net45\ImageProcessor.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ImageProcessor.Web, Version=4.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="ImageProcessor.Web, Version=4.8.1.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ImageProcessor.Web.4.7.2\lib\net45\ImageProcessor.Web.dll</HintPath>
+      <HintPath>..\packages\ImageProcessor.Web.4.8.1\lib\net45\ImageProcessor.Web.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="LinqToTwitterPcl, Version=3.1.2.18329, Culture=neutral, PublicKeyToken=957107be965c25d9, processorArchitecture=MSIL">

diff --git a/WebApplication/bin/FrameworkLibrary.dll b/WebApplication/bin/FrameworkLibrary.dll
diff --git a/WebApplication/bin/FrameworkLibrary.pdb b/WebApplication/bin/FrameworkLibrary.pdb
diff --git a/WebApplication/bin/TinyFileManager.dll b/WebApplication/bin/TinyFileManager.dll
diff --git a/WebApplication/bin/TinyFileManager.pdb b/WebApplication/bin/TinyFileManager.pdb
diff --git a/WebApplication/bin/WebApplication.dll b/WebApplication/bin/WebApplication.dll
diff --git a/WebApplication/bin/WebApplication.dll.config b/WebApplication/bin/WebApplication.dll.config
@@ -220,8 +220,8 @@
       <remove name="PassportAuthentication" />
       <remove name="UrlAuthentication" />
       <remove name="FileAuthentication" />
-      <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" />
-    </httpModules>
+
+    <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" /></httpModules>
     <authentication mode="Forms">
       <forms loginUrl="~/login/" name="adAuthCookie" timeout="2880" slidingExpiration="true" />
     </authentication>
@@ -249,8 +249,8 @@
       <remove name="PassportAuthentication" />
       <remove name="UrlAuthentication" />
       <remove name="FileAuthentication" />
-      <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" />
-    </modules>
+
+    <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" /></modules>
     <handlers>
       <add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
       <add name="UrlRoutingHandler" preCondition="integratedMode" verb="*" path="UrlRouting.axd" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
@@ -268,8 +268,8 @@
       <mimeMap fileExtension=".woff2" mimeType="application/octet-stream" />
     </staticContent>
 
-    <validation validateIntegratedModeConfiguration="false" />
-  </system.webServer>
+
+  <validation validateIntegratedModeConfiguration="false" /></system.webServer>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
       <parameters>
@@ -281,4 +281,19 @@
     </providers>
   </entityFramework>
 
+  <runtime>
+
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+
+      <dependentAssembly>
+
+        <assemblyIdentity name="System.Net.Http.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+
+        <bindingRedirect oldVersion="0.0.0.0-4.2.29.0" newVersion="4.2.29.0" />
+
+      </dependentAssembly>
+
+    </assemblyBinding>
+
+  </runtime>
 </configuration>
diff --git a/WebApplication/bin/WebApplication.pdb b/WebApplication/bin/WebApplication.pdb
diff --git a/WebApplication/packages.config b/WebApplication/packages.config
@@ -3,8 +3,8 @@
   <package id="CSSFriendly" version="1.0" targetFramework="net452" />
   <package id="EntityFramework" version="6.1.3" targetFramework="net45" />
   <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net452" />
-  <package id="ImageProcessor" version="2.5.1" targetFramework="net452" />
-  <package id="ImageProcessor.Web" version="4.7.2" targetFramework="net452" />
+  <package id="ImageProcessor" version="2.5.2" targetFramework="net452" />
+  <package id="ImageProcessor.Web" version="4.8.1" targetFramework="net452" />
   <package id="Microsoft.Azure.KeyVault.Core" version="2.0.4" targetFramework="net452" />
   <package id="Microsoft.IO.RecyclableMemoryStream" version="1.2.1" targetFramework="net452" />
   <package id="Microsoft.Net.Compilers" version="1.3.2" targetFramework="net452" developmentDependency="true" />