Merge pull request #468 from ONLYOFFICE/release/1.7.0

Release/1.7.0
2026-04-07 14:06:11 +08:00 · 2023-10-30 12:17:35 +03:00
246 changed files with 3151 additions and 6088 deletions
--- a/.github/workflows/artifact-csharp-mvc.yml
+++ b/.github/workflows/artifact-csharp-mvc.yml
@ -3,10 +3,10 @@ name: Artifact Csharp MVC
 on:
  workflow_dispatch:
  push:
-    branches: [master]
+    branches: [master, main]
    paths: ['web/documentserver-example/csharp-mvc/**']
  pull_request:
-    branches: [master]
+    branches: [master, main]
    paths: ['web/documentserver-example/csharp-mvc/**']

 jobs:
--- a/.github/workflows/artifact-csharp.yml
+++ b/.github/workflows/artifact-csharp.yml
@ -3,10 +3,10 @@ name: Artifact Csharp
 on:
  workflow_dispatch:
  push:
-    branches: [master]
+    branches: [master, main]
    paths: ['web/documentserver-example/csharp/**']
  pull_request:
-    branches: [master]
+    branches: [master, main, develop]
    paths: ['web/documentserver-example/csharp/**']

 jobs:
--- a/.github/workflows/artifact-java.yml
+++ b/.github/workflows/artifact-java.yml
@ -3,10 +3,10 @@ name: Artifact Java
 on:
  workflow_dispatch:
  push:
-    branches: [master]
+    branches: [master, main]
    paths: ['web/documentserver-example/java/**']
  pull_request:
-    branches: [master]
+    branches: [master, main]
    paths: ['web/documentserver-example/java/**']

 jobs:
--- a/.github/workflows/artifact-node.yml
+++ b/.github/workflows/artifact-node.yml
@ -3,10 +3,10 @@ name: Artifact Nodejs
 on:
  workflow_dispatch:
  push:
-    branches: [master]
+    branches: [master, main]
    paths: ['web/documentserver-example/nodejs/**']
  pull_request:
-    branches: [master]
+    branches: [master, main]
    paths: ['web/documentserver-example/nodejs/**']

 jobs:
--- a/.github/workflows/artifact-php.yml
+++ b/.github/workflows/artifact-php.yml
@ -3,10 +3,10 @@ name: Artifact PHP
 on:
  workflow_dispatch:
  push:
-    branches: [master]
+    branches: [master, main]
    paths: ['web/documentserver-example/php/**']
  pull_request:
-    branches: [master]
+    branches: [master, main]
    paths: ['web/documentserver-example/php/**']

 jobs:
--- a/.github/workflows/artifact-python.yml
+++ b/.github/workflows/artifact-python.yml
@ -3,10 +3,10 @@ name: Artifact Python
 on:
  workflow_dispatch:
  push:
-    branches: [master]
+    branches: [master, main]
    paths: ['web/documentserver-example/python/**']
  pull_request:
-    branches: [master]
+    branches: [master, main]
    paths: ['web/documentserver-example/python/**']

 jobs:
--- a/.github/workflows/artifact-ruby.yml
+++ b/.github/workflows/artifact-ruby.yml
@ -3,10 +3,10 @@ name: Artifact Ruby
 on:
  workflow_dispatch:
  push:
-    branches: [master]
+    branches: [master, main]
    paths: ['web/documentserver-example/ruby/**']
  pull_request:
-    branches: [master]
+    branches: [master, main]
    paths: ['web/documentserver-example/ruby/**']

 jobs:
--- a/.github/workflows/artifact-spring.yml
+++ b/.github/workflows/artifact-spring.yml
@ -3,10 +3,10 @@ name: Artifact Java Spring
 on:
  workflow_dispatch:
  push:
-    branches: [master]
+    branches: [master, main]
    paths: ['web/documentserver-example/java-spring/**']
  pull_request:
-    branches: [master]
+    branches: [master, main]
    paths: ['web/documentserver-example/java-spring/**']

 jobs:
--- a/.github/workflows/lint-python.yml
+++ b/.github/workflows/lint-python.yml
@ -21,17 +21,20 @@ jobs:
      - name: Set up Python
        uses: actions/setup-python@v4
        with:
-          python-version: '3.11' 
+          python-version: '3.10' 

      - name: Install Dependencies
        run: |
-          make dev
+          python -m pip install --upgrade pip
+          pip install flake8
+          pip install pylint
+          if [ -f requirements.txt ]; then pip install -r requirements.txt; fi

      - name: Lint Flake8
        run: |
-          make lint
-
-      # TODO: Configure mypy
-      # - name: Types mypy
-      #   run: |
-      #     make types
+          flake8 --count --select=E9,F63,F7,F82 --show-source --statistics
+          flake8 --count --max-complexity=10 --max-line-length=79 --statistics
+          
+      - name: Lint Pylint
+        run: |
+          find . -type f -name "*.py" | xargs pylint 
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +1,11 @@
+[submodule "web/documentserver-example/csharp-mvc/assets"]
+	path = web/documentserver-example/csharp-mvc/assets
+	url = https://github.com/ONLYOFFICE/document-templates
+	branch = main/en
+[submodule "web/documentserver-example/csharp/assets"]
+	path = web/documentserver-example/csharp/assets
+	url = https://github.com/ONLYOFFICE/document-templates
+	branch = main/en
 [submodule "web/documentserver-example/nodejs/public/assets/document-templates"]
 	path = web/documentserver-example/nodejs/public/assets/document-templates
 	url = https://github.com/ONLYOFFICE/document-templates
@ -5,14 +13,7 @@
 [submodule "web/documentserver-example/nodejs/public/assets/document-formats"]
 	path = web/documentserver-example/nodejs/public/assets/document-formats
 	url = https://github.com/ONLYOFFICE/document-formats
-	branch = feature/v8.0
-[submodule "web/documentserver-example/csharp-mvc/assets/document-templates"]
-	path = web/documentserver-example/csharp-mvc/assets/document-templates
-	url = https://github.com/ONLYOFFICE/document-templates
-	branch = main/en
-[submodule "web/documentserver-example/csharp-mvc/assets/document-formats"]
-	path = web/documentserver-example/csharp-mvc/assets/document-formats
-	url = https://github.com/ONLYOFFICE/document-formats
+	branch = master
 [submodule "web/documentserver-example/php/assets/document-templates"]
 	path = web/documentserver-example/php/assets/document-templates
 	url = https://github.com/ONLYOFFICE/document-templates
@ -45,18 +46,3 @@
 	path = web/documentserver-example/ruby/assets/document-formats
 	url = https://github.com/ONLYOFFICE/document-formats
 	branch = master
-[submodule "web/documentserver-example/java/src/main/resources/assets/document-formats"]
-	path = web/documentserver-example/java/src/main/resources/assets/document-formats
-	url = https://github.com/ONLYOFFICE/document-formats
-	branch = master
-[submodule "web/documentserver-example/java-spring/src/main/resources/assets/document-formats"]
-	path = web/documentserver-example/java-spring/src/main/resources/assets/document-formats
-	url = https://github.com/ONLYOFFICE/document-formats
-	branch = master
-[submodule "web/documentserver-example/csharp/assets/document-templates"]
-	path = web/documentserver-example/csharp/assets/document-templates
-	url = https://github.com/ONLYOFFICE/document-templates
-	branch = main/en
-[submodule "web/documentserver-example/csharp/assets/document-formats"]
-	path = web/documentserver-example/csharp/assets/document-formats
-	url = https://github.com/ONLYOFFICE/document-formats
--- a/3rd-Party.license
+++ b/3rd-Party.license
@ -113,10 +113,6 @@ Prime JWT     - is intended to be fast and easy to use. Prime JWT has a single e
 License:        Apache 2.0
 License File:   prime-jwt.license

-Project Lombok - Spice up your java: Automatic Resource Management, automatic generation of getters, setters, equals, hashCode and toString, and more! (https://projectlombok.org/LICENSE)
-License:        MIT
-License File:   lombok.license
-

 web/documentserver-example/java-spring

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,20 +1,5 @@
 # Change Log

- version number to page meta
- sr-Latn-CS skin languages
- getting history via api
- using a repo with a list of formats
- convert after uploading only tagged formats
- link in referenceData
- setUsers for region protection
- onRequestOpen method
- user avatar
- trimming long name of uploading file
- onRequestSelectDocument method
- onRequestSelectSpreadsheet method
- key in referenceData
- restore from history
-
 ## 1.7.0
 - nodejs: onRequestSelectDocument method
 - nodejs: onRequestSelectSpreadsheet method
--- a/Readme.md
+++ b/Readme.md
@ -11,10 +11,8 @@ You should change `http://documentserver` to your server address in these files:
 * [.Net (C# MVC)](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/csharp-mvc) - `web/documentserver-example/csharp-mvc/web.appsettings.config`
 * [.Net (C#)](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/csharp) - `web/documentserver-example/csharp/settings.config`
 * [Java](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/java) - `web/documentserver-example/java/src/main/resources/settings.properties`
-* [Java Spring](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/java-spring) - `web/documentserver-example/java-spring/src/main/resources/application.properties`
 * [Node.js](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/nodejs) - `web/documentserver-example/nodejs/config/default.json`
-* [PHP](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/php) - `web/documentserver-example/php/config.json`
-* [Python](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/python) - `web/documentserver-example/python/config.py`
+* [PHP](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/php) - `web/documentserver-example/php/config.php`
 * [Ruby](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/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")
--- a/web/documentserver-example/csharp-mvc/Content/images/file_docx.svg
+++ b/web/documentserver-example/csharp-mvc/Content/images/file_docx.svg
@ -1 +1,8 @@
-<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#1E7AAA"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#000" fill-opacity=".25"/><path d="M6 15h18v1H6v-1zM6 19h18v1H6v-1zM6 23h18v1H6v-1zM6 27h18v1H6v-1z" fill="#fff"/></svg>
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H21.674C22.4697 0 23.2327 0.316071 23.7953 0.87868L29.1213 6.20465C29.6839 6.76726 30 7.53032 30 8.32597V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#3779A6"/>
+<path d="M22.9167 0L30.0001 7.08333H25.9167C24.2599 7.08333 22.9167 5.74019 22.9167 4.08333V0Z" fill="#1D5880"/>
+<path d="M6.17627 14.7059H23.8233V15.8823H6.17627V14.7059Z" fill="white"/>
+<path d="M6.17627 18.5294H23.8233V19.7059H6.17627V18.5294Z" fill="white"/>
+<path d="M6.17627 22.3529H23.8233V23.5294H6.17627V22.3529Z" fill="white"/>
+<path d="M6.17627 26.1765H23.8233V27.3529H6.17627V26.1765Z" fill="white"/>
+</svg>
--- a/web/documentserver-example/csharp-mvc/Content/images/file_docxf.svg
+++ b/web/documentserver-example/csharp-mvc/Content/images/file_docxf.svg
@ -1 +1,6 @@
-<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#27ABA3"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#008078"/><path fill-rule="evenodd" clip-rule="evenodd" d="M24 14H6v7h18v-7zm-.8182 5.9978H6.81818V15H23.1818v4.9978zM24 23H6v7h18v-7zm-.8182 5.9978H6.81818V24H23.1818v4.9978z" fill="#fff"/></svg>
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#27ABA3"/>
+<path d="M22.9165 0L29.9998 7.08333H25.9165C24.2597 7.08333 22.9165 5.74019 22.9165 4.08333V0Z" fill="#008078"/>
+<rect x="6.5" y="15.5" width="17" height="5" stroke="white"/>
+<rect x="6.5" y="23.5" width="17" height="5" stroke="white"/>
+</svg>
--- a/web/documentserver-example/csharp-mvc/Content/images/file_pptx.svg
+++ b/web/documentserver-example/csharp-mvc/Content/images/file_pptx.svg
@ -1 +1,8 @@
-<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#F36700"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#000" fill-opacity=".25"/><path stroke="#fff" stroke-opacity=".95" d="M6.5 15.5h17v12h-17z"/></svg>
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#F36700"/>
+<path d="M22.9167 0L30.0001 7.08333H25.9168C24.2599 7.08333 22.9167 5.74019 22.9167 4.08333V0Z" fill="#AB531F"/>
+<path d="M6.17627 16.1275H23.8233V17.3039H6.17627V16.1275Z" fill="white"/>
+<path d="M6.17627 28.7745L6.17627 16.1275L7.35274 16.1275L7.35274 28.7745H6.17627Z" fill="white"/>
+<path d="M23.8233 16.1275V28.7745H22.6469V16.1275L23.8233 16.1275Z" fill="white"/>
+<path d="M6.17627 27.598H23.8233V28.7745H6.17627L6.17627 27.598Z" fill="white"/>
+</svg>
--- a/web/documentserver-example/csharp-mvc/Content/images/file_upload.svg
+++ b/web/documentserver-example/csharp-mvc/Content/images/file_upload.svg
@ -1 +1,6 @@
-<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#D0D5DA"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#646464"/><path fill-rule="evenodd" clip-rule="evenodd" d="M7.5 23c-.27614 0-.5.2239-.5.5v4c0 .2761.22386.5.5.5h15c.2761 0 .5-.2239.5-.5v-4c0-.2761-.2239-.5-.5-.5h-2c-.2761 0-.5-.2239-.5-.5s.2239-.5.5-.5h2c.8284 0 1.5.6716 1.5 1.5v4c0 .8284-.6716 1.5-1.5 1.5h-15c-.82843 0-1.5-.6716-1.5-1.5v-4c0-.8284.67157-1.5 1.5-1.5h2c.27614 0 .5.2239.5.5s-.22386.5-.5.5h-2z" fill="#646464"/><path fill-rule="evenodd" clip-rule="evenodd" d="M20 20.0001L15 14l-5 6.0001h3v4c0 .5523.4477 1 1 1h2c.5523 0 1-.4477 1-1v-4h3z" fill="#646464"/></svg>
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M30 7.44186L22 0H3C1.22739 0 0 0.822551 0 2.32558V37.2093C0 38.7123 1.22739 40 3 40H27C28.7726 40 30 38.7123 30 37.2093V7.44186Z" fill="#D0D5DA"/>
+<path d="M24.1042 7.27273H29.9631L22 0V5.32334C22 6.4105 22.949 7.27273 24.1042 7.27273Z" fill="#646464"/>
+<path d="M16.9562 22.3485H12.9746V17.803H10.9839L14.9654 14.1667L18.947 17.803H16.9562V22.3485Z" fill="#646464"/>
+<path d="M20.9378 23.7121C20.9378 24.1666 20.4401 24.6212 19.9424 24.6212H9.98848C9.49078 24.6212 8.99309 24.1666 8.99309 23.7121V22.3485C8.99309 21.8939 9.49078 21.4394 9.98848 21.4394H10.9839V20.0757H9.49078C8.49539 20.0757 7.5 20.9848 7.5 21.8939V24.1666C7.5 25.0757 8.61982 25.9848 9.49078 25.9848H20.4401C21.3111 25.9848 22.4309 25.0757 22.4309 24.1666V21.8939C22.4309 20.9848 21.4355 20.0757 20.4401 20.0757H18.947V21.4394H19.9424C20.4401 21.4394 20.9378 21.8939 20.9378 22.3485V23.7121Z" fill="#646464"/>
+</svg>
--- a/web/documentserver-example/csharp-mvc/Content/images/file_xlsx.svg
+++ b/web/documentserver-example/csharp-mvc/Content/images/file_xlsx.svg
@ -1 +1,12 @@
-<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#6AAA1E"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#000" fill-opacity=".25"/><path fill-rule="evenodd" clip-rule="evenodd" d="M6 15h18v13H7.00001v-1H12v-3H7v4H6V15zm7 12h4v-3h-4v3zm5 0h5v-3h-5v3zm5-7v3h-5v-3h5zm-6 0v3h-4v-3h4zm-5 0v3H7v-3h5zm11-1v-3h-5v3h5zm-10-3h4v3h-4v-3zm-1 3v-3H7v3h5z" fill="#fff" fill-opacity=".95"/></svg>
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#78A73B"/>
+<path d="M22.9167 0L30.0001 7.08333H25.9168C24.2599 7.08333 22.9167 5.74019 22.9167 4.08333V0Z" fill="#5A7D2B"/>
+<path d="M6.17644 15.2941H23.8235V16.4706H6.17644V15.2941Z" fill="white"/>
+<path d="M6.17644 19.1177H23.8235V20.2941H6.17644V19.1177Z" fill="white"/>
+<path d="M6.17644 22.9412H23.8235V24.1177H6.17644V22.9412Z" fill="white"/>
+<path d="M6.17644 26.7647H23.8235V27.9412H6.17644V26.7647Z" fill="white"/>
+<path d="M5.88232 27.9412L5.88232 15.2941L7.0588 15.2941L7.0588 27.9412H5.88232Z" fill="white"/>
+<path d="M11.4706 27.9412L11.4706 15.2941L12.647 15.2941V27.9412H11.4706Z" fill="white"/>
+<path d="M17.0588 27.9412L17.0588 15.2941L18.2353 15.2941V27.9412H17.0588Z" fill="white"/>
+<path d="M22.647 27.9412V15.2941H23.8235V27.9412H22.647Z" fill="white"/>
+</svg>
--- a/web/documentserver-example/csharp-mvc/Content/images/uid-1.png
+++ b/web/documentserver-example/csharp-mvc/Content/images/uid-1.png
--- a/web/documentserver-example/csharp-mvc/Content/images/uid-2.png
+++ b/web/documentserver-example/csharp-mvc/Content/images/uid-2.png
--- a/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs
+++ b/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs
@ -31,12 +31,6 @@ namespace OnlineEditorsExampleMVC.Helpers
 {
    public class DocManagerHelper
    {
-        //get server version
-        public static string GetVersion()
-        {
-            return WebConfigurationManager.AppSettings["version"];
-        }
-
        // get max file size
        public static long MaxFileSize
        {
@ -57,24 +51,24 @@ namespace OnlineEditorsExampleMVC.Helpers
        // get file extensions that can be viewed
        public static List<string> ViewedExts
        {
-            get { return FormatManager.ViewableExtensions(); }
+            get { return (WebConfigurationManager.AppSettings["files.docservice.viewed-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
        }

        public static List<string> FillFormExts
        {
-            get { return FormatManager.FillableExtensions(); }
+            get { return (WebConfigurationManager.AppSettings["files.docservice.fillform-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
        }

        // get file extensions that can be edited
        public static List<string> EditedExts
        {
-            get { return FormatManager.EditableExtensions(); }
+            get { return (WebConfigurationManager.AppSettings["files.docservice.edited-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
        }

        // get file extensions that can be converted
        public static List<string> ConvertExts
        {
-            get { return FormatManager.ConvertibleExtensions(); }
+            get { return (WebConfigurationManager.AppSettings["files.docservice.convert-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
        }

        // get current user host address
@ -183,12 +177,7 @@ namespace OnlineEditorsExampleMVC.Helpers
        // get a file name with an index if the file with such a name already exists
        public static string GetCorrectName(string fileName, string userAddress = null)
        {
-            int maxName;
-            int.TryParse(WebConfigurationManager.AppSettings["filename-max"], out maxName);
            var baseName = Path.GetFileNameWithoutExtension(fileName);
-            if (baseName.Length > maxName){
-                baseName = baseName.Substring(0, maxName) + "[...]";
-            }
            var ext = Path.GetExtension(fileName).ToLower();
            var name = baseName + ext;

@ -226,7 +215,7 @@ namespace OnlineEditorsExampleMVC.Helpers
        public static string CreateDemo(string fileExt, bool withContent)
        {
            var demoName = (withContent ? "sample." : "new.") + fileExt;  // create sample or new template file with the necessary extension
-            var demoPath = "assets\\document-templates\\" + (withContent ? "sample\\" : "new\\");  // get the path to the sample document
+            var demoPath = "assets\\" + (withContent ? "sample\\" : "new\\");  // get the path to the sample document

            var fileName = GetCorrectName(demoName);  // get a file name with an index if the file with such a name already exists

--- a/web/documentserver-example/csharp-mvc/Helpers/TrackManager.cs
+++ b/web/documentserver-example/csharp-mvc/Helpers/TrackManager.cs
@ -256,22 +256,6 @@ namespace OnlineEditorsExampleMVC.Helpers
                    var action = jss.Deserialize<Dictionary<string, object>>(jss.Serialize(actions[0]));
                    var user = action["userid"].ToString();  // get the user id
                    DocManagerHelper.CreateMeta(fileName, user, "Filling Form", userAddress);  // create meta data for the forcesaved file
-
-                    string formsDataUrl = fileData["formsdataurl"].ToString();
-
-                    if (!string.IsNullOrEmpty(formsDataUrl))
-                    {
-                        string formsName = DocManagerHelper.GetCorrectName(Path.GetFileNameWithoutExtension(fileName) + ".txt", userAddress);
-                        string formsPath = DocManagerHelper.StoragePath(formsName, userAddress);
-
-                        var bytesForms = DownloadFile(formsDataUrl);
-
-                        SaveFile(bytesForms, formsPath);
-                    }
-                    else
-                    {
-                        throw new Exception("Document editing service did not return formsDataUrl");
-                    }
                }
            } catch (Exception)
            {
--- a/web/documentserver-example/csharp-mvc/Helpers/Users.cs
+++ b/web/documentserver-example/csharp-mvc/Helpers/Users.cs
@ -31,9 +31,7 @@ namespace OnlineEditorsExampleMVC.Helpers
            "Can perform all actions with comments",
            "The file favorite state is undefined",
            "Can create files from templates using data from the editor",
-            "Can see the information about all users",
-            "Has an avatar",
-            "Can submit forms"
+            "Can see the information about all users"
        };

        static List<string> descr_user_2 = new List<string>()
@ -43,9 +41,7 @@ namespace OnlineEditorsExampleMVC.Helpers
            "Can view comments, edit his own comments and comments left by users with no group. Can remove his own comments only",
            "This file is marked as favorite",
            "Can create new files from the editor",
-            "Can see the information about users from Group2 and users who don’t belong to any group",
-            "Has an avatar",
-            "Can’t submit forms"
+            "Can see the information about users from Group2 and users who don’t belong to any group"
        };

        static List<string> descr_user_3 = new List<string>()
@ -58,8 +54,7 @@ namespace OnlineEditorsExampleMVC.Helpers
            "Can’t download the file",
            "Can’t print the file",
            "Can create new files from the editor",
-            "Can see the information about Group2 users",
-            "Can’t submit forms"
+            "Can see the information about Group2 users"
        };

        static List<string> descr_user_0 = new List<string>()
@ -76,7 +71,6 @@ namespace OnlineEditorsExampleMVC.Helpers
            "Can't view chat",
            "Can't protect file",
            "View file without collaboration",
-            "Can’t submit forms"
        };

        private static List<User> users = new List<User>() {
@ -91,7 +85,6 @@ namespace OnlineEditorsExampleMVC.Helpers
                    null,
                    new List<string>(),
                    descr_user_1,
-                    true,
                    true
                ),
            new User(
@ -110,13 +103,12 @@ namespace OnlineEditorsExampleMVC.Helpers
                    true,
                    new List<string>(),
                    descr_user_2,
-                    false,
-                    true
+                    false
                ),
            new User(
                    "uid-3",
                    "Hamish Mitchell",
-                    null,
+                    "mitchell@example.com",
                    "group-3",
                    new List<string>() { "group-2" },
                    new Dictionary<string,object>()
@ -129,7 +121,6 @@ namespace OnlineEditorsExampleMVC.Helpers
                    false,
                    new List<string>() { "copy", "download", "print" },
                    descr_user_3,
-                    false,
                    false
                ),
            new User(
@ -143,7 +134,6 @@ namespace OnlineEditorsExampleMVC.Helpers
                    null,
                    new List<string>() { "protect" },
                    descr_user_0,
-                    false,
                    false
                )
        };
@ -181,43 +171,6 @@ namespace OnlineEditorsExampleMVC.Helpers
            }
            return usersData;
        }
-
-        public static List<Dictionary<string, object>> getUsersInfo(string id)
-        {
-            List<Dictionary<string, object>> usersData = new List<Dictionary<string, object>>();
-            if (id != "uid-0") {
-                foreach (User user in users)
-                {
-                    usersData.Add(new Dictionary<string, object>()
-                        {
-                            {"id", user.id},
-                            {"name", user.name },
-                            {"email", user.email },
-                            {"image", user.avatar ? DocManagerHelper.GetServerUrl(false) + "/Content/images/" + user.id + ".png" : null}
-                        });
-                }
-            }
-            return usersData;
-        }
-
-        // get a list of users with their names and emails for protect
-        public static List<Dictionary<string, object>> getUsersForProtect(string id)
-        {
-            List<Dictionary<string, object>> usersData = new List<Dictionary<string, object>>();
-            foreach (User user in users)
-            {
-                if (!user.id.Equals(id) && user.name != null)
-                {
-                    usersData.Add(new Dictionary<string, object>()
-                    {
-                        {"name", user.name },
-                        {"email", user.email },
-                        {"id", user.id}
-                    });
-                }
-            }
-            return usersData;
-        }
    }

    public class User
@ -233,9 +186,8 @@ namespace OnlineEditorsExampleMVC.Helpers
        public List<string> descriptions;
        public bool templates;
        public List<string> userInfoGroups;
-        public bool avatar;

-        public User(string id, string name, string email, string group, List<string> reviewGroups, Dictionary<string, object> commentGroups, List<string> userInfoGroups, bool? favorite, List<string> deniedPermissions, List<string> descriptions, bool templates, bool avatar)
+        public User(string id, string name, string email, string group, List<string> reviewGroups, Dictionary<string, object> commentGroups, List<string> userInfoGroups, bool? favorite, List<string> deniedPermissions, List<string> descriptions, bool templates)
        {
            this.id = id;
            this.name = name;
@ -248,7 +200,6 @@ namespace OnlineEditorsExampleMVC.Helpers
            this.descriptions = descriptions;
            this.templates = templates;
            this.userInfoGroups = userInfoGroups;
-            this.avatar = avatar;
        }
    }
 }
--- a/web/documentserver-example/csharp-mvc/Models/FileModel.cs
+++ b/web/documentserver-example/csharp-mvc/Models/FileModel.cs
@ -88,7 +88,7 @@ namespace OnlineEditorsExampleMVC.Models
                editorsMode = "fillForms";
                canEdit = true;
            }
-            var submitForm = editorsMode.Equals("fillForms") && id.Equals("uid-1");  // check if the Submit form button is displayed or not
+            var submitForm = editorsMode.Equals("fillForms") && id.Equals("uid-1") && false;  // check if the Submit form button is displayed or not
            var mode = canEdit && editorsMode != "view" ? "edit" : "view";  // set the mode parameter: change it to view if the document can't be edited

            // favorite icon state
@ -190,8 +190,7 @@ namespace OnlineEditorsExampleMVC.Models
                                        {
                                            { "id", !user.id.Equals("uid-0") ? user.id : null  },
                                            { "name", user.name },
-                                            { "group", user.group },
-                                            { "image", user.avatar ? DocManagerHelper.GetServerUrl(false) + "/Content/images/" + user.id + ".png" : null}
+                                            { "group", user.group }
                                        }
                                },
                                {
@ -237,7 +236,7 @@ namespace OnlineEditorsExampleMVC.Models
        }

        // get a document which will be compared with the current document
-        public void GetDocumentData(out string compareConfig)
+        public void GetCompareFileData(out string compareConfig)
        {
            var jss = new JavaScriptSerializer();

@ -321,7 +320,7 @@ namespace OnlineEditorsExampleMVC.Models
        }

        // get a mail merge config
-        public void GetSpreadsheetConfig(out string dataSpreadsheet)
+        public void GetMailMergeConfig(out string dataMailMergeRecipients)
        {
            var jss = new JavaScriptSerializer();

@ -362,7 +361,7 @@ namespace OnlineEditorsExampleMVC.Models
                mailMergeConfig.Add("token", mailmergeToken);  // and add it to the mail merge config
            }

-            dataSpreadsheet = jss.Serialize(mailMergeConfig);
+            dataMailMergeRecipients = jss.Serialize(mailMergeConfig);
        }

        //get a users for mentions
@ -373,22 +372,5 @@ namespace OnlineEditorsExampleMVC.Models
            var user = Users.getUser(id);
            usersForMentions = !user.id.Equals("uid-0") ? jss.Serialize(Users.getUsersForMentions(user.id)) : null;
        }
-
-        public void GetUsersInfo(HttpRequest request, out string usersInfo)
-        {
-            var jss = new JavaScriptSerializer();
-            var id = request.Cookies.GetOrDefault("uid", null);
-            var user = Users.getUser(id);
-            usersInfo = jss.Serialize(Users.getUsersInfo(user.id));
-        }
-
-        //get a users for protect
-        public void GetUsersProtect(HttpRequest request, out string usersForProtect)
-        {
-            var jss = new JavaScriptSerializer();
-            var id = request.Cookies.GetOrDefault("uid", null);
-            var user = Users.getUser(id);
-            usersForProtect = !user.id.Equals("uid-0") ? jss.Serialize(Users.getUsersForProtect(user.id)) : null;
-        }
    }
 }
--- a/web/documentserver-example/csharp-mvc/Models/FileUtility.cs
+++ b/web/documentserver-example/csharp-mvc/Models/FileUtility.cs
@ -16,13 +16,8 @@
 *
 */

-using Newtonsoft.Json;
-using System;
 using System.Collections.Generic;
 using System.IO;
-using static OnlineEditorsExampleMVC.Models.FileUtility;
-using System.Linq;
-using System.Text;

 namespace OnlineEditorsExampleMVC.Models
 {
@ -40,176 +35,38 @@ namespace OnlineEditorsExampleMVC.Models
        {
            var ext = Path.GetExtension(fileName).ToLower();

-            if (FormatManager.DocumentExtensions().Contains(ext)) return FileType.Word;  // word type for document extensions
-            if (FormatManager.SpreadsheetExtensions().Contains(ext)) return FileType.Cell;  // cell type for spreadsheet extensions
-            if (FormatManager.PresentationExtensions().Contains(ext)) return FileType.Slide;  // slide type for presentation extensions
+            if (ExtsDocument.Contains(ext)) return FileType.Word;  // word type for document extensions
+            if (ExtsSpreadsheet.Contains(ext)) return FileType.Cell;  // cell type for spreadsheet extensions
+            if (ExtsPresentation.Contains(ext)) return FileType.Slide;  // slide type for presentation extensions

            return FileType.Word;  // the default type is word
        }
-    }

-    public class Format
-    {
-        public string Name { get; }
-        public FileType Type { get; }
-        public List<string> Actions { get; }
-        public List<string> Convert { get; }
-        public List<string> Mime { get; }
-
-        public Format(string name, FileType type, List<string> actions, List<string> convert, List<string> mime)
-        {
-            Name = name;
-            Type = type;
-            Actions = actions;
-            Convert = convert;
-            Mime = mime;
-        }
-
-        public string Extension()
-        {
-            return "." + Name;
-        }
-    }
-
-    public static class FormatManager
-    {
-        private static List<Format> cachedFormats;
-        public static List<string> FillableExtensions()
-        {
-            return Fillable()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> Fillable()
-        {
-            return All()
-                .Where(format => format.Actions.Contains("fill"))
-                .ToList();
-        }
-
-        public static List<string> ViewableExtensions()
-        {
-            return Viewable()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> Viewable()
-        {
-            return All()
-                .Where(format => format.Actions.Contains("view"))
-                .ToList();
-        }
-
-        public static List<string> EditableExtensions()
-        {
-            return Editable()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> Editable()
-        {
-            return All()
-                .Where(format => format.Actions.Contains("edit") || format.Actions.Contains("lossy-edit"))
-                .ToList();
-        }
-
-        public static List<string> ConvertibleExtensions()
-        {
-            return Convertible()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> Convertible()
-        {
-            return All()
-                .Where(format => format.Actions.Contains("auto-convert"))
-                .ToList();
-        }
-
-        public static List<string> SpreadsheetExtensions()
-        {
-            return Spreadsheets()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> Spreadsheets()
-        {
-            return All()
-                .Where(format => format.Type == FileType.Cell)
-                .ToList();
-        }
-
-        public static List<string> PresentationExtensions()
-        {
-            return Presentations()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> Presentations()
-        {
-            return All()
-                .Where(format => format.Type == FileType.Slide)
-                .ToList();
-        }
-
-        public static List<string> DocumentExtensions()
-        {
-            return Documents()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> Documents()
-        {
-            return All()
-                .Where(format => format.Type == FileType.Word)
-                .ToList();
-        }
-
-        public static List<string> AllExtensions()
-        {
-            return All()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> All()
-        {
-            if (cachedFormats == null)
+        // document extensions
+        public static readonly List<string> ExtsDocument = new List<string>
            {
-                var path = GetPath();
-                var lines = File.ReadLines(path, Encoding.UTF8);
-                var contents = string.Join(Environment.NewLine, lines);
-                var formats = JsonConvert.DeserializeObject<Format[]>(contents);
-                cachedFormats = formats.ToList();
-            }
+                ".doc", ".docx", ".docm",
+                ".dot", ".dotx", ".dotm",
+                ".odt", ".fodt", ".ott", ".rtf", ".txt",
+                ".html", ".htm", ".mht", ".xml",
+                ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps", ".oform"
+            };

-            return cachedFormats;
-        }
-
-        private static string GetPath()
-        {
-            string path = Path.Combine(GetDirectory(), "onlyoffice-docs-formats.json");
-            if (File.Exists(path))
+        // spreadsheet extensions
+        public static readonly List<string> ExtsSpreadsheet = new List<string>
            {
-                return path;
-            }
-            else
-            {
-                throw new FileNotFoundException("The JSON file does not exist.");
-            }
-        }
+                ".xls", ".xlsx", ".xlsm", ".xlsb",
+                ".xlt", ".xltx", ".xltm",
+                ".ods", ".fods", ".ots", ".csv"
+            };

-        private static string GetDirectory()
-        {
-            string directory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "assets", "document-formats");
-            return Path.GetFullPath(directory);
-        }
+        // presentation extensions
+        public static readonly List<string> ExtsPresentation = new List<string>
+            {
+                ".pps", ".ppsx", ".ppsm",
+                ".ppt", ".pptx", ".pptm",
+                ".pot", ".potx", ".potm",
+                ".odp", ".fodp", ".otp"
+            };
    }
 }
--- a/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj
+++ b/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj
@ -159,6 +159,7 @@
    <Content Include="favicon.ico" />
    <Content Include="Global.asax" />
    <Content Include="LICENSE" />
+    <Content Include="Scripts\jquery-1.8.2.js" />
    <Content Include="Scripts\jquery-ui.js" />
    <Content Include="Scripts\jquery.blockUI.js" />
    <Content Include="Scripts\jquery.dropdownToggle.js" />
@ -181,23 +182,17 @@
    <Content Include="WebEditor.ashx" />
  </ItemGroup>
  <ItemGroup>
-    <Content Include="assets\document-templates\AUTHORS.md" />
-    <Content Include="assets\document-templates\LICENSE" />
-    <Content Include="assets\document-templates\new\new.docx" />
-    <Content Include="assets\document-templates\new\new.docxf" />
-    <Content Include="assets\document-templates\new\new.pptx" />
-    <Content Include="assets\document-templates\new\new.xlsx" />
-    <Content Include="assets\document-templates\README.md" />
-    <Content Include="assets\document-templates\sample\csv.csv" />
-    <Content Include="assets\document-templates\sample\sample.docx" />
-    <Content Include="assets\document-templates\sample\sample.docxf" />
-    <Content Include="assets\document-templates\sample\sample.pptx" />
-    <Content Include="assets\document-templates\sample\sample.xlsx" />
-    <Content Include="assets\document-formats\AUTHORS.md" />
-    <Content Include="assets\document-formats\CHANGELOG.md" />
-    <Content Include="assets\document-formats\LICENSE" />
-    <Content Include="assets\document-formats\onlyoffice-docs-formats.json" />
-    <Content Include="assets\document-formats\README.md" />
+    <Content Include="assets\AUTHORS.md" />
+    <Content Include="assets\LICENSE" />
+    <Content Include="assets\new\new.docx" />
+    <Content Include="assets\new\new.docxf" />
+    <Content Include="assets\new\new.pptx" />
+    <Content Include="assets\new\new.xlsx" />
+    <Content Include="assets\sample\csv.csv" />
+    <Content Include="assets\sample\sample.docx" />
+    <Content Include="assets\sample\sample.docxf" />
+    <Content Include="assets\sample\sample.pptx" />
+    <Content Include="assets\sample\sample.xlsx" />
    <None Include="packages.config" />
  </ItemGroup>
  <PropertyGroup>
--- a/web/documentserver-example/csharp-mvc/README.md
+++ b/web/documentserver-example/csharp-mvc/README.md
@ -14,7 +14,7 @@ See the detailed guide to learn how to install Document Server [for Windows](htt

 Download the [.Net (C# MVC) example](https://api.onlyoffice.com/editors/demopreview) from our site.

-To connect the editors to your website, specify the path to the editors installation and the path to the storage folder in the *web.appsettings.config* file:
+To connect the editors to your website, specify the path to the editors installation and the path to the storage folder in the *settings.config* file:
 ```
 <add key="storage-path" value=""/>
 <add key="files.docservice.url.site" value="https://documentserver/" />
--- a/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
+++ b/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
@ -129,21 +129,17 @@
        };

        // the user is trying to select document for comparing by clicking the Document from Storage button
-        var onRequestSelectDocument = function (event) {
-            <% string documentData; %>
-            <% Model.GetDocumentData(out documentData); %>
-            var data = <%=documentData%>;
-            data.c = event.data.c;
-            docEditor.setRequestedDocument(data);  // select a document for comparing
+        var onRequestCompareFile = function () {
+            <% string compareFileData; %>
+            <% Model.GetCompareFileData(out compareFileData); %>
+            docEditor.setRevisedFile(<%=compareFileData%>);  // select a document for comparing
        };

        // the user is trying to select recipients data by clicking the Mail merge button
-        var onRequestSelectSpreadsheet = function (event) {
-            <% string dataSpreadsheet; %>
-            <% Model.GetSpreadsheetConfig(out dataSpreadsheet); %>
-            var data = <%= dataSpreadsheet%>;
-            data.c = event.data.c;
-            docEditor.setRequestedSpreadsheet(data);  // insert recipient data for mail merge into the file
+        var onRequestMailMergeRecipients = function (event) {
+            <% string dataMailMergeRecipients; %>
+            <% Model.GetMailMergeConfig(out dataMailMergeRecipients); %>
+            docEditor.setMailMergeRecipients(<%= dataMailMergeRecipients%>);  // insert recipient data for mail merge into the file
        };

         var onRequestSaveAs = function (event) {  //  the user is trying to save file by clicking Save Copy as... button
@ -182,39 +178,15 @@
            }
        };

-        var onRequestOpen = function (event) {  // user open external data source
-            innerAlert("onRequestOpen");
-            var windowName = event.data.windowName;
-            requestReference(event.data, function (data) {
-                if (data.error) {
-                    var winEditor = window.open("", windowName);
-                    winEditor.close();
-                    innerAlert(data.error, true);
-                    return;
-                }
-                var link = data.link;
-                window.open(link, windowName);
-            });
-        };
-
        var onRequestReferenceData = function (event) {  // user refresh external data source
-            innerAlert("onRequestReferenceData");
-
-            requestReference(event.data, function (data) {
-                docEditor.setReferenceData(data);
-            });
-        };
-
-        var requestReference = function (data, callback) {
-            innerAlert(data);
-            data.directUrl = !!config.document.directUrl;
+            event.data.directUrl = !!config.document.directUrl;
            let xhr = new XMLHttpRequest();
            xhr.open("POST", "webeditor.ashx?type=reference");
            xhr.setRequestHeader("Content-Type", "application/json");
-            xhr.send(JSON.stringify(data));
+            xhr.send(JSON.stringify(event.data));
            xhr.onload = function () {
                console.log(xhr.responseText);
-                callback(JSON.parse(xhr.responseText));
+                docEditor.setReferenceData(JSON.parse(xhr.responseText));
            }
        };

@ -272,16 +244,12 @@
            "onMakeActionLink": onMakeActionLink,
            "onMetaChange": onMetaChange,
            "onRequestInsertImage": onRequestInsertImage,
-            "onRequestSelectDocument": onRequestSelectDocument,
-            "onRequestSelectSpreadsheet": onRequestSelectSpreadsheet,
+            "onRequestCompareFile": onRequestCompareFile,
+            "onRequestMailMergeRecipients": onRequestMailMergeRecipients,
        };

        <% string usersForMentions; %>
        <% Model.GetUsersMentions(Request, out usersForMentions); %>
-        <% string usersInfo; %>
-        <% Model.GetUsersInfo(Request, out usersInfo); %>
-        <% string usersForProtect; %>
-        <% Model.GetUsersProtect(Request, out usersForProtect); %>

        if (config.editorConfig.user.id) {
            // the user is trying to show the document version history
@ -297,32 +265,9 @@
            // add mentions for not anonymous users
            <% if (!string.IsNullOrEmpty(usersForMentions))
            { %>
-                config.events['onRequestUsers'] = function (event) {
-                    if (event && event.data){
-                        var c = event.data.c;
-                    }
-                    switch (c) {
-                        case "info":
-                            users = [];
-                            var allUsers = <%= usersInfo %>;
-                            for (var i = 0; i < event.data.id.length; i++) {
-                                for (var j = 0; j < allUsers.length; j++) {
-                                    if (allUsers[j].id == event.data.id[i]) {
-                                        users.push(allUsers[j]);
-                                        break;
-                                    }
-                                }
-                            }
-                            break;
-                        case "protect":
-                            var users = <%= usersForProtect %>;
-                            break;
-                        default:
-                            users = <%= usersForMentions %>;
-                    }
-                    docEditor.setUsers({
-                        "c": c,
-                        "users": users,
+                config.events['onRequestUsers'] = function () {
+                    docEditor.setUsers({  // set a list of users to mention in the comments
+                        "users": <%= usersForMentions %>
                    });
                };
            <% } %>
@ -338,7 +283,6 @@
            config.events['onRequestReferenceData'] = onRequestReferenceData;
            // prevent switch the document from the viewing into the editing mode for anonymous users
            config.events['onRequestEditRights'] = onRequestEditRights;
-            config.events['onRequestOpen'] = onRequestOpen;
        }

        if (config.editorConfig.createUrl) {
--- a/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
+++ b/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
@ -13,7 +13,6 @@
    <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" />
-    <meta name="server-version" content=<%= DocManagerHelper.GetVersion() %> />
    <!--
    *
    * (c) Copyright Ascensio System SIA 2023
--- a/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
+++ b/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
@ -453,7 +453,7 @@ namespace OnlineEditorsExampleMVC
        private static void Assets(HttpContext context)
        {
            var fileName = Path.GetFileName(context.Request["filename"]);
-            var filePath = HttpRuntime.AppDomainAppPath + "assets/document-templates/sample/" + fileName;
+            var filePath = HttpRuntime.AppDomainAppPath + "assets/sample/" + fileName;
            download(filePath, context);
        }

@ -461,7 +461,7 @@ namespace OnlineEditorsExampleMVC
        private static void GetCsv(HttpContext context)
        {
            var fileName = "csv.csv";
-            var filePath = HttpRuntime.AppDomainAppPath + "assets/document-templates/sample/" + fileName;
+            var filePath = HttpRuntime.AppDomainAppPath + "assets/sample/" + fileName;
            download(filePath, context);
        }

@ -812,27 +812,6 @@ namespace OnlineEditorsExampleMVC
                }
            }

-            if (fileName == "" && body.ContainsKey("link"))
-            {
-                string link = body["link"].ToString();
-                if (!link.Contains(DocManagerHelper.GetServerUrl(false)))
-                {
-                    context.Response.Write(jss.Serialize(new Dictionary<string, string>() {
-                        { "url", link },
-                        { "directUrl", link }
-                    }));
-                    return;
-                }
-
-                Uri linkUri = new Uri(link);
-                fileName = HttpUtility.ParseQueryString(linkUri.Query).Get("fileName");
-                if (string.IsNullOrEmpty(fileName) || !File.Exists(DocManagerHelper.StoragePath(fileName, null)))
-                {
-                    context.Response.Write("{ \"error\": \"File is not exist\"}");
-                    return;
-                }
-            }
-
            if (fileName == "")
            {
                try
@ -861,7 +840,6 @@ namespace OnlineEditorsExampleMVC

            var data = new Dictionary<string, object>() {
            { "fileType", (Path.GetExtension(fileName) ?? "").ToLower().Trim('.') },
-            { "key",  ServiceConverter.GenerateRevisionId(DocManagerHelper.CurUserHostAddress() + "/" + fileName + "/" + File.GetLastWriteTime(DocManagerHelper.StoragePath(fileName, null)).GetHashCode())},
            { "url",  DocManagerHelper.GetDownloadUrl(fileName)},
            { "directUrl", directUrl ? DocManagerHelper.GetDownloadUrl(fileName, false) : null },
            { "referenceData", new Dictionary<string, string>()
@ -874,8 +852,7 @@ namespace OnlineEditorsExampleMVC
                    { "instanceId", DocManagerHelper.GetServerUrl(false) }
                }
            },
-            { "path", fileName },
-            { "link", DocManagerHelper.GetServerUrl(false) + "Editor?fileName=" + fileName }
+            { "path", fileName }
            };

            if (JwtManager.Enabled)
--- a/web/documentserver-example/csharp-mvc/assets/document-templates
+++ b/web/documentserver-example/csharp-mvc/assets/document-templates
--- a/web/documentserver-example/csharp-mvc/assets/document-formats
+++ b/web/documentserver-example/csharp-mvc/assets/document-formats
--- a/web/documentserver-example/csharp-mvc/web.appsettings.config
+++ b/web/documentserver-example/csharp-mvc/web.appsettings.config
@ -5,8 +5,11 @@

  <add key="filesize-max" value="52428800"/>
  <add key="storage-path" value=""/>
-  <add key="filename-max" value="50"/>
  
+  <add key="files.docservice.fillform-docs" value=".docx|.oform"/>
+  <add key="files.docservice.viewed-docs" value=".djvu|.oxps|.pdf|.xps"/>
+  <add key="files.docservice.edited-docs" value=".csv|.docm|.docx|.docxf|.dotm|.dotx|.epub|.fb2|.html|.odp|.ods|.odt|.otp|.ots|.ott|.potm|.potx|.ppsm|.ppsx|.pptm|.pptx|.rtf|.txt|.xlsm|.xlsx|.xltm|.xltx"/>
+  <add key="files.docservice.convert-docs" value=".doc|.dot|.dps|.dpt|.epub|.et|.ett|.fb2|.fodp|.fods|.fodt|.htm|.html|.mht|.mhtml|.odp|.ods|.odt|.otp|.ots|.ott|.pot|.pps|.ppt|.rtf|.stw|.sxc|.sxi|.sxw|.wps|.wpt|.xls|.xlsb|.xlt|.xml"/>
  <add key="files.docservice.timeout" value="120000" />
  <add key="files.docservice.secret" value="" />
  <add key="files.docservice.header" value="Authorization" />
@ -15,7 +18,7 @@

  <add key="files.docservice.verify-peer-off" value="true"/>

-  <add key="files.docservice.languages" value="en:English|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sr-Latn-CS:Serbian|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA: Test Language"/>
+  <add key="files.docservice.languages" value="en:English|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA: Test Language"/>

  <add key="files.docservice.url.site" value="http://documentserver/"/>

--- a/web/documentserver-example/csharp/App_Themes/images/file_docx.svg
+++ b/web/documentserver-example/csharp/App_Themes/images/file_docx.svg
@ -1 +1,8 @@
-<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#1E7AAA"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#000" fill-opacity=".25"/><path d="M6 15h18v1H6v-1zM6 19h18v1H6v-1zM6 23h18v1H6v-1zM6 27h18v1H6v-1z" fill="#fff"/></svg>
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H21.674C22.4697 0 23.2327 0.316071 23.7953 0.87868L29.1213 6.20465C29.6839 6.76726 30 7.53032 30 8.32597V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#3779A6"/>
+<path d="M22.9167 0L30.0001 7.08333H25.9167C24.2599 7.08333 22.9167 5.74019 22.9167 4.08333V0Z" fill="#1D5880"/>
+<path d="M6.17627 14.7059H23.8233V15.8823H6.17627V14.7059Z" fill="white"/>
+<path d="M6.17627 18.5294H23.8233V19.7059H6.17627V18.5294Z" fill="white"/>
+<path d="M6.17627 22.3529H23.8233V23.5294H6.17627V22.3529Z" fill="white"/>
+<path d="M6.17627 26.1765H23.8233V27.3529H6.17627V26.1765Z" fill="white"/>
+</svg>
--- a/web/documentserver-example/csharp/App_Themes/images/file_docxf.svg
+++ b/web/documentserver-example/csharp/App_Themes/images/file_docxf.svg
@ -1 +1,6 @@
-<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#27ABA3"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#008078"/><path fill-rule="evenodd" clip-rule="evenodd" d="M24 14H6v7h18v-7zm-.8182 5.9978H6.81818V15H23.1818v4.9978zM24 23H6v7h18v-7zm-.8182 5.9978H6.81818V24H23.1818v4.9978z" fill="#fff"/></svg>
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#27ABA3"/>
+<path d="M22.9165 0L29.9998 7.08333H25.9165C24.2597 7.08333 22.9165 5.74019 22.9165 4.08333V0Z" fill="#008078"/>
+<rect x="6.5" y="15.5" width="17" height="5" stroke="white"/>
+<rect x="6.5" y="23.5" width="17" height="5" stroke="white"/>
+</svg>
--- a/web/documentserver-example/csharp/App_Themes/images/file_pptx.svg
+++ b/web/documentserver-example/csharp/App_Themes/images/file_pptx.svg
@ -1 +1,8 @@
-<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#F36700"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#000" fill-opacity=".25"/><path stroke="#fff" stroke-opacity=".95" d="M6.5 15.5h17v12h-17z"/></svg>
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#F36700"/>
+<path d="M22.9167 0L30.0001 7.08333H25.9168C24.2599 7.08333 22.9167 5.74019 22.9167 4.08333V0Z" fill="#AB531F"/>
+<path d="M6.17627 16.1275H23.8233V17.3039H6.17627V16.1275Z" fill="white"/>
+<path d="M6.17627 28.7745L6.17627 16.1275L7.35274 16.1275L7.35274 28.7745H6.17627Z" fill="white"/>
+<path d="M23.8233 16.1275V28.7745H22.6469V16.1275L23.8233 16.1275Z" fill="white"/>
+<path d="M6.17627 27.598H23.8233V28.7745H6.17627L6.17627 27.598Z" fill="white"/>
+</svg>
--- a/web/documentserver-example/csharp/App_Themes/images/file_upload.svg
+++ b/web/documentserver-example/csharp/App_Themes/images/file_upload.svg
@ -1 +1,6 @@
-<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#D0D5DA"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#646464"/><path fill-rule="evenodd" clip-rule="evenodd" d="M7.5 23c-.27614 0-.5.2239-.5.5v4c0 .2761.22386.5.5.5h15c.2761 0 .5-.2239.5-.5v-4c0-.2761-.2239-.5-.5-.5h-2c-.2761 0-.5-.2239-.5-.5s.2239-.5.5-.5h2c.8284 0 1.5.6716 1.5 1.5v4c0 .8284-.6716 1.5-1.5 1.5h-15c-.82843 0-1.5-.6716-1.5-1.5v-4c0-.8284.67157-1.5 1.5-1.5h2c.27614 0 .5.2239.5.5s-.22386.5-.5.5h-2z" fill="#646464"/><path fill-rule="evenodd" clip-rule="evenodd" d="M20 20.0001L15 14l-5 6.0001h3v4c0 .5523.4477 1 1 1h2c.5523 0 1-.4477 1-1v-4h3z" fill="#646464"/></svg>
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M30 7.44186L22 0H3C1.22739 0 0 0.822551 0 2.32558V37.2093C0 38.7123 1.22739 40 3 40H27C28.7726 40 30 38.7123 30 37.2093V7.44186Z" fill="#D0D5DA"/>
+<path d="M24.1042 7.27273H29.9631L22 0V5.32334C22 6.4105 22.949 7.27273 24.1042 7.27273Z" fill="#646464"/>
+<path d="M16.9562 22.3485H12.9746V17.803H10.9839L14.9654 14.1667L18.947 17.803H16.9562V22.3485Z" fill="#646464"/>
+<path d="M20.9378 23.7121C20.9378 24.1666 20.4401 24.6212 19.9424 24.6212H9.98848C9.49078 24.6212 8.99309 24.1666 8.99309 23.7121V22.3485C8.99309 21.8939 9.49078 21.4394 9.98848 21.4394H10.9839V20.0757H9.49078C8.49539 20.0757 7.5 20.9848 7.5 21.8939V24.1666C7.5 25.0757 8.61982 25.9848 9.49078 25.9848H20.4401C21.3111 25.9848 22.4309 25.0757 22.4309 24.1666V21.8939C22.4309 20.9848 21.4355 20.0757 20.4401 20.0757H18.947V21.4394H19.9424C20.4401 21.4394 20.9378 21.8939 20.9378 22.3485V23.7121Z" fill="#646464"/>
+</svg>
--- a/web/documentserver-example/csharp/App_Themes/images/file_xlsx.svg
+++ b/web/documentserver-example/csharp/App_Themes/images/file_xlsx.svg
@ -1 +1,12 @@
-<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#6AAA1E"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#000" fill-opacity=".25"/><path fill-rule="evenodd" clip-rule="evenodd" d="M6 15h18v13H7.00001v-1H12v-3H7v4H6V15zm7 12h4v-3h-4v3zm5 0h5v-3h-5v3zm5-7v3h-5v-3h5zm-6 0v3h-4v-3h4zm-5 0v3H7v-3h5zm11-1v-3h-5v3h5zm-10-3h4v3h-4v-3zm-1 3v-3H7v3h5z" fill="#fff" fill-opacity=".95"/></svg>
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#78A73B"/>
+<path d="M22.9167 0L30.0001 7.08333H25.9168C24.2599 7.08333 22.9167 5.74019 22.9167 4.08333V0Z" fill="#5A7D2B"/>
+<path d="M6.17644 15.2941H23.8235V16.4706H6.17644V15.2941Z" fill="white"/>
+<path d="M6.17644 19.1177H23.8235V20.2941H6.17644V19.1177Z" fill="white"/>
+<path d="M6.17644 22.9412H23.8235V24.1177H6.17644V22.9412Z" fill="white"/>
+<path d="M6.17644 26.7647H23.8235V27.9412H6.17644V26.7647Z" fill="white"/>
+<path d="M5.88232 27.9412L5.88232 15.2941L7.0588 15.2941L7.0588 27.9412H5.88232Z" fill="white"/>
+<path d="M11.4706 27.9412L11.4706 15.2941L12.647 15.2941V27.9412H11.4706Z" fill="white"/>
+<path d="M17.0588 27.9412L17.0588 15.2941L18.2353 15.2941V27.9412H17.0588Z" fill="white"/>
+<path d="M22.647 27.9412V15.2941H23.8235V27.9412H22.647Z" fill="white"/>
+</svg>
--- a/web/documentserver-example/csharp/App_Themes/images/uid-1.png
+++ b/web/documentserver-example/csharp/App_Themes/images/uid-1.png
--- a/web/documentserver-example/csharp/App_Themes/images/uid-2.png
+++ b/web/documentserver-example/csharp/App_Themes/images/uid-2.png
--- a/web/documentserver-example/csharp/Default.aspx
+++ b/web/documentserver-example/csharp/Default.aspx
@ -13,7 +13,6 @@
 <head runat="server">
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <meta name="viewport" content="width=device-width" />
-    <meta name="server-version" content=<%= GetVersion() %> />
    <title>ONLYOFFICE</title>
    <!--
    *
--- a/web/documentserver-example/csharp/Default.aspx.cs
+++ b/web/documentserver-example/csharp/Default.aspx.cs
@ -30,15 +30,49 @@ using ASC.Api.DocumentConverter;

 namespace OnlineEditorsExample
 {
+    internal static class FileType
+    {
+        // the spreadsheet extension list
+        public static readonly List<string> ExtsSpreadsheet = new List<string>
+            {
+                ".xls", ".xlsx", ".xlsm", ".xlsb",
+                ".xlt", ".xltx", ".xltm",
+                ".ods", ".fods", ".ots", ".csv"
+            };
+
+        // the presentation extension list
+        public static readonly List<string> ExtsPresentation = new List<string>
+            {
+                ".pps", ".ppsx", ".ppsm",
+                ".ppt", ".pptx", ".pptm",
+                ".pot", ".potx", ".potm",
+                ".odp", ".fodp", ".otp"
+            };
+
+        // the document extension list
+        public static readonly List<string> ExtsDocument = new List<string>
+            {
+                ".doc", ".docx", ".docm",
+                ".dot", ".dotx", ".dotm",
+                ".odt", ".fodt", ".ott", ".rtf", ".txt",
+                ".html", ".htm", ".mht", ".xml",
+                ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps", ".oform"
+            };
+
+        // get an internal file extension
+        public static string GetInternalExtension(string extension)
+        {
+            extension = Path.GetExtension(extension).ToLower();  // get file extension
+            if (ExtsDocument.Contains(extension)) return ".docx";  // .docx for text document extensions
+            if (ExtsSpreadsheet.Contains(extension)) return ".xlsx";  // .xlsx for spreadsheet extensions
+            if (ExtsPresentation.Contains(extension)) return ".pptx";  // .pptx for presentation extensions
+            return string.Empty;
+        }
+    }
+
    public partial class _Default : Page
    {

-        //get server version
-        public static string GetVersion()
-        {
-            return WebConfigurationManager.AppSettings["version"];
-        }
-        
        // get the virtual path
        public static string VirtualPath
        {
@ -81,24 +115,24 @@ namespace OnlineEditorsExample
        // file extensions that can be viewed
        private static List<string> ViewedExts
        {
-            get { return FormatManager.ViewableExtensions(); }
+            get { return (WebConfigurationManager.AppSettings["files.docservice.viewed-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
        }
-
+        
        public static List<string> FillFormsExts
        {
-            get { return FormatManager.FillableExtensions(); }
+            get { return (WebConfigurationManager.AppSettings["files.docservice.fillform-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
        }

        // file extensions that can be edited
        public static List<string> EditedExts
        {
-            get { return FormatManager.EditableExtensions(); }
+            get { return (WebConfigurationManager.AppSettings["files.docservice.edited-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
        }

        // file extensions that can be converted
        public static List<string> ConvertExts
        {
-            get { return FormatManager.ConvertibleExtensions(); }
+            get { return (WebConfigurationManager.AppSettings["files.docservice.convert-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
        }

        private static string _fileName;
@ -250,9 +284,9 @@ namespace OnlineEditorsExample
        {
            var ext = Path.GetExtension(fileName).ToLower();

-            if (FormatManager.DocumentExtensions().Contains(ext)) return "word";  // word for text document extensions
-            if (FormatManager.SpreadsheetExtensions().Contains(ext)) return "cell";  // cell for spreadsheet extensions
-            if (FormatManager.PresentationExtensions().Contains(ext)) return "slide";  // slide for presentation extensions
+            if (FileType.ExtsDocument.Contains(ext)) return "word";  // word for text document extensions
+            if (FileType.ExtsSpreadsheet.Contains(ext)) return "cell";  // cell for spreadsheet extensions
+            if (FileType.ExtsPresentation.Contains(ext)) return "slide";  // slide for presentation extensions

            return "word";  // the default document type is word
        }
@ -504,12 +538,7 @@ namespace OnlineEditorsExample
        // get the correct file name if such a name already exists
        public static string GetCorrectName(string fileName, string userAddress = null)
        {
-            int maxName;
-            int.TryParse(WebConfigurationManager.AppSettings["filename-max"], out maxName);
            var baseName = Path.GetFileNameWithoutExtension(fileName);  // get file name without extension
-            if (baseName.Length > maxName){
-                baseName = baseName.Substring(0, maxName) + "[...]";
-            }
            var ext = Path.GetExtension(fileName).ToLower();  // get file extension
            var name = baseName + ext;  // get full file name

--- a/web/documentserver-example/csharp/DocEditor.aspx
+++ b/web/documentserver-example/csharp/DocEditor.aspx
@ -145,17 +145,13 @@
        };

        // the user is trying to select document for comparing by clicking the Document from Storage button
-        var onRequestSelectDocument = function (event) {
-            var data = <%= DocumentData %>;
-            data.c = event.data.c;
-            docEditor.setRequestedDocument(data);  // select a document for comparing
+        var onRequestCompareFile = function () {
+            docEditor.setRevisedFile(<%= CompareFileData %>);  // select a document for comparing
        };

        // the user is trying to select recipients data by clicking the Mail merge button
-        var onRequestSelectSpreadsheet = function (event) {
-            var data = <%= DataSpreadsheet %>;
-            data.c = event.data.c;
-            docEditor.setRequestedSpreadsheet(data);  // insert recipient data for spreadsheet into the file
+        var onRequestMailMergeRecipients = function (event) {
+            docEditor.setMailMergeRecipients(<%= DataMailMergeRecipients %>);  // insert recipient data for mail merge into the file
        };

        var onRequestSaveAs = function (event) {  //  the user is trying to save file by clicking Save Copy as... button
@ -194,42 +190,16 @@
            }
        };

-        var onRequestOpen = function (event) {  // user open external data source
-            innerAlert("onRequestOpen");
-            var windowName = event.data.windowName;
-
-            requestReference(event.data, function (data) {
-                if (data.error) {
-                    var winEditor = window.open("", windowName);
-                    winEditor.close();
-                    innerAlert(data.error, true);
-                    return;
-                }
-
-                var link = data.link;
-                window.open(link, windowName);
-            });
-        };
-
        var onRequestReferenceData = function (event) {  // user refresh external data source
-            innerAlert("onRequestReferenceData");

-            requestReference(event.data, function (data) {
-                docEditor.setReferenceData(data);
-            });
-        };
-
-        var requestReference = function (data, callback) {
-            innerAlert(data);
-
-            data.directUrl = !!config.document.directUrl;
+            event.data.directUrl = !!config.document.directUrl;
            let xhr = new XMLHttpRequest();
            xhr.open("POST", "webeditor.ashx?type=reference");
            xhr.setRequestHeader("Content-Type", "application/json");
-            xhr.send(JSON.stringify(data));
+            xhr.send(JSON.stringify(event.data));
            xhr.onload = function () {
                console.log(xhr.responseText);
-                callback(JSON.parse(xhr.responseText));
+                docEditor.setReferenceData(JSON.parse(xhr.responseText));
            }
        };

@ -246,8 +216,8 @@
            'onMakeActionLink': onMakeActionLink,
            'onMetaChange': onMetaChange,
            'onRequestInsertImage': onRequestInsertImage,
-            'onRequestSelectDocument': onRequestSelectDocument,
-            "onRequestSelectSpreadsheet": onRequestSelectSpreadsheet,
+            'onRequestCompareFile': onRequestCompareFile,
+            "onRequestMailMergeRecipients": onRequestMailMergeRecipients,
        };

        if (config.editorConfig.user.id) {
@ -298,32 +268,9 @@
            // add mentions for not anonymous users
            <% if (!string.IsNullOrEmpty(UsersForMentions))
            { %>
-                config.events['onRequestUsers'] = function (event) {
-                    if (event && event.data){
-                        var c = event.data.c;
-                    }
-                    switch (c) {
-                        case "info":
-                            users = [];
-                            var allUsers = <%= UsersInfo %>;
-                            for (var i = 0; i < event.data.id.length; i++) {
-                                for (var j = 0; j < allUsers.length; j++) {
-                                    if (allUsers[j].id == event.data.id[i]) {
-                                        users.push(allUsers[j]);
-                                        break;
-                                    }
-                                }
-                            }
-                            break;
-                        case "protect":
-                            var users = <%= UsersForProtect %>;
-                            break;
-                        default:
-                            users = <%= UsersForMentions %>;
-                    }
-                    docEditor.setUsers({
-                        "c": c,
-                        "users": users,
+                config.events['onRequestUsers'] = function () {
+                    docEditor.setUsers({  // set a list of users to mention in the comments
+                        "users": <%= UsersForMentions %>
                    });
                };
            <% } %>
@ -339,7 +286,6 @@
            config.events['onRequestReferenceData'] = onRequestReferenceData;
            // prevent switch the document from the viewing into the editing mode for anonymous users
            config.events['onRequestEditRights'] = onRequestEditRights;
-            config.events['onRequestOpen'] = onRequestOpen;
        }

        if (config.editorConfig.createUrl) {
--- a/web/documentserver-example/csharp/DocEditor.aspx.cs
+++ b/web/documentserver-example/csharp/DocEditor.aspx.cs
@ -61,11 +61,9 @@ namespace OnlineEditorsExample

        protected string DocConfig { get; private set; }
        protected string InsertImageConfig { get; private set; }
-        protected string DocumentData { get; private set; }
-        protected string DataSpreadsheet { get; private set; }
+        protected string CompareFileData { get; private set; }
+        protected string DataMailMergeRecipients { get; private set; }
        protected string UsersForMentions { get; private set; }
-        protected string UsersInfo { get; private set; }
-        protected string UsersForProtect { get; private set; }
        protected string DocumentType { get { return _Default.DocumentType(FileName); } }

        // get callback url
@ -154,7 +152,7 @@ namespace OnlineEditorsExample
                editorsMode = "fillForms";
                canEdit = true;
            }            
-            var submitForm = editorsMode.Equals("fillForms") && id.Equals("uid-1");  // check if the Submit form button is displayed or hidden
+            var submitForm = editorsMode.Equals("fillForms") && id.Equals("uid-1") && false;  // check if the Submit form button is displayed or hidden
            var mode = canEdit && editorsMode != "view" ? "edit" : "view";  // get the editor opening mode (edit or view)

            var jss = new JavaScriptSerializer();
@ -258,8 +256,7 @@ namespace OnlineEditorsExample
                                        {
                                            { "id", !user.id.Equals("uid-0") ? user.id : null },
                                            { "name",  user.name },
-                                            { "group", user.group },
-                                            { "image", user.avatar ? _Default.GetServerUrl(false) + "/App_Themes/images/"+ user.id + ".png" : null }
+                                            { "group", user.group }
                                        }
                                },
                                {
@ -311,22 +308,15 @@ namespace OnlineEditorsExample

                // a document which will be compared with the current document
                Dictionary<string, object> compareFile = GetCompareFile();
-                DocumentData = jss.Serialize(compareFile);
+                CompareFileData = jss.Serialize(compareFile);

-                // recipient data for spreadsheet
-                Dictionary<string, object> spreadsheetConfig = GetSpreadsheetConfig();
-                DataSpreadsheet = jss.Serialize(spreadsheetConfig);
+                // recipient data for mail merging
+                Dictionary<string, object> mailMergeConfig = GetMailMergeConfig();
+                DataMailMergeRecipients = jss.Serialize(mailMergeConfig);

                // get users for mentions
                List<Dictionary<string, object>> usersData = Users.getUsersForMentions(user.id);
                UsersForMentions = !user.id.Equals("uid-0") ? jss.Serialize(usersData) : null;
-
-                List<Dictionary<string, object>> usersInfo = Users.getUsersInfo(user.id);
-                UsersInfo = jss.Serialize(usersData);
-
-                // get users for protect
-                List<Dictionary<string, object>> usersProtectData = Users.getUsersForProtect(user.id);
-                UsersForProtect = !user.id.Equals("uid-0") ? jss.Serialize(usersProtectData) : null;
            }
            catch { }
        }
@ -403,43 +393,43 @@ namespace OnlineEditorsExample
            return dataCompareFile;
        }

-        // get a spreadsheet config
-        private Dictionary<string, object> GetSpreadsheetConfig()
+        // get a mail merge config
+        private Dictionary<string, object> GetMailMergeConfig()
        {
-            // get the path to the recipients data for spreadsheet
-            var spreadsheetUrl = new UriBuilder(_Default.GetServerUrl(true));
-            spreadsheetUrl.Path =
+            // get the path to the recipients data for mail merging
+            var mailmergeUrl = new UriBuilder(_Default.GetServerUrl(true));
+            mailmergeUrl.Path =
                    HttpRuntime.AppDomainAppVirtualPath
                    + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
                    + "webeditor.ashx";
-            spreadsheetUrl.Query = "type=csv";
+            mailmergeUrl.Query = "type=csv";

-            var DirectSpreadsheetUrl = new UriBuilder(_Default.GetServerUrl(false));
-            DirectSpreadsheetUrl.Path =
+            var DirectMailMergeUrl = new UriBuilder(_Default.GetServerUrl(false));
+            DirectMailMergeUrl.Path =
                    HttpRuntime.AppDomainAppVirtualPath
                    + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
                    + "webeditor.ashx";
-            DirectSpreadsheetUrl.Query = "type=csv";
+            DirectMailMergeUrl.Query = "type=csv";

-            // create a spreadsheet config
-            Dictionary<string, object> spreadsheetConfig = new Dictionary<string, object>
+            // create a mail merge config
+            Dictionary<string, object> mailMergeConfig = new Dictionary<string, object>
                {
                    { "fileType", "csv" },
-                    { "url", spreadsheetUrl.ToString() }
+                    { "url", mailmergeUrl.ToString() }
                };

            if (_Default.IsEnabledDirectUrl())
            {
-                spreadsheetConfig.Add("directUrl", DirectSpreadsheetUrl.ToString());
+                mailMergeConfig.Add("directUrl", DirectMailMergeUrl.ToString());
            }

            if (JwtManager.Enabled)  // if the secret key to generate token exists
            {
-                var spreadsheetToken = JwtManager.Encode(spreadsheetConfig);  // encode spreadsheetConfig into the token
-                spreadsheetConfig.Add("token", spreadsheetToken);  // and add it to the spreadsheet config
+                var mailmergeToken = JwtManager.Encode(mailMergeConfig);  // encode mailMergeConfig into the token
+                mailMergeConfig.Add("token", mailmergeToken);  // and add it to the mail merge config
            }

-            return spreadsheetConfig;
+            return mailMergeConfig;
        }

        // get image url for templates
@ -494,7 +484,7 @@ namespace OnlineEditorsExample
                    return;
            }
            var demoName = (string.IsNullOrEmpty(sample) ? "new" : "sample") + ext;  // create demo document name with the necessary extension
-            var demoPath = "assets\\document-templates\\" + (string.IsNullOrEmpty(sample) ? "new\\" : "sample\\");  // and put this file into the assets directory
+            var demoPath = "assets\\" + (string.IsNullOrEmpty(sample) ? "new\\" : "sample\\");  // and put this file into the assets directory

            FileName = _Default.GetCorrectName(demoName);  // get file name with an index if such a file name already exists

--- a/web/documentserver-example/csharp/FormatManager.cs
+++ b/web/documentserver-example/csharp/FormatManager.cs
@ -1,192 +0,0 @@
-/**
- *
- * (c) Copyright Ascensio System SIA 2023
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using Newtonsoft.Json;
-
-namespace OnlineEditorsExample
-{
-    public class Format
-    {
-        public string Name { get; }
-        public string Type { get; }
-        public List<string> Actions { get; }
-        public List<string> Convert { get; }
-        public List<string> Mime { get; }
-
-        public Format(string name, string type, List<string> actions, List<string> convert, List<string> mime)
-        {
-            Name = name;
-            Type = type;
-            Actions = actions;
-            Convert = convert;
-            Mime = mime;
-        }
-
-        public string Extension()
-        {
-            return "." + Name;
-        }
-    }
-
-    public class FormatManager
-    {
-        private static List<Format> cachedFormats;
-
-        public static List<string> FillableExtensions()
-        {
-            return Fillable()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> Fillable()
-        {
-            return All()
-                .Where(format => format.Actions.Contains("fill"))
-                .ToList();
-        }
-
-        public static List<string> ViewableExtensions()
-        {
-            return Viewable()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> Viewable()
-        {
-            return All()
-                .Where(format => format.Actions.Contains("view"))
-                .ToList();
-        }
-
-        public static List<string> EditableExtensions()
-        {
-            return Editable()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> Editable()
-        {
-            return All()
-                .Where(format => format.Actions.Contains("edit") || format.Actions.Contains("lossy-edit"))
-                .ToList();
-        }
-
-        public static List<string> ConvertibleExtensions()
-        {
-            return Convertible()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> Convertible()
-        {
-            return All()
-                .Where(format => format.Actions.Contains("auto-convert"))
-                .ToList();
-        }
-
-        public static List<string> SpreadsheetExtensions()
-        {
-            return Spreadsheets()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> Spreadsheets()
-        {
-            return All()
-                .Where(format => format.Type == "cell")
-                .ToList();
-        }
-
-        public static List<string> PresentationExtensions()
-        {
-            return Presentations()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> Presentations()
-        {
-            return All()
-                .Where(format => format.Type == "slide")
-                .ToList();
-        }
-
-        public static List<string> DocumentExtensions()
-        {
-            return Documents()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> Documents()
-        {
-            return All()
-                .Where(format => format.Type == "word")
-                .ToList();
-        }
-
-        public static List<string> AllExtensions()
-        {
-            return All()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> All()
-        {
-            if (cachedFormats == null) { 
-                var path = GetPath();
-                var lines = File.ReadLines(path, Encoding.UTF8);
-                var contents = string.Join(Environment.NewLine, lines);
-                var formats = JsonConvert.DeserializeObject<Format[]>(contents);
-                cachedFormats = formats.ToList();
-            }
-
-            return cachedFormats;
-        }
-
-        private static string GetPath()
-        {
-            string path = Path.Combine(GetDirectory(), "onlyoffice-docs-formats.json");
-            if (File.Exists(path))
-            {
-                return path;
-            }
-            else
-            {
-                throw new FileNotFoundException("The JSON file does not exist.");
-            }
-        }
-
-        private static string GetDirectory()
-        {
-            string directory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "assets", "document-formats");
-            return Path.GetFullPath(directory);
-        }
-    }
-}
--- a/web/documentserver-example/csharp/OnlineEditorsExample.csproj
+++ b/web/documentserver-example/csharp/OnlineEditorsExample.csproj
@ -119,7 +119,6 @@
      <DependentUpon>DocEditor.aspx</DependentUpon>
    </Compile>
    <Compile Include="DocumentConverter.cs" />
-    <Compile Include="FormatManager.cs" />
    <Compile Include="JwtManager.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="Default.aspx.cs">
@ -149,6 +148,7 @@
    <Content Include="App_Themes\jquery-ui.css" />
    <Content Include="App_Themes\stylesheet.css" />
    <Content Include="DocEditor.aspx" />
+    <Content Include="script\jquery-1.9.0.min.js" />
    <Content Include="script\jquery-ui.min.js" />
    <Content Include="script\jquery.blockUI.js" />
    <Content Include="script\jquery.dropdownToggle.js" />
@ -158,23 +158,17 @@
    <Content Include="WebEditor.ashx" />
  </ItemGroup>
  <ItemGroup>
-    <Content Include="assets\document-formats\AUTHORS.md" />
-    <Content Include="assets\document-formats\CHANGELOG.md" />
-    <Content Include="assets\document-formats\LICENSE" />
-    <Content Include="assets\document-formats\onlyoffice-docs-formats.json" />
-    <Content Include="assets\document-formats\README.md" />
-    <Content Include="assets\document-templates\AUTHORS.md" />
-    <Content Include="assets\document-templates\LICENSE" />
-    <Content Include="assets\document-templates\new\new.docx" />
-    <Content Include="assets\document-templates\new\new.docxf" />
-    <Content Include="assets\document-templates\new\new.pptx" />
-    <Content Include="assets\document-templates\new\new.xlsx" />
-    <Content Include="assets\document-templates\README.md" />
-    <Content Include="assets\document-templates\sample\csv.csv" />
-    <Content Include="assets\document-templates\sample\sample.docx" />
-    <Content Include="assets\document-templates\sample\sample.docxf" />
-    <Content Include="assets\document-templates\sample\sample.pptx" />
-    <Content Include="assets\document-templates\sample\sample.xlsx" />
+    <Content Include="assets\AUTHORS.md" />
+    <Content Include="assets\LICENSE" />
+    <Content Include="assets\new\new.docx" />
+    <Content Include="assets\new\new.docxf" />
+    <Content Include="assets\new\new.pptx" />
+    <Content Include="assets\new\new.xlsx" />
+    <Content Include="assets\sample\csv.csv" />
+    <Content Include="assets\sample\sample.docx" />
+    <Content Include="assets\sample\sample.docxf" />
+    <Content Include="assets\sample\sample.pptx" />
+    <Content Include="assets\sample\sample.xlsx" />
    <None Include="packages.config" />
  </ItemGroup>
  <PropertyGroup>
--- a/web/documentserver-example/csharp/TrackManager.cs
+++ b/web/documentserver-example/csharp/TrackManager.cs
@ -258,22 +258,6 @@ namespace OnlineEditorsExample
                    var action = jss.Deserialize<Dictionary<string, object>>(jss.Serialize(actions[0]));
                    var user = action["userid"].ToString();  // get the user id
                    DocEditor.CreateMeta(fileName, user, "Filling Form", userAddress);  // create meta data for the forcesaved file
-
-                    string formsDataUrl = fileData["formsdataurl"].ToString();
-
-                    if (!string.IsNullOrEmpty(formsDataUrl))
-                    {
-                        string formsName = _Default.GetCorrectName(Path.GetFileNameWithoutExtension(fileName) + ".txt", userAddress);
-                        string formsPath = _Default.StoragePath(formsName, userAddress);
-
-                        var bytesForms = DownloadFile(formsDataUrl);
-
-                        SaveFile(bytesForms, formsPath);
-                    }
-                    else
-                    {
-                        throw new Exception("Document editing service did not return formsDataUrl");
-                    }
                }
            }
            catch (Exception)
--- a/web/documentserver-example/csharp/Users.cs
+++ b/web/documentserver-example/csharp/Users.cs
@ -30,9 +30,7 @@ namespace OnlineEditorsExample
            "Can perform all actions with comments",
            "The file favorite state is undefined",
            "Can create files from templates using data from the editor",
-            "Can see the information about all users",
-            "Has an avatar",
-            "Can submit forms"
+            "Can see the information about all users"
        };

        static List<string> descr_user_2 = new List<string>()
@ -42,9 +40,7 @@ namespace OnlineEditorsExample
            "Can view comments, edit his own comments and comments left by users with no group. Can remove his own comments only",
            "This file is marked as favorite",
            "Can create new files from the editor",
-            "Can see the information about users from Group2 and users who don’t belong to any group",
-            "Has an avatar",
-            "Can’t submit forms"
+            "Can see the information about users from Group2 and users who don’t belong to any group"
        };

        static List<string> descr_user_3 = new List<string>()
@ -57,8 +53,7 @@ namespace OnlineEditorsExample
            "Can’t download the file",
            "Can’t print the file",
            "Can create new files from the editor",
-            "Can see the information about Group2 users",
-            "Can’t submit forms"
+            "Can see the information about Group2 users"
        };

        static List<string> descr_user_0 = new List<string>()
@ -75,7 +70,6 @@ namespace OnlineEditorsExample
            "Can't view chat",
            "Can't protect file",
            "View file without collaboration",
-            "Can’t submit forms"
        };

        private static List<User> users = new List<User>() {
@ -90,7 +84,6 @@ namespace OnlineEditorsExample
                    null,
                    new List<string>(),
                    descr_user_1,
-                    true,
                    true
                ),
            new User(
@ -109,13 +102,12 @@ namespace OnlineEditorsExample
                    true,
                    new List<string>(),
                    descr_user_2,
-                    false,
-                    true
+                    false
                ),
            new User(
                    "uid-3",
                    "Hamish Mitchell",
-                    null,
+                    "mitchell@example.com",
                    "group-3",
                    new List<string>() { "group-2" },
                    new Dictionary<string,object>()
@ -128,7 +120,6 @@ namespace OnlineEditorsExample
                    false,
                    new List<string>() { "copy", "download", "print" },
                    descr_user_3,
-                    false,
                    false
                ),
            new User(
@ -142,7 +133,6 @@ namespace OnlineEditorsExample
                    null,
                    new List<string>() { "protect" },
                    descr_user_0,
-                    false,
                    false
                )
        };
@ -181,44 +171,6 @@ namespace OnlineEditorsExample
            }
            return usersData;
        }
-
-        public static List<Dictionary<string, object>> getUsersInfo(string id)
-        {
-            List<Dictionary<string, object>> usersData = new List<Dictionary<string, object>>();
-            if(id != "uid-0"){
-                foreach (User user in users)
-                {
-                    usersData.Add(new Dictionary<string, object>()
-                    {
-                        {"id", user.id},
-                        {"name", user.name },
-                        {"email", user.email },
-                        {"image", user.avatar ? _Default.GetServerUrl(false) + "/App_Themes/images/"+ user.id + ".png" : null }
-                    });
-                }
-            }
-            return usersData;
-        }
-
-        // get a list of users with their names and emails for protect
-        public static List<Dictionary<string, object>> getUsersForProtect(string id)
-        {
-            List<Dictionary<string, object>> usersData = new List<Dictionary<string, object>>();
-
-            foreach (User user in users)
-            {
-                if (!user.id.Equals(id) && user.name != null)
-                {
-                    usersData.Add(new Dictionary<string, object>()
-                    {
-                        {"name", user.name },
-                        {"email", user.email },
-                        {"id", user.id}
-                    });
-                }
-            }
-            return usersData;
-        }
    }

    public class User
@ -234,9 +186,8 @@ namespace OnlineEditorsExample
        public List<string> descriptions;
        public bool templates;
        public List<string> userInfoGroups;
-        public bool avatar;

-        public User(string id, string name, string email, string group, List<string> reviewGroups, Dictionary<string, object> commentGroups, List<string> userInfoGroups, bool? favorite, List<string> deniedPermissions, List<string> descriptions, bool templates, bool avatar)
+        public User(string id, string name, string email, string group, List<string> reviewGroups, Dictionary<string, object> commentGroups, List<string> userInfoGroups, bool? favorite, List<string> deniedPermissions, List<string> descriptions, bool templates)
        {
            this.id = id;
            this.name = name;
@ -249,7 +200,6 @@ namespace OnlineEditorsExample
            this.descriptions = descriptions;
            this.templates = templates;
            this.userInfoGroups = userInfoGroups;
-            this.avatar = avatar;
        }
    }
 }
--- a/web/documentserver-example/csharp/WebEditor.ashx.cs
+++ b/web/documentserver-example/csharp/WebEditor.ashx.cs
@ -29,7 +29,6 @@ using System.Net;
 using System.Collections;
 using System.Net.Sockets;
 using ASC.Api.DocumentConverter;
-using Newtonsoft.Json;

 namespace OnlineEditorsExample
 {
@ -276,7 +275,7 @@ namespace OnlineEditorsExample
        private static void Assets(HttpContext context)
        {
            var fileName = Path.GetFileName(context.Request["filename"]);
-            var filePath = HttpRuntime.AppDomainAppPath + "assets/document-templates/sample/" + fileName;
+            var filePath = HttpRuntime.AppDomainAppPath + "assets/sample/" + fileName;
            download(filePath, context);
        }

@ -284,7 +283,7 @@ namespace OnlineEditorsExample
        private static void GetCsv(HttpContext context)
        {
            var fileName = "csv.csv";
-            var filePath = HttpRuntime.AppDomainAppPath + "assets/document-templates/sample/" + fileName;
+            var filePath = HttpRuntime.AppDomainAppPath + "assets/sample/" + fileName;
            download(filePath, context);
        }

@ -623,27 +622,6 @@ namespace OnlineEditorsExample
                }
            }

-            if (fileName == "" && body.ContainsKey("link"))
-            {
-                string link = body["link"].ToString();
-                if (!link.Contains(_Default.GetServerUrl(false)))
-                {
-                    context.Response.Write(jss.Serialize(new Dictionary<string, string>() {
-                        { "url", link },
-                        { "directUrl", link }
-                    }));
-                    return;
-                }
-
-                Uri linkUri = new Uri(link);
-                fileName = HttpUtility.ParseQueryString(linkUri.Query).Get("fileID");
-                if (string.IsNullOrEmpty(fileName) || !File.Exists(_Default.StoragePath(fileName, null)))
-                {
-                    context.Response.Write("{ \"error\": \"File is not exist\"}");
-                    return;
-                }
-            }
-
            if (fileName == "")
            {
                try
@ -672,9 +650,6 @@ namespace OnlineEditorsExample

            var data = new Dictionary<string, object>() {
            { "fileType", (Path.GetExtension(fileName) ?? "").ToLower().Trim('.') },
-            { "key", ServiceConverter.GenerateRevisionId(_Default.CurUserHostAddress(null)
-                        + "/" + Path.GetFileName(_Default.FileUri(fileName, true))
-                        + "/" + File.GetLastWriteTime(_Default.StoragePath(fileName, null)).GetHashCode()) },
            { "url",  DocEditor.getDownloadUrl(fileName)},
            { "directUrl", directUrl ? DocEditor.getDownloadUrl(fileName, false) : null},
            { "referenceData", new Dictionary<string, string>()
@ -687,8 +662,7 @@ namespace OnlineEditorsExample
                    {"instanceId", _Default.GetServerUrl(false) }
                }
            },
-            { "path", fileName },
-            { "link", _Default.GetServerUrl(false) + "doceditor.aspx?fileID=" + fileName }
+            { "path", fileName }
            };

            if (JwtManager.Enabled)
--- a/web/documentserver-example/csharp/assets/document-templates
+++ b/web/documentserver-example/csharp/assets/document-templates
--- a/web/documentserver-example/csharp/assets/document-formats
+++ b/web/documentserver-example/csharp/assets/document-formats
--- a/web/documentserver-example/csharp/settings.config
+++ b/web/documentserver-example/csharp/settings.config
@ -5,8 +5,11 @@

  <add key="filesize-max" value="52428800"/>
  <add key="storage-path" value=""/>
-  <add key="filename-max" value="50"/>

+  <add key="files.docservice.fillform-docs" value=".docx|.oform"/>
+  <add key="files.docservice.viewed-docs" value=".djvu|.oxps|.pdf|.xps"/>
+  <add key="files.docservice.edited-docs" value=".csv|.docm|.docx|.docxf|.dotm|.dotx|.epub|.fb2|.html|.odp|.ods|.odt|.otp|.ots|.ott|.potm|.potx|.ppsm|.ppsx|.pptm|.pptx|.rtf|.txt|.xlsm|.xlsx|.xltm|.xltx"/>
+  <add key="files.docservice.convert-docs" value=".doc|.dot|.dps|.dpt|.epub|.et|.ett|.fb2|.fodp|.fods|.fodt|.htm|.html|.mht|.mhtml|.odp|.ods|.odt|.otp|.ots|.ott|.pot|.pps|.ppt|.rtf|.stw|.sxc|.sxi|.sxw|.wps|.wpt|.xls|.xlsb|.xlt|.xml"/>
  <add key="files.docservice.timeout" value="120000" />
  <add key="files.docservice.secret" value="" />
  <add key="files.docservice.header" value="Authorization" />
@ -14,7 +17,7 @@

  <add key="files.docservice.token.useforrequest" value="true" />

-  <add key="files.docservice.languages" value="en:English|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sr-Latn-CS:Serbian|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA: Test Language"/>
+  <add key="files.docservice.languages" value="en:English|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA: Test Language"/>

  <add key="files.docservice.url.site" value="http://documentserver/"/>

--- a/web/documentserver-example/java-spring/README.md
+++ b/web/documentserver-example/java-spring/README.md
@ -20,7 +20,7 @@ See the detailed guide to learn how to install Document Server [for Windows](htt

 Download the [Java-Spring example](https://api.onlyoffice.com/editors/demopreview) from our site.

-To connect the editors to your website, specify the path to the editors installation, server port and the path to the storage folder in the *src/main/resources/application.properties* file:
+To connect the editors to your website, specify the path to the editors installation, server port and the path to the storage folder in the *\src\main\resources\application.properties* file:

 ```
 files.storage=
@ -128,18 +128,22 @@ See the detailed guide to learn how to install Document Server [for Linux](https

 ### Step 2. Install the prerequisites and run the website with the editors

-1. Install **Java** following the instructions [here](https://docs.oracle.com/en/java/javase/20/install/installation-jdk-linux-platforms.html#GUID-737A84E4-2EFF-4D38-8E60-3E29D1B884B8).
+1. Install **Java**:
+
+    ```
+    sudo add-apt-repository ppa:webupd8team/java sudo apt-get update sudo apt-get install oracle-java11-installer
+    ```

 2. Download the archive with the Java-Spring example and unpack the archive or clone git repository:

    a) archive with Java-Spring:

    ```
-    wget https://api.onlyoffice.com/app_data/editor/Java.Spring.Example.zip
+    wget https://api.onlyoffice.com/app_data/editor/Java%20Spring%20Example.zip
    ```
    
    ```
-    unzip Java.Spring.Example.zip
+    unzip Java\ Spring\ Example.zip
    ```
    b) git repository:
    ```
@ -158,7 +162,7 @@ See the detailed guide to learn how to install Document Server [for Linux](https
    ```
    cd document-server-integration/web/documentserver-example/java-spring
    ```
-4. Edit the *src/main/resources/application.properties* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed.
+4. Edit the *application.properties* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed.

    ```
    nano src/main/resources/application.properties
@ -206,51 +210,13 @@ Make sure that the Document Server has access to the server with the example ins

 ##  For Docker

-### Step 1. Install ONLYOFFICE Docs
-
-Download and install ONLYOFFICE Docs (packaged as Document Server). 
-
-See the detailed guide to learn how to install Document Server [for Docker](https://helpcenter.onlyoffice.com/installation/docs-developer-install-docker.aspx). 
-
-### Step 2. Install the prerequisites and run the website with the editors
-
-1. Install **Java** following the instructions [here](https://docs.oracle.com/en/java/javase/20/install/installation-jdk-linux-platforms.html#GUID-737A84E4-2EFF-4D38-8E60-3E29D1B884B8).
-
-2. Download the archive with the Java-Spring example and unpack the archive or clone git repository:
-
-    a) archive with Java-Spring:
-
-    ```
-    wget https://api.onlyoffice.com/app_data/editor/Java.Spring.Example.zip
-    ```
-    
-    ```
-    unzip Java.Spring.Example.zip
-    ```
-    b) git repository:
-    ```
-    git clone https://github.com/ONLYOFFICE/document-server-integration.git
-    ```
-
-
-3. Change the current directory for the project directory:
-
-    a) from archive
-
-    ```
-   cd Java\ Spring\ Example/
-   ```
-   b) from git repository 
-    ```
-    cd document-server-integration/web/documentserver-example/java-spring
-    ```
-4. Edit the *src/main/resources/application.properties* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed:
+1. Edit the *application.properties* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed ([installation instructions](https://helpcenter.onlyoffice.com/installation/docs-developer-install-docker.aspx)).

 	```
 	nano src/main/resources/application.properties
 	```
 	
-5. Edit the following lines:
+2. Edit the following lines:

   ```
   files.storage=
@ -260,23 +226,17 @@ See the detailed guide to learn how to install Document Server [for Docker](http

    where the **documentserver** is the name of the server with the ONLYOFFICE Docs installed, **port** is any available port and **files.storage** is the path where files will be created and stored (in the project folder by default). You can set an absolute path.

-6. Run the next command in the java example directory:
+3. Run the next command in the java example directory:

 	```
 	docker-compose up
 	```
-7. Open your browser using **server.address** and **server.port**:
+4. Open your browser using **server.address** and **server.port**:

      ```
      http://server.address:server.port/
      ```

-### Step 3. Check accessibility
-
-In case the example and Document Server are installed on different computers, make sure that your server with the example installed has access to the Document Server with the address which you specify instead of **documentserver** in the configuration files. 
-
-Make sure that the Document Server has access to the server with the example installed with the address which you specify instead of **example.com** in the configuration files.
-
 ## Important security info

 Please keep in mind the following security aspects when you are using test examples:
--- a/web/documentserver-example/java-spring/checkstyle-suppressions.xml
+++ b/web/documentserver-example/java-spring/checkstyle-suppressions.xml
@ -10,5 +10,4 @@
    <suppress checks="JavadocPackage" files="."/>
    <suppress checks="JavadocVariable" files="."/>
    <suppress checks="MissingJavadocMethod" files="."/>
-    <suppress checks="MagicNumber" files="DefaultDocumentManager.java"/>
 </suppressions>
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/ExampleData.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/ExampleData.java
@ -46,8 +46,7 @@ public class ExampleData {
                "Can't rename files from the editor",
                "Can't view chat",
                "Can't protect file",
-                "View file without collaboration",
-                "Can’t submit forms"
+                "View file without collaboration"
        );

        // the description for user 1
@ -59,9 +58,7 @@ public class ExampleData {
                "The file favorite state is undefined",
                "Can create a file from a template with data from the editor",
                "Can see the information about all users",
-                "Can view chat",
-                "Has an avatar",
-                "Can submit forms"
+                "Can view chat"
        );

        // the description for user 2
@ -74,9 +71,7 @@ public class ExampleData {
                "This file is favorite",
                "Can create a file from an editor",
                "Can see the information about users from Group2 and users who don’t belong to any group",
-                "Can view chat",
-                "Has an avatar",
-                "Can’t submit forms"
+                "Can view chat"
        );

        // the description for user 3
@ -91,31 +86,30 @@ public class ExampleData {
                "He can’t print the file",
                "Can create a file from an editor",
                "Can see the information about Group2 users",
-                "Can view chat",
-                "Can’t submit forms"
+                "Can view chat"
        );

        // create user 1 with the specified parameters
        userService.createUser("John Smith", "smith@example.com", descriptionUserFirst,
                "", List.of(FilterState.NULL.toString()), List.of(FilterState.NULL.toString()),
                List.of(FilterState.NULL.toString()), List.of(FilterState.NULL.toString()),
-                List.of(FilterState.NULL.toString()), null, true, true, true);
+                List.of(FilterState.NULL.toString()), null, true, true);

        // create user 2 with the specified parameters
        userService.createUser("Mark Pottato", "pottato@example.com", descriptionUserSecond,
                "group-2", List.of("", "group-2"), List.of(FilterState.NULL.toString()),
                List.of("group-2", ""), List.of("group-2"), List.of("group-2", ""), true, true,
-                true, true);
+                true);

        // create user 3 with the specified parameters
-        userService.createUser("Hamish Mitchell", null, descriptionUserThird,
+        userService.createUser("Hamish Mitchell", "mitchell@example.com", descriptionUserThird,
                "group-3", List.of("group-2"), List.of("group-2", "group-3"), List.of("group-2"),
-                new ArrayList<>(), List.of("group-2"), false, true, true, false);
+                new ArrayList<>(), List.of("group-2"), false, true, true);

        // create user 0 with the specified parameters
        userService.createUser("Anonymous", null, descriptionUserZero, "",
                List.of(FilterState.NULL.toString()), List.of(FilterState.NULL.toString()),
                List.of(FilterState.NULL.toString()), List.of(FilterState.NULL.toString()),
-                new ArrayList<>(), null, false, false, false);
+                new ArrayList<>(), null, false, false);
    }
 }
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/EditorController.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/EditorController.java
@ -20,13 +20,12 @@ package com.onlyoffice.integration.controllers;

 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.onlyoffice.integration.documentserver.managers.history.HistoryManager;
 import com.onlyoffice.integration.documentserver.managers.jwt.JwtManager;
 import com.onlyoffice.integration.documentserver.models.enums.Action;
 import com.onlyoffice.integration.documentserver.storage.FileStoragePathBuilder;
 import com.onlyoffice.integration.entities.User;
 import com.onlyoffice.integration.dto.Mentions;
-import com.onlyoffice.integration.dto.UserInfo;
-import com.onlyoffice.integration.dto.Protect;
 import com.onlyoffice.integration.documentserver.models.enums.Type;
 import com.onlyoffice.integration.documentserver.models.filemodel.FileModel;
 import com.onlyoffice.integration.services.UserServices;
@ -74,6 +73,9 @@ public class EditorController {
    @Autowired
    private UserServices userService;

+    @Autowired
+    private HistoryManager historyManager;
+
    @Autowired
    private ObjectMapper objectMapper;

@ -119,8 +121,6 @@ public class EditorController {
        }

        User user = optionalUser.get();
-        user.setImage(user.getAvatar() ? storagePathBuilder.getServerUrl(true) + "/css/img/uid-"
-                + user.getId() + ".png" : null);

        // get file model with the default file parameters
        FileModel fileModel = fileConfigurer.getFileModel(
@ -140,6 +140,9 @@ public class EditorController {
        // add file model with the default parameters to the original model
        model.addAttribute("model", fileModel);

+        // get file history and add it to the model
+        model.addAttribute("fileHistory", historyManager.getHistory(fileModel.getDocument()));
+
        // create the document service api URL and add it to the model
        model.addAttribute("docserviceApiUrl", docserviceSite + docserviceApiUrl);

@ -147,19 +150,13 @@ public class EditorController {
        model.addAttribute("dataInsertImage",  getInsertImage(directUrl));

        // get a document for comparison and add it to the model
-        model.addAttribute("dataDocument",  getCompareFile(directUrl));
+        model.addAttribute("dataCompareFile",  getCompareFile(directUrl));

        // get recipients data for mail merging and add it to the model
-        model.addAttribute("dataSpreadsheet", getSpreadsheet(directUrl));
+        model.addAttribute("dataMailMergeRecipients", getMailMerge(directUrl));

        // get user data for mentions and add it to the model
        model.addAttribute("usersForMentions", getUserMentions(uid));
-
-        model.addAttribute("usersInfo", getUsersInfo(uid));
-
-        // get user data for protect and add it to the model
-        model.addAttribute("usersForProtect", getUserProtect(uid));
-
        return "editor.html";
    }

@ -179,36 +176,6 @@ public class EditorController {
        return usersForMentions;
    }

-    private List<UserInfo> getUsersInfo(final String uid) {  // get user data for mentions
-        List<UserInfo> usersInfo = new ArrayList<>();
-        if (uid != null && !uid.equals("4")) {
-            List<User> list = userService.findAll();
-            for (User u : list) {
-                String image = u.getAvatar() ? storagePathBuilder.getServerUrl(true) + "/css/img/uid-"
-                + u.getId() + ".png" : null;
-                usersInfo.add(new UserInfo(u.getId(), u.getName(), u.getEmail(), image));
-            }
-        }
-        return usersInfo;
-    }
-
-    private List<Protect> getUserProtect(final String uid) {  // get user data for protect
-        List<Protect> usersForProtect = new ArrayList<>();
-        if (uid != null && !uid.equals("4")) {
-            List<User> list = userService.findAll();
-            for (User u : list) {
-                if (u.getId() != Integer.parseInt(uid) && u.getId() != ANONYMOUS_USER_ID) {
-
-                    // user data includes user names, IDs and emails
-                    usersForProtect.add(new Protect(u.getId(), u.getName(), u.getEmail()));
-                }
-            }
-        }
-
-        return usersForProtect;
-    }
-
-
    @SneakyThrows
    private String getInsertImage(final Boolean directUrl) {  // get an image that will be inserted into the document
        Map<String, Object> dataInsertImage = new HashMap<>();
@ -233,40 +200,40 @@ public class EditorController {
    // get a document that will be compared with the current document
    @SneakyThrows
    private String getCompareFile(final Boolean directUrl) {
-        Map<String, Object> dataDocument = new HashMap<>();
-        dataDocument.put("fileType", "docx");
-        dataDocument.put("url", storagePathBuilder.getServerUrl(true) + "/assets?name=sample.docx");
+        Map<String, Object> dataCompareFile = new HashMap<>();
+        dataCompareFile.put("fileType", "docx");
+        dataCompareFile.put("url", storagePathBuilder.getServerUrl(true) + "/assets?name=sample.docx");
        if (directUrl) {
-            dataDocument.put("directUrl", storagePathBuilder
+            dataCompareFile.put("directUrl", storagePathBuilder
                    .getServerUrl(false) + "/assets?name=sample.docx");
        }

        // check if the document token is enabled
        if (jwtManager.tokenEnabled()) {

-            // create token from the dataDocument object
-            dataDocument.put("token", jwtManager.createToken(dataDocument));
+            // create token from the dataCompareFile object
+            dataCompareFile.put("token", jwtManager.createToken(dataCompareFile));
        }

-        return objectMapper.writeValueAsString(dataDocument);
+        return objectMapper.writeValueAsString(dataCompareFile);
    }

    @SneakyThrows
-    private String getSpreadsheet(final Boolean directUrl) {
-        Map<String, Object> dataSpreadsheet = new HashMap<>();  // get recipients data for mail merging
-        dataSpreadsheet.put("fileType", "csv");
-        dataSpreadsheet.put("url", storagePathBuilder.getServerUrl(true) + "/csv");
+    private String getMailMerge(final Boolean directUrl) {
+        Map<String, Object> dataMailMergeRecipients = new HashMap<>();  // get recipients data for mail merging
+        dataMailMergeRecipients.put("fileType", "csv");
+        dataMailMergeRecipients.put("url", storagePathBuilder.getServerUrl(true) + "/csv");
        if (directUrl) {
-            dataSpreadsheet.put("directUrl", storagePathBuilder.getServerUrl(false) + "/csv");
+            dataMailMergeRecipients.put("directUrl", storagePathBuilder.getServerUrl(false) + "/csv");
        }

        // check if the document token is enabled
        if (jwtManager.tokenEnabled()) {

-            // create token from the dataSpreadsheet object
-            dataSpreadsheet.put("token", jwtManager.createToken(dataSpreadsheet));
+            // create token from the dataMailMergeRecipients object
+            dataMailMergeRecipients.put("token", jwtManager.createToken(dataMailMergeRecipients));
        }

-        return objectMapper.writeValueAsString(dataSpreadsheet);
+        return objectMapper.writeValueAsString(dataMailMergeRecipients);
    }
 }
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java
@ -22,17 +22,11 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.onlyoffice.integration.documentserver.callbacks.CallbackHandler;
-import com.onlyoffice.integration.documentserver.managers.history.HistoryManager;
 import com.onlyoffice.integration.documentserver.managers.jwt.JwtManager;
 import com.onlyoffice.integration.documentserver.storage.FileStorageMutator;
 import com.onlyoffice.integration.documentserver.storage.FileStoragePathBuilder;
 import com.onlyoffice.integration.dto.Converter;
 import com.onlyoffice.integration.dto.ConvertedData;
-import com.onlyoffice.integration.dto.Reference;
-import com.onlyoffice.integration.dto.ReferenceData;
-import com.onlyoffice.integration.dto.Rename;
-import com.onlyoffice.integration.dto.Restore;
-import com.onlyoffice.integration.dto.SaveAs;
 import com.onlyoffice.integration.dto.Track;
 import com.onlyoffice.integration.entities.User;
 import com.onlyoffice.integration.documentserver.models.enums.DocumentType;
@ -48,7 +42,6 @@ import org.json.simple.parser.JSONParser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
-import org.springframework.core.io.UrlResource;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@ -63,8 +56,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.util.UriComponents;
-import org.springframework.web.util.UriComponentsBuilder;

 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
@ -73,7 +64,6 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.InetAddress;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
@ -84,6 +74,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Optional;

@ -123,8 +114,6 @@ public class FileController {
    private ServiceConverter serviceConverter;
    @Autowired
    private CallbackManager callbackManager;
-    @Autowired
-    private HistoryManager historyManager;

    // create user metadata
    private String createUserMetadata(final String uid, final String fullFileName) {
@ -151,28 +140,6 @@ public class FileController {
                .body(resource);
    }

-    private ResponseEntity<Resource> downloadSample(final String fileName) {
-        String serverPath = System.getProperty("user.dir");
-        String contentType = "application/octet-stream";
-        String[] fileLocation = new String[] {serverPath, "src", "main", "resources", "assets", "document-templates",
-                                              "sample", fileName};
-        Path filePath = Paths.get(String.join(File.separator, fileLocation));
-        Resource resource;
-        try {
-            resource = new UrlResource(filePath.toUri());
-            if (resource.exists()) {
-                return ResponseEntity.ok()
-                        .contentType(MediaType.parseMediaType(contentType))
-                        .header(HttpHeaders.CONTENT_DISPOSITION,
-                                "attachment; filename=\"" + resource.getFilename() + "\"")
-                        .body(resource);
-        }
-        } catch (MalformedURLException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
    // download data from the specified history file
    private ResponseEntity<Resource> downloadFileHistory(final String fileName,
                                                         final String version,
@ -217,8 +184,7 @@ public class FileController {
                throw new IOException("Could not update a file");  // if the file cannot be updated, an error occurs
            }

-            fullFileName = fileUtility.getFileNameWithoutExtension(fileNamePath)
-                    + "." + fileExtension;  // get full file name
+            fullFileName = fileUtility.getFileNameWithoutExtension(fileNamePath) + fileExtension;  // get full file name

            return createUserMetadata(uid, fullFileName);  // create user metadata and return it
        } catch (Exception e) {
@ -398,12 +364,14 @@ public class FileController {
    @GetMapping("/assets")
    public ResponseEntity<Resource> assets(@RequestParam("name")
                                               final String name) {  // get sample files from the assests
-        return downloadSample(name);
+        String fileName = Path.of("assets", "document-templates", "sample", fileUtility.getFileName(name)).toString();
+        return downloadFile(fileName);
    }

    @GetMapping("/csv")
    public ResponseEntity<Resource> csv() {  // download a csv file
-        return downloadSample("csv.csv");
+        String fileName = Path.of("assets", "document-templates", "sample", "csv.csv").toString();
+        return downloadFile(fileName);
    }

    @GetMapping("/files")
@ -444,16 +412,19 @@ public class FileController {

    @PostMapping("/saveas")
    @ResponseBody
-    public String saveAs(@RequestBody final SaveAs body, @CookieValue("uid") final String uid) {
+    public String saveAs(@RequestBody final JSONObject body, @CookieValue("uid") final String uid) {
+        String title = (String) body.get("title");
+        String saveAsFileUrl = (String) body.get("url");
+
        try {
-            String fileName = documentManager.getCorrectName(body.getTitle());
+            String fileName = documentManager.getCorrectName(title);
            String curExt = fileUtility.getFileExtension(fileName);

            if (!fileUtility.getFileExts().contains(curExt)) {
                return "{\"error\":\"File type is not supported\"}";
            }

-            URL url = new URL(body.getUrl());
+            URL url = new URL(saveAsFileUrl);
            java.net.HttpURLConnection connection = (java.net.HttpURLConnection) url.openConnection();
            InputStream stream = connection.getInputStream();

@ -472,14 +443,25 @@ public class FileController {

    @PostMapping("/rename")
    @ResponseBody
-    public String rename(@RequestBody final Rename body) {
-        String fileName = body.getFileName();
+    public String rename(@RequestBody final JSONObject body) {
+        String newfilename = (String) body.get("newfilename");
+        String dockey = (String) body.get("dockey");
+        String origExt = "." + (String) body.get("ext");
+        String curExt = newfilename;
+
+        if (newfilename.indexOf(".") != -1) {
+            curExt = (String) fileUtility.getFileExtension(newfilename);
+        }
+
+        if (origExt.compareTo(curExt) != 0) {
+            newfilename += origExt;
+        }

        HashMap<String, String> meta = new HashMap<>();
-        meta.put("title", fileName + "." + body.getFileType());
+        meta.put("title", newfilename);

        try {
-            callbackManager.commandRequest("meta", body.getFileKey(), meta);
+            callbackManager.commandRequest("meta", dockey, meta);
            return "result ok";
        } catch (Exception e) {
            e.printStackTrace();
@ -489,7 +471,7 @@ public class FileController {

    @PostMapping("/reference")
    @ResponseBody
-    public String reference(@RequestBody final Reference body) {
+    public String reference(@RequestBody final JSONObject body) {
        try {
            JSONParser parser = new JSONParser();
            Gson gson = new GsonBuilder().disableHtmlEscaping().create();
@ -497,11 +479,12 @@ public class FileController {
            String userAddress = "";
            String fileName = "";

-            if (body.getReferenceData() != null) {
-                ReferenceData referenceData = body.getReferenceData();
+            if (body.containsKey("referenceData")) {
+                LinkedHashMap referenceDataObj = (LinkedHashMap) body.get("referenceData");
+                String instanceId = (String) referenceDataObj.get("instanceId");

-                if (referenceData.getInstanceId().equals(storagePathBuilder.getServerUrl(false))) {
-                    JSONObject fileKey = (JSONObject) parser.parse(referenceData.getFileKey());
+                if (instanceId.equals(storagePathBuilder.getServerUrl(false))) {
+                    JSONObject fileKey = (JSONObject) parser.parse((String) referenceDataObj.get("fileKey"));
                    userAddress = (String) fileKey.get("userAddress");
                    if (userAddress.equals(InetAddress.getLocalHost().getHostAddress())) {
                        fileName = (String) fileKey.get("fileName");
@ -509,26 +492,10 @@ public class FileController {
                }
            }

-            String link = body.getLink();
-            if (fileName.equals("") && link != null) {
-                if (!link.contains(storagePathBuilder.getServerUrl(true))) {
-                    HashMap<String, String> data = new HashMap<>();
-                    data.put("url", link);
-                    data.put("directUrl", link);
-                    return gson.toJson(data);
-                }
-
-                UriComponents uriComponents = UriComponentsBuilder.fromUriString(body.getLink()).build();
-                fileName = uriComponents.getQueryParams().getFirst("fileName");
-                boolean fileExists = new File(storagePathBuilder.getFileLocation(fileName)).exists();
-                if (!fileExists) {
-                    return "{ \"error\": \"File is not exist\"}";
-                }
-            }

            if (fileName.equals("")) {
                try {
-                    String path = (String) body.getPath();
+                    String path = (String) body.get("path");
                    path = fileUtility.getFileName(path);
                    File f = new File(storagePathBuilder.getFileLocation(path));
                    if (f.exists()) {
@ -543,6 +510,8 @@ public class FileController {
                return "{ \"error\": \"File not found\"}";
            }

+            boolean directUrl = (boolean) body.get("directUrl");
+
            HashMap<String, Object> fileKey = new HashMap<>();
            fileKey.put("fileName", fileName);
            fileKey.put("userAddress", InetAddress.getLocalHost().getHostAddress());
@ -552,17 +521,11 @@ public class FileController {
            referenceData.put("fileKey", gson.toJson(fileKey));

            HashMap<String, Object> data = new HashMap<>();
-            data.put("fileType", fileUtility.getFileExtension(fileName));
-            data.put("key", serviceConverter.generateRevisionId(
-                storagePathBuilder.getStorageLocation()
-                + "/" + fileName + "/"
-                + new File(storagePathBuilder.getFileLocation(fileName)).lastModified()
-                ));
+            data.put("fileType", fileUtility.getFileExtension(fileName).replace(".", ""));
            data.put("url", documentManager.getDownloadUrl(fileName, true));
-            data.put("directUrl", body.getDirectUrl() ? documentManager.getDownloadUrl(fileName, false) : null);
+            data.put("directUrl", directUrl ? documentManager.getDownloadUrl(fileName, false) : null);
            data.put("referenceData", referenceData);
            data.put("path", fileName);
-            data.put("link", storagePathBuilder.getServerUrl(true) + "/editor?fileName=" + fileName);

            if (jwtManager.tokenEnabled()) {
                String token = jwtManager.createToken(data);
@ -575,25 +538,15 @@ public class FileController {
        }
    }

-    @GetMapping("/history")
-    @ResponseBody
-    public String history(@RequestParam("fileName") final String fileName) {
-        return historyManager.getHistory(fileName);
-    }
-
-    @GetMapping("/historydata")
-    @ResponseBody
-    public String history(@RequestParam("fileName") final String fileName,
-                          @RequestParam("version") final String version,
-                          @RequestParam(value = "directUrl", defaultValue = "false") final Boolean directUrl) {
-        return historyManager.getHistoryData(fileName, version, directUrl);
-    }
-
    @PutMapping("/restore")
    @ResponseBody
-    public String restore(@RequestBody final Restore body, @CookieValue("uid") final Integer uid) {
+    public String restore(@RequestBody final JSONObject body) {
        try {
-            String sourceStringFile = storagePathBuilder.getFileLocation(body.getFileName());
+            String sourceBasename = (String) body.get("fileName");
+            Integer version = (Integer) body.get("version");
+            String userID = (String) body.get("userId");
+
+            String sourceStringFile = storagePathBuilder.getFileLocation(sourceBasename);
            File sourceFile = new File(sourceStringFile);
            Path sourcePathFile = sourceFile.toPath();
            String historyDirectory = storagePathBuilder.getHistoryDir(sourcePathFile.toString());
@ -611,7 +564,7 @@ public class FileController {
            String bumpedKey = serviceConverter.generateRevisionId(
                storagePathBuilder.getStorageLocation()
                + "/"
-                + body.getFileName()
+                + sourceBasename
                + "/"
                + Long.toString(sourceFile.lastModified())
            );
@ -619,7 +572,8 @@ public class FileController {
            bumpedKeyFileWriter.write(bumpedKey);
            bumpedKeyFileWriter.close();

-            User user = userService.findUserById(uid).get();
+            Integer userInnerID = Integer.parseInt(userID.replace("uid-", ""));
+            User user = userService.findUserById(userInnerID).get();

            Path bumpedChangesPathFile = Paths.get(bumpedVersionStringDirectory, "changes.json");
            String bumpedChangesStringFile = bumpedChangesPathFile.toString();
@ -642,17 +596,13 @@ public class FileController {
            bumpedChangesFileWriter.write(bumpedChangesContent);
            bumpedChangesFileWriter.close();

-            String sourceExtension = fileUtility.getFileExtension(body.getFileName());
-            String previousBasename = "prev." + sourceExtension;
+            String sourceExtension = fileUtility.getFileExtension(sourceBasename);
+            String previousBasename = "prev" + sourceExtension;

            Path bumpedFile = Paths.get(bumpedVersionStringDirectory, previousBasename);
            Files.move(sourcePathFile, bumpedFile);

-            String recoveryVersionStringDirectory = documentManager.versionDir(
-                    historyDirectory,
-                    body.getVersion(),
-                    true
-            );
+            String recoveryVersionStringDirectory = documentManager.versionDir(historyDirectory, version, true);
            Path recoveryPathFile = Paths.get(recoveryVersionStringDirectory, previousBasename);
            String recoveryStringFile = recoveryPathFile.toString();
            FileInputStream recoveryStream = new FileInputStream(recoveryStringFile);
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/IndexController.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/IndexController.java
@ -76,9 +76,6 @@ public class IndexController {
    @Value("${files.docservice.languages}")
    private String langs;

-    @Value("${server.version}")
-    private String serverVersion;
-
    @GetMapping("${url.index}")
    public String index(@RequestParam(value = "directUrl", required = false) final Boolean directUrl,
                        final Model model) {
@ -127,7 +124,6 @@ public class IndexController {
        model.addAttribute("users", users);
        model.addAttribute("languages", languages);
        model.addAttribute("directUrl", directUrl);
-        model.addAttribute("serverVersion", serverVersion);

        return "index.html";
    }
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/callback/DefaultCallbackManager.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/callback/DefaultCallbackManager.java
@ -120,7 +120,7 @@ public class DefaultCallbackManager implements CallbackManager {
        String newFileName = fileName;

        String curExt = fileUtility.getFileExtension(fileName);  // get current file extension
-        String downloadExt = body.getFiletype(); // get an extension of the downloaded file
+        String downloadExt = "." + body.getFiletype(); // get an extension of the downloaded file

        // todo: Refactoring
        // convert downloaded file to the file with the current extension if these extensions aren't equal
@ -132,14 +132,14 @@ public class DefaultCallbackManager implements CallbackManager {
                                null).getUri();  // convert a file and get URL to a new file
                if (newFileUri.isEmpty()) {
                    newFileName = documentManager
-                            .getCorrectName(fileUtility.getFileNameWithoutExtension(fileName) + "."
+                            .getCorrectName(fileUtility.getFileNameWithoutExtension(fileName)
                                    + downloadExt);  // get the correct file name if it already exists
                } else {
                    downloadUri = newFileUri;
                }
            } catch (Exception e) {
                newFileName = documentManager
-                        .getCorrectName(fileUtility.getFileNameWithoutExtension(fileName) + "." + downloadExt);
+                        .getCorrectName(fileUtility.getFileNameWithoutExtension(fileName) + downloadExt);
            }
        }

@ -163,7 +163,7 @@ public class DefaultCallbackManager implements CallbackManager {

            storageMutator.createDirectory(ver);  // create the file version directory

-            lastVersion.toFile().renameTo(new File(versionDir + File.separator + "prev." + curExt));
+            lastVersion.toFile().renameTo(new File(versionDir + File.separator + "prev" + curExt));

            saveFile(byteArrayFile, toSave); // save document file

@ -269,7 +269,7 @@ public class DefaultCallbackManager implements CallbackManager {
        String fileName = fileNameParam;

        String curExt = fileUtility.getFileExtension(fileName);  // get current file extension
-        String downloadExt = body.getFiletype();  // get an extension of the downloaded file
+        String downloadExt = "." + body.getFiletype();  // get an extension of the downloaded file

        Boolean newFileName = false;

@ -304,10 +304,10 @@ public class DefaultCallbackManager implements CallbackManager {
                // get the correct file name if it already exists
                fileName = documentManager
                        .getCorrectName(fileUtility
-                                .getFileNameWithoutExtension(fileName) + "-form." + downloadExt);
+                                .getFileNameWithoutExtension(fileName) + "-form" + downloadExt);
            } else {
                fileName = documentManager
-                        .getCorrectName(fileUtility.getFileNameWithoutExtension(fileName) + "-form." + curExt);
+                        .getCorrectName(fileUtility.getFileNameWithoutExtension(fileName) + "-form" + curExt);
            }
            forcesavePath = storagePathBuilder.getFileLocation(fileName);  // create forcesave path if it doesn't exist
            List<Action> actions =  body.getActions();
@ -315,24 +315,6 @@ public class DefaultCallbackManager implements CallbackManager {
            String user = action.getUserid();  // get the user ID
            // create meta data for the forcesaved file
            storageMutator.createMeta(fileName, user, "Filling Form");
-
-            try {
-                String formsDataUrl = body.getFormsdataurl();
-
-                if (formsDataUrl != null && !formsDataUrl.isEmpty()) {
-                    String formsName = documentManager.getCorrectName(fileUtility
-                            .getFileNameWithoutExtension(fileName) + ".txt");
-                    String formsPath = storagePathBuilder.getFileLocation(formsName);
-
-                    byte[] byteArrayFormsData = getDownloadFile(formsDataUrl);
-
-                    saveFile(byteArrayFormsData, Paths.get(formsPath));
-                } else {
-                    throw new RuntimeException("Document editing service did not return formsDataUrl");
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
        } else {
            if (newFileName) {
                fileName = documentManager
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/document/DefaultDocumentManager.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/document/DefaultDocumentManager.java
@ -20,14 +20,11 @@ package com.onlyoffice.integration.documentserver.managers.document;

 import com.onlyoffice.integration.documentserver.storage.FileStorageMutator;
 import com.onlyoffice.integration.documentserver.storage.FileStoragePathBuilder;
-import com.onlyoffice.integration.documentserver.util.Constants;
 import com.onlyoffice.integration.documentserver.util.file.FileUtility;
 import com.onlyoffice.integration.documentserver.util.service.ServiceConverter;
-import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Primary;
-import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Component;

 import java.io.File;
@ -72,7 +69,7 @@ public class DefaultDocumentManager implements DocumentManager {

    // get URL to the created file
    public String getCreateUrl(final String fileName, final Boolean sample) {
-        String fileExt = fileUtility.getFileExtension(fileName);
+        String fileExt = fileUtility.getFileExtension(fileName).replace(".", "");
        String url = storagePathBuilder.getServerUrl(true)
                + "/create?fileExt=" + fileExt + "&sample=" + sample;
        return url;
@ -82,13 +79,13 @@ public class DefaultDocumentManager implements DocumentManager {
    public String getCorrectName(final String fileName) {
        String baseName = fileUtility.getFileNameWithoutExtension(fileName);  // get file name without extension
        String ext = fileUtility.getFileExtension(fileName);  // get file extension
-        String name = baseName + "." + ext;  // create a full file name
+        String name = baseName + ext;  // create a full file name

        Path path = Paths.get(storagePathBuilder.getFileLocation(name));

        // run through all the files with such a name in the storage directory
        for (int i = 1; Files.exists(path); i++) {
-            name = baseName + " (" + i + ")." + ext;  // and add an index to the base name
+            name = baseName + " (" + i + ")" + ext;  // and add an index to the base name
            path = Paths.get(storagePathBuilder.getFileLocation(name));
        }

@ -246,52 +243,4 @@ public class DefaultDocumentManager implements DocumentManager {

        return fileName;
    }
-
-    @SneakyThrows
-    public Boolean isExtendedPDFFile(final String fileName) {
-        Resource resource = storageMutator.loadFileAsResource(fileName);
-
-        byte[] bytes = resource.getInputStream().readNBytes(4096);
-
-        String pBuffer = new String(bytes, "Windows-1252");
-
-        int indexFirst = pBuffer.indexOf("%\315\312\322\251\015");
-        if (indexFirst == -1) {
-            return false;
-        }
-
-        String pFirst = pBuffer.substring(indexFirst + 6);
-
-        if (!pFirst.startsWith("1 0 obj\012<<\012")) {
-            return false;
-        }
-
-        pFirst = pFirst.substring(11);
-
-        int indexStream = pFirst.indexOf("stream\015\012");
-        int indexMeta = pFirst.indexOf(Constants.G_FORMAT_OFORM_PDF_META_TAG);
-
-        if (indexStream == -1 || indexMeta == -1 || indexStream < indexMeta) {
-            return false;
-        }
-
-        String pMeta = pFirst.substring(indexMeta);
-        pMeta = pMeta.substring(Constants.G_FORMAT_OFORM_PDF_META_TAG.length() + 3);
-
-        int indexMetaLast = pMeta.indexOf(" ");
-
-        if (indexMetaLast == -1) {
-            return false;
-        }
-
-        pMeta = pMeta.substring(indexMetaLast + 1);
-
-        indexMetaLast = pMeta.indexOf(" ");
-
-        if (indexMetaLast == -1) {
-            return false;
-        }
-
-        return true;
-    }
 }
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/document/DocumentManager.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/document/DocumentManager.java
@ -39,5 +39,4 @@ public interface DocumentManager {
    // create demo document
    String createDemo(String fileExt, Boolean sample, String uid, String uname) throws Exception;
    String getCreateUrl(String fileName, Boolean sample);  // get URL to the created file
-    Boolean isExtendedPDFFile(String fileName);
 }
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/history/DefaultHistoryManager.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/history/DefaultHistoryManager.java
@ -25,7 +25,6 @@ import com.onlyoffice.integration.documentserver.managers.jwt.JwtManager;
 import com.onlyoffice.integration.documentserver.models.filemodel.Document;
 import com.onlyoffice.integration.documentserver.storage.FileStoragePathBuilder;
 import com.onlyoffice.integration.documentserver.util.file.FileUtility;
-import com.onlyoffice.integration.documentserver.util.service.ServiceConverter;
 import lombok.SneakyThrows;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
@ -40,7 +39,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Scanner;
-import java.nio.file.Paths;

 // todo: Rebuild completely
@Component
@ -64,9 +62,6 @@ public class DefaultHistoryManager implements HistoryManager {
    @Autowired
    private ObjectMapper objectMapper;

-    @Autowired
-    private ServiceConverter serviceConverter;
-
    // todo: Refactoring
    @SneakyThrows
    public String[] getHistory(final Document document) {  // get document history
@ -104,14 +99,14 @@ public class DefaultHistoryManager implements HistoryManager {
                }

                dataObj.put("fileType", fileUtility
-                        .getFileExtension(document.getTitle()));
+                        .getFileExtension(document.getTitle()).replace(".", ""));
                dataObj.put("key", key);
                dataObj.put("url", i == curVer ? document.getUrl()
-                        : documentManager.getHistoryFileUrl(document.getTitle(), i, "prev." + fileUtility
+                        : documentManager.getHistoryFileUrl(document.getTitle(), i, "prev" + fileUtility
                        .getFileExtension(document.getTitle()), true));
                if (!document.getDirectUrl().equals("")) {
                    dataObj.put("directUrl", i == curVer ? document.getDirectUrl()
-                            : documentManager.getHistoryFileUrl(document.getTitle(), i, "prev." + fileUtility
+                            : documentManager.getHistoryFileUrl(document.getTitle(), i, "prev" + fileUtility
                            .getFileExtension(document.getTitle()), false));
                }
                dataObj.put("version", i);
@ -169,156 +164,6 @@ public class DefaultHistoryManager implements HistoryManager {
        return new String[]{"", ""};
    }

-    // todo: Refactoring
-    @SneakyThrows
-    public String getHistory(final String fileName) {  // get document history
-
-        // get history directory
-        String histDir = storagePathBuilder.getHistoryDir(storagePathBuilder.getFileLocation(fileName));
-        Integer curVer = storagePathBuilder.getFileVersion(histDir, false);  // get current file version
-
-        if (curVer > 0) {  // check if the current file version is greater than 0
-            List<Object> hist = new ArrayList<>();
-
-            for (Integer i = 1; i <= curVer; i++) {  // run through all the file versions
-                Map<String, Object> obj = new HashMap<String, Object>();
-                String verDir = documentManager
-                        .versionDir(histDir, i, true);  // get the path to the given file version
-
-                String key;
-                if (i == curVer) {
-                    key = serviceConverter
-                            .generateRevisionId(storagePathBuilder.getStorageLocation()
-                                    + "/" + fileName + "/"
-                                    + new File(storagePathBuilder.getFileLocation(fileName)).lastModified());
-                } else {
-                    key = readFileToEnd(new File(verDir + File.separator + "key.txt"));
-                }
-
-                obj.put("key", key);
-                obj.put("version", i);
-
-                if (i == 1) {  // check if the version number is equal to 1
-                    String createdInfo = readFileToEnd(new File(histDir
-                            + File.separator + "createdInfo.json"));  // get file with meta data
-                    JSONObject json = (JSONObject) parser.parse(createdInfo);  // and turn it into json object
-
-                    // write meta information to the object (user information and creation date)
-                    obj.put("created", json.get("created"));
-                    Map<String, Object> user = new HashMap<String, Object>();
-                    user.put("id", json.get("id"));
-                    user.put("name", json.get("name"));
-                    obj.put("user", user);
-                }
-
-                if (i > 1) {  //check if the version number is greater than 1
-                    // if so, get the path to the changes.json file
-                    JSONObject changes = (JSONObject) parser.parse(readFileToEnd(new File(documentManager
-                            .versionDir(histDir, i - 1, true) + File.separator + "changes.json")));
-                    JSONObject change = (JSONObject) ((JSONArray) changes.get("changes")).get(0);
-
-                    // write information about changes to the object
-                    obj.put("changes", changes.get("changes"));
-                    obj.put("serverVersion", changes.get("serverVersion"));
-                    obj.put("created", change.get("created"));
-                    obj.put("user", change.get("user"));
-                }
-
-                hist.add(obj);
-            }
-
-            // write history information about the current file version to the history object
-            Map<String, Object> histObj = new HashMap<String, Object>();
-            histObj.put("currentVersion", curVer);
-            histObj.put("history", hist);
-
-            try {
-                return objectMapper.writeValueAsString(histObj);
-            } catch (JsonProcessingException e) {
-                e.printStackTrace();
-            }
-        }
-        return "";
-    }
-
-    // todo: Refactoring
-    @SneakyThrows
-    public String getHistoryData(final String fileName, final String version, final Boolean directUrl) {
-        // get history directory
-        String histDir = storagePathBuilder.getHistoryDir(storagePathBuilder.getFileLocation(fileName));
-        Integer curVer = storagePathBuilder.getFileVersion(histDir, false);  // get current file version
-
-        if (curVer > 0) {  // check if the current file version is greater than 0
-            Map<String, Object> histData = new HashMap<>();
-
-            for (Integer i = 1; i <= curVer; i++) {  // run through all the file versions
-                Map<String, Object> dataObj = new HashMap<String, Object>();
-                String verDir = documentManager
-                        .versionDir(histDir, i, true);  // get the path to the given file version
-
-                String key;
-                if (i == curVer) {
-                    key = serviceConverter
-                            .generateRevisionId(storagePathBuilder.getStorageLocation()
-                                    + "/" + fileName + "/"
-                                    + new File(storagePathBuilder.getFileLocation(fileName)).lastModified());
-                } else {
-                    key = readFileToEnd(new File(verDir + File.separator + "key.txt"));
-                }
-
-                dataObj.put("fileType", fileUtility
-                        .getFileExtension(fileName).replace(".", ""));
-                dataObj.put("key", key);
-                dataObj.put("url", i == curVer ? documentManager.getDownloadUrl(fileName, true)
-                        : documentManager.getHistoryFileUrl(fileName, i, "prev" + fileUtility
-                        .getFileExtension(fileName), true));
-                if (directUrl) {
-                    dataObj.put("directUrl", i == curVer
-                            ? documentManager.getDownloadUrl(fileName, false)
-                            : documentManager.getHistoryFileUrl(fileName, i, "prev" + fileUtility
-                                    .getFileExtension(fileName), false));
-                }
-                dataObj.put("version", i);
-
-                if (i > 1) {  //check if the version number is greater than 1
-                    Integer verdiff = i - 1;
-                    // get the history data from the previous file version
-                    Map<String, Object> prev = (Map<String, Object>) histData.get(Integer.toString(verdiff));
-                    Map<String, Object> prevInfo = new HashMap<String, Object>();
-                    prevInfo.put("fileType", prev.get("fileType"));
-                    prevInfo.put("key", prev.get("key"));  // write key and URL information about previous file version
-                    prevInfo.put("url", prev.get("url"));
-                    if (directUrl) {
-                        prevInfo.put("directUrl", prev.get("directUrl"));
-                    }
-
-                    // write information about previous file version to the data object
-                    dataObj.put("previous", prevInfo);
-
-                    if (diffExists(histDir, verdiff)) {
-                        // write the path to the diff.zip archive with differences in this file version
-                        dataObj.put("changesUrl", documentManager
-                                .getHistoryFileUrl(fileName, verdiff, "diff.zip", true));
-                    }
-                }
-
-                if (jwtManager.tokenEnabled()) {
-                    dataObj.put("token", jwtManager.createToken(dataObj));
-                }
-
-                histData.put(Integer.toString(i), dataObj);
-            }
-
-            try {
-                return objectMapper.writeValueAsString(histData.get(version));
-            } catch (JsonProcessingException e) {
-                e.printStackTrace();
-            }
-        }
-        return "";
-    }
-
-
    // read a file
    private String readFileToEnd(final File file) {
        String output = "";
@ -335,11 +180,4 @@ public class DefaultHistoryManager implements HistoryManager {
        }
        return output;
    }
-
-    // diff.zip existence check
-    private Boolean diffExists(final String histDir, final Integer verdiff) {
-        String filePath = Paths.get(histDir, String.valueOf(verdiff), "diff.zip").toString();
-        File file = new File(filePath);
-        return file.exists();
-    }
 }
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/history/HistoryManager.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/history/HistoryManager.java
@ -18,9 +18,9 @@

 package com.onlyoffice.integration.documentserver.managers.history;

+import com.onlyoffice.integration.documentserver.models.filemodel.Document;
+
 // specify the history manager functions
 public interface HistoryManager {
-    String getHistory(String fileName);  // get document history
-
-    String getHistoryData(String fileName, String version, Boolean directUrl); // get document history data
+    String[] getHistory(Document document);  // get document history
 }
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/Format.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/Format.java
@ -1,36 +0,0 @@
-/**
- *
- * (c) Copyright Ascensio System SIA 2023
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package com.onlyoffice.integration.documentserver.models;
-
-import java.util.List;
-
-import com.onlyoffice.integration.documentserver.models.enums.DocumentType;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-@Getter
-@Setter
-@ToString
-public class Format {
-    private String name;
-    private DocumentType type;
-    private List<String> actions;
-    private List<String> convert;
-    private List<String> mime;
-}
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/configurations/Customization.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/configurations/Customization.java
@ -32,6 +32,8 @@ import org.springframework.stereotype.Component;
 other products (if there are any) and change the presence or absence of the additional buttons,
  links, change logos and editor owner details. */
 public class Customization {
+    @Autowired
+    private Logo logo;  // the image file at the top left corner of the Editor header
    @Autowired
    private Goback goback;  // the settings for the Open file location menu button and upper right corner button
    private Boolean autosave = true;  // if the Autosave menu option is enabled or disabled
@ -45,7 +47,7 @@ public class Customization {
    private Boolean help = true;  //  if the Help menu button is displayed or hidden
    private Boolean hideRightMenu = false;  // if the right menu is displayed or hidden on first loading
    private Boolean hideRulers = false;  // if the editor rulers are displayed or hidden
-    private Boolean submitForm = true;  // if the Submit form button is displayed or hidden
+    private Boolean submitForm = false;  // if the Submit form button is displayed or hidden
    private Boolean about = true;
    private Boolean feedback = true;
 }
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/configurations/Logo.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/configurations/Logo.java
@ -0,0 +1,38 @@
+/**
+ *
+ * (c) Copyright Ascensio System SIA 2023
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.onlyoffice.integration.documentserver.models.configurations;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+@Component
+@Scope("prototype")
+@Getter
+@Setter
+public class Logo {  // the image file at the top left corner of the Editor header
+    @Value("${logo.image}")
+    private String image;  // the path to the image file used to show in common work mode
+    @Value("${logo.imageEmbedded}")
+    private String imageEmbedded;  // the path to the image file used to show in the embedded mode
+    @Value("${logo.url}")
+    private String url;  // the absolute URL which will be used when someone clicks the logo image
+}
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/User.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/User.java
@ -19,8 +19,6 @@
 package com.onlyoffice.integration.documentserver.models.filemodel;

 import com.onlyoffice.integration.documentserver.models.AbstractModel;
-import com.onlyoffice.integration.documentserver.storage.FileStoragePathBuilder;
-
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.context.annotation.Scope;
@ -31,17 +29,14 @@ import org.springframework.stereotype.Component;
@Getter
@Setter
 public class User extends AbstractModel {
-    private FileStoragePathBuilder storagePathBuilder;
    private String id;
    private String name;
    private String group;
-    private String image;

    // the user configuration parameters
    public void configure(final int idParam, final String nameParam, final String groupParam) {
        this.id = "uid-" + idParam;  // the user id
        this.name = nameParam;  // the user name
        this.group = groupParam;  // the group the user belongs to
-        this.image = storagePathBuilder.getServerUrl(true) + "/css/img/uid-" + this.id + ".png";
    }
 }
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/Constants.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/Constants.java
@ -27,7 +27,6 @@ public final class Constants {
    public static final Integer MAX_KEY_LENGTH = 20;
    public static final Integer ANONYMOUS_USER_ID = 4;
    public static final Integer KILOBYTE_SIZE = 1024;
-    public static final String G_FORMAT_OFORM_PDF_META_TAG = "ONLYOFFICEFORM";

    private Constants() { }
 }
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/file/DefaultFileUtility.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/file/DefaultFileUtility.java
@ -18,10 +18,7 @@

 package com.onlyoffice.integration.documentserver.util.file;

-import com.onlyoffice.integration.documentserver.models.Format;
 import com.onlyoffice.integration.documentserver.models.enums.DocumentType;
-import com.onlyoffice.integration.documentserver.util.service.FormatService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@ -29,6 +26,8 @@ import org.springframework.stereotype.Component;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;

 import static com.onlyoffice.integration.documentserver.util.Constants.MAX_FILE_SIZE;
@ -38,21 +37,56 @@ import static com.onlyoffice.integration.documentserver.util.Constants.MAX_FILE_
 public class DefaultFileUtility implements FileUtility {
    @Value("${filesize-max}")
    private String filesizeMax;
-    @Value("${filename-max}")
-    private String filenameMax;

-    @Autowired
-    private FormatService formatService;
+    @Value("${files.docservice.viewed-docs}")
+    private String docserviceViewedDocs;
+
+    @Value("${files.docservice.edited-docs}")
+    private String docserviceEditedDocs;
+
+    @Value("${files.docservice.convert-docs}")
+    private String docserviceConvertDocs;
+
+    @Value("${files.docservice.fillforms-docs}")
+    private String docserviceFillDocs;
+
+    // document extensions
+    private List<String> extsDocument = Arrays.asList(
+                            ".doc", ".docx", ".docm",
+                            ".dot", ".dotx", ".dotm",
+                            ".odt", ".fodt", ".ott", ".rtf", ".txt",
+                            ".html", ".htm", ".mht", ".xml",
+                            ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oform");
+
+    // spreadsheet extensions
+    private List<String> extsSpreadsheet = Arrays.asList(
+                            ".xls", ".xlsx", ".xlsm", ".xlsb",
+                            ".xlt", ".xltx", ".xltm",
+                            ".ods", ".fods", ".ots", ".csv");
+
+    // presentation extensions
+    private List<String> extsPresentation = Arrays.asList(
+                            ".pps", ".ppsx", ".ppsm",
+                            ".ppt", ".pptx", ".pptm",
+                            ".pot", ".potx", ".potm",
+                            ".odp", ".fodp", ".otp");

    // get the document type
    public DocumentType getDocumentType(final String fileName) {
        String ext = getFileExtension(fileName).toLowerCase();  // get file extension from its name
+        // word type for document extensions
+        if (extsDocument.contains(ext)) {
+            return DocumentType.word;
+        }

-        List<Format> formats = formatService.getFormats();
-        for (Format format : formats) {
-            if (format.getName().equals(ext)) {
-                return format.getType();
-            }
+        // cell type for spreadsheet extensions
+        if (extsSpreadsheet.contains(ext)) {
+            return DocumentType.cell;
+        }
+
+        // slide type for presentation extensions
+        if (extsPresentation.contains(ext)) {
+            return DocumentType.slide;
        }

        // default file type is word
@ -87,7 +121,7 @@ public class DefaultFileUtility implements FileUtility {
        if (fileName == null) {
            return null;
        }
-        String fileExt = fileName.substring(fileName.lastIndexOf(".") + 1);
+        String fileExt = fileName.substring(fileName.lastIndexOf("."));
        return fileExt.toLowerCase();
    }

@ -113,49 +147,51 @@ public class DefaultFileUtility implements FileUtility {
    }

    public List<String> getFillExts() {
-        return formatService.fillableExtensions();
+        return Arrays.asList(docserviceFillDocs.split("\\|"));
    }

    // get file extensions that can be viewed
    public List<String> getViewedExts() {
-        return formatService.viewableExtensions();
+        return Arrays.asList(docserviceViewedDocs.split("\\|"));
    }

    // get file extensions that can be edited
    public List<String> getEditedExts() {
-        return formatService.editableExtensions();
+        return Arrays.asList(docserviceEditedDocs.split("\\|"));
    }

    // get file extensions that can be converted
    public List<String> getConvertExts() {
-        return formatService.autoConvertExtensions();
+        return Arrays.asList(docserviceConvertDocs.split("\\|"));
    }

    // get all the supported file extensions
    public List<String> getFileExts() {
-        return formatService.allExtensions();
+        List<String> res = new ArrayList<>();
+
+        res.addAll(getViewedExts());
+        res.addAll(getEditedExts());
+        res.addAll(getConvertExts());
+        res.addAll(getFillExts());
+
+        return res;
    }

    // generate the file path from file directory and name
    public Path generateFilepath(final String directory, final String fullFileName) {
-        int maxName = Integer.parseInt(filenameMax);
-        String fileName = getFileNameWithoutExtension(fullFileName);
-        if (fileName.length() > maxName) {
-            fileName = fileName.substring(0, maxName) + "[...]";
-        }
+        String fileName = getFileNameWithoutExtension(fullFileName);  // get file name without extension
        String fileExtension = getFileExtension(fullFileName);  // get file extension
-        // get the path to the files with the specified name
-        Path path = Paths.get(directory + fileName + "." + fileExtension);
+        Path path = Paths.get(directory + fullFileName);  // get the path to the files with the specified name

        for (int i = 1; Files.exists(path); i++) {  // run through all the files with the specified name
            // get a name of each file without extension and add an index to it
-            fileName = fileName + "(" + i + ")";
+            fileName = getFileNameWithoutExtension(fullFileName) + "(" + i + ")";

            // create a new path for this file with the correct name and extension
-            path = Paths.get(directory + fileName + "." + fileExtension);
+            path = Paths.get(directory + fileName + fileExtension);
        }

-        path = Paths.get(directory + fileName + "." + fileExtension);
+        path = Paths.get(directory + fileName + fileExtension);
        return path;
    }

--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/service/DefaultFormatService.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/service/DefaultFormatService.java
@ -1,102 +0,0 @@
-/**
- *
- * (c) Copyright Ascensio System SIA 2023
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.onlyoffice.integration.documentserver.util.service;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import com.onlyoffice.integration.documentserver.models.Format;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.io.Resource;
-import org.springframework.stereotype.Service;
-
-import java.io.File;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-@Service
-public class DefaultFormatService implements FormatService {
-    private List<Format> formats;
-    @Autowired
-    public DefaultFormatService(
-            @Value("classpath:assets/document-formats/onlyoffice-docs-formats.json") final Resource resourceFile,
-            final ObjectMapper objectMapper
-    ) {
-        try {
-            File targetFile = resourceFile.getFile();
-            this.formats = objectMapper.readValue(targetFile, new TypeReference<List<Format>>() { });
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public List<Format> getFormats() {
-        return this.formats;
-    }
-
-    public List<Format> getFormatsByAction(final String action) {
-        return this
-                .formats
-                .stream()
-                .filter(format -> format.getActions().contains(action))
-                .collect(Collectors.toList());
-    }
-
-    public List<String> allExtensions() {
-        return this
-                .formats
-                .stream()
-                .map(format -> format.getName())
-                .collect(Collectors.toList());
-    }
-
-    public List<String> fillableExtensions() {
-        return this
-                .getFormatsByAction("fill")
-                .stream()
-                .map(format -> format.getName())
-                .collect(Collectors.toList());
-    }
-
-    public List<String> viewableExtensions() {
-        return this
-                .getFormatsByAction("view")
-                .stream()
-                .map(format -> format.getName())
-                .collect(Collectors.toList());
-    }
-
-    public List<String> editableExtensions() {
-        return Stream
-                .of(this.getFormatsByAction("edit"), this.getFormatsByAction("lossy-edit"))
-                .flatMap(x -> x.stream())
-                .map(format -> format.getName())
-                .collect(Collectors.toList());
-    }
-
-    public List<String> autoConvertExtensions() {
-        return this
-                .getFormatsByAction("auto-convert")
-                .stream()
-                .map(format -> format.getName())
-                .collect(Collectors.toList());
-    }
-}
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/service/DefaultServiceConverter.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/service/DefaultServiceConverter.java
@ -146,8 +146,8 @@ public class DefaultServiceConverter implements ServiceConverter {
        Convert body = new Convert();
        body.setLang(lang);
        body.setUrl(documentUri);
-        body.setOutputtype(toExtension);
-        body.setFiletype(fromExt);
+        body.setOutputtype(toExtension.replace(".", ""));
+        body.setFiletype(fromExt.replace(".", ""));
        body.setTitle(title);
        body.setKey(documentRevId);
        body.setFilePass(filePass);
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/service/FormatService.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/service/FormatService.java
@ -1,33 +0,0 @@
-/**
- *
- * (c) Copyright Ascensio System SIA 2023
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.onlyoffice.integration.documentserver.util.service;
-
-import com.onlyoffice.integration.documentserver.models.Format;
-
-import java.util.List;
-
-public interface FormatService {
-    List<Format> getFormats();
-    List<Format> getFormatsByAction(String action);
-    List<String> allExtensions();
-    List<String> fillableExtensions();
-    List<String> viewableExtensions();
-    List<String> editableExtensions();
-    List<String> autoConvertExtensions();
-}
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Protect.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Protect.java
@ -1,32 +0,0 @@
-/**
- *
- * (c) Copyright Ascensio System SIA 2023
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.onlyoffice.integration.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-@AllArgsConstructor
-public class Protect {
-    private Integer id;
-    private String name;
-    private String email;
-}
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Reference.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Reference.java
@ -1,37 +0,0 @@
-/**
- *
- * (c) Copyright Ascensio System SIA 2023
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.onlyoffice.integration.dto;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-@Getter
-@Setter
-@AllArgsConstructor
-@NoArgsConstructor
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class Reference {
-    private Boolean directUrl;
-    private ReferenceData referenceData;
-    private String path;
-    private String link;
-}
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/ReferenceData.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/ReferenceData.java
@ -1,31 +0,0 @@
-/**
- *
- * (c) Copyright Ascensio System SIA 2023
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.onlyoffice.integration.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class ReferenceData {
-    private String fileKey;
-    private String instanceId;
-}
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Rename.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Rename.java
@ -1,34 +0,0 @@
-/**
- *
- * (c) Copyright Ascensio System SIA 2023
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.onlyoffice.integration.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-@Getter
-@Setter
-@AllArgsConstructor
-@NoArgsConstructor
-public class Rename {
-    private String fileName;
-    private String fileKey;
-    private String fileType;
-}
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Restore.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Restore.java
@ -1,33 +0,0 @@
-/**
- *
- * (c) Copyright Ascensio System SIA 2023
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.onlyoffice.integration.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-@Getter
-@Setter
-@AllArgsConstructor
-@NoArgsConstructor
-public class Restore {
-    private String fileName;
-    private Integer version;
-}
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/SaveAs.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/SaveAs.java
@ -1,33 +0,0 @@
-/**
- *
- * (c) Copyright Ascensio System SIA 2023
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.onlyoffice.integration.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-@Getter
-@Setter
-@AllArgsConstructor
-@NoArgsConstructor
-public class SaveAs {
-    private String title;
-    private String url;
-}
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Track.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Track.java
@ -43,5 +43,4 @@ public class Track {
    private String userdata;
    private String lastsave;
    private Boolean notmodified;
-    private String formsdataurl;
 }
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/UserInfo.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/UserInfo.java
@ -1,33 +0,0 @@
-/**
- *
- * (c) Copyright Ascensio System SIA 2023
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.onlyoffice.integration.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-@AllArgsConstructor
-public class UserInfo {
-    private Integer id;
-    private String name;
-    private String email;
-    private String image;
-}
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/entities/User.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/entities/User.java
@ -45,6 +45,4 @@ public class User extends AbstractEntity {
    @ElementCollection
    @CollectionTable(name = "user_descriptions")
    private List<String> descriptions;
-    private Boolean avatar;
-    private String image;
 }
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/UserServices.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/UserServices.java
@ -58,15 +58,13 @@ public class UserServices {
                           final List<String> removeGroups,
                           final List<String> userInfoGroups, final Boolean favoriteDoc,
                           final Boolean chat,
-                           final Boolean protect,
-                           final Boolean avatar) {
+                           final Boolean protect) {
        User newUser = new User();
        newUser.setName(name);  // set the user name
        newUser.setEmail(email);  // set the user email
        newUser.setGroup(groupServices.createGroup(group));  // set the user group
        newUser.setDescriptions(description);  // set the user description
        newUser.setFavorite(favoriteDoc);  // specify if the user has the favorite documents or not
-        newUser.setAvatar(avatar);

        List<Group> groupsReview = groupServices
                .createGroups(reviewGroups);  // define the groups whose changes the user can accept/reject
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultCustomizationConfigurer.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultCustomizationConfigurer.java
@ -34,5 +34,6 @@ public class DefaultCustomizationConfigurer implements CustomizationConfigurer<D
    public void configure(final Customization customization, final DefaultCustomizationWrapper wrapper) {
        Action action = wrapper.getAction();  // get the action parameter from the customization wrapper
        User user = wrapper.getUser();
+        customization.setSubmitForm(false);  // set the submitForm parameter to the customization config
    }
 }
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultEditorConfigConfigurer.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultEditorConfigConfigurer.java
@ -77,6 +77,7 @@ public class DefaultEditorConfigConfigurer implements EditorConfigConfigurer<Def
                    (JavaType) new TypeToken<HashMap<String, Object>>() { }.getType()));
        }
        String fileName = wrapper.getFileName();  // set the fileName parameter from the editorConfig wrapper
+        String fileExt = fileUtility.getFileExtension(fileName);
        boolean userIsAnon = wrapper.getUser()
                .getName().equals("Anonymous");  // check if the user from the editorConfig wrapper is anonymous or not

--- a/web/documentserver-example/java-spring/src/main/resources/application.properties
+++ b/web/documentserver-example/java-spring/src/main/resources/application.properties
@ -4,11 +4,14 @@ server.address=
 server.port=4000

 filesize-max=5242880
-filename-max=50

 files.storage=
 files.storage.folder=documents

+files.docservice.fillforms-docs=.docx|.oform
+files.docservice.viewed-docs=.djvu|.oxps|.pdf|.xps
+files.docservice.edited-docs=.csv|.docm|.docx|.docxf|.dotm|.dotx|.epub|.fb2|.html|.odp|.ods|.odt|.otp|.ots|.ott|.potm|.potx|.ppsm|.ppsx|.pptm|.pptx|.rtf|.txt|.xlsm|.xlsx|.xltm|.xltx
+files.docservice.convert-docs=.doc|.dot|.dps|.dpt|.epub|.et|.ett|.fb2|.fodp|.fods|.fodt|.htm|.html|.mht|.mhtml|.odp|.ods|.odt|.otp|.ots|.ott|.pot|.pps|.ppt|.rtf|.stw|.sxc|.sxi|.sxw|.wps|.wpt|.xls|.xlsb|.xlt|.xml
 files.docservice.timeout=120000
 files.docservice.history.postfix=-hist

@ -25,7 +28,7 @@ files.docservice.token-use-for-request=true

 files.docservice.verify-peer-off=true

-files.docservice.languages=en:English|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sr-Latn-CS:Serbian|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA:Test Language
+files.docservice.languages=en:English|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA:Test Language

 spring.datasource.url=jdbc:h2:mem:usersdb
 spring.datasource.driverClassName=org.h2.Driver
@ -43,3 +46,7 @@ url.converter=/converter
 url.editor=/editor
 url.track=/track
 url.download=/download
+
+logo.image=
+logo.imageEmbedded=
+logo.url=https://www.onlyoffice.com
--- a/web/documentserver-example/java-spring/src/main/resources/assets/document-formats
+++ b/web/documentserver-example/java-spring/src/main/resources/assets/document-formats
--- a/web/documentserver-example/java-spring/src/main/resources/static/css/img/file_docx.svg
+++ b/web/documentserver-example/java-spring/src/main/resources/static/css/img/file_docx.svg
@ -1 +1,8 @@
-<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#1E7AAA"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#000" fill-opacity=".25"/><path d="M6 15h18v1H6v-1zM6 19h18v1H6v-1zM6 23h18v1H6v-1zM6 27h18v1H6v-1z" fill="#fff"/></svg>
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H21.674C22.4697 0 23.2327 0.316071 23.7953 0.87868L29.1213 6.20465C29.6839 6.76726 30 7.53032 30 8.32597V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#3779A6"/>
+<path d="M22.9167 0L30.0001 7.08333H25.9167C24.2599 7.08333 22.9167 5.74019 22.9167 4.08333V0Z" fill="#1D5880"/>
+<path d="M6.17627 14.7059H23.8233V15.8823H6.17627V14.7059Z" fill="white"/>
+<path d="M6.17627 18.5294H23.8233V19.7059H6.17627V18.5294Z" fill="white"/>
+<path d="M6.17627 22.3529H23.8233V23.5294H6.17627V22.3529Z" fill="white"/>
+<path d="M6.17627 26.1765H23.8233V27.3529H6.17627V26.1765Z" fill="white"/>
+</svg>
--- a/web/documentserver-example/java-spring/src/main/resources/static/css/img/file_docxf.svg
+++ b/web/documentserver-example/java-spring/src/main/resources/static/css/img/file_docxf.svg
@ -1 +1,6 @@
-<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#27ABA3"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#008078"/><path fill-rule="evenodd" clip-rule="evenodd" d="M24 14H6v7h18v-7zm-.8182 5.9978H6.81818V15H23.1818v4.9978zM24 23H6v7h18v-7zm-.8182 5.9978H6.81818V24H23.1818v4.9978z" fill="#fff"/></svg>
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#27ABA3"/>
+<path d="M22.9165 0L29.9998 7.08333H25.9165C24.2597 7.08333 22.9165 5.74019 22.9165 4.08333V0Z" fill="#008078"/>
+<rect x="6.5" y="15.5" width="17" height="5" stroke="white"/>
+<rect x="6.5" y="23.5" width="17" height="5" stroke="white"/>
+</svg>
--- a/web/documentserver-example/java-spring/src/main/resources/static/css/img/file_pptx.svg
+++ b/web/documentserver-example/java-spring/src/main/resources/static/css/img/file_pptx.svg
@ -1 +1,8 @@
-<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#F36700"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#000" fill-opacity=".25"/><path stroke="#fff" stroke-opacity=".95" d="M6.5 15.5h17v12h-17z"/></svg>
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#F36700"/>
+<path d="M22.9167 0L30.0001 7.08333H25.9168C24.2599 7.08333 22.9167 5.74019 22.9167 4.08333V0Z" fill="#AB531F"/>
+<path d="M6.17627 16.1275H23.8233V17.3039H6.17627V16.1275Z" fill="white"/>
+<path d="M6.17627 28.7745L6.17627 16.1275L7.35274 16.1275L7.35274 28.7745H6.17627Z" fill="white"/>
+<path d="M23.8233 16.1275V28.7745H22.6469V16.1275L23.8233 16.1275Z" fill="white"/>
+<path d="M6.17627 27.598H23.8233V28.7745H6.17627L6.17627 27.598Z" fill="white"/>
+</svg>
--- a/web/documentserver-example/java-spring/src/main/resources/static/css/img/file_upload.svg
+++ b/web/documentserver-example/java-spring/src/main/resources/static/css/img/file_upload.svg
@ -1 +1,6 @@
-<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#D0D5DA"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#646464"/><path fill-rule="evenodd" clip-rule="evenodd" d="M7.5 23c-.27614 0-.5.2239-.5.5v4c0 .2761.22386.5.5.5h15c.2761 0 .5-.2239.5-.5v-4c0-.2761-.2239-.5-.5-.5h-2c-.2761 0-.5-.2239-.5-.5s.2239-.5.5-.5h2c.8284 0 1.5.6716 1.5 1.5v4c0 .8284-.6716 1.5-1.5 1.5h-15c-.82843 0-1.5-.6716-1.5-1.5v-4c0-.8284.67157-1.5 1.5-1.5h2c.27614 0 .5.2239.5.5s-.22386.5-.5.5h-2z" fill="#646464"/><path fill-rule="evenodd" clip-rule="evenodd" d="M20 20.0001L15 14l-5 6.0001h3v4c0 .5523.4477 1 1 1h2c.5523 0 1-.4477 1-1v-4h3z" fill="#646464"/></svg>
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M30 7.44186L22 0H3C1.22739 0 0 0.822551 0 2.32558V37.2093C0 38.7123 1.22739 40 3 40H27C28.7726 40 30 38.7123 30 37.2093V7.44186Z" fill="#D0D5DA"/>
+<path d="M24.1042 7.27273H29.9631L22 0V5.32334C22 6.4105 22.949 7.27273 24.1042 7.27273Z" fill="#646464"/>
+<path d="M16.9562 22.3485H12.9746V17.803H10.9839L14.9654 14.1667L18.947 17.803H16.9562V22.3485Z" fill="#646464"/>
+<path d="M20.9378 23.7121C20.9378 24.1666 20.4401 24.6212 19.9424 24.6212H9.98848C9.49078 24.6212 8.99309 24.1666 8.99309 23.7121V22.3485C8.99309 21.8939 9.49078 21.4394 9.98848 21.4394H10.9839V20.0757H9.49078C8.49539 20.0757 7.5 20.9848 7.5 21.8939V24.1666C7.5 25.0757 8.61982 25.9848 9.49078 25.9848H20.4401C21.3111 25.9848 22.4309 25.0757 22.4309 24.1666V21.8939C22.4309 20.9848 21.4355 20.0757 20.4401 20.0757H18.947V21.4394H19.9424C20.4401 21.4394 20.9378 21.8939 20.9378 22.3485V23.7121Z" fill="#646464"/>
+</svg>
--- a/web/documentserver-example/java-spring/src/main/resources/static/css/img/file_xlsx.svg
+++ b/web/documentserver-example/java-spring/src/main/resources/static/css/img/file_xlsx.svg
@ -1 +1,12 @@
-<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#6AAA1E"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#000" fill-opacity=".25"/><path fill-rule="evenodd" clip-rule="evenodd" d="M6 15h18v13H7.00001v-1H12v-3H7v4H6V15zm7 12h4v-3h-4v3zm5 0h5v-3h-5v3zm5-7v3h-5v-3h5zm-6 0v3h-4v-3h4zm-5 0v3H7v-3h5zm11-1v-3h-5v3h5zm-10-3h4v3h-4v-3zm-1 3v-3H7v3h5z" fill="#fff" fill-opacity=".95"/></svg>
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#78A73B"/>
+<path d="M22.9167 0L30.0001 7.08333H25.9168C24.2599 7.08333 22.9167 5.74019 22.9167 4.08333V0Z" fill="#5A7D2B"/>
+<path d="M6.17644 15.2941H23.8235V16.4706H6.17644V15.2941Z" fill="white"/>
+<path d="M6.17644 19.1177H23.8235V20.2941H6.17644V19.1177Z" fill="white"/>
+<path d="M6.17644 22.9412H23.8235V24.1177H6.17644V22.9412Z" fill="white"/>
+<path d="M6.17644 26.7647H23.8235V27.9412H6.17644V26.7647Z" fill="white"/>
+<path d="M5.88232 27.9412L5.88232 15.2941L7.0588 15.2941L7.0588 27.9412H5.88232Z" fill="white"/>
+<path d="M11.4706 27.9412L11.4706 15.2941L12.647 15.2941V27.9412H11.4706Z" fill="white"/>
+<path d="M17.0588 27.9412L17.0588 15.2941L18.2353 15.2941V27.9412H17.0588Z" fill="white"/>
+<path d="M22.647 27.9412V15.2941H23.8235V27.9412H22.647Z" fill="white"/>
+</svg>
--- a/web/documentserver-example/java-spring/src/main/resources/static/css/img/uid-1.png
+++ b/web/documentserver-example/java-spring/src/main/resources/static/css/img/uid-1.png
--- a/web/documentserver-example/java-spring/src/main/resources/static/css/img/uid-2.png
+++ b/web/documentserver-example/java-spring/src/main/resources/static/css/img/uid-2.png
--- a/web/documentserver-example/java-spring/src/main/resources/static/scripts/converter.js
+++ b/web/documentserver-example/java-spring/src/main/resources/static/scripts/converter.js
@ -25,9 +25,9 @@ var FillExtList;
 if (typeof jQuery !== "undefined") {
    jQuery.post('/config',
        function(data) {
-            FillExtList = data.FillExtList.split(',');
-            ConverExtList = data.ConverExtList.split(',');
-            EditedExtList = data.EditedExtList.split(',');
+            FillExtList = data.FillExtList;
+            ConverExtList = data.ConverExtList;
+            EditedExtList = data.EditedExtList;
            UrlConverter = data.UrlConverter;
            UrlEditor = data.UrlEditor;
    });
--- a/web/documentserver-example/java-spring/src/main/resources/static/scripts/jscript.js
+++ b/web/documentserver-example/java-spring/src/main/resources/static/scripts/jscript.js
@ -100,10 +100,10 @@ if (typeof jQuery !== "undefined") {
        jq("#filePass").val("");

        var fileName = jq("#hiddenFileName").val();
-        var posExt = fileName.lastIndexOf(".") + 1;
+        var posExt = fileName.lastIndexOf(".");
        posExt = 0 <= posExt ? fileName.substring(posExt).trim().toLowerCase() : "";

-        if (ConverExtList.includes(posExt) === -1) {
+        if (ConverExtList.indexOf(posExt) === -1) {
            jq("#step2").addClass("done").removeClass("current");
            loadScripts();
            return;
@ -177,10 +177,10 @@ if (typeof jQuery !== "undefined") {
        jq("#beginView, #beginEmbedded").removeClass("disable");

        var fileName = jq("#hiddenFileName").val();
-        var posExt = fileName.lastIndexOf(".") + 1;
+        var posExt = fileName.lastIndexOf(".");
        posExt = 0 <= posExt ? fileName.substring(posExt).trim().toLowerCase() : "";

-        if (EditedExtList.includes(posExt) !== -1 || FillExtList.includes(posExt) !== -1) {
+        if (EditedExtList.indexOf(posExt) !== -1 || FillExtList.indexOf(posExt) !== -1) {
            jq("#beginEdit").removeClass("disable");
        }
    };
--- a/web/documentserver-example/java-spring/src/main/resources/templates/editor.html
+++ b/web/documentserver-example/java-spring/src/main/resources/templates/editor.html
@ -109,20 +109,14 @@
                    docEditor.insertImage(temp);
                };

-                var dataDocument = [[${dataDocument}]];
-
                // the user is trying to select document for comparing by clicking the Document from Storage button
-                var onRequestSelectDocument = function(event) {
-                    const temp = Object.assign({"c": event.data.c}, JSON.parse(dataDocument));
-                    docEditor.setRequestedDocument(temp);
+                var onRequestCompareFile = function() {
+                    docEditor.setRevisedFile([[${dataCompareFile}]]);
                };

-                var dataSpreadsheet = [[${dataSpreadsheet}]];
-
                // the user is trying to select recipients data by clicking the Mail merge button
-                var onRequestSelectSpreadsheet = function (event) {
-                    const temp = Object.assign({"c": event.data.c}, JSON.parse(dataSpreadsheet));
-                    docEditor.setRequestedSpreadsheet(temp);
+                var onRequestMailMergeRecipients = function (event) {
+                    docEditor.setMailMergeRecipients([[${dataMailMergeRecipients}]]);
                };

                config = [[${model}]];
@ -153,9 +147,9 @@

                    var newfilename = event.data;
                    var data = {
-                        fileName: newfilename,
-                        fileKey: config.document.key,
-                        fileType: config.document.fileType
+                        newfilename: newfilename,
+                        dockey: config.document.key,
+                        ext: config.document.fileType
                    };
                    let xhr = new XMLHttpRequest();
                    xhr.open("POST", "rename");
@ -166,101 +160,37 @@
                    }
                };

-                var onRequestOpen = function(event) {  // user open external data source
-                    innerAlert("onRequestOpen");
-                    var windowName = event.data.windowName;
-
-                    requestReference(event.data, function (data) {
-                        if (data.error) {
-                            var winEditor = window.open("", windowName);
-                            winEditor.close();
-                            innerAlert(data.error, true);
-                            return;
-                        }
-
-                        var link = data.link;
-                        window.open(link, windowName);
-                    });
-                };
-
                var onRequestReferenceData = function(event) {  // user refresh external data source
-                    innerAlert("onRequestReferenceData");
-
-                    requestReference(event.data, function (data) {
-                        docEditor.setReferenceData(data);
-                    });
-                };
-
-                var requestReference = function(data, callback) {
-                    innerAlert(data);
-
-                    data.directUrl = !!config.document.directUrl;
-
+                    event.data.directUrl = !!config.document.directUrl;
                    let xhr = new XMLHttpRequest();
                    xhr.open("POST", "reference");
                    xhr.setRequestHeader("Content-Type", "application/json");
-                    xhr.send(JSON.stringify(data));
+                    xhr.send(JSON.stringify(event.data));
                    xhr.onload = function () {
                        innerAlert(xhr.responseText);
-                        callback(JSON.parse(xhr.responseText));
+                        docEditor.setReferenceData(JSON.parse(xhr.responseText));
                    }
                };

-                var onRequestHistory = function () {
-                    var xhr = new XMLHttpRequest();
-                    xhr.open("GET", "history?fileName=" + config.document.title, false);
-                    xhr.send();
-
-                    if (xhr.status == 200) {
-                        var historyInfo = JSON.parse(xhr.responseText);
-                        docEditor.refreshHistory(historyInfo);
-                    }
-                };
-
-                var onRequestHistoryData = function (event) {
-                    var version = event.data;
-                    var historyDataUri = "historydata?fileName=" + config.document.title
-                        + "&version=" + version
-                        + "&directUrl=" + !!config.document.directUrl;
-                    var xhr = new XMLHttpRequest();
-                    xhr.open("GET", historyDataUri, false);
-                    xhr.send();
-
-                    if (xhr.status == 200) {
-                        var historyData = JSON.parse(xhr.responseText);
-                        docEditor.setHistoryData(historyData);
-                    }
-                };
-
-                var onRequestHistoryClose = function() {
-                    document.location.reload();
-                };
-
                function onRequestRestore(event) {
                  const query = new URLSearchParams(window.location.search)
+                  const config = [[${model}]]
                  const payload = {
                    fileName: query.get('fileName'),
-                    version: event.data.version
+                    version: event.data.version,
+                    userId: config.editorConfig.user.id
                  }
                  const request = new XMLHttpRequest()
                  request.open('PUT', 'restore')
                  request.setRequestHeader('Content-Type', 'application/json')
                  request.send(JSON.stringify(payload))
                  request.onload = function () {
-                    const response = JSON.parse(request.responseText);
-                    if (response.success && !response.error) {
-                      var historyInfoUri = "history?fileName=" + config.document.title;
-                      var xhr = new XMLHttpRequest();
-                      xhr.open("GET", historyInfoUri, false);
-                      xhr.send();
-
-                      if (xhr.status == 200) {
-                          var historyInfo = JSON.parse(xhr.responseText);
-                          docEditor.refreshHistory(historyInfo);
-                      }
-                    } else {
-                      innerAlert(response.error);
+                    if (request.status != 200) {
+                      response = JSON.parse(request.response)
+                      innerAlert(response.error)
+                      return
                    }
+                    document.location.reload()
                  }
                }

@ -274,46 +204,37 @@
                    "onMakeActionLink": onMakeActionLink,
                    "onMetaChange": onMetaChange,
                    "onRequestInsertImage": onRequestInsertImage,
-                    "onRequestSelectDocument": onRequestSelectDocument,
-                    "onRequestSelectSpreadsheet": onRequestSelectSpreadsheet,
-                    "onRequestRestore": onRequestRestore,
-                    "onRequestHistory": onRequestHistory,
-                    "onRequestHistoryData": onRequestHistoryData,
-                    "onRequestHistoryClose": onRequestHistoryClose
+                    "onRequestCompareFile": onRequestCompareFile,
+                    "onRequestMailMergeRecipients": onRequestMailMergeRecipients,
+                    "onRequestRestore": onRequestRestore
                };

+                var histArray = [[${fileHistory}]];
+                var hist = histArray[0];
+                var historyData = histArray[1];
                var usersForMentions = [[${usersForMentions}]];
-                var usersInfo = [[${usersInfo}]];
-                var usersForProtect = [[${usersForProtect}]];

                if (config.editorConfig.user.id != 4) {
+                    if (hist && historyData) {
+                        // the user is trying to show the document version history
+                        config.events['onRequestHistory'] = function () {
+                            docEditor.refreshHistory(JSON.parse(hist));  // show the document version history
+                        };
+                        // the user is trying to click the specific document version in the document version history
+                        config.events['onRequestHistoryData'] = function (event) {
+                            var ver = event.data;
+                            var histData = historyData;
+                            docEditor.setHistoryData(JSON.parse(histData)[ver - 1]);  // send the link to the document for viewing the version history
+                        };
+                        // the user is trying to go back to the document from viewing the document version history
+                        config.events['onRequestHistoryClose'] = function () {
+                            document.location.reload();
+                        };
+                    }
                    // add mentions for not anonymous users
-                    config.events['onRequestUsers'] = function (event) {
-                        if (event && event.data){
-                            var c = event.data.c;
-                        }
-                        switch (c) {
-                            case "info":
-                                users = [];
-                                var allUsers = usersInfo;
-                                for (var i = 0; i < event.data.id.length; i++) {
-                                    for (var j = 0; j < allUsers.length; j++) {
-                                        if (allUsers[j].id == event.data.id[i]) {
-                                            users.push(allUsers[j]);
-                                            break;
-                                        }
-                                    }
-                                }
-                                break;
-                            case "protect":
-                                var users = usersForProtect;
-                                break;
-                            default:
-                                users = usersForMentions;
-                        }
-                        docEditor.setUsers({
-                            "c": c,
-                            "users": users,
+                    config.events['onRequestUsers'] = function () {
+                        docEditor.setUsers({  // set a list of users to mention in the comments
+                            "users": usersForMentions
                        });
                    };
                    // the user is mentioned in a comment
@ -327,7 +248,6 @@
                    config.events['onRequestReferenceData'] = onRequestReferenceData;
                    // prevent switch the document from the viewing into the editing mode for anonymous users
                    config.events['onRequestEditRights'] = onRequestEditRights;
-                    config.events['onRequestOpen'] = onRequestOpen;
                }

                if (config.editorConfig.createUrl) {
--- a/web/documentserver-example/java-spring/src/main/resources/templates/index.html
+++ b/web/documentserver-example/java-spring/src/main/resources/templates/index.html
@ -3,7 +3,6 @@
 <head>
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    <meta name="viewport" content="width=device-width" />
-    <meta name="server-version" th:content="${serverVersion}"/>
    <!--
    *
    * (c) Copyright Ascensio System SIA 2023
--- a/web/documentserver-example/java/3rd-Party.license
+++ b/web/documentserver-example/java/3rd-Party.license
@ -27,7 +27,3 @@ License File:   jQuery.UI.license
 Prime JWT     - is intended to be fast and easy to use. Prime JWT has a single external dependency on Jackson. (https://github.com/ws-apps/prime-jwt/blob/master/LICENSE)
 License:        Apache 2.0
 License File:   prime-jwt.license
-
-Project Lombok - Spice up your java: Automatic Resource Management, automatic generation of getters, setters, equals, hashCode and toString, and more! (https://projectlombok.org/LICENSE)
-License:        MIT
-License File:   lombok.license
--- a/web/documentserver-example/java/README.md
+++ b/web/documentserver-example/java/README.md
@ -16,7 +16,7 @@ See the detailed guide to learn how to [install Document Server for Windows](htt

 Download the [Java example](https://api.onlyoffice.com/editors/demopreview) from our site.

-To connect the editors to your website, specify the path to the editors installation and the path to the storage folder in the *src/main/resources/settings.properties* file:
+To connect the editors to your website, specify the path to the editors installation and the path to the storage folder in the *\src\main\resources\settings.properties* file:

 ```
 storage-folder = app_data
@ -140,16 +140,20 @@ See the detailed guide to learn how to [install Document Server for Linux](https

 ### Step 2. Install the prerequisites and run the website with the editors

-1. Install **Java** following the instructions [here](https://docs.oracle.com/en/java/javase/20/install/installation-jdk-linux-platforms.html#GUID-737A84E4-2EFF-4D38-8E60-3E29D1B884B8).
+1. Install **Java**:
+
+    ```
+    sudo add-apt-repository ppa:webupd8team/java sudo apt-get update sudo apt-get install oracle-java8-installer
+    ```

 2. Download the archive with the Java example and unpack the archive:

    ```
-    wget https://api.onlyoffice.com/app_data/editor/Java.Example.zip
+    wget https://api.onlyoffice.com/app_data/editor/Java%20Example.zip
    ```
    
    ```
-    unzip Java.Example.zip
+    unzip Java\ Example.zip
    ```

 3. Change the current directory for the project directory:
@ -158,7 +162,7 @@ See the detailed guide to learn how to [install Document Server for Linux](https
   cd Java\ Example/
   ```

-4. Edit the *src/main/resources/settings.properties* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed.
+4. 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
@ -237,39 +241,13 @@ Make sure that the Document Server has access to the server with the example ins

 ## For Docker

-### Step 1. Install ONLYOFFICE Docs
-
-Download and install ONLYOFFICE Docs (packaged as Document Server). 
-
-See the detailed guide to learn how to install Document Server [for Docker](https://helpcenter.onlyoffice.com/installation/docs-developer-install-docker.aspx). 
-
-### Step 2. Install the prerequisites and run the website with the editors
-
-1. Install **Java** following the instructions [here](https://docs.oracle.com/en/java/javase/20/install/installation-jdk-linux-platforms.html#GUID-737A84E4-2EFF-4D38-8E60-3E29D1B884B8).
-
-2. Download the archive with the Java example and unpack the archive:
-
-    ```
-    wget https://api.onlyoffice.com/app_data/editor/Java.Example.zip
-    ```
-    
-    ```
-    unzip Java.Example.zip
-    ```
-
-3. Change the current directory for the project directory:
-
-    ```
-   cd Java\ Example/
-   ```
-
-4. Edit the *src/main/resources/settings.properties* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed:
+1. Edit the *settings.properties* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed ([installation instructions](https://helpcenter.onlyoffice.com/installation/docs-developer-install-docker.aspx)).

 	```
 	nano src/main/resources/settings.properties
 	```
 	
-5. Edit the following lines:
+2. Edit the following lines:

 	```
 	storage-folder = app_data
@ -278,19 +256,13 @@ See the detailed guide to learn how to install Document Server [for Docker](http

 	where the **documentserver** is the name of the server with the ONLYOFFICE Document Server installed and the **storage-folder** is the path where files will be created and stored.

-6. Run the next command in the Java example directory:
+3. Run the next command in the Java example directory:

 	```
 	docker-compose up
 	```

-7. After it, all the *bin* files will be passed to the *./target* folder.
-
-### Step 3. Check accessibility
-
-In case the example and Document Server are installed on different computers, make sure that your server with the example installed has access to the Document Server with the address which you specify instead of **documentserver** in the configuration files. 
-
-Make sure that the Document Server has access to the server with the example installed with the address which you specify instead of **example.com** in the configuration files.
+4. After it, all the *bin* files will be passed to the *./target* folder.

 ## Important security info

--- a/web/documentserver-example/java/licenses/3rd-Party.license
+++ b/web/documentserver-example/java/licenses/3rd-Party.license
@ -27,7 +27,3 @@ License File:   jQuery.UI.license
 Prime JWT     - is intended to be fast and easy to use. Prime JWT has a single external dependency on Jackson. (https://github.com/ws-apps/prime-jwt/blob/master/LICENSE)
 License:        Apache 2.0
 License File:   prime-jwt.license
-
-Project Lombok - Spice up your java: Automatic Resource Management, automatic generation of getters, setters, equals, hashCode and toString, and more! (https://projectlombok.org/LICENSE)
-License:        MIT
-License File:   lombok.license
--- a/Show More
+++ b/Show More