r7: remove asc dll

This commit is contained in:
Sergey Linnik 2019-02-13 14:47:32 +03:00
parent 3349a2f44b
commit cae8f140d4
16 changed files with 8 additions and 62 deletions

View File

@ -1,53 +1,8 @@
using System;
using System.Web;
using System.Net;
using System.Threading;
using System.IO;
using System.Configuration;
using ASC.Core;
using ASC.Core.Tenants;
using ASC.Data.Storage;
using log4net;
using log4net.Config;
using TeamLab;
public class Global : HttpApplication
{
public Global()
{
}
void Application_Start(object sender, EventArgs e)
{
XmlConfigurator.Configure();
}
void Application_End(object sender, EventArgs e)
{
}
void Application_Error(object sender, EventArgs e)
{
}
public override string GetVaryByCustomString(HttpContext context, string custom)
{
if (custom == "ResourceBundleControl")
{
return SecureHelper.IsSecure().ToString();
}
return base.GetVaryByCustomString(context, custom);
}
void Session_Start(object sender, EventArgs e)
{
}
void Session_End(object sender, EventArgs e)
{
}
protected void Application_BeginRequest(object sender, EventArgs e)
{
}

View File

@ -1,4 +1,4 @@
<%@ Control Language="C#" AutoEventWireup="true" Inherits="ASC.Web.Core.Client.Bundling.ResourceBundleControl" %>
<%@ Control Language="C#" AutoEventWireup="true" %>
<link rel="icon" href="<%=VirtualPathUtility.ToAbsolute("~/images/favicon.ico")%>" type="image/x-icon" />
<link href="<%=VirtualPathUtility.ToAbsolute("~/css/reset.css")%>" rel="stylesheet" type="text/css" />

View File

@ -1,2 +1,2 @@
<%@ Control Language="C#" AutoEventWireup="true" Inherits="ASC.Web.Core.Client.Bundling.ResourceBundleControl" %>
<%@ Control Language="C#" AutoEventWireup="true" %>
<link href="<%=VirtualPathUtility.ToAbsolute("~/css/lang/ru.less")%>" rel="stylesheet" type="text/css" />

View File

@ -1,2 +1,2 @@
<%@ Control Language="C#" AutoEventWireup="true" Inherits="ASC.Web.Core.Client.Bundling.ResourceBundleControl" %>
<%@ Control Language="C#" AutoEventWireup="true" %>
<script type="text/javascript" src="<%=VirtualPathUtility.ToAbsolute("~/js/lng/lng.ru.js")%>"></script>

View File

@ -1,2 +1,2 @@
<%@ Control Language="C#" AutoEventWireup="true" Inherits="ASC.Web.Core.Client.Bundling.ResourceBundleControl" %>
<%@ Control Language="C#" AutoEventWireup="true" %>
<script type="text/javascript" src="<%=VirtualPathUtility.ToAbsolute("~/js/scripts.js")%>"></script>

View File

@ -1,4 +1,4 @@
<%@ Control Language="C#" AutoEventWireup="true" Inherits="ASC.Web.Core.Client.Bundling.ResourceBundleControl" %>
<%@ Control Language="C#" AutoEventWireup="true" %>
<%--<script type="text/javascript" src="<%=VirtualPathUtility.ToAbsolute("~/js/jquery/jquery.min.js")%>"></script>
<script type="text/javascript" src="<%=VirtualPathUtility.ToAbsolute("~/js/jquery/jquery-migrate.min.js")%>"></script>

View File

@ -2,9 +2,7 @@
<%@ Register Src="~/Controls/Common/BaseHeader/BaseHeader.ascx" TagName="Header" TagPrefix="uc" %>
<%@ Import Namespace="ASC.Data.Storage" %>
<%@ Register Namespace="TeamLab.Controls" Assembly="__Code" TagPrefix="cc" %>
<%@ Register TagPrefix="client" Namespace="ASC.Web.Core.Client.PageExtensions" Assembly="ASC.Web.Core" %>
<%@ Register TagPrefix="master" TagName="BaseMasterCss" Src="~/Controls/Common/BaseMaster/BaseMasterCss.ascx" %>
<%@ Register TagPrefix="master" TagName="BaseMasterJSBody" Src="~/Controls/Common/BaseMaster/BaseMasterJSBody.ascx" %>
@ -35,7 +33,7 @@
availibleLanguage.Key) + Environment.NewLine);
sb.AppendLine(string.Format(@"<link rel=""alternate"" href=""{0}"" hreflang=""{1}"" />",
availibleLanguage.Key.HtmlEncode(),
HttpUtility.HtmlEncode(availibleLanguage.Key),
availibleLanguage.Value.Name));
}
@ -63,7 +61,7 @@
<head runat="server">
<title></title>
<meta charset="utf-8" />
<link rel="icon" href="<%=WebPath.GetPath("/images/favicon.ico") %>" type="image/x-icon" />
<link rel="icon" href="/images/favicon.ico" type="image/x-icon" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />

View File

@ -63,16 +63,13 @@
<add assembly="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
<add assembly="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
<add assembly="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
<add assembly="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a"/>
<add assembly="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a"/>
</assemblies>
</compilation>
<pages pageBaseType="BasePage" controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID"/>
<httpHandlers>
<add verb="*" path="*.less" type="dotless.Core.LessCssHttpHandler, dotless.Core" validate="false" />
</httpHandlers>
<httpModules>
<add name="HttpContextDispose" type="ASC.Common.Web.DisposableHttpContextHttpModule, ASC.Common"/>
</httpModules>
</system.web>
<system.webServer>
<validation validateIntegratedModeConfiguration="false"/>
@ -242,10 +239,6 @@
<remove statusCode="500" subStatusCode="-1"/>
<error statusCode="500" prefixLanguageFilePath="" path="500.htm" responseMode="File"/>
</httpErrors>
<modules>
<remove name="HttpContextDispose"/>
<add name="HttpContextDispose" type="ASC.Common.Web.DisposableHttpContextHttpModule, ASC.Common"/>
</modules>
<handlers>
<remove name="UrlRoutingHandler"/>
<remove name="AjaxPoster"/>