diff --git a/src/Umbraco.Web.UI/App_Browsers/Form.browser b/src/Umbraco.Web.UI/App_Browsers/Form.browser deleted file mode 100644 index a15cd2c4c1..0000000000 --- a/src/Umbraco.Web.UI/App_Browsers/Form.browser +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 69347d0520..2a37f62462 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -474,7 +474,6 @@ - Designer diff --git a/src/Umbraco.Web/Routing/LegacyRequestInitializer.cs b/src/Umbraco.Web/Routing/LegacyRequestInitializer.cs deleted file mode 100644 index d84ff25d73..0000000000 --- a/src/Umbraco.Web/Routing/LegacyRequestInitializer.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using System.Web; - -namespace Umbraco.Web.Routing -{ - /// - /// A legacy class for old style handling of URL requests - /// - internal class LegacyRequestInitializer - { - private readonly Uri _requestUrl; - private readonly HttpContextBase _httpContext; - - public LegacyRequestInitializer(Uri requestUrl, HttpContextBase httpContext) - { - _requestUrl = requestUrl; - _httpContext = httpContext; - } - - public void InitializeRequest() - { - var uri = _requestUrl; - - // legacy - umbOriginalUrl used by default.aspx to rewritepath so forms are happy - // legacy - umbOriginalUrl used by presentation/umbraco/urlRewriter/UrlRewriterFormWriter which handles
- @@ -1347,7 +1346,6 @@ - CheckForUpgrade.asmx diff --git a/src/Umbraco.Web/UmbracoModule.cs b/src/Umbraco.Web/UmbracoModule.cs index bc252dda70..1eff1f2000 100644 --- a/src/Umbraco.Web/UmbracoModule.cs +++ b/src/Umbraco.Web/UmbracoModule.cs @@ -98,11 +98,6 @@ namespace Umbraco.Web // ok, process - // create the LegacyRequestInitializer - // and initialize legacy stuff - var legacyRequestInitializer = new LegacyRequestInitializer(httpContext.Request.Url, httpContext); - legacyRequestInitializer.InitializeRequest(); - // create the UmbracoContext singleton, one per request, and assign // replace existing if any (eg during app startup, a temp one is created) UmbracoContext.EnsureContext( diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/urlRewriter/UrlRewriterFormWriter.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/urlRewriter/UrlRewriterFormWriter.cs deleted file mode 100644 index 9e1845db6c..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/urlRewriter/UrlRewriterFormWriter.cs +++ /dev/null @@ -1,69 +0,0 @@ -using System; -using System.Data; -using System.Configuration; -using System.Web; -using System.Web.Security; -using System.Web.UI; -using System.Web.UI.WebControls; -using System.Web.UI.WebControls.WebParts; -using System.Web.UI.HtmlControls; - -namespace umbraco.presentation.urlRewriter -{ - - //TODO: Do we need these????????? - - - public class FormRewriterControlAdapter : System.Web.UI.Adapters.ControlAdapter - { - protected override void Render(HtmlTextWriter writer) - { - base.Render(new UrlRewriterFormWriter(writer)); - } - } - - public class UrlRewriterFormWriter : HtmlTextWriter - { - - public UrlRewriterFormWriter(HtmlTextWriter writer) : base(writer) - { - base.InnerWriter = writer.InnerWriter; - - } - - public UrlRewriterFormWriter(System.IO.TextWriter writer) - : base(writer) - { - - base.InnerWriter = writer; - - } - public override void WriteAttribute(string name, string value, bool fEncode) - { - if (name == "action") - { - HttpContext Context; - Context = HttpContext.Current; - if (Context.Items["ActionAlreadyWritten"] == null) - { - string formAction = ""; - if (Context.Items["VirtualUrl"] != null && !String.IsNullOrEmpty(Context.Items["VirtualUrl"].ToString())) - { - formAction = Context.Items["VirtualUrl"].ToString(); - } - else - { - formAction = Context.Items["umbOriginalUrl"].ToString(); - if (!String.IsNullOrEmpty(Context.Request.Url.Query)) - { - formAction += Context.Request.Url.Query; - } - } - value = formAction; - Context.Items["ActionAlreadyWritten"] = true; - } - } - base.WriteAttribute(name, value, fEncode); - } - } -}