java-spring: add method isExtendedPDFFile

Feature/version on front

.github/workflows/artifact-csharp-mvc.yml

@@ -3,10 +3,10 @@ name: Artifact Csharp MVC
 on:
   workflow_dispatch:
   push:
-    branches: [master, main]
+    branches: [master]
     paths: ['web/documentserver-example/csharp-mvc/**']
   pull_request:
-    branches: [master, main]
+    branches: [master]
     paths: ['web/documentserver-example/csharp-mvc/**']
 
 jobs:
@@ -21,11 +21,9 @@ jobs:
           cwd=$(pwd)
           git submodule update --init --recursive
           cd ./web/documentserver-example/csharp-mvc
-          mkdir -p ./deploy/'DotNet (Csharp MVN) Example'
+          mkdir -p ./deploy/'DotNet (Csharp MVC) Example'
           rsync -av --exclude='deploy' ./ ./deploy/'DotNet (Csharp MVC) Example'
-          cd ./deploy/'DotNet (Csharp MVC) Example'/assets
-          rm -rf ./.git/
-          rm .git
+          rm -rf ./deploy/'DotNet (Csharp MVC) Example'/assets/.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, main]
+    branches: [master]
     paths: ['web/documentserver-example/csharp/**']
   pull_request:
-    branches: [master, main, develop]
+    branches: [master]
     paths: ['web/documentserver-example/csharp/**']
 
 jobs:
@@ -18,14 +18,11 @@ 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'
-          cd ./deploy/'DotNet (Csharp) Example'/assets
-          rm -rf ./.git/
-          rm .git
+          rm -rf ./deploy/'DotNet (Csharp) Example'/assets/.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, main]
+    branches: [master]
     paths: ['web/documentserver-example/java/**']
   pull_request:
-    branches: [master, main]
+    branches: [master]
     paths: ['web/documentserver-example/java/**']
 
 jobs:
@@ -18,14 +18,12 @@ 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'
-          cd ./deploy/'Java Example'/src/main/resources/assets
-          rm -rf ./.git/
-          rm .git
+          rm -rf ./deploy/'Java Example'/src/main/resources/assets/document-formats/.git
+          rm -rf ./deploy/'Java Example'/src/main/resources/assets/document-templates/.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, main]
+    branches: [master]
     paths: ['web/documentserver-example/nodejs/**']
   pull_request:
-    branches: [master, main]
+    branches: [master]
     paths: ['web/documentserver-example/nodejs/**']
 
 jobs:
@@ -18,14 +18,12 @@ 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'
-          cd ./deploy/'Node.js Example'/public/assets
-          rm -rf ./.git/
-          rm .git
+          rm -rf ./deploy/'Node.js Example'/public/assets/document-formats/.git
+          rm -rf ./deploy/'Node.js Example'/public/assets/document-templates/.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, main]
+    branches: [master]
     paths: ['web/documentserver-example/php/**']
   pull_request:
-    branches: [master, main]
+    branches: [master]
     paths: ['web/documentserver-example/php/**']
 
 jobs:
@@ -18,14 +18,12 @@ 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'
-          cd ./deploy/'PHP Example'/assets
-          rm -rf ./.git/
-          rm .git
+          rm -rf ./deploy/'PHP Example'/assets/document-formats/.git
+          rm -rf ./deploy/'PHP Example'/assets/document-templates/.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, main]
+    branches: [master]
     paths: ['web/documentserver-example/python/**']
   pull_request:
-    branches: [master, main]
+    branches: [master]
     paths: ['web/documentserver-example/python/**']
 
 jobs:
@@ -18,14 +18,12 @@ 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'
-          cd ./deploy/'Python Example'/assets
-          rm -rf ./.git/
-          rm .git
+          rm -rf ./deploy/'Python Example'/assets/document-formats/.git
+          rm -rf ./deploy/'Python Example'/assets/document-templates/.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, main]
+    branches: [master]
     paths: ['web/documentserver-example/ruby/**']
   pull_request:
-    branches: [master, main]
+    branches: [master]
     paths: ['web/documentserver-example/ruby/**']
 
 jobs:
@@ -18,14 +18,12 @@ 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'
-          cd ./deploy/'Ruby Example'/public/assets
-          rm -rf ./.git/
-          rm .git
+          rm -rf ./deploy/'Ruby Example'/public/assets/document-formats/.git
+          rm -rf ./deploy/'Ruby Example'/public/assets/document-templates/.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, main]
+    branches: [master]
     paths: ['web/documentserver-example/java-spring/**']
   pull_request:
-    branches: [master, main]
+    branches: [master]
     paths: ['web/documentserver-example/java-spring/**']
 
 jobs:
@@ -23,9 +23,8 @@ jobs:
           cd ./web/documentserver-example/java-spring
           mkdir -p ./deploy/'Java Spring Example'
           rsync -av --exclude='deploy' ./ ./deploy/'Java Spring Example'
-          cd ./deploy/'Java Spring Example'/src/main/resources/assets
-          rm -rf ./.git/
-          rm .git
+          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
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:

.github/workflows/lint-python.yml

@@ -21,20 +21,17 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.10' 
+          python-version: '3.11' 
 
       - name: Install Dependencies
         run: |
-          python -m pip install --upgrade pip
-          pip install flake8
-          pip install pylint
-          if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+          make dev
 
       - name: Lint Flake8
         run: |
-          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
+          make lint
+
+      # TODO: Configure mypy
+      # - name: Types mypy
+      #   run: |
+      #     make types

.github/workflows/lint-ruby.yml

@@ -16,16 +16,22 @@ jobs:
       run:
         working-directory: ./web/documentserver-example/ruby
     steps:
-      - 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
+    - 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

.github/workflows/release.yml

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

.gitmodules

@@ -1,11 +1,3 @@
-[submodule "web/documentserver-example/csharp-mvc/assets"]
-	path = web/documentserver-example/csharp-mvc/assets
-	url = https://github.com/ONLYOFFICE/document-templates
-	branch = main/en
-[submodule "web/documentserver-example/csharp/assets"]
-	path = web/documentserver-example/csharp/assets
-	url = https://github.com/ONLYOFFICE/document-templates
-	branch = main/en
 [submodule "web/documentserver-example/nodejs/public/assets/document-templates"]
 	path = web/documentserver-example/nodejs/public/assets/document-templates
 	url = https://github.com/ONLYOFFICE/document-templates
@@ -13,7 +5,14 @@
 [submodule "web/documentserver-example/nodejs/public/assets/document-formats"]
 	path = web/documentserver-example/nodejs/public/assets/document-formats
 	url = https://github.com/ONLYOFFICE/document-formats
-	branch = master
+	branch = feature/v8.0
+[submodule "web/documentserver-example/csharp-mvc/assets/document-templates"]
+	path = web/documentserver-example/csharp-mvc/assets/document-templates
+	url = https://github.com/ONLYOFFICE/document-templates
+	branch = main/en
+[submodule "web/documentserver-example/csharp-mvc/assets/document-formats"]
+	path = web/documentserver-example/csharp-mvc/assets/document-formats
+	url = https://github.com/ONLYOFFICE/document-formats
 [submodule "web/documentserver-example/php/assets/document-templates"]
 	path = web/documentserver-example/php/assets/document-templates
 	url = https://github.com/ONLYOFFICE/document-templates
@@ -54,3 +53,10 @@
 	path = web/documentserver-example/java-spring/src/main/resources/assets/document-formats
 	url = https://github.com/ONLYOFFICE/document-formats
 	branch = master
+[submodule "web/documentserver-example/csharp/assets/document-templates"]
+	path = web/documentserver-example/csharp/assets/document-templates
+	url = https://github.com/ONLYOFFICE/document-templates
+	branch = main/en
+[submodule "web/documentserver-example/csharp/assets/document-formats"]
+	path = web/documentserver-example/csharp/assets/document-formats
+	url = https://github.com/ONLYOFFICE/document-formats

CHANGELOG.md

@@ -1,26 +1,42 @@
 # Change Log
 
-- nodejs: link in referenceData
+- nodejs: pdf, djvu, xps, oxps as pdf documentType
+- nodejs: filling pdf
+- version number to page meta
+- ar skin languages
+- sr-Latn-CS skin languages
+- getting history via api
+- using a repo with a list of formats
+- convert after uploading only tagged formats
+- link in referenceData
+- setUsers for region protection
+- onRequestOpen method
+- user avatar
+- trimming long name of uploading file
+- onRequestSelectDocument method
+- onRequestSelectSpreadsheet method
+- key in referenceData
+- restore from history
+
+## 1.7.0
 - nodejs: onRequestSelectDocument method
 - nodejs: onRequestSelectSpreadsheet method
 - nodejs: onRequestOpen
 - nodejs: submitForm
 - nodejs: key in referenceData
 - nodejs: change reference source
-- java-spring: using a repo with a list of formats
-- java: using a repo with a list of formats
-- php: using a repo with a list of formats
 - nodejs: using a repo with a list of formats
-- java: using a repo with a list of formats
-- python: using a repo with a list of formats
-- ruby: 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
-- java: getting history by a separate request
-- java-spring: getting history by a separate request
-- restore from history
+- csharp: restore from history
 
 ## 1.6.0
 - nodejs: setUsers for region protection

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

@@ -31,6 +31,12 @@ namespace OnlineEditorsExampleMVC.Helpers
 {
     public class DocManagerHelper
     {
+        //get server version
+        public static string GetVersion()
+        {
+            return WebConfigurationManager.AppSettings["version"];
+        }
+
         // get max file size
         public static long MaxFileSize
         {
@@ -51,24 +57,24 @@ namespace OnlineEditorsExampleMVC.Helpers
         // get file extensions that can be viewed
         public static List<string> ViewedExts
         {
-            get { return (WebConfigurationManager.AppSettings["files.docservice.viewed-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
+            get { return FormatManager.ViewableExtensions(); }
         }
 
         public static List<string> FillFormExts
         {
-            get { return (WebConfigurationManager.AppSettings["files.docservice.fillform-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
+            get { return FormatManager.FillableExtensions(); }
         }
 
         // get file extensions that can be edited
         public static List<string> EditedExts
         {
-            get { return (WebConfigurationManager.AppSettings["files.docservice.edited-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
+            get { return FormatManager.EditableExtensions(); }
         }
 
         // get file extensions that can be converted
         public static List<string> ConvertExts
         {
-            get { return (WebConfigurationManager.AppSettings["files.docservice.convert-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
+            get { return FormatManager.ConvertibleExtensions(); }
         }
 
         // get current user host address
@@ -177,7 +183,12 @@ 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;
 
@@ -215,7 +226,7 @@ namespace OnlineEditorsExampleMVC.Helpers
         public static string CreateDemo(string fileExt, bool withContent)
         {
             var demoName = (withContent ? "sample." : "new.") + fileExt;  // create sample or new template file with the necessary extension
-            var demoPath = "assets\\" + (withContent ? "sample\\" : "new\\");  // get the path to the sample document
+            var demoPath = "assets\\document-templates\\" + (withContent ? "sample\\" : "new\\");  // get the path to the sample document
 
             var fileName = GetCorrectName(demoName);  // get a file name with an index if the file with such a name already exists
 

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

@@ -256,6 +256,22 @@ namespace OnlineEditorsExampleMVC.Helpers
                     var action = jss.Deserialize<Dictionary<string, object>>(jss.Serialize(actions[0]));
                     var user = action["userid"].ToString();  // get the user id
                     DocManagerHelper.CreateMeta(fileName, user, "Filling Form", userAddress);  // create meta data for the forcesaved file
+
+                    string formsDataUrl = fileData["formsdataurl"].ToString();
+
+                    if (!string.IsNullOrEmpty(formsDataUrl))
+                    {
+                        string formsName = DocManagerHelper.GetCorrectName(Path.GetFileNameWithoutExtension(fileName) + ".txt", userAddress);
+                        string formsPath = DocManagerHelper.StoragePath(formsName, userAddress);
+
+                        var bytesForms = DownloadFile(formsDataUrl);
+
+                        SaveFile(bytesForms, formsPath);
+                    }
+                    else
+                    {
+                        throw new Exception("Document editing service did not return formsDataUrl");
+                    }
                 }
             } catch (Exception)
             {

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

@@ -31,7 +31,9 @@ namespace OnlineEditorsExampleMVC.Helpers
             "Can perform all actions with comments",
             "The file favorite state is undefined",
             "Can create files from templates using data from the editor",
-            "Can see the information about all users"
+            "Can see the information about all users",
+            "Has an avatar",
+            "Can submit forms"
         };
 
         static List<string> descr_user_2 = new List<string>()
@@ -41,7 +43,9 @@ namespace OnlineEditorsExampleMVC.Helpers
             "Can view comments, edit his own comments and comments left by users with no group. Can remove his own comments only",
             "This file is marked as favorite",
             "Can create new files from the editor",
-            "Can see the information about users from Group2 and users who don’t belong to any group"
+            "Can see the information about users from Group2 and users who don’t belong to any group",
+            "Has an avatar",
+            "Can’t submit forms"
         };
 
         static List<string> descr_user_3 = new List<string>()
@@ -54,7 +58,8 @@ namespace OnlineEditorsExampleMVC.Helpers
             "Can’t download the file",
             "Can’t print the file",
             "Can create new files from the editor",
-            "Can see the information about Group2 users"
+            "Can see the information about Group2 users",
+            "Can’t submit forms"
         };
 
         static List<string> descr_user_0 = new List<string>()
@@ -71,6 +76,7 @@ namespace OnlineEditorsExampleMVC.Helpers
             "Can't view chat",
             "Can't protect file",
             "View file without collaboration",
+            "Can’t submit forms"
         };
 
         private static List<User> users = new List<User>() {
@@ -85,6 +91,7 @@ namespace OnlineEditorsExampleMVC.Helpers
                     null,
                     new List<string>(),
                     descr_user_1,
+                    true,
                     true
                 ),
             new User(
@@ -103,12 +110,13 @@ namespace OnlineEditorsExampleMVC.Helpers
                     true,
                     new List<string>(),
                     descr_user_2,
-                    false
+                    false,
+                    true
                 ),
             new User(
                     "uid-3",
                     "Hamish Mitchell",
-                    "mitchell@example.com",
+                    null,
                     "group-3",
                     new List<string>() { "group-2" },
                     new Dictionary<string,object>()
@@ -121,6 +129,7 @@ namespace OnlineEditorsExampleMVC.Helpers
                     false,
                     new List<string>() { "copy", "download", "print" },
                     descr_user_3,
+                    false,
                     false
                 ),
             new User(
@@ -134,6 +143,7 @@ namespace OnlineEditorsExampleMVC.Helpers
                     null,
                     new List<string>() { "protect" },
                     descr_user_0,
+                    false,
                     false
                 )
         };
@@ -171,6 +181,43 @@ namespace OnlineEditorsExampleMVC.Helpers
             }
             return usersData;
         }
+
+        public static List<Dictionary<string, object>> getUsersInfo(string id)
+        {
+            List<Dictionary<string, object>> usersData = new List<Dictionary<string, object>>();
+            if (id != "uid-0") {
+                foreach (User user in users)
+                {
+                    usersData.Add(new Dictionary<string, object>()
+                        {
+                            {"id", user.id},
+                            {"name", user.name },
+                            {"email", user.email },
+                            {"image", user.avatar ? DocManagerHelper.GetServerUrl(false) + "/Content/images/" + user.id + ".png" : null}
+                        });
+                }
+            }
+            return usersData;
+        }
+
+        // get a list of users with their names and emails for protect
+        public static List<Dictionary<string, object>> getUsersForProtect(string id)
+        {
+            List<Dictionary<string, object>> usersData = new List<Dictionary<string, object>>();
+            foreach (User user in users)
+            {
+                if (!user.id.Equals(id) && user.name != null)
+                {
+                    usersData.Add(new Dictionary<string, object>()
+                    {
+                        {"name", user.name },
+                        {"email", user.email },
+                        {"id", user.id}
+                    });
+                }
+            }
+            return usersData;
+        }
     }
 
     public class User
@@ -186,8 +233,9 @@ namespace OnlineEditorsExampleMVC.Helpers
         public List<string> descriptions;
         public bool templates;
         public List<string> userInfoGroups;
+        public bool avatar;
 
-        public User(string id, string name, string email, string group, List<string> reviewGroups, Dictionary<string, object> commentGroups, List<string> userInfoGroups, bool? favorite, List<string> deniedPermissions, List<string> descriptions, bool templates)
+        public User(string id, string name, string email, string group, List<string> reviewGroups, Dictionary<string, object> commentGroups, List<string> userInfoGroups, bool? favorite, List<string> deniedPermissions, List<string> descriptions, bool templates, bool avatar)
         {
             this.id = id;
             this.name = name;
@@ -200,6 +248,7 @@ namespace OnlineEditorsExampleMVC.Helpers
             this.descriptions = descriptions;
             this.templates = templates;
             this.userInfoGroups = userInfoGroups;
+            this.avatar = avatar;
         }
     }
 }

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

@@ -88,7 +88,7 @@ namespace OnlineEditorsExampleMVC.Models
                 editorsMode = "fillForms";
                 canEdit = true;
             }
-            var submitForm = editorsMode.Equals("fillForms") && id.Equals("uid-1") && false;  // check if the Submit form button is displayed or not
+            var submitForm = editorsMode.Equals("fillForms") && id.Equals("uid-1");  // check if the Submit form button is displayed or not
             var mode = canEdit && editorsMode != "view" ? "edit" : "view";  // set the mode parameter: change it to view if the document can't be edited
 
             // favorite icon state
@@ -190,7 +190,8 @@ namespace OnlineEditorsExampleMVC.Models
                                         {
                                             { "id", !user.id.Equals("uid-0") ? user.id : null  },
                                             { "name", user.name },
-                                            { "group", user.group }
+                                            { "group", user.group },
+                                            { "image", user.avatar ? DocManagerHelper.GetServerUrl(false) + "/Content/images/" + user.id + ".png" : null}
                                         }
                                 },
                                 {
@@ -236,7 +237,7 @@ namespace OnlineEditorsExampleMVC.Models
         }
 
         // get a document which will be compared with the current document
-        public void GetCompareFileData(out string compareConfig)
+        public void GetDocumentData(out string compareConfig)
         {
             var jss = new JavaScriptSerializer();
 
@@ -320,7 +321,7 @@ namespace OnlineEditorsExampleMVC.Models
         }
 
         // get a mail merge config
-        public void GetMailMergeConfig(out string dataMailMergeRecipients)
+        public void GetSpreadsheetConfig(out string dataSpreadsheet)
         {
             var jss = new JavaScriptSerializer();
 
@@ -361,7 +362,7 @@ namespace OnlineEditorsExampleMVC.Models
                 mailMergeConfig.Add("token", mailmergeToken);  // and add it to the mail merge config
             }
 
-            dataMailMergeRecipients = jss.Serialize(mailMergeConfig);
+            dataSpreadsheet = jss.Serialize(mailMergeConfig);
         }
 
         //get a users for mentions
@@ -372,5 +373,22 @@ namespace OnlineEditorsExampleMVC.Models
             var user = Users.getUser(id);
             usersForMentions = !user.id.Equals("uid-0") ? jss.Serialize(Users.getUsersForMentions(user.id)) : null;
         }
+
+        public void GetUsersInfo(HttpRequest request, out string usersInfo)
+        {
+            var jss = new JavaScriptSerializer();
+            var id = request.Cookies.GetOrDefault("uid", null);
+            var user = Users.getUser(id);
+            usersInfo = jss.Serialize(Users.getUsersInfo(user.id));
+        }
+
+        //get a users for protect
+        public void GetUsersProtect(HttpRequest request, out string usersForProtect)
+        {
+            var jss = new JavaScriptSerializer();
+            var id = request.Cookies.GetOrDefault("uid", null);
+            var user = Users.getUser(id);
+            usersForProtect = !user.id.Equals("uid-0") ? jss.Serialize(Users.getUsersForProtect(user.id)) : null;
+        }
     }
 }

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

@@ -16,8 +16,13 @@
  *
  */
 
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.IO;
+using static OnlineEditorsExampleMVC.Models.FileUtility;
+using System.Linq;
+using System.Text;
 
 namespace OnlineEditorsExampleMVC.Models
 {
@@ -35,38 +40,176 @@ namespace OnlineEditorsExampleMVC.Models
         {
             var ext = Path.GetExtension(fileName).ToLower();
 
-            if (ExtsDocument.Contains(ext)) return FileType.Word;  // word type for document extensions
-            if (ExtsSpreadsheet.Contains(ext)) return FileType.Cell;  // cell type for spreadsheet extensions
-            if (ExtsPresentation.Contains(ext)) return FileType.Slide;  // slide type for presentation extensions
+            if (FormatManager.DocumentExtensions().Contains(ext)) return FileType.Word;  // word type for document extensions
+            if (FormatManager.SpreadsheetExtensions().Contains(ext)) return FileType.Cell;  // cell type for spreadsheet extensions
+            if (FormatManager.PresentationExtensions().Contains(ext)) return FileType.Slide;  // slide type for presentation extensions
 
             return FileType.Word;  // the default type is word
         }
+    }
 
-        // document extensions
-        public static readonly List<string> ExtsDocument = new List<string>
-            {
-                ".doc", ".docx", ".docm",
-                ".dot", ".dotx", ".dotm",
-                ".odt", ".fodt", ".ott", ".rtf", ".txt",
-                ".html", ".htm", ".mht", ".xml",
-                ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps", ".oform"
-            };
+    public class Format
+    {
+        public string Name { get; }
+        public FileType Type { get; }
+        public List<string> Actions { get; }
+        public List<string> Convert { get; }
+        public List<string> Mime { get; }
 
-        // spreadsheet extensions
-        public static readonly List<string> ExtsSpreadsheet = new List<string>
-            {
-                ".xls", ".xlsx", ".xlsm", ".xlsb",
-                ".xlt", ".xltx", ".xltm",
-                ".ods", ".fods", ".ots", ".csv"
-            };
+        public Format(string name, FileType type, List<string> actions, List<string> convert, List<string> mime)
+        {
+            Name = name;
+            Type = type;
+            Actions = actions;
+            Convert = convert;
+            Mime = mime;
+        }
 
-        // presentation extensions
-        public static readonly List<string> ExtsPresentation = new List<string>
+        public string Extension()
+        {
+            return "." + Name;
+        }
+    }
+
+    public static class FormatManager
+    {
+        private static List<Format> cachedFormats;
+        public static List<string> FillableExtensions()
+        {
+            return Fillable()
+                .Select(format => format.Extension())
+                .ToList();
+        }
+
+        public static List<Format> Fillable()
+        {
+            return All()
+                .Where(format => format.Actions.Contains("fill"))
+                .ToList();
+        }
+
+        public static List<string> ViewableExtensions()
+        {
+            return Viewable()
+                .Select(format => format.Extension())
+                .ToList();
+        }
+
+        public static List<Format> Viewable()
+        {
+            return All()
+                .Where(format => format.Actions.Contains("view"))
+                .ToList();
+        }
+
+        public static List<string> EditableExtensions()
+        {
+            return Editable()
+                .Select(format => format.Extension())
+                .ToList();
+        }
+
+        public static List<Format> Editable()
+        {
+            return All()
+                .Where(format => format.Actions.Contains("edit") || format.Actions.Contains("lossy-edit"))
+                .ToList();
+        }
+
+        public static List<string> ConvertibleExtensions()
+        {
+            return Convertible()
+                .Select(format => format.Extension())
+                .ToList();
+        }
+
+        public static List<Format> Convertible()
+        {
+            return All()
+                .Where(format => format.Actions.Contains("auto-convert"))
+                .ToList();
+        }
+
+        public static List<string> SpreadsheetExtensions()
+        {
+            return Spreadsheets()
+                .Select(format => format.Extension())
+                .ToList();
+        }
+
+        public static List<Format> Spreadsheets()
+        {
+            return All()
+                .Where(format => format.Type == FileType.Cell)
+                .ToList();
+        }
+
+        public static List<string> PresentationExtensions()
+        {
+            return Presentations()
+                .Select(format => format.Extension())
+                .ToList();
+        }
+
+        public static List<Format> Presentations()
+        {
+            return All()
+                .Where(format => format.Type == FileType.Slide)
+                .ToList();
+        }
+
+        public static List<string> DocumentExtensions()
+        {
+            return Documents()
+                .Select(format => format.Extension())
+                .ToList();
+        }
+
+        public static List<Format> Documents()
+        {
+            return All()
+                .Where(format => format.Type == FileType.Word)
+                .ToList();
+        }
+
+        public static List<string> AllExtensions()
+        {
+            return All()
+                .Select(format => format.Extension())
+                .ToList();
+        }
+
+        public static List<Format> All()
+        {
+            if (cachedFormats == null)
             {
-                ".pps", ".ppsx", ".ppsm",
-                ".ppt", ".pptx", ".pptm",
-                ".pot", ".potx", ".potm",
-                ".odp", ".fodp", ".otp"
-            };
+                var path = GetPath();
+                var lines = File.ReadLines(path, Encoding.UTF8);
+                var contents = string.Join(Environment.NewLine, lines);
+                var formats = JsonConvert.DeserializeObject<Format[]>(contents);
+                cachedFormats = formats.ToList();
+            }
+
+            return cachedFormats;
+        }
+
+        private static string GetPath()
+        {
+            string path = Path.Combine(GetDirectory(), "onlyoffice-docs-formats.json");
+            if (File.Exists(path))
+            {
+                return path;
+            }
+            else
+            {
+                throw new FileNotFoundException("The JSON file does not exist.");
+            }
+        }
+
+        private static string GetDirectory()
+        {
+            string directory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "assets", "document-formats");
+            return Path.GetFullPath(directory);
+        }
     }
 }

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

@@ -159,7 +159,6 @@
     <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" />
@@ -182,17 +181,23 @@
     <Content Include="WebEditor.ashx" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="assets\AUTHORS.md" />
-    <Content Include="assets\LICENSE" />
-    <Content Include="assets\new\new.docx" />
-    <Content Include="assets\new\new.docxf" />
-    <Content Include="assets\new\new.pptx" />
-    <Content Include="assets\new\new.xlsx" />
-    <Content Include="assets\sample\csv.csv" />
-    <Content Include="assets\sample\sample.docx" />
-    <Content Include="assets\sample\sample.docxf" />
-    <Content Include="assets\sample\sample.pptx" />
-    <Content Include="assets\sample\sample.xlsx" />
+    <Content Include="assets\document-templates\AUTHORS.md" />
+    <Content Include="assets\document-templates\LICENSE" />
+    <Content Include="assets\document-templates\new\new.docx" />
+    <Content Include="assets\document-templates\new\new.docxf" />
+    <Content Include="assets\document-templates\new\new.pptx" />
+    <Content Include="assets\document-templates\new\new.xlsx" />
+    <Content Include="assets\document-templates\README.md" />
+    <Content Include="assets\document-templates\sample\csv.csv" />
+    <Content Include="assets\document-templates\sample\sample.docx" />
+    <Content Include="assets\document-templates\sample\sample.docxf" />
+    <Content Include="assets\document-templates\sample\sample.pptx" />
+    <Content Include="assets\document-templates\sample\sample.xlsx" />
+    <Content Include="assets\document-formats\AUTHORS.md" />
+    <Content Include="assets\document-formats\CHANGELOG.md" />
+    <Content Include="assets\document-formats\LICENSE" />
+    <Content Include="assets\document-formats\onlyoffice-docs-formats.json" />
+    <Content Include="assets\document-formats\README.md" />
     <None Include="packages.config" />
   </ItemGroup>
   <PropertyGroup>

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

@@ -129,17 +129,21 @@
         };
 
         // the user is trying to select document for comparing by clicking the Document from Storage button
-        var onRequestCompareFile = function () {
-            <% string compareFileData; %>
-            <% Model.GetCompareFileData(out compareFileData); %>
-            docEditor.setRevisedFile(<%=compareFileData%>);  // select a document for comparing
+        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
         };
 
         // the user is trying to select recipients data by clicking the Mail merge button
-        var onRequestMailMergeRecipients = function (event) {
-            <% string dataMailMergeRecipients; %>
-            <% Model.GetMailMergeConfig(out dataMailMergeRecipients); %>
-            docEditor.setMailMergeRecipients(<%= dataMailMergeRecipients%>);  // insert recipient data for mail merge into the file
+        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 onRequestSaveAs = function (event) {  //  the user is trying to save file by clicking Save Copy as... button
@@ -178,15 +182,39 @@
             }
         };
 
+        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
-            event.data.directUrl = !!config.document.directUrl;
+            innerAlert("onRequestReferenceData");
+
+            requestReference(event.data, function (data) {
+                docEditor.setReferenceData(data);
+            });
+        };
+
+        var requestReference = function (data, callback) {
+            innerAlert(data);
+            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(event.data));
+            xhr.send(JSON.stringify(data));
             xhr.onload = function () {
                 console.log(xhr.responseText);
-                docEditor.setReferenceData(JSON.parse(xhr.responseText));
+                callback(JSON.parse(xhr.responseText));
             }
         };
 
@@ -244,12 +272,16 @@
             "onMakeActionLink": onMakeActionLink,
             "onMetaChange": onMetaChange,
             "onRequestInsertImage": onRequestInsertImage,
-            "onRequestCompareFile": onRequestCompareFile,
-            "onRequestMailMergeRecipients": onRequestMailMergeRecipients,
+            "onRequestSelectDocument": onRequestSelectDocument,
+            "onRequestSelectSpreadsheet": onRequestSelectSpreadsheet,
         };
 
         <% string usersForMentions; %>
         <% Model.GetUsersMentions(Request, out usersForMentions); %>
+        <% string usersInfo; %>
+        <% Model.GetUsersInfo(Request, out usersInfo); %>
+        <% string usersForProtect; %>
+        <% Model.GetUsersProtect(Request, out usersForProtect); %>
 
         if (config.editorConfig.user.id) {
             // the user is trying to show the document version history
@@ -265,9 +297,32 @@
             // add mentions for not anonymous users
             <% if (!string.IsNullOrEmpty(usersForMentions))
             { %>
-                config.events['onRequestUsers'] = function () {
-                    docEditor.setUsers({  // set a list of users to mention in the comments
-                        "users": <%= usersForMentions %>
+                config.events['onRequestUsers'] = function (event) {
+                    if (event && event.data){
+                        var c = event.data.c;
+                    }
+                    switch (c) {
+                        case "info":
+                            users = [];
+                            var allUsers = <%= usersInfo %>;
+                            for (var i = 0; i < event.data.id.length; i++) {
+                                for (var j = 0; j < allUsers.length; j++) {
+                                    if (allUsers[j].id == event.data.id[i]) {
+                                        users.push(allUsers[j]);
+                                        break;
+                                    }
+                                }
+                            }
+                            break;
+                        case "protect":
+                            var users = <%= usersForProtect %>;
+                            break;
+                        default:
+                            users = <%= usersForMentions %>;
+                    }
+                    docEditor.setUsers({
+                        "c": c,
+                        "users": users,
                     });
                 };
             <% } %>
@@ -283,6 +338,7 @@
             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/Views/Home/Index.aspx

@@ -13,6 +13,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width" />
+    <meta name="server-version" content=<%= DocManagerHelper.GetVersion() %> />
     <!--
     *
     * (c) Copyright Ascensio System SIA 2023

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

@@ -453,7 +453,7 @@ namespace OnlineEditorsExampleMVC
         private static void Assets(HttpContext context)
         {
             var fileName = Path.GetFileName(context.Request["filename"]);
-            var filePath = HttpRuntime.AppDomainAppPath + "assets/sample/" + fileName;
+            var filePath = HttpRuntime.AppDomainAppPath + "assets/document-templates/sample/" + fileName;
             download(filePath, context);
         }
 
@@ -461,7 +461,7 @@ namespace OnlineEditorsExampleMVC
         private static void GetCsv(HttpContext context)
         {
             var fileName = "csv.csv";
-            var filePath = HttpRuntime.AppDomainAppPath + "assets/sample/" + fileName;
+            var filePath = HttpRuntime.AppDomainAppPath + "assets/document-templates/sample/" + fileName;
             download(filePath, context);
         }
 
@@ -812,6 +812,27 @@ namespace OnlineEditorsExampleMVC
                 }
             }
 
+            if (fileName == "" && body.ContainsKey("link"))
+            {
+                string link = body["link"].ToString();
+                if (!link.Contains(DocManagerHelper.GetServerUrl(false)))
+                {
+                    context.Response.Write(jss.Serialize(new Dictionary<string, string>() {
+                        { "url", link },
+                        { "directUrl", link }
+                    }));
+                    return;
+                }
+
+                Uri linkUri = new Uri(link);
+                fileName = HttpUtility.ParseQueryString(linkUri.Query).Get("fileName");
+                if (string.IsNullOrEmpty(fileName) || !File.Exists(DocManagerHelper.StoragePath(fileName, null)))
+                {
+                    context.Response.Write("{ \"error\": \"File is not exist\"}");
+                    return;
+                }
+            }
+
             if (fileName == "")
             {
                 try
@@ -840,6 +861,7 @@ 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>()
@@ -852,7 +874,8 @@ namespace OnlineEditorsExampleMVC
                     { "instanceId", DocManagerHelper.GetServerUrl(false) }
                 }
             },
-            { "path", fileName }
+            { "path", fileName },
+            { "link", DocManagerHelper.GetServerUrl(false) + "Editor?fileName=" + fileName }
             };
 
             if (JwtManager.Enabled)

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

@@ -1,15 +1,12 @@
 <?xml version="1.0"?>
 <appSettings>
   <clear />
-  <add key="version" value="1.6.0"/>
+  <add key="version" value="1.7.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"/>
-  <add key="files.docservice.edited-docs" value=".csv|.docm|.docx|.docxf|.dotm|.dotx|.epub|.fb2|.html|.odp|.ods|.odt|.otp|.ots|.ott|.potm|.potx|.ppsm|.ppsx|.pptm|.pptx|.rtf|.txt|.xlsm|.xlsx|.xltm|.xltx"/>
-  <add key="files.docservice.convert-docs" value=".doc|.dot|.dps|.dpt|.epub|.et|.ett|.fb2|.fodp|.fods|.fodt|.htm|.html|.mht|.mhtml|.odp|.ods|.odt|.otp|.ots|.ott|.pot|.pps|.ppt|.rtf|.stw|.sxc|.sxi|.sxw|.wps|.wpt|.xls|.xlsb|.xlt|.xml"/>
   <add key="files.docservice.timeout" value="120000" />
   <add key="files.docservice.secret" value="" />
   <add key="files.docservice.header" value="Authorization" />
@@ -18,7 +15,7 @@
 
   <add key="files.docservice.verify-peer-off" value="true"/>
 
-  <add key="files.docservice.languages" value="en:English|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA: Test Language"/>
+  <add key="files.docservice.languages" value="en:English|ar:Arabic|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sr-Latn-CS:Serbian|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA: Test Language"/>
 
   <add key="files.docservice.url.site" value="http://documentserver/"/>
 

web/documentserver-example/csharp/Default.aspx

@@ -13,6 +13,7 @@
 <head runat="server">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta name="viewport" content="width=device-width" />
+    <meta name="server-version" content=<%= GetVersion() %> />
     <title>ONLYOFFICE</title>
     <!--
     *

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

@@ -30,49 +30,15 @@ using ASC.Api.DocumentConverter;
 
 namespace OnlineEditorsExample
 {
-    internal static class FileType
-    {
-        // the spreadsheet extension list
-        public static readonly List<string> ExtsSpreadsheet = new List<string>
-            {
-                ".xls", ".xlsx", ".xlsm", ".xlsb",
-                ".xlt", ".xltx", ".xltm",
-                ".ods", ".fods", ".ots", ".csv"
-            };
-
-        // the presentation extension list
-        public static readonly List<string> ExtsPresentation = new List<string>
-            {
-                ".pps", ".ppsx", ".ppsm",
-                ".ppt", ".pptx", ".pptm",
-                ".pot", ".potx", ".potm",
-                ".odp", ".fodp", ".otp"
-            };
-
-        // the document extension list
-        public static readonly List<string> ExtsDocument = new List<string>
-            {
-                ".doc", ".docx", ".docm",
-                ".dot", ".dotx", ".dotm",
-                ".odt", ".fodt", ".ott", ".rtf", ".txt",
-                ".html", ".htm", ".mht", ".xml",
-                ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps", ".oform"
-            };
-
-        // get an internal file extension
-        public static string GetInternalExtension(string extension)
-        {
-            extension = Path.GetExtension(extension).ToLower();  // get file extension
-            if (ExtsDocument.Contains(extension)) return ".docx";  // .docx for text document extensions
-            if (ExtsSpreadsheet.Contains(extension)) return ".xlsx";  // .xlsx for spreadsheet extensions
-            if (ExtsPresentation.Contains(extension)) return ".pptx";  // .pptx for presentation extensions
-            return string.Empty;
-        }
-    }
-
     public partial class _Default : Page
     {
 
+        //get server version
+        public static string GetVersion()
+        {
+            return WebConfigurationManager.AppSettings["version"];
+        }
+        
         // get the virtual path
         public static string VirtualPath
         {
@@ -115,24 +81,24 @@ namespace OnlineEditorsExample
         // file extensions that can be viewed
         private static List<string> ViewedExts
         {
-            get { return (WebConfigurationManager.AppSettings["files.docservice.viewed-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
+            get { return FormatManager.ViewableExtensions(); }
         }
-        
+
         public static List<string> FillFormsExts
         {
-            get { return (WebConfigurationManager.AppSettings["files.docservice.fillform-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
+            get { return FormatManager.FillableExtensions(); }
         }
 
         // file extensions that can be edited
         public static List<string> EditedExts
         {
-            get { return (WebConfigurationManager.AppSettings["files.docservice.edited-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
+            get { return FormatManager.EditableExtensions(); }
         }
 
         // file extensions that can be converted
         public static List<string> ConvertExts
         {
-            get { return (WebConfigurationManager.AppSettings["files.docservice.convert-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
+            get { return FormatManager.ConvertibleExtensions(); }
         }
 
         private static string _fileName;
@@ -284,9 +250,9 @@ namespace OnlineEditorsExample
         {
             var ext = Path.GetExtension(fileName).ToLower();
 
-            if (FileType.ExtsDocument.Contains(ext)) return "word";  // word for text document extensions
-            if (FileType.ExtsSpreadsheet.Contains(ext)) return "cell";  // cell for spreadsheet extensions
-            if (FileType.ExtsPresentation.Contains(ext)) return "slide";  // slide for presentation extensions
+            if (FormatManager.DocumentExtensions().Contains(ext)) return "word";  // word for text document extensions
+            if (FormatManager.SpreadsheetExtensions().Contains(ext)) return "cell";  // cell for spreadsheet extensions
+            if (FormatManager.PresentationExtensions().Contains(ext)) return "slide";  // slide for presentation extensions
 
             return "word";  // the default document type is word
         }
@@ -538,7 +504,12 @@ 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
 

web/documentserver-example/csharp/DocEditor.aspx

@@ -145,13 +145,17 @@
         };
 
         // the user is trying to select document for comparing by clicking the Document from Storage button
-        var onRequestCompareFile = function () {
-            docEditor.setRevisedFile(<%= CompareFileData %>);  // select a document for comparing
+        var onRequestSelectDocument = function (event) {
+            var data = <%= DocumentData %>;
+            data.c = event.data.c;
+            docEditor.setRequestedDocument(data);  // select a document for comparing
         };
 
         // the user is trying to select recipients data by clicking the Mail merge button
-        var onRequestMailMergeRecipients = function (event) {
-            docEditor.setMailMergeRecipients(<%= DataMailMergeRecipients %>);  // insert recipient data for mail merge into the file
+        var onRequestSelectSpreadsheet = function (event) {
+            var data = <%= DataSpreadsheet %>;
+            data.c = event.data.c;
+            docEditor.setRequestedSpreadsheet(data);  // insert recipient data for spreadsheet into the file
         };
 
         var onRequestSaveAs = function (event) {  //  the user is trying to save file by clicking Save Copy as... button
@@ -190,16 +194,42 @@
             }
         };
 
-        var onRequestReferenceData = function (event) {  // user refresh external data source
+        var onRequestOpen = function (event) {  // user open external data source
+            innerAlert("onRequestOpen");
+            var windowName = event.data.windowName;
 
-            event.data.directUrl = !!config.document.directUrl;
+            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;
             let xhr = new XMLHttpRequest();
             xhr.open("POST", "webeditor.ashx?type=reference");
             xhr.setRequestHeader("Content-Type", "application/json");
-            xhr.send(JSON.stringify(event.data));
+            xhr.send(JSON.stringify(data));
             xhr.onload = function () {
                 console.log(xhr.responseText);
-                docEditor.setReferenceData(JSON.parse(xhr.responseText));
+                callback(JSON.parse(xhr.responseText));
             }
         };
 
@@ -216,8 +246,8 @@
             'onMakeActionLink': onMakeActionLink,
             'onMetaChange': onMetaChange,
             'onRequestInsertImage': onRequestInsertImage,
-            'onRequestCompareFile': onRequestCompareFile,
-            "onRequestMailMergeRecipients": onRequestMailMergeRecipients,
+            'onRequestSelectDocument': onRequestSelectDocument,
+            "onRequestSelectSpreadsheet": onRequestSelectSpreadsheet,
         };
 
         if (config.editorConfig.user.id) {
@@ -268,9 +298,32 @@
             // add mentions for not anonymous users
             <% if (!string.IsNullOrEmpty(UsersForMentions))
             { %>
-                config.events['onRequestUsers'] = function () {
-                    docEditor.setUsers({  // set a list of users to mention in the comments
-                        "users": <%= UsersForMentions %>
+                config.events['onRequestUsers'] = function (event) {
+                    if (event && event.data){
+                        var c = event.data.c;
+                    }
+                    switch (c) {
+                        case "info":
+                            users = [];
+                            var allUsers = <%= UsersInfo %>;
+                            for (var i = 0; i < event.data.id.length; i++) {
+                                for (var j = 0; j < allUsers.length; j++) {
+                                    if (allUsers[j].id == event.data.id[i]) {
+                                        users.push(allUsers[j]);
+                                        break;
+                                    }
+                                }
+                            }
+                            break;
+                        case "protect":
+                            var users = <%= UsersForProtect %>;
+                            break;
+                        default:
+                            users = <%= UsersForMentions %>;
+                    }
+                    docEditor.setUsers({
+                        "c": c,
+                        "users": users,
                     });
                 };
             <% } %>
@@ -286,6 +339,7 @@
             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

@@ -61,9 +61,11 @@ namespace OnlineEditorsExample
 
         protected string DocConfig { get; private set; }
         protected string InsertImageConfig { get; private set; }
-        protected string CompareFileData { get; private set; }
-        protected string DataMailMergeRecipients { get; private set; }
+        protected string DocumentData { get; private set; }
+        protected string DataSpreadsheet { get; private set; }
         protected string UsersForMentions { get; private set; }
+        protected string UsersInfo { get; private set; }
+        protected string UsersForProtect { get; private set; }
         protected string DocumentType { get { return _Default.DocumentType(FileName); } }
 
         // get callback url
@@ -152,7 +154,7 @@ namespace OnlineEditorsExample
                 editorsMode = "fillForms";
                 canEdit = true;
             }            
-            var submitForm = editorsMode.Equals("fillForms") && id.Equals("uid-1") && false;  // check if the Submit form button is displayed or hidden
+            var submitForm = editorsMode.Equals("fillForms") && id.Equals("uid-1");  // check if the Submit form button is displayed or hidden
             var mode = canEdit && editorsMode != "view" ? "edit" : "view";  // get the editor opening mode (edit or view)
 
             var jss = new JavaScriptSerializer();
@@ -256,7 +258,8 @@ namespace OnlineEditorsExample
                                         {
                                             { "id", !user.id.Equals("uid-0") ? user.id : null },
                                             { "name",  user.name },
-                                            { "group", user.group }
+                                            { "group", user.group },
+                                            { "image", user.avatar ? _Default.GetServerUrl(false) + "/App_Themes/images/"+ user.id + ".png" : null }
                                         }
                                 },
                                 {
@@ -308,15 +311,22 @@ namespace OnlineEditorsExample
 
                 // a document which will be compared with the current document
                 Dictionary<string, object> compareFile = GetCompareFile();
-                CompareFileData = jss.Serialize(compareFile);
+                DocumentData = jss.Serialize(compareFile);
 
-                // recipient data for mail merging
-                Dictionary<string, object> mailMergeConfig = GetMailMergeConfig();
-                DataMailMergeRecipients = jss.Serialize(mailMergeConfig);
+                // recipient data for spreadsheet
+                Dictionary<string, object> spreadsheetConfig = GetSpreadsheetConfig();
+                DataSpreadsheet = jss.Serialize(spreadsheetConfig);
 
                 // get users for mentions
                 List<Dictionary<string, object>> usersData = Users.getUsersForMentions(user.id);
                 UsersForMentions = !user.id.Equals("uid-0") ? jss.Serialize(usersData) : null;
+
+                List<Dictionary<string, object>> usersInfo = Users.getUsersInfo(user.id);
+                UsersInfo = jss.Serialize(usersData);
+
+                // get users for protect
+                List<Dictionary<string, object>> usersProtectData = Users.getUsersForProtect(user.id);
+                UsersForProtect = !user.id.Equals("uid-0") ? jss.Serialize(usersProtectData) : null;
             }
             catch { }
         }
@@ -393,43 +403,43 @@ namespace OnlineEditorsExample
             return dataCompareFile;
         }
 
-        // get a mail merge config
-        private Dictionary<string, object> GetMailMergeConfig()
+        // get a spreadsheet config
+        private Dictionary<string, object> GetSpreadsheetConfig()
         {
-            // get the path to the recipients data for mail merging
-            var mailmergeUrl = new UriBuilder(_Default.GetServerUrl(true));
-            mailmergeUrl.Path =
+            // get the path to the recipients data for spreadsheet
+            var spreadsheetUrl = new UriBuilder(_Default.GetServerUrl(true));
+            spreadsheetUrl.Path =
                     HttpRuntime.AppDomainAppVirtualPath
                     + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
                     + "webeditor.ashx";
-            mailmergeUrl.Query = "type=csv";
+            spreadsheetUrl.Query = "type=csv";
 
-            var DirectMailMergeUrl = new UriBuilder(_Default.GetServerUrl(false));
-            DirectMailMergeUrl.Path =
+            var DirectSpreadsheetUrl = new UriBuilder(_Default.GetServerUrl(false));
+            DirectSpreadsheetUrl.Path =
                     HttpRuntime.AppDomainAppVirtualPath
                     + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
                     + "webeditor.ashx";
-            DirectMailMergeUrl.Query = "type=csv";
+            DirectSpreadsheetUrl.Query = "type=csv";
 
-            // create a mail merge config
-            Dictionary<string, object> mailMergeConfig = new Dictionary<string, object>
+            // create a spreadsheet config
+            Dictionary<string, object> spreadsheetConfig = new Dictionary<string, object>
                 {
                     { "fileType", "csv" },
-                    { "url", mailmergeUrl.ToString() }
+                    { "url", spreadsheetUrl.ToString() }
                 };
 
             if (_Default.IsEnabledDirectUrl())
             {
-                mailMergeConfig.Add("directUrl", DirectMailMergeUrl.ToString());
+                spreadsheetConfig.Add("directUrl", DirectSpreadsheetUrl.ToString());
             }
 
             if (JwtManager.Enabled)  // if the secret key to generate token exists
             {
-                var mailmergeToken = JwtManager.Encode(mailMergeConfig);  // encode mailMergeConfig into the token
-                mailMergeConfig.Add("token", mailmergeToken);  // and add it to the mail merge config
+                var spreadsheetToken = JwtManager.Encode(spreadsheetConfig);  // encode spreadsheetConfig into the token
+                spreadsheetConfig.Add("token", spreadsheetToken);  // and add it to the spreadsheet config
             }
 
-            return mailMergeConfig;
+            return spreadsheetConfig;
         }
 
         // get image url for templates
@@ -484,7 +494,7 @@ namespace OnlineEditorsExample
                     return;
             }
             var demoName = (string.IsNullOrEmpty(sample) ? "new" : "sample") + ext;  // create demo document name with the necessary extension
-            var demoPath = "assets\\" + (string.IsNullOrEmpty(sample) ? "new\\" : "sample\\");  // and put this file into the assets directory
+            var demoPath = "assets\\document-templates\\" + (string.IsNullOrEmpty(sample) ? "new\\" : "sample\\");  // and put this file into the assets directory
 
             FileName = _Default.GetCorrectName(demoName);  // get file name with an index if such a file name already exists
 

web/documentserver-example/csharp/FormatManager.cs

@@ -0,0 +1,192 @@
+/**
+ *
+ * (c) Copyright Ascensio System SIA 2023
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using Newtonsoft.Json;
+
+namespace OnlineEditorsExample
+{
+    public class Format
+    {
+        public string Name { get; }
+        public string Type { get; }
+        public List<string> Actions { get; }
+        public List<string> Convert { get; }
+        public List<string> Mime { get; }
+
+        public Format(string name, string type, List<string> actions, List<string> convert, List<string> mime)
+        {
+            Name = name;
+            Type = type;
+            Actions = actions;
+            Convert = convert;
+            Mime = mime;
+        }
+
+        public string Extension()
+        {
+            return "." + Name;
+        }
+    }
+
+    public class FormatManager
+    {
+        private static List<Format> cachedFormats;
+
+        public static List<string> FillableExtensions()
+        {
+            return Fillable()
+                .Select(format => format.Extension())
+                .ToList();
+        }
+
+        public static List<Format> Fillable()
+        {
+            return All()
+                .Where(format => format.Actions.Contains("fill"))
+                .ToList();
+        }
+
+        public static List<string> ViewableExtensions()
+        {
+            return Viewable()
+                .Select(format => format.Extension())
+                .ToList();
+        }
+
+        public static List<Format> Viewable()
+        {
+            return All()
+                .Where(format => format.Actions.Contains("view"))
+                .ToList();
+        }
+
+        public static List<string> EditableExtensions()
+        {
+            return Editable()
+                .Select(format => format.Extension())
+                .ToList();
+        }
+
+        public static List<Format> Editable()
+        {
+            return All()
+                .Where(format => format.Actions.Contains("edit") || format.Actions.Contains("lossy-edit"))
+                .ToList();
+        }
+
+        public static List<string> ConvertibleExtensions()
+        {
+            return Convertible()
+                .Select(format => format.Extension())
+                .ToList();
+        }
+
+        public static List<Format> Convertible()
+        {
+            return All()
+                .Where(format => format.Actions.Contains("auto-convert"))
+                .ToList();
+        }
+
+        public static List<string> SpreadsheetExtensions()
+        {
+            return Spreadsheets()
+                .Select(format => format.Extension())
+                .ToList();
+        }
+
+        public static List<Format> Spreadsheets()
+        {
+            return All()
+                .Where(format => format.Type == "cell")
+                .ToList();
+        }
+
+        public static List<string> PresentationExtensions()
+        {
+            return Presentations()
+                .Select(format => format.Extension())
+                .ToList();
+        }
+
+        public static List<Format> Presentations()
+        {
+            return All()
+                .Where(format => format.Type == "slide")
+                .ToList();
+        }
+
+        public static List<string> DocumentExtensions()
+        {
+            return Documents()
+                .Select(format => format.Extension())
+                .ToList();
+        }
+
+        public static List<Format> Documents()
+        {
+            return All()
+                .Where(format => format.Type == "word")
+                .ToList();
+        }
+
+        public static List<string> AllExtensions()
+        {
+            return All()
+                .Select(format => format.Extension())
+                .ToList();
+        }
+
+        public static List<Format> All()
+        {
+            if (cachedFormats == null) { 
+                var path = GetPath();
+                var lines = File.ReadLines(path, Encoding.UTF8);
+                var contents = string.Join(Environment.NewLine, lines);
+                var formats = JsonConvert.DeserializeObject<Format[]>(contents);
+                cachedFormats = formats.ToList();
+            }
+
+            return cachedFormats;
+        }
+
+        private static string GetPath()
+        {
+            string path = Path.Combine(GetDirectory(), "onlyoffice-docs-formats.json");
+            if (File.Exists(path))
+            {
+                return path;
+            }
+            else
+            {
+                throw new FileNotFoundException("The JSON file does not exist.");
+            }
+        }
+
+        private static string GetDirectory()
+        {
+            string directory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "assets", "document-formats");
+            return Path.GetFullPath(directory);
+        }
+    }
+}

web/documentserver-example/csharp/OnlineEditorsExample.csproj

@@ -119,6 +119,7 @@
       <DependentUpon>DocEditor.aspx</DependentUpon>
     </Compile>
     <Compile Include="DocumentConverter.cs" />
+    <Compile Include="FormatManager.cs" />
     <Compile Include="JwtManager.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Default.aspx.cs">
@@ -148,7 +149,6 @@
     <Content Include="App_Themes\jquery-ui.css" />
     <Content Include="App_Themes\stylesheet.css" />
     <Content Include="DocEditor.aspx" />
-    <Content Include="script\jquery-1.9.0.min.js" />
     <Content Include="script\jquery-ui.min.js" />
     <Content Include="script\jquery.blockUI.js" />
     <Content Include="script\jquery.dropdownToggle.js" />
@@ -158,17 +158,23 @@
     <Content Include="WebEditor.ashx" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="assets\AUTHORS.md" />
-    <Content Include="assets\LICENSE" />
-    <Content Include="assets\new\new.docx" />
-    <Content Include="assets\new\new.docxf" />
-    <Content Include="assets\new\new.pptx" />
-    <Content Include="assets\new\new.xlsx" />
-    <Content Include="assets\sample\csv.csv" />
-    <Content Include="assets\sample\sample.docx" />
-    <Content Include="assets\sample\sample.docxf" />
-    <Content Include="assets\sample\sample.pptx" />
-    <Content Include="assets\sample\sample.xlsx" />
+    <Content Include="assets\document-formats\AUTHORS.md" />
+    <Content Include="assets\document-formats\CHANGELOG.md" />
+    <Content Include="assets\document-formats\LICENSE" />
+    <Content Include="assets\document-formats\onlyoffice-docs-formats.json" />
+    <Content Include="assets\document-formats\README.md" />
+    <Content Include="assets\document-templates\AUTHORS.md" />
+    <Content Include="assets\document-templates\LICENSE" />
+    <Content Include="assets\document-templates\new\new.docx" />
+    <Content Include="assets\document-templates\new\new.docxf" />
+    <Content Include="assets\document-templates\new\new.pptx" />
+    <Content Include="assets\document-templates\new\new.xlsx" />
+    <Content Include="assets\document-templates\README.md" />
+    <Content Include="assets\document-templates\sample\csv.csv" />
+    <Content Include="assets\document-templates\sample\sample.docx" />
+    <Content Include="assets\document-templates\sample\sample.docxf" />
+    <Content Include="assets\document-templates\sample\sample.pptx" />
+    <Content Include="assets\document-templates\sample\sample.xlsx" />
     <None Include="packages.config" />
   </ItemGroup>
   <PropertyGroup>

web/documentserver-example/csharp/TrackManager.cs

@@ -258,6 +258,22 @@ namespace OnlineEditorsExample
                     var action = jss.Deserialize<Dictionary<string, object>>(jss.Serialize(actions[0]));
                     var user = action["userid"].ToString();  // get the user id
                     DocEditor.CreateMeta(fileName, user, "Filling Form", userAddress);  // create meta data for the forcesaved file
+
+                    string formsDataUrl = fileData["formsdataurl"].ToString();
+
+                    if (!string.IsNullOrEmpty(formsDataUrl))
+                    {
+                        string formsName = _Default.GetCorrectName(Path.GetFileNameWithoutExtension(fileName) + ".txt", userAddress);
+                        string formsPath = _Default.StoragePath(formsName, userAddress);
+
+                        var bytesForms = DownloadFile(formsDataUrl);
+
+                        SaveFile(bytesForms, formsPath);
+                    }
+                    else
+                    {
+                        throw new Exception("Document editing service did not return formsDataUrl");
+                    }
                 }
             }
             catch (Exception)

web/documentserver-example/csharp/Users.cs

@@ -30,7 +30,9 @@ namespace OnlineEditorsExample
             "Can perform all actions with comments",
             "The file favorite state is undefined",
             "Can create files from templates using data from the editor",
-            "Can see the information about all users"
+            "Can see the information about all users",
+            "Has an avatar",
+            "Can submit forms"
         };
 
         static List<string> descr_user_2 = new List<string>()
@@ -40,7 +42,9 @@ namespace OnlineEditorsExample
             "Can view comments, edit his own comments and comments left by users with no group. Can remove his own comments only",
             "This file is marked as favorite",
             "Can create new files from the editor",
-            "Can see the information about users from Group2 and users who don’t belong to any group"
+            "Can see the information about users from Group2 and users who don’t belong to any group",
+            "Has an avatar",
+            "Can’t submit forms"
         };
 
         static List<string> descr_user_3 = new List<string>()
@@ -53,7 +57,8 @@ namespace OnlineEditorsExample
             "Can’t download the file",
             "Can’t print the file",
             "Can create new files from the editor",
-            "Can see the information about Group2 users"
+            "Can see the information about Group2 users",
+            "Can’t submit forms"
         };
 
         static List<string> descr_user_0 = new List<string>()
@@ -70,6 +75,7 @@ namespace OnlineEditorsExample
             "Can't view chat",
             "Can't protect file",
             "View file without collaboration",
+            "Can’t submit forms"
         };
 
         private static List<User> users = new List<User>() {
@@ -84,6 +90,7 @@ namespace OnlineEditorsExample
                     null,
                     new List<string>(),
                     descr_user_1,
+                    true,
                     true
                 ),
             new User(
@@ -102,12 +109,13 @@ namespace OnlineEditorsExample
                     true,
                     new List<string>(),
                     descr_user_2,
-                    false
+                    false,
+                    true
                 ),
             new User(
                     "uid-3",
                     "Hamish Mitchell",
-                    "mitchell@example.com",
+                    null,
                     "group-3",
                     new List<string>() { "group-2" },
                     new Dictionary<string,object>()
@@ -120,6 +128,7 @@ namespace OnlineEditorsExample
                     false,
                     new List<string>() { "copy", "download", "print" },
                     descr_user_3,
+                    false,
                     false
                 ),
             new User(
@@ -133,6 +142,7 @@ namespace OnlineEditorsExample
                     null,
                     new List<string>() { "protect" },
                     descr_user_0,
+                    false,
                     false
                 )
         };
@@ -171,6 +181,44 @@ namespace OnlineEditorsExample
             }
             return usersData;
         }
+
+        public static List<Dictionary<string, object>> getUsersInfo(string id)
+        {
+            List<Dictionary<string, object>> usersData = new List<Dictionary<string, object>>();
+            if(id != "uid-0"){
+                foreach (User user in users)
+                {
+                    usersData.Add(new Dictionary<string, object>()
+                    {
+                        {"id", user.id},
+                        {"name", user.name },
+                        {"email", user.email },
+                        {"image", user.avatar ? _Default.GetServerUrl(false) + "/App_Themes/images/"+ user.id + ".png" : null }
+                    });
+                }
+            }
+            return usersData;
+        }
+
+        // get a list of users with their names and emails for protect
+        public static List<Dictionary<string, object>> getUsersForProtect(string id)
+        {
+            List<Dictionary<string, object>> usersData = new List<Dictionary<string, object>>();
+
+            foreach (User user in users)
+            {
+                if (!user.id.Equals(id) && user.name != null)
+                {
+                    usersData.Add(new Dictionary<string, object>()
+                    {
+                        {"name", user.name },
+                        {"email", user.email },
+                        {"id", user.id}
+                    });
+                }
+            }
+            return usersData;
+        }
     }
 
     public class User
@@ -186,8 +234,9 @@ namespace OnlineEditorsExample
         public List<string> descriptions;
         public bool templates;
         public List<string> userInfoGroups;
+        public bool avatar;
 
-        public User(string id, string name, string email, string group, List<string> reviewGroups, Dictionary<string, object> commentGroups, List<string> userInfoGroups, bool? favorite, List<string> deniedPermissions, List<string> descriptions, bool templates)
+        public User(string id, string name, string email, string group, List<string> reviewGroups, Dictionary<string, object> commentGroups, List<string> userInfoGroups, bool? favorite, List<string> deniedPermissions, List<string> descriptions, bool templates, bool avatar)
         {
             this.id = id;
             this.name = name;
@@ -200,6 +249,7 @@ namespace OnlineEditorsExample
             this.descriptions = descriptions;
             this.templates = templates;
             this.userInfoGroups = userInfoGroups;
+            this.avatar = avatar;
         }
     }
 }

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

@@ -29,6 +29,7 @@ using System.Net;
 using System.Collections;
 using System.Net.Sockets;
 using ASC.Api.DocumentConverter;
+using Newtonsoft.Json;
 
 namespace OnlineEditorsExample
 {
@@ -275,7 +276,7 @@ namespace OnlineEditorsExample
         private static void Assets(HttpContext context)
         {
             var fileName = Path.GetFileName(context.Request["filename"]);
-            var filePath = HttpRuntime.AppDomainAppPath + "assets/sample/" + fileName;
+            var filePath = HttpRuntime.AppDomainAppPath + "assets/document-templates/sample/" + fileName;
             download(filePath, context);
         }
 
@@ -283,7 +284,7 @@ namespace OnlineEditorsExample
         private static void GetCsv(HttpContext context)
         {
             var fileName = "csv.csv";
-            var filePath = HttpRuntime.AppDomainAppPath + "assets/sample/" + fileName;
+            var filePath = HttpRuntime.AppDomainAppPath + "assets/document-templates/sample/" + fileName;
             download(filePath, context);
         }
 
@@ -622,6 +623,27 @@ namespace OnlineEditorsExample
                 }
             }
 
+            if (fileName == "" && body.ContainsKey("link"))
+            {
+                string link = body["link"].ToString();
+                if (!link.Contains(_Default.GetServerUrl(false)))
+                {
+                    context.Response.Write(jss.Serialize(new Dictionary<string, string>() {
+                        { "url", link },
+                        { "directUrl", link }
+                    }));
+                    return;
+                }
+
+                Uri linkUri = new Uri(link);
+                fileName = HttpUtility.ParseQueryString(linkUri.Query).Get("fileID");
+                if (string.IsNullOrEmpty(fileName) || !File.Exists(_Default.StoragePath(fileName, null)))
+                {
+                    context.Response.Write("{ \"error\": \"File is not exist\"}");
+                    return;
+                }
+            }
+
             if (fileName == "")
             {
                 try
@@ -650,6 +672,9 @@ 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>()
@@ -662,7 +687,8 @@ namespace OnlineEditorsExample
                     {"instanceId", _Default.GetServerUrl(false) }
                 }
             },
-            { "path", fileName }
+            { "path", fileName },
+            { "link", _Default.GetServerUrl(false) + "doceditor.aspx?fileID=" + fileName }
             };
 
             if (JwtManager.Enabled)

web/documentserver-example/csharp/settings.config

@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <appSettings>
   <clear />
-  <add key="version" value="1.6.0"/>
+  <add key="version" value="1.7.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"/>
-  <add key="files.docservice.edited-docs" value=".csv|.docm|.docx|.docxf|.dotm|.dotx|.epub|.fb2|.html|.odp|.ods|.odt|.otp|.ots|.ott|.potm|.potx|.ppsm|.ppsx|.pptm|.pptx|.rtf|.txt|.xlsm|.xlsx|.xltm|.xltx"/>
-  <add key="files.docservice.convert-docs" value=".doc|.dot|.dps|.dpt|.epub|.et|.ett|.fb2|.fodp|.fods|.fodt|.htm|.html|.mht|.mhtml|.odp|.ods|.odt|.otp|.ots|.ott|.pot|.pps|.ppt|.rtf|.stw|.sxc|.sxi|.sxw|.wps|.wpt|.xls|.xlsb|.xlt|.xml"/>
   <add key="files.docservice.timeout" value="120000" />
   <add key="files.docservice.secret" value="" />
   <add key="files.docservice.header" value="Authorization" />
@@ -17,7 +14,7 @@
 
   <add key="files.docservice.token.useforrequest" value="true" />
 
-  <add key="files.docservice.languages" value="en:English|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA: Test Language"/>
+  <add key="files.docservice.languages" value="en:English|ar:Arabic|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sr-Latn-CS:Serbian|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA: Test Language"/>
 
   <add key="files.docservice.url.site" value="http://documentserver/"/>
 

web/documentserver-example/java-spring/checkstyle-suppressions.xml

@@ -10,4 +10,5 @@
     <suppress checks="JavadocPackage" files="."/>
     <suppress checks="JavadocVariable" files="."/>
     <suppress checks="MissingJavadocMethod" files="."/>
+    <suppress checks="MagicNumber" files="DefaultDocumentManager.java"/>
 </suppressions>

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

@@ -46,7 +46,8 @@ public class ExampleData {
                 "Can't rename files from the editor",
                 "Can't view chat",
                 "Can't protect file",
-                "View file without collaboration"
+                "View file without collaboration",
+                "Can’t submit forms"
         );
 
         // the description for user 1
@@ -58,7 +59,9 @@ public class ExampleData {
                 "The file favorite state is undefined",
                 "Can create a file from a template with data from the editor",
                 "Can see the information about all users",
-                "Can view chat"
+                "Can view chat",
+                "Has an avatar",
+                "Can submit forms"
         );
 
         // the description for user 2
@@ -71,7 +74,9 @@ public class ExampleData {
                 "This file is favorite",
                 "Can create a file from an editor",
                 "Can see the information about users from Group2 and users who don’t belong to any group",
-                "Can view chat"
+                "Can view chat",
+                "Has an avatar",
+                "Can’t submit forms"
         );
 
         // the description for user 3
@@ -86,30 +91,31 @@ public class ExampleData {
                 "He can’t print the file",
                 "Can create a file from an editor",
                 "Can see the information about Group2 users",
-                "Can view chat"
+                "Can view chat",
+                "Can’t submit forms"
         );
 
         // create user 1 with the specified parameters
         userService.createUser("John Smith", "smith@example.com", descriptionUserFirst,
                 "", List.of(FilterState.NULL.toString()), List.of(FilterState.NULL.toString()),
                 List.of(FilterState.NULL.toString()), List.of(FilterState.NULL.toString()),
-                List.of(FilterState.NULL.toString()), null, true, true);
+                List.of(FilterState.NULL.toString()), null, true, true, true);
 
         // create user 2 with the specified parameters
         userService.createUser("Mark Pottato", "pottato@example.com", descriptionUserSecond,
                 "group-2", List.of("", "group-2"), List.of(FilterState.NULL.toString()),
                 List.of("group-2", ""), List.of("group-2"), List.of("group-2", ""), true, true,
-                true);
+                true, true);
 
         // create user 3 with the specified parameters
-        userService.createUser("Hamish Mitchell", "mitchell@example.com", descriptionUserThird,
+        userService.createUser("Hamish Mitchell", null, descriptionUserThird,
                 "group-3", List.of("group-2"), List.of("group-2", "group-3"), List.of("group-2"),
-                new ArrayList<>(), List.of("group-2"), false, true, true);
+                new ArrayList<>(), List.of("group-2"), false, true, true, false);
 
         // create user 0 with the specified parameters
         userService.createUser("Anonymous", null, descriptionUserZero, "",
                 List.of(FilterState.NULL.toString()), List.of(FilterState.NULL.toString()),
                 List.of(FilterState.NULL.toString()), List.of(FilterState.NULL.toString()),
-                new ArrayList<>(), null, false, false);
+                new ArrayList<>(), null, false, false, false);
     }
 }

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

@@ -25,6 +25,8 @@ import com.onlyoffice.integration.documentserver.models.enums.Action;
 import com.onlyoffice.integration.documentserver.storage.FileStoragePathBuilder;
 import com.onlyoffice.integration.entities.User;
 import com.onlyoffice.integration.dto.Mentions;
+import com.onlyoffice.integration.dto.UserInfo;
+import com.onlyoffice.integration.dto.Protect;
 import com.onlyoffice.integration.documentserver.models.enums.Type;
 import com.onlyoffice.integration.documentserver.models.filemodel.FileModel;
 import com.onlyoffice.integration.services.UserServices;
@@ -117,6 +119,8 @@ public class EditorController {
         }
 
         User user = optionalUser.get();
+        user.setImage(user.getAvatar() ? storagePathBuilder.getServerUrl(true) + "/css/img/uid-"
+                + user.getId() + ".png" : null);
 
         // get file model with the default file parameters
         FileModel fileModel = fileConfigurer.getFileModel(
@@ -143,13 +147,19 @@ public class EditorController {
         model.addAttribute("dataInsertImage",  getInsertImage(directUrl));
 
         // get a document for comparison and add it to the model
-        model.addAttribute("dataCompareFile",  getCompareFile(directUrl));
+        model.addAttribute("dataDocument",  getCompareFile(directUrl));
 
         // get recipients data for mail merging and add it to the model
-        model.addAttribute("dataMailMergeRecipients", getMailMerge(directUrl));
+        model.addAttribute("dataSpreadsheet", getSpreadsheet(directUrl));
 
         // get user data for mentions and add it to the model
         model.addAttribute("usersForMentions", getUserMentions(uid));
+
+        model.addAttribute("usersInfo", getUsersInfo(uid));
+
+        // get user data for protect and add it to the model
+        model.addAttribute("usersForProtect", getUserProtect(uid));
+
         return "editor.html";
     }
 
@@ -169,6 +179,36 @@ public class EditorController {
         return usersForMentions;
     }
 
+    private List<UserInfo> getUsersInfo(final String uid) {  // get user data for mentions
+        List<UserInfo> usersInfo = new ArrayList<>();
+        if (uid != null && !uid.equals("4")) {
+            List<User> list = userService.findAll();
+            for (User u : list) {
+                String image = u.getAvatar() ? storagePathBuilder.getServerUrl(true) + "/css/img/uid-"
+                + u.getId() + ".png" : null;
+                usersInfo.add(new UserInfo(u.getId(), u.getName(), u.getEmail(), image));
+            }
+        }
+        return usersInfo;
+    }
+
+    private List<Protect> getUserProtect(final String uid) {  // get user data for protect
+        List<Protect> usersForProtect = new ArrayList<>();
+        if (uid != null && !uid.equals("4")) {
+            List<User> list = userService.findAll();
+            for (User u : list) {
+                if (u.getId() != Integer.parseInt(uid) && u.getId() != ANONYMOUS_USER_ID) {
+
+                    // user data includes user names, IDs and emails
+                    usersForProtect.add(new Protect(u.getId(), u.getName(), u.getEmail()));
+                }
+            }
+        }
+
+        return usersForProtect;
+    }
+
+
     @SneakyThrows
     private String getInsertImage(final Boolean directUrl) {  // get an image that will be inserted into the document
         Map<String, Object> dataInsertImage = new HashMap<>();
@@ -193,40 +233,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> dataCompareFile = new HashMap<>();
-        dataCompareFile.put("fileType", "docx");
-        dataCompareFile.put("url", storagePathBuilder.getServerUrl(true) + "/assets?name=sample.docx");
+        Map<String, Object> dataDocument = new HashMap<>();
+        dataDocument.put("fileType", "docx");
+        dataDocument.put("url", storagePathBuilder.getServerUrl(true) + "/assets?name=sample.docx");
         if (directUrl) {
-            dataCompareFile.put("directUrl", storagePathBuilder
+            dataDocument.put("directUrl", storagePathBuilder
                     .getServerUrl(false) + "/assets?name=sample.docx");
         }
 
         // check if the document token is enabled
         if (jwtManager.tokenEnabled()) {
 
-            // create token from the dataCompareFile object
-            dataCompareFile.put("token", jwtManager.createToken(dataCompareFile));
+            // create token from the dataDocument object
+            dataDocument.put("token", jwtManager.createToken(dataDocument));
         }
 
-        return objectMapper.writeValueAsString(dataCompareFile);
+        return objectMapper.writeValueAsString(dataDocument);
     }
 
     @SneakyThrows
-    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");
+    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");
         if (directUrl) {
-            dataMailMergeRecipients.put("directUrl", storagePathBuilder.getServerUrl(false) + "/csv");
+            dataSpreadsheet.put("directUrl", storagePathBuilder.getServerUrl(false) + "/csv");
         }
 
         // check if the document token is enabled
         if (jwtManager.tokenEnabled()) {
 
-            // create token from the dataMailMergeRecipients object
-            dataMailMergeRecipients.put("token", jwtManager.createToken(dataMailMergeRecipients));
+            // create token from the dataSpreadsheet object
+            dataSpreadsheet.put("token", jwtManager.createToken(dataSpreadsheet));
         }
 
-        return objectMapper.writeValueAsString(dataMailMergeRecipients);
+        return objectMapper.writeValueAsString(dataSpreadsheet);
     }
 }

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

@@ -48,6 +48,7 @@ import org.json.simple.parser.JSONParser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
+import org.springframework.core.io.UrlResource;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -62,6 +63,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.util.UriComponents;
+import org.springframework.web.util.UriComponentsBuilder;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
@@ -70,6 +73,7 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.InetAddress;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
@@ -147,6 +151,28 @@ public class FileController {
                 .body(resource);
     }
 
+    private ResponseEntity<Resource> downloadSample(final String fileName) {
+        String serverPath = System.getProperty("user.dir");
+        String contentType = "application/octet-stream";
+        String[] fileLocation = new String[] {serverPath, "src", "main", "resources", "assets", "document-templates",
+                                              "sample", fileName};
+        Path filePath = Paths.get(String.join(File.separator, fileLocation));
+        Resource resource;
+        try {
+            resource = new UrlResource(filePath.toUri());
+            if (resource.exists()) {
+                return ResponseEntity.ok()
+                        .contentType(MediaType.parseMediaType(contentType))
+                        .header(HttpHeaders.CONTENT_DISPOSITION,
+                                "attachment; filename=\"" + resource.getFilename() + "\"")
+                        .body(resource);
+        }
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
     // download data from the specified history file
     private ResponseEntity<Resource> downloadFileHistory(final String fileName,
                                                          final String version,
@@ -372,14 +398,12 @@ 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();
-        return downloadFile(fileName);
+        return downloadSample(name);
     }
 
     @GetMapping("/csv")
     public ResponseEntity<Resource> csv() {  // download a csv file
-        String fileName = Path.of("assets", "document-templates", "sample", "csv.csv").toString();
-        return downloadFile(fileName);
+        return downloadSample("csv.csv");
     }
 
     @GetMapping("/files")
@@ -485,6 +509,22 @@ public class FileController {
                 }
             }
 
+            String link = body.getLink();
+            if (fileName.equals("") && link != null) {
+                if (!link.contains(storagePathBuilder.getServerUrl(true))) {
+                    HashMap<String, String> data = new HashMap<>();
+                    data.put("url", link);
+                    data.put("directUrl", link);
+                    return gson.toJson(data);
+                }
+
+                UriComponents uriComponents = UriComponentsBuilder.fromUriString(body.getLink()).build();
+                fileName = uriComponents.getQueryParams().getFirst("fileName");
+                boolean fileExists = new File(storagePathBuilder.getFileLocation(fileName)).exists();
+                if (!fileExists) {
+                    return "{ \"error\": \"File is not exist\"}";
+                }
+            }
 
             if (fileName.equals("")) {
                 try {
@@ -513,10 +553,16 @@ public class FileController {
 
             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("url", documentManager.getDownloadUrl(fileName, true));
             data.put("directUrl", body.getDirectUrl() ? 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);

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

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

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/callback/DefaultCallbackManager.java

@@ -315,6 +315,24 @@ public class DefaultCallbackManager implements CallbackManager {
             String user = action.getUserid();  // get the user ID
             // create meta data for the forcesaved file
             storageMutator.createMeta(fileName, user, "Filling Form");
+
+            try {
+                String formsDataUrl = body.getFormsdataurl();
+
+                if (formsDataUrl != null && !formsDataUrl.isEmpty()) {
+                    String formsName = documentManager.getCorrectName(fileUtility
+                            .getFileNameWithoutExtension(fileName) + ".txt");
+                    String formsPath = storagePathBuilder.getFileLocation(formsName);
+
+                    byte[] byteArrayFormsData = getDownloadFile(formsDataUrl);
+
+                    saveFile(byteArrayFormsData, Paths.get(formsPath));
+                } else {
+                    throw new RuntimeException("Document editing service did not return formsDataUrl");
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         } else {
             if (newFileName) {
                 fileName = documentManager

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

@@ -20,11 +20,14 @@ package com.onlyoffice.integration.documentserver.managers.document;
 
 import com.onlyoffice.integration.documentserver.storage.FileStorageMutator;
 import com.onlyoffice.integration.documentserver.storage.FileStoragePathBuilder;
+import com.onlyoffice.integration.documentserver.util.Constants;
 import com.onlyoffice.integration.documentserver.util.file.FileUtility;
 import com.onlyoffice.integration.documentserver.util.service.ServiceConverter;
+import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Primary;
+import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Component;
 
 import java.io.File;
@@ -243,4 +246,58 @@ public class DefaultDocumentManager implements DocumentManager {
 
         return fileName;
     }
+
+    @SneakyThrows
+    public Boolean isExtendedPDFFile(final String fileName) {
+        Resource resource = storageMutator.loadFileAsResource(fileName);
+
+        byte[] bytes;
+
+        try (InputStream inputStream = resource.getInputStream()) {
+            bytes = inputStream.readNBytes(110);
+        } catch (Exception e) {
+            return false;
+        }
+
+        String pBuffer = new String(bytes, "Windows-1252");
+
+        int indexFirst = pBuffer.indexOf("%\315\312\322\251\015");
+        if (indexFirst == -1) {
+            return false;
+        }
+
+        String pFirst = pBuffer.substring(indexFirst + 6);
+
+        if (!pFirst.startsWith("1 0 obj\012<<\012")) {
+            return false;
+        }
+
+        pFirst = pFirst.substring(11);
+
+        int indexStream = pFirst.indexOf("stream\015\012");
+        int indexMeta = pFirst.indexOf(Constants.G_FORMAT_OFORM_PDF_META_TAG);
+
+        if (indexStream == -1 || indexMeta == -1 || indexStream < indexMeta) {
+            return false;
+        }
+
+        String pMeta = pFirst.substring(indexMeta);
+        pMeta = pMeta.substring(Constants.G_FORMAT_OFORM_PDF_META_TAG.length() + 3);
+
+        int indexMetaLast = pMeta.indexOf(" ");
+
+        if (indexMetaLast == -1) {
+            return false;
+        }
+
+        pMeta = pMeta.substring(indexMetaLast + 1);
+
+        indexMetaLast = pMeta.indexOf(" ");
+
+        if (indexMetaLast == -1) {
+            return false;
+        }
+
+        return true;
+    }
 }

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

@@ -39,4 +39,5 @@ public interface DocumentManager {
     // create demo document
     String createDemo(String fileExt, Boolean sample, String uid, String uname) throws Exception;
     String getCreateUrl(String fileName, Boolean sample);  // get URL to the created file
+    Boolean isExtendedPDFFile(String fileName);
 }

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/history/DefaultHistoryManager.java

@@ -40,6 +40,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Scanner;
+import java.nio.file.Paths;
 
 // todo: Rebuild completely
 @Component
@@ -280,8 +281,9 @@ public class DefaultHistoryManager implements HistoryManager {
                 dataObj.put("version", i);
 
                 if (i > 1) {  //check if the version number is greater than 1
+                    Integer verdiff = i - 1;
                     // get the history data from the previous file version
-                    Map<String, Object> prev = (Map<String, Object>) histData.get(Integer.toString(i - 1));
+                    Map<String, Object> prev = (Map<String, Object>) histData.get(Integer.toString(verdiff));
                     Map<String, Object> prevInfo = new HashMap<String, Object>();
                     prevInfo.put("fileType", prev.get("fileType"));
                     prevInfo.put("key", prev.get("key"));  // write key and URL information about previous file version
@@ -292,10 +294,12 @@ public class DefaultHistoryManager implements HistoryManager {
 
                     // 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 (diffExists(histDir, verdiff)) {
+                        // write the path to the diff.zip archive with differences in this file version
+                        dataObj.put("changesUrl", documentManager
+                                .getHistoryFileUrl(fileName, verdiff, "diff.zip", true));
+                    }
                 }
 
                 if (jwtManager.tokenEnabled()) {
@@ -331,4 +335,11 @@ public class DefaultHistoryManager implements HistoryManager {
         }
         return output;
     }
+
+    // diff.zip existence check
+    private Boolean diffExists(final String histDir, final Integer verdiff) {
+        String filePath = Paths.get(histDir, String.valueOf(verdiff), "diff.zip").toString();
+        File file = new File(filePath);
+        return file.exists();
+    }
 }

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/configurations/Customization.java

@@ -32,8 +32,6 @@ import org.springframework.stereotype.Component;
  other products (if there are any) and change the presence or absence of the additional buttons,
   links, change logos and editor owner details. */
 public class Customization {
-    @Autowired
-    private Logo logo;  // the image file at the top left corner of the Editor header
     @Autowired
     private Goback goback;  // the settings for the Open file location menu button and upper right corner button
     private Boolean autosave = true;  // if the Autosave menu option is enabled or disabled
@@ -47,7 +45,7 @@ public class Customization {
     private Boolean help = true;  //  if the Help menu button is displayed or hidden
     private Boolean hideRightMenu = false;  // if the right menu is displayed or hidden on first loading
     private Boolean hideRulers = false;  // if the editor rulers are displayed or hidden
-    private Boolean submitForm = false;  // if the Submit form button is displayed or hidden
+    private Boolean submitForm = true;  // if the Submit form button is displayed or hidden
     private Boolean about = true;
     private Boolean feedback = true;
 }

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/configurations/Logo.java

@@ -1,38 +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.configurations;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-@Component
-@Scope("prototype")
-@Getter
-@Setter
-public class Logo {  // the image file at the top left corner of the Editor header
-    @Value("${logo.image}")
-    private String image;  // the path to the image file used to show in common work mode
-    @Value("${logo.imageEmbedded}")
-    private String imageEmbedded;  // the path to the image file used to show in the embedded mode
-    @Value("${logo.url}")
-    private String url;  // the absolute URL which will be used when someone clicks the logo image
-}

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/User.java

@@ -19,6 +19,8 @@
 package com.onlyoffice.integration.documentserver.models.filemodel;
 
 import com.onlyoffice.integration.documentserver.models.AbstractModel;
+import com.onlyoffice.integration.documentserver.storage.FileStoragePathBuilder;
+
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.context.annotation.Scope;
@@ -29,14 +31,17 @@ import org.springframework.stereotype.Component;
 @Getter
 @Setter
 public class User extends AbstractModel {
+    private FileStoragePathBuilder storagePathBuilder;
     private String id;
     private String name;
     private String group;
+    private String image;
 
     // the user configuration parameters
     public void configure(final int idParam, final String nameParam, final String groupParam) {
         this.id = "uid-" + idParam;  // the user id
         this.name = nameParam;  // the user name
         this.group = groupParam;  // the group the user belongs to
+        this.image = storagePathBuilder.getServerUrl(true) + "/css/img/uid-" + this.id + ".png";
     }
 }

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/Constants.java

@@ -27,6 +27,7 @@ public final class Constants {
     public static final Integer MAX_KEY_LENGTH = 20;
     public static final Integer ANONYMOUS_USER_ID = 4;
     public static final Integer KILOBYTE_SIZE = 1024;
+    public static final String G_FORMAT_OFORM_PDF_META_TAG = "ONLYOFFICEFORM";
 
     private Constants() { }
 }

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/file/DefaultFileUtility.java

@@ -38,6 +38,8 @@ 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;
@@ -136,13 +138,18 @@ public class DefaultFileUtility implements FileUtility {
 
     // generate the file path from file directory and name
     public Path generateFilepath(final String directory, final String fullFileName) {
-        String fileName = getFileNameWithoutExtension(fullFileName);  // get file name without extension
+        int maxName = Integer.parseInt(filenameMax);
+        String fileName = getFileNameWithoutExtension(fullFileName);
+        if (fileName.length() > maxName) {
+            fileName = fileName.substring(0, maxName) + "[...]";
+        }
         String fileExtension = getFileExtension(fullFileName);  // get file extension
-        Path path = Paths.get(directory + fullFileName);  // get the path to the files with the specified name
+        // get the path to the files with the specified name
+        Path path = Paths.get(directory + fileName + "." + fileExtension);
 
         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 = getFileNameWithoutExtension(fullFileName) + "(" + i + ")";
+            fileName = fileName + "(" + i + ")";
 
             // create a new path for this file with the correct name and extension
             path = Paths.get(directory + fileName + "." + fileExtension);

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Protect.java

@@ -0,0 +1,32 @@
+/**
+ *
+ * (c) Copyright Ascensio System SIA 2023
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.onlyoffice.integration.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+public class Protect {
+    private Integer id;
+    private String name;
+    private String email;
+}

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Reference.java

@@ -18,6 +18,7 @@
 
 package com.onlyoffice.integration.dto;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -27,8 +28,10 @@ import lombok.Setter;
 @Setter
 @AllArgsConstructor
 @NoArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Reference {
     private Boolean directUrl;
     private ReferenceData referenceData;
     private String path;
+    private String link;
 }

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Track.java

@@ -43,4 +43,5 @@ public class Track {
     private String userdata;
     private String lastsave;
     private Boolean notmodified;
+    private String formsdataurl;
 }

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/UserInfo.java

@@ -0,0 +1,33 @@
+/**
+ *
+ * (c) Copyright Ascensio System SIA 2023
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.onlyoffice.integration.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+public class UserInfo {
+    private Integer id;
+    private String name;
+    private String email;
+    private String image;
+}

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/entities/User.java

@@ -45,4 +45,6 @@ public class User extends AbstractEntity {
     @ElementCollection
     @CollectionTable(name = "user_descriptions")
     private List<String> descriptions;
+    private Boolean avatar;
+    private String image;
 }

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/UserServices.java

@@ -58,13 +58,15 @@ public class UserServices {
                            final List<String> removeGroups,
                            final List<String> userInfoGroups, final Boolean favoriteDoc,
                            final Boolean chat,
-                           final Boolean protect) {
+                           final Boolean protect,
+                           final Boolean avatar) {
         User newUser = new User();
         newUser.setName(name);  // set the user name
         newUser.setEmail(email);  // set the user email
         newUser.setGroup(groupServices.createGroup(group));  // set the user group
         newUser.setDescriptions(description);  // set the user description
         newUser.setFavorite(favoriteDoc);  // specify if the user has the favorite documents or not
+        newUser.setAvatar(avatar);
 
         List<Group> groupsReview = groupServices
                 .createGroups(reviewGroups);  // define the groups whose changes the user can accept/reject

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultCustomizationConfigurer.java

@@ -34,6 +34,5 @@ public class DefaultCustomizationConfigurer implements CustomizationConfigurer<D
     public void configure(final Customization customization, final DefaultCustomizationWrapper wrapper) {
         Action action = wrapper.getAction();  // get the action parameter from the customization wrapper
         User user = wrapper.getUser();
-        customization.setSubmitForm(false);  // set the submitForm parameter to the customization config
     }
 }

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

@@ -1,9 +1,10 @@
-server.version=1.6.0
+server.version=1.7.0
 
 server.address=
 server.port=4000
 
 filesize-max=5242880
+filename-max=50
 
 files.storage=
 files.storage.folder=documents
@@ -24,7 +25,7 @@ files.docservice.token-use-for-request=true
 
 files.docservice.verify-peer-off=true
 
-files.docservice.languages=en:English|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA:Test Language
+files.docservice.languages=en:English|ar:Arabic|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sr-Latn-CS:Serbian|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA:Test Language
 
 spring.datasource.url=jdbc:h2:mem:usersdb
 spring.datasource.driverClassName=org.h2.Driver
@@ -42,7 +43,3 @@ url.converter=/converter
 url.editor=/editor
 url.track=/track
 url.download=/download
-
-logo.image=
-logo.imageEmbedded=
-logo.url=https://www.onlyoffice.com

web/documentserver-example/java-spring/src/main/resources/templates/editor.html

@@ -109,14 +109,20 @@
                     docEditor.insertImage(temp);
                 };
 
+                var dataDocument = [[${dataDocument}]];
+
                 // the user is trying to select document for comparing by clicking the Document from Storage button
-                var onRequestCompareFile = function() {
-                    docEditor.setRevisedFile([[${dataCompareFile}]]);
+                var onRequestSelectDocument = function(event) {
+                    const temp = Object.assign({"c": event.data.c}, JSON.parse(dataDocument));
+                    docEditor.setRequestedDocument(temp);
                 };
 
+                var dataSpreadsheet = [[${dataSpreadsheet}]];
+
                 // the user is trying to select recipients data by clicking the Mail merge button
-                var onRequestMailMergeRecipients = function (event) {
-                    docEditor.setMailMergeRecipients([[${dataMailMergeRecipients}]]);
+                var onRequestSelectSpreadsheet = function (event) {
+                    const temp = Object.assign({"c": event.data.c}, JSON.parse(dataSpreadsheet));
+                    docEditor.setRequestedSpreadsheet(temp);
                 };
 
                 config = [[${model}]];
@@ -160,15 +166,43 @@
                     }
                 };
 
+                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
-                    event.data.directUrl = !!config.document.directUrl;
+                    innerAlert("onRequestReferenceData");
+
+                    requestReference(event.data, function (data) {
+                        docEditor.setReferenceData(data);
+                    });
+                };
+
+                var requestReference = function(data, callback) {
+                    innerAlert(data);
+
+                    data.directUrl = !!config.document.directUrl;
+
                     let xhr = new XMLHttpRequest();
                     xhr.open("POST", "reference");
                     xhr.setRequestHeader("Content-Type", "application/json");
-                    xhr.send(JSON.stringify(event.data));
+                    xhr.send(JSON.stringify(data));
                     xhr.onload = function () {
                         innerAlert(xhr.responseText);
-                        docEditor.setReferenceData(JSON.parse(xhr.responseText));
+                        callback(JSON.parse(xhr.responseText));
                     }
                 };
 
@@ -240,8 +274,8 @@
                     "onMakeActionLink": onMakeActionLink,
                     "onMetaChange": onMetaChange,
                     "onRequestInsertImage": onRequestInsertImage,
-                    "onRequestCompareFile": onRequestCompareFile,
-                    "onRequestMailMergeRecipients": onRequestMailMergeRecipients,
+                    "onRequestSelectDocument": onRequestSelectDocument,
+                    "onRequestSelectSpreadsheet": onRequestSelectSpreadsheet,
                     "onRequestRestore": onRequestRestore,
                     "onRequestHistory": onRequestHistory,
                     "onRequestHistoryData": onRequestHistoryData,
@@ -249,12 +283,37 @@
                 };
 
                 var usersForMentions = [[${usersForMentions}]];
+                var usersInfo = [[${usersInfo}]];
+                var usersForProtect = [[${usersForProtect}]];
 
                 if (config.editorConfig.user.id != 4) {
                     // add mentions for not anonymous users
-                    config.events['onRequestUsers'] = function () {
-                        docEditor.setUsers({  // set a list of users to mention in the comments
-                            "users": usersForMentions
+                    config.events['onRequestUsers'] = function (event) {
+                        if (event && event.data){
+                            var c = event.data.c;
+                        }
+                        switch (c) {
+                            case "info":
+                                users = [];
+                                var allUsers = usersInfo;
+                                for (var i = 0; i < event.data.id.length; i++) {
+                                    for (var j = 0; j < allUsers.length; j++) {
+                                        if (allUsers[j].id == event.data.id[i]) {
+                                            users.push(allUsers[j]);
+                                            break;
+                                        }
+                                    }
+                                }
+                                break;
+                            case "protect":
+                                var users = usersForProtect;
+                                break;
+                            default:
+                                users = usersForMentions;
+                        }
+                        docEditor.setUsers({
+                            "c": c,
+                            "users": users,
                         });
                     };
                     // the user is mentioned in a comment
@@ -268,6 +327,7 @@
                     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-spring/src/main/resources/templates/index.html

@@ -3,6 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="viewport" content="width=device-width" />
+    <meta name="server-version" th:content="${serverVersion}"/>
     <!--
     *
     * (c) Copyright Ascensio System SIA 2023

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

@@ -85,27 +85,30 @@ public class EditorServlet extends HttpServlet {
         }
 
         // a document that will be compared with the current document
-        Map<String, Object> dataCompareFile = new HashMap<>();
-        dataCompareFile.put("fileType", "docx");
-        dataCompareFile.put("url", DocumentManager.getServerUrl(true) + "/IndexServlet?type=assets&"
+        Map<String, Object> dataDocument = new HashMap<>();
+        dataDocument.put("fileType", "docx");
+        dataDocument.put("url", DocumentManager.getServerUrl(true) + "/IndexServlet?type=assets&"
                 + "name=sample.docx");
         if (isEnableDirectUrl) {
-            dataCompareFile.put("directUrl", DocumentManager.getServerUrl(false) + "/IndexServlet?"
+            dataDocument.put("directUrl", DocumentManager.getServerUrl(false) + "/IndexServlet?"
                     + "type=assets&name=sample.docx");
         }
 
         // recipients data for mail merging
-        Map<String, Object> dataMailMergeRecipients = new HashMap<>();
-        dataMailMergeRecipients.put("fileType", "csv");
-        dataMailMergeRecipients.put("url", DocumentManager.getServerUrl(true) + "/IndexServlet?"
+        Map<String, Object> dataSpreadsheet = new HashMap<>();
+        dataSpreadsheet.put("fileType", "csv");
+        dataSpreadsheet.put("url", DocumentManager.getServerUrl(true) + "/IndexServlet?"
                 + "type=csv");
         if (isEnableDirectUrl) {
-            dataMailMergeRecipients.put("directUrl", DocumentManager.getServerUrl(false)
+            dataSpreadsheet.put("directUrl", DocumentManager.getServerUrl(false)
                     + "/IndexServlet?type=csv");
         }
 
         // users data for mentions
         List<Map<String, Object>> usersForMentions = Users.getUsersForMentions(user.getId());
+        List<Map<String, Object>> usersForProtect = Users.getUsersForProtect(user.getId());
+
+        List<Map<String, Object>> usersInfo = Users.getUsersInfo(user.getId());
 
         // check if the document token is enabled
         if (DocumentManager.tokenEnabled()) {
@@ -114,11 +117,11 @@ public class EditorServlet extends HttpServlet {
             // create token from the dataInsertImage object
             dataInsertImage.put("token", DocumentManager.createToken(dataInsertImage));
 
-            // create token from the dataCompareFile object
-            dataCompareFile.put("token", DocumentManager.createToken(dataCompareFile));
+            // create token from the dataDocument object
+            dataDocument.put("token", DocumentManager.createToken(dataDocument));
 
-            // create token from the dataMailMergeRecipients object
-            dataMailMergeRecipients.put("token", DocumentManager.createToken(dataMailMergeRecipients));
+            // create token from the dataSpreadsheet object
+            dataSpreadsheet.put("token", DocumentManager.createToken(dataSpreadsheet));
         }
 
         Gson gson = new Gson();
@@ -127,10 +130,13 @@ 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("dataCompareFile",  gson.toJson(dataCompareFile));
-        request.setAttribute("dataMailMergeRecipients", gson.toJson(dataMailMergeRecipients));
+        request.setAttribute("dataDocument",  gson.toJson(dataDocument));
+        request.setAttribute("dataSpreadsheet", gson.toJson(dataSpreadsheet));
         request.setAttribute("usersForMentions", !user.getId()
                 .equals("uid-0") ? gson.toJson(usersForMentions) : null);
+        request.setAttribute("usersInfo", gson.toJson(usersInfo));
+        request.setAttribute("usersForProtect", !user.getId()
+                .equals("uid-0") ? gson.toJson(usersForProtect) : null);
         request.getRequestDispatcher("editor.jsp").forward(request, response);
     }
 

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

@@ -694,6 +694,33 @@ public class IndexServlet extends HttpServlet {
                 }
             }
 
+            Object link = body.get("link");
+            if (fileName.equals("") && link != null) {
+                if (!((String) link).contains(DocumentManager.getServerUrl(false))) {
+                    HashMap<String, Object> data = new HashMap<>();
+                    data.put("url", link);
+                    data.put("directUrl", link);
+                    writer.write(gson.toJson(data));
+                    return;
+                }
+
+                URL url = new URL((String) link);
+                String query = url.getQuery();
+                String[] parameters = query.split("&");
+                for (String parameter : parameters) {
+                    String[] keyValue = parameter.split("=");
+                    if (keyValue.length == 2 && "fileName".equals(keyValue[0])) {
+                        fileName = keyValue[1];
+                        break;
+                    }
+                }
+                boolean fileExists = new File(DocumentManager.storagePath(fileName, null)).exists();
+                if (!fileExists) {
+                    writer.write("{ \"error\": \"File is not exist\"}");
+                    return;
+                }
+            }
+
             if (fileName.equals("")) {
                 try {
                     String path = (String) body.get("path");
@@ -725,10 +752,15 @@ public class IndexServlet extends HttpServlet {
 
             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("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);
@@ -963,9 +995,10 @@ public class IndexServlet extends HttpServlet {
                     dataObj.put("version", i);
 
                     if (i > 1) {  //check if the version number is greater than 1
+                        Integer verdiff = i - 1;
 
                         // get the history data from the previous file version
-                        Map<String, Object> prev = (Map<String, Object>) histData.get(Integer.toString(i - 1));
+                        Map<String, Object> prev = (Map<String, Object>) histData.get(Integer.toString(verdiff));
                         Map<String, Object> prevInfo = new HashMap<String, Object>();
                         prevInfo.put("fileType", prev.get("fileType"));
 
@@ -978,12 +1011,16 @@ public class IndexServlet extends HttpServlet {
 
                         // 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);
+
+                        String diffPath = Paths.get(histDir, String.valueOf(verdiff), "diff.zip").toString();
+                        File diffFile = new File(diffPath);
+                        if (diffFile.exists()) {
+                            // write the path to the diff.zip archive with differences in this file version
+                            String changesUrl = DocumentManager
+                                    .getDownloadHistoryUrl(fileName, verdiff,
+                                            "diff.zip", true);
+                            dataObj.put("changesUrl", changesUrl);
+                        }
                     }
 
                     if (DocumentManager.tokenEnabled()) {

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

@@ -111,6 +111,8 @@ public class FileModel {
         editorConfig.getUser().setId(!user.getId().equals("uid-0") ? user.getId() : null);
         editorConfig.getUser().setName(user.getName());
         editorConfig.getUser().setGroup(user.getGroup());
+        editorConfig.getUser().setImage(user.getAvatar() ? DocumentManager.getServerUrl(false)
+        + "/css/img/" + user.getId() + ".png" : null);
 
         // write the absolute URL to the file location
         editorConfig.getCustomization().getGoback()
@@ -152,7 +154,7 @@ public class FileModel {
         String fileExt = FileUtility.getFileExtension(document.getTitle());
         Boolean canEdit = DocumentManager.getEditedExts().contains(fileExt);
         // check if the Submit form button is displayed or not
-        editorConfig.getCustomization().setSubmitForm(false);
+        editorConfig.getCustomization().setSubmitForm(true);
 
         if ((!canEdit && mode.equals("edit") || mode.equals("fillForms"))
                 && DocumentManager.getFillExts().contains(fileExt)) {
@@ -521,6 +523,7 @@ public class FileModel {
             private String id;
             private String name;
             private String group;
+            private String image;
 
             public String getId() {
                 return id;
@@ -545,6 +548,10 @@ public class FileModel {
             public void setGroup(final String groupParam) {
                 this.group = groupParam;
             }
+
+            public void setImage(final String imageParam) {
+                this.image = imageParam;
+            }
         }
 
         // customization parameters

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

@@ -32,12 +32,13 @@ public class User {
     private final List<String> descriptions;
     private final Boolean templates;
     private final List<String> userInfoGroups;
+    private final Boolean avatar;
 
     public User(final String idParam, final String nameParam, final String emailParam, final String groupParam,
                 final List<String> reviewGroupsParam, final CommentGroups commentGroupsParam,
                 final List<String> userInfoGroupsParam, final Boolean favoriteParam,
                 final List<String> deniedPermissionsParam, final List<String> descriptionsParam,
-                final Boolean templatesParam) {
+                final Boolean templatesParam, final Boolean avatarParam) {
         this.id = idParam;
         this.name = nameParam;
         this.email = emailParam;
@@ -49,6 +50,7 @@ public class User {
         this.descriptions = descriptionsParam;
         this.templates = templatesParam;
         this.userInfoGroups = userInfoGroupsParam;
+        this.avatar = avatarParam;
     }
 
     public String getId() {
@@ -94,4 +96,8 @@ public class User {
     public List<String> getUserInfoGroups() {
         return userInfoGroups;
     }
+
+    public Boolean getAvatar() {
+        return avatar;
+    }
 }

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

@@ -246,7 +246,11 @@ 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;
 

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

@@ -293,6 +293,24 @@ public final class TrackManager {
 
             // create meta data for forcesaved file
             DocumentManager.createMeta(fileName, user, "Filling Form", userAddress);
+
+            try {
+                String formsDataUrl = body.get("formsdataurl").toString();
+
+                if (formsDataUrl != null && !formsDataUrl.isEmpty()) {
+                    String formsName = DocumentManager.getCorrectName(FileUtility
+                            .getFileNameWithoutExtension(fileName) + ".txt", userAddress);
+                    String formsPath = DocumentManager.storagePath(formsName, userAddress);
+
+                    byte[] byteArrayFormsData = getDownloadFile(formsDataUrl);
+
+                    saveFile(byteArrayFormsData, Paths.get(formsPath));
+                } else {
+                    throw new Exception("Document editing service did not return formsDataUrl");
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
     }
 

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

@@ -37,6 +37,8 @@ public final class Users {
         add("The file favorite state is undefined");
         add("Can create files from templates using data from the editor");
         add("Can see the information about all users");
+        add("Has an avatar");
+        add("Can submit forms");
     }};
 
     private static List<String> descriptionUserSecond = new ArrayList<String>() {{
@@ -47,6 +49,8 @@ public final class Users {
         add("This file is marked as favorite");
         add("Can create new files from the editor");
         add("Can see the information about users from Group2 and users who don’t belong to any group");
+        add("Has an avatar");
+        add("Can’t submit forms");
     }};
 
     private static List<String> descriptionUserThird = new ArrayList<String>() {{
@@ -59,6 +63,7 @@ public final class Users {
         add("Can’t print the file");
         add("Can create new files from the editor");
         add("Can see the information about Group2 users");
+        add("Can’t submit forms");
     }};
 
     private static List<String> descriptionUserZero = new ArrayList<String>() {{
@@ -74,24 +79,25 @@ public final class Users {
         add("Can't view chat");
         add("Can't protect file");
         add("View file without collaboration");
+        add("Can’t submit forms");
     }};
 
     private static List<User> users = new ArrayList<User>() {{
         add(new User("uid-1", "John Smith", "smith@example.com",
                 "", null, new CommentGroups(), null,
-                null, new ArrayList<String>(), descriptionUserFirst, true));
+                null, new ArrayList<String>(), descriptionUserFirst, true, true));
         add(new User("uid-2", "Mark Pottato", "pottato@example.com",
                 "group-2", Arrays.asList("group-2", ""), new CommentGroups(null,
                 Arrays.asList("group-2", ""), Arrays.asList("group-2")), Arrays.asList("group-2", ""),
-                true, new ArrayList<String>(), descriptionUserSecond, false));
-        add(new User("uid-3", "Hamish Mitchell", "mitchell@example.com",
+                true, new ArrayList<String>(), descriptionUserSecond, false, true));
+        add(new User("uid-3", "Hamish Mitchell", null,
                 "group-3", Arrays.asList("group-2"), new CommentGroups(Arrays.asList("group-3", "group-2"),
                 Arrays.asList("group-2"), null), Arrays.asList("group-2"),
                 false, Arrays.asList("copy", "download", "print"),
-                descriptionUserThird, false));
+                descriptionUserThird, false, false));
         add(new User("uid-0", null, null,
                 "", null, null, null,
-                null, Arrays.asList("protect"), descriptionUserZero, false));
+                null, Arrays.asList("protect"), descriptionUserZero, false, false));
     }};
 
     private Users() { }
@@ -124,5 +130,36 @@ public final class Users {
         }
         return usersData;
     }
+
+    public static List<Map<String, Object>> getUsersInfo(final String id) {
+        List<Map<String, Object>> usersData = new ArrayList<>();
+        if (id != "uid-0") {
+            for (User user : users) {
+                Map<String, Object> data = new HashMap<>();
+                data.put("id", user.getId());
+                data.put("name", user.getName());
+                data.put("email", user.getEmail());
+                data.put("image", user.getAvatar() ? DocumentManager.getServerUrl(false)
+                + "/css/img/" + user.getId() + ".png" : null);
+                usersData.add(data);
+            }
+        }
+        return usersData;
+    }
+
+    // get a list of users with their names and emails for protect
+    public static List<Map<String, Object>> getUsersForProtect(final String id) {
+        List<Map<String, Object>> usersData = new ArrayList<>();
+        for (User user : users) {
+            if (!user.getId().equals(id) && user.getName() != null) {
+                Map<String, Object> data = new HashMap<>();
+                data.put("name", user.getName());
+                data.put("email", user.getEmail());
+                data.put("id", user.getId());
+                usersData.add(data);
+            }
+        }
+        return usersData;
+    }
 }
 

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

@@ -1,7 +1,8 @@
-version=1.6.0
+version=1.7.0
 
 filesize-max=5242880
 storage-folder=app_data
+filename-max=50
 
 files.docservice.timeout=120000
 
@@ -12,7 +13,7 @@ files.docservice.url.api=web-apps/apps/api/documents/api.js
 files.docservice.url.preloader=web-apps/apps/api/documents/cache-scripts.html
 files.docservice.url.example=
 
-files.docservice.languages=en:English|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA:Test Language
+files.docservice.languages=en:English|ar:Arabic|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sr-Latn-CS:Serbian|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA:Test Language
 
 files.docservice.secret=
 files.docservice.header=Authorization

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

@@ -117,13 +117,17 @@
         };
 
         // the user is trying to select document for comparing by clicking the Document from Storage button
-        var onRequestCompareFile = function() {
-            docEditor.setRevisedFile(${dataCompareFile});  // select a document for comparing
+        var onRequestSelectDocument = function(event) {
+            var data = ${dataDocument};
+            data.c = event.data.c;
+            docEditor.setRequestedDocument(data);  // select a document for comparing
         };
 
         // the user is trying to select recipients data by clicking the Mail merge button
-        var onRequestMailMergeRecipients = function (event) {
-            docEditor.setMailMergeRecipients(${dataMailMergeRecipients});  // insert recipient data for mail merge into the file
+        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 onRequestSaveAs = function (event) {  //  the user is trying to save file by clicking Save Copy as... button
@@ -161,15 +165,41 @@
             }
         };
 
+        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
-            event.data.directUrl = !!config.document.directUrl;
+            innerAlert("onRequestReferenceData");
+            requestReference(event.data, function (data) {
+                docEditor.setReferenceData(data);
+            });
+        };
+
+        var requestReference = function(data, callback) {
+            innerAlert(data);
+            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(event.data));
+            xhr.send(JSON.stringify(data));
             xhr.onload = function () {
                 innerAlert(xhr.responseText);
-                docEditor.setReferenceData(JSON.parse(xhr.responseText));
+                callback(JSON.parse(xhr.responseText));
             }
         };
 
@@ -243,8 +273,8 @@
             "onMakeActionLink": onMakeActionLink,
             "onMetaChange": onMetaChange,
             "onRequestInsertImage": onRequestInsertImage,
-            "onRequestCompareFile": onRequestCompareFile,
-            "onRequestMailMergeRecipients": onRequestMailMergeRecipients,
+            "onRequestSelectDocument": onRequestSelectDocument,
+            "onRequestSelectSpreadsheet": onRequestSelectSpreadsheet,
             "onRequestRestore": onRequestRestore,
             "onRequestHistory": onRequestHistory,
             "onRequestHistoryData": onRequestHistoryData,
@@ -253,13 +283,38 @@
 
         <%
             String usersForMentions = (String) request.getAttribute("usersForMentions");
+            String usersInfo = (String) request.getAttribute("usersInfo");
+            String usersForProtect = (String) request.getAttribute("usersForProtect");
         %>
 
         if (config.editorConfig.user.id) {
             // add mentions for not anonymous users
-            config.events['onRequestUsers'] = function () {
-                docEditor.setUsers({  // set a list of users to mention in the comments
-                    "users": <%=usersForMentions%>
+            config.events['onRequestUsers'] = function (event) {
+                if (event && event.data){
+                    var c = event.data.c;
+                }
+                switch (c) {
+                    case "info":
+                        users = [];
+                        var allUsers = <%=usersInfo%>;
+                        for (var i = 0; i < event.data.id.length; i++) {
+                            for (var j = 0; j < allUsers.length; j++) {
+                                if (allUsers[j].id == event.data.id[i]) {
+                                    users.push(allUsers[j]);
+                                    break;
+                                }
+                            }
+                        }
+                        break;
+                    case "protect":
+                        var users = <%=usersForProtect%>;
+                        break;
+                    default:
+                        users = <%=usersForMentions%>;
+                }
+                docEditor.setUsers({
+                    "c": c,
+                    "users": users,
                 });
             };
             // the user is mentioned in a comment
@@ -273,6 +328,7 @@
             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

@@ -16,6 +16,7 @@
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
         <meta name="viewport" content="width=device-width" />
+        <meta name="server-version" content="<%= ConfigManager.getProperty("version") %>" />
         <!--
         *
         * (c) Copyright Ascensio System SIA 2023

web/documentserver-example/nodejs/app.js

@@ -55,7 +55,7 @@ String.prototype.hashCode = function hashCode() {
   const len = this.length;
   let ret = 0;
   for (let i = 0; i < len; i++) {
-    ret = Math.trunc(31 * ret + this.charCodeAt(i));
+    ret = Math.imul(ret, 31) + this.charCodeAt(i);
   }
   return ret;
 };
@@ -100,6 +100,7 @@ app.get('/', (req, res) => { // define a handler for default page
       params: req.DocManager.getCustomParams(),
       users,
       languages: configServer.get('languages'),
+      serverVersion: config.get('version'),
     });
   } catch (ex) {
     console.log(ex); // display error message in the console
@@ -500,8 +501,11 @@ app.post('/reference', (req, res) => { // define a handler for renaming file
   }
 
   if (!fileName && !!req.body.link) {
-    if (req.body.link.indexOf(req.DocManager.curUserHostAddress()) !== -1) {
-      result({ error: 'You do not have access to this site' });
+    if (req.body.link.indexOf(req.DocManager.getServerUrl()) === -1) {
+      result({
+        url: req.body.link,
+        directUrl: req.body.link,
+      });
       return;
     }
 
@@ -759,6 +763,26 @@ app.post('/track', async (req, res) => { // define a handler for tracking file c
         if (isSubmitForm) {
           const uid = body.actions[0].userid;
           req.DocManager.saveFileData(correctName, uid, 'Filling Form', userAddress);
+
+          const { formsdataurl } = body;
+          if (formsdataurl) {
+            const formsdataName = req.DocManager.getCorrectName(
+              `${fileUtility.getFileName(correctName, true)}.txt`,
+              userAddress,
+            );
+            // get the path to the file with forms data
+            const formsdataPath = req.DocManager.storagePath(formsdataName, userAddress);
+            const formsdata = await urllib.request(formsdataurl, { method: 'GET' });
+            const statusFormsdata = formsdata.status;
+            const dataFormsdata = formsdata.data;
+            if (statusFormsdata === 200) {
+              fileSystem.writeFileSync(formsdataPath, dataFormsdata); // write the forms data
+            } else {
+              emitWarning(`Document editing service returned status: ${statusFormsdata}`);
+            }
+          } else {
+            emitWarning('Document editing service do not returned formsdataurl');
+          }
         }
       } catch (ex) {
         response.write('{"error":1}');
@@ -912,24 +936,36 @@ app.get('/editor', (req, res) => { // define a handler for editing document
 
     const templatesImageUrl = req.DocManager.getTemplateImageUrl(fileUtility.getFileType(fileName));
     const createUrl = req.DocManager.getCreateUrl(fileUtility.getFileType(fileName), userid, type, lang);
-    const templates = [
-      {
-        image: '',
-        title: 'Blank',
-        url: createUrl,
-      },
-      {
-        image: templatesImageUrl,
-        title: 'With sample content',
-        url: `${createUrl}&sample=true`,
-      },
-    ];
+    let templates = null;
+    if (createUrl != null) {
+      templates = [
+        {
+          image: '',
+          title: 'Blank',
+          url: createUrl,
+        },
+        {
+          image: templatesImageUrl,
+          title: 'With sample content',
+          url: `${createUrl}&sample=true`,
+        },
+      ];
+    }
 
     const userGroup = user.group;
     const { reviewGroups } = user;
     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);
@@ -961,19 +997,30 @@ 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 ext = fileUtility.getFileExtension(fileName, true);
+    let isForm = 'null';
+    if (req.query.checkform !== 'false' && ext === 'pdf') {
+      isForm = req.DocManager.isExtendedPDFFile(fileName);
+    }
+
+    let submitForm = false;
+    if (mode === 'fillForms') {
+      submitForm = userid === 'uid-1';
+    }
 
     // file config data
     const argss = {
       apiUrl: siteUrl + configServer.get('apiUrl'),
       file: {
         name: fileName,
-        ext: fileUtility.getFileExtension(fileName, true),
+        ext: ext,
         uri: url,
         directUrl: !userDirectUrl ? null : directUrl,
         uriUser: directUrl,
         created: new Date().toDateString(),
         favorite: user.favorite != null ? user.favorite : 'null',
+        isForm: isForm,
       },
       editor: {
         type,
@@ -1000,6 +1047,7 @@ 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),
@@ -1033,6 +1081,7 @@ app.get('/editor', (req, res) => { // define a handler for editing document
       },
       usersForMentions: user.id !== 'uid-0' ? users.getUsersForMentions(user.id) : null,
       usersForProtect: user.id !== 'uid-0' ? users.getUsersForProtect(user.id) : null,
+      usersInfo,
     };
 
     if (cfgSignatureEnable) {

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

@@ -1,5 +1,5 @@
 {
-  "version": "1.6.0",
+  "version": "1.7.0",
   "log": {
     "appenders": [
       {
@@ -25,6 +25,8 @@
     "storageFolder": "./files",
     "storagePath": "/files",
     "maxFileSize": 1073741824,
+    "maxNameLength": 50,
+    "gFormatOformPdfMetaTag": "ONLYOFFICEFORM",
     "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",
     "token": {
         "enable": false,
@@ -38,6 +40,7 @@
     "verify_peer_off": true,
     "languages": {
       "en": "English",
+      "ar": "Arabic",
       "hy": "Armenian",
       "az": "Azerbaijani",
       "eu": "Basque",
@@ -68,6 +71,7 @@
       "pt-PT": "Portuguese (Portugal)",
       "ro": "Romanian",
       "ru": "Russian",
+      "sr-Latn-CS": "Serbian",
       "si": "Sinhala (Sri Lanka)",
       "sk": "Slovak",
       "sl": "Slovenian",

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

@@ -84,7 +84,10 @@ DocManager.prototype.getCustomParams = function getCustomParams() {
 
 // get the correct file name if such a name already exists
 DocManager.prototype.getCorrectName = function getCorrectName(fileName, userAddress) {
-  const baseName = fileUtility.getFileName(fileName, true); // get file name from the url without extension
+  // 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 ext = fileUtility.getFileExtension(fileName); // get file extension from the url
   let name = baseName + ext; // get full file name
   let index = 1;
@@ -152,9 +155,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() < 10 ? '0' : '') + (parseInt(dateCreate.getMonth().toString(), 10) + 1);
+  const month = (dateCreate.getMonth() < 9 ? '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
@@ -211,7 +214,11 @@ DocManager.prototype.getCallback = function getCallback(fileName) {
 // get url to the created file
 DocManager.prototype.getCreateUrl = function getCreateUrl(docType, userid, type, lang) {
   const server = this.getServerUrl();
-  const ext = this.getInternalExtension(docType).replace('.', '');
+  let ext = this.getInternalExtension(docType);
+  if (ext === null) {
+    return null;
+  }
+  ext = ext.replace('.', '');
   const handler = `/editor?fileExt=${ext}&userid=${userid}&type=${type}&lang=${lang}`;
 
   return server + handler;
@@ -378,7 +385,7 @@ DocManager.prototype.getInternalExtension = function getInternalExtension(fileTy
     return '.pptx';
   }
 
-  return '.docx'; // the default value is .docx
+  return null; // the default value is null
 };
 
 // get the template image url
@@ -534,7 +541,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.userid;
+    userIdFromJson = oldVersion ? contentJson.userid : contentJson.user.id;
     createdFromJson = oldVersion ? contentJson.date : contentJson.created;
   }
 
@@ -603,6 +610,59 @@ DocManager.prototype.getFilesInfo = function getFilesInfo(fileId) {
   } return responseArray;
 };
 
+DocManager.prototype.isExtendedPDFFile = function isExtendedPDFFile(fileName) {
+  let filePath = this.forcesavePath(fileName, null, false);
+  if (filePath === '') {
+    filePath = this.storagePath(fileName);
+  }
+
+  const bufferSize = 110;
+  const buffer = Buffer.alloc(bufferSize);
+  const fd = fileSystem.openSync(filePath, 'r');
+
+  fileSystem.readSync(fd, buffer, 0, bufferSize);
+  fileSystem.closeSync(fd);
+
+  const pBuffer = buffer.toString('latin1');
+
+  const indexFirst = pBuffer.indexOf('%\xCD\xCA\xD2\xA9\x0D');
+  if (indexFirst === -1) {
+    return false;
+  }
+
+  let pFirst = pBuffer.substring(indexFirst + 6);
+
+  if (!pFirst.startsWith('1 0 obj\x0A<<\x0A')) {
+    return false;
+  }
+
+  pFirst = pFirst.substring(11);
+
+  const indexStream = pFirst.indexOf('stream\x0D\x0A');
+  const indexMeta = pFirst.indexOf(configServer.get('gFormatOformPdfMetaTag'));
+
+  if (indexStream === -1 || indexMeta === -1 || indexStream < indexMeta) {
+    return false;
+  }
+
+  let pMeta = pFirst.substring(indexMeta);
+  pMeta = pMeta.substring(configServer.get('gFormatOformPdfMetaTag').length + 3);
+
+  let indexMetaLast = pMeta.indexOf(' ');
+  if (indexMetaLast === -1) {
+    return false;
+  }
+
+  pMeta = pMeta.substring(indexMetaLast + 1);
+
+  indexMetaLast = pMeta.indexOf(' ');
+  if (indexMetaLast === -1) {
+    return false;
+  }
+
+  return true;
+};
+
 DocManager.prototype.getInstanceId = function getInstanceId() {
   return this.getServerUrl();
 };

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

@@ -64,6 +64,7 @@ fileUtility.fileType = {
   word: 'word',
   cell: 'cell',
   slide: 'slide',
+  pdf: 'pdf',
 };
 
 fileUtility.getSuppotredExtensions = function getSuppotredExtensions() {

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

@@ -29,6 +29,7 @@ class User {
     deniedPermissions,
     descriptions,
     templates,
+    avatar,
   ) {
     this.id = id;
     this.name = name;
@@ -41,6 +42,7 @@ class User {
     this.deniedPermissions = deniedPermissions;
     this.descriptions = descriptions;
     this.templates = templates;
+    this.avatar = avatar;
   }
 }
 
@@ -53,6 +55,7 @@ const descrUser1 = [
   'Can create files from templates using data from the editor',
   'Can see the information about all users',
   'Can submit forms',
+  'Has an avatar',
 ];
 
 const descrUser2 = [
@@ -63,6 +66,7 @@ const descrUser2 = [
   'Can create new files from the editor',
   'Can see the information about users from Group2 and users who don’t belong to any group',
   'Can’t submit forms',
+  'Has an avatar',
 ];
 
 const descrUser3 = [
@@ -95,18 +99,44 @@ const descrUser0 = [
 ];
 
 const users = [
-  new User('uid-1', 'John Smith', 'smith@example.com', null, null, {}, null, null, [], descrUser1, true),
-  new User('uid-2', 'Mark Pottato', 'pottato@example.com', 'group-2', ['group-2', ''], {
-    view: '',
-    edit: ['group-2', ''],
-    remove: ['group-2'],
-  }, ['group-2', ''], true, [], descrUser2, false), // own and without group
-  new User('uid-3', 'Hamish Mitchell', 'mitchell@example.com', 'group-3', ['group-2'], {
-    view: ['group-3', 'group-2'],
-    edit: ['group-2'],
-    remove: [],
-  }, ['group-2'], false, ['copy', 'download', 'print'], descrUser3, false), // other group only
-  new User('uid-0', null, null, null, null, {}, [], null, ['protect'], descrUser0, false),
+  new User('uid-1', 'John Smith', 'smith@example.com', null, null, {}, null, null, [], descrUser1, true, true),
+  new User(
+    'uid-2',
+    'Mark Pottato',
+    'pottato@example.com',
+    'group-2',
+    ['group-2', ''], // own and without group
+    {
+      view: '',
+      edit: ['group-2', ''],
+      remove: ['group-2'],
+    },
+    ['group-2', ''],
+    true,
+    [],
+    descrUser2,
+    false,
+    true,
+  ),
+  new User(
+    'uid-3',
+    'Hamish Mitchell',
+    'mitchell@example.com',
+    'group-3',
+    ['group-2'], // other group only
+    {
+      view: ['group-3', 'group-2'],
+      edit: ['group-2'],
+      remove: [],
+    },
+    ['group-2'],
+    false,
+    ['copy', 'download', 'print'],
+    descrUser3,
+    false,
+    false,
+  ),
+  new User('uid-0', null, null, null, null, {}, [], null, ['protect'], descrUser0, false, false),
 ];
 
 // get a list of all the users
@@ -145,7 +175,6 @@ users.getUsersForProtect = function getUsersForProtect(id) {
   this.forEach((user) => {
     if (user.id !== id && user.name != null) {
       result.push({
-        email: user.email,
         id: user.id,
         name: user.name,
       });

web/documentserver-example/nodejs/helpers/wopi/utils.js

@@ -145,7 +145,8 @@ const getDefaultAction = async function getDefaultAction(ext) {
 
 // get the action url
 const getActionUrl = function getActionUrl(host, userAddress, action, filename) {
-  return `${action.urlsrc.replace(/<.*&>/g, '')}WOPISrc=${host}/wopi/files/${filename}@${userAddress}`;
+  const WOPISrc = `${host}/wopi/files/${filename}@${userAddress}`;
+  return `${action.urlsrc.replace(/<.*&>/g, '')}WOPISrc=${encodeURIComponent(WOPISrc)}`;
 };
 
 exports.initWopi = initWopi;

web/documentserver-example/nodejs/public/images/icon_pdf.svg

@@ -0,0 +1 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M2 1h8l4 4v10H2V1z" fill="#fff"/><path fill-rule="evenodd" clip-rule="evenodd" d="M14 5l-4-4H2v14h12V5zm-4-5l5 5v11H1V0h9z" fill="#BFBFBF"/><path fill="#9E1919" d="M3 10h10v4H3z"/><path d="M7 7V2H3v5h4zM8 3V2h2v1H8zM8 5V4h5v1H8zM13 6H8v1h5V6zM13 8H3v1h10V8z" fill="#BFBFBF"/><path opacity=".3" d="M9 1h1v3h4l1 1H9V1z" fill="#333"/></svg>

web/documentserver-example/nodejs/public/stylesheets/stylesheet.css

@@ -470,6 +470,11 @@ footer table tr td:first-child {
     background-image: url("../images/icon_pptx.svg");
 }
 
+.stored-edit.pdf,
+.uploadFileName.pdf {
+    background-image: url("../images/icon_pdf.svg");
+}
+
 .stored-edit span {
     font-size: 12px;
     line-height: 12px;

web/documentserver-example/nodejs/views/config.ejs

@@ -6,6 +6,7 @@
         "uploaded": "<%- file.created %>",
         "favorite": <%- file.favorite %>
     },
+    "isForm": <%- file.isForm %>,
     "key": "<%- editor.key %>",
     "permissions": {
         "chat": <%- editor.chat %>,
@@ -60,6 +61,7 @@
     "user": {
         "group": "<%- editor.userGroup %>",
         "id": "<%- editor.userid %>",
+        "image": "<%- editor.userImage %>",
         "name": "<%- editor.name %>"
     }
 },

web/documentserver-example/nodejs/views/editor.ejs

@@ -177,7 +177,7 @@
             docEditor.insertImage(data);  // insert an image into the file
         };
 
-        var onRequestSelectDocument = function() {  // the user is trying to select document by clicking the Document from Storage button
+        var onRequestSelectDocument = function(event) {  // the user is trying to select document by clicking the Document from Storage button
             var data = <%- JSON.stringify(dataDocument) %>;
             data.c = event.data.c;
             docEditor.setRequestedDocument(data);  // select a document
@@ -198,6 +198,18 @@
                 case "protect":
                     var users = <%- JSON.stringify(usersForProtect) %>;
                     break;
+                case "info":
+                    users = [];
+                    var allUsers = <%- JSON.stringify(usersInfo) %>;
+                    for (var i = 0; i < event.data.id.length; i++) {
+                        for (var j = 0; j < allUsers.length; j++) {
+                            if (allUsers[j].id == event.data.id[i]) {
+                                users.push(allUsers[j]);
+                                break;
+                            }
+                        }
+                    }
+                    break;
                 default:
                     users = <%- JSON.stringify(usersForMentions) %>;
             }
@@ -242,7 +254,7 @@
         var requestReference = function(data, callback) {
             innerAlert(data);
 
-            event.data.directUrl = !!config.document.directUrl;
+            data.directUrl = !!config.document.directUrl;
 
             let xhr = new XMLHttpRequest();
             xhr.open("POST", "reference");
@@ -336,11 +348,18 @@
             }
         };
 
+        var onDocumentReady = function(){
+            if (config.type === "mobile") {
+                document.getElementsByTagName("iframe")[0].style.height = window.innerHeight + "px";
+            }
+        };
+
         config = {
             <%- include("config") %>
         };
         config.events = {
             "onAppReady": onAppReady,
+            "onDocumentReady": onDocumentReady,
             "onDocumentStateChange": onDocumentStateChange,
             "onError": onError,
             "onOutdatedVersion": onOutdatedVersion,
@@ -386,20 +405,6 @@
             }
 
             docEditor = new DocsAPI.DocEditor("iframeEditor", config);
-            fixSize();
-        };
-
-        // get the editor sizes
-        var fixSize = function () {
-            if (config.type !== "mobile") {
-                return;
-            }
-            var wrapEl = document.getElementsByClassName("form");
-            if (wrapEl.length) {
-                wrapEl[0].style.height = screen.availHeight + "px";
-                window.scrollTo(0, -1);
-                wrapEl[0].style.height = window.innerHeight + "px";
-            }
         };
 
         const getFileExt = function (fileName) {
@@ -411,10 +416,8 @@
 
         if (window.addEventListener) {
             window.addEventListener("load", connectEditor);
-            window.addEventListener("resize", fixSize);
         } else if (window.attachEvent) {
             window.attachEvent("onload", connectEditor);
-            window.attachEvent("onresize", fixSize);
         }
 
     </script>

web/documentserver-example/nodejs/views/index.ejs

@@ -5,6 +5,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width" />
+    <meta name="server-version" content="<%= serverVersion %>">
     <!--
     *
     * (c) Copyright Ascensio System SIA 2023

web/documentserver-example/php/.composer-version

@@ -0,0 +1 @@
+2.6.5

web/documentserver-example/php/.php-version

@@ -1 +1 @@
-8.1.21
+8.2.11