Removed backward compatibility code related to displaymode querystrin…

…g and file naming.
Orckestra · Feb 16, 2016 · 99d4275 · 99d4275
1 parent ba0df78
commit 99d4275
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 75 deletions.
diff --git a/Composite/AspNet/DisplayModeFacade.cs b/Composite/AspNet/DisplayModeFacade.cs
diff --git a/Composite/AspNet/LegacyC1DisplayMode.cs b/Composite/AspNet/LegacyC1DisplayMode.cs
diff --git a/Composite/AspNet/Razor/RazorHelper.cs b/Composite/AspNet/Razor/RazorHelper.cs
@@ -6,7 +6,7 @@
 using System.Web.WebPages;
 using System.Xml;
 using System.Xml.Linq;
-using Composite.Core.Application;
+using Composite.Core.IO;
 //using Composite.Core.Extensions;
 //using Composite.Core.IO;
 using Composite.Core.Types;

diff --git a/Composite/Composite.csproj b/Composite/Composite.csproj
@@ -152,8 +152,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AspNet\CompositeC1SiteMapProvider.cs" />
-    <Compile Include="AspNet\DisplayModeFacade.cs" />
-    <Compile Include="AspNet\LegacyC1DisplayMode.cs" />
     <Compile Include="AspNet\Razor\RazorFunction.cs" />
     <Compile Include="AspNet\Razor\RazorHelper.cs" />
     <Compile Include="AspNet\Razor\RazorPageTemplate.cs" />
@@ -191,7 +189,7 @@
     <Compile Include="C1Console\Trees\SortDirection.cs" />
     <Compile Include="Core\Application\ServiceLocator.cs" />
     <Compile Include="Core\Application\Job.cs" />
-    <Compile Include="Core\Application\SpecialModesFileResolver.cs" />
+    <Compile Include="Core\IO\SpecialModesFileResolver.cs" />
     <Compile Include="Core\Caching\FileRelatedDataCache.cs" />
     <Compile Include="Core\Extensions\StackTraceExtensionMethods.cs" />
     <Compile Include="Core\Instrumentation\LogExecutionTime.cs" />

diff --git a/...e/Application/SpecialModesFileResolver.cs → ...osite/Core/IO/SpecialModesFileResolver.cs b/...e/Application/SpecialModesFileResolver.cs → ...osite/Core/IO/SpecialModesFileResolver.cs
@@ -4,7 +4,7 @@
 using System.Web.Hosting;
 using System.Web.WebPages;
 
-namespace Composite.Core.Application
+namespace Composite.Core.IO
 {
     /// <exclude />
     public static class SpecialModesFileResolver

diff --git a/Composite/Core/WebClient/ApplicationLevelEventHandlers.cs b/Composite/Core/WebClient/ApplicationLevelEventHandlers.cs
@@ -4,7 +4,6 @@
 using System.Globalization;
 using System.Text;
 using System.Web;
-using Composite.AspNet;
 using Composite.C1Console.Elements;
 using Composite.C1Console.Events;
 using Composite.Core.Application;
@@ -54,6 +53,8 @@ public static void Application_Start(object sender, EventArgs e)
 
             SystemSetupFacade.SetFirstTimeStart();
 
+            InitializeServices();
+
             if (!SystemSetupFacade.IsSystemFirstTimeInitialized)
             {
                 return;
@@ -68,12 +69,10 @@ public static void Application_Start(object sender, EventArgs e)
             {
                 throw new InvalidOperationException("Windows limitation problem detected! You have installed the website at a place where the total path length of the file with the longest filename exceeds the maximum allowed in Windows. See http://msdn.microsoft.com/en-us/library/aa365247%28VS.85%29.aspx#paths");
             }
-
+            
 
             AppDomain.CurrentDomain.DomainUnload += CurrentDomain_DomainUnload;
 
-            InitializeServices();
-
             lock (_syncRoot)
             {
                 if (_systemIsInitialized) return;
@@ -345,7 +344,6 @@ public static void ApplicationStartInitialize(bool displayDebugInfo = false)
             TempDirectoryFacade.OnApplicationStart();
 
             HostnameBindingsFacade.Initialize();
-            DisplayModeFacade.Initialize();
 
             ApplicationStartupFacade.FireSystemInitialized();
 

diff --git a/Composite/Core/WebClient/Renderings/RenderingContext.cs b/Composite/Core/WebClient/Renderings/RenderingContext.cs
@@ -21,10 +21,10 @@ namespace Composite.Core.WebClient.Renderings
     /// Rendering context
     /// </summary>
     /// <exclude />
-    [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] 
-    public sealed class RenderingContext: IDisposable
+    [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+    public sealed class RenderingContext : IDisposable
     {
-        private static readonly string LogTitle = typeof (RenderingContext).Name;
+        private static readonly string LogTitle = typeof(RenderingContext).Name;
 
         /// <summary>
         /// Indicates whether performance profiling is enabled.
@@ -198,7 +198,7 @@ private void InitializeFromHttpContextInternal()
             var request = httpContext.Request;
             var response = httpContext.Response;
 
-           ProfilingEnabled = request.Url.OriginalString.Contains("c1mode=perf");
+            ProfilingEnabled = request.Url.OriginalString.Contains("c1mode=perf");
             if (ProfilingEnabled)
             {
                 if (!UserValidationFacade.IsLoggedIn())
@@ -221,17 +221,17 @@ private void InitializeFromHttpContextInternal()
                 Page = (IPage)HttpRuntime.Cache.Get(_previewKey + "_SelectedPage");
                 C1PageRoute.PageUrlData = new PageUrlData(Page);
 
-                PageRenderer.RenderingReason = (RenderingReason) HttpRuntime.Cache.Get(_previewKey + "_RenderingReason");
+                PageRenderer.RenderingReason = (RenderingReason)HttpRuntime.Cache.Get(_previewKey + "_RenderingReason");
             }
             else
             {
-                PageUrlData pageUrl = C1PageRoute.PageUrlData ??  PageUrls.UrlProvider.ParseInternalUrl(request.Url.OriginalString);
+                PageUrlData pageUrl = C1PageRoute.PageUrlData ?? PageUrls.UrlProvider.ParseInternalUrl(request.Url.OriginalString);
                 Page = pageUrl.GetPage();
 
                 _cachedUrl = request.Url.PathAndQuery;
 
-                PageRenderer.RenderingReason = new UrlSpace(httpContext).ForceRelativeUrls 
-                    ? RenderingReason.C1ConsoleBrowserPageView 
+                PageRenderer.RenderingReason = new UrlSpace(httpContext).ForceRelativeUrls
+                    ? RenderingReason.C1ConsoleBrowserPageView
                     : RenderingReason.PageView;
             }
 
@@ -258,7 +258,7 @@ private void InitializeFromHttpContextInternal()
             Verify.IsNotNull(httpContext.Handler, "HttpHandler isn't defined");
 
             var aspnetPage = (System.Web.UI.Page)httpContext.Handler;
-            
+
             OverrideDisplayMode(httpContext);
 
             var pageRenderer = PageTemplateFacade.BuildPageRenderer(Page.TemplateId);
@@ -267,14 +267,7 @@ private void InitializeFromHttpContextInternal()
 
         private static void OverrideDisplayMode(HttpContextBase httpContext)
         {
-            var qs = httpContext.Request.QueryString;
-            var displayMode = qs["c1displaymode"];
-
-            if (qs.AllKeys.Length > 0 && qs.Keys[0] == null)
-            {
-                displayMode = qs[0];
-            }
-
+            var displayMode = httpContext.Request.QueryString["c1displaymode"];
             if (!String.IsNullOrEmpty(displayMode))
             {
                 if (displayMode.Equals("mobile", StringComparison.OrdinalIgnoreCase))
@@ -333,7 +326,7 @@ public bool PreRenderRedirectCheck()
 
             return false;
         }
-        
+
         private static string GetLoginRedirectUrl(string url)
         {
             return UrlUtils.PublicRootPath + "/Composite/Login.aspx?ReturnUrl=" +

diff --git a/Composite/Plugins/PageTemplates/MasterPages/MasterPagePageRenderer.cs b/Composite/Plugins/PageTemplates/MasterPages/MasterPagePageRenderer.cs
@@ -6,9 +6,9 @@
 using System.Linq;
 using System.Web;
 using Composite.C1Console.Security;
-using Composite.Core.Application;
 using Composite.Core.Collections.Generic;
 using Composite.Core.Extensions;
+using Composite.Core.IO;
 using Composite.Core.PageTemplates;
 using Composite.Core.WebClient.Renderings.Page;
 using Composite.Core.Xml;

diff --git a/Composite/Plugins/PageTemplates/Razor/RazorPageRenderer.cs b/Composite/Plugins/PageTemplates/Razor/RazorPageRenderer.cs
@@ -6,10 +6,10 @@
 using System.Web.WebPages;
 using System.Xml.Linq;
 using Composite.AspNet.Razor;
-using Composite.Core.Application;
 using Composite.Core.Collections.Generic;
 using Composite.Core.Extensions;
 using Composite.Core.Instrumentation;
+using Composite.Core.IO;
 using Composite.Core.PageTemplates;
 using Composite.Core.WebClient.Renderings.Page;
 using Composite.Functions;