release/v5.2.0

Thx

.gitignore

@@ -4,8 +4,9 @@
 *.user
 /build/deploy
 /build/*.log
-/web/documentserver-example/csharp-mvc/packages
 /web/documentserver-example/nodejs/node_modules
 /web/documentserver-example/nodejs/public/files
 /web/documentserver-example/nodejs/config/local.json
-**/.idea
+**/.vscode/
+**/.idea
+/web/documentserver-example/java/target/

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 ONLYOFFICE
+Copyright (c) 2018 ONLYOFFICE
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -0,0 +1,4 @@
+.PHONY: all
+
+all:
+	cd web/documentserver-example/nodejs && npm install

Readme.md

@@ -1,9 +1,17 @@
 
-[![License](https://img.shields.io/badge/License-MIT-green.svg?style=flat)](http://www.gnu.org/licenses/agpl-3.0.ru.html) ![Release](https://img.shields.io/badge/Release-v4.1.2-blue.svg?style=flat)
+[![License](https://img.shields.io/badge/License-MIT-green.svg?style=flat)](https://opensource.org/licenses/MIT) ![Release](https://img.shields.io/badge/Release-v4.1.2-blue.svg?style=flat)
 
 ## Document Server integration example
 
-These examples show the way to integrate [ONLYOFFICE Document Server][2] into your own website or application using one of the programming languages. The package contains examples written in .Net (C# MVC), .Net (C#), Java, Node.js, PHP and Ruby. 
+These examples show the way to integrate [ONLYOFFICE Document Server][2] into your own website or application using one of the programming languages. The package contains examples written in .Net (C# MVC), .Net (C#), Java, Node.js, PHP and Ruby.
+
+You should change `http://documentserver` to your server address in these files:
+* .Net (C# MVC) - `web/documentserver-example/csharp-mvc/web.appsettings.config`
+* .Net (C#) - `web/documentserver-example/csharp/settings.config`
+* Java - `web/documentserver-example/java/src/main/resources/settings.properties`
+* Node.js - `web/documentserver-example/nodejs/config/default.json`
+* PHP - `web/documentserver-example/php/config.php`
+* Ruby - `web/documentserver-example/ruby/config/application.rb`
 
 More information on how to use these examples can be found here: [http://api.onlyoffice.com/editors/demopreview](http://api.onlyoffice.com/editors/demopreview "http://api.onlyoffice.com/editors/demopreview")
 

build/msbuild/build.proj

@@ -1,13 +1,13 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <UsingTask AssemblyFile="App_Data\MSBuild.Community.Tasks.dll" TaskName="MSBuild.Community.Tasks.Zip" />
-  
+
   <PropertyGroup>
     <To Condition=" '$(To)' == '' ">..\deploy\</To>
 
     <RootDir Condition="$(RootDir)==''">..\..\</RootDir>
-	<DirCSharp>$(RootDir)web\documentserver-example\csharp\</DirCSharp>
-	<DirMvc>$(RootDir)web\documentserver-example\csharp-mvc\</DirMvc>
+    <DirCSharp>$(RootDir)web\documentserver-example\csharp\</DirCSharp>
+    <DirMvc>$(RootDir)web\documentserver-example\csharp-mvc\</DirMvc>
   </PropertyGroup>
 
   <ItemGroup>

build/msbuild/zip.proj

@@ -1,47 +1,61 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <UsingTask AssemblyFile="MSBuild.Community.Tasks.dll" TaskName="MSBuild.Community.Tasks.Zip" />
-  
+
   <PropertyGroup>
     <To Condition=" '$(To)' == '' ">..\deploy\</To>
     <RootDir Condition="$(RootDir)==''">..\..\</RootDir>
-	<DirCSharp>$(RootDir)web\documentserver-example\csharp\</DirCSharp>
-	<DirMvc>$(RootDir)web\documentserver-example\csharp-mvc\</DirMvc>
-	<DirJava>$(RootDir)web\documentserver-example\java\</DirJava>
-	<DirNodeJS>$(RootDir)web\documentserver-example\nodejs\</DirNodeJS>
-	<DirPHP>$(RootDir)web\documentserver-example\php\</DirPHP>
-	<DirRuby>$(RootDir)web\documentserver-example\ruby\</DirRuby>
+    <NameCSharp>$(To).Net (C#) Example</NameCSharp>
+    <DirCSharp>$(RootDir)web\documentserver-example\csharp\</DirCSharp>
+    <NameMvc>$(To).Net (C# MVC) Example</NameMvc>
+    <DirMvc>$(RootDir)web\documentserver-example\csharp-mvc\</DirMvc>
+    <NameJava>$(To)Java Example</NameJava>
+    <DirJava>$(RootDir)web\documentserver-example\java\</DirJava>
+    <NameNodeJS>$(To)Node.js Example</NameNodeJS>
+    <DirNodeJS>$(RootDir)web\documentserver-example\nodejs\</DirNodeJS>
+    <NamePHP>$(To)PHP Example</NamePHP>
+    <DirPHP>$(RootDir)web\documentserver-example\php\</DirPHP>
+    <NameRuby>$(To)Ruby Example</NameRuby>
+    <DirRuby>$(RootDir)web\documentserver-example\ruby\</DirRuby>
   </PropertyGroup>
 
   <Target Name="Build">
-    <ItemGroup>
-      <ZipFilesCSharp Include="$(DirCSharp)**" Exclude="$(DirCSharp)App_Data\*.dll;$(DirCSharp)obj\**;" />
-    </ItemGroup>
-    <Zip Files="@(ZipFilesCSharp)" WorkingDirectory="$(DirCSharp)" ZipFileName="$(To).Net (C#) Example.zip" />
+    <RemoveDir Directories="$(To)" ContinueOnError="true" />
 
     <ItemGroup>
-      <ZipFilesMVC Include="$(DirMvc)**" Exclude="$(DirMvc)obj\**;$(DirMvc)packages\**;" />
+      <ZipFilesCSharp Include="$(DirCSharp)**" Exclude="$(DirCSharp)obj\**" />
     </ItemGroup>
-    <Zip Files="@(ZipFilesMVC)" WorkingDirectory="$(DirMvc)" ZipFileName="$(To).Net (C# MVC) Example.zip" />
+    <Copy SourceFiles="@(ZipFilesCSharp)" DestinationFiles="@(ZipFilesCSharp->'$(NameCSharp)\%(RecursiveDir)%(Filename)%(Extension)')" />
+    <Zip Files="$(NameCSharp)" WorkingDirectory="$(To)" ZipFileName="$(NameCSharp).zip" />
+
+    <ItemGroup>
+      <ZipFilesMVC Include="$(DirMvc)**" Exclude="$(DirMvc)obj\**" />
+    </ItemGroup>
+    <Copy SourceFiles="@(ZipFilesMVC)" DestinationFiles="@(ZipFilesMVC->'$(NameMvc)\%(RecursiveDir)%(Filename)%(Extension)')" />
+    <Zip Files="$(NameMvc)" WorkingDirectory="$(To)" ZipFileName="$(NameMvc).zip" />
 
     <ItemGroup>
       <ZipFilesJava Include="$(DirJava)**" />
     </ItemGroup>
-    <Zip Files="@(ZipFilesJava)" WorkingDirectory="$(DirJava)" ZipFileName="$(To)Java Example.zip" />
+    <Copy SourceFiles="@(ZipFilesJava)" DestinationFiles="@(ZipFilesJava->'$(NameJava)\%(RecursiveDir)%(Filename)%(Extension)')" />
+    <Zip Files="$(NameJava)" WorkingDirectory="$(To)" ZipFileName="$(NameJava).zip" />
 
     <ItemGroup>
-      <ZipFilesNodeJS Include="$(DirNodeJS)**" Exclude="$(DirNodeJS)node_modules\**;$(DirNodeJS)run.bat" />
+      <ZipFilesNodeJS Include="$(DirNodeJS)**" Exclude="$(DirNodeJS)node_modules\**" />
     </ItemGroup>
-    <Zip Files="@(ZipFilesNodeJS)" WorkingDirectory="$(DirNodeJS)" ZipFileName="$(To)Node.js Example.zip" />
+    <Copy SourceFiles="@(ZipFilesNodeJS)" DestinationFiles="@(ZipFilesNodeJS->'$(NameNodeJS)\%(RecursiveDir)%(Filename)%(Extension)')" />
+    <Zip Files="$(NameNodeJS)" WorkingDirectory="$(To)" ZipFileName="$(NameNodeJS).zip" />
 
     <ItemGroup>
       <ZipFilesPHP Include="$(DirPHP)**" />
     </ItemGroup>
-    <Zip Files="@(ZipFilesPHP)" WorkingDirectory="$(DirPHP)" ZipFileName="$(To)PHP Example.zip" />
+    <Copy SourceFiles="@(ZipFilesPHP)" DestinationFiles="@(ZipFilesPHP->'$(NamePHP)\%(RecursiveDir)%(Filename)%(Extension)')" />
+    <Zip Files="$(NamePHP)" WorkingDirectory="$(To)" ZipFileName="$(NamePHP).zip" />
 
     <ItemGroup>
       <ZipFilesRuby Include="$(DirRuby)**" />
     </ItemGroup>
-    <Zip Files="@(ZipFilesRuby)" WorkingDirectory="$(DirRuby)" ZipFileName="$(To)Ruby Example.zip" />
+    <Copy SourceFiles="@(ZipFilesRuby)" DestinationFiles="@(ZipFilesRuby->'$(NameRuby)\%(RecursiveDir)%(Filename)%(Extension)')" />
+    <Zip Files="$(NameRuby)" WorkingDirectory="$(To)" ZipFileName="$(NameRuby).zip" />
   </Target>
 
 </Project>

web/documentserver-example/csharp-mvc/.nuget/NuGet.Config

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <solution>
-    <add key="disableSourceControlIntegration" value="true" />
-  </solution>
-</configuration>

web/documentserver-example/csharp-mvc/.nuget/NuGet.targets

@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup>
-        <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
-
-        <!-- Enable the restore command to run before builds -->
-        <RestorePackages Condition="  '$(RestorePackages)' == '' ">false</RestorePackages>
-
-        <!-- Property that enables building a package from a project -->
-        <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
-
-        <!-- Determines if package restore consent is required to restore packages -->
-        <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
-
-        <!-- Download NuGet.exe if it does not already exist -->
-        <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
-    </PropertyGroup>
-
-    <ItemGroup Condition=" '$(PackageSources)' == '' ">
-        <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
-        <!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
-        <!--
-            <PackageSource Include="https://www.nuget.org/api/v2/" />
-            <PackageSource Include="https://my-nuget-source/nuget/" />
-        -->
-    </ItemGroup>
-
-    <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
-        <!-- Windows specific commands -->
-        <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
-    </PropertyGroup>
-
-    <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
-        <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
-        <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <PackagesProjectConfig Condition=" '$(OS)' == 'Windows_NT'">$(MSBuildProjectDirectory)\packages.$(MSBuildProjectName.Replace(' ', '_')).config</PackagesProjectConfig>
-        <PackagesProjectConfig Condition=" '$(OS)' != 'Windows_NT'">$(MSBuildProjectDirectory)\packages.$(MSBuildProjectName).config</PackagesProjectConfig>
-    </PropertyGroup>
-
-    <PropertyGroup>
-      <PackagesConfig Condition="Exists('$(MSBuildProjectDirectory)\packages.config')">$(MSBuildProjectDirectory)\packages.config</PackagesConfig>
-      <PackagesConfig Condition="Exists('$(PackagesProjectConfig)')">$(PackagesProjectConfig)</PackagesConfig>
-    </PropertyGroup>
-    
-    <PropertyGroup>
-        <!-- NuGet command -->
-        <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
-        <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
-
-        <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
-        <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 "$(NuGetExePath)"</NuGetCommand>
-
-        <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
-
-        <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
-        <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
-
-        <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
-        <PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>
-
-        <!-- Commands -->
-        <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
-        <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
-
-        <!-- We need to ensure packages are restored prior to assembly resolve -->
-        <BuildDependsOn Condition="$(RestorePackages) == 'true'">
-            RestorePackages;
-            $(BuildDependsOn);
-        </BuildDependsOn>
-
-        <!-- Make the build depend on restore packages -->
-        <BuildDependsOn Condition="$(BuildPackage) == 'true'">
-            $(BuildDependsOn);
-            BuildPackage;
-        </BuildDependsOn>
-    </PropertyGroup>
-
-    <Target Name="CheckPrerequisites">
-        <!-- Raise an error if we're unable to locate nuget.exe  -->
-        <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
-        <!--
-        Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
-        This effectively acts as a lock that makes sure that the download operation will only happen once and all
-        parallel builds will have to wait for it to complete.
-        -->
-        <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
-    </Target>
-
-    <Target Name="_DownloadNuGet">
-        <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
-    </Target>
-
-    <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">        
-        <Exec Command="$(RestoreCommand)"
-              Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
-
-        <Exec Command="$(RestoreCommand)"
-              LogStandardErrorAsError="true"
-              Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
-    </Target>
-
-    <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
-        <Exec Command="$(BuildCommand)"
-              Condition=" '$(OS)' != 'Windows_NT' " />
-
-        <Exec Command="$(BuildCommand)"
-              LogStandardErrorAsError="true"
-              Condition=" '$(OS)' == 'Windows_NT' " />
-    </Target>
-
-    <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
-        <ParameterGroup>
-            <OutputFilename ParameterType="System.String" Required="true" />
-        </ParameterGroup>
-        <Task>
-            <Reference Include="System.Core" />
-            <Using Namespace="System" />
-            <Using Namespace="System.IO" />
-            <Using Namespace="System.Net" />
-            <Using Namespace="Microsoft.Build.Framework" />
-            <Using Namespace="Microsoft.Build.Utilities" />
-            <Code Type="Fragment" Language="cs">
-                <![CDATA[
-                try {
-                    OutputFilename = Path.GetFullPath(OutputFilename);
-
-                    Log.LogMessage("Downloading latest version of NuGet.exe...");
-                    WebClient webClient = new WebClient();
-                    webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
-
-                    return true;
-                }
-                catch (Exception ex) {
-                    Log.LogErrorFromException(ex);
-                    return false;
-                }
-            ]]>
-            </Code>
-        </Task>
-    </UsingTask>
-</Project>

web/documentserver-example/csharp-mvc/App_Start/BundleConfig.cs

@@ -1,25 +1,26 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 

web/documentserver-example/csharp-mvc/App_Start/FilterConfig.cs

@@ -1,25 +1,26 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 

web/documentserver-example/csharp-mvc/App_Start/RouteConfig.cs

@@ -1,25 +1,26 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 

web/documentserver-example/csharp-mvc/App_Start/WebApiConfig.cs

@@ -1,25 +1,26 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 

web/documentserver-example/csharp-mvc/Content/editor.css

@@ -1,25 +1,26 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 

web/documentserver-example/csharp-mvc/Content/stylesheet.css

@@ -1,25 +1,26 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 

web/documentserver-example/csharp-mvc/Controllers/HomeController.cs

@@ -1,25 +1,26 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 

web/documentserver-example/csharp-mvc/Global.asax.cs

@@ -1,25 +1,26 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 

web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs

@@ -1,25 +1,26 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 
@@ -129,8 +130,8 @@ namespace OnlineEditorsExampleMVC.Helpers
                     + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
                     + "webeditor.ashx",
                 Query = "type=track"
-                        + "&userAddress=" + HttpUtility.UrlEncode(HttpContext.Current.Request.UserHostAddress)
                         + "&fileName=" + HttpUtility.UrlEncode(fileName)
+                        + "&userAddress=" + HttpUtility.UrlEncode(HttpContext.Current.Request.UserHostAddress)
             };
             return callbackUrl.ToString();
         }

web/documentserver-example/csharp-mvc/Helpers/DocumentConverter.cs

@@ -1,36 +1,36 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 
 using System;
 using System.IO;
 using System.Net;
+using System.Text;
 using System.Text.RegularExpressions;
-using System.Web;
 using System.Web.Configuration;
-using System.Xml;
-using System.Xml.Linq;
+using System.Web.Helpers;
 
 namespace OnlineEditorsExampleMVC.Helpers
 {
@@ -45,7 +45,6 @@ namespace OnlineEditorsExampleMVC.Helpers
         static ServiceConverter()
         {
             DocumentConverterUrl = WebConfigurationManager.AppSettings["files.docservice.url.converter"] ?? "";
-            DocumentStorageUrl = WebConfigurationManager.AppSettings["files.docservice.url.storage"] ?? "";
 
             Int32.TryParse(WebConfigurationManager.AppSettings["files.docservice.timeout"], out ConvertTimeout);
             ConvertTimeout = ConvertTimeout > 0 ? ConvertTimeout : 120000;
@@ -63,21 +62,6 @@ namespace OnlineEditorsExampleMVC.Helpers
         /// </summary>
         private static readonly string DocumentConverterUrl;
 
-        /// <summary>
-        /// Url to the service of storage
-        /// </summary>
-        private static readonly string DocumentStorageUrl;
-
-        /// <summary>
-        /// The parameters for the query conversion
-        /// </summary>
-        private const string ConvertParams = "?url={0}&outputtype={1}&filetype={2}&title={3}&key={4}";
-
-        /// <summary>
-        /// Number of tries request conversion
-        /// </summary>
-        private const int MaxTry = 3;
-
         #endregion
 
         #region public method
@@ -106,74 +90,51 @@ namespace OnlineEditorsExampleMVC.Helpers
                                           out string convertedDocumentUri)
         {
             convertedDocumentUri = string.Empty;
-            var responceFromConvertService =
-                SendRequestToConvertService(documentUri, fromExtension, toExtension, documentRevisionId, isAsync)
-                    .Root;
 
-            var errorElement = responceFromConvertService.Element("Error");
-            if (errorElement != null)
-                ProcessConvertServiceResponceError(Convert.ToInt32(errorElement.Value));
+            fromExtension = string.IsNullOrEmpty(fromExtension) ? Path.GetExtension(documentUri) : fromExtension;
 
-            var isEndConvert = Convert.ToBoolean(responceFromConvertService.Element("EndConvert").Value);
-            var percent = Convert.ToInt32(responceFromConvertService.Element("Percent").Value);
+            var title = Path.GetFileName(documentUri);
+            title = string.IsNullOrEmpty(title) ? Guid.NewGuid().ToString() : title;
 
-            if (isEndConvert)
-            {
-                convertedDocumentUri = responceFromConvertService.Element("FileUrl").Value;
-                percent = 100;
-            }
-            else
-            {
-                percent = percent >= 100 ? 99 : percent;
-            }
+            documentRevisionId = string.IsNullOrEmpty(documentRevisionId)
+                                     ? documentUri
+                                     : documentRevisionId;
+            documentRevisionId = GenerateRevisionId(documentRevisionId);
 
-            return percent;
-        }
-
-        /// <summary>
-        /// Placing the document in the storage service
-        /// </summary>
-        /// <param name="fileStream">Stream of document</param>
-        /// <param name="contentLength">Length of stream</param>
-        /// <param name="contentType">Mime type</param>
-        /// <param name="documentRevisionId">Key for caching on service, whose used in editor</param>
-        /// <returns>Uri to document in the storage</returns>
-        public static string GetExternalUri(
-            Stream fileStream,
-            long contentLength,
-            string contentType,
-            string documentRevisionId)
-        {
-            var urlDocumentService = DocumentStorageUrl + ConvertParams;
-            var urlTostorage = String.Format(urlDocumentService,
-                                             string.Empty,
-                                             string.Empty,
-                                             string.Empty,
-                                             string.Empty,
-                                             documentRevisionId);
-
-            var request = (HttpWebRequest)WebRequest.Create(urlTostorage);
+            var request = (HttpWebRequest)WebRequest.Create(DocumentConverterUrl);
             request.Method = "POST";
-            request.ContentType = contentType;
-            request.ContentLength = contentLength;
+            request.ContentType = "application/json";
+            request.Accept = "application/json";
+            request.Timeout = ConvertTimeout;
 
-            const int bufferSize = 2048;
-            var buffer = new byte[bufferSize];
-            int readed;
-            while ((readed = fileStream.Read(buffer, 0, bufferSize)) > 0)
+            var bodyString = string.Format("{{\"async\": {0},\"filetype\": \"{1}\",\"key\": \"{2}\",\"outputtype\": \"{3}\",\"title\": \"{4}\",\"url\": \"{5}\"}}",
+                                           isAsync.ToString().ToLower(),
+                                           fromExtension.Trim('.'),
+                                           documentRevisionId,
+                                           toExtension.Trim('.'),
+                                           title,
+                                           documentUri);
+
+            var bytes = Encoding.UTF8.GetBytes(bodyString);
+            request.ContentLength = bytes.Length;
+            using (var requestStream = request.GetRequestStream())
             {
-                request.GetRequestStream().Write(buffer, 0, readed);
+                requestStream.Write(bytes, 0, bytes.Length);
             }
 
+            string dataResponse;
             using (var response = request.GetResponse())
             using (var stream = response.GetResponseStream())
             {
-                if (stream == null) throw new WebException("Could not get an answer");
-                var xDocumentResponse = XDocument.Load(new XmlTextReader(stream));
-                string externalUri;
-                GetResponseUri(xDocumentResponse, out externalUri);
-                return externalUri;
+                if (stream == null) throw new Exception("Response is null");
+
+                using (var reader = new StreamReader(stream))
+                {
+                    dataResponse = reader.ReadToEnd();
+                }
             }
+
+            return GetResponseUri(dataResponse, out convertedDocumentUri);
         }
 
         /// <summary>
@@ -193,71 +154,44 @@ namespace OnlineEditorsExampleMVC.Helpers
         #region private method
 
         /// <summary>
-        /// Request for conversion to a service
+        /// Processing document received from the editing service
         /// </summary>
-        /// <param name="documentUri">Uri for the document to convert</param>
-        /// <param name="fromExtension">Document extension</param>
-        /// <param name="toExtension">Extension to which to convert</param>
-        /// <param name="documentRevisionId">Key for caching on service</param>
-        /// <param name="isAsync">Perform conversions asynchronously</param>
-        /// <returns>Xml document request result of conversion</returns>
-        private static XDocument SendRequestToConvertService(string documentUri, string fromExtension, string toExtension, string documentRevisionId, bool isAsync)
+        /// <param name="jsonDocumentResponse">The resulting json from editing service</param>
+        /// <param name="responseUri">Uri to the converted document</param>
+        /// <returns>The percentage of completion of conversion</returns>
+        private static int GetResponseUri(string jsonDocumentResponse, out string responseUri)
         {
-            fromExtension = string.IsNullOrEmpty(fromExtension) ? Path.GetExtension(documentUri) : fromExtension;
+            if (string.IsNullOrEmpty(jsonDocumentResponse)) throw new ArgumentException("Invalid param", "jsonDocumentResponse");
 
-            var title = Path.GetFileName(documentUri);
-            title = string.IsNullOrEmpty(title) ? Guid.NewGuid().ToString() : title;
+            var responseFromService = Json.Decode(jsonDocumentResponse);
+            if (jsonDocumentResponse == null) throw new WebException("Invalid answer format");
 
-            documentRevisionId = string.IsNullOrEmpty(documentRevisionId)
-                                     ? documentUri
-                                     : documentRevisionId;
-            documentRevisionId = GenerateRevisionId(documentRevisionId);
+            var errorElement = responseFromService.error;
+            if (errorElement != null) ProcessResponseError(Convert.ToInt32(errorElement));
 
-            var urlDocumentService = DocumentConverterUrl + ConvertParams;
-            var urlToConverter = String.Format(urlDocumentService,
-                                               HttpUtility.UrlEncode(documentUri),
-                                               toExtension.Trim('.'),
-                                               fromExtension.Trim('.'),
-                                               title,
-                                               documentRevisionId);
+            var isEndConvert = responseFromService.endConvert;
 
-            if (isAsync)
-                urlToConverter += "&async=true";
-
-            var req = (HttpWebRequest) WebRequest.Create(urlToConverter);
-            req.Timeout = ConvertTimeout;
-
-            Stream stream = null;
-            var countTry = 0;
-            while (countTry < MaxTry)
+            int resultPercent;
+            responseUri = string.Empty;
+            if (isEndConvert)
             {
-                try
-                {
-                    countTry++;
-                    stream = req.GetResponse().GetResponseStream();
-                    break;
-                }
-                catch (WebException ex)
-                {
-                    if (ex.Status != WebExceptionStatus.Timeout)
-                    {
-                        throw new HttpException((int) HttpStatusCode.BadRequest, "Bad Request", ex);
-                    }
-                }
+                responseUri = responseFromService.fileUrl;
+                resultPercent = 100;
             }
-            if (countTry == MaxTry)
+            else
             {
-                throw new WebException("Timeout", WebExceptionStatus.Timeout);
+                resultPercent = responseFromService.percent;
+                if (resultPercent >= 100) resultPercent = 99;
             }
 
-            return XDocument.Load(new XmlTextReader(stream));
+            return resultPercent;
         }
 
         /// <summary>
         /// Generate an error code table
         /// </summary>
         /// <param name="errorCode">Error code</param>
-        private static void ProcessConvertServiceResponceError(int errorCode)
+        private static void ProcessResponseError(int errorCode)
         {
             var errorMessage = string.Empty;
             const string errorMessageTemplate = "Error occurred in the ConvertService.ashx: {0}";
@@ -307,45 +241,6 @@ namespace OnlineEditorsExampleMVC.Helpers
             throw new Exception(errorMessage);
         }
 
-        /// <summary>
-        /// Processing document received from the editing service
-        /// </summary>
-        /// <param name="xDocumentResponse">The resulting xml from editing service</param>
-        /// <param name="responseUri">Uri to the converted document</param>
-        /// <returns>The percentage of completion of conversion</returns>
-        private static int GetResponseUri(XDocument xDocumentResponse, out string responseUri)
-        {
-            var responceFromConvertService = xDocumentResponse.Root;
-            if (responceFromConvertService == null) throw new WebException("Invalid answer format");
-
-            var errorElement = responceFromConvertService.Element("Error");
-            if (errorElement != null) ProcessConvertServiceResponceError(Convert.ToInt32(errorElement.Value));
-
-            var endConvert = responceFromConvertService.Element("EndConvert");
-            if (endConvert == null) throw new WebException("Invalid answer format");
-            var isEndConvert = Convert.ToBoolean(endConvert.Value);
-
-            var resultPercent = 0;
-            responseUri = string.Empty;
-            if (isEndConvert)
-            {
-                var fileUrl = responceFromConvertService.Element("FileUrl");
-                if (fileUrl == null) throw new WebException("Invalid answer format");
-
-                responseUri = fileUrl.Value;
-                resultPercent = 100;
-            }
-            else
-            {
-                var percent = responceFromConvertService.Element("Percent");
-                if (percent != null)
-                    resultPercent = Convert.ToInt32(percent.Value);
-                resultPercent = resultPercent >= 100 ? 99 : resultPercent;
-            }
-
-            return resultPercent;
-        }
-
         #endregion
     }
 }

web/documentserver-example/csharp-mvc/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 ONLYOFFICE
+Copyright (c) 2018 ONLYOFFICE
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

web/documentserver-example/csharp-mvc/Models/FileModel.cs

@@ -1,25 +1,26 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 

web/documentserver-example/csharp-mvc/Models/FileUtility.cs

@@ -1,25 +1,26 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 
@@ -50,22 +51,26 @@ namespace OnlineEditorsExampleMVC.Models
 
         public static readonly List<string> ExtsDocument = new List<string>
             {
-                ".docx", ".doc", ".odt", ".rtf", ".txt",
-                ".html", ".htm", ".mht", ".pdf", ".djvu",
-                ".fb2", ".epub", ".xps"
+                ".doc", ".docx", ".docm",
+                ".dot", ".dotx", ".dotm",
+                ".odt", ".fodt", ".ott", ".rtf", ".txt",
+                ".html", ".htm", ".mht",
+                ".pdf", ".djvu", ".fb2", ".epub", ".xps"
             };
 
         public static readonly List<string> ExtsSpreadsheet = new List<string>
             {
-                ".xls", ".xlsx",
-                ".ods", ".csv"
+                ".xls", ".xlsx", ".xlsm",
+                ".xlt", ".xltx", ".xltm",
+                ".ods", ".fods", ".ots", ".csv"
             };
 
         public static readonly List<string> ExtsPresentation = new List<string>
             {
-				".pps", ".ppsx",
-                ".ppt", ".pptx",
-                ".odp"
+                ".pps", ".ppsx", ".ppsm",
+                ".ppt", ".pptx", ".pptm",
+                ".pot", ".potx", ".potm",
+                ".odp", ".fodp", ".otp"
             };
     }
 }

web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj

@@ -20,8 +20,6 @@
     <IISExpressAnonymousAuthentication />
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">.\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -51,69 +49,80 @@
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Web.Abstractions" />
     <Reference Include="System.Web.Routing" />
-    <Reference Include="System.Xml" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Web.Services" />
     <Reference Include="System.EnterpriseServices" />
     <Reference Include="EntityFramework">
-      <HintPath>packages\EntityFramework.5.0.0\lib\net45\EntityFramework.dll</HintPath>
+      <Private>True</Private>
+      <HintPath>bin\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Web.Infrastructure">
       <Private>True</Private>
-      <HintPath>packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
+      <HintPath>bin\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Web.Mvc.FixedDisplayModes">
       <Private>True</Private>
-      <HintPath>packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.0\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll</HintPath>
+      <HintPath>bin\Microsoft.Web.Mvc.FixedDisplayModes.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json">
-      <HintPath>packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+      <HintPath>bin\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http">
     </Reference>
     <Reference Include="System.Net.Http.Formatting">
-      <HintPath>packages\Microsoft.AspNet.WebApi.Client.5.2.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+      <Private>True</Private>
+      <HintPath>bin\System.Net.Http.Formatting.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http.WebRequest">
     </Reference>
     <Reference Include="System.Web.Http">
-      <HintPath>packages\Microsoft.AspNet.WebApi.Core.5.2.0\lib\net45\System.Web.Http.dll</HintPath>
+      <Private>True</Private>
+      <HintPath>bin\System.Web.Http.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.Http.WebHost">
-      <HintPath>packages\Microsoft.AspNet.WebApi.WebHost.5.2.0\lib\net45\System.Web.Http.WebHost.dll</HintPath>
+      <Private>True</Private>
+      <HintPath>bin\System.Web.Http.WebHost.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.Mvc">
-      <HintPath>packages\Microsoft.AspNet.Mvc.5.2.0\lib\net45\System.Web.Mvc.dll</HintPath>
+      <Private>True</Private>
+      <HintPath>bin\System.Web.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.Optimization">
-      <HintPath>packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
+      <Private>True</Private>
+      <HintPath>bin\System.Web.Optimization.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.Providers">
-      <HintPath>packages\Microsoft.AspNet.Providers.Core.1.2\lib\net40\System.Web.Providers.dll</HintPath>
+      <Private>True</Private>
+      <HintPath>bin\System.Web.Providers.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.Razor">
-      <HintPath>packages\Microsoft.AspNet.Razor.3.2.0\lib\net45\System.Web.Razor.dll</HintPath>
+      <Private>True</Private>
+      <HintPath>bin\System.Web.Razor.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.Helpers">
-      <HintPath>packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.Helpers.dll</HintPath>
+      <Private>True</Private>
+      <HintPath>bin\System.Web.Helpers.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.WebPages">
-      <HintPath>packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.WebPages.dll</HintPath>
+      <Private>True</Private>
+      <HintPath>bin\System.Web.WebPages.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.WebPages.Deployment">
-      <HintPath>packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
+      <Private>True</Private>
+      <HintPath>bin\System.Web.WebPages.Deployment.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.WebPages.Razor">
-      <HintPath>packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
+      <Private>True</Private>
+      <HintPath>bin\System.Web.WebPages.Razor.dll</HintPath>
     </Reference>
     <Reference Include="WebGrease">
       <Private>True</Private>
-      <HintPath>packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath>
+      <HintPath>bin\WebGrease.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -170,8 +179,7 @@
     <Content Include="licenses\Microsoft.Web.Infrastructure.license" />
     <Content Include="licenses\Newtonsoft.Json.license" />
     <Content Include="licenses\WebGrease.license" />
-    <None Include="packages.config" />
-    <None Include="web.appsettings.config" />
+    <Content Include="web.appsettings.config" />
     <Content Include="WebEditor.ashx" />
   </ItemGroup>
   <ItemGroup>
@@ -205,13 +213,6 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

web/documentserver-example/csharp-mvc/Properties/AssemblyInfo.cs

@@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Ascensio System SIA")]
 [assembly: AssemblyProduct("OnlineEditorsExampleMVC")]
-[assembly: AssemblyCopyright("Ascensio System SIA 2016")]
+[assembly: AssemblyCopyright("Ascensio System SIA 2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

web/documentserver-example/csharp-mvc/ReadMe.txt

@@ -1,16 +1,14 @@
-For the ONLYOFFICE<EFBFBD> Applications example to work properly you need to do the following:
+For the ONLYOFFICE Applications example to work properly you need to do the following:
 
 1. Download and extract the Example.zip into a directory selected for it, for instance, C:\OnlyofficeExample
 
-2. Use the settings.config file to change the received authorization key for the document service. The file can be found in the unpacked root folder (C:\OnlyofficeExample\web.appsettings.config, in our example). The authorization key is specified in the files.docservice.key field.
+2. Run the IIS Manager (C:\Windows\system32\inetsrv\InetMgr.exe or Start -> All Programs -> Administrative Tools -> Internet Information Services (IIS) Manager for Windows Server 2003)
 
-3. Run the IIS Manager (C:\Windows\system32\inetsrv\InetMgr.exe or Start -> All Programs -> Administrative Tools -> Internet Information Services (IIS) Manager for Windows Server 2003)
+3. Add the unpacked Example to the list of sites with the physical path to the C:\OnlyofficeExample (or the one you selected) folder.
 
-4. Add the unpacked Example to the list of sites with the physical path to the C:\OnlyofficeExample (or the one you selected) folder.
+4. Make sure that the user account under which the IIS NetworkService process is executed has the write access rights for the C:\OnlyofficeExample\App_Data folder (this is significant for the IIS later than 6.0).
 
-5. Make sure that the user account under which the IIS NetworkService process is executed has the write access rights for the C:\OnlyofficeExample\App_Data folder (this is significant for the IIS later than 6.0).
-
-6. Make the created ONLYOFFICE<43> Applications example available through IP or domain name so that it could be connected from the web by the document service for proper document rendering.
+5. Make the created ONLYOFFIC<49> Applications example available through IP or domain name so that it could be connected from the web by the document service for proper document rendering.
 
 
 

web/documentserver-example/csharp-mvc/Scripts/jscript.js

@@ -1,25 +1,26 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 

web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx

@@ -1,29 +1,30 @@
 <!--*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 *-->
 
-<%@ Page Title="ONLYOFFICE™" Language="C#" Inherits="System.Web.Mvc.ViewPage<OnlineEditorsExampleMVC.Models.FileModel>" %>
+<%@ Page Title="ONLYOFFICE" Language="C#" Inherits="System.Web.Mvc.ViewPage<OnlineEditorsExampleMVC.Models.FileModel>" %>
 <%@ Import Namespace="System.IO" %>
 <%@ Import Namespace="System.Web.Configuration" %>
 <%@ Import Namespace="OnlineEditorsExampleMVC.Helpers" %>
@@ -36,7 +37,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width" />
     <link rel="icon" href="~/favicon.ico" type="image/x-icon" />
-    <title><%= Model.FileName + " - ONLYOFFICE™" %></title>
+    <title><%= Model.FileName + " - ONLYOFFICE" %></title>
     
     <%: Styles.Render("~/Content/editor") %>
 
@@ -78,6 +79,10 @@
                 innerAlert(event.data);
         };
 
+        var onOutdatedVersion = function (event) {
+            location.reload(true);
+        };
+
         var сonnectEditor = function () {
 
             docEditor = new DocsAPI.DocEditor("iframeEditor",
@@ -112,8 +117,7 @@
 
                         user: {
                             id: "<%= DocManagerHelper.CurUserHostAddress() %>",
-                            firstname: 'John',
-                            lastname: 'Smith',
+                            name: "John Smith",
                         },
 
                         embedded: {
@@ -136,32 +140,16 @@
                         'onDocumentStateChange': onDocumentStateChange,
                         'onRequestEditRights': onRequestEditRights,
                         'onError': onError,
+                        'onOutdatedVersion': onOutdatedVersion,
                     }
                 });
         };
 
-            if (window.addEventListener) {
-                window.addEventListener("load", сonnectEditor);
-            } else if (window.attachEvent) {
-                window.attachEvent("load", сonnectEditor);
-            }
-
-            function getXmlHttp() {
-                var xmlhttp;
-                try {
-                    xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
-                } catch (e) {
-                    try {
-                        xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
-                    } catch (ex) {
-                        xmlhttp = false;
-                    }
-                }
-                if (!xmlhttp && typeof XMLHttpRequest != 'undefined') {
-                    xmlhttp = new XMLHttpRequest();
-                }
-                return xmlhttp;
-            }
+        if (window.addEventListener) {
+            window.addEventListener("load", сonnectEditor);
+        } else if (window.attachEvent) {
+            window.attachEvent("load", сonnectEditor);
+        }
 
     </script>
 </body>

web/documentserver-example/csharp-mvc/Views/Home/Index.aspx

@@ -1,29 +1,30 @@
 <!--*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 *-->
 
-<%@ Page Title="ONLYOFFICE™" Language="C#" Inherits="System.Web.Mvc.ViewPage" %>
+<%@ Page Title="ONLYOFFICE" Language="C#" Inherits="System.Web.Mvc.ViewPage" %>
 
 <%@ Import Namespace="System.Web.Configuration" %>
 <%@ Import Namespace="OnlineEditorsExampleMVC.Helpers" %>
@@ -35,7 +36,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width" />
-    <title>ONLYOFFICE™</title>
+    <title>ONLYOFFICE</title>
 
     <link href="<%: Url.Content("~/favicon.ico") %>" rel="shortcut icon" type="image/x-icon" />
 
@@ -46,10 +47,10 @@
 <body>
     <div class="top-panel"></div>
     <div class="main-panel">
-        <span class="portal-name">ONLYOFFICE™ Online Editors</span>
+        <span class="portal-name">ONLYOFFICE Document Editors</span>
         <br />
         <br />
-        <span class="portal-descr">Get started with a demo-sample of ONLYOFFICE™ Online Editors, the first html5-based editors. You may upload your own documents for testing using the "Choose file" button and selecting the necessary files on your PC.</span>
+        <span class="portal-descr">Get started with a demo-sample of ONLYOFFICE Document Editors, the first html5-based editors. You may upload your own documents for testing using the "Choose file" button and selecting the necessary files on your PC.</span>
 
         <div class="file-upload button gray">
             <span>Choose file</span>

web/documentserver-example/csharp-mvc/Web.config

@@ -31,11 +31,11 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" />
-        <bindingRedirect oldVersion="1.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="1.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
+        <bindingRedirect oldVersion="1.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

web/documentserver-example/csharp-mvc/WebEditor.ashx.cs

@@ -1,25 +1,26 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 

web/documentserver-example/csharp-mvc/packages.config

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="EntityFramework" version="5.0.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Mvc" version="5.2.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Razor" version="3.2.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Providers.Core" version="1.2.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebPages" version="3.2.0" targetFramework="net45" />
-  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
-  <package id="WebGrease" version="1.5.2" targetFramework="net45" />
-</packages>

web/documentserver-example/csharp-mvc/web.appsettings.config

@@ -9,13 +9,12 @@
 
   <add key="filesize-max" value="5242880"/>
 
-  <add key="files.docservice.viewed-docs" value=".ppt|.pps|.odp|.pdf|.djvu|.epub|.xps"/>
-  <add key="files.docservice.edited-docs" value=".docx|.doc|.odt|.xlsx|.xls|.ods|.csv|.pptx|.ppsx|.rtf|.txt|.mht|.html|.htm"/>
-  <add key="files.docservice.convert-docs" value=".doc|.odt|.xls|.ods|.ppt|.pps|.odp|.rtf|.mht|.html|.htm|.epub"/>
+  <add key="files.docservice.viewed-docs" value=".pdf|.djvu|.xps"/>
+  <add key="files.docservice.edited-docs" value=".docx|.xlsx|.csv|.pptx|.ppsx|.txt"/>
+  <add key="files.docservice.convert-docs" value=".docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.epub"/>
   <add key="files.docservice.timeout" value="120000" />
 
-  <add key="files.docservice.url.storage" value="https://doc.onlyoffice.com/FileUploader.ashx"/>
-  <add key="files.docservice.url.converter" value="https://doc.onlyoffice.com/ConvertService.ashx"/>
-  <add key="files.docservice.url.api" value="https://doc.onlyoffice.com/web-apps/apps/api/documents/api.js"/>
-  <add key="files.docservice.url.preloader" value="https://doc.onlyoffice.com/web-apps/apps/api/documents/cache-scripts.html"/>
+  <add key="files.docservice.url.converter" value="https://documentserver/ConvertService.ashx"/>
+  <add key="files.docservice.url.api" value="https://documentserver/web-apps/apps/api/documents/api.js"/>
+  <add key="files.docservice.url.preloader" value="https://documentserver/web-apps/apps/api/documents/cache-scripts.html"/>
 </appSettings>

web/documentserver-example/csharp/App_Themes/stylesheet.css

@@ -1,25 +1,26 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 

web/documentserver-example/csharp/Default.aspx

@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="OnlineEditorsExample._Default" Title="ONLYOFFICE™" %>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="OnlineEditorsExample._Default" Title="ONLYOFFICE" %>
 
 <%@ Import Namespace="System.IO" %>
 <%@ Import Namespace="System.Linq" %>
@@ -9,7 +9,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>ONLYOFFICE™</title>
+    <title>ONLYOFFICE</title>
 
     <link rel="icon" href="~/favicon.ico" type="image/x-icon" />
 
@@ -43,10 +43,10 @@
 
         <div class="top-panel"></div>
         <div class="main-panel">
-            <span class="portal-name">ONLYOFFICE™ Online Editors</span>
+            <span class="portal-name">ONLYOFFICE Document Editors</span>
             <br />
             <br />
-            <span class="portal-descr">Get started with a demo-sample of ONLYOFFICE™ Online Editors, the first html5-based editors. You may upload your own documents for testing using the "Choose file" button and selecting the necessary files on your PC.</span>
+            <span class="portal-descr">Get started with a demo-sample of ONLYOFFICE Document Editors, the first html5-based editors. You may upload your own documents for testing using the "Choose file" button and selecting the necessary files on your PC.</span>
 
             <div class="file-upload button gray">
                 <span>Choose file</span>
@@ -99,7 +99,7 @@
                    if (examples.Any())
                    { %>
                 <br />
-                Download the code for the sample of ONLYOFFICE™ Online Editors to find out the details.
+                Download the code for the sample of ONLYOFFICE Document Editors to find out the details.
                 <br />
                 <br />
                 <% foreach (var example in examples)

web/documentserver-example/csharp/Default.aspx.cs

@@ -1,25 +1,26 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 
@@ -41,22 +42,26 @@ namespace OnlineEditorsExample
     {
         public static readonly List<string> ExtsSpreadsheet = new List<string>
             {
-                ".xls", ".xlsx",
-                ".ods", ".csv"
+                ".xls", ".xlsx", ".xlsm",
+                ".xlt", ".xltx", ".xltm",
+                ".ods", ".fods", ".ots", ".csv"
             };
 
         public static readonly List<string> ExtsPresentation = new List<string>
             {
-                ".pps", ".ppsx",
-                ".ppt", ".pptx",
-                ".odp"
+                ".pps", ".ppsx", ".ppsm",
+                ".ppt", ".pptx", ".pptm",
+                ".pot", ".potx", ".potm",
+                ".odp", ".fodp", ".otp"
             };
 
         public static readonly List<string> ExtsDocument = new List<string>
             {
-                ".docx", ".doc", ".odt", ".rtf", ".txt",
-                ".html", ".htm", ".mht", ".pdf", ".djvu",
-                ".fb2", ".epub", ".xps"
+                ".doc", ".docx", ".docm",
+                ".dot", ".dotx", ".dotm",
+                ".odt", ".fodt", ".ott", ".rtf", ".txt",
+                ".html", ".htm", ".mht",
+                ".pdf", ".djvu", ".fb2", ".epub", ".xps"
             };
 
         public static string GetInternalExtension(string extension)

web/documentserver-example/csharp/DocEditor.aspx

@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DocEditor.aspx.cs" Inherits="OnlineEditorsExample.DocEditor" Title="ONLYOFFICE™" %>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DocEditor.aspx.cs" Inherits="OnlineEditorsExample.DocEditor" Title="ONLYOFFICE" %>
 
 <%@ Import Namespace="System.IO" %>
 <%@ Import Namespace="OnlineEditorsExample" %>
@@ -9,7 +9,7 @@
 <head runat="server">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <link rel="icon" href="~/favicon.ico" type="image/x-icon" />
-    <title>ONLYOFFICE™</title>
+    <title>ONLYOFFICE</title>
 
     <style>
         html {
@@ -71,6 +71,10 @@
                 innerAlert(event.data);
         };
 
+        var onOutdatedVersion = function (event) {
+            location.reload(true);
+        };
+
         var сonnectEditor = function () {
 
             docEditor = new DocsAPI.DocEditor("iframeEditor",
@@ -105,8 +109,7 @@
 
                         user: {
                             id: "<%= _Default.CurUserHostAddress(null) %>",
-                            firstname: "John",
-                            lastname: "Smith",
+                            name: "John Smith",
                         },
 
                         embedded: {
@@ -128,7 +131,8 @@
                         'onReady': onReady,
                         'onDocumentStateChange': onDocumentStateChange,
                         'onRequestEditRights': onRequestEditRights,
-                        'onError': onError
+                        'onError': onError,
+                        'onOutdatedVersion': onOutdatedVersion,
                     }
                 });
         };
@@ -139,35 +143,6 @@
             window.attachEvent("load", сonnectEditor);
         }
 
-        function getXmlHttp() {
-            var xmlhttp;
-            try {
-                xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
-            } catch (e) {
-                try {
-                    xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
-                } catch (ex) {
-                    xmlhttp = false;
-                }
-            }
-            if (!xmlhttp && typeof XMLHttpRequest != 'undefined') {
-                xmlhttp = new XMLHttpRequest();
-            }
-            return xmlhttp;
-        }
-
-        function SaveFileRequest(fileName, fileType, fileUri) {
-            var req = getXmlHttp();
-            var requestAddress = "webeditor.ashx"
-                + "?type=save"
-                + "&filename=" + encodeURIComponent(fileName)
-                + "&filetype=" + encodeURIComponent(fileType)
-                + "&fileuri=" + encodeURIComponent(fileUri);
-            req.open('get', requestAddress, true);
-
-            req.send(fileUri);
-        }
-
     </script>
 </head>
 <body>

web/documentserver-example/csharp/DocEditor.aspx.cs

@@ -1,25 +1,26 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 
@@ -61,8 +62,8 @@ namespace OnlineEditorsExample
                     + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
                     + "webeditor.ashx";
                 callbackUrl.Query = "type=track"
-                                    + "&userAddress=" + HttpUtility.UrlEncode(HttpContext.Current.Request.UserHostAddress)
-                                    + "&fileName=" + HttpUtility.UrlEncode(FileName);
+                                    + "&fileName=" + HttpUtility.UrlEncode(FileName)
+                                    + "&userAddress=" + HttpUtility.UrlEncode(HttpContext.Current.Request.UserHostAddress);
                 return callbackUrl.ToString();
             }
         }

web/documentserver-example/csharp/DocumentConverter.cs

@@ -1,37 +1,37 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 
-using OnlineEditorsExample;
 using System;
 using System.IO;
 using System.Net;
+using System.Text;
 using System.Text.RegularExpressions;
-using System.Web;
 using System.Web.Configuration;
-using System.Xml;
-using System.Xml.Linq;
+using System.Web.Helpers;
+using OnlineEditorsExample;
 
 namespace ASC.Api.DocumentConverter
 {
@@ -46,7 +46,6 @@ namespace ASC.Api.DocumentConverter
         static ServiceConverter()
         {
             DocumentConverterUrl = WebConfigurationManager.AppSettings["files.docservice.url.converter"] ?? "";
-            DocumentStorageUrl = WebConfigurationManager.AppSettings["files.docservice.url.storage"] ?? "";
 
             Int32.TryParse(WebConfigurationManager.AppSettings["files.docservice.timeout"], out ConvertTimeout);
             ConvertTimeout = ConvertTimeout > 0 ? ConvertTimeout : 120000;
@@ -64,21 +63,6 @@ namespace ASC.Api.DocumentConverter
         /// </summary>
         private static readonly string DocumentConverterUrl;
 
-        /// <summary>
-        /// Url to the service of storage
-        /// </summary>
-        private static readonly string DocumentStorageUrl;
-
-        /// <summary>
-        /// The parameters for the query conversion
-        /// </summary>
-        private const string ConvertParams = "?url={0}&outputtype={1}&filetype={2}&title={3}&key={4}";
-
-        /// <summary>
-        /// Number of tries request conversion
-        /// </summary>
-        private const int MaxTry = 3;
-
         #endregion
 
         #region public method
@@ -107,63 +91,36 @@ namespace ASC.Api.DocumentConverter
                                           out string convertedDocumentUri)
         {
             convertedDocumentUri = string.Empty;
-            var responceFromConvertService =
-                SendRequestToConvertService(documentUri, fromExtension, toExtension, documentRevisionId, isAsync)
-                    .Root;
 
-            var errorElement = responceFromConvertService.Element("Error");
-            if (errorElement != null)
-                ProcessConvertServiceResponceError(Convert.ToInt32(errorElement.Value));
+            fromExtension = string.IsNullOrEmpty(fromExtension) ? Path.GetExtension(documentUri) : fromExtension;
 
-            var isEndConvert = Convert.ToBoolean(responceFromConvertService.Element("EndConvert").Value);
-            var percent = Convert.ToInt32(responceFromConvertService.Element("Percent").Value);
+            var title = Path.GetFileName(documentUri);
+            title = string.IsNullOrEmpty(title) ? Guid.NewGuid().ToString() : title;
 
-            if (isEndConvert)
-            {
-                convertedDocumentUri = responceFromConvertService.Element("FileUrl").Value;
-                percent = 100;
-            }
-            else
-            {
-                percent = percent >= 100 ? 99 : percent;
-            }
+            documentRevisionId = string.IsNullOrEmpty(documentRevisionId)
+                                     ? documentUri
+                                     : documentRevisionId;
+            documentRevisionId = GenerateRevisionId(documentRevisionId);
 
-            return percent;
-        }
-
-        /// <summary>
-        /// Placing the document in the storage service
-        /// </summary>
-        /// <param name="fileStream">Stream of document</param>
-        /// <param name="contentLength">Length of stream</param>
-        /// <param name="contentType">Mime type</param>
-        /// <param name="documentRevisionId">Key for caching on service, whose used in editor</param>
-        /// <returns>Uri to document in the storage</returns>
-        public static string GetExternalUri(
-            Stream fileStream,
-            long contentLength,
-            string contentType,
-            string documentRevisionId)
-        {
-            var urlDocumentService = DocumentStorageUrl + ConvertParams;
-            var urlTostorage = String.Format(urlDocumentService,
-                                             string.Empty,
-                                             string.Empty,
-                                             string.Empty,
-                                             string.Empty,
-                                             documentRevisionId);
-
-            var request = (HttpWebRequest)WebRequest.Create(urlTostorage);
+            var request = (HttpWebRequest)WebRequest.Create(DocumentConverterUrl);
             request.Method = "POST";
-            request.ContentType = contentType;
-            request.ContentLength = contentLength;
+            request.ContentType = "application/json";
+            request.Accept = "application/json";
+            request.Timeout = ConvertTimeout;
 
-            const int bufferSize = 2048;
-            var buffer = new byte[bufferSize];
-            int readed;
-            while ((readed = fileStream.Read(buffer, 0, bufferSize)) > 0)
+            var bodyString = string.Format("{{\"async\": {0},\"filetype\": \"{1}\",\"key\": \"{2}\",\"outputtype\": \"{3}\",\"title\": \"{4}\",\"url\": \"{5}\"}}",
+                                           isAsync.ToString().ToLower(),
+                                           fromExtension.Trim('.'),
+                                           documentRevisionId,
+                                           toExtension.Trim('.'),
+                                           title,
+                                           documentUri);
+
+            var bytes = Encoding.UTF8.GetBytes(bodyString);
+            request.ContentLength = bytes.Length;
+            using (var requestStream = request.GetRequestStream())
             {
-                request.GetRequestStream().Write(buffer, 0, readed);
+                requestStream.Write(bytes, 0, bytes.Length);
             }
 
             // hack. http://ubuntuforums.org/showthread.php?t=1841740
@@ -172,15 +129,19 @@ namespace ASC.Api.DocumentConverter
                 ServicePointManager.ServerCertificateValidationCallback += (s, ce, ca, p) => true;
             }
 
+            string dataResponse;
             using (var response = request.GetResponse())
             using (var stream = response.GetResponseStream())
             {
-                if (stream == null) throw new WebException("Could not get an answer");
-                var xDocumentResponse = XDocument.Load(new XmlTextReader(stream));
-                string externalUri;
-                GetResponseUri(xDocumentResponse, out externalUri);
-                return externalUri;
+                if (stream == null) throw new Exception("Response is null");
+
+                using (var reader = new StreamReader(stream))
+                {
+                    dataResponse = reader.ReadToEnd();
+                }
             }
+
+            return GetResponseUri(dataResponse, out convertedDocumentUri);
         }
 
         /// <summary>
@@ -198,79 +159,46 @@ namespace ASC.Api.DocumentConverter
         #endregion
 
         #region private method
-
+        
         /// <summary>
-        /// Request for conversion to a service
+        /// Processing document received from the editing service
         /// </summary>
-        /// <param name="documentUri">Uri for the document to convert</param>
-        /// <param name="fromExtension">Document extension</param>
-        /// <param name="toExtension">Extension to which to convert</param>
-        /// <param name="documentRevisionId">Key for caching on service</param>
-        /// <param name="isAsync">Perform conversions asynchronously</param>
-        /// <returns>Xml document request result of conversion</returns>
-        private static XDocument SendRequestToConvertService(string documentUri, string fromExtension, string toExtension, string documentRevisionId, bool isAsync)
+        /// <param name="jsonDocumentResponse">The resulting json from editing service</param>
+        /// <param name="responseUri">Uri to the converted document</param>
+        /// <returns>The percentage of completion of conversion</returns>
+        private static int GetResponseUri(string jsonDocumentResponse, out string responseUri)
         {
-            fromExtension = string.IsNullOrEmpty(fromExtension) ? Path.GetExtension(documentUri) : fromExtension;
+            if (string.IsNullOrEmpty(jsonDocumentResponse)) throw new ArgumentException("Invalid param", "jsonDocumentResponse");
 
-            var title = Path.GetFileName(documentUri);
-            title = string.IsNullOrEmpty(title) ? Guid.NewGuid().ToString() : title;
+            var responseFromService = Json.Decode(jsonDocumentResponse);
+            if (jsonDocumentResponse == null) throw new WebException("Invalid answer format");
 
-            documentRevisionId = string.IsNullOrEmpty(documentRevisionId)
-                                     ? documentUri
-                                     : documentRevisionId;
-            documentRevisionId = GenerateRevisionId(documentRevisionId);
+            var errorElement = responseFromService.error;
+            if (errorElement != null) ProcessResponseError(Convert.ToInt32(errorElement));
 
-            var urlDocumentService = DocumentConverterUrl + ConvertParams;
-            var urlToConverter = String.Format(urlDocumentService,
-                                               HttpUtility.UrlEncode(documentUri),
-                                               toExtension.Trim('.'),
-                                               fromExtension.Trim('.'),
-                                               title,
-                                               documentRevisionId);
+            var isEndConvert = responseFromService.endConvert;
 
-            if (isAsync)
-                urlToConverter += "&async=true";
-
-            var req = (HttpWebRequest) WebRequest.Create(urlToConverter);
-            req.Timeout = ConvertTimeout;
-
-            Stream stream = null;
-            var countTry = 0;
-
-            // hack. http://ubuntuforums.org/showthread.php?t=1841740
-            if (_Default.IsMono)
+            int resultPercent;
+            responseUri = string.Empty;
+            if (isEndConvert)
             {
-                ServicePointManager.ServerCertificateValidationCallback += (s, ce, ca, p) => true;
+                responseUri = responseFromService.fileUrl;
+                resultPercent = 100;
             }
-            while (countTry < MaxTry)
+            else
             {
-                try
-                {
-                    countTry++;
-                    stream = req.GetResponse().GetResponseStream();
-                    break;
-                }
-                catch (WebException ex)
-                {
-                    if (ex.Status != WebExceptionStatus.Timeout)
-                    {
-                        throw new HttpException((int) HttpStatusCode.BadRequest, "Bad Request", ex);
-                    }
-                }
-            }
-            if (countTry == MaxTry)
-            {
-                throw new WebException("Timeout", WebExceptionStatus.Timeout);
+                resultPercent = responseFromService.percent;
+                if (resultPercent >= 100) resultPercent = 99;
             }
 
-            return XDocument.Load(new XmlTextReader(stream));
+            return resultPercent;
         }
 
         /// <summary>
         /// Generate an error code table
         /// </summary>
         /// <param name="errorCode">Error code</param>
-        private static void ProcessConvertServiceResponceError(int errorCode)
+        private static void ProcessResponseError(int errorCode)
         {
             var errorMessage = string.Empty;
             const string errorMessageTemplate = "Error occurred in the ConvertService.ashx: {0}";
@@ -320,45 +248,6 @@ namespace ASC.Api.DocumentConverter
             throw new Exception(errorMessage);
         }
 
-        /// <summary>
-        /// Processing document received from the editing service
-        /// </summary>
-        /// <param name="xDocumentResponse">The resulting xml from editing service</param>
-        /// <param name="responseUri">Uri to the converted document</param>
-        /// <returns>The percentage of completion of conversion</returns>
-        private static int GetResponseUri(XDocument xDocumentResponse, out string responseUri)
-        {
-            var responceFromConvertService = xDocumentResponse.Root;
-            if (responceFromConvertService == null) throw new WebException("Invalid answer format");
-
-            var errorElement = responceFromConvertService.Element("Error");
-            if (errorElement != null) ProcessConvertServiceResponceError(Convert.ToInt32(errorElement.Value));
-
-            var endConvert = responceFromConvertService.Element("EndConvert");
-            if (endConvert == null) throw new WebException("Invalid answer format");
-            var isEndConvert = Convert.ToBoolean(endConvert.Value);
-
-            var resultPercent = 0;
-            responseUri = string.Empty;
-            if (isEndConvert)
-            {
-                var fileUrl = responceFromConvertService.Element("FileUrl");
-                if (fileUrl == null) throw new WebException("Invalid answer format");
-
-                responseUri = fileUrl.Value;
-                resultPercent = 100;
-            }
-            else
-            {
-                var percent = responceFromConvertService.Element("Percent");
-                if (percent != null)
-                    resultPercent = Convert.ToInt32(percent.Value);
-                resultPercent = resultPercent >= 100 ? 99 : resultPercent;
-            }
-
-            return resultPercent;
-        }
-
         #endregion
     }
 }

web/documentserver-example/csharp/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 ONLYOFFICE
+Copyright (c) 2018 ONLYOFFICE
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

web/documentserver-example/csharp/OnlineEditorsExample.csproj

@@ -44,12 +44,12 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Web" />
-    <Reference Include="System.Xml" />
+    <Reference Include="System.Web.Helpers" />
     <Reference Include="System.Web.Services" />
-    <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="App_Themes\images\file_docx.png" />

web/documentserver-example/csharp/Properties/AssemblyInfo.cs

@@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Ascensio System SIA")]
 [assembly: AssemblyProduct("OnlineEditorsExample")]
-[assembly: AssemblyCopyright("Ascensio System SIA 2016")]
+[assembly: AssemblyCopyright("Ascensio System SIA 2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

web/documentserver-example/csharp/ReadMe.txt

@@ -1,16 +1,14 @@
-For the ONLYOFFICE<EFBFBD> Applications example to work properly you need to do the following:
+For the ONLYOFFICE Applications example to work properly you need to do the following:
 
 1. Download and extract the Example.zip into a directory selected for it, for instance, C:\OnlyofficeExample
 
-2. Use the settings.config file to change the received authorization key for the document service. The file can be found in the unpacked root folder (C:\OnlyofficeExample\settings.config, in our example). The authorization key is specified in the files.docservice.key field.
+2. Run the IIS Manager (C:\Windows\system32\inetsrv\InetMgr.exe or Start -> All Programs -> Administrative Tools -> Internet Information Services (IIS) Manager for Windows Server 2003)
 
-3. Run the IIS Manager (C:\Windows\system32\inetsrv\InetMgr.exe or Start -> All Programs -> Administrative Tools -> Internet Information Services (IIS) Manager for Windows Server 2003)
+3. Add the unpacked Example to the list of sites with the physical path to the C:\OnlyofficeExample (or the one you selected) folder.
 
-4. Add the unpacked Example to the list of sites with the physical path to the C:\OnlyofficeExample (or the one you selected) folder.
+4. Make sure that the user account under which the IIS NetworkService process is executed has the write access rights for the C:\OnlyofficeExample\App_Data folder (this is significant for the IIS later than 6.0).
 
-5. Make sure that the user account under which the IIS NetworkService process is executed has the write access rights for the C:\OnlyofficeExample\App_Data folder (this is significant for the IIS later than 6.0).
-
-6. Make the created ONLYOFFICE<43> Applications example available through IP or domain name so that it could be connected from the web by the document service for proper document rendering.
+5. Make the created ONLYOFFICE Applications example available through IP or domain name so that it could be connected from the web by the document service for proper document rendering.
 
 
 

web/documentserver-example/csharp/WebEditor.ashx.cs

@@ -1,25 +1,26 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 

web/documentserver-example/csharp/script/jscript.js

@@ -1,25 +1,26 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 

web/documentserver-example/csharp/settings.config

@@ -5,13 +5,12 @@
   <add key="filesize-max" value="5242880"/>
   <add key="storage-path" value=""/>
 
-  <add key="files.docservice.viewed-docs" value=".ppt|.pps|.odp|.pdf|.djvu|.epub|.xps"/>
-  <add key="files.docservice.edited-docs" value=".docx|.doc|.odt|.xlsx|.xls|.ods|.csv|.pptx|.ppsx|.rtf|.txt|.mht|.html|.htm"/>
-  <add key="files.docservice.convert-docs" value=".doc|.odt|.xls|.ods|.ppt|.pps|.odp|.rtf|.mht|.html|.htm|.epub"/>
+  <add key="files.docservice.viewed-docs" value=".pdf|.djvu|.xps"/>
+  <add key="files.docservice.edited-docs" value=".docx|.xlsx|.csv|.pptx|.ppsx|.txt"/>
+  <add key="files.docservice.convert-docs" value=".docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.epub"/>
   <add key="files.docservice.timeout" value="120000" />
 
-  <add key="files.docservice.url.storage" value="https://doc.onlyoffice.com/FileUploader.ashx"/>
-  <add key="files.docservice.url.converter" value="https://doc.onlyoffice.com/ConvertService.ashx"/>
-  <add key="files.docservice.url.api" value="https://doc.onlyoffice.com/web-apps/apps/api/documents/api.js"/>
-  <add key="files.docservice.url.preloader" value="https://doc.onlyoffice.com/web-apps/apps/api/documents/cache-scripts.html"/>
+  <add key="files.docservice.url.converter" value="https://documentserver/ConvertService.ashx"/>
+  <add key="files.docservice.url.api" value="https://documentserver/web-apps/apps/api/documents/api.js"/>
+  <add key="files.docservice.url.preloader" value="https://documentserver/web-apps/apps/api/documents/cache-scripts.html"/>
 </appSettings>

web/documentserver-example/java/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>OnlineEditorsExampleJava</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>

web/documentserver-example/java/Dockerfile

@@ -0,0 +1,9 @@
+FROM ubuntu:16.04
+RUN apt-get update && apt-get install -y software-properties-common \
+                                         python-software-properties
+RUN add-apt-repository -y ppa:webupd8team/java
+RUN echo "oracle-java8-installer shared/accepted-oracle-license-v1-1 select true" | debconf-set-selections
+RUN apt-get update && apt-get install -y oracle-java8-installer \
+                                         maven
+COPY . /java
+CMD mvn -f /java package

web/documentserver-example/java/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 ONLYOFFICE
+Copyright (c) 2018 ONLYOFFICE
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

web/documentserver-example/java/README.md

@@ -0,0 +1,61 @@
+## Build instruction
+
+At first, You need to install `oracle-java8-installer`
+
+```
+sudo add-apt-repository ppa:webupd8team/java
+sudo apt-get update
+sudo apt-get install oracle-java8-installer
+```
+
+Edit the **settings.properties** configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed
+
+```
+nano src/main/resources/settings.properties
+```
+
+Edit the following lines:
+
+```
+files.docservice.url.converter=https://documentserver/ConvertService.ashx
+files.docservice.url.tempstorage=https://documentserver/ResourceService.ashx
+files.docservice.url.api=https://documentserver/web-apps/apps/api/documents/api.js
+files.docservice.url.preloader=https://documentserver/web-apps/apps/api/documents/cache-scripts.html
+```
+
+Install Maven:
+
+```
+apt-get install maven
+```
+
+And build:
+
+```
+mvn package
+```
+
+After it, all bin files will be passed to `./target` folder
+
+## Build from docker
+Edit the **settings.properties** configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed
+
+```
+nano src/main/resources/settings.properties
+```
+
+Edit the following lines. You need to change `documentserver` to your documentserver:
+
+```
+files.docservice.url.converter=https://documentserver/ConvertService.ashx
+files.docservice.url.tempstorage=https://documentserver/ResourceService.ashx
+files.docservice.url.api=https://documentserver/web-apps/apps/api/documents/api.js
+files.docservice.url.preloader=https://documentserver/web-apps/apps/api/documents/cache-scripts.html
+
+```
+Run next command in java example directory:
+```
+docker build . -t java-example
+docker run -it -v $PWD/target:/java/target java-example
+```
+After it, all bin files will be passed to `./target` folder

web/documentserver-example/java/pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>onlyoffice.com</groupId>
     <artifactId>OnlineEditorsExampleJava</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0</version>
     <packaging>war</packaging>
 
     <name>OnlineEditorsExampleJava</name>

web/documentserver-example/java/src/main/java/controllers/EditorServlet.java

@@ -1,25 +1,26 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 
@@ -38,20 +39,27 @@ import entities.FileModel;
 
 
 @WebServlet(name = "EditorServlet", urlPatterns = {"/EditorServlet"})
-public class EditorServlet extends HttpServlet {
-
+public class EditorServlet extends HttpServlet
+{
     protected void processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
     {
-        String mode = request.getParameter("mode");
-        String fileExt = request.getParameter("fileExt");
-        String fileName = request.getParameter("fileName");
-        
-        DocumentManager.Init(request, response);
-        
-        if(fileExt != null)
+        String fileName = "";
+        if (request.getParameterMap().containsKey("fileName"))
+        {
+             fileName = request.getParameter("fileName");
+        }
+
+        String fileExt = null;
+        if (request.getParameterMap().containsKey("fileExt"))
+        {
+             fileExt = request.getParameter("fileExt");
+        }
+
+        if (fileExt != null)
         {
             try
             {
+                DocumentManager.Init(request, response);
                 fileName = DocumentManager.CreateDemo(fileExt);
             }
             catch (Exception ex)
@@ -60,6 +68,11 @@ public class EditorServlet extends HttpServlet {
             }
         }
 
+        String mode = "";
+        if (request.getParameterMap().containsKey("mode"))
+        {
+             mode = request.getParameter("mode");
+        }
         Boolean desktopMode = !"embedded".equals(mode);
         
         FileModel file = new FileModel();
@@ -74,17 +87,20 @@ public class EditorServlet extends HttpServlet {
     }
 
     @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
         processRequest(request, response);
     }
 
     @Override
-    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
         processRequest(request, response);
     }
 
     @Override
-    public String getServletInfo() {
-        return "Short description";
+    public String getServletInfo()
+    {
+        return "Editor page";
     }
 }

web/documentserver-example/java/src/main/java/controllers/GlobalServletContextListener.java

@@ -1,25 +1,26 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 
@@ -37,61 +38,62 @@ import javax.net.ssl.X509TrustManager;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
  
-public class GlobalServletContextListener implements ServletContextListener{
- 
-	@Override
-	public void contextDestroyed(ServletContextEvent arg0) {
-            System.out.println("ServletContextListener destroyed");
-	}
+public class GlobalServletContextListener implements ServletContextListener
+{
+    @Override
+    public void contextDestroyed(ServletContextEvent arg0)
+    {
+        System.out.println("ServletContextListener destroyed");
+    }
 
-	@Override
-	public void contextInitialized(ServletContextEvent arg0) {
-            
-            TrustManager[] trustAllCerts = new TrustManager[] {
-                new X509TrustManager() {
-                    
-                    @Override
-                    public java.security.cert.X509Certificate[] getAcceptedIssuers()
-                    {
-                        return null;
-                    }
-
-                    @Override
-                    public void checkClientTrusted(X509Certificate[] certs, String authType)
-                    {
-                    }
-
-                    @Override
-                    public void checkServerTrusted(X509Certificate[] certs, String authType)
-                    {
-                    }
-
-                }
-            };
-
-            SSLContext sc;
-
-            try
+    @Override
+    public void contextInitialized(ServletContextEvent arg0)
+    {
+        TrustManager[] trustAllCerts = new TrustManager[]
+        {
+            new X509TrustManager()
             {
-                sc = SSLContext.getInstance("SSL");
-                sc.init(null, trustAllCerts, new java.security.SecureRandom());
-                HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
-            }
-            catch (NoSuchAlgorithmException | KeyManagementException ex)
-            {
-            }
-
-            HostnameVerifier allHostsValid = new HostnameVerifier() {
-                
                 @Override
-                public boolean verify(String hostname, SSLSession session) {
-                  return true;
+                public java.security.cert.X509Certificate[] getAcceptedIssuers()
+                {
+                    return null;
                 }
-                
-            };
 
-            HttpsURLConnection.setDefaultHostnameVerifier(allHostsValid);
+                @Override
+                public void checkClientTrusted(X509Certificate[] certs, String authType)
+                {
+                }
 
-            System.out.println("ServletContextListener started");	
-	}
+                @Override
+                public void checkServerTrusted(X509Certificate[] certs, String authType)
+                {
+                }
+            }
+        };
+
+        SSLContext sc;
+
+        try
+        {
+            sc = SSLContext.getInstance("SSL");
+            sc.init(null, trustAllCerts, new java.security.SecureRandom());
+            HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
+        }
+        catch (NoSuchAlgorithmException | KeyManagementException ex)
+        {
+        }
+
+        HostnameVerifier allHostsValid = new HostnameVerifier()
+        {
+            @Override
+            public boolean verify(String hostname, SSLSession session)
+            {
+              return true;
+            }
+        };
+
+        HttpsURLConnection.setDefaultHostnameVerifier(allHostsValid);
+
+        System.out.println("ServletContextListener started");
+    }
 }

web/documentserver-example/java/src/main/java/controllers/IndexServlet.java

@@ -1,28 +1,30 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 
+
 package controllers;
 
 import helpers.DocumentManager;
@@ -34,7 +36,6 @@ import java.io.InputStream;
 import java.io.PrintWriter;
 import java.net.URL;
 import java.util.Scanner;
-import javafx.util.Pair;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.MultipartConfig;
 import javax.servlet.annotation.WebServlet;
@@ -49,13 +50,13 @@ import org.json.simple.parser.JSONParser;
 
 @WebServlet(name = "IndexServlet", urlPatterns = {"/IndexServlet"})
 @MultipartConfig
-public class IndexServlet extends HttpServlet {
-
-    protected void processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-
+public class IndexServlet extends HttpServlet
+{
+    protected void processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
         String action = request.getParameter("type");
 
-        if(action == null)
+        if (action == null)
         {
             request.getRequestDispatcher("index.jsp").forward(request, response);
             return;
@@ -64,7 +65,8 @@ public class IndexServlet extends HttpServlet {
         DocumentManager.Init(request, response);
         PrintWriter writer = response.getWriter();
         
-        switch (action.toLowerCase()) {
+        switch (action.toLowerCase())
+        {
             case "upload":
                 Upload(request, response, writer);
                 break;
@@ -75,11 +77,11 @@ public class IndexServlet extends HttpServlet {
                 Track(request, response, writer);
                 break;
         }
-
     }
 
 
-    private static void Upload(HttpServletRequest request, HttpServletResponse response, PrintWriter writer) {
+    private static void Upload(HttpServletRequest request, HttpServletResponse response, PrintWriter writer)
+    {
         response.setContentType("text/plain");
 
         try
@@ -87,20 +89,24 @@ public class IndexServlet extends HttpServlet {
             Part httpPostedFile = request.getPart("file");
 
             String fileName = "";
-            for (String content : httpPostedFile.getHeader("content-disposition").split(";")) {
-                if (content.trim().startsWith("filename")) {
+            for (String content : httpPostedFile.getHeader("content-disposition").split(";"))
+            {
+                if (content.trim().startsWith("filename"))
+                {
                     fileName = content.substring(content.indexOf('=') + 1).trim().replace("\"", "");
                 }
             }
 
             long curSize = httpPostedFile.getSize();
-            if (DocumentManager.GetMaxFileSize() < curSize || curSize <= 0) {
+            if (DocumentManager.GetMaxFileSize() < curSize || curSize <= 0)
+            {
                 writer.write("{ \"error\": \"File size is incorrect\"}");
                 return;
             }
 
             String curExt = FileUtility.GetFileExtension(fileName);
-            if (!DocumentManager.GetFileExts().contains(curExt)) {
+            if (!DocumentManager.GetFileExts().contains(curExt))
+            {
                 writer.write("{ \"error\": \"File type is not supported\"}");
                 return;
             }
@@ -112,10 +118,12 @@ public class IndexServlet extends HttpServlet {
 
             File file = new File(fileStoragePath);
 
-            try (FileOutputStream out = new FileOutputStream(file)) {
+            try (FileOutputStream out = new FileOutputStream(file))
+            {
                 int read;
                 final byte[] bytes = new byte[1024];
-                while ((read = fileStream.read(bytes)) != -1) {
+                while ((read = fileStream.read(bytes)) != -1)
+                {
                     out.write(bytes, 0, read);
                 }
 
@@ -147,14 +155,11 @@ public class IndexServlet extends HttpServlet {
             {
                 String key = ServiceConverter.GenerateRevisionId(fileUri);
 
-                Pair<Integer, String> res = ServiceConverter.GetConvertedUri(fileUri, fileExt, internalFileExt, key, true);
+                String newFileUri = ServiceConverter.GetConvertedUri(fileUri, fileExt, internalFileExt, key, true);
                 
-                int result = res.getKey();
-                String newFileUri = res.getValue();
-
-                if (result != 100)
+                if (newFileUri == "")
                 {
-                    writer.write("{ \"step\" : \"" + result + "\", \"filename\" : \"" + fileName + "\"}");
+                    writer.write("{ \"step\" : \"0\", \"filename\" : \"" + fileName + "\"}");
                     return;
                 }
 
@@ -164,15 +169,18 @@ public class IndexServlet extends HttpServlet {
                 java.net.HttpURLConnection connection = (java.net.HttpURLConnection) url.openConnection();
                 InputStream stream = connection.getInputStream();
 
-                if (stream == null) {
+                if (stream == null)
+                {
                     throw new Exception("Stream is null");
                 }
 
                 File convertedFile = new File(DocumentManager.StoragePath(correctName, null));
-                try (FileOutputStream out = new FileOutputStream(convertedFile)) {
+                try (FileOutputStream out = new FileOutputStream(convertedFile))
+                {
                     int read;
                     final byte[] bytes = new byte[1024];
-                    while ((read = stream.read(bytes)) != -1) {
+                    while ((read = stream.read(bytes)) != -1)
+                    {
                         out.write(bytes, 0, read);
                     }
                     
@@ -197,7 +205,8 @@ public class IndexServlet extends HttpServlet {
         }
     }
 
-    private static void Track(HttpServletRequest request, HttpServletResponse response, PrintWriter writer) {
+    private static void Track(HttpServletRequest request, HttpServletResponse response, PrintWriter writer)
+    {
         String userAddress = request.getParameter("userAddress");
         String fileName = request.getParameter("fileName");
 
@@ -206,8 +215,10 @@ public class IndexServlet extends HttpServlet {
 
         try
         {
-            Scanner scanner = new Scanner(request.getInputStream()).useDelimiter("\\A");
+            Scanner scanner = new Scanner(request.getInputStream());
+            scanner.useDelimiter("\\A");
             body = scanner.hasNext() ? scanner.next() : "";
+            scanner.close();
         }
         catch (Exception ex)
         {
@@ -237,26 +248,29 @@ public class IndexServlet extends HttpServlet {
 
         long status = (long) jsonObj.get("status");
 
-        if(status == 2 || status == 3)//MustSave, Corrupted
+        int saved = 0;
+        if (status == 2 || status == 3)//MustSave, Corrupted
         {
             String downloadUri = (String) jsonObj.get("url");
 
-            int saved = 1;
             try
             {
                 URL url = new URL(downloadUri);
                 java.net.HttpURLConnection connection = (java.net.HttpURLConnection) url.openConnection();
                 InputStream stream = connection.getInputStream();
 
-                if (stream == null) {
+                if (stream == null)
+                {
                     throw new Exception("Stream is null");
                 }
 
                 File savedFile = new File(storagePath);
-                try (FileOutputStream out = new FileOutputStream(savedFile)) {
+                try (FileOutputStream out = new FileOutputStream(savedFile))
+                {
                     int read;
                     final byte[] bytes = new byte[1024];
-                    while ((read = stream.read(bytes)) != -1) {
+                    while ((read = stream.read(bytes)) != -1)
+                    {
                         out.write(bytes, 0, read);
                     }
                     
@@ -268,28 +282,29 @@ public class IndexServlet extends HttpServlet {
             }
             catch (Exception ex)
             {
-                saved = 0;
+                saved = 1;
             }
         }
 
-        writer.write("{\"error\":0}");
+        writer.write("{\"error\":" + saved + "}");
     }
 
 
-
-
     @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
         processRequest(request, response);
     }
 
     @Override
-    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+    {
         processRequest(request, response);
     }
 
     @Override
-    public String getServletInfo() {
-        return "Short description";
+    public String getServletInfo()
+    {
+        return "Handler";
     }
 }

web/documentserver-example/java/src/main/java/entities/FileModel.java

@@ -1,3 +1,29 @@
+/*
+ *
+ * (c) Copyright Ascensio System Limited 2010-2018
+ *
+ * The MIT License (MIT)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+*/
+
 
 package entities;
 

web/documentserver-example/java/src/main/java/entities/FileType.java

@@ -1,7 +1,34 @@
+/*
+ *
+ * (c) Copyright Ascensio System Limited 2010-2018
+ *
+ * The MIT License (MIT)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+*/
+
 
 package entities;
 
-public enum FileType {
+public enum FileType
+{
     Text,
     Spreadsheet,
     Presentation

web/documentserver-example/java/src/main/java/helpers/ConfigManager.java

@@ -1,11 +1,37 @@
+/*
+ *
+ * (c) Copyright Ascensio System Limited 2010-2018
+ *
+ * The MIT License (MIT)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+*/
+
 
 package helpers;
 
 import java.io.InputStream;
 import java.util.Properties;
 
-public class ConfigManager  {
-    
+public class ConfigManager
+{
     private static Properties properties;
     
     static
@@ -27,7 +53,8 @@ public class ConfigManager  {
         }
     }
     
-    public static String GetProperty(String name){
+    public static String GetProperty(String name)
+    {
         if(properties == null)
             return "";
         

web/documentserver-example/java/src/main/java/helpers/DocumentManager.java

@@ -1,19 +1,40 @@
+/*
+ *
+ * (c) Copyright Ascensio System Limited 2010-2018
+ *
+ * The MIT License (MIT)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+*/
 
 package helpers;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
 import java.net.InetAddress;
-import java.net.URL;
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import javafx.util.Pair;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import entities.FileType;
@@ -22,13 +43,10 @@ import entities.FileType;
 public class DocumentManager
 {
     private static HttpServletRequest request;
-    private static HttpServletResponse response;
 
-    private static final String ExternalIPCacheKey = "ExternalIPCacheKey";
-
-    public static void Init(HttpServletRequest req, HttpServletResponse resp){
+    public static void Init(HttpServletRequest req, HttpServletResponse resp)
+    {
         request = req;
-        response = resp;
     }
 
     public static long GetMaxFileSize()
@@ -39,7 +57,7 @@ public class DocumentManager
         {
             size = Long.parseLong(ConfigManager.GetProperty("filesize-max"));
         }
-        catch(Exception ex)
+        catch (Exception ex)
         {
             size = 0;
         }
@@ -84,7 +102,7 @@ public class DocumentManager
             {
                 userAddress = InetAddress.getLocalHost().getHostAddress();
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 userAddress = "";
             }
@@ -99,7 +117,7 @@ public class DocumentManager
         String storagePath = ConfigManager.GetProperty("storage-folder");
         String hostAddress = CurUserHostAddress(userAddress);
         
-        String directory = serverPath + "\\" + storagePath + "\\";
+        String directory = serverPath + File.separator + storagePath + File.separator;
 
         File file = new File(directory);
         
@@ -108,7 +126,7 @@ public class DocumentManager
             file.mkdir();
         }
         
-        directory = directory + hostAddress + "\\";
+        directory = directory + hostAddress + File.separator;
         file = new File(directory);
 
         if (!file.exists())
@@ -140,25 +158,20 @@ public class DocumentManager
     {
         String demoName = "sample." + fileExt;
         String fileName = GetCorrectName(demoName);
-        
-        try
+
+        InputStream stream = Thread.currentThread().getContextClassLoader().getResourceAsStream(demoName);
+
+        File file = new File(StoragePath(fileName, null));
+
+        try (FileOutputStream out = new FileOutputStream(file))
         {
-            InputStream stream = Thread.currentThread().getContextClassLoader().getResourceAsStream(demoName);
-            
-            File file = new File(StoragePath(fileName, null));
-            
-            try (FileOutputStream out = new FileOutputStream(file)) {
-                int read;
-                final byte[] bytes = new byte[1024];
-                while ((read = stream.read(bytes)) != -1) {
-                    out.write(bytes, 0, read);
-                }
-                out.flush();
+            int read;
+            final byte[] bytes = new byte[1024];
+            while ((read = stream.read(bytes)) != -1)
+            {
+                out.write(bytes, 0, read);
             }
-        }
-        catch(Exception ex)
-        {
-            throw ex;
+            out.flush();
         }
         
         return fileName;
@@ -168,32 +181,39 @@ public class DocumentManager
     {
         try
         {
-            String serverPath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + request.getContextPath();
+            String serverPath = GetServerUrl();
             String storagePath = ConfigManager.GetProperty("storage-folder");
             String hostAddress = CurUserHostAddress(null);
             
-            String filePath = serverPath + "/" + storagePath + "/" + hostAddress + "/" + URLEncoder.encode(fileName);
+            String filePath = serverPath + "/" + storagePath + "/" + hostAddress + "/" + URLEncoder.encode(fileName, java.nio.charset.StandardCharsets.UTF_8.toString()).replace("+", "%20");
             
             return filePath;
         }
-        catch(Exception ex)
+        catch (UnsupportedEncodingException e)
         {
-            throw ex;
+            throw new AssertionError("UTF-8 is unknown");
         }
     }
 
     public static String GetServerUrl()
     {
-        return serverPath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort();
+        return request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + request.getContextPath();
     }
 
     public static String GetCallback(String fileName)
     {
-        String serverPath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + request.getContextPath();
+        String serverPath = GetServerUrl();
         String hostAddress = CurUserHostAddress(null);
-        String query = "?type=track&userAddress=" + URLEncoder.encode(hostAddress) + "&fileName=" + URLEncoder.encode(fileName);
+        try
+        {
+            String query = "?type=track&fileName=" + URLEncoder.encode(fileName, java.nio.charset.StandardCharsets.UTF_8.toString()) + "&userAddress=" + URLEncoder.encode(hostAddress, java.nio.charset.StandardCharsets.UTF_8.toString());
         
-        return serverPath + "/IndexServlet" + query;
+            return serverPath + "/IndexServlet" + query;
+        }
+        catch (UnsupportedEncodingException e)
+        {
+            throw new AssertionError("UTF-8 is unknown");
+        }
     }
 
     public static String GetInternalExtension(FileType fileType)

web/documentserver-example/java/src/main/java/helpers/FileUtility.java

@@ -1,3 +1,29 @@
+/*
+ *
+ * (c) Copyright Ascensio System Limited 2010-2018
+ *
+ * The MIT License (MIT)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+*/
+
 
 package helpers;
 
@@ -11,14 +37,14 @@ import java.util.Map;
 public class FileUtility
 {
     static {}
-    
+
     public static FileType GetFileType(String fileName)
     {
         String ext = GetFileExtension(fileName).toLowerCase();
 
         if (ExtsDocument.contains(ext))
             return FileType.Text;
-        
+
         if (ExtsSpreadsheet.contains(ext))
             return FileType.Spreadsheet;
         
@@ -30,26 +56,33 @@ public class FileUtility
 
     public static List<String> ExtsDocument = Arrays.asList
     (
-        ".docx", ".doc", ".odt", ".rtf", ".txt",
-        ".html", ".htm", ".mht", ".pdf", ".djvu",
-        ".fb2", ".epub", ".xps"
+        ".doc", ".docx", ".docm",
+        ".dot", ".dotx", ".dotm",
+        ".odt", ".fodt", ".ott", ".rtf", ".txt",
+        ".html", ".htm", ".mht",
+        ".pdf", ".djvu", ".fb2", ".epub", ".xps"
     );
 
     public static List<String> ExtsSpreadsheet = Arrays.asList
     (
-        ".xls", ".xlsx", ".ods", ".csv"
+        ".xls", ".xlsx", ".xlsm",
+        ".xlt", ".xltx", ".xltm",
+        ".ods", ".fods", ".ots", ".csv"
     );
 
     public static List<String> ExtsPresentation = Arrays.asList
     (
-        ".pps", ".ppsx", ".ppt", ".pptx",".odp"
+        ".pps", ".ppsx", ".ppsm",
+        ".ppt", ".pptx", ".pptm",
+        ".pot", ".potx", ".potm",
+        ".odp", ".fodp", ".otp"
     );
-    
+
 
     public static String GetFileName (String url)
     {
         if(url == null) return null;
-        
+
         //for external file url
         String tempstorage = ConfigManager.GetProperty("files.docservice.url.tempstorage");
         if(!tempstorage.isEmpty() && url.startsWith(tempstorage))
@@ -61,7 +94,7 @@ public class FileUtility
         String fileName = url.substring(url.lastIndexOf('/')+1, url.length());
         return fileName;
     }
-    
+
     public static String GetFileNameWithoutExtension (String url)
     {
         String fileName = GetFileName(url);

web/documentserver-example/java/src/main/java/helpers/ServiceConverter.java

@@ -1,3 +1,28 @@
+/*
+ *
+ * (c) Copyright Ascensio System Limited 2010-2018
+ *
+ * The MIT License (MIT)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+*/
 
 package helpers;
 
@@ -7,31 +32,21 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.net.InetAddress;
 import java.net.URL;
 import java.net.URLEncoder;
 import java.text.MessageFormat;
-import java.util.Date;
 import java.util.UUID;
 import java.util.concurrent.TimeoutException;
-import javafx.util.Pair;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
 
 
 public class ServiceConverter
 {
     private static int ConvertTimeout = 120000;
     private static final String DocumentConverterUrl = ConfigManager.GetProperty("files.docservice.url.converter");
-    private static final String DocumentStorageUrl = ConfigManager.GetProperty("files.docservice.url.storage");
     private static final MessageFormat ConvertParams = new MessageFormat("?url={0}&outputtype={1}&filetype={2}&title={3}&key={4}");
-    private static final int MaxTry = 3;
 
     static
     {
@@ -48,124 +63,25 @@ public class ServiceConverter
         }
     }
 
-    public static Pair<Integer, String> GetConvertedUri(String documentUri, String fromExtension, String toExtension, String documentRevisionId, Boolean isAsync) throws Exception
-    {
-        String convertedDocumentUri = null;
-        
-        String xml = SendRequestToConvertService(documentUri, fromExtension, toExtension, documentRevisionId, isAsync);
-        
-        Document document = ConvertStringToXmlDocument(xml);
-
-        Element responceFromConvertService = document.getDocumentElement();
-        if (responceFromConvertService == null)
-            throw new Exception("Invalid answer format");
-
-        NodeList errorElement = responceFromConvertService.getElementsByTagName("Error");
-        if (errorElement != null && errorElement.getLength() > 0)
-            ProcessConvertServiceResponceError(Integer.parseInt(errorElement.item(0).getTextContent()));
-
-        NodeList endConvertNode = responceFromConvertService.getElementsByTagName("EndConvert");
-        if (endConvertNode == null || endConvertNode.getLength() == 0)
-            throw new Exception("EndConvert node is null");
-        
-        Boolean isEndConvert = Boolean.parseBoolean(endConvertNode.item(0).getTextContent());
-        
-        NodeList percentNode = responceFromConvertService.getElementsByTagName("Percent");
-        if (percentNode == null || percentNode.getLength() == 0)
-            throw new Exception("Percent node is null");
-        
-        Integer percent = Integer.parseInt(percentNode.item(0).getTextContent());
-
-        if (isEndConvert)
-        {
-            NodeList fileUrlNode = responceFromConvertService.getElementsByTagName("FileUrl");
-            if (fileUrlNode == null || fileUrlNode.getLength() == 0)
-                throw new Exception("FileUrl node is null");
-            
-            convertedDocumentUri = fileUrlNode.item(0).getTextContent();
-            percent = 100;
-        }
-        else
-        {
-            percent = percent >= 100 ? 99 : percent;
-        }
-
-        return new Pair<>(percent, convertedDocumentUri);
-    }
-
-    public static String GetExternalUri(InputStream fileStream, long contentLength, String contentType, String documentRevisionId) throws IOException, Exception
-    {
-        Object[] args = {"", "", "", "", documentRevisionId};
-        
-        String urlTostorage = DocumentStorageUrl + ConvertParams.format(args);
-
-        URL url = new URL(urlTostorage);
-        java.net.HttpURLConnection connection = (java.net.HttpURLConnection) url.openConnection();
-
-        connection.setDoOutput(true);
-        connection.setDoInput(true);
-        connection.setInstanceFollowRedirects(false); 
-        connection.setRequestMethod("POST"); 
-        connection.setRequestProperty("Content-Type", contentType == null ? "application/octet-stream" : contentType);
-        connection.setRequestProperty("charset", "utf-8");
-        connection.setRequestProperty("Content-Length", Long.toString(contentLength));
-        connection.setUseCaches (false);
-               
-        try (DataOutputStream dataOutputStream = new DataOutputStream(connection.getOutputStream())) {
-            int read;
-            final byte[] bytes = new byte[1024];
-            while ((read = fileStream.read(bytes)) != -1) {
-                dataOutputStream.write(bytes, 0, read);
-            }
-            
-            dataOutputStream.flush();
-        }
-        
-        InputStream stream = connection.getInputStream();
-
-        if (stream == null)
-        {
-            throw new Exception("Could not get an answer");
-        }
-        
-        String xml = ConvertStreamToString(stream);
-
-        connection.disconnect();
-        
-        Pair <Integer, String> res = GetResponseUri(xml);
-          
-        return res.getValue();
-    }
-
-    public static String GenerateRevisionId(String expectedKey)
-    {
-        if (expectedKey.length() > 20)
-            expectedKey = Integer.toString(expectedKey.hashCode());
-        
-        String key = expectedKey.replace("[^0-9-.a-zA-Z_=]", "_");
-        
-        return key.substring(0, Math.min(key.length(), 20));
-    }
-
-    private static String SendRequestToConvertService(String documentUri, String fromExtension, String toExtension, String documentRevisionId, Boolean isAsync) throws Exception
+    public static String GetConvertedUri(String documentUri, String fromExtension, String toExtension, String documentRevisionId, Boolean isAsync) throws Exception
     {
         fromExtension = fromExtension == null || fromExtension.isEmpty() ? FileUtility.GetFileExtension(documentUri) : fromExtension;
 
         String title = FileUtility.GetFileName(documentUri);
         title = title == null || title.isEmpty() ? UUID.randomUUID().toString() : title;
-        
+
         documentRevisionId = documentRevisionId == null || documentRevisionId.isEmpty() ? documentUri : documentRevisionId;
-        
+
         documentRevisionId = GenerateRevisionId(documentRevisionId);
 
         Object[] args = {
-                            URLEncoder.encode(documentUri),
+                            URLEncoder.encode(documentUri, java.nio.charset.StandardCharsets.UTF_8.toString()),
                             toExtension.replace(".", ""),
                             fromExtension.replace(".", ""),
                             title,
                             documentRevisionId
                         };
-        
+
         String urlToConverter = DocumentConverterUrl +  ConvertParams.format(args);
 
         if (isAsync)
@@ -173,38 +89,29 @@ public class ServiceConverter
 
         URL url = new URL(urlToConverter);
         java.net.HttpURLConnection connection = (java.net.HttpURLConnection) url.openConnection();
+        connection.setRequestProperty("Accept", "application/json");
         connection.setConnectTimeout(ConvertTimeout);
-        
-        InputStream stream = null;
-        int countTry = 0;
-        
-        while (countTry < MaxTry)
-        {
-            try
-            {
-                countTry++;
-                stream = connection.getInputStream();
-                break;
-            }
-            catch (Exception ex)
-            {
-                if(!(ex instanceof TimeoutException))
-                    throw new Exception("Bad Request");
-            }
-        }
-        if (countTry == MaxTry)
-        {
-            throw new Exception("Timeout");
-        }
+
+        InputStream stream = connection.getInputStream();
 
         if (stream == null)
             throw new Exception("Could not get an answer");
-               
-        String xml = ConvertStreamToString(stream);
+
+        String jsonString = ConvertStreamToString(stream);
 
         connection.disconnect();
-        
-        return xml;
+
+        return GetResponseUri(jsonString);
+    }
+
+    public static String GenerateRevisionId(String expectedKey)
+    {
+        if (expectedKey.length() > 20)
+            expectedKey = Integer.toString(expectedKey.hashCode());
+
+        String key = expectedKey.replace("[^0-9-.a-zA-Z_=]", "_");
+
+        return key.substring(0, Math.min(key.length(), 20));
     }
 
     private static void ProcessConvertServiceResponceError(int errorCode) throws Exception
@@ -248,46 +155,31 @@ public class ServiceConverter
         throw new Exception(errorMessage);
     }
 
-    private static Pair<Integer, String> GetResponseUri(String xml) throws Exception
+    private static String GetResponseUri(String jsonString) throws Exception
     {
-        Document document = ConvertStringToXmlDocument(xml);
-        
-        Element responceFromConvertService = document.getDocumentElement();
-        if (responceFromConvertService == null)
-            throw new Exception("Invalid answer format");
+        JSONObject jsonObj = ConvertStringToJSON(jsonString);
 
-        NodeList errorElement = responceFromConvertService.getElementsByTagName("Error");
-        if (errorElement != null && errorElement.getLength() > 0)
-            ProcessConvertServiceResponceError(Integer.parseInt(errorElement.item(0).getTextContent()));
+        String error = (String) jsonObj.get("error");
+        if (error != null && error != "")
+            ProcessConvertServiceResponceError(Integer.parseInt(error));
 
-        NodeList endConvert = responceFromConvertService.getElementsByTagName("EndConvert");
-        if (endConvert == null || endConvert.getLength() == 0)
-            throw new Exception("Invalid answer format");
-        
-        Boolean isEndConvert = Boolean.parseBoolean(endConvert.item(0).getTextContent());
+        Boolean isEndConvert = (Boolean) jsonObj.get("endConvert");
 
-        int resultPercent = 0;
+        Long resultPercent = 0l;
         String responseUri = null;
-        
+
         if (isEndConvert)
         {
-            NodeList fileUrl = responceFromConvertService.getElementsByTagName("FileUrl");
-            if (fileUrl == null || endConvert.getLength() == 0)
-                throw new Exception("Invalid answer format");
-
-            resultPercent = 100;
-            responseUri = fileUrl.item(0).getTextContent();
+            resultPercent = 100l;
+            responseUri = (String) jsonObj.get("fileUrl");
         }
         else
         {
-            NodeList percent = responceFromConvertService.getElementsByTagName("Percent");
-            if (percent != null && percent.getLength() > 0)
-                resultPercent = Integer.parseInt(percent.item(0).getTextContent());
-            
-            resultPercent = resultPercent >= 100 ? 99 : resultPercent;
+            resultPercent = (Long) jsonObj.get("percent");
+            resultPercent = resultPercent >= 100l ? 99l : resultPercent;
         }
 
-        return new Pair<>(resultPercent, responseUri);
+        return resultPercent >= 100l ? responseUri : "";
     }
 
     private static String ConvertStreamToString(InputStream stream) throws IOException
@@ -297,24 +189,23 @@ public class ServiceConverter
         BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
         String line = bufferedReader.readLine();
 
-        while(line != null) {
+        while(line != null)
+        {
             stringBuilder.append(line);
-            line =bufferedReader.readLine();
+            line = bufferedReader.readLine();
         }
 
         String result = stringBuilder.toString();
-        
+
         return result;
     }
 
-    private static Document ConvertStringToXmlDocument(String xml) throws IOException, ParserConfigurationException, SAXException
+    private static JSONObject ConvertStringToJSON(String jsonString) throws ParseException
     {
-        DocumentBuilderFactory documentBuildFactory = DocumentBuilderFactory.newInstance();
-        DocumentBuilder doccumentBuilder = documentBuildFactory.newDocumentBuilder();
-        InputStream inputStream = new ByteArrayInputStream(xml.getBytes("utf-8"));
-        InputSource inputSource = new InputSource(inputStream);
-        Document document = doccumentBuilder.parse(inputSource);
-        
-        return document;
+        JSONParser parser = new JSONParser();
+        Object obj = parser.parse(jsonString);
+        JSONObject jsonObj = (JSONObject) obj;
+
+        return jsonObj;
     }
 }

web/documentserver-example/java/src/main/resources/settings.properties

@@ -1,13 +1,12 @@
 filesize-max=5242880
 storage-folder=app_data
 
-files.docservice.viewed-docs=.ppt|.pps|.odp|.pdf|.djvu|.epub|.xps
-files.docservice.edited-docs=.docx|.doc|.odt|.xlsx|.xls|.ods|.csv|.pptx|.ppsx|.rtf|.txt|.mht|.html|.htm
-files.docservice.convert-docs=.doc|.odt|.xls|.ods|.ppt|.pps|.odp|.rtf|.mht|.html|.htm|.epub
+files.docservice.viewed-docs=.pdf|.djvu|.xps
+files.docservice.edited-docs=.docx|.xlsx|.csv|.pptx|.ppsx|.txt
+files.docservice.convert-docs=.docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.epub
 files.docservice.timeout=120000
 
-files.docservice.url.storage=https://doc.onlyoffice.com/FileUploader.ashx
-files.docservice.url.converter=https://doc.onlyoffice.com/ConvertService.ashx
-files.docservice.url.tempstorage=https://doc.onlyoffice.com/ResourceService.ashx
-files.docservice.url.api=https://doc.onlyoffice.com/web-apps/apps/api/documents/api.js
-files.docservice.url.preloader=https://doc.onlyoffice.com/web-apps/apps/api/documents/cache-scripts.html
+files.docservice.url.converter=https://documentserver/ConvertService.ashx
+files.docservice.url.tempstorage=https://documentserver/ResourceService.ashx
+files.docservice.url.api=https://documentserver/web-apps/apps/api/documents/api.js
+files.docservice.url.preloader=https://documentserver/web-apps/apps/api/documents/cache-scripts.html

web/documentserver-example/java/src/main/webapp/css/editor.css

@@ -1,25 +1,26 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 

web/documentserver-example/java/src/main/webapp/css/stylesheet.css

@@ -1,25 +1,26 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 

web/documentserver-example/java/src/main/webapp/editor.jsp

@@ -1,25 +1,26 @@
 <!--*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 *-->
 
@@ -35,10 +36,11 @@
 <html>
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>ONLYOFFICE™</title>
+        <title>ONLYOFFICE</title>
         <link rel="icon" href="favicon.ico" type="image/x-icon" />
         <link rel="stylesheet" type="text/css" href="css/editor.css" />
 
+        <% DocumentManager.Init(request, response); %>
         <% FileModel Model = (FileModel)request.getAttribute("file"); %>
 
         <script type="text/javascript" src="${docserviceApiUrl}"></script>
@@ -72,6 +74,10 @@
                 innerAlert(event.data);
         };
 
+        var onOutdatedVersion = function (event) {
+            location.reload(true);
+        };
+
         var сonnectEditor = function () {
 
             docEditor = new DocsAPI.DocEditor("iframeEditor",
@@ -106,8 +112,7 @@
 
                         user: {
                             id: "<%= Model.CurUserHostAddress() %>",
-                            firstname: "John",
-                            lastname: "Smith",
+                            name: "John Smith",
                         },
 
                         embedded: {
@@ -130,6 +135,7 @@
                         "onDocumentStateChange": onDocumentStateChange,
                         'onRequestEditRights': onRequestEditRights,
                         "onError": onError,
+                        "onOutdatedVersion": onOutdatedVersion,
                     }
                 });
         };
@@ -140,23 +146,6 @@
             window.attachEvent("load", сonnectEditor);
         }
 
-        function getXmlHttp() {
-            var xmlhttp;
-            try {
-                xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
-            } catch (e) {
-                try {
-                    xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
-                } catch (ex) {
-                    xmlhttp = false;
-                }
-            }
-            if (!xmlhttp && typeof XMLHttpRequest !== "undefined") {
-                xmlhttp = new XMLHttpRequest();
-            }
-            return xmlhttp;
-        }
-
     </script>
         
     </head>

web/documentserver-example/java/src/main/webapp/index.jsp

@@ -1,25 +1,26 @@
 <!--*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 *-->
 
@@ -32,7 +33,7 @@
 <html>
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>ONLYOFFICE™</title>
+        <title>ONLYOFFICE</title>
         <link rel="icon" href="favicon.ico" type="image/x-icon" />
         <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Open+Sans:900,800,700,600,500,400,300&subset=latin,cyrillic-ext,cyrillic,latin-ext" />
         <link rel="stylesheet" type="text/css" href="css/stylesheet.css" />
@@ -43,10 +44,10 @@
         <div class="top-panel"></div>
         
         <div class="main-panel">
-            <span class="portal-name">ONLYOFFICE™ Online Editors</span>
+            <span class="portal-name">ONLYOFFICE Document Editors</span>
             <br />
             <br />
-            <span class="portal-descr">Get started with a demo-sample of ONLYOFFICE™ Online Editors, the first html5-based editors. You may upload your own documents for testing using the "Choose file" button and selecting the necessary files on your PC.</span>
+            <span class="portal-descr">Get started with a demo-sample of ONLYOFFICE Document Editors, the first html5-based editors. You may upload your own documents for testing using the "Choose file" button and selecting the necessary files on your PC.</span>
 
             <div class="file-upload button gray">
                 <span>Choose file</span>

web/documentserver-example/java/src/main/webapp/scripts/jscript.js

@@ -1,25 +1,26 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 

web/documentserver-example/js/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 ONLYOFFICE
+Copyright (c) 2018 ONLYOFFICE
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

web/documentserver-example/js/OnlineEditorsExampleJS.html

@@ -1,25 +1,26 @@
 <!--*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 *-->
 
@@ -27,12 +28,12 @@
 <head>
     <meta http-equiv='Content-Type' content='text/html; charset=utf-8'>
 
-    <title>ONLYOFFICE™</title>
+    <title>ONLYOFFICE</title>
 
     <link href="stylesheet.css" type="text/css" rel="stylesheet">
 
-    <!--Change the address on installed ONLYOFFICE™ Online Editors-->
-    <script id="scriptApi" type="text/javascript" src="https://doc.onlyoffice.com/web-apps/apps/api/documents/api.js"></script>
+    <!--Change the address on installed ONLYOFFICE Document Editors-->
+    <script id="scriptApi" type="text/javascript" src="https://documentserver/web-apps/apps/api/documents/api.js"></script>
 
 
     <script type="text/javascript" src="init.js"></script>
@@ -42,10 +43,10 @@
     <div id="page">
         <div class="top-panel"></div>
         <div id="mainPanel" class="main-panel">
-            <span class="portal-name">ONLYOFFICE™ Online Editors</span>
+            <span class="portal-name">ONLYOFFICE Document Editors</span>
             <br />
             <br />
-            <span class="portal-descr">Get started with a demo-sample of ONLYOFFICE™ Online Editors, the first html5-based editors. You may enter url your own document for testing.</span>
+            <span class="portal-descr">Get started with a demo-sample of ONLYOFFICE Document Editors, the first html5-based editors. You may enter url your own document for testing.</span>
             <textarea id="documentUrl" class="document-url">http://onlyo.co/1x5REbq?demo.docx</textarea>
             <br />
             <br />

web/documentserver-example/js/init.js

@@ -1,25 +1,26 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 
@@ -72,8 +73,8 @@ function key(k) {
 };
 
 var getDocumentType = function (ext) {
-    if (".docx.doc.odt.rtf.txt.html.htm.mht.pdf.djvu.fb2.epub.xps".indexOf(ext) != -1) return "text";
-    if (".xls.xlsx.ods.csv".indexOf(ext) != -1) return "spreadsheet";
-    if (".pps.ppsx.ppt.pptx.odp".indexOf(ext) != -1) return "presentation";
+    if (".doc.docx.docm.dot.dotx.dotm.odt.fodt.ott.rtf.txt.html.htm.mht.pdf.djvu.fb2.epub.xps".indexOf(ext) != -1) return "text";
+    if (".xls.xlsx.xlsm.xlt.xltx.xltm.ods.fods.ots.csv".indexOf(ext) != -1) return "spreadsheet";
+    if (".pps.ppsx.ppsm.ppt.pptx.pptm.pot.potx.potm.odp.fodp.otp".indexOf(ext) != -1) return "presentation";
     return null;
 };

web/documentserver-example/js/stylesheet.css

@@ -1,25 +1,26 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 

web/documentserver-example/nodejs/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 ONLYOFFICE
+Copyright (c) 2018 ONLYOFFICE
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

web/documentserver-example/nodejs/app.js

@@ -1,59 +1,69 @@
-/*
+"use strict";
+/*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 
-var express = require("express");
-var path = require("path");
-var favicon = require("serve-favicon");
-var bodyParser = require("body-parser");
-var fileSystem = require("fs");
-var formidable = require("formidable");
-var syncRequest = require("sync-request");
-var config = require('config');
-var configServer = config.get('server');
-var docManager = require("./helpers/docManager");
-var documentService = require("./helpers/documentService");
-var fileUtility = require("./helpers/fileUtility");
-var siteUrl = configServer.get('siteUrl');
-var fileChoiceUrl = configServer.has('fileChoiceUrl') ? configServer.get('fileChoiceUrl') : "";
-var plugins = config.get('plugins');
+const express = require("express");
+const path = require("path");
+const favicon = require("serve-favicon");
+const bodyParser = require("body-parser");
+const fileSystem = require("fs");
+const formidable = require("formidable");
+const syncRequest = require("sync-request");
+const jwt = require('jsonwebtoken');
+const config = require('config');
+const configServer = config.get('server');
+const mime = require("mime");
+const docManager = require("./helpers/docManager");
+const documentService = require("./helpers/documentService");
+const fileUtility = require("./helpers/fileUtility");
+const siteUrl = configServer.get('siteUrl');
+const fileChoiceUrl = configServer.has('fileChoiceUrl') ? configServer.get('fileChoiceUrl') : "";
+const plugins = config.get('plugins');
+const cfgSignatureEnable = configServer.get('token.enable');
+const cfgSignatureUseForRequest = configServer.get('token.useforrequest');
+const cfgSignatureSecretExpiresIn = configServer.get('token.expiresIn');
+const cfgSignatureSecret = configServer.get('token.secret');
 
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
 
 
 String.prototype.hashCode = function () {
-    for (var ret = 0, i = 0, len = this.length; i < len; i++) {
+	const len = this.length;
+	let ret = 0;
+    for (let i = 0; i < len; i++) {
         ret = (31 * ret + this.charCodeAt(i)) << 0;
     }
     return ret;
 };
 String.prototype.format = function () {
-    var text = this.toString();
+    let text = this.toString();
 
     if (!arguments.length) return text;
 
-    for (var i = 0; i < arguments.length; i++) {
+    for (let i = 0; i < arguments.length; i++) {
         text = text.replace(new RegExp("\\{" + i + "\\}", "gi"), arguments[i]);
     }
 
@@ -61,11 +71,9 @@ String.prototype.format = function () {
 };
 
 
-var app = express();
-
-
+const app = express();
 app.set("views", path.join(__dirname, "views"));
-app.set("view engine", "ejs")
+app.set("view engine", "ejs");
 
 
 app.use(function (req, res, next) {
@@ -74,6 +82,13 @@ app.use(function (req, res, next) {
 });
 
 app.use(express.static(path.join(__dirname, "public")));
+if (config.has('server.static')) {
+  const staticContent = config.get('server.static');
+  for (let i = 0; i < staticContent.length; ++i) {
+    const staticContentElem = staticContent[i];
+    app.use(staticContentElem['name'], express.static(staticContentElem['path'], staticContentElem['options']));
+  }
+}
 app.use(favicon(__dirname + "/public/images/favicon.ico"));
 
 
@@ -103,37 +118,74 @@ app.get("/", function (req, res) {
     }
 });
 
+app.get("/download", function(req, res) {
+    docManager.init(__dirname, req, res);
+
+    var fileName = fileUtility.getFileName(req.query.fileName);
+    var userAddress = docManager.curUserHostAddress();
+
+    var path = docManager.forcesavePath(fileName, userAddress, false);
+    if (path == "") {
+        path = docManager.storagePath(fileName, userAddress);
+    }
+
+    res.setHeader("Content-Length", fileSystem.statSync(path).size);
+    res.setHeader("Content-Type", mime.lookup(path));
+
+    res.setHeader("Content-Disposition", "attachment; filename=\"" + fileName + "\"");
+
+    var filestream = fileSystem.createReadStream(path);
+    filestream.pipe(res);
+});
+
 app.post("/upload", function (req, res) {
 
     docManager.init(__dirname, req, res);
     docManager.storagePath(""); //mkdir if not exist
 
-    var userIp = docManager.curUserHostAddress();
-    var uploadDir = "./public/" + configServer.get('storageFolder') + "/" + userIp;
+    const userIp = docManager.curUserHostAddress();
+    const uploadDir = path.join("./public", configServer.get('storageFolder'), userIp);
+    const uploadDirTmp = path.join(uploadDir, 'tmp');
+    docManager.createDirectory(uploadDirTmp);
 
-    var form = new formidable.IncomingForm();
-    form.uploadDir = uploadDir;
+    const form = new formidable.IncomingForm();
+    form.uploadDir = uploadDirTmp;
     form.keepExtensions = true;
+    form.maxFileSize = configServer.get("maxFileSize");
 
     form.parse(req, function (err, fields, files) {
+    	if (err) {
+			docManager.cleanFolderRecursive(uploadDirTmp, true);
+			res.writeHead(200, { "Content-Type": "text/plain" });
+			res.write("{ \"error\": \"" + err.message + "\"}");
+			res.end();
+			return;
+		}
 
-        var file = files.uploadedFile;
+        const file = files.uploadedFile;
+
+        if (file == undefined) {
+            res.writeHead(200, { "Content-Type": "text/plain" });
+            res.write("{ \"error\": \"Uploaded file not found\"}");
+            res.end();
+            return;
+        }
 
         file.name = docManager.getCorrectName(file.name);
 
         if (configServer.get('maxFileSize') < file.size || file.size <= 0) {
-            fileSystem.unlinkSync(file.path);
+			docManager.cleanFolderRecursive(uploadDirTmp, true);
             res.writeHead(200, { "Content-Type": "text/plain" });
             res.write("{ \"error\": \"File size is incorrect\"}");
             res.end();
             return;
         }
 
-        var exts = [].concat(configServer.get('viewedDocs'), configServer.get('editedDocs'), configServer.get('convertedDocs'));
-        var curExt = fileUtility.getFileExtension(file.name);
+        const exts = [].concat(configServer.get('viewedDocs'), configServer.get('editedDocs'), configServer.get('convertedDocs'));
+        const curExt = fileUtility.getFileExtension(file.name);
 
         if (exts.indexOf(curExt) == -1) {
-            fileSystem.unlinkSync(file.path);
+			docManager.cleanFolderRecursive(uploadDirTmp, true);
             res.writeHead(200, { "Content-Type": "text/plain" });
             res.write("{ \"error\": \"File type is not supported\"}");
             res.end();
@@ -141,17 +193,17 @@ app.post("/upload", function (req, res) {
         }
 
         fileSystem.rename(file.path, uploadDir + "/" + file.name, function (err) {
+			docManager.cleanFolderRecursive(uploadDirTmp, true);
             res.writeHead(200, { "Content-Type": "text/plain" });
             if (err) {
                 res.write("{ \"error\": \"" + err + "\"}");
             } else {
                 res.write("{ \"filename\": \"" + file.name + "\"}");
 
-                var userid = req.query.userid ? req.query.userid : "uid-1";
-                var firstname = req.query.firstname ? req.query.firstname : "Jonn";
-                var lastname = req.query.lastname ? req.query.lastname : "Smith";
+                const userid = req.query.userid ? req.query.userid : "uid-1";
+                const name = req.query.name ? req.query.name : "Jonn Smith";
 
-                docManager.saveFileData(file.name, userid, firstname + " " + lastname);
+                docManager.saveFileData(file.name, userid, name);
             }
             res.end();
         });
@@ -179,6 +231,7 @@ app.get("/convert", function (req, res) {
         if (error != null)
             result["error"] = error;
 
+        response.setHeader("Content-Type", "application/json");
         response.write(JSON.stringify(result));
         response.end();
     };
@@ -218,7 +271,7 @@ app.get("/convert", function (req, res) {
 
             fileSystem.renameSync(path.join(correctHistoryPath, fileName + ".txt"), path.join(correctHistoryPath, correctName + ".txt"));
 
-            writeResult(correctName, null, null);
+            writeResult(correctName, result, null);
         } catch (e) {
             console.log(e);
             writeResult(null, null, "Server error");
@@ -227,8 +280,12 @@ app.get("/convert", function (req, res) {
 
     try {
         if (configServer.get('convertedDocs').indexOf(fileExt) != -1) {
-            var key = documentService.generateRevisionId(fileUri);
-            documentService.getConvertedUriAsync(fileUri, fileExt, internalFileExt, key, callback);
+            let storagePath = docManager.storagePath(fileName);
+            const stat = fileSystem.statSync(storagePath);
+            let key = fileUri + stat.mtime.getTime();
+
+            key = documentService.generateRevisionId(key);
+            documentService.getConvertedUri(fileUri, fileExt, internalFileExt, key, true, callback);
         } else {
             writeResult(fileName, null, null);
         }
@@ -240,31 +297,20 @@ app.get("/convert", function (req, res) {
 
 app.delete("/file", function (req, res) {
     try {
-        docManager.init(__dirname, req, res);
+    	docManager.init(__dirname, req, res);
+        let fileName = req.query.filename;
+        if (fileName) {
+			fileName = fileUtility.getFileName(fileName);
 
-        var fileName = fileUtility.getFileName(req.query.filename);
+			const filePath = docManager.storagePath(fileName);
+			fileSystem.unlinkSync(filePath);
 
-        var filePath = docManager.storagePath(fileName)
-        fileSystem.unlinkSync(filePath);
-
-        var userAddress = docManager.curUserHostAddress();
-        var historyPath = docManager.historyPath(fileName, userAddress, true);
-
-        var deleteFolderRecursive = function (path) {
-            if (fileSystem.existsSync(path)) {
-                var files = fileSystem.readdirSync(path);
-                files.forEach(function (file, index) {
-                    var curPath = path + "/" + file;
-                    if (fileSystem.lstatSync(curPath).isDirectory()) {
-                        deleteFolderRecursive(curPath);
-                    } else {
-                        fileSystem.unlinkSync(curPath);
-                    }
-                });
-                fileSystem.rmdirSync(path);
-            }
-        };
-        deleteFolderRecursive(historyPath);
+			const userAddress = docManager.curUserHostAddress();
+			const historyPath = docManager.historyPath(fileName, userAddress, true);
+			docManager.cleanFolderRecursive(historyPath, true);
+		} else {
+			docManager.cleanFolderRecursive(docManager.storagePath(''), false);
+		}
 
         res.write("{\"success\":true}");
     } catch (ex) {
@@ -284,9 +330,7 @@ app.post("/track", function (req, res) {
 
     var processTrack = function (response, body, fileName, userAddress) {
 
-        var processSave = function (body, fileName, userAddress, newVersion) {
-
-            var downloadUri = body.url;
+        var processSave = function (downloadUri, body, fileName, userAddress, resp) {
             var curExt = fileUtility.getFileExtension(fileName);
             var downloadExt = fileUtility.getFileExtension(downloadUri);
 
@@ -294,7 +338,10 @@ app.post("/track", function (req, res) {
                 var key = documentService.generateRevisionId(downloadUri);
 
                 try {
-                    downloadUri = documentService.getConvertedUri(downloadUri, downloadExt, curExt, key);
+                    documentService.getConvertedUriSync(downloadUri, downloadExt, curExt, key, function (dUri) {
+                        processSave(dUri, body, fileName, userAddress, resp)
+                    });
+                    return;
                 } catch (ex) {
                     console.log(ex);
                     fileName = docManager.getCorrectName(fileUtility.getFileName(fileName, true) + downloadExt, userAddress)
@@ -305,7 +352,7 @@ app.post("/track", function (req, res) {
 
                 var path = docManager.storagePath(fileName, userAddress);
 
-                if (newVersion) {
+                if (docManager.existsSync(path)) {
                     var historyPath = docManager.historyPath(fileName, userAddress);
                     if (historyPath == "") {
                         historyPath = docManager.historyPath(fileName, userAddress, true);
@@ -314,7 +361,7 @@ app.post("/track", function (req, res) {
 
                     var count_version = docManager.countVersion(historyPath);
                     version = count_version + 1;
-                    versionPath = docManager.versionPath(fileName, userAddress, version);
+                    var versionPath = docManager.versionPath(fileName, userAddress, version);
                     docManager.createDirectory(versionPath);
 
                     var downloadZip = body.changesurl;
@@ -335,14 +382,59 @@ app.post("/track", function (req, res) {
 
                     var path_prev = docManager.prevFilePath(fileName, userAddress, version);
                     fileSystem.writeFileSync(path_prev, fileSystem.readFileSync(path));
-                }
 
-                var file = syncRequest("GET", downloadUri);
-                fileSystem.writeFileSync(path, file.getBody());
+                    var file = syncRequest("GET", downloadUri);
+                    fileSystem.writeFileSync(path, file.getBody());
+
+                    var forcesavePath = docManager.forcesavePath(fileName, userAddress, false);
+                    if (forcesavePath != "") {
+                        fileSystem.unlinkSync(forcesavePath);
+                    }
+                }
             } catch (ex) {
                 console.log(ex);
             }
-        }
+
+            response.write("{\"error\":0}");
+            response.end();
+        };
+
+        var processForceSave = function (downloadUri, body, fileName, userAddress, resp) {
+            var curExt = fileUtility.getFileExtension(fileName);
+            var downloadExt = fileUtility.getFileExtension(downloadUri);
+
+            if (downloadExt != curExt) {
+                var key = documentService.generateRevisionId(downloadUri);
+
+                try {
+                    documentService.getConvertedUriSync(downloadUri, downloadExt, curExt, key, function (dUri) {
+                        processForceSave(dUri, body, fileName, userAddress, resp)
+                    });
+                    return;
+                } catch (ex) {
+                    console.log(ex);
+                    fileName = docManager.getCorrectName(fileUtility.getFileName(fileName, true) + downloadExt, userAddress)
+                }
+            }
+
+            try {
+
+                var path = docManager.storagePath(fileName, userAddress);
+
+                var forcesavePath = docManager.forcesavePath(fileName, userAddress, false);
+                if (forcesavePath == "") {
+                    forcesavePath = docManager.forcesavePath(fileName, userAddress, true);
+                }
+
+                var file = syncRequest("GET", downloadUri);
+                fileSystem.writeFileSync(forcesavePath, file.getBody());
+            } catch (ex) {
+                console.log(ex);
+            }
+
+            response.write("{\"error\":0}");
+            response.end();
+        };
 
         if (body.status == 1) { //Editing
             if (body.actions && body.actions[0].type == 0) { //finished edit
@@ -356,15 +448,18 @@ app.post("/track", function (req, res) {
                     }
                 }
             }
+
         } else if (body.status == 2 || body.status == 3) { //MustSave, Corrupted
-            processSave(body, fileName, userAddress, true);
+            processSave(body.url, body, fileName, userAddress, response);
+            return;
         } else if (body.status == 6 || body.status == 7) { //MustForceSave, CorruptedForceSave
-            processSave(body, fileName, userAddress);
+            processForceSave(body.url, body, fileName, userAddress, response);
+            return;
         }
 
         response.write("{\"error\":0}");
         response.end();
-    }
+    };
 
     var readbody = function (request, response, fileName, userAddress) {
         var content = "";
@@ -375,6 +470,37 @@ app.post("/track", function (req, res) {
             var body = JSON.parse(content);
             processTrack(response, body, fileName, userAddress);
         });
+    };
+
+    //checkjwt
+    if (cfgSignatureEnable && cfgSignatureUseForRequest) {
+        var body = null;
+        if (req.body.hasOwnProperty("token")) {
+            body = documentService.readToken(req.body.token);
+        } else {
+            var checkJwtHeaderRes = documentService.checkJwtHeader(req);
+            if (checkJwtHeaderRes) {
+                var body;
+                if (checkJwtHeaderRes.payload) {
+                    body = checkJwtHeaderRes.payload;
+                }
+                if (checkJwtHeaderRes.query) {
+                    if (checkJwtHeaderRes.query.useraddress) {
+                        userAddress = checkJwtHeaderRes.query.useraddress;
+                    }
+                    if (checkJwtHeaderRes.query.filename) {
+                        fileName = fileUtility.getFileName(checkJwtHeaderRes.query.filename);
+                    }
+                }
+            }
+        }
+        if (body == null) {
+            res.write("{\"error\":1}");
+            res.end();
+            return;
+        }
+        processTrack(res, body, fileName, userAddress);
+        return;
     }
 
     if (req.body.hasOwnProperty("status")) {
@@ -391,59 +517,84 @@ app.get("/editor", function (req, res) {
 
         var fileExt = req.query.fileExt;
         var history = [];
-        var prevUrl = [];
-        var diff = [];
+        var historyData = [];
         var lang = docManager.getLang();
         var userid = req.query.userid ? req.query.userid : "uid-1";
-        var firstname = req.query.firstname ? req.query.firstname : "Jonn";
-        var lastname = req.query.lastname ? req.query.lastname : "Smith";
+        var name = req.query.name ? req.query.name : "Jonn Smith";
 
         if (fileExt != null) {
-            var fileName = docManager.createDemo((req.query.sample ? "sample." : "new.") + fileExt, userid, firstname + " " + lastname);
+            var fileName = docManager.createDemo((req.query.sample ? "sample." : "new.") + fileExt, userid, name);
 
-            var redirectPath = docManager.getProtocol() + "://" + docManager.req.get("host") + "/editor?fileName=" + encodeURIComponent(fileName) + docManager.getCustomParams();
+            var redirectPath = docManager.getServerUrl() + "/editor?fileName=" + encodeURIComponent(fileName) + docManager.getCustomParams();
             res.redirect(redirectPath);
             return;
         }
 
         var userAddress = docManager.curUserHostAddress();
-        fileName = fileUtility.getFileName(req.query.fileName);
+        var fileName = fileUtility.getFileName(req.query.fileName);
         var key = docManager.getKey(fileName);
         var url = docManager.getFileUri(fileName);
-        var mode = req.query.mode || "edit"; //mode: view/edit 
-        var type = req.query.type || "desktop"; //type: embedded/mobile/desktop
+        var mode = req.query.mode || "edit"; //mode: view/edit/review/comment/fillForms/embedded
+        var type = req.query.type || ""; //type: embedded/mobile/desktop
+        if (type == "") {
+                type = new RegExp(configServer.get("mobileRegEx"), "i").test(req.get('User-Agent')) ? "mobile" : "desktop";
+            }
+
         var canEdit = configServer.get('editedDocs').indexOf(fileUtility.getFileExtension(fileName)) != -1;
 
         var countVersion = 1;
 
         var historyPath = docManager.historyPath(fileName, userAddress);
-        changes = null;
+        var changes = null;
+        var keyVersion = key;
 
         if (historyPath != '') {
 
             countVersion = docManager.countVersion(historyPath) + 1;
-            var prevPath = docManager.getlocalFileUri(fileName, 1) + "/prev" + fileUtility.getFileExtension(fileName);
-            var diffPath = null;
-            for (var i = 1; i < countVersion; i++) {
-                var keyPath = docManager.keyPath(fileName, userAddress, i);
-                var keyVersion = "" + fileSystem.readFileSync(keyPath);
+            for (var i = 1; i <= countVersion; i++) {
+                if (i < countVersion) {
+                    var keyPath = docManager.keyPath(fileName, userAddress, i);
+                    keyVersion = "" + fileSystem.readFileSync(keyPath);
+                } else {
+                    keyVersion = key;
+                }
                 history.push(docManager.getHistory(fileName, changes, keyVersion, i));
 
-                prevUrl.push(prevPath);
-                prevPath = docManager.getlocalFileUri(fileName, i) + "/prev" + fileUtility.getFileExtension(fileName);
+                var historyD = {
+                    version: i,
+                    key: keyVersion,
+                    url: i == countVersion ? url : (docManager.getlocalFileUri(fileName, i, true) + "/prev" + fileUtility.getFileExtension(fileName)),
+                };
 
-                diff.push(diffPath);
-                diffPath = docManager.getlocalFileUri(fileName, i) + "/diff.zip";
+                if (i > 1 && docManager.existsSync(docManager.diffPath(fileName, userAddress, i-1))) {
+                    historyD.previous = {
+                        key: historyData[i-2].key,
+                        url: historyData[i-2].url,
+                    };
+                    historyD.changesUrl = docManager.getlocalFileUri(fileName, i-1) + "/diff.zip";
+                }
 
-                var changesFile = docManager.changesPath(fileName, userAddress, i);
-                var changes = docManager.getChanges(changesFile);
+                historyData.push(historyD);
+                
+                if (i < countVersion) {
+                    var changesFile = docManager.changesPath(fileName, userAddress, i);
+                    changes = docManager.getChanges(changesFile);
+                }
             }
-            prevUrl.push(prevPath);
-            diff.push(diffPath);
         } else {
-            prevUrl.push(url);
+            history.push(docManager.getHistory(fileName, changes, keyVersion, countVersion));
+            historyData.push({
+                version: countVersion,
+                key: key,
+                url: url
+            });
+        }
+
+        if (cfgSignatureEnable) {
+            for (var i = 0; i < historyData.length; i++) {
+                historyData[i].token = jwt.sign(historyData[i], cfgSignatureSecret, {expiresIn: cfgSignatureSecretExpiresIn});
+            }
         }
-        history.push(docManager.getHistory(fileName, changes, key, countVersion));
 
         var argss = {
             apiUrl: siteUrl + configServer.get('apiUrl'),
@@ -451,33 +602,46 @@ app.get("/editor", function (req, res) {
                 name: fileName,
                 ext: fileUtility.getFileExtension(fileName, true),
                 uri: url,
-                version: countVersion
+                version: countVersion,
+                created: new Date().toDateString()
             },
             editor: {
                 type: type,
                 documentType: fileUtility.getFileType(fileName),
                 key: key,
+                token: "",
                 callbackUrl: docManager.getCallback(fileName),
-                isEdit: canEdit,
+                isEdit: canEdit && (mode == "edit" || mode == "filter"),
+                review: mode == "edit" || mode == "review",
+                comment: mode != "view" && mode != "fillForms" && mode != "embedded",
+                fillForms: mode != "view" && mode != "comment" && mode != "embedded",
+                modifyFilter: mode != "filter",
                 mode: canEdit && mode != "view" ? "edit" : "view",
                 canBackToFolder: type != "embedded",
-                getServerUrl: docManager.getServerUrl(),
+                backUrl: docManager.getServerUrl(),
                 curUserHostAddress: docManager.curUserHostAddress(),
                 lang: lang,
                 userid: userid,
-                firstname: firstname,
-                lastname: lastname,
+                name: name,
                 fileChoiceUrl: fileChoiceUrl,
-                plugins: plugins
+                plugins: JSON.stringify(plugins)
             },
             history: history,
-            setHistoryData: {
-                url: prevUrl,
-                urlDiff: diff
-            }
+            historyData: historyData
         };
 
-        res.render("editor", argss);
+        if (cfgSignatureEnable) {
+            app.render('config', argss, function(err, html){
+                if (err) {
+                    console.log(err);
+                } else {
+                    argss.editor.token = jwt.sign(JSON.parse("{"+html+"}"), cfgSignatureSecret, {expiresIn: cfgSignatureSecretExpiresIn});
+                }
+                res.render("editor", argss);
+              });
+        } else {
+              res.render("editor", argss);
+        }
     }
     catch (ex) {
         console.log(ex);
@@ -487,7 +651,7 @@ app.get("/editor", function (req, res) {
 });
 
 app.use(function (req, res, next) {
-    var err = new Error("Not Found");
+    const err = new Error("Not Found");
     err.status = 404;
     next(err);
 });

web/documentserver-example/nodejs/config/default.json

@@ -12,29 +12,36 @@
   },
   "server": {
     "port": 3000,
-    "siteUrl": "https://doc.onlyoffice.com/",
+    "siteUrl": "https://documentserver/",
     "commandUrl": "coauthoring/CommandService.ashx",
-    "storageUrl": "FileUploader.ashx",
     "converterUrl": "ConvertService.ashx",
     "tempStorageUrl": "ResourceService.ashx",
     "apiUrl": "web-apps/apps/api/documents/api.js",
     "preloaderUrl": "web-apps/apps/api/documents/cache-scripts.html",
-    "viewedDocs": [".ppt", ".pps", ".odp", ".pdf", ".djvu", ".epub", ".xps"],
-    "editedDocs": [".docx", ".doc", ".odt", ".xlsx", ".xls", ".ods", ".csv", ".pptx", ".ppsx", ".rtf", ".txt", ".mht", ".html", ".htm"],
-    "convertedDocs": [".doc", ".odt", ".xls", ".ods", ".ppt", ".pps", ".odp", ".rtf", ".mht", ".html", ".htm", ".epub"],
+    "exampleUrl": null,
+    "viewedDocs": [".pdf", ".djvu", ".xps"],
+    "editedDocs": [".docx", ".xlsx", ".csv", ".pptx", ".ppsx", ".txt"],
+    "convertedDocs": [".docm", ".doc", ".dotx", ".dotm", ".dot", ".odt", ".fodt", ".ott", ".xlsm", ".xls", ".xltx", ".xltm", ".xlt", ".ods", ".fods", ".ots", ".pptm", ".ppt", ".ppsm", ".pps", ".potx", ".potm", ".pot", ".odp", ".fodp", ".otp", ".rtf", ".mht", ".html", ".htm", ".epub"],
     "storageFolder": "files",
-    "maxFileSize": 1073741824
+    "maxFileSize": 1073741824,
+    "mobileRegEx": "android|avantgo|playbook|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od|ad)|iris|kindle|lge |maemo|midp|mmp|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\\/|plucker|pocket|psp|symbian|treo|up\\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino",
+    "static":[
+      {
+        "name": "/public",
+        "path": "public"
+      }
+    ],
+    "token": {
+        "enable": false,
+        "useforrequest": true,
+        "algorithmRequest": "HS256",
+        "authorizationHeader": "Authorization",
+        "authorizationHeaderPrefix": "Bearer ",
+        "secret": "secret",
+        "expiresIn": "5m"
+    }
   },
   "plugins": {
-    "url": "../../../../sdkjs-plugins/",
-    "pluginsData": [
-		"helloworld/config.json",
-		"chess/config.json",
-		"speech/config.json",
-		"youtube/config.json",
-		"cbr/config.json",
-		"ocr/config.json",
-		"clipart/config.json"
-    ]
+    "pluginsData": []
   }
-}
+}

web/documentserver-example/nodejs/config/development-mac.json

@@ -1,6 +1,8 @@
 {
   "server": {
     "port": 3000,
-    "siteUrl": "http://127.0.0.1:8080/"
+    "siteUrl": "http://127.0.0.1:8080/",
+    "apiUrl": "web-apps-pro/apps/api/documents/api.js",
+    "preloaderUrl": "web-apps-pro/apps/api/documents/cache-scripts.html"
   }
 }

web/documentserver-example/nodejs/config/development-windows.json

@@ -1,6 +1,8 @@
-{
+{
   "server": {
     "port": 80,
-    "siteUrl": "http://127.0.0.1:8001/"
+    "siteUrl": "http://127.0.0.1:8001/",	
+    "apiUrl": "web-apps-pro/apps/api/documents/api.js",
+    "preloaderUrl": "web-apps-pro/apps/api/documents/cache-scripts.html"
   }
 }

web/documentserver-example/nodejs/config/production-linux.json

@@ -2,8 +2,5 @@
   "server": {
     "siteUrl": "/",
     "maxFileSize": 104857600
-  },
-  "plugins": {
-    "url": "/sdkjs-plugins/"
   }
 }

web/documentserver-example/nodejs/config/production-windows.json

@@ -1,9 +1,13 @@
 {
   "server": {
     "siteUrl": "/",
-    "maxFileSize": 104857600
-  },
-  "plugins": {
-    "url": "/sdkjs-plugins/"
+    "maxFileSize": 104857600,
+    "static":[
+      {
+        "name": "/public",
+        "path": "public",
+        "options": {"maxAge": "7d"}
+      }
+    ]
   }
 }

web/documentserver-example/nodejs/helpers/cacheManager.js

@@ -1,25 +1,26 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 

web/documentserver-example/nodejs/helpers/docManager.js

@@ -1,52 +1,48 @@
+"use strict";
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 
-var path = require("path");
-var fileSystem = require("fs");
-var fileUtility = require("./fileUtility");
-var documentService = require("./documentService");
-var cacheManager = require("./cacheManager");
-var guidManager = require("./guidManager");
-var configServer = require('config').get('server');
-var storageFolder = configServer.get('storageFolder');
-var os = require("os");
-const readline = require('readline');
+const path = require("path");
+const fileSystem = require("fs");
+const fileUtility = require("./fileUtility");
+const documentService = require("./documentService");
+const cacheManager = require("./cacheManager");
+const guidManager = require("./guidManager");
+const configServer = require('config').get('server');
+const storageFolder = configServer.get('storageFolder');
+const os = require("os");
 
-const rl = readline.createInterface({
-  input: process.stdin,
-  output: process.stdout
-});
-
-var docManager = {};
+let docManager = {};
 
 docManager.dir = null;
 docManager.req = null;
 docManager.res = null;
 
 docManager.existsSync = function(path) {
-    var res = true;
+    let res = true;
     try {
         fileSystem.accessSync(path, fileSystem.F_OK);
     } catch (e) {
@@ -77,37 +73,34 @@ docManager.getLang = function () {
 };
 
 docManager.getCustomParams = function () {
-    var params = "";
+    let params = "";
 
-    var userid = docManager.req.query.userid;
+    const userid = docManager.req.query.userid;
     params += (userid ? "&userid=" + userid : "");
 
-    var firstname = docManager.req.query.firstname;
-    params += (firstname ? "&firstname=" + firstname : "");
+    const name = docManager.req.query.name;
+    params += (name ? "&name=" + name : "");
 
-    var lastname = docManager.req.query.lastname;
-    params += (lastname ? "&lastname=" + lastname : "");
-
-    var lang = docManager.req.query.lang;
+    const lang = docManager.req.query.lang;
     params += (lang ? "&lang=" + docManager.getLang() : "");
 
-    var fileName = docManager.req.query.fileName;
+    const fileName = docManager.req.query.fileName;
     params += (fileName ? "&fileName=" + fileName : "");
 
-    var mode = docManager.req.query.mode;
+    const mode = docManager.req.query.mode;
     params += (mode ? "&mode=" + mode : "");
 
-    var type = docManager.req.query.type;
+    const type = docManager.req.query.type;
     params += (type ? "&type=" + type : "");
 
     return params;
 };
 
 docManager.getCorrectName = function (fileName, userAddress) {
-    var baseName = fileUtility.getFileName(fileName, true);
-    var ext = fileUtility.getFileExtension(fileName);
-    var name = baseName + ext;
-    var index = 1;
+    const baseName = fileUtility.getFileName(fileName, true);
+    const ext = fileUtility.getFileExtension(fileName);
+    let name = baseName + ext;
+    let index = 1;
 
     while (this.existsSync(docManager.storagePath(name, userAddress))) {
         name = baseName + " (" + index + ")" + ext;
@@ -118,7 +111,7 @@ docManager.getCorrectName = function (fileName, userAddress) {
 };
 
 docManager.createDemo = function (demoName, userid, username) {
-    var fileName = docManager.getCorrectName(demoName);
+    const fileName = docManager.getCorrectName(demoName);
 
     docManager.copyFile(path.join(docManager.dir, "public", "samples", demoName), docManager.storagePath(fileName));
 
@@ -128,64 +121,81 @@ docManager.createDemo = function (demoName, userid, username) {
 };
 
 docManager.saveFileData = function (fileName, userid, username) {
-    var userAddress = docManager.curUserHostAddress();
-    var date_create = fileSystem.statSync(docManager.storagePath(fileName)).mtime;
-    var minutes = (date_create.getMinutes() < 10 ? '0' : '') + date_create.getMinutes().toString();
-    var month = (date_create.getMonth() < 10 ? '0' : '') + (parseInt(date_create.getMonth().toString()) + 1);
-    var sec = (date_create.getSeconds() < 10 ? '0' : '') + date_create.getSeconds().toString();
-    var date_format = date_create.getFullYear() + "-" + month + "-" + date_create.getDate() + " " + date_create.getHours() + ":" + minutes + ":" + sec;
+    const userAddress = docManager.curUserHostAddress();
+    const date_create = fileSystem.statSync(docManager.storagePath(fileName)).mtime;
+    const minutes = (date_create.getMinutes() < 10 ? '0' : '') + date_create.getMinutes().toString();
+    const month = (date_create.getMonth() < 10 ? '0' : '') + (parseInt(date_create.getMonth().toString()) + 1);
+    const sec = (date_create.getSeconds() < 10 ? '0' : '') + date_create.getSeconds().toString();
+    const date_format = date_create.getFullYear() + "-" + month + "-" + date_create.getDate() + " " + date_create.getHours() + ":" + minutes + ":" + sec;
 
-    var file_info = docManager.historyPath(fileName, userAddress, true);
+    const file_info = docManager.historyPath(fileName, userAddress, true);
     this.createDirectory(file_info);
 
     fileSystem.writeFileSync(path.join(file_info, fileName + ".txt"), date_format + "," + userid + "," + username);
 };
 
 docManager.getFileData = function (fileName, userAddress) {
-    var file_info = docManager.historyPath(fileName, userAddress, true);
-    if (!this.existsSync(file_info)) {
-        return ["2016-01-01", "uid-1", "John Smith"];
+    const history = path.join(docManager.historyPath(fileName, userAddress, true), fileName + ".txt");
+    if (!this.existsSync(history)) {
+        return ["2017-01-01", "uid-1", "John Smith"];
     }
 
-    return ((fileSystem.readFileSync(path.join(file_info, fileName + ".txt"))).toString()).split(",");
+    return ((fileSystem.readFileSync(history)).toString()).split(",");
 };
 
 docManager.getFileUri = function (fileName) {
-	return docManager.getlocalFileUri(fileName);
+    return docManager.getlocalFileUri(fileName, 0, true);
 };
 
-docManager.getlocalFileUri = function (fileName, version) {
-    var serverPath = docManager.getProtocol() + "://" + docManager.req.get("host");
-    var storagePath = storageFolder.length ? storageFolder + "/" : "";
-    var hostAddress = docManager.curUserHostAddress();
-    var url = serverPath + "/" + storagePath + hostAddress + "/" + encodeURIComponent(fileName);
+docManager.getlocalFileUri = function (fileName, version, forDocumentServer) {
+    const serverPath = docManager.getServerUrl(forDocumentServer);
+    const storagePath = storageFolder.length ? storageFolder + "/" : "";
+    const hostAddress = docManager.curUserHostAddress();
+    const url = serverPath + "/" + storagePath + hostAddress + "/" + encodeURIComponent(fileName);
     if (!version) {
         return url;
     }
     return url + "-history/" + version;
 };
 
-docManager.getServerUrl = function () {
-    return docManager.getProtocol() + "://" + docManager.req.get("host");
+docManager.getServerUrl = function (forDocumentServer) {
+    return (forDocumentServer && !!configServer.get("exampleUrl")) ? configServer.get("exampleUrl") : (docManager.getProtocol() + "://" + docManager.req.get("host"));
 };
 
 docManager.getCallback = function (fileName) {
-    var server = docManager.getProtocol() + "://" + docManager.req.get("host");
-    var hostAddress = docManager.curUserHostAddress();
-    var handler = "/track?useraddress=" + encodeURIComponent(hostAddress) + "&filename=" + encodeURIComponent(fileName);
+    const server = docManager.getServerUrl(true);
+    const hostAddress = docManager.curUserHostAddress();
+    const handler = "/track?filename=" + encodeURIComponent(fileName) + "&useraddress=" + encodeURIComponent(hostAddress);
 
     return server + handler;
 };
 
 docManager.storagePath = function (fileName, userAddress) {
     fileName = fileUtility.getFileName(fileName);
-    var directory = path.join(docManager.dir, "public", storageFolder, docManager.curUserHostAddress(userAddress));
+    const directory = path.join(docManager.dir, "public", storageFolder, docManager.curUserHostAddress(userAddress));
     this.createDirectory(directory);
     return path.join(directory, fileName);
 };
 
+docManager.forcesavePath = function (fileName, userAddress, create) {
+    let directory = path.join(docManager.dir, "public", storageFolder, docManager.curUserHostAddress(userAddress));
+    if (!this.existsSync(directory)) {
+        return "";
+    }
+    directory = path.join(directory, fileName + "-history");
+    if (!create && !this.existsSync(directory)) {
+        return "";
+    }
+    this.createDirectory(directory);
+    directory = path.join(directory, fileName);
+    if (!create && !this.existsSync(directory)) {
+        return "";
+    }
+    return directory;
+};
+
 docManager.historyPath = function (fileName, userAddress, create) {
-    var directory = path.join(docManager.dir, "public", storageFolder, docManager.curUserHostAddress(userAddress));
+    let directory = path.join(docManager.dir, "public", storageFolder, docManager.curUserHostAddress(userAddress));
     if (!this.existsSync(directory)) {
         return "";
     }
@@ -197,7 +207,7 @@ docManager.historyPath = function (fileName, userAddress, create) {
 };
 
 docManager.versionPath = function (fileName, userAddress, version) {
-    var historyPath = docManager.historyPath(fileName, userAddress, true);
+    const historyPath = docManager.historyPath(fileName, userAddress, true);
     return path.join(historyPath, "" + version);
 };
 
@@ -222,27 +232,28 @@ docManager.changesUser = function (fileName, userAddress, version) {
 };
 
 docManager.getStoredFiles = function () {
-    var directory = path.join(docManager.dir, "public", storageFolder, docManager.curUserHostAddress());
+    const directory = path.join(docManager.dir, "public", storageFolder, docManager.curUserHostAddress());
     this.createDirectory(directory);
-    var result = [];
-    var storedFiles = fileSystem.readdirSync(directory);
-    for (var i = 0; i < storedFiles.length; i++) {
-        var stats = fileSystem.lstatSync(path.join(directory, storedFiles[i]));
+    const result = [];
+    const storedFiles = fileSystem.readdirSync(directory);
+    for (let i = 0; i < storedFiles.length; i++) {
+        const stats = fileSystem.lstatSync(path.join(directory, storedFiles[i]));
 
         if (!stats.isDirectory()) {
 
-            var time = stats.mtime.getTime();
-            var item = {
+            const time = stats.mtime.getTime();
+            const item = {
                 time: time,
                 name: storedFiles[i],
-                url: docManager.getlocalFileUri(storedFiles[i]),
-                documentType: fileUtility.getFileType(storedFiles[i])
+                documentType: fileUtility.getFileType(storedFiles[i]),
+                canEdit: configServer.get("editedDocs").indexOf(fileUtility.getFileExtension(storedFiles[i])) != -1
             };
 
             if (!result.length) {
                 result.push(item);
             } else {
-                for (var j = 0; j < result.length; j++) {
+                let j = 0;
+                for (; j < result.length; j++) {
                     if (time > result[j].time) {
                         break;
                     }
@@ -283,32 +294,35 @@ docManager.getInternalExtension = function (fileType) {
 };
 
 docManager.getKey = function (fileName) {
-    var userAddress = docManager.curUserHostAddress();
-    var key = userAddress + docManager.getlocalFileUri(fileName);
+    const userAddress = docManager.curUserHostAddress();
+    let key = userAddress + docManager.getlocalFileUri(fileName);
 
-    var historyPath = docManager.historyPath(fileName, userAddress);
+    let historyPath = docManager.historyPath(fileName, userAddress);
     if (historyPath != ""){
         key += docManager.countVersion(historyPath);
     }
 
-    historyPath = docManager.historyPath(fileName, userAddress, true);
-    var stat = fileSystem.statSync(historyPath);
-    key += stat.mtime.toString();
+    let storagePath = docManager.storagePath(fileName, userAddress);
+    const stat = fileSystem.statSync(storagePath);
+    key += stat.mtime.getTime();
 
     return documentService.generateRevisionId(key);
 };
 
 docManager.getDate = function (date) {
-    var minutes = (date.getMinutes() < 10 ? '0' : '') + date.getMinutes().toString();
+    const minutes = (date.getMinutes() < 10 ? '0' : '') + date.getMinutes().toString();
     return date.getMonth() + "/" + date.getDate() + "/" + date.getFullYear() + " " + date.getHours() + ":" + minutes;
 };
 
 docManager.getChanges = function (fileName) {
-    return JSON.parse(fileSystem.readFileSync(fileName));
+    if (this.existsSync(fileName)) {
+        return JSON.parse(fileSystem.readFileSync(fileName));
+    }
+    return null;
 };
 
 docManager.countVersion = function(directory) {
-    var i = 0;
+    let i = 0;
     while (this.existsSync(path.join(directory, '' + (i + 1)))) {
         i++;
     }
@@ -316,8 +330,8 @@ docManager.countVersion = function(directory) {
 };
 
 docManager.getHistory = function (fileName, content, keyVersion, version) {
-    var oldVersion = false;
-    var contentJson = null;
+    let oldVersion = false;
+    let contentJson = null;
     if (content) {
         if (content.changes) {
             contentJson = content.changes[0];
@@ -327,21 +341,37 @@ docManager.getHistory = function (fileName, content, keyVersion, version) {
         }
     }
 
-    var userAddress = docManager.curUserHostAddress();
-    var username = content ? (oldVersion ? contentJson.username : contentJson.user.name) : (docManager.getFileData(fileName, userAddress))[2];
-    var userid = content ? (oldVersion ? contentJson.userid : contentJson.user.id) : (docManager.getFileData(fileName, userAddress))[1];
-    var date = content ? (oldVersion ? contentJson.date : contentJson.created) : (docManager.getFileData(fileName, userAddress))[0];
-
-    return {
-        key: keyVersion,
-        version: version,
-        created: date,
-        user: {
-            id: userid,
-            name: username
-        },
-        changes: content
+    const userAddress = docManager.curUserHostAddress();
+    const username = content ? (oldVersion ? contentJson.username : contentJson.user.name) : (docManager.getFileData(fileName, userAddress))[2];
+    const userid = content ? (oldVersion ? contentJson.userid : contentJson.user.id) : (docManager.getFileData(fileName, userAddress))[1];
+    const created = content ? (oldVersion ? contentJson.date : contentJson.created) : (docManager.getFileData(fileName, userAddress))[0];
+    const res = (content && !oldVersion) ? content : {changes: content};
+    res.key = keyVersion;
+    res.version = version;
+    res.created = created;
+    res.user = {
+        id: userid,
+        name: username
     };
+
+    return res;
+};
+
+docManager.cleanFolderRecursive = function (folder, me) {
+    if (fileSystem.existsSync(folder)) {
+        const files = fileSystem.readdirSync(folder);
+        files.forEach((file) => {
+            const curPath = path.join(folder, file);
+            if (fileSystem.lstatSync(curPath).isDirectory()) {
+                this.cleanFolderRecursive(curPath, true);
+            } else {
+                fileSystem.unlinkSync(curPath);
+            }
+        });
+        if (me) {
+            fileSystem.rmdirSync(folder);
+        }
+    }
 };
 
 module.exports = docManager;

web/documentserver-example/nodejs/helpers/documentService.js

@@ -1,85 +1,95 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 
 var path = require("path");
+var urlModule = require("url");
 var urllib = require("urllib");
-var syncRequest = require("sync-request");
-var xml2js = require("xml2js");
+var jwt = require("jsonwebtoken");
+var jwa = require("jwa");
 var fileUtility = require("./fileUtility");
 var guidManager = require("./guidManager");
 var configServer = require('config').get('server');
 var siteUrl = configServer.get('siteUrl');
+var cfgSignatureEnable = configServer.get('token.enable');
+var cfgSignatureUseForRequest = configServer.get('token.useforrequest');
+var cfgSignatureAuthorizationHeader = configServer.get('token.authorizationHeader');
+var cfgSignatureAuthorizationHeaderPrefix = configServer.get('token.authorizationHeaderPrefix');
+var cfgSignatureSecretExpiresIn = configServer.get('token.expiresIn');
+var cfgSignatureSecret = configServer.get('token.secret');
+var cfgSignatureSecretAlgorithmRequest = configServer.get('token.algorithmRequest');
 
 var documentService = {};
 
-documentService.convertParams = "?url={0}&outputtype={1}&filetype={2}&title={3}&key={4}";
-documentService.commandParams = "?c={0}&key={1}";
 documentService.userIp = null;
 
-documentService.getConvertedUri = function (documentUri, fromExtension, toExtension, documentRevisionId) {
-    var xml = documentService.sendRequestToConvertService(documentUri, fromExtension, toExtension, documentRevisionId);
-
-    var res = documentService.getResponseUri(xml);
-
-    return res.value;
+documentService.getConvertedUriSync = function (documentUri, fromExtension, toExtension, documentRevisionId, callback) {
+    documentService.getConvertedUri(documentUri, fromExtension, toExtension, documentRevisionId, false, function (err, data) {
+        if (err) {
+            callback();
+            return;
+        }
+        var res = documentService.getResponseUri(data);
+        callback(res.value);
+    });
 };
 
-documentService.getConvertedUriAsync = function (documentUri, fromExtension, toExtension, documentRevisionId, callback) {
+documentService.getConvertedUri = function (documentUri, fromExtension, toExtension, documentRevisionId, async, callback) {
     fromExtension = fromExtension || fileUtility.getFileExtension(documentUri);
 
     var title = fileUtility.getFileName(documentUri) || guidManager.newGuid();
 
     documentRevisionId = documentService.generateRevisionId(documentRevisionId || documentUri);
 
-    var params = documentService.convertParams.format(
-    encodeURIComponent(documentUri),
-    toExtension.replace(".", ""),
-    fromExtension.replace(".", ""),
-    title,
-    documentRevisionId);
+    var params = {
+        async: async,
+        url: documentUri,
+        outputtype: toExtension.replace(".", ""),
+        filetype: fromExtension.replace(".", ""),
+        title: title,
+        key: documentRevisionId
+    };
 
-    urllib.request(siteUrl + configServer.get('converterUrl') + params, callback);
-};
+    var uri = siteUrl + configServer.get('converterUrl');
+    var headers = {
+        'Content-Type': 'application/json',
+        "Accept": "application/json"
+    };
 
-documentService.getExternalUri = function (fileStream, contentLength, contentType, documentRevisionId) {
-    var params = documentService.convertParams.format("", "", "", "", documentRevisionId);
+    if (cfgSignatureEnable && cfgSignatureUseForRequest) {
+        headers[cfgSignatureAuthorizationHeader] = cfgSignatureAuthorizationHeaderPrefix + this.fillJwtByUrl(uri, params);
+        params.token = documentService.getToken(params);
+    }
 
-    var urlTostorage = siteUrl + configServer.get('storageUrl') + params;
-
-    var response = syncRequest("POST", urlTostorage, {
-        headers: {
-            "Content-Type": contentType == null ? "application/octet-stream" : contentType,
-            "Content-Length": contentLength.toString(),
-            "charset": "utf-8"
+    urllib.request(uri,
+        {
+            method: "POST",
+            headers: headers,
+            data: params
         },
-        body: fileStream
-    });
-
-    var res = documentService.getResponseUri(response.body.toString());
-
-    return res.value;
+        callback);
 };
 
 documentService.generateRevisionId = function (expectedKey) {
@@ -92,34 +102,16 @@ documentService.generateRevisionId = function (expectedKey) {
     return key.substring(0, Math.min(key.length, 20));
 };
 
-documentService.sendRequestToConvertService = function (documentUri, fromExtension, toExtension, documentRevisionId) {
-    fromExtension = fromExtension || fileUtility.getFileExtension(documentUri);
-
-    var title = fileUtility.getFileName(documentUri) || guidManager.newGuid();
-
-    documentRevisionId = documentService.generateRevisionId(documentRevisionId || documentUri);
-
-    var params = documentService.convertParams.format(
-    encodeURIComponent(documentUri),
-    toExtension.replace(".", ""),
-    fromExtension.replace(".", ""),
-    title,
-    documentRevisionId);
-
-    var res = syncRequest("GET", siteUrl + configServer.get('converterUrl') + params);
-    return res.getBody("utf8");
-};
-
 documentService.processConvertServiceResponceError = function (errorCode) {
     var errorMessage = "";
     var errorMessageTemplate = "Error occurred in the ConvertService: ";
 
     switch (errorCode) {
         case -20:
-            errorMessage = errorMessageTemplate + "vkey deciphering error";
+            errorMessage = errorMessageTemplate + "Error encrypt signature";
             break;
         case -8:
-            errorMessage = errorMessageTemplate + "Error document VKey";
+            errorMessage = errorMessageTemplate + "Error document signature";
             break;
         case -7:
             errorMessage = errorMessageTemplate + "Error document request";
@@ -152,33 +144,22 @@ documentService.processConvertServiceResponceError = function (errorCode) {
     throw { message: errorMessage };
 };
 
-documentService.getResponseUri = function (xml) {
-    var json = documentService.convertXmlStringToJson(xml);
+documentService.getResponseUri = function (json) {
+    var fileResult = JSON.parse(json);
 
-    if (!json.FileResult)
-        throw { message: "FileResult node is null" };
+    if (fileResult.error)
+        documentService.processConvertServiceResponceError(parseInt(fileResult.error));
 
-    var fileResult = json.FileResult;
+    var isEndConvert = fileResult.endConvert
 
-    if (fileResult.Error)
-        documentService.processConvertServiceResponceError(parseInt(fileResult.Error[0]));
-
-    if (!fileResult.EndConvert)
-        throw { message: "EndConvert node is null" };
-
-    var isEndConvert = fileResult.EndConvert[0].toLowerCase() === "true";
-
-    if (!fileResult.Percent)
-        throw { message: "Percent node is null" };
-
-    var percent = parseInt(fileResult.Percent[0]);
+    var percent = parseInt(fileResult.percent);
     var uri = null;
 
     if (isEndConvert) {
-        if (!fileResult.FileUrl)
-            throw { message: "FileUrl node is null" };
+        if (!fileResult.fileUrl)
+            throw { message: "FileUrl is null" };
 
-        uri = fileResult.FileUrl[0];
+        uri = fileResult.fileUrl;
         percent = 100;
     } else {
         percent = percent >= 100 ? 99 : percent;
@@ -190,24 +171,65 @@ documentService.getResponseUri = function (xml) {
     };
 };
 
-documentService.convertXmlStringToJson = function (xml) {
-    var res;
+documentService.commandRequest = function (method, documentRevisionId, callback) {
+    documentRevisionId = documentService.generateRevisionId(documentRevisionId);
+    var params = {
+        c: method,
+        key: documentRevisionId
+    };
 
-    xml2js.parseString(xml, function (err, result) {
-        res = result;
-    });
+    var uri = siteUrl + configServer.get('commandUrl');
+    var headers = {
+        'Content-Type': 'application/json'
+    };
+    if (cfgSignatureEnable && cfgSignatureUseForRequest) {
+        headers[cfgSignatureAuthorizationHeader] = cfgSignatureAuthorizationHeaderPrefix + this.fillJwtByUrl(uri, params);
+        params.token = documentService.getToken(params);
+    }
 
-    return res;
+    urllib.request(uri,
+        {
+            method: "POST",
+            headers: headers,
+            data: params
+        },
+        callback);
 };
 
-documentService.commandRequest = function (method, documentRevisionId) {
-    documentRevisionId = documentService.generateRevisionId(documentRevisionId);
-    var params = documentService.commandParams.format(
-    method,
-    documentRevisionId);
+documentService.checkJwtHeader = function (req) {
+  var decoded = null;
+  var authorization = req.get(cfgSignatureAuthorizationHeader);
+  if (authorization && authorization.startsWith(cfgSignatureAuthorizationHeaderPrefix)) {
+    var token = authorization.substring(cfgSignatureAuthorizationHeaderPrefix.length);
+    try {
+      decoded = jwt.verify(token, cfgSignatureSecret);
+    } catch (err) {
+        console.log('checkJwtHeader error: name = ' + err.name + ' message = ' + err.message + ' token = ' + token)
+    }
+  }
+  return decoded;
+}
 
-    var res = syncRequest("GET", siteUrl + configServer.get('commandUrl') + params).getBody("utf8");
-    return JSON.parse(res).error;
+documentService.fillJwtByUrl = function (uri, opt_dataObject, opt_iss, opt_payloadhash) {
+  var parseObject = urlModule.parse(uri, true);
+  var payload = {query: parseObject.query, payload: opt_dataObject, payloadhash: opt_payloadhash};
+
+  var options = {algorithm: cfgSignatureSecretAlgorithmRequest, expiresIn: cfgSignatureSecretExpiresIn, issuer: opt_iss};
+  return jwt.sign(payload, cfgSignatureSecret, options);
+}
+
+documentService.getToken = function (data) {
+    var options = {algorithm: cfgSignatureSecretAlgorithmRequest, expiresIn: cfgSignatureSecretExpiresIn};
+    return jwt.sign(data, cfgSignatureSecret, options);
+};
+
+documentService.readToken = function (token) {
+    try {
+        return jwt.verify(token, cfgSignatureSecret);
+    } catch (err) {
+        console.log('checkJwtHeader error: name = ' + err.name + ' message = ' + err.message + ' token = ' + token)
+    }
+    return null;
 };
 
 module.exports = documentService;

web/documentserver-example/nodejs/helpers/fileUtility.js

@@ -1,25 +1,26 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * The MIT License (MIT)
  *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
 */
 
@@ -76,11 +77,11 @@ fileUtility.fileType = {
     presentation: "presentation"
 }
 
-fileUtility.documentExts = [".docx", ".doc", ".odt", ".rtf", ".txt", ".html", ".htm", ".mht", ".pdf", ".djvu", ".fb2", ".epub", ".xps"];
+fileUtility.documentExts = [".doc", ".docx", ".docm", ".dot", ".dotx", ".dotm", ".odt", ".fodt", ".ott", ".rtf", ".txt", ".html", ".htm", ".mht", ".pdf", ".djvu", ".fb2", ".epub", ".xps"];
 
-fileUtility.spreadsheetExts = [".xls", ".xlsx", ".ods", ".csv"];
+fileUtility.spreadsheetExts = [".xls", ".xlsx", ".xlsm", ".xlt", ".xltx", ".xltm", ".ods", ".fods", ".ots", ".csv"];
 
-fileUtility.presentationExts = [".pps", ".ppsx", ".ppt", ".pptx", ".odp"];
+fileUtility.presentationExts = [".pps", ".ppsx", ".ppsm", ".ppt", ".pptx", ".pptm", ".pot", ".potx", ".potm", ".odp", ".fodp", ".otp"];
 
 function getUrlParams(url) {
     try {