python-raw: add sr-only

.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:
@@ -21,9 +21,11 @@ jobs:
           cwd=$(pwd)
           git submodule update --init --recursive
           cd ./web/documentserver-example/csharp-mvc
-          mkdir -p ./deploy/'DotNet (Csharp MVC) Example'
+          mkdir -p ./deploy/'DotNet (Csharp MVN) Example'
           rsync -av --exclude='deploy' ./ ./deploy/'DotNet (Csharp MVC) Example'
-          rm -rf ./deploy/'DotNet (Csharp MVC) Example'/assets/.git
+          cd ./deploy/'DotNet (Csharp MVC) Example'/assets
+          rm -rf ./.git/
+          rm .git
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:

.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:
@@ -18,11 +18,14 @@ jobs:
       - name: Build Artifact
         run: |
           cd ${{ github.workspace }}
+          cwd=$(pwd)
           git submodule update --init --recursive
           cd ./web/documentserver-example/csharp
           mkdir -p ./deploy/'DotNet (Csharp) Example'
           rsync -av --exclude='deploy' ./ ./deploy/'DotNet (Csharp) Example'
-          rm -rf ./deploy/'DotNet (Csharp) Example'/assets/.git
+          cd ./deploy/'DotNet (Csharp) Example'/assets
+          rm -rf ./.git/
+          rm .git
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:

.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:
@@ -18,12 +18,14 @@ jobs:
       - name: Build Artifact
         run: |
           cd ${{ github.workspace }}
+          cwd=$(pwd)
           git submodule update --init --recursive
           cd ./web/documentserver-example/java
           mkdir -p ./deploy/'Java Example'
           rsync -av --exclude='deploy' ./ ./deploy/'Java Example'
-          rm -rf ./deploy/'Java Example'/src/main/resources/assets/document-formats/.git
-          rm -rf ./deploy/'Java Example'/src/main/resources/assets/document-templates/.git
+          cd ./deploy/'Java Example'/src/main/resources/assets
+          rm -rf ./.git/
+          rm .git
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:

.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:
@@ -18,12 +18,14 @@ jobs:
       - name: Build Artifact
         run: |
           cd ${{ github.workspace }}
+          cwd=$(pwd)
           git submodule update --init --recursive
           cd ./web/documentserver-example/nodejs
           mkdir -p ./deploy/'Node.js Example'
           rsync -av --exclude='deploy' ./ ./deploy/'Node.js Example'
-          rm -rf ./deploy/'Node.js Example'/public/assets/document-formats/.git
-          rm -rf ./deploy/'Node.js Example'/public/assets/document-templates/.git
+          cd ./deploy/'Node.js Example'/public/assets
+          rm -rf ./.git/
+          rm .git
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:

.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:
@@ -18,12 +18,14 @@ jobs:
       - name: Build Artifact
         run: |
           cd ${{ github.workspace }}
+          cwd=$(pwd)
           git submodule update --init --recursive
           cd ./web/documentserver-example/php
           mkdir -p ./deploy/'PHP Example'
           rsync -av --exclude='deploy' ./ ./deploy/'PHP Example'
-          rm -rf ./deploy/'PHP Example'/assets/document-formats/.git
-          rm -rf ./deploy/'PHP Example'/assets/document-templates/.git
+          cd ./deploy/'PHP Example'/assets
+          rm -rf ./.git/
+          rm .git
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:

.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:
@@ -18,12 +18,14 @@ jobs:
       - name: Build Artifact
         run: |
           cd ${{ github.workspace }}
+          cwd=$(pwd)
           git submodule update --init --recursive
           cd ./web/documentserver-example/python
           mkdir -p ./deploy/'Python Example'
           rsync -av --exclude='deploy' ./ ./deploy/'Python Example'
-          rm -rf ./deploy/'Python Example'/assets/document-formats/.git
-          rm -rf ./deploy/'Python Example'/assets/document-templates/.git
+          cd ./deploy/'Python Example'/assets
+          rm -rf ./.git/
+          rm .git
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:

.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:
@@ -18,12 +18,14 @@ jobs:
       - name: Build Artifact
         run: |
           cd ${{ github.workspace }}
+          cwd=$(pwd)
           git submodule update --init --recursive
           cd ./web/documentserver-example/ruby
           mkdir -p ./deploy/'Ruby Example'
           rsync -av --exclude='deploy' ./ ./deploy/'Ruby Example'
-          rm -rf ./deploy/'Ruby Example'/public/assets/document-formats/.git
-          rm -rf ./deploy/'Ruby Example'/public/assets/document-templates/.git
+          cd ./deploy/'Ruby Example'/public/assets
+          rm -rf ./.git/
+          rm .git
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:

.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:
@@ -23,8 +23,9 @@ jobs:
           cd ./web/documentserver-example/java-spring
           mkdir -p ./deploy/'Java Spring Example'
           rsync -av --exclude='deploy' ./ ./deploy/'Java Spring Example'
-          rm -rf ./deploy/'Java Spring Example'/src/main/resources/assets/document-formats/.git
-          rm -rf ./deploy/'Java Spring Example'/src/main/resources/assets/document-templates/.git
+          cd ./deploy/'Java Spring Example'/src/main/resources/assets
+          rm -rf ./.git/
+          rm .git
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:

.github/workflows/lint-php.yml

@@ -26,4 +26,4 @@ jobs:
           tools: cs2pr, phpcs
           
       - name: Lint
-        run: phpcs src index.php
+        run: phpcs .

.github/workflows/lint-python.yml

@@ -27,9 +27,14 @@ jobs:
         run: |
           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: |
-          flake8 --count --select=E9,F63,F7,F82 --show-source --statistics
-          flake8 --count --max-complexity=15 --max-line-length=120 --per-file-ignores="__init__.py:F4"  --statistics
+          flake8 ./**/*.py --count --select=E9,F63,F7,F82 --show-source --statistics
+          flake8 ./**/*.py --count --max-complexity=10 --max-line-length=79 --statistics
+          
+      - name: Lint Pylint
+        run: |
+          pylint ./**/*.py

.github/workflows/lint-ruby.yml

@@ -16,22 +16,16 @@ jobs:
       run:
         working-directory: ./web/documentserver-example/ruby
     steps:
-    - name: Checkout Repository
-      uses: actions/checkout@v3
-
-    - name: Setup Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: '3.2.2'
-
-    - name: Update Submodules
-      run: |
-        git submodule update --init --recursive
-
-    - name: Install Dependencies
-      run: |
-        bundle update
-
-    - name: Rubocop
-      run: |
-        bundle exec rubocop
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
+          bundler-cache: true
+      - name: Install dependencies
+        run: | 
+          bundle install
+      - name: Rubocop
+        run: |
+          gem install rubocop
+          rubocop

.github/workflows/release.yml

@@ -13,10 +13,8 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v3
-      - name: Clone Submodules
-        run: |
-          cd ${{ github.workspace }}
-          git submodule update --init --recursive
+      - name: Install Zip
+        run: sudo apt-get install zip
       - name: Get Info
         run: |
           echo "version=$(grep -Eo '[0-9]+(\.[0-9]+)+' CHANGELOG.md | head -n 1)" >> $GITHUB_OUTPUT
@@ -27,66 +25,91 @@ jobs:
       - name: Build Csharp MVC Artifact
         run: |
           cd ${{ github.workspace }}
+          cwd=$(pwd)
+          git submodule update --init --recursive
           cd ./web/documentserver-example/csharp-mvc
           mkdir -p ./'DotNet (Csharp MVC) Example'
           rsync -av --exclude='DotNet (Csharp MVC) Example' ./ ./'DotNet (Csharp MVC) Example'
           cd ./'DotNet (Csharp MVC) Example'/assets
-          rm -rf .git
+          rm -rf ./.git/
+          rm .git
       - name: Build Csharp Artifact
         run: |
           cd ${{ github.workspace }}
+          cwd=$(pwd)
+          git submodule update --init --recursive
           cd ./web/documentserver-example/csharp
           mkdir -p ./'DotNet (Csharp) Example'
           rsync -av --exclude='DotNet (Csharp) Example' ./ ./'DotNet (Csharp) Example'
-          rm -rf ./'DotNet (Csharp) Example'/assets/.git
+          cd ./'DotNet (Csharp) Example'/assets
+          rm -rf ./.git/
+          rm .git
       - name: Build Java Artifact
         run: |
           cd ${{ github.workspace }}
+          cwd=$(pwd)
+          git submodule update --init --recursive
           cd ./web/documentserver-example/java
           mkdir -p ./'Java Example'
           rsync -av --exclude='Java Example' ./ ./'Java Example'
-          rm -rf ./'Java Example'/src/main/resources/assets/document-formats/.git
-          rm -rf ./'Java Example'/src/main/resources/assets/document-templates/.git
+          cd ./'Java Example'/src/main/resources/assets
+          rm -rf ./.git/
+          rm .git
       - name: Build Nodejs Artifact
         run: |
           cd ${{ github.workspace }}
+          cwd=$(pwd)
+          git submodule update --init --recursive
           cd ./web/documentserver-example/nodejs
           mkdir -p ./'Node.js Example'
           rsync -av --exclude='Node.js Example' ./ ./'Node.js Example'
-          rm -rf ./'Node.js Example'/public/assets/document-formats/.git
-          rm -rf ./'Node.js Example'/public/assets/document-templates/.git
+          cd ./'Node.js Example'/public/assets
+          rm -rf ./.git/
+          rm .git
       - name: Build PHP Artifact
         run: |
           cd ${{ github.workspace }}
+          cwd=$(pwd)
+          git submodule update --init --recursive
           cd ./web/documentserver-example/php
           mkdir -p ./'PHP Example'
           rsync -av --exclude='PHP Example' ./ ./'PHP Example'
-          rm -rf ./'PHP Example'/assets/document-formats/.git
-          rm -rf ./'PHP Example'/assets/document-templates/.git
+          cd ./'PHP Example'/assets
+          rm -rf ./.git/
+          rm .git
       - name: Build Python Artifact
         run: |
           cd ${{ github.workspace }}
+          cwd=$(pwd)
+          git submodule update --init --recursive
           cd ./web/documentserver-example/python
           mkdir -p ./'Python Example'
           rsync -av --exclude='Python Example' ./ ./'Python Example'
-          rm -rf ./'Python Example'/assets/document-formats/.git
-          rm -rf ./'Python Example'/assets/document-templates/.git
+          cd ./'Python Example'/assets
+          rm -rf ./.git/
+          rm .git
       - name: Build Ruby Artifact
         run: |
           cd ${{ github.workspace }}
+          cwd=$(pwd)
+          git submodule update --init --recursive
           cd ./web/documentserver-example/ruby
           mkdir -p ./'Ruby Example'
           rsync -av --exclude='Ruby Example' ./ ./'Ruby Example'
-          rm -rf ./'Ruby Example'/public/assets/document-formats/.git
-          rm -rf ./'Ruby Example'/public/assets/document-templates/.git
+          cd ./'Ruby Example'/public/assets
+          rm -rf ./.git/
+          rm .git
       - name: Build Spring Artifact
         run: |
           cd ${{ github.workspace }}
+          cwd=$(pwd)
+          git submodule update --init --recursive
           cd ./web/documentserver-example/java-spring
           mkdir -p ./'Java Spring Example'
           rsync -av --exclude='Java Spring Example' ./ ./'Java Spring Example'
-          rm -rf ./'Java Spring Example'/src/main/resources/assets/document-formats/.git
-          rm -rf ./'Java Spring Example'/src/main/resources/assets/document-templates/.git
+          cd ./'Java Spring Example'/src/main/resources/assets
+          rm -rf ./.git/
+          rm .git
       - name: Pack Artifacts
         run: |
           cd ${{ github.workspace }}/web/documentserver-example/csharp-mvc

.gitmodules

@@ -1,3 +1,7 @@
+[submodule "web/documentserver-example/java/src/main/resources/assets"]
+	path = web/documentserver-example/java/src/main/resources/assets
+	url = https://github.com/ONLYOFFICE/document-templates
+	branch = main/en
 [submodule "web/documentserver-example/csharp-mvc/assets"]
 	path = web/documentserver-example/csharp-mvc/assets
 	url = https://github.com/ONLYOFFICE/document-templates
@@ -6,6 +10,14 @@
 	path = web/documentserver-example/csharp/assets
 	url = https://github.com/ONLYOFFICE/document-templates
 	branch = main/en
+[submodule "web/documentserver-example/ruby/public/assets"]
+	path = web/documentserver-example/ruby/public/assets
+	url = https://github.com/ONLYOFFICE/document-templates
+	branch = main/en
+[submodule "web/documentserver-example/java-spring/src/main/resources/assets"]
+	path = web/documentserver-example/java-spring/src/main/resources/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
@@ -26,31 +38,7 @@
 	path = web/documentserver-example/python/assets/document-templates
 	url = https://github.com/ONLYOFFICE/document-templates
 	branch = main/en
-[submodule "web/documentserver-example/java/src/main/resources/assets/document-templates"]
-	path = web/documentserver-example/java/src/main/resources/assets/document-templates
-	url = https://github.com/ONLYOFFICE/document-templates
-	branch = main/en
-[submodule "web/documentserver-example/ruby/assets/document-templates"]
-	path = web/documentserver-example/ruby/assets/document-templates
-	url = https://github.com/ONLYOFFICE/document-templates
-	branch = main/en
-[submodule "web/documentserver-example/java-spring/src/main/resources/assets/document-templates"]
-	path = web/documentserver-example/java-spring/src/main/resources/assets/document-templates
-	url = https://github.com/ONLYOFFICE/document-templates
-	branch = main/en
 [submodule "web/documentserver-example/python/assets/document-formats"]
 	path = web/documentserver-example/python/assets/document-formats
 	url = https://github.com/ONLYOFFICE/document-formats
 	branch = master
-[submodule "web/documentserver-example/ruby/assets/document-formats"]
-	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

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
 
@@ -311,14 +307,6 @@ PHPUnit         - The PHP Unit Testing framework. (https://github.com/sebastianb
 License:        BSD 3-Clause
 License File:   phpunit.license
 
-property-access - Provides functions to read and write from/to an object or array using a simple string notation. (https://github.com/symfony/property-access/blob/6.3/LICENSE)
-License:        MIT
-License File:   property-access.license
-
-serializer      - Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON. (https://github.com/symfony/serializer/blob/6.3/LICENSE)
-License:        MIT
-License File:   serializer.license
-
 
 web/documentserver-example/python
 
@@ -358,10 +346,6 @@ jQuery.UI     - jQuery UI is an open source library of interface components —
 License:        MIT
 License File:   jQuery.UI.license
 
-msgspec       - A fast serialization and validation library, with builtin support for JSON, MessagePack, YAML, and TOML. (https://github.com/jcrist/msgspec/blob/0.18.1/LICENSE)
-License:        BSD 3-Clause
-License File:   msgspec.license
-
 mypy          - Optional static typing for Python. (https://github.com/python/mypy/blob/master/LICENSE)
 License:        MIT
 License File:   mypy.license

CHANGELOG.md

@@ -1,39 +1,14 @@
 # Change Log
 
-- onRequestOpen method
-- nodejs: user avatar
-- trimming long name of uploading file
-- nodejs: link in referenceData
-- onRequestSelectDocument method
-- onRequestSelectSpreadsheet method
-- key in referenceData
-- restore from history
-- python: using a repo with a list of formats
-- ruby: using a repo with a list of formats
-- java: using a repo with a list of formats
-- java: getting history by a separate request
-- java-spring: using a repo with a list of formats
-- java-spring: getting history by a separate request
-
-## 1.7.0
-- nodejs: onRequestSelectDocument method
-- nodejs: onRequestSelectSpreadsheet method
-- nodejs: onRequestOpen
-- nodejs: submitForm
-- nodejs: key in referenceData
 - nodejs: change reference source
+- php: using a repo with a list of formats
 - nodejs: using a repo with a list of formats
 - nodejs: delete file without reloading the page
 - nodejs: getting history by a separate request
 - nodejs: restore from history
-- php: using a repo with a list of formats
-- php: restore from history
 - python: restore from history
 - ruby: restore from history
-- csharp-mvc: getting history by a separate request
-- csharp-mvc: restore from history
-- csharp: getting history by a separate request
-- csharp: restore from history
+- php: restore from history
 
 ## 1.6.0
 - nodejs: setUsers for region protection

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")

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>

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>

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>

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>

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>

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

@@ -177,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;
 

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

@@ -17,6 +17,7 @@
  */
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Web;
@@ -235,8 +236,125 @@ namespace OnlineEditorsExampleMVC.Models
             return jss.Serialize(config);
         }
 
+        // get the document history
+        public void GetHistory(out string history, out string historyData)
+        {            
+            var storagePath = WebConfigurationManager.AppSettings["storage-path"];
+            var jss = new JavaScriptSerializer();
+            var histDir = DocManagerHelper.HistoryDir(DocManagerHelper.StoragePath(FileName, null));
+
+            history = null;
+            historyData = null;
+
+            if (DocManagerHelper.GetFileVersion(histDir) > 0)  // if the file was modified (the file version is greater than 0)
+            {
+                var currentVersion = DocManagerHelper.GetFileVersion(histDir);
+                var hist = new List<Dictionary<string, object>>();
+                var histData = new Dictionary<string, object>();
+
+                for (var i = 1; i <= currentVersion; i++)  // run through all the file versions
+                {
+                    var obj = new Dictionary<string, object>();
+                    var dataObj = new Dictionary<string, object>();
+                    var verDir = DocManagerHelper.VersionDir(histDir, i);  // get the path to the given file version
+
+                    var key = i == currentVersion ? Key : File.ReadAllText(Path.Combine(verDir, "key.txt"));  // get document key
+
+                    obj.Add("key", key);
+                    obj.Add("version", i);
+
+                    if (i == 1)  // check if the version number is equal to 1
+                    {
+                        var infoPath = Path.Combine(histDir, "createdInfo.json");  // get meta data of this file
+
+                        if (File.Exists(infoPath))
+                        {
+                            var info = jss.Deserialize<Dictionary<string, object>>(File.ReadAllText(infoPath));
+                            obj.Add("created", info["created"]);  // write meta information to the object (user information and creation date)
+                            obj.Add("user", new Dictionary<string, object>() {
+                                { "id", info["id"] },
+                                { "name", info["name"] },
+                            });
+                        }
+                    }
+
+                    var ext = Path.GetExtension(FileName).ToLower();
+                    dataObj.Add("fileType", ext.Replace(".", ""));
+                    dataObj.Add("key", key);
+                    // write file url to the data object
+                    string prevFileUrl;
+                    string directPrevFileUrl;
+                    if (Path.IsPathRooted(storagePath) && !string.IsNullOrEmpty(storagePath))
+                    {
+                        prevFileUrl = i == currentVersion ? DocManagerHelper.GetHistoryDownloadUrl(FileName, i.ToString(), "prev" + ext)
+                            : DocManagerHelper.GetDownloadUrl(Directory.GetFiles(verDir, "prev.*")[0].Replace(storagePath + "\\", ""));
+                        directPrevFileUrl = i == currentVersion ? DocManagerHelper.GetHistoryDownloadUrl(FileName, i.ToString(), "prev" + ext, false)
+                            : DocManagerHelper.GetDownloadUrl(Directory.GetFiles(verDir, "prev.*")[0].Replace(storagePath + "\\", ""), false);
+                    }
+                    else {
+                        prevFileUrl = i == currentVersion ? FileUri
+                            : DocManagerHelper.GetHistoryDownloadUrl(FileName, i.ToString(), "prev" + ext);
+                        directPrevFileUrl = i == currentVersion ? DocManagerHelper.GetHistoryDownloadUrl(FileName, i.ToString(), "prev" + ext, false)
+                            : DocManagerHelper.GetDownloadUrl(Directory.GetFiles(verDir, "prev.*")[0].Replace(storagePath + "\\", ""), false);
+                    }
+
+                    dataObj.Add("url", prevFileUrl);
+                    if (IsEnabledDirectUrl)
+                    {
+                        dataObj.Add("directUrl", directPrevFileUrl);
+                    }
+                    dataObj.Add("version", i);
+                    if (i > 1)  // check if the version number is greater than 1 (the file was modified)
+                    {
+                        // get the path to the changes.json file
+                        var changes = jss.Deserialize<Dictionary<string, object>>(File.ReadAllText(Path.Combine(DocManagerHelper.VersionDir(histDir, i - 1), "changes.json")));
+                        var changesArray = (ArrayList)changes["changes"];
+                        var change = changesArray.Count > 0
+                            ? (Dictionary<string, object>)changesArray[0]
+                            : new Dictionary<string, object>();
+
+                        // write information about changes to the object
+                        obj.Add("changes", change.Count > 0 ? changes["changes"] : null);
+                        obj.Add("serverVersion", changes["serverVersion"]);
+                        obj.Add("created", change.Count > 0  ? change["created"] : null);
+                        obj.Add("user", change.Count > 0 ? change["user"] : null);
+
+                        var prev = (Dictionary<string, object>)histData[(i - 2).ToString()];  // get the history data from the previous file version
+                        dataObj.Add("previous", IsEnabledDirectUrl ? new Dictionary<string, object>() {  // write information about previous file version to the data object with direct url
+                            { "fileType", prev["fileType"] },
+                            { "key", prev["key"] },  // write key and url information about previous file version
+                            { "url", prev["url"] },
+                            { "directUrl", prev["directUrl"] },
+                        } : new Dictionary<string, object>() {  // write information about previous file version to the data object without direct url
+                            { "fileType", prev["fileType"] },
+                            { "key", prev["key"] },  // write key and url information about previous file version
+                            { "url", prev["url"] },
+                        });
+                        // write the path to the diff.zip archive with differences in this file version
+                        var changesUrl = DocManagerHelper.GetHistoryDownloadUrl(FileName, (i - 1).ToString(), "diff.zip");
+                        dataObj.Add("changesUrl", changesUrl);
+                    }
+                    if(JwtManager.Enabled)
+                    {
+                        var token = JwtManager.Encode(dataObj);
+                        dataObj.Add("token", token);
+                    }
+                    hist.Add(obj);  // add object dictionary to the hist list
+                    histData.Add((i - 1).ToString(), dataObj);  // write data object information to the history data
+                }
+
+                // write history information about the current file version to the history object
+                history = jss.Serialize(new Dictionary<string, object>()
+                {
+                    { "currentVersion", currentVersion },
+                    { "history", hist }
+                });
+                historyData = jss.Serialize(histData);
+            }
+        }
+
         // 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();
 
@@ -320,7 +438,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();
 
@@ -361,7 +479,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

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" />

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/" />

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,83 +178,18 @@
             }
         };
 
-        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));
             }
         };
 
-        var onRequestHistory = function () {
-            let xhr = new XMLHttpRequest();
-            xhr.open("GET", "webeditor.ashx?type=gethistory&filename=<%= Model.FileName %>");
-            xhr.setRequestHeader("Content-Type", "application/json");
-            xhr.send();
-            xhr.onload = function () {
-                console.log(xhr.responseText);
-                docEditor.refreshHistory(JSON.parse(xhr.responseText));
-            }
-        };
-
-        var onRequestHistoryData = function (event) {
-            var ver = event.data;
-
-            let xhr = new XMLHttpRequest();
-            xhr.open("GET", "webeditor.ashx?type=getversiondata&filename=<%= Model.FileName %>&version=" + ver + "&directUrl=" + !!config.document.directUrl);
-            xhr.setRequestHeader("Content-Type", "application/json");
-            xhr.send();
-            xhr.onload = function () {
-                console.log(xhr.responseText);
-                docEditor.setHistoryData(JSON.parse(xhr.responseText));  // send the link to the document for viewing the version history
-            }
-        };
-
-        var onRequestRestore = function (event) {
-            var fileName = "<%= Model.FileName %>";
-            var version = event.data.version;
-            var data = {
-                fileName: fileName,
-                version: version
-            };
-
-            let xhr = new XMLHttpRequest();
-            xhr.open("POST", "webeditor.ashx?type=restore&directUrl=" + !!config.document.directUrl);
-            xhr.setRequestHeader('Content-Type', 'application/json');
-            xhr.send(JSON.stringify(data));
-            xhr.onload = function () {
-                docEditor.refreshHistory(JSON.parse(xhr.responseText));
-            }
-        }
-
         config = <%= Model.GetDocConfig(Request, Url) %>;
 
         config.width = "100%";
@@ -272,23 +203,34 @@
             "onMakeActionLink": onMakeActionLink,
             "onMetaChange": onMetaChange,
             "onRequestInsertImage": onRequestInsertImage,
-            "onRequestSelectDocument": onRequestSelectDocument,
-            "onRequestSelectSpreadsheet": onRequestSelectSpreadsheet,
+            "onRequestCompareFile": onRequestCompareFile,
+            "onRequestMailMergeRecipients": onRequestMailMergeRecipients,
         };
 
+        <% string hist, histData; %>
+        <% Model.GetHistory(out hist, out histData); %>
+
         <% string usersForMentions; %>
         <% Model.GetUsersMentions(Request, out usersForMentions); %>
 
         if (config.editorConfig.user.id) {
-            // the user is trying to show the document version history
-            config.events['onRequestHistory'] = onRequestHistory;
-            // the user is trying to click the specific document version in the document version history
-            config.events['onRequestHistoryData'] = onRequestHistoryData;
-            // the user is trying to go back to the document from viewing the document version history
-            config.events['onRequestHistoryClose'] = function () {
-                document.location.reload();
-            };
-            config.events['onRequestRestore'] = onRequestRestore;
+            <% if (!string.IsNullOrEmpty(hist) && !string.IsNullOrEmpty(histData))
+            { %>
+                // the user is trying to show the document version history
+                config.events['onRequestHistory'] = function () {
+                    docEditor.refreshHistory(<%= 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 = <%= histData %>;
+                    docEditor.setHistoryData(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
             <% if (!string.IsNullOrEmpty(usersForMentions))
@@ -311,7 +253,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) {

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

@@ -17,7 +17,6 @@
  */
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
@@ -51,15 +50,6 @@ namespace OnlineEditorsExampleMVC
                 case "downloadhistory":
                     DownloadHistory(context);
                     break;
-                case "gethistory":
-                    GetHistory(context);
-                    break;
-                case "getversiondata":
-                    GetVersionData(context);
-                    break;
-                case "restore":
-                    Restore(context);
-                    break;
                 case "convert":
                     Convert(context);
                     break;
@@ -523,173 +513,6 @@ namespace OnlineEditorsExampleMVC
             get { return false; }
         }
 
-        private static void GetHistory(HttpContext context)
-        {
-            var jss = new JavaScriptSerializer();
-            var fileName = context.Request["filename"];
-
-            var history = GetHistory(fileName);
-
-            context.Response.Write(jss.Serialize(history));
-        }
-
-        private static void GetVersionData(HttpContext context)
-        {
-            var storagePath = WebConfigurationManager.AppSettings["storage-path"];
-            var jss = new JavaScriptSerializer();
-
-            var fileName = context.Request["filename"];
-            int version;
-
-            if (!int.TryParse(context.Request["version"], out version))
-            {
-                context.Response.Write("{ \"error\": \"Version number invalid!\"}");
-                return;
-            }
-
-            var versionData = new Dictionary<string, object>();
-
-            var histDir = DocManagerHelper.HistoryDir(DocManagerHelper.StoragePath(fileName, null));
-            var lastVersion = DocManagerHelper.GetFileVersion(histDir);
-
-            var verDir = DocManagerHelper.VersionDir(histDir, version);
-
-            var key = version == lastVersion
-                ? ServiceConverter.GenerateRevisionId(DocManagerHelper.CurUserHostAddress()
-                    + "/" + fileName + "/"
-                    + File.GetLastWriteTime(DocManagerHelper.StoragePath(fileName, null)).GetHashCode())
-                : File.ReadAllText(Path.Combine(verDir, "key.txt"));
-
-
-            var ext = Path.GetExtension(fileName).ToLower();
-            versionData.Add("fileType", ext.Replace(".", ""));
-            versionData.Add("key", key);
-
-            // write file url to the data object
-            string prevFileUrl;
-            string directPrevFileUrl;
-            if (Path.IsPathRooted(storagePath) && !string.IsNullOrEmpty(storagePath))
-            {
-                prevFileUrl = version == lastVersion ? DocManagerHelper.GetDownloadUrl(fileName)
-                    : DocManagerHelper.GetDownloadUrl(Directory.GetFiles(verDir, "prev.*")[0].Replace(storagePath + "\\", ""));
-                directPrevFileUrl = version == lastVersion ? DocManagerHelper.GetDownloadUrl(fileName, false)
-                    : DocManagerHelper.GetDownloadUrl(Directory.GetFiles(verDir, "prev.*")[0].Replace(storagePath + "\\", ""), false);
-            }
-            else
-            {
-                prevFileUrl = version == lastVersion ? DocManagerHelper.GetFileUri(fileName, true)
-                    : DocManagerHelper.GetHistoryDownloadUrl(fileName, version.ToString(), "prev" + ext);
-                directPrevFileUrl = version == lastVersion ? DocManagerHelper.GetFileUri(fileName, false)
-                    : DocManagerHelper.GetHistoryDownloadUrl(fileName, version.ToString(), "prev" + ext, false);
-            }
-
-            versionData.Add("url", prevFileUrl);
-
-            var isEnableDirectUrl = string.Equals(DocManagerHelper.GetDirectUrl(), "true");
-            if (isEnableDirectUrl)
-            {
-                versionData.Add("directUrl", directPrevFileUrl); // write direct url to the data object
-            }
-
-            versionData.Add("version", version);
-            if (version > 1)
-            {
-                var prevVerDir = DocManagerHelper.VersionDir(histDir, version - 1);
-
-                var prevUrl = Path.IsPathRooted(storagePath) && !string.IsNullOrEmpty(storagePath)
-                    ? DocManagerHelper.GetDownloadUrl(Directory.GetFiles(prevVerDir, "prev.*")[0].Replace(storagePath + "\\", ""))
-                    : DocManagerHelper.GetHistoryDownloadUrl(fileName, (version - 1).ToString(), "prev" + ext);
-
-                var prevKey = File.ReadAllText(Path.Combine(prevVerDir, "key.txt"));
-
-                Dictionary<string, object> dataPrev = new Dictionary<string, object>() {  // write information about previous file version to the data object
-                    { "fileType", ext.Replace(".", "") },
-                    { "key", prevKey },  // write key and url information about previous file version
-                    { "url", prevUrl }
-                };
-
-                string directPrevUrl;
-                if (isEnableDirectUrl)
-                {
-                    directPrevUrl = Path.IsPathRooted(storagePath) && !string.IsNullOrEmpty(storagePath)
-                        ? DocManagerHelper.GetDownloadUrl(Directory.GetFiles(prevVerDir, "prev.*")[0].Replace(storagePath + "\\", ""), false)
-                        : DocManagerHelper.GetHistoryDownloadUrl(fileName, version.ToString(), "prev" + ext, false);
-
-                    dataPrev.Add("directUrl", directPrevUrl);
-                }
-
-                versionData.Add("previous", dataPrev);
-
-                if (File.Exists(Path.Combine(prevVerDir, "diff.zip")))
-                {
-                    var changesUrl = DocManagerHelper.GetHistoryDownloadUrl(fileName, (version - 1).ToString(), "diff.zip");
-                    versionData.Add("changesUrl", changesUrl);
-                }
-            }
-
-            if (JwtManager.Enabled)
-            {
-                var token = JwtManager.Encode(versionData);
-                versionData.Add("token", token);
-            }
-
-            context.Response.Write(jss.Serialize(versionData));
-        }
-
-        private static void Restore(HttpContext context)
-        {
-            string fileData;
-            try
-            {
-                using (var receiveStream = context.Request.InputStream)
-                using (var readStream = new StreamReader(receiveStream))
-                {
-                    fileData = readStream.ReadToEnd();
-                    if (string.IsNullOrEmpty(fileData)) return;
-                }
-            }
-            catch (Exception e)
-            {
-                throw new HttpException((int)HttpStatusCode.BadRequest, e.Message);
-            }
-
-            var jss = new JavaScriptSerializer();
-            var body = jss.Deserialize<Dictionary<string, object>>(fileData);
-
-            var fileName = (string)body["fileName"];
-            var version = (int)body["version"];
-
-            var key = ServiceConverter.GenerateRevisionId(DocManagerHelper.CurUserHostAddress()
-                + "/" + fileName + "/"
-                + File.GetLastWriteTime(DocManagerHelper.StoragePath(fileName, null)).GetHashCode());
-
-            var histDir = DocManagerHelper.HistoryDir(DocManagerHelper.StoragePath(fileName, null));
-            var currentVersionDir = DocManagerHelper.VersionDir(histDir, DocManagerHelper.GetFileVersion(histDir));
-            var verDir = DocManagerHelper.VersionDir(histDir, version);
-
-            if (!Directory.Exists(currentVersionDir)) Directory.CreateDirectory(currentVersionDir);
-
-            var ext = Path.GetExtension(fileName).ToLower();
-            File.Copy(DocManagerHelper.StoragePath(fileName, null), Path.Combine(currentVersionDir, "prev" + ext));
-
-            File.WriteAllText(Path.Combine(currentVersionDir, "key.txt"), key);
-
-            var changesPath = Path.Combine(DocManagerHelper.VersionDir(histDir, version - 1), "changes.json");
-            if (File.Exists(changesPath))
-            {
-                File.Copy(changesPath, Path.Combine(currentVersionDir, "changes.json"));
-            }
-
-            File.Copy(Path.Combine(verDir, "prev" + ext), DocManagerHelper.StoragePath(fileName, null), true);
-
-            var fileInfo = new FileInfo(DocManagerHelper.StoragePath(fileName, null));
-            fileInfo.LastWriteTimeUtc = DateTime.UtcNow;
-
-            var history = GetHistory(fileName);
-
-            context.Response.Write(jss.Serialize(history));
-        }
-
         // download a history file
         private static void DownloadHistory(HttpContext context)
         {
@@ -840,7 +663,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>()
@@ -853,8 +675,7 @@ namespace OnlineEditorsExampleMVC
                     { "instanceId", DocManagerHelper.GetServerUrl(false) }
                 }
             },
-            { "path", fileName },
-            { "link", DocManagerHelper.GetServerUrl(false) + "Editor?fileName=" + fileName }
+            { "path", fileName }
             };
 
             if (JwtManager.Enabled)
@@ -866,70 +687,6 @@ namespace OnlineEditorsExampleMVC
             context.Response.Write(jss.Serialize(data));
         }
 
-        // get the document history
-        private static Dictionary<string, object> GetHistory(string fileName)
-        {
-            var jss = new JavaScriptSerializer();
-            var histDir = DocManagerHelper.HistoryDir(DocManagerHelper.StoragePath(fileName, null));
-
-            var history = new Dictionary<string, object>();
-
-            var currentVersion = DocManagerHelper.GetFileVersion(histDir);
-            var currentKey = ServiceConverter.GenerateRevisionId(DocManagerHelper.CurUserHostAddress()
-                + "/" + fileName + "/"
-                + File.GetLastWriteTime(DocManagerHelper.StoragePath(fileName, null)).GetHashCode());
-
-            var versionList = new List<Dictionary<string, object>>();
-            for (var versionNum = 1; versionNum <= currentVersion; versionNum++)
-            {
-                var versionObj = new Dictionary<string, object>();
-                var verDir = DocManagerHelper.VersionDir(histDir, versionNum);  // get the path to the given file version
-
-                var key = versionNum == currentVersion ? currentKey : File.ReadAllText(Path.Combine(verDir, "key.txt"));  // get document key
-
-                versionObj.Add("key", key);
-                versionObj.Add("version", versionNum);
-
-                var changesPath = Path.Combine(DocManagerHelper.VersionDir(histDir, versionNum - 1), "changes.json");
-                if (versionNum == 1 || !File.Exists(changesPath))  // check if the version number is equal to 1
-                {
-                    var infoPath = Path.Combine(histDir, "createdInfo.json");  // get meta data of this file
-                    if (File.Exists(infoPath))
-                    {
-                        var info = jss.Deserialize<Dictionary<string, object>>(File.ReadAllText(infoPath));
-                        versionObj.Add("created", info["created"]);  // write meta information to the object (user information and creation date)
-                        versionObj.Add("user", new Dictionary<string, object>()
-                        {
-                            { "id", info["id"] },
-                            { "name", info["name"] },
-                        });
-                    }
-                }
-                else if (versionNum > 1)  // check if the version number is greater than 1 (the file was modified)
-                {
-                    // get the path to the changes.json file 
-                    var changes = jss.Deserialize<Dictionary<string, object>>(File.ReadAllText(changesPath));
-                    var changesArray = (ArrayList)changes["changes"];
-                    var change = changesArray.Count > 0
-                        ? (Dictionary<string, object>)changesArray[0]
-                        : new Dictionary<string, object>();
-
-                    // write information about changes to the object
-                    versionObj.Add("changes", change.Count > 0 ? changes["changes"] : null);
-                    versionObj.Add("serverVersion", changes["serverVersion"]);
-                    versionObj.Add("created", change.Count > 0 ? change["created"] : null);
-                    versionObj.Add("user", change.Count > 0 ? change["user"] : null);
-                }
-
-                versionList.Add(versionObj);
-            }
-
-            history.Add("currentVersion", currentVersion);
-            history.Add("history", versionList);
-
-            return history;
-        }
-
     }
  
 }

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

@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <appSettings>
   <clear />
-  <add key="version" value="1.7.0"/>
+  <add key="version" value="1.6.0"/>
 
   <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"/>

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>

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>

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>

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>

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>

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

@@ -538,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
 
@@ -638,12 +633,5 @@ namespace OnlineEditorsExample
             string isEnabledDirectUrl = HttpUtility.ParseQueryString(HttpContext.Current.Request.Url.Query).Get("directUrl");
             return "&directUrl=" + (isEnabledDirectUrl != null ? isEnabledDirectUrl : "false");
         }
-
-        // get direct url flag
-        public static bool IsEnabledDirectUrl()
-        {
-            string isEnabledDirectUrl = HttpUtility.ParseQueryString(HttpContext.Current.Request.Url.Query).Get("directUrl");
-            return isEnabledDirectUrl != null ? Convert.ToBoolean(isEnabledDirectUrl) : false;
-        }
     }
 }

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,54 +216,25 @@
             'onMakeActionLink': onMakeActionLink,
             'onMetaChange': onMetaChange,
             'onRequestInsertImage': onRequestInsertImage,
-            'onRequestSelectDocument': onRequestSelectDocument,
-            "onRequestSelectSpreadsheet": onRequestSelectSpreadsheet,
+            'onRequestCompareFile': onRequestCompareFile,
+            "onRequestMailMergeRecipients": onRequestMailMergeRecipients,
         };
 
         if (config.editorConfig.user.id) {
-
-            config.events['onRequestHistory'] = function (event) {  // the user is trying to show the document version history
-
-                let xhr = new XMLHttpRequest();
-                xhr.open("GET", "webeditor.ashx?type=gethistory&filename=<%= FileName %>");
-                xhr.setRequestHeader("Content-Type", "application/json");
-                xhr.send();
-                xhr.onload = function () {
-                    console.log(xhr.responseText);
-                    docEditor.refreshHistory(JSON.parse(xhr.responseText));
-                }
-            };
-            config.events['onRequestHistoryData'] = function (event) {  // the user is trying to click the specific document version in the document version history
-                var ver = event.data;
-
-                let xhr = new XMLHttpRequest();
-                xhr.open("GET", "webeditor.ashx?type=getversiondata&filename=<%= FileName %>&version=" + ver + "&directUrl=" + !!config.document.directUrl);
-                xhr.setRequestHeader("Content-Type", "application/json");
-                xhr.send();
-                xhr.onload = function () {
-                    console.log(xhr.responseText);
-                    docEditor.setHistoryData(JSON.parse(xhr.responseText));  // send the link to the document for viewing the version history
-                }
-            };
-            config.events['onRequestHistoryClose'] = function () {  // the user is trying to go back to the document from viewing the document version history
-                document.location.reload();
-            };
-            config.events['onRequestRestore'] = function (event) {
-                var fileName = "<%= FileName %>";
-                var version = event.data.version;
-                var data = {
-                    fileName: fileName,
-                    version: version
+            <% if (!string.IsNullOrEmpty(History) && !string.IsNullOrEmpty(HistoryData))
+            { %>
+                config.events['onRequestHistory'] = function () {  // the user is trying to show the document version history
+                    docEditor.refreshHistory(<%= History %>);  // show the document version history
                 };
-
-                let xhr = new XMLHttpRequest();
-                xhr.open("POST", "webeditor.ashx?type=restore&directUrl=" + !!config.document.directUrl);
-                xhr.setRequestHeader('Content-Type', 'application/json');
-                xhr.send(JSON.stringify(data));
-                xhr.onload = function () {
-                    docEditor.refreshHistory(JSON.parse(xhr.responseText));
-                }
-            };
+                config.events['onRequestHistoryData'] = function (event) {  // the user is trying to click the specific document version in the document version history
+                    var ver = event.data;
+                    var histData = <%= HistoryData %>;
+                    docEditor.setHistoryData(histData[ver - 1]);  // send the link to the document for viewing the version history
+                };
+                config.events['onRequestHistoryClose'] = function () {  // the user is trying to go back to the document from viewing the document version history
+                    document.location.reload();
+                };
+            <% } %>
 
             // add mentions for not anonymous users
             <% if (!string.IsNullOrEmpty(UsersForMentions))
@@ -316,7 +257,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) {

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

@@ -17,6 +17,7 @@
  */
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Web;
@@ -60,9 +61,11 @@ namespace OnlineEditorsExample
         }
 
         protected string DocConfig { get; private set; }
+        protected string History { get; private set; }
+        protected string HistoryData { 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 DocumentType { get { return _Default.DocumentType(FileName); } }
 
@@ -192,7 +195,7 @@ namespace OnlineEditorsExample
                             {
                                 { "title", FileName },
                                 { "url", getDownloadUrl(FileName) },
-                                { "directUrl", _Default.IsEnabledDirectUrl() ? directUrl : "" },
+                                { "directUrl", IsEnabledDirectUrl() ? directUrl : "" },
                                 { "fileType", ext.Trim('.') },
                                 { "key", Key },
                                 {
@@ -308,19 +311,143 @@ 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;
+
+                Dictionary<string, object> hist;
+                Dictionary<string, object> histData;
+  
+                // get the document history
+                GetHistory(out hist, out histData);
+                if (hist != null && histData != null)
+                {
+                    History = jss.Serialize(hist);
+                    HistoryData = jss.Serialize(histData);
+                }
             }
             catch { }
         }
 
+        // get the document history
+        private void GetHistory(out Dictionary<string, object> history, out Dictionary<string, object> historyData)
+        {
+            var storagePath = WebConfigurationManager.AppSettings["storage-path"];
+            var jss = new JavaScriptSerializer();
+            var histDir = _Default.HistoryDir(_Default.StoragePath(FileName, null));
+
+            history = null;
+            historyData = null;
+
+            if (_Default.GetFileVersion(histDir) > 0)  // if the file was modified (the file version is greater than 0)
+            {
+                var currentVersion = _Default.GetFileVersion(histDir);
+                var hist = new List<Dictionary<string, object>>();
+                var histData = new Dictionary<string, object>();
+
+                for (var i = 1; i <= currentVersion; i++)  // run through all the file versions
+                {
+                    var obj = new Dictionary<string, object>();
+                    var dataObj = new Dictionary<string, object>();
+                    var verDir = _Default.VersionDir(histDir, i);  // get the path to the given file version
+
+                    var key = i == currentVersion ? Key : File.ReadAllText(Path.Combine(verDir, "key.txt"));  // get document key
+
+                    obj.Add("key", key);
+                    obj.Add("version", i);
+
+                    if (i == 1)  // check if the version number is equal to 1
+                    {
+                        var infoPath = Path.Combine(histDir, "createdInfo.json");  // get meta data of this file
+
+                        if (File.Exists(infoPath)) {
+                            var info = jss.Deserialize<Dictionary<string, object>>(File.ReadAllText(infoPath));
+                            obj.Add("created", info["created"]);  // write meta information to the object (user information and creation date)
+                            obj.Add("user", new Dictionary<string, object>() {
+                                { "id", info["id"] },
+                                { "name", info["name"] },
+                            });
+                        }
+                    }
+
+                    var ext = Path.GetExtension(FileName).ToLower();
+                    dataObj.Add("fileType", ext.Replace(".", ""));
+                    dataObj.Add("key", key);
+                    // write file url to the data object
+                    var directPrevFileUrl = i == currentVersion ? _Default.FileUri(FileName, false) : MakePublicHistoryUrl(FileName, i.ToString(), "prev" + ext, false);
+                    var prevFileUrl = i == currentVersion ? FileUri : MakePublicHistoryUrl(FileName, i.ToString(), "prev" + ext);
+                    if (Path.IsPathRooted(storagePath))
+                    {
+                        prevFileUrl = i == currentVersion ? getDownloadUrl(FileName) : getDownloadUrl(Directory.GetFiles(verDir, "prev.*")[0].Replace(storagePath + "\\", ""));
+                        directPrevFileUrl = i == currentVersion ? getDownloadUrl(FileName, false) : getDownloadUrl(Directory.GetFiles(verDir, "prev.*")[0].Replace(storagePath + "\\", ""), false);
+                    }
+
+                    dataObj.Add("url", prevFileUrl);  // write file url to the data object
+
+                    if (IsEnabledDirectUrl())
+                    {
+                        dataObj.Add("directUrl", directPrevFileUrl); // write direct url to the data object
+                    } 
+
+                    dataObj.Add("version", i);
+                    if (i > 1)  // check if the version number is greater than 1 (the file was modified)
+                    {
+                        // get the path to the changes.json file 
+                        var changes = jss.Deserialize<Dictionary<string, object>>(File.ReadAllText(Path.Combine(_Default.VersionDir(histDir, i - 1), "changes.json")));
+                        var changesArray = (ArrayList)changes["changes"];
+                        var change = changesArray.Count > 0
+                            ? (Dictionary<string, object>)changesArray[0]
+                            : new Dictionary<string, object>();
+
+                        // write information about changes to the object
+                        obj.Add("changes", change.Count > 0 ? changes["changes"] : null);
+                        obj.Add("serverVersion", changes["serverVersion"]);
+                        obj.Add("created", change.Count > 0 ? change["created"] : null);
+                        obj.Add("user", change.Count > 0 ? change["user"] : null);
+
+                        var prev = (Dictionary<string, object>)histData[(i - 2).ToString()];  // get the history data from the previous file version
+
+                        Dictionary<string, object> dataPrev = new Dictionary<string, object>() {  // write information about previous file version to the data object
+                            { "fileType", prev["fileType"] },
+                            { "key", prev["key"] },  // write key and url information about previous file version
+                            { "url", prev["url"] }
+                        };
+
+                        if (IsEnabledDirectUrl())
+                        {
+                            dataPrev.Add("directUrl", prev["directUrl"]);
+                        }
+
+                        dataObj.Add("previous", dataPrev);
+                        // write the path to the diff.zip archive with differences in this file version
+                        var changesUrl = MakePublicHistoryUrl(FileName, (i - 1).ToString(), "diff.zip");
+                        dataObj.Add("changesUrl", changesUrl);
+                    }
+                    if (JwtManager.Enabled)
+                    {
+                        var token = JwtManager.Encode(dataObj);
+                        dataObj.Add("token", token);
+                    }
+                    hist.Add(obj);  // add object dictionary to the hist list
+                    histData.Add((i - 1).ToString(), dataObj);  // write data object information to the history data
+                }
+
+                // write history information about the current file version to the history object
+                history = new Dictionary<string, object>()
+                {
+                    { "currentVersion", currentVersion },
+                    { "history", hist }
+                };
+                historyData = histData;
+            }
+        }
+
         // get a logo config
         private Dictionary<string, object> GetLogoConfig()
         {
@@ -342,7 +469,7 @@ namespace OnlineEditorsExample
                     { "url", InsertImageUrl.ToString()}
                 };
 
-            if (_Default.IsEnabledDirectUrl())
+            if (IsEnabledDirectUrl())
             {
                 logoConfig.Add("directUrl", DirectImageUrl.ToString());
             }
@@ -379,7 +506,7 @@ namespace OnlineEditorsExample
                     { "url", compareFileUrl.ToString() }
                 };
 
-            if (_Default.IsEnabledDirectUrl())
+            if (IsEnabledDirectUrl())
             {
                 dataCompareFile.Add("directUrl", DirectFileUrl.ToString());
             }
@@ -393,43 +520,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())
+            if (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
@@ -462,6 +589,21 @@ namespace OnlineEditorsExample
             return _Default.GetServerUrl(true) + fullPath.Substring(root.Length).Replace(Path.DirectorySeparatorChar, '/');
         }
 
+
+        // create the public history url
+        private string MakePublicHistoryUrl(string filename, string version, string file, Boolean isServer = true)
+        {
+            var userAddress = isServer ? "&userAddress=" + HttpUtility.UrlEncode(_Default.CurUserHostAddress(HttpContext.Current.Request.UserHostAddress)) : "";
+            var fileUrl = new UriBuilder(_Default.GetServerUrl(isServer));
+            fileUrl.Path = HttpRuntime.AppDomainAppVirtualPath
+                + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
+                + "webeditor.ashx";
+            fileUrl.Query = "type=downloadhistory&fileName=" + HttpUtility.UrlEncode(filename)
+                + "&ver=" + version + "&file=" + file
+                + userAddress;
+            return fileUrl.ToString();
+        }
+
         // create demo document
         private static void Try(string type, string sample, HttpRequest request)
         {
@@ -510,5 +652,12 @@ namespace OnlineEditorsExample
                 { "name", uname }
             }));
         }
+
+        // get direct url flag
+        private static bool IsEnabledDirectUrl()
+        {
+            string isEnabledDirectUrl = HttpUtility.ParseQueryString(HttpContext.Current.Request.Url.Query).Get("directUrl");
+            return isEnabledDirectUrl != null ? Convert.ToBoolean(isEnabledDirectUrl) : false;
+        }
     }
 }

web/documentserver-example/csharp/OnlineEditorsExample.csproj

@@ -148,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" />

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

@@ -26,9 +26,7 @@ using System.Diagnostics;
 using System.Web.Configuration;
 using System.Linq;
 using System.Net;
-using System.Collections;
 using System.Net.Sockets;
-using ASC.Api.DocumentConverter;
 
 namespace OnlineEditorsExample
 {
@@ -50,15 +48,6 @@ namespace OnlineEditorsExample
                 case "downloadhistory":
                     DownloadHistory(context);
                     break;
-                case "gethistory":
-                    GetHistory(context);
-                    break;
-                case "getversiondata":
-                    GetVersionData(context);
-                    break;
-                case "restore":
-                    Restore(context);
-                    break;
                 case "convert":
                     Convert(context);
                     break;
@@ -344,164 +333,6 @@ namespace OnlineEditorsExample
             get { return false; }
         }
 
-        private static void GetHistory(HttpContext context)
-        {
-            var jss = new JavaScriptSerializer();
-            var fileName = context.Request["filename"];
-
-            var history = GetHistory(fileName);
-
-            context.Response.Write(jss.Serialize(history));
-        }
-
-        private static void GetVersionData(HttpContext context)
-        {
-            var storagePath = WebConfigurationManager.AppSettings["storage-path"];
-            var jss = new JavaScriptSerializer();
-
-            var fileName = context.Request["filename"];
-            int version;
-
-            if (!int.TryParse(context.Request["version"], out version))
-            {
-                context.Response.Write("{ \"error\": \"Version number invalid!\"}");
-                return;
-            }
-
-            var versionData = new Dictionary<string, object>();
-
-            var histDir = _Default.HistoryDir(_Default.StoragePath(fileName, null));
-            var lastVersion = _Default.GetFileVersion(histDir);
-
-            var verDir = _Default.VersionDir(histDir, version);
-
-            var lastVersionUri = _Default.FileUri(fileName, true);
-            var key = version == lastVersion
-                ? ServiceConverter.GenerateRevisionId(_Default.CurUserHostAddress(null)
-                                                           + "/" + Path.GetFileName(lastVersionUri)
-                                                           + "/" + File.GetLastWriteTime(_Default.StoragePath(fileName, null)).GetHashCode())
-                : File.ReadAllText(Path.Combine(verDir, "key.txt"));
-
-
-            var ext = Path.GetExtension(fileName).ToLower();
-            versionData.Add("fileType", ext.Replace(".", ""));
-            versionData.Add("key", key);
-
-            var directPrevFileUrl = version == lastVersion ? _Default.FileUri(fileName, false) : MakePublicHistoryUrl(fileName, version.ToString(), "prev" + ext, false);
-            var prevFileUrl = version == lastVersion ? lastVersionUri : MakePublicHistoryUrl(fileName, version.ToString(), "prev" + ext);
-            if (Path.IsPathRooted(storagePath))
-            {
-                prevFileUrl = version == lastVersion ? DocEditor.getDownloadUrl(fileName) : DocEditor.getDownloadUrl(Directory.GetFiles(verDir, "prev.*")[0].Replace(storagePath + "\\", ""));
-                directPrevFileUrl = version == lastVersion ? DocEditor.getDownloadUrl(fileName, false) : DocEditor.getDownloadUrl(Directory.GetFiles(verDir, "prev.*")[0].Replace(storagePath + "\\", ""), false);
-            }
-
-            versionData.Add("url", prevFileUrl);
-
-            if (_Default.IsEnabledDirectUrl())
-            {
-                versionData.Add("directUrl", directPrevFileUrl); // write direct url to the data object
-            }
-
-            versionData.Add("version", version);
-            if (version > 1)
-            {
-                var prevVerDir = _Default.VersionDir(histDir, version - 1);
-
-                var prevUrl = MakePublicHistoryUrl(fileName, (version - 1).ToString(), "prev" + ext);
-                if (Path.IsPathRooted(storagePath))
-                    prevUrl = DocEditor.getDownloadUrl(Directory.GetFiles(prevVerDir, "prev.*")[0].Replace(storagePath + "\\", ""));
-
-                var prevKey = File.ReadAllText(Path.Combine(prevVerDir, "key.txt"));
-
-                Dictionary<string, object> dataPrev = new Dictionary<string, object>() {  // write information about previous file version to the data object
-                    { "fileType", ext.Replace(".", "") },
-                    { "key", prevKey },  // write key and url information about previous file version
-                    { "url", prevUrl }
-                };
-
-                string directPrevUrl;
-                if (_Default.IsEnabledDirectUrl())
-                {
-                    directPrevUrl = Path.IsPathRooted(storagePath)
-                        ? DocEditor.getDownloadUrl(Directory.GetFiles(prevVerDir, "prev.*")[0].Replace(storagePath + "\\", ""), false)
-                        : MakePublicHistoryUrl(fileName, (version - 1).ToString(), "prev" + ext, false);
-
-                    dataPrev.Add("directUrl", directPrevUrl); // write direct url to the data object
-                }
-
-                versionData.Add("previous", dataPrev);
-
-                if (File.Exists(Path.Combine(prevVerDir, "diff.zip")))
-                {
-                    var changesUrl = MakePublicHistoryUrl(fileName, (version - 1).ToString(), "diff.zip");
-                    versionData.Add("changesUrl", changesUrl);
-                }
-            }
-
-            if (JwtManager.Enabled)
-            {
-                var token = JwtManager.Encode(versionData);
-                versionData.Add("token", token);
-            }
-
-            context.Response.Write(jss.Serialize(versionData));
-        }
-
-        private void Restore(HttpContext context)
-        {
-            string fileData;
-            try
-            {
-                using (var receiveStream = context.Request.InputStream)
-                using (var readStream = new StreamReader(receiveStream))
-                {
-                    fileData = readStream.ReadToEnd();
-                    if (string.IsNullOrEmpty(fileData)) return;
-                }
-            }
-            catch (Exception e)
-            {
-                throw new HttpException((int)HttpStatusCode.BadRequest, e.Message);
-            }
-
-            var jss = new JavaScriptSerializer();
-            var body = jss.Deserialize<Dictionary<string, object>>(fileData);
-
-            var fileName = (string)body["fileName"];
-            var version = (int)body["version"];
-
-            var lastVersionUri = _Default.FileUri(fileName, true);
-            var key = ServiceConverter.GenerateRevisionId(_Default.CurUserHostAddress(null)
-                + "/" + Path.GetFileName(lastVersionUri)
-                + "/" + File.GetLastWriteTime(_Default.StoragePath(fileName, null)).GetHashCode());
-
-            var histDir = _Default.HistoryDir(_Default.StoragePath(fileName, null));
-            var currentVersionDir = _Default.VersionDir(histDir, _Default.GetFileVersion(histDir));
-            var verDir = _Default.VersionDir(histDir, version);
-
-            if (!Directory.Exists(currentVersionDir)) Directory.CreateDirectory(currentVersionDir);
-
-            var ext = Path.GetExtension(fileName).ToLower();
-            File.Copy(_Default.StoragePath(fileName, null), Path.Combine(currentVersionDir, "prev" + ext));
-
-            File.WriteAllText(Path.Combine(currentVersionDir, "key.txt"), key);
-
-            var changesPath = Path.Combine(_Default.VersionDir(histDir, version - 1), "changes.json");
-            if (File.Exists(changesPath))
-            {
-                File.Copy(changesPath, Path.Combine(currentVersionDir, "changes.json"));
-            }
-
-            File.Copy(Path.Combine(verDir, "prev" + ext), _Default.StoragePath(fileName, null), true);
-
-            var fileInfo = new FileInfo(_Default.StoragePath(fileName, null));
-            fileInfo.LastWriteTimeUtc = DateTime.UtcNow;
-
-            var history = GetHistory(fileName);
-
-            context.Response.Write(jss.Serialize(history));
-        }
-
         private static void DownloadHistory(HttpContext context)
         {
             try
@@ -650,9 +481,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>()
@@ -665,8 +493,7 @@ namespace OnlineEditorsExample
                     {"instanceId", _Default.GetServerUrl(false) }
                 }
             },
-            { "path", fileName },
-            { "link", _Default.GetServerUrl(false) + "doceditor.aspx?fileID=" + fileName }
+            { "path", fileName }
             };
 
             if (JwtManager.Enabled)
@@ -677,84 +504,5 @@ namespace OnlineEditorsExample
 
             context.Response.Write(jss.Serialize(data));
         }
-
-        // get the document history
-        private static Dictionary<string, object> GetHistory(string fileName)
-        {
-            var jss = new JavaScriptSerializer();
-            var histDir = _Default.HistoryDir(_Default.StoragePath(fileName, null));
-
-            var history = new Dictionary<string, object>();
-
-            var currentVersion = _Default.GetFileVersion(histDir);
-            var currentFileUri = _Default.FileUri(fileName, true);
-            var currentKey = ServiceConverter.GenerateRevisionId(_Default.CurUserHostAddress(null)
-                                                           + "/" + Path.GetFileName(currentFileUri)
-                                                           + "/" + File.GetLastWriteTime(_Default.StoragePath(fileName, null)).GetHashCode());
-
-            var versionList = new List<Dictionary<string, object>>();
-            for (var versionNum = 1; versionNum <= currentVersion; versionNum++)
-            {
-                var versionObj = new Dictionary<string, object>();
-                var verDir = _Default.VersionDir(histDir, versionNum);  // get the path to the given file version
-
-                var key = versionNum == currentVersion ? currentKey : File.ReadAllText(Path.Combine(verDir, "key.txt"));  // get document key
-
-                versionObj.Add("key", key);
-                versionObj.Add("version", versionNum);
-
-                var changesPath = Path.Combine(_Default.VersionDir(histDir, versionNum - 1), "changes.json");
-                if (versionNum == 1 || !File.Exists(changesPath))  // check if the version number is equal to 1
-                {
-                    var infoPath = Path.Combine(histDir, "createdInfo.json");  // get meta data of this file
-                    if (File.Exists(infoPath))
-                    {
-                        var info = jss.Deserialize<Dictionary<string, object>>(File.ReadAllText(infoPath));
-                        versionObj.Add("created", info["created"]);  // write meta information to the object (user information and creation date)
-                        versionObj.Add("user", new Dictionary<string, object>()
-                        {
-                            { "id", info["id"] },
-                            { "name", info["name"] },
-                        });
-                    }
-                }
-                else if (versionNum > 1)  // check if the version number is greater than 1 (the file was modified)
-                {
-                    // get the path to the changes.json file
-                    var changes = jss.Deserialize<Dictionary<string, object>>(File.ReadAllText(changesPath));
-                    var changesArray = (ArrayList)changes["changes"];
-                    var change = changesArray.Count > 0
-                        ? (Dictionary<string, object>)changesArray[0]
-                        : new Dictionary<string, object>();
-
-                    // write information about changes to the object
-                    versionObj.Add("changes", change.Count > 0 ? changes["changes"] : null);
-                    versionObj.Add("serverVersion", changes["serverVersion"]);
-                    versionObj.Add("created", change.Count > 0 ? change["created"] : null);
-                    versionObj.Add("user", change.Count > 0 ? change["user"] : null);
-                }
-
-                versionList.Add(versionObj);
-            }
-
-            history.Add("currentVersion", currentVersion);
-            history.Add("history", versionList);
-
-            return history;
-        }
-
-        // create the public history url
-        private static string MakePublicHistoryUrl(string filename, string version, string file, Boolean isServer = true)
-        {
-            var userAddress = isServer ? "&userAddress=" + HttpUtility.UrlEncode(_Default.CurUserHostAddress(HttpContext.Current.Request.UserHostAddress)) : "";
-            var fileUrl = new UriBuilder(_Default.GetServerUrl(isServer));
-            fileUrl.Path = HttpRuntime.AppDomainAppVirtualPath
-                + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
-                + "webeditor.ashx";
-            fileUrl.Query = "type=downloadhistory&fileName=" + HttpUtility.UrlEncode(filename)
-                + "&ver=" + version + "&file=" + file
-                + userAddress;
-            return fileUrl.ToString();
-        }
     }
 }

web/documentserver-example/csharp/settings.config

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <appSettings>
   <clear />
-  <add key="version" value="1.7.0"/>
+  <add key="version" value="1.6.0"/>
 
   <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"/>

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:

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/EditorController.java

@@ -20,6 +20,7 @@ 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;
@@ -72,6 +73,9 @@ public class EditorController {
     @Autowired
     private UserServices userService;
 
+    @Autowired
+    private HistoryManager historyManager;
+
     @Autowired
     private ObjectMapper objectMapper;
 
@@ -136,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);
 
@@ -143,10 +150,10 @@ 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));
@@ -193,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);
     }
 }

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;
@@ -41,8 +35,6 @@ import com.onlyoffice.integration.documentserver.util.file.FileUtility;
 import com.onlyoffice.integration.documentserver.util.service.ServiceConverter;
 import com.onlyoffice.integration.documentserver.managers.document.DocumentManager;
 import com.onlyoffice.integration.documentserver.managers.callback.CallbackManager;
-
-import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,7 +49,6 @@ import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -65,21 +56,16 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.InetAddress;
 import java.net.URL;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
-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;
 
@@ -119,8 +105,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) {
@@ -191,8 +175,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) {
@@ -372,13 +355,13 @@ public class FileController {
     @GetMapping("/assets")
     public ResponseEntity<Resource> assets(@RequestParam("name")
                                                final String name) {  // get sample files from the assests
-        String fileName = Path.of("assets", "document-templates", "sample", fileUtility.getFileName(name)).toString();
+        String fileName = Path.of("assets", "sample", fileUtility.getFileName(name)).toString();
         return downloadFile(fileName);
     }
 
     @GetMapping("/csv")
     public ResponseEntity<Resource> csv() {  // download a csv file
-        String fileName = Path.of("assets", "document-templates", "sample", "csv.csv").toString();
+        String fileName = Path.of("assets", "sample", "csv.csv").toString();
         return downloadFile(fileName);
     }
 
@@ -420,16 +403,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();
 
@@ -448,14 +434,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();
@@ -465,7 +462,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();
@@ -473,11 +470,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");
@@ -488,7 +486,7 @@ public class FileController {
 
             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()) {
@@ -503,6 +501,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());
@@ -512,17 +512,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);
@@ -534,101 +528,4 @@ public class FileController {
             return "{ \"error\" : 1, \"message\" : \"" + e.getMessage() + "\"}";
         }
     }
-
-    @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) {
-        try {
-            String sourceStringFile = storagePathBuilder.getFileLocation(body.getFileName());
-            File sourceFile = new File(sourceStringFile);
-            Path sourcePathFile = sourceFile.toPath();
-            String historyDirectory = storagePathBuilder.getHistoryDir(sourcePathFile.toString());
-
-            Integer bumpedVersion = storagePathBuilder.getFileVersion(historyDirectory, false);
-            String bumpedVersionStringDirectory = documentManager.versionDir(historyDirectory, bumpedVersion, true);
-            File bumpedVersionDirectory = new File(bumpedVersionStringDirectory);
-            if (!bumpedVersionDirectory.exists()) {
-                bumpedVersionDirectory.mkdir();
-            }
-
-            Path bumpedKeyPathFile = Paths.get(bumpedVersionStringDirectory, "key.txt");
-            String bumpedKeyStringFile = bumpedKeyPathFile.toString();
-            File bumpedKeyFile = new File(bumpedKeyStringFile);
-            String bumpedKey = serviceConverter.generateRevisionId(
-                storagePathBuilder.getStorageLocation()
-                + "/"
-                + body.getFileName()
-                + "/"
-                + Long.toString(sourceFile.lastModified())
-            );
-            FileWriter bumpedKeyFileWriter = new FileWriter(bumpedKeyFile);
-            bumpedKeyFileWriter.write(bumpedKey);
-            bumpedKeyFileWriter.close();
-
-            User user = userService.findUserById(uid).get();
-
-            Path bumpedChangesPathFile = Paths.get(bumpedVersionStringDirectory, "changes.json");
-            String bumpedChangesStringFile = bumpedChangesPathFile.toString();
-            File bumpedChangesFile = new File(bumpedChangesStringFile);
-            JSONObject bumpedChangesUser = new JSONObject();
-            // Don't add the `uid-` prefix.
-            // https://github.com/ONLYOFFICE/document-server-integration/issues/437#issuecomment-1663526562
-            bumpedChangesUser.put("id", user.getId());
-            bumpedChangesUser.put("name", user.getName());
-            JSONObject bumpedChangesChangesItem = new JSONObject();
-            bumpedChangesChangesItem.put("created", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-            bumpedChangesChangesItem.put("user", bumpedChangesUser);
-            JSONArray bumpedChangesChanges = new JSONArray();
-            bumpedChangesChanges.add(bumpedChangesChangesItem);
-            JSONObject bumpedChanges = new JSONObject();
-            bumpedChanges.put("serverVersion", null);
-            bumpedChanges.put("changes", bumpedChangesChanges);
-            String bumpedChangesContent = bumpedChanges.toJSONString();
-            FileWriter bumpedChangesFileWriter = new FileWriter(bumpedChangesFile);
-            bumpedChangesFileWriter.write(bumpedChangesContent);
-            bumpedChangesFileWriter.close();
-
-            String sourceExtension = fileUtility.getFileExtension(body.getFileName());
-            String previousBasename = "prev." + sourceExtension;
-
-            Path bumpedFile = Paths.get(bumpedVersionStringDirectory, previousBasename);
-            Files.move(sourcePathFile, bumpedFile);
-
-            String recoveryVersionStringDirectory = documentManager.versionDir(
-                    historyDirectory,
-                    body.getVersion(),
-                    true
-            );
-            Path recoveryPathFile = Paths.get(recoveryVersionStringDirectory, previousBasename);
-            String recoveryStringFile = recoveryPathFile.toString();
-            FileInputStream recoveryStream = new FileInputStream(recoveryStringFile);
-            storageMutator.createFile(sourcePathFile, recoveryStream);
-            recoveryStream.close();
-
-            JSONObject responseBody = new JSONObject();
-            responseBody.put("error", null);
-            responseBody.put("success", true);
-            return responseBody.toJSONString();
-        } catch (Exception error) {
-            error.printStackTrace();
-            JSONObject responseBody = new JSONObject();
-            responseBody.put("error", error.getMessage());
-            responseBody.put("success", false);
-            return responseBody.toJSONString();
-        }
-    }
 }

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();

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/document/DefaultDocumentManager.java

@@ -69,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;
@@ -79,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));
         }
 
@@ -217,14 +217,8 @@ public class DefaultDocumentManager implements DocumentManager {
     public String createDemo(final String fileExt, final Boolean sample, final String uid, final String uname) {
         String demoName = (sample ? "sample." : "new.")
                 + fileExt;  // create sample or new template file with the necessary extension
-        String demoPath =
-            "assets"
-            + File.separator
-            + "document-templates"
-            + File.separator
-            + (sample ? "sample" : "new")
-            + File.separator
-            + demoName;
+        String demoPath = "assets" + File.separator  + (sample ? "sample" : "new")
+                + File.separator + demoName;  // get the path to the sample document
 
         // get a file name with an index if the file with such a name already exists
         String fileName = getCorrectName(demoName);

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;
@@ -63,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
@@ -103,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);
@@ -168,153 +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
-                    // get the history data from the previous file version
-                    Map<String, Object> prev = (Map<String, Object>) histData.get(Integer.toString(i - 1));
-                    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);
-                    // write the path to the diff.zip archive with differences in this file version
-                    Integer verdiff = i - 1;
-                    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 = "";

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
 }

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;
-}

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;
     }
 

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());
-    }
-}

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);

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();
-}

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Reference.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.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;
-}

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;
-}

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;
-}

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;
-}

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;
-}

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
 

web/documentserver-example/java-spring/src/main/resources/application.properties

@@ -1,14 +1,17 @@
-server.version=1.7.0
+server.version=1.6.0
 
 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
 

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>

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>

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>

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>

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>

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;
     });

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");
         }
     };

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,104 +160,18 @@
                     }
                 };
 
-                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 payload = {
-                    fileName: query.get('fileName'),
-                    version: event.data.version
-                  }
-                  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);
-                    }
-                  }
-                }
-
                 config.width = "100%";
                 config.height = "100%";
                 config.events = {
@@ -274,17 +182,32 @@
                     "onMakeActionLink": onMakeActionLink,
                     "onMetaChange": onMetaChange,
                     "onRequestInsertImage": onRequestInsertImage,
-                    "onRequestSelectDocument": onRequestSelectDocument,
-                    "onRequestSelectSpreadsheet": onRequestSelectSpreadsheet,
-                    "onRequestRestore": onRequestRestore,
-                    "onRequestHistory": onRequestHistory,
-                    "onRequestHistoryData": onRequestHistoryData,
-                    "onRequestHistoryClose": onRequestHistoryClose
+                    "onRequestCompareFile": onRequestCompareFile,
+                    "onRequestMailMergeRecipients": onRequestMailMergeRecipients,
                 };
 
+                var histArray = [[${fileHistory}]];
+                var hist = histArray[0];
+                var historyData = histArray[1];
                 var usersForMentions = [[${usersForMentions}]];
 
                 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 () {
                         docEditor.setUsers({  // set a list of users to mention in the comments
@@ -302,7 +225,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) {

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

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
 

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

web/documentserver-example/java/licenses/lombok.license

@@ -1,104 +0,0 @@
-Copyright (C) 2009-2021 The Project Lombok Authors.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-==============================================================================
-Licenses for included components:
-
-org.ow2.asm:asm
-org.ow2.asm:asm-analysis
-org.ow2.asm:asm-commons
-org.ow2.asm:asm-tree
-org.ow2.asm:asm-util
-ASM: a very small and fast Java bytecode manipulation framework
- Copyright (c) 2000-2011 INRIA, France Telecom
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- 3. Neither the name of the copyright holders nor the names of its
-    contributors may be used to endorse or promote products derived from
-    this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- THE POSSIBILITY OF SUCH DAMAGE.
-
-------------------------------------------------------------------------------
-rzwitserloot/com.zwitserloot.cmdreader
-
- Copyright © 2010 Reinier Zwitserloot.
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
-
-------------------------------------------------------------------------------
-
-projectlombok/lombok.patcher
-
- Copyright (C) 2009-2021 The Project Lombok Authors.
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
-
-------------------------------------------------------------------------------

web/documentserver-example/java/pom.xml

@@ -36,12 +36,6 @@
             <artifactId>prime-jwt</artifactId>
             <version>1.3.1</version>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.28</version>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
     <build>

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

@@ -85,22 +85,22 @@ public class EditorServlet extends HttpServlet {
         }
 
         // a document that will be compared with the current document
-        Map<String, Object> dataDocument = new HashMap<>();
-        dataDocument.put("fileType", "docx");
-        dataDocument.put("url", DocumentManager.getServerUrl(true) + "/IndexServlet?type=assets&"
+        Map<String, Object> dataCompareFile = new HashMap<>();
+        dataCompareFile.put("fileType", "docx");
+        dataCompareFile.put("url", DocumentManager.getServerUrl(true) + "/IndexServlet?type=assets&"
                 + "name=sample.docx");
         if (isEnableDirectUrl) {
-            dataDocument.put("directUrl", DocumentManager.getServerUrl(false) + "/IndexServlet?"
+            dataCompareFile.put("directUrl", DocumentManager.getServerUrl(false) + "/IndexServlet?"
                     + "type=assets&name=sample.docx");
         }
 
         // recipients data for mail merging
-        Map<String, Object> dataSpreadsheet = new HashMap<>();
-        dataSpreadsheet.put("fileType", "csv");
-        dataSpreadsheet.put("url", DocumentManager.getServerUrl(true) + "/IndexServlet?"
+        Map<String, Object> dataMailMergeRecipients = new HashMap<>();
+        dataMailMergeRecipients.put("fileType", "csv");
+        dataMailMergeRecipients.put("url", DocumentManager.getServerUrl(true) + "/IndexServlet?"
                 + "type=csv");
         if (isEnableDirectUrl) {
-            dataSpreadsheet.put("directUrl", DocumentManager.getServerUrl(false)
+            dataMailMergeRecipients.put("directUrl", DocumentManager.getServerUrl(false)
                     + "/IndexServlet?type=csv");
         }
 
@@ -114,11 +114,11 @@ public class EditorServlet extends HttpServlet {
             // create token from the dataInsertImage object
             dataInsertImage.put("token", DocumentManager.createToken(dataInsertImage));
 
-            // create token from the dataDocument object
-            dataDocument.put("token", DocumentManager.createToken(dataDocument));
+            // create token from the dataCompareFile object
+            dataCompareFile.put("token", DocumentManager.createToken(dataCompareFile));
 
-            // create token from the dataSpreadsheet object
-            dataSpreadsheet.put("token", DocumentManager.createToken(dataSpreadsheet));
+            // create token from the dataMailMergeRecipients object
+            dataMailMergeRecipients.put("token", DocumentManager.createToken(dataMailMergeRecipients));
         }
 
         Gson gson = new Gson();
@@ -127,8 +127,8 @@ public class EditorServlet extends HttpServlet {
                 + ConfigManager.getProperty("files.docservice.url.api"));
         request.setAttribute("dataInsertImage",  gson.toJson(dataInsertImage)
                 .substring(1, gson.toJson(dataInsertImage).length() - 1));
-        request.setAttribute("dataDocument",  gson.toJson(dataDocument));
-        request.setAttribute("dataSpreadsheet", gson.toJson(dataSpreadsheet));
+        request.setAttribute("dataCompareFile",  gson.toJson(dataCompareFile));
+        request.setAttribute("dataMailMergeRecipients", gson.toJson(dataMailMergeRecipients));
         request.setAttribute("usersForMentions", !user.getId()
                 .equals("uid-0") ? gson.toJson(usersForMentions) : null);
         request.getRequestDispatcher("editor.jsp").forward(request, response);

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

@@ -48,7 +48,6 @@ import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
@@ -58,11 +57,8 @@ import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Scanner;
 
@@ -130,15 +126,6 @@ public class IndexServlet extends HttpServlet {
             case "reference":
                 reference(request, response, writer);
                 break;
-            case "restore":
-                restore(request, response, writer);
-                break;
-            case "history":
-                history(request, response, writer);
-                break;
-            case "historydata":
-                historyData(request, response, writer);
-                break;
             default:
                 break;
         }
@@ -464,7 +451,7 @@ public class IndexServlet extends HttpServlet {
     private static void csv(final HttpServletRequest request,
                             final HttpServletResponse response,
                             final PrintWriter writer) {
-        String fileName = "assets/document-templates/sample/csv.csv";
+        String fileName = "assets/sample/csv.csv";
         URL fileUrl = Thread.currentThread().getContextClassLoader().getResource(fileName);
         Path filePath = null;
         try {
@@ -479,7 +466,7 @@ public class IndexServlet extends HttpServlet {
     private static void assets(final HttpServletRequest request,
                                final HttpServletResponse response,
                                final PrintWriter writer) {
-        String fileName = "assets/document-templates/sample/" + FileUtility.getFileName(request.getParameter("name"));
+        String fileName = "assets/sample/" + FileUtility.getFileName(request.getParameter("name"));
         URL fileUrl = Thread.currentThread().getContextClassLoader().getResource(fileName);
         Path filePath = null;
         try {
@@ -635,7 +622,7 @@ public class IndexServlet extends HttpServlet {
             String newfilename = (String) body.get("newfilename");
             String dockey = (String) body.get("dockey");
 
-            String origExt = (String) body.get("ext");
+            String origExt = "." + (String) body.get("ext");
             String curExt = newfilename;
 
             if (newfilename.indexOf(".") != -1) {
@@ -643,7 +630,7 @@ public class IndexServlet extends HttpServlet {
             }
 
             if (origExt.compareTo(curExt) != 0) {
-                newfilename += "." + origExt;
+                newfilename += origExt;
             }
 
             HashMap<String, String> meta = new HashMap<>();
@@ -724,16 +711,11 @@ public class IndexServlet extends HttpServlet {
             referenceData.put("fileKey", gson.toJson(fileKey));
 
             HashMap<String, Object> data = new HashMap<>();
-            data.put("fileType", FileUtility.getFileExtension(fileName));
-            data.put("key", ServiceConverter.generateRevisionId(DocumentManager
-                .curUserHostAddress(null) + "/" + fileName + "/"
-                + Long.toString(new File(DocumentManager.storagePath(fileName, null))
-                .lastModified())));
+            data.put("fileType", FileUtility.getFileExtension(fileName).replace(".", ""));
             data.put("url", DocumentManager.getDownloadUrl(fileName, true));
             data.put("directUrl", directUrl ? DocumentManager.getDownloadUrl(fileName, false) : null);
             data.put("referenceData", referenceData);
             data.put("path", fileName);
-            data.put("link", DocumentManager.getServerUrl(false) + "/EditorServlet?fileName=" + fileName);
 
             if (DocumentManager.tokenEnabled()) {
                 String token = DocumentManager.createToken(data);
@@ -746,267 +728,6 @@ public class IndexServlet extends HttpServlet {
         }
     }
 
-    private static void restore(final HttpServletRequest request,
-                                final HttpServletResponse response,
-                                final PrintWriter writer) {
-        try {
-            Scanner scanner = new Scanner(request.getInputStream());
-            scanner.useDelimiter("\\A");
-            String bodyString = scanner.hasNext() ? scanner.next() : "";
-            scanner.close();
-
-            JSONParser parser = new JSONParser();
-            JSONObject body = (JSONObject) parser.parse(bodyString);
-
-            String sourceBasename = (String) body.get("fileName");
-            Integer version = ((Long) body.get("version")).intValue();
-            String userID = (String) body.get("userId");
-
-            String sourceStringFile = DocumentManager.storagePath(sourceBasename, null);
-            File sourceFile = new File(sourceStringFile);
-            Path sourcePathFile = sourceFile.toPath();
-            String historyDirectory = DocumentManager.historyDir(sourceStringFile);
-
-            Integer bumpedVersion = DocumentManager.getFileVersion(historyDirectory);
-            String bumpedVersionStringDirectory = DocumentManager.versionDir(historyDirectory, bumpedVersion);
-            File bumpedVersionDirectory = new File(bumpedVersionStringDirectory);
-            if (!bumpedVersionDirectory.exists()) {
-                bumpedVersionDirectory.mkdir();
-            }
-
-            Path bumpedKeyPathFile = Paths.get(bumpedVersionStringDirectory, "key.txt");
-            String bumpedKeyStringFile = bumpedKeyPathFile.toString();
-            File bumpedKeyFile = new File(bumpedKeyStringFile);
-            String bumpedKey = ServiceConverter.generateRevisionId(
-                DocumentManager.curUserHostAddress(null)
-                + "/"
-                + sourceBasename
-                + "/"
-                + Long.toString(sourceFile.lastModified())
-            );
-            FileWriter bumpedKeyFileWriter = new FileWriter(bumpedKeyFile);
-            bumpedKeyFileWriter.write(bumpedKey);
-            bumpedKeyFileWriter.close();
-
-            User user = Users.getUser(userID);
-
-            Path bumpedChangesPathFile = Paths.get(bumpedVersionStringDirectory, "changes.json");
-            String bumpedChangesStringFile = bumpedChangesPathFile.toString();
-            File bumpedChangesFile = new File(bumpedChangesStringFile);
-            JSONObject bumpedChangesUser = new JSONObject();
-            bumpedChangesUser.put("id", user.getId());
-            bumpedChangesUser.put("name", user.getName());
-            JSONObject bumpedChangesChangesItem = new JSONObject();
-            bumpedChangesChangesItem.put("created", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-            bumpedChangesChangesItem.put("user", bumpedChangesUser);
-            JSONArray bumpedChangesChanges = new JSONArray();
-            bumpedChangesChanges.add(bumpedChangesChangesItem);
-            JSONObject bumpedChanges = new JSONObject();
-            bumpedChanges.put("serverVersion", null);
-            bumpedChanges.put("changes", bumpedChangesChanges);
-            String bumpedChangesContent = bumpedChanges.toJSONString();
-            FileWriter bumpedChangesFileWriter = new FileWriter(bumpedChangesFile);
-            bumpedChangesFileWriter.write(bumpedChangesContent);
-            bumpedChangesFileWriter.close();
-
-            String sourceExtension = FileUtility.getFileExtension(sourceBasename);
-            String previousBasename = "prev." + sourceExtension;
-
-            Path bumpedFile = Paths.get(bumpedVersionStringDirectory, previousBasename);
-            Files.move(sourcePathFile, bumpedFile);
-
-            String recoveryVersionStringDirectory = DocumentManager.versionDir(historyDirectory, version);
-            Path recoveryPathFile = Paths.get(recoveryVersionStringDirectory, previousBasename);
-            String recoveryStringFile = recoveryPathFile.toString();
-            FileInputStream recoveryStream = new FileInputStream(recoveryStringFile);
-            DocumentManager.createFile(sourcePathFile, recoveryStream);
-            recoveryStream.close();
-
-            JSONObject responseBody = new JSONObject();
-            responseBody.put("error", null);
-            responseBody.put("success", true);
-            String responseContent = responseBody.toJSONString();
-            writer.write(responseContent);
-        } catch (Exception error) {
-            error.printStackTrace();
-            JSONObject responseBody = new JSONObject();
-            responseBody.put("error", error.getMessage());
-            responseBody.put("success", false);
-            String responseContent = responseBody.toJSONString();
-            writer.write(responseContent);
-        }
-    }
-
-    private static void history(final HttpServletRequest request,
-                                final HttpServletResponse response,
-                                final PrintWriter writer) {
-        String fileName = FileUtility.getFileName(request.getParameter("filename"));
-        String path = DocumentManager.storagePath(fileName, null);
-
-        JSONParser parser = new JSONParser();
-        response.setContentType("application/json");
-
-        // get history directory
-        String histDir = DocumentManager.historyDir(path);
-        if (DocumentManager.getFileVersion(histDir) > 0) {
-
-            // get current file version if it is greater than 0
-            Integer curVer = DocumentManager.getFileVersion(histDir);
-
-            List<Object> hist = new ArrayList<>();
-            Map<String, Object> histData = new HashMap<String, Object>();
-
-            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);  // get the path to the given file version
-
-                try {
-                    String key = null;
-
-                    // get document key
-                    if (i == curVer) {
-                        key = ServiceConverter.generateRevisionId(
-                                DocumentManager.curUserHostAddress(null) + "/" + fileName + "/"
-                                        + Long.toString(new File(DocumentManager.storagePath(fileName, null))
-                                        .lastModified()));
-                    } else {
-                        key = DocumentManager.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 = DocumentManager.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(
-                                DocumentManager.readFileToEnd(new File(DocumentManager
-                                .versionDir(histDir, i - 1) + File.separator + "changes.json")));
-                        JSONObject change = (JSONObject) ((JSONArray) changes.get("changes")).get(0);
-
-                        // write information about changes to the object
-                        obj.put("changes", !change.isEmpty() ? changes.get("changes") : null);
-                        obj.put("serverVersion", changes.get("serverVersion"));
-                        obj.put("created", !change.isEmpty() ? change.get("created") : null);
-                        obj.put("user", !change.isEmpty() ? change.get("user") : null);
-                    }
-
-                    hist.add(obj);
-                } catch (Exception ex) { }
-            }
-
-            // 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);
-
-            Gson gson = new Gson();
-            writer.write(gson.toJson(histObj));
-            return;
-        }
-        writer.write("{}");
-    }
-
-    private static void historyData(final HttpServletRequest request,
-                                final HttpServletResponse response,
-                                final PrintWriter writer) {
-        String fileName = FileUtility.getFileName(request.getParameter("filename"));
-        String version = request.getParameter("version");
-        String directUrl = request.getParameter("directUrl");
-        String path = DocumentManager.storagePath(fileName, null);
-
-        response.setContentType("application/json");
-        // get history directory
-        String histDir = DocumentManager.historyDir(path);
-        if (DocumentManager.getFileVersion(histDir) > 0) {
-            // get current file version if it is greater than 0
-            Integer curVer = DocumentManager.getFileVersion(histDir);
-
-            Map<String, Object> histData = new HashMap<String, Object>();
-            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);  // get the path to the given file version
-
-                try {
-                    String key = null;
-
-                    // get document key
-                    if (i == curVer) {
-                        key = ServiceConverter.generateRevisionId(
-                                DocumentManager.curUserHostAddress(null) + "/" + fileName + "/"
-                                        + Long.toString(new File(DocumentManager.storagePath(fileName, null))
-                                        .lastModified()));
-                    } else {
-                        key = DocumentManager.readFileToEnd(new File(verDir + File.separator + "key.txt"));
-                    }
-
-                    dataObj.put("fileType", FileUtility.getFileExtension(fileName));
-                    dataObj.put("key", key);
-                    dataObj.put("url", i == curVer
-                            ? DocumentManager.getDownloadUrl(fileName, true)
-                            : DocumentManager.getDownloadHistoryUrl(fileName, i, "prev." + FileUtility
-                                    .getFileExtension(fileName), true));
-                    if (directUrl.equals("true")) {
-                        dataObj.put("directUrl", i == curVer
-                                ? DocumentManager.getDownloadUrl(fileName, false)
-                                : DocumentManager.getDownloadHistoryUrl(fileName, i, "prev." + FileUtility
-                                        .getFileExtension(fileName), false));
-                    }
-
-                    dataObj.put("version", i);
-
-                    if (i > 1) {  //check if the version number is greater than 1
-
-                        // get the history data from the previous file version
-                        Map<String, Object> prev = (Map<String, Object>) histData.get(Integer.toString(i - 1));
-                        Map<String, Object> prevInfo = new HashMap<String, Object>();
-                        prevInfo.put("fileType", prev.get("fileType"));
-
-                        // write key and url information about previous file version
-                        prevInfo.put("key", prev.get("key"));
-                        prevInfo.put("url", prev.get("url"));
-                        if (directUrl.equals("true")) {
-                            prevInfo.put("directUrl", prev.get("directUrl"));
-                        }
-
-                        // write information about previous file version to the data object
-                        dataObj.put("previous", prevInfo);
-                        // write the path to the diff.zip archive with differences in this file version
-                        Integer verdiff = i - 1;
-                        String changesUrl = DocumentManager
-                                .getDownloadHistoryUrl(fileName, verdiff,
-                                        "diff.zip", true);
-                        dataObj.put("changesUrl", changesUrl);
-                    }
-
-                    if (DocumentManager.tokenEnabled()) {
-                        dataObj.put("token", DocumentManager.createToken(dataObj));
-                    }
-
-                    histData.put(Integer.toString(i), dataObj);
-
-                } catch (Exception ex) { }
-            }
-
-            Gson gson = new Gson();
-            writer.write(gson.toJson(histData.get(version)));
-            return;
-        }
-        writer.write("{}");
-    }
-
     // process get request
     @Override
     protected void doGet(final HttpServletRequest request,
@@ -1021,12 +742,6 @@ public class IndexServlet extends HttpServlet {
         processRequest(request, response);
     }
 
-    @Override
-    protected void doPut(final HttpServletRequest request,
-                          final HttpServletResponse response) throws ServletException, IOException {
-        processRequest(request, response);
-    }
-
     // get servlet information
     @Override
     public String getServletInfo() {

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

@@ -23,8 +23,12 @@ import com.google.gson.reflect.TypeToken;
 import helpers.DocumentManager;
 import helpers.FileUtility;
 import helpers.ServiceConverter;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -32,6 +36,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Scanner;
 
 public class FileModel {
     private String type = "desktop";
@@ -63,7 +68,7 @@ public class FileModel {
         document.setDirectUrl(isEnableDirectUrl ? DocumentManager.getDownloadUrl(fileName, false) : "");
 
         // get file extension from the file name
-        document.setFileType(FileUtility.getFileExtension(fileName));
+        document.setFileType(FileUtility.getFileExtension(fileName).replace(".", ""));
         // generate document key
         document.setKey(ServiceConverter
                 .generateRevisionId(DocumentManager
@@ -187,6 +192,128 @@ public class FileModel {
         token = DocumentManager.createToken(map);
     }
 
+    // get document history
+    public String[] getHistory() {
+        JSONParser parser = new JSONParser();
+
+        // get history directory
+        String histDir = DocumentManager.historyDir(DocumentManager.storagePath(document.getTitle(), null));
+        if (DocumentManager.getFileVersion(histDir) > 0) {
+
+            // get current file version if it is greater than 0
+            Integer curVer = DocumentManager.getFileVersion(histDir);
+
+            List<Object> hist = new ArrayList<>();
+            Map<String, Object> histData = new HashMap<String, Object>();
+
+            for (Integer i = 1; i <= curVer; i++) {  // run through all the file versions
+                Map<String, Object> obj = new HashMap<String, Object>();
+                Map<String, Object> dataObj = new HashMap<String, Object>();
+                String verDir = DocumentManager.versionDir(histDir, i);  // get the path to the given file version
+
+                try {
+                    String key = null;
+
+                    // get document key
+                    key = i == curVer
+                            ? document.getKey() : 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);
+                    }
+
+                    dataObj.put("fileType", FileUtility.getFileExtension(document.getTitle()).substring(1));
+                    dataObj.put("key", key);
+                    dataObj.put("url", i == curVer ? document.getUrl() : DocumentManager
+                            .getDownloadHistoryUrl(document.getTitle(), i, "prev" + FileUtility
+                                    .getFileExtension(document.getTitle()), true));
+                    if (!document.getDirectUrl().equals("")) {
+                        dataObj.put("directUrl", i == curVer ? document.getUrl() : DocumentManager
+                                .getDownloadHistoryUrl(document.getTitle(), i, "prev" + FileUtility
+                                        .getFileExtension(document.getTitle()), false));
+                    }
+                    dataObj.put("version", i);
+
+                    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) + File.separator + "changes.json")));
+                        JSONObject change = (JSONObject) ((JSONArray) changes.get("changes")).get(0);
+
+                        // write information about changes to the object
+                        obj.put("changes", !change.isEmpty() ? changes.get("changes") : null);
+                        obj.put("serverVersion", changes.get("serverVersion"));
+                        obj.put("created", !change.isEmpty() ? change.get("created") : null);
+                        obj.put("user", !change.isEmpty() ? change.get("user") : null);
+
+                        // get the history data from the previous file version
+                        Map<String, Object> prev = (Map<String, Object>) histData.get(Integer.toString(i - 2));
+                        Map<String, Object> prevInfo = new HashMap<String, Object>();
+                        prevInfo.put("fileType", prev.get("fileType"));
+
+                        // write key and url information about previous file version
+                        prevInfo.put("key", prev.get("key"));
+                        prevInfo.put("url", prev.get("url"));
+
+                        // write information about previous file version to the data object
+                        dataObj.put("previous", prevInfo);
+                        // write the path to the diff.zip archive with differences in this file version
+                        Integer verdiff = i - 1;
+                        String changesUrl = DocumentManager
+                                .getDownloadHistoryUrl(document.getTitle(), verdiff,
+                                        "diff.zip", true);
+                        dataObj.put("changesUrl", changesUrl);
+                    }
+
+                    if (DocumentManager.tokenEnabled()) {
+                        dataObj.put("token", DocumentManager.createToken(dataObj));
+                    }
+
+                    hist.add(obj);
+                    histData.put(Integer.toString(i - 1), dataObj);
+
+                } catch (Exception ex) { }
+            }
+
+            // 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);
+
+            Gson gson = new Gson();
+            return new String[] {gson.toJson(histObj), gson.toJson(histData) };
+        }
+        return new String[] {"", "" };
+    }
+
+    // read a file
+    private String readFileToEnd(final File file) {
+        String output = "";
+        try {
+            try (FileInputStream is = new FileInputStream(file)) {
+                Scanner scanner = new Scanner(is);  // read data from the source
+                scanner.useDelimiter("\\A");
+                while (scanner.hasNext()) {
+                    output += scanner.next();
+                }
+                scanner.close();
+            }
+        } catch (Exception e) { }
+        return output;
+    }
+
     // the document parameters
     public class Document {
         private String title;

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

@@ -18,17 +18,8 @@
 
 package entities;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.gson.annotations.SerializedName;
-
 public enum FileType {
-    @JsonProperty("word")
-    @SerializedName("word")
-    WORD,
-    @JsonProperty("cell")
-    @SerializedName("cell")
-    CELL,
-    @JsonProperty("slide")
-    @SerializedName("slide")
-    SLIDE
+    Word,
+    Cell,
+    Slide
 }

web/documentserver-example/java/src/main/java/format/Format.java

@@ -1,39 +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 format;
-
-import java.util.List;
-
-import entities.FileType;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-@Getter
-@Setter
-@ToString
-public final class Format {
-
-    private String name;
-    private FileType type;
-    private List<String>  actions;
-    private List<String> convert;
-    private List<String> mime;
-
-}

web/documentserver-example/java/src/main/java/format/FormatManager.java

@@ -1,119 +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 format;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-public final class FormatManager {
-
-    private List<Format> formats;
-
-    public FormatManager() {
-        formats = this.all();
-    }
-
-    public List<Format> getFormats() {
-        return this.formats;
-    }
-
-    public List<Format> getFormatsByAction(final String action) {
-        return this
-                .all()
-                .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());
-    }
-
-    private List<Format> all()  {
-        try {
-            ObjectMapper objectMapper = new ObjectMapper();
-            Path path = this.file();
-            return objectMapper.readValue(Files.readAllBytes(path), new TypeReference<List<Format>>() { });
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return new ArrayList<>();
-    }
-
-    private Path file() throws URISyntaxException {
-        return this
-            .directory()
-            .resolve("onlyoffice-docs-formats.json");
-    }
-
-    private Path directory() throws URISyntaxException {
-        URI uri = Thread
-            .currentThread()
-            .getContextClassLoader()
-            .getResource("assets/document-formats")
-            .toURI();
-        return Paths.get(uri);
-    }
-}

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

@@ -20,8 +20,6 @@ package helpers;
 
 import entities.FileType;
 import entities.User;
-import format.FormatManager;
-
 import org.json.simple.JSONObject;
 import org.primeframework.jwt.Signer;
 import org.primeframework.jwt.Verifier;
@@ -33,7 +31,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.FileFilter;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -53,14 +50,12 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Scanner;
 
 import static utils.Constants.KILOBYTE_SIZE;
 import static utils.Constants.MAX_FILE_SIZE;
 
 public final class DocumentManager {
     private static HttpServletRequest request;
-    private static FormatManager formatManager = new FormatManager();
 
     private DocumentManager() { }
 
@@ -83,26 +78,37 @@ public final class DocumentManager {
 
     // get all the supported file extensions
     public static List<String> getFileExts() {
-        return DocumentManager.formatManager.allExtensions();
+        List<String> res = new ArrayList<>();
+
+        res.addAll(getViewedExts());
+        res.addAll(getEditedExts());
+        res.addAll(getConvertExts());
+        res.addAll(getFillExts());
+
+        return res;
     }
 
     public static List<String> getFillExts() {
-        return DocumentManager.formatManager.fillableExtensions();
+        String exts = ConfigManager.getProperty("files.docservice.fill-docs");
+        return Arrays.asList(exts.split("\\|"));
     }
 
     // get file extensions that can be viewed
     public static List<String> getViewedExts() {
-        return DocumentManager.formatManager.viewableExtensions();
+        String exts = ConfigManager.getProperty("files.docservice.viewed-docs");
+        return Arrays.asList(exts.split("\\|"));
     }
 
     // get file extensions that can be edited
     public static List<String> getEditedExts() {
-        return DocumentManager.formatManager.editableExtensions();
+        String exts = ConfigManager.getProperty("files.docservice.edited-docs");
+        return Arrays.asList(exts.split("\\|"));
     }
 
     // get file extensions that can be converted
     public static List<String> getConvertExts() {
-        return DocumentManager.formatManager.autoConvertExtensions();
+        String exts = ConfigManager.getProperty("files.docservice.convert-docs");
+        return Arrays.asList(exts.split("\\|"));
     }
 
     // get current user host address
@@ -246,18 +252,14 @@ public final class DocumentManager {
 
     // get a file name with an index if the file with such a name already exists
     public static String getCorrectName(final String fileName, final String userAddress) {
-        int maxName = Integer.parseInt(ConfigManager.getProperty("filename-max"));
         String baseName = FileUtility.getFileNameWithoutExtension(fileName);
-        if (baseName.length() > maxName) {
-            baseName = baseName.substring(0, maxName) + "[...]";
-        }
         String ext = FileUtility.getFileExtension(fileName);
-        String name = baseName + "." + ext;
+        String name = baseName + ext;
 
         File file = new File(storagePath(name, userAddress));
 
         for (int i = 1; file.exists(); i++) {  // run through all the files with such a name in the storage directory
-            name = baseName + " (" + i + ")." + ext;  // and add an index to the base name
+            name = baseName + " (" + i + ")" + ext;  // and add an index to the base name
             file = new File(storagePath(name, userAddress));
         }
 
@@ -304,12 +306,7 @@ public final class DocumentManager {
         String demoName = (sample ? "sample." : "new.") + fileExt;
 
         // get the path to the sample document
-        String demoPath = "assets"
-            + File.separator
-            + "document-templates"
-            + File.separator
-            + (sample ? "sample" : "new")
-            + File.separator;
+        String demoPath = "assets" + File.separator + (sample ? "sample" : "new") + File.separator;
 
         // get a file name with an index if the file with such a name already exists
         String fileName = getCorrectName(demoName, null);
@@ -494,17 +491,17 @@ public final class DocumentManager {
     // get an editor internal extension
     public static String getInternalExtension(final FileType fileType) {
         // .docx for word file type
-        if (fileType.equals(FileType.WORD)) {
+        if (fileType.equals(FileType.Word)) {
             return ".docx";
         }
 
         // .xlsx for cell file type
-        if (fileType.equals(FileType.CELL)) {
+        if (fileType.equals(FileType.Cell)) {
             return ".xlsx";
         }
 
         // .pptx for slide file type
-        if (fileType.equals(FileType.SLIDE)) {
+        if (fileType.equals(FileType.Slide)) {
             return ".pptx";
         }
 
@@ -516,17 +513,17 @@ public final class DocumentManager {
     public static String getTemplateImageUrl(final FileType fileType) {
         String path = getServerUrl(true) + "/css/img/";
         // for word file type
-        if (fileType.equals(FileType.WORD)) {
+        if (fileType.equals(FileType.Word)) {
             return path + "file_docx.svg";
         }
 
         // .xlsx for cell file type
-        if (fileType.equals(FileType.CELL)) {
+        if (fileType.equals(FileType.Cell)) {
             return path + "file_xlsx.svg";
         }
 
         // .pptx for slide file type
-        if (fileType.equals(FileType.SLIDE)) {
+        if (fileType.equals(FileType.Slide)) {
             return path + "file_pptx.svg";
         }
 
@@ -597,19 +594,4 @@ public final class DocumentManager {
         });
         return languages;
     }
-
-    public static String readFileToEnd(final File file) {
-        String output = "";
-        try {
-            try (FileInputStream is = new FileInputStream(file)) {
-                Scanner scanner = new Scanner(is);  // read data from the source
-                scanner.useDelimiter("\\A");
-                while (scanner.hasNext()) {
-                    output += scanner.next();
-                }
-                scanner.close();
-            }
-        } catch (Exception e) { }
-        return output;
-    }
 }

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

@@ -19,34 +19,64 @@
 package helpers;
 
 import entities.FileType;
-import format.Format;
-import format.FormatManager;
-
 import java.net.URL;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 public final class FileUtility {
-    private static FormatManager formatManager = new FormatManager();
 
     private FileUtility() { }
 
     // get file type
     public static FileType getFileType(final String fileName) {
         String ext = getFileExtension(fileName).toLowerCase();
-        List<Format> formats  = FileUtility.formatManager.getFormats();
 
-        for (Format format : formats) {
-            if (format.getName().equals(ext)) {
-                return format.getType();
-            }
+        // word type for document extensions
+        if (extsDocument.contains(ext)) {
+            return FileType.Word;
+        }
+
+        // cell type for spreadsheet extensions
+        if (extsSpreadsheet.contains(ext)) {
+            return FileType.Cell;
+        }
+
+        // slide type for presentation extensions
+        if (extsPresentation.contains(ext)) {
+            return FileType.Slide;
         }
 
         // default file type is word
-        return FileType.WORD;
+        return FileType.Word;
     }
 
+    // document extensions
+    private static 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", ".oxps", ".oform"
+    );
+
+    // spreadsheet extensions
+    private static List<String> extsSpreadsheet = Arrays.asList(
+            ".xls", ".xlsx", ".xlsm", ".xlsb",
+            ".xlt", ".xltx", ".xltm",
+            ".ods", ".fods", ".ots", ".csv"
+    );
+
+    // presentation extensions
+    private static List<String> extsPresentation = Arrays.asList(
+            ".pps", ".ppsx", ".ppsm",
+            ".ppt", ".pptx", ".pptm",
+            ".pot", ".potx", ".potm",
+            ".odp", ".fodp", ".otp"
+    );
+
+
     // get file name from the url
     public static String getFileName(final String url) {
         if (url == null) {
@@ -75,7 +105,7 @@ public final class FileUtility {
         if (fileName == null) {
             return null;
         }
-        String fileExt = fileName.substring(fileName.lastIndexOf(".") + 1);
+        String fileExt = fileName.substring(fileName.lastIndexOf("."));
         return fileExt.toLowerCase();
     }
 

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

@@ -158,8 +158,8 @@ public final class ServiceConverter {
         ConvertBody body = new ConvertBody();
         body.setRegion(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.setPassword(filePass);

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

@@ -150,7 +150,7 @@ public final class TrackManager {
         String newFileName = fileName;
 
         String curExt = FileUtility.getFileExtension(fileName);  // get current file extension
-        String downloadExt = (String) body.get("filetype");  // get the extension of the downloaded file
+        String downloadExt = "." + (String) body.get("filetype");  // get the extension of the downloaded file
 
         // convert downloaded file to the file with the current extension if these extensions aren't equal
         if (!curExt.equals(downloadExt)) {
@@ -164,13 +164,13 @@ public final class TrackManager {
                     // get the correct file name if it already exists
                     newFileName = DocumentManager
                             .getCorrectName(FileUtility
-                                    .getFileNameWithoutExtension(fileName) + "." + downloadExt, userAddress);
+                                    .getFileNameWithoutExtension(fileName) + downloadExt, userAddress);
                 } else {
                     downloadUri = newFileUri;
                 }
             } catch (Exception e) {
                 newFileName = DocumentManager.getCorrectName(FileUtility
-                        .getFileNameWithoutExtension(fileName) + "." + downloadExt, userAddress);
+                        .getFileNameWithoutExtension(fileName) + downloadExt, userAddress);
             }
         }
 
@@ -193,7 +193,7 @@ public final class TrackManager {
         }
 
         // get the path to the previous file version and rename the last file version with it
-        lastVersion.renameTo(new File(versionDir + File.separator + "prev." + curExt));
+        lastVersion.renameTo(new File(versionDir + File.separator + "prev" + curExt));
 
         saveFile(byteArrayFile, toSave); // save document file
 
@@ -236,7 +236,7 @@ public final class TrackManager {
         String downloadUri = (String) body.get("url");
 
         String curExt = FileUtility.getFileExtension(fileName);  // get current file extension
-        String downloadExt = (String) body.get("filetype");  // get the extension of the downloaded file
+        String downloadExt = "." + (String) body.get("filetype");  // get the extension of the downloaded file
 
         Boolean newFileName = false;
 
@@ -265,10 +265,10 @@ public final class TrackManager {
             // new file
             if (newFileName) {
                 fileName = DocumentManager.getCorrectName(FileUtility.getFileNameWithoutExtension(fileName)
-                        + "-form." + downloadExt, userAddress);  // get the correct file name if it already exists
+                        + "-form" + downloadExt, userAddress);  // get the correct file name if it already exists
             } else {
                 fileName = DocumentManager.getCorrectName(FileUtility.getFileNameWithoutExtension(fileName)
-                        + "-form." + curExt, userAddress);
+                        + "-form" + curExt, userAddress);
             }
             forcesavePath = DocumentManager.storagePath(fileName, userAddress);
         } else {

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

@@ -1,9 +1,12 @@
-version=1.7.0
+version=1.6.0
 
 filesize-max=5242880
 storage-folder=app_data
-filename-max=50
 
+files.docservice.fill-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.url.site=http://documentserver/

web/documentserver-example/java/src/main/webapp/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>

web/documentserver-example/java/src/main/webapp/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>

web/documentserver-example/java/src/main/webapp/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>

web/documentserver-example/java/src/main/webapp/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>

web/documentserver-example/java/src/main/webapp/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>

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

@@ -117,17 +117,13 @@
         };
 
         // the user is trying to select document for comparing by clicking the Document from Storage button
-        var onRequestSelectDocument = function(event) {
-            var data = ${dataDocument};
-            data.c = event.data.c;
-            docEditor.setRequestedDocument(data);  // select a document for comparing
+        var onRequestCompareFile = function() {
+            docEditor.setRevisedFile(${dataCompareFile});  // 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 mail merge 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
@@ -165,103 +161,18 @@
             }
         };
 
-        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", "IndexServlet?type=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));
             }
         };
 
-        function onRequestRestore(event) {
-          const query = new URLSearchParams(window.location.search)
-          const payload = {
-            fileName: query.get('fileName'),
-            version: event.data.version,
-            userId: config.editorConfig.user.id
-          }
-          const request = new XMLHttpRequest()
-          request.open('PUT', 'IndexServlet?type=restore')
-          request.send(JSON.stringify(payload))
-          request.onload = function () {
-            const response = JSON.parse(request.responseText);
-            if (response.success && !response.error) {
-              var historyInfoUri = "IndexServlet?type=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);
-            }
-          }
-        }
-
-        var onRequestHistory = function () {
-            var historyInfoUri = "IndexServlet?type=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);
-            }
-        };
-
-        var onRequestHistoryData = function (event) {
-            var version = event.data;
-            var historyDataUri = "IndexServlet?type=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();
-        };
-
         config = JSON.parse('<%= FileModel.serialize(Model) %>');
         config.width = "100%";
         config.height = "100%";
@@ -273,19 +184,34 @@
             "onMakeActionLink": onMakeActionLink,
             "onMetaChange": onMetaChange,
             "onRequestInsertImage": onRequestInsertImage,
-            "onRequestSelectDocument": onRequestSelectDocument,
-            "onRequestSelectSpreadsheet": onRequestSelectSpreadsheet,
-            "onRequestRestore": onRequestRestore,
-            "onRequestHistory": onRequestHistory,
-            "onRequestHistoryData": onRequestHistoryData,
-            "onRequestHistoryClose": onRequestHistoryClose
+            "onRequestCompareFile": onRequestCompareFile,
+            "onRequestMailMergeRecipients": onRequestMailMergeRecipients,
         };
 
         <%
+            String[] histArray = Model.getHistory();
+            String history = histArray[0];
+            String historyData = histArray[1];
             String usersForMentions = (String) request.getAttribute("usersForMentions");
         %>
 
         if (config.editorConfig.user.id) {
+            <% if (!history.isEmpty() && !historyData.isEmpty()) { %>
+                // the user is trying to show the document version history
+                config.events['onRequestHistory'] = function () {
+                    docEditor.refreshHistory(<%= history %>);  // 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(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 () {
                 docEditor.setUsers({  // set a list of users to mention in the comments
@@ -303,7 +229,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) {

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

@@ -367,9 +367,9 @@
         <script type="text/javascript" src="scripts/jscript.js"></script>
 
         <script language="javascript" type="text/javascript">
-            var FillExtList = "<%= String.join(",", DocumentManager.getFillExts()) %>".split(",");
-            var ConverExtList = "<%= String.join(",", DocumentManager.getConvertExts()) %>".split(",");
-            var EditedExtList = "<%= String.join(",", DocumentManager.getEditedExts()) %>".split(",");
+            var FillExtList = "<%= String.join(",", DocumentManager.getFillExts()) %>";
+            var ConverExtList = "<%= String.join(",", DocumentManager.getConvertExts()) %>";
+            var EditedExtList = "<%= String.join(",", DocumentManager.getEditedExts()) %>";
             var UrlConverter = "IndexServlet?type=convert";
             var UrlEditor = "EditorServlet";
 

web/documentserver-example/java/src/main/webapp/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)) {
+        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) || FillExtList.includes(posExt)) {
+        if (EditedExtList.indexOf(posExt) !== -1 || FillExtList.indexOf(posExt) !== -1) {
             jq("#beginEdit").removeClass("disable");
         }
     };

web/documentserver-example/nodejs/README.md

@@ -91,11 +91,11 @@ See the detailed guide to learn how to [install Document Server for Linux](https
 2. Download the archive with the Node.js example and unpack it:
 
     ```
-    wget https://api.onlyoffice.com/app_data/editor/Node.js.Example.zip
+    wget https://api.onlyoffice.com/app_data/editor/Node.js%20Example.zip
     ```
 
     ```
-    unzip Node.js.Example.zip
+    unzip Node.js\ Example.zip
     ```
 
 3. Change the current directory for the project directory:
@@ -110,7 +110,7 @@ See the detailed guide to learn how to [install Document Server for Linux](https
     npm install
     ```
 
-5. Edit the *config/default.json* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed.
+5. Edit the *default.json* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed.
 
     ```
     nano config/default.json

web/documentserver-example/nodejs/app.js

@@ -27,7 +27,6 @@ const jwt = require('jsonwebtoken');
 const config = require('config');
 const mime = require('mime');
 const urllib = require('urllib');
-const urlModule = require('url');
 const { emitWarning } = require('process');
 const DocManager = require('./helpers/docManager');
 const documentService = require('./helpers/documentService');
@@ -82,6 +81,14 @@ app.use((req, res, next) => {
 });
 
 app.use(express.static(path.join(__dirname, 'public'))); // public directory
+// check if there are static files such as .js, .css files, images, samples and process them
+if (config.has('server.static')) {
+  const staticContent = config.get('server.static');
+  for (let i = 0; i < staticContent.length; i++) {
+    const staticContentElem = staticContent[i];
+    app.use(staticContentElem.name, express.static(staticContentElem.path, staticContentElem.options));
+  }
+}
 app.use(favicon(`${__dirname}/public/images/favicon.ico`)); // use favicon
 
 app.use(bodyParser.json()); // connect middleware that parses json
@@ -499,23 +506,6 @@ app.post('/reference', (req, res) => { // define a handler for renaming file
     }
   }
 
-  if (!fileName && !!req.body.link) {
-    if (req.body.link.indexOf(req.DocManager.getServerUrl()) === -1) {
-      result({
-        url: req.body.link,
-        directUrl: req.body.link,
-      });
-      return;
-    }
-
-    const urlObj = urlModule.parse(req.body.link, true);
-    fileName = urlObj.query.fileName;
-    if (!req.DocManager.existsSync(req.DocManager.storagePath(fileName, userAddress))) {
-      result({ error: 'File is not exist' });
-      return;
-    }
-  }
-
   if (!fileName && !!req.body.path) {
     const filePath = fileUtility.getFileName(req.body.path);
 
@@ -531,14 +521,12 @@ app.post('/reference', (req, res) => { // define a handler for renaming file
 
   const data = {
     fileType: fileUtility.getFileExtension(fileName).slice(1),
-    key: req.DocManager.getKey(fileName),
     url: req.DocManager.getDownloadUrl(fileName, true),
     directUrl: req.body.directUrl ? req.DocManager.getDownloadUrl(fileName) : null,
     referenceData: {
       fileKey: JSON.stringify({ fileName, userAddress: req.DocManager.curUserHostAddress() }),
       instanceId: req.DocManager.getServerUrl(),
     },
-    link: `${req.DocManager.getServerUrl()}/editor?fileName=${encodeURIComponent(fileName)}`,
     path: fileName,
   };
 
@@ -561,16 +549,13 @@ app.put('/restore', (req, res) => { // define a handler for restore file version
     const filePath = req.DocManager.storagePath(fileName, userAddress);
     const historyPath = req.DocManager.historyPath(fileName, userAddress);
     const newVersion = req.DocManager.countVersion(historyPath) + 1;
-    const versionPath = path.join(`${historyPath}`, `${version}`, `prev${fileUtility.getFileExtension(fileName)}`);
-    const newVersionPath = path.join(`${historyPath}`, `${newVersion}`);
+    const versionPath = `${historyPath}\\${version}\\prev${fileUtility.getFileExtension(fileName)}`;
+    const newVersionPath = `${historyPath}\\${newVersion}`;
 
     if (fileSystem.existsSync(versionPath)) {
       req.DocManager.createDirectory(newVersionPath);
-      req.DocManager.copyFile(
-        filePath,
-        path.join(`${newVersionPath}`, `prev${fileUtility.getFileExtension(fileName)}`),
-      );
-      fileSystem.writeFileSync(path.join(`${newVersionPath}`, 'key.txt'), key);
+      req.DocManager.copyFile(filePath, `${newVersionPath}\\prev${fileUtility.getFileExtension(fileName)}`);
+      fileSystem.writeFileSync(`${newVersionPath}\\key.txt`, key);
       req.DocManager.copyFile(versionPath, filePath);
       result.success = true;
     } else {
@@ -697,6 +682,7 @@ app.post('/track', async (req, res) => { // define a handler for tracking file c
             try {
               const resp = documentService.getResponseUri(data);
               await callbackProcessSave(resp.uri, body, fileName, userAddress, fileName);
+              return;
             } catch (ex) {
               console.log(ex);
               await callbackProcessSave(downloadUri, body, fileName, userAddress, newFileName);
@@ -725,22 +711,18 @@ app.post('/track', async (req, res) => { // define a handler for tracking file c
 
         const downloadExt = `.${body.fileType}`;
         const isSubmitForm = body.forcesavetype === 3; // SubmitForm
-        let correctName = fileName;
+        let correctName = '';
         let forcesavePath = '';
 
         if (isSubmitForm) {
           // new file
           if (newFileName) {
-            correctName = req.DocManager.getCorrectName(
-              `${fileUtility.getFileName(fileName, true)}-form${downloadExt}`,
-              userAddress,
-            );
+            correctName = req.DocManager.getCorrectName(`${fileUtility.getFileName(fileName, true)}
+            -form${downloadExt}`, userAddress);
           } else {
             const ext = fileUtility.getFileExtension(fileName);
-            correctName = req.DocManager.getCorrectName(
-              `${fileUtility.getFileName(fileName, true)}-form${ext}`,
-              userAddress,
-            );
+            correctName = req.DocManager.getCorrectName(`${fileUtility.getFileName(fileName, true)}
+            -form${ext}`, userAddress);
           }
           forcesavePath = req.DocManager.storagePath(correctName, userAddress);
         } else {
@@ -796,6 +778,7 @@ app.post('/track', async (req, res) => { // define a handler for tracking file c
             try {
               const resp = documentService.getResponseUri(data);
               await callbackProcessForceSave(resp.uri, body, fileName, userAddress, false);
+              return;
             } catch (ex) {
               console.log(ex);
               await callbackProcessForceSave(downloadUri, body, fileName, userAddress, true);
@@ -933,15 +916,6 @@ app.get('/editor', (req, res) => { // define a handler for editing document
     const { commentGroups } = user;
     const { userInfoGroups } = user;
 
-    const usersInfo = [];
-    if (user.id !== 'uid-0') {
-      users.getAllUsers().forEach((userInfo) => {
-        const u = userInfo;
-        u.image = userInfo.avatar ? `${req.DocManager.getServerUrl()}/images/${userInfo.id}.png` : null;
-        usersInfo.push(u);
-      }, usersInfo);
-    }
-
     if (fileExt) {
       // create demo document of a given extension
       const fName = req.DocManager.createDemo(!!req.query.sample, fileExt, userid, name, false);
@@ -973,7 +947,7 @@ app.get('/editor', (req, res) => { // define a handler for editing document
     if (!canEdit && mode === 'edit') {
       mode = 'view';
     }
-    const submitForm = mode === 'fillForms' && userid === 'uid-1';
+    const submitForm = mode === 'fillForms' && userid === 'uid-1' && !1;
 
     // file config data
     const argss = {
@@ -1012,7 +986,6 @@ app.get('/editor', (req, res) => { // define a handler for editing document
         curUserHostAddress: req.DocManager.curUserHostAddress(),
         lang,
         userid: userid !== 'uid-0' ? userid : null,
-        userImage: user.avatar ? `${req.DocManager.getServerUrl()}/images/${user.id}.png` : null,
         name,
         userGroup,
         reviewGroups: JSON.stringify(reviewGroups),
@@ -1032,21 +1005,20 @@ app.get('/editor', (req, res) => { // define a handler for editing document
         url: `${req.DocManager.getServerUrl(true)}/images/logo.png`,
         directUrl: !userDirectUrl ? null : `${req.DocManager.getServerUrl()}/images/logo.png`,
       },
-      dataDocument: {
+      dataCompareFile: {
         fileType: 'docx',
         url: `${req.DocManager.getServerUrl(true)}/assets/document-templates/sample/sample.docx`,
         directUrl: !userDirectUrl
           ? null
           : `${req.DocManager.getServerUrl()}/assets/document-templates/sample/sample.docx`,
       },
-      dataSpreadsheet: {
+      dataMailMergeRecipients: {
         fileType: 'csv',
         url: `${req.DocManager.getServerUrl(true)}/csv`,
         directUrl: !userDirectUrl ? null : `${req.DocManager.getServerUrl()}/csv`,
       },
       usersForMentions: user.id !== 'uid-0' ? users.getUsersForMentions(user.id) : null,
       usersForProtect: user.id !== 'uid-0' ? users.getUsersForProtect(user.id) : null,
-      usersInfo,
     };
 
     if (cfgSignatureEnable) {
@@ -1065,13 +1037,13 @@ app.get('/editor', (req, res) => { // define a handler for editing document
             cfgSignatureSecret,
             { expiresIn: cfgSignatureSecretExpiresIn },
           );
-          argss.dataDocument.token = jwt.sign(
-            argss.dataDocument,
+          argss.dataCompareFile.token = jwt.sign(
+            argss.dataCompareFile,
             cfgSignatureSecret,
             { expiresIn: cfgSignatureSecretExpiresIn },
           );
-          argss.dataSpreadsheet.token = jwt.sign(
-            argss.dataSpreadsheet,
+          argss.dataMailMergeRecipients.token = jwt.sign(
+            argss.dataMailMergeRecipients,
             cfgSignatureSecret,
             { expiresIn: cfgSignatureSecretExpiresIn },
           );

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

@@ -1,5 +1,5 @@
 {
-  "version": "1.7.0",
+  "version": "1.6.0",
   "log": {
     "appenders": [
       {
@@ -25,8 +25,13 @@
     "storageFolder": "./files",
     "storagePath": "/files",
     "maxFileSize": 1073741824,
-    "maxNameLength": 50,
     "mobileRegEx": "android|avantgo|playbook|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od|ad)|iris|kindle|lge |maemo|midp|mmp|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\\/|plucker|pocket|psp|symbian|treo|up\\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino",
+    "static":[
+      {
+        "name": "/files",
+        "path": "./files"
+      }
+    ],
     "token": {
         "enable": false,
         "useforrequest": true,

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

@@ -2,6 +2,12 @@
   "server": {
     "siteUrl": "/",
     "maxFileSize": 104857600,
-    "storageFolder": "/var/lib/onlyoffice/documentserver-example/files"
+    "storageFolder": "/var/lib/onlyoffice/documentserver-example/files",
+    "static":[
+      {
+        "name": "/files",
+        "path": "/var/lib/onlyoffice/documentserver-example/files"
+      }
+    ]
   }
 }

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

@@ -1,6 +1,13 @@
 {
   "server": {
     "siteUrl": "/",
-    "maxFileSize": 104857600
+    "maxFileSize": 104857600,
+    "static":[
+      {
+        "name": "/files",
+        "path": "./files",
+        "options": {"maxAge": "7d"}
+      }
+    ]
   }
 }

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

@@ -84,10 +84,7 @@ DocManager.prototype.getCustomParams = function getCustomParams() {
 
 // get the correct file name if such a name already exists
 DocManager.prototype.getCorrectName = function getCorrectName(fileName, userAddress) {
-  // get file name from the url without extension
-  const maxName = configServer.get('maxNameLength');
-  const baseName = fileUtility.getFileName(fileName, true).substr(0, maxName)
-    + (fileName.length > maxName ? '[...]' : '');
+  const baseName = fileUtility.getFileName(fileName, true); // get file name from the url without extension
   const ext = fileUtility.getFileExtension(fileName); // get file extension from the url
   let name = baseName + ext; // get full file name
   let index = 1;
@@ -155,9 +152,9 @@ DocManager.prototype.saveFileData = function saveFileData(fileName, userid, user
   // get full creation date of the document
   const dateCreate = fileSystem.statSync(this.storagePath(fileName, address)).mtime;
   const minutes = (dateCreate.getMinutes() < 10 ? '0' : '') + dateCreate.getMinutes().toString();
-  const month = (dateCreate.getMonth() < 9 ? '0' : '') + (parseInt(dateCreate.getMonth().toString(), 10) + 1);
+  const month = (dateCreate.getMonth() < 10 ? '0' : '') + (parseInt(dateCreate.getMonth().toString(), 10) + 1);
   const sec = (dateCreate.getSeconds() < 10 ? '0' : '') + dateCreate.getSeconds().toString();
-  const dateFormat = `${dateCreate.getFullYear()}-${month}-${dateCreate.getDate()} `
+  const dateFormat = `${dateCreate.getFullYear()}-${month}-${dateCreate.getDate()}`
     + `${dateCreate.getHours()}:${minutes}:${sec}`;
 
   const fileInfo = this.historyPath(fileName, address, true); // get file history information
@@ -392,14 +389,14 @@ DocManager.prototype.getTemplateImageUrl = function getTemplateImageUrl(fileType
   }
 
   if (fileType === fileUtility.fileType.cell) { // for cell type
-    return `${serverUrl}/images/file_xlsx.svg`;
+    return `${path}/images/file_xlsx.svg`;
   }
 
   if (fileType === fileUtility.fileType.slide) { // for slide type
-    return `${serverUrl}/images/file_pptx.svg`;
+    return `${path}/images/file_pptx.svg`;
   }
 
-  return `${serverUrl}/images/file_docx.svg`; // the default value
+  return `${path}/images/file_docx.svg`; // the default value
 };
 
 // get document key
@@ -537,7 +534,7 @@ DocManager.prototype.getHistory = function getHistory(fileName, content, keyVers
 
   if (content && contentJson) {
     userNameFromJson = oldVersion ? contentJson.username : contentJson.user.name;
-    userIdFromJson = oldVersion ? contentJson.userid : contentJson.user.id;
+    userIdFromJson = oldVersion ? contentJson.userid : contentJson.user.userid;
     createdFromJson = oldVersion ? contentJson.date : contentJson.created;
   }