nodejs: rename wopi icons

# Conflicts:
#	.github/workflows/lint-python.yml
#	.github/workflows/lint-ruby.yml

.github/workflows/lint-java.yml

@@ -0,0 +1,31 @@
+name: Lint Java
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [master, main]
+    paths: ['web/documentserver-example/java/**']
+  pull_request:
+    branches: [master, main, develop]
+    paths: ['web/documentserver-example/java/**']
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./web/documentserver-example/java
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+
+      - name: Install Java 11
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+          
+      - name: Run linter
+        run: |
+          mvn -version
+          mvn package

.github/workflows/lint-nodejs.yml

@@ -0,0 +1,35 @@
+name: ESLint
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [master, main]
+    paths: ['web/documentserver-example/nodejs/**']
+  pull_request:
+    branches: [master, main, develop]
+    paths: ['web/documentserver-example/nodejs/**']
+
+env:
+  NODE_VERSION: 16
+
+jobs:
+  lint:
+    name: Lint 
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./web/documentserver-example/nodejs
+    steps:
+      - name: Install NodeJS
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+      
+      - name: Code Checkout
+        uses: actions/checkout@v3
+
+      - name: Install Dependencies
+        run: npm ci
+        
+      - name: Code Linting
+        run: npm run lint

.github/workflows/lint-php.yml

@@ -0,0 +1,29 @@
+name: PHPCs
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [master, main]
+    paths: ['web/documentserver-example/php/**']
+  pull_request:
+    branches: [master, main, develop]
+    paths: ['web/documentserver-example/php/**']
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./web/documentserver-example/php
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.1'
+          tools: cs2pr, phpcs
+          
+      - name: Run phpcs
+        run: phpcs -q --extensions=php,module,inc,install,test,profile,theme,css,info,txt,md,yml --ignore=node_modules,bower_components,vendor ./

.github/workflows/lint-python.yml

@@ -0,0 +1,40 @@
+name: PyLint
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [master, main]
+    paths: ['web/documentserver-example/python/**']
+  pull_request:
+    branches: [master, main, develop]
+    paths: ['web/documentserver-example/python/**']
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./web/documentserver-example/python
+    steps:
+      - uses: actions/checkout@v3
+      
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10' 
+
+      - 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
+
+      - 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

.github/workflows/lint-ruby.yml

@@ -0,0 +1,31 @@
+name: Rubocop
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [master, main]
+    paths: ['web/documentserver-example/ruby/**']
+  pull_request:
+    branches: [master, main, develop]
+    paths: ['web/documentserver-example/ruby/**']
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    defaults:
+      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

.github/workflows/lint-spring.yml

@@ -0,0 +1,31 @@
+name: Lint Spring
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [master, main]
+    paths: ['web/documentserver-example/java-spring/**']
+  pull_request:
+    branches: [master, main, develop]
+    paths: ['web/documentserver-example/java-spring/**']
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./web/documentserver-example/java-spring
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+
+      - name: Install Java 11
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+          
+      - name: Run linter
+        run: |
+          mvn -version
+          mvn package

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Change Log
 
+- nodejs: wopi editnew action for exisiting file
+- nodejs: fix wopi actions after restart
+- setting an unavailable language
+- description in the tooltip on the main page
+- option to send directUrl
+
+## 1.4.0
+- nodejs: option to send directUrl
+- opening file on client by directUrl
+- offline viewer for anonymous
+- added hy, eu, zh-TW, ms, pt-PT
+
+## 1.3.1
+- charp: fix references
+- ruby: update rails 
+
 ## 1.3.0
 - update empty files
 - anonymous without chat
@@ -24,6 +40,5 @@
 - creating docxf
 - opening docxf, oform
 
-
 ## 1.0.0
 - added java spring

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

@@ -167,7 +167,7 @@ label .checkbox {
     background-image: url("images/file_docxf.svg");
 }
 
-.create-sample {
+.side-option {
     color: #666666;
     line-height: 24px;
 }
@@ -740,3 +740,28 @@ html {
 .user-descr > b {
     margin-left: 25px;
 }
+
+.tooltip {
+    background: #FFFFFF;
+    border-radius: 5px;
+    box-shadow: 0px 7px 25px rgba(85, 85, 85, 0.15);
+    color: #666666;
+    line-height: 160%;
+    max-width: 455px;
+    padding: 14px;
+    position: absolute;
+}
+
+.tooltip ul {
+    margin: 0;
+}
+
+.arrow {
+    border-top: 8px solid transparent;
+    border-bottom: 8px solid transparent;
+    border-right: 8px solid #FFFFFF;
+    left: -4px;
+    position: absolute;
+    top: 50%;
+    transform: translate(-50%, -50%);
+}

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

@@ -16,6 +16,7 @@
  *
  */
 
+using System;
 using System.IO;
 using System.Web.Mvc;
 using OnlineEditorsExampleMVC.Helpers;
@@ -31,13 +32,14 @@ namespace OnlineEditorsExampleMVC.Controllers
         }
 
         // viewing file in the editor
-        public ActionResult Editor(string fileName, string editorsMode, string editorsType)
+        public ActionResult Editor(string fileName, string editorsMode, string editorsType, string directUrl)
         {
             var file = new FileModel
             {
                 Mode = editorsMode,  // editor mode: edit or view
                 Type = editorsType,  // editor type: desktop, mobile, embedded
-                FileName = Path.GetFileName(fileName)  // file name
+                FileName = Path.GetFileName(fileName),  // file name
+                IsEnabledDirectUrl = directUrl != null ? Convert.ToBoolean(directUrl) : false
             };
 
             return View("Editor", file);

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

@@ -313,9 +313,10 @@ namespace OnlineEditorsExampleMVC.Helpers
         }
 
         // create the public history url
-        public static string GetHistoryDownloadUrl(string filename, string version, string file)
+        public static string GetHistoryDownloadUrl(string filename, string version, string file, Boolean isServer = true)
         {
-            var downloadUrl = new UriBuilder(GetServerUrl(true))
+            var userAddress = "&userAddress=" + HttpUtility.UrlEncode(CurUserHostAddress(HttpContext.Current.Request.UserHostAddress));
+            var downloadUrl = new UriBuilder(GetServerUrl(isServer))
             {
                 Path =
                     HttpRuntime.AppDomainAppVirtualPath
@@ -323,7 +324,7 @@ namespace OnlineEditorsExampleMVC.Helpers
                     + "webeditor.ashx",
                 Query = "type=downloadhistory"
                         + "&fileName=" + HttpUtility.UrlEncode(filename)
-                        + "&userAddress=" + HttpUtility.UrlEncode(CurUserHostAddress(HttpContext.Current.Request.UserHostAddress))
+                        + userAddress
                         + "&ver=" + version
                         + "&file="+ file
             };
@@ -331,9 +332,10 @@ namespace OnlineEditorsExampleMVC.Helpers
         }
 
         // get url to download a file
-        public static string GetDownloadUrl(string fileName)
+        public static string GetDownloadUrl(string fileName, Boolean isServer = true)
         {
-            var downloadUrl = new UriBuilder(GetServerUrl(true))
+            var userAddress = isServer ? "&userAddress=" + HttpUtility.UrlEncode(CurUserHostAddress(HttpContext.Current.Request.UserHostAddress)) : "";
+            var downloadUrl = new UriBuilder(GetServerUrl(isServer))
             {
                 Path =
                     HttpRuntime.AppDomainAppVirtualPath
@@ -341,7 +343,7 @@ namespace OnlineEditorsExampleMVC.Helpers
                     + "webeditor.ashx",
                 Query = "type=download"
                         + "&fileName=" + HttpUtility.UrlEncode(fileName)
-                        + "&userAddress=" + HttpUtility.UrlEncode(CurUserHostAddress(HttpContext.Current.Request.UserHostAddress))
+                        + userAddress
             };
             return downloadUrl.ToString();
         }
@@ -440,5 +442,11 @@ namespace OnlineEditorsExampleMVC.Helpers
             }
             return languages;
         }
+
+        public static string GetDirectUrl()
+        {
+            string isEnabledDirectUrl = HttpUtility.ParseQueryString(HttpContext.Current.Request.Url.Query).Get("directUrl");
+            return isEnabledDirectUrl != null ? isEnabledDirectUrl : "false";
+        }
     }
 }

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

@@ -130,7 +130,7 @@ namespace OnlineEditorsExampleMVC.Helpers
                 var payloadToken = JwtManager.Encode(payload);  // encode the payload object to the payload token
                 var bodyToken = JwtManager.Encode(body);  // encode the body object to the body token
                 // create header token
-                string JWTheader = WebConfigurationManager.AppSettings["files.docservice.header"].Equals("") ? "Authorization" : WebConfigurationManager.AppSettings["files.docservice.header"];
+                string JWTheader = string.IsNullOrEmpty(WebConfigurationManager.AppSettings["files.docservice.header"]) ? "Authorization" : WebConfigurationManager.AppSettings["files.docservice.header"];
                 request.Headers.Add(JWTheader, "Bearer " + payloadToken);
 
                 body.Add("token", bodyToken);

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

@@ -55,7 +55,7 @@ namespace OnlineEditorsExampleMVC.Helpers
             // check if the document token is enabled
             if (JwtManager.Enabled)
             {
-                string JWTheader = WebConfigurationManager.AppSettings["files.docservice.header"].Equals("") ? "Authorization" : WebConfigurationManager.AppSettings["files.docservice.header"];
+                string JWTheader = string.IsNullOrEmpty(WebConfigurationManager.AppSettings["files.docservice.header"]) ? "Authorization" : WebConfigurationManager.AppSettings["files.docservice.header"];
 
                 string token = null;
 
@@ -92,7 +92,7 @@ namespace OnlineEditorsExampleMVC.Helpers
         // file saving process
         public static int processSave(Dictionary<string, object> fileData, string fileName, string userAddress)
         {
-            if (fileData["url"].Equals(null)) {
+            if (string.IsNullOrEmpty((string)fileData["url"])) {
                 throw new Exception("DownloadUrl is null");
             }
             var downloadUri = (string)fileData["url"];
@@ -169,7 +169,7 @@ namespace OnlineEditorsExampleMVC.Helpers
         // file force saving process
         public static int processForceSave(Dictionary<string, object> fileData, string fileName, string userAddress)
         {
-            if (fileData["url"].Equals(null)) {
+            if ( string.IsNullOrEmpty((string)fileData["url"])) {
                 throw new Exception("DownloadUrl is null");
             }
             var downloadUri = (string)fileData["url"];
@@ -228,7 +228,7 @@ namespace OnlineEditorsExampleMVC.Helpers
                     fileName = DocManagerHelper.GetCorrectName(Path.GetFileNameWithoutExtension(fileName) + downloadExt, userAddress);
                 }
                 forcesavePath = DocManagerHelper.ForcesavePath(fileName, userAddress, false);
-                if (forcesavePath.Equals(""))  // create forcesave path if it doesn't exist
+                if (string.IsNullOrEmpty(forcesavePath))  // create forcesave path if it doesn't exist
                 {
                     forcesavePath = DocManagerHelper.ForcesavePath(fileName, userAddress, true);
                 }
@@ -279,7 +279,7 @@ namespace OnlineEditorsExampleMVC.Helpers
 
                 var payloadToken = JwtManager.Encode(payload);  // encode a payload object into a header token
                 var bodyToken = JwtManager.Encode(body);  // encode body into a body token
-                string JWTheader = WebConfigurationManager.AppSettings["files.docservice.header"].Equals("") ? "Authorization" : WebConfigurationManager.AppSettings["files.docservice.header"];
+                string JWTheader = string.IsNullOrEmpty(WebConfigurationManager.AppSettings["files.docservice.header"]) ? "Authorization" : WebConfigurationManager.AppSettings["files.docservice.header"];
                 request.Headers.Add(JWTheader, "Bearer " + payloadToken);  // add a header Authorization with a header token and Authorization prefix in it
 
                 body.Add("token", bodyToken);
@@ -321,6 +321,7 @@ namespace OnlineEditorsExampleMVC.Helpers
             if (string.IsNullOrEmpty(path)) throw new ArgumentException("path");  // file isn't specified
 
             var req = (HttpWebRequest)WebRequest.Create(url);
+            req.Timeout = 5000;
             using (var stream = req.GetResponse().GetResponseStream())  // get input stream of the file information from the url
             {
                 if (stream == null) throw new Exception("stream is null");

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

@@ -69,6 +69,7 @@ namespace OnlineEditorsExampleMVC.Helpers
             "Can’t see anyone’s information",
             "Can't rename files from the editor",
             "Can't view chat",
+            "View file without collaboration",
         };
 
         private static List<User> users = new List<User>() {

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

@@ -33,6 +33,7 @@ namespace OnlineEditorsExampleMVC.Models
     {
         public string Mode { get; set; }  // editor mode
         public string Type { get; set; }  // editor type
+        public bool IsEnabledDirectUrl { get; set; }  // is enabled direct url
 
         // get file url for Document Server
         public string FileUri
@@ -97,6 +98,7 @@ namespace OnlineEditorsExampleMVC.Models
             var actionLink = request.GetOrDefault("actionLink", null);  // get the action link (comment or bookmark) if it exists
             var actionData = string.IsNullOrEmpty(actionLink) ? null : jss.DeserializeObject(actionLink);  // get action data for the action link
 
+            var directUrl = DocManagerHelper.GetDownloadUrl(FileName, false);
             var createUrl = DocManagerHelper.GetCreateUrl(FileUtility.GetFileType(FileName));
             var templatesImageUrl = DocManagerHelper.GetTemplateImageUrl(FileUtility.GetFileType(FileName)); // image url for templates
             var templates = new List<Dictionary<string, string>>
@@ -125,6 +127,7 @@ namespace OnlineEditorsExampleMVC.Models
                             {
                                 { "title", FileName },
                                 { "url", DownloadUrl },
+                                { "directUrl", IsEnabledDirectUrl ? directUrl : "" },
                                 { "fileType", ext.Trim('.') },
                                 { "key", Key },
                                 {
@@ -163,6 +166,11 @@ namespace OnlineEditorsExampleMVC.Models
                                 { "mode", mode },
                                 { "lang", request.Cookies.GetOrDefault("ulang", "en") },
                                 { "callbackUrl", CallbackUrl },  // absolute URL to the document storage service
+                                { "coEditing", editorsMode == "view" && user.id.Equals("uid-0") ? 
+                                    new Dictionary<string, object>{
+                                        {"mode", "strict"},
+                                        {"change", false}
+                                    } : null },
                                 { "createUrl", !user.id.Equals("uid-0") ? createUrl : null },
                                 { "templates", user.templates ? templates : null },
                                 {
@@ -178,9 +186,9 @@ namespace OnlineEditorsExampleMVC.Models
                                     // the parameters for the embedded document type
                                     "embedded", new Dictionary<string, object>
                                         {
-                                            { "saveUrl", FileUriUser },  // the absolute URL that will allow the document to be saved onto the user personal computer
-                                            { "embedUrl", FileUriUser },  // the absolute URL to the document serving as a source file for the document embedded into the web page
-                                            { "shareUrl", FileUriUser },  // the absolute URL that will allow other users to share this document
+                                            { "saveUrl", directUrl },  // the absolute URL that will allow the document to be saved onto the user personal computer
+                                            { "embedUrl", directUrl },  // the absolute URL to the document serving as a source file for the document embedded into the web page
+                                            { "shareUrl", directUrl },  // the absolute URL that will allow other users to share this document
                                             { "toolbarDocked", "top" }  // the place for the embedded viewer toolbar (top or bottom)
                                         }
                                 },
@@ -263,17 +271,26 @@ namespace OnlineEditorsExampleMVC.Models
                     dataObj.Add("key", key);
                     // write file url to the data object
                     string prevFileUrl;
+                    string directPrevFileUrl;
                     if (Path.IsPathRooted(storagePath) && !string.IsNullOrEmpty(storagePath))
                     {
                         prevFileUrl = i == currentVersion ? DocManagerHelper.GetHistoryDownloadUrl(FileName, i.ToString(), "prev" + ext)
                             : DocManagerHelper.GetDownloadUrl(Directory.GetFiles(verDir, "prev.*")[0].Replace(storagePath + "\\", ""));
+                        directPrevFileUrl = i == currentVersion ? DocManagerHelper.GetHistoryDownloadUrl(FileName, i.ToString(), "prev" + ext, false)
+                            : DocManagerHelper.GetDownloadUrl(Directory.GetFiles(verDir, "prev.*")[0].Replace(storagePath + "\\", ""), false);
                     }
                     else {
-                       prevFileUrl = i == currentVersion ? FileUri
-                        : DocManagerHelper.GetHistoryDownloadUrl(FileName, i.ToString(), "prev" + ext);
+                        prevFileUrl = i == currentVersion ? FileUri
+                            : DocManagerHelper.GetHistoryDownloadUrl(FileName, i.ToString(), "prev" + ext);
+                        directPrevFileUrl = i == currentVersion ? DocManagerHelper.GetHistoryDownloadUrl(FileName, i.ToString(), "prev" + ext, false)
+                            : DocManagerHelper.GetDownloadUrl(Directory.GetFiles(verDir, "prev.*")[0].Replace(storagePath + "\\", ""), false);
                     }
 
                     dataObj.Add("url", prevFileUrl);
+                    if (IsEnabledDirectUrl)
+                    {
+                        dataObj.Add("directUrl", directPrevFileUrl);
+                    }
                     dataObj.Add("version", i);
                     if (i > 1)  // check if the version number is greater than 1 (the file was modified)
                     {
@@ -291,7 +308,12 @@ namespace OnlineEditorsExampleMVC.Models
                         obj.Add("user", change.Count > 0 ? change["user"] : null);
 
                         var prev = (Dictionary<string, object>)histData[(i - 2).ToString()];  // get the history data from the previous file version
-                        dataObj.Add("previous", new Dictionary<string, object>() {  // write information about previous file version to the data object
+                        dataObj.Add("previous", IsEnabledDirectUrl ? new Dictionary<string, object>() {  // write information about previous file version to the data object with direct url
+                            { "fileType", prev["fileType"] },
+                            { "key", prev["key"] },  // write key and url information about previous file version
+                            { "url", prev["url"] },
+                            { "directUrl", prev["directUrl"] },
+                        } : new Dictionary<string, object>() {  // write information about previous file version to the data object without direct url
                             { "fileType", prev["fileType"] },
                             { "key", prev["key"] },  // write key and url information about previous file version
                             { "url", prev["url"] },
@@ -333,6 +355,14 @@ namespace OnlineEditorsExampleMVC.Models
                 Query = "type=assets&fileName=" + HttpUtility.UrlEncode("sample.docx")
             };
 
+            var directCompareFileUrl = new UriBuilder(DocManagerHelper.GetServerUrl(false))
+            {
+                Path = HttpRuntime.AppDomainAppVirtualPath
+                    + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
+                    + "webeditor.ashx",
+                Query = "type=assets&fileName=" + HttpUtility.UrlEncode("sample.docx")
+            };
+
             // create an object with the information about the compared file
             var dataCompareFile = new Dictionary<string, object>
             {
@@ -340,6 +370,11 @@ namespace OnlineEditorsExampleMVC.Models
                 { "url", compareFileUrl.ToString() }
             };
 
+            if (IsEnabledDirectUrl)
+            {
+                dataCompareFile.Add("directUrl", directCompareFileUrl.ToString());
+            }
+
             if (JwtManager.Enabled)  // if the secret key to generate token exists
             {
                 var compareFileToken = JwtManager.Encode(dataCompareFile);  // encode the dataCompareFile object into the token
@@ -362,6 +397,13 @@ namespace OnlineEditorsExampleMVC.Models
                     + "Content\\images\\logo.png"
             };
 
+            var directMailMergeUrl = new UriBuilder(DocManagerHelper.GetServerUrl(false))
+            {
+                Path = HttpRuntime.AppDomainAppVirtualPath
+                    + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
+                    + "Content\\images\\logo.png"
+            };
+
             // create a logo config
             var logoConfig = new Dictionary<string, object>
             {
@@ -369,6 +411,11 @@ namespace OnlineEditorsExampleMVC.Models
                 { "url", mailMergeUrl.ToString()}
             };
 
+            if (IsEnabledDirectUrl)
+            {
+                logoConfig.Add("directUrl", directMailMergeUrl.ToString());
+            }
+
             if (JwtManager.Enabled)  // if the secret key to generate token exists
             {
                 var token = JwtManager.Encode(logoConfig);  // encode logoConfig into the token
@@ -393,6 +440,15 @@ namespace OnlineEditorsExampleMVC.Models
                 Query = "type=csv"
             };
 
+            var directMailMergeUrl = new UriBuilder(DocManagerHelper.GetServerUrl(false))
+            {
+                Path =
+                    HttpRuntime.AppDomainAppVirtualPath
+                    + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
+                    + "webeditor.ashx",
+                Query = "type=csv"
+            };
+
             // create a mail merge config
             var mailMergeConfig = new Dictionary<string, object>
             {
@@ -400,6 +456,11 @@ namespace OnlineEditorsExampleMVC.Models
                 { "url", mailMergeUrl.ToString()}
             };
 
+            if (IsEnabledDirectUrl)
+            {
+                mailMergeConfig.Add("directUrl", directMailMergeUrl.ToString());
+            }
+
             if (JwtManager.Enabled)  // if the secret key to generate token exists
             {
                 var mailmergeToken = JwtManager.Encode(mailMergeConfig);  // encode mailMergeConfig into the token

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

@@ -53,49 +53,49 @@
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Web.Services" />
-    <Reference Include="Antlr3.Runtime">
+    <Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
       <HintPath>packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="EntityFramework">
+    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Web.Infrastructure">
+    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="System.Net.Http.Formatting">
+    <Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Helpers">
+    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Http">
+    <Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Http.WebHost">
+    <Reference Include="System.Web.Http.WebHost, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Mvc">
+    <Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Optimization">
+    <Reference Include="System.Web.Optimization, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Razor">
+    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.WebPages">
+    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.WebPages.Deployment">
+    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.WebPages.Razor">
+    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
     </Reference>
-    <Reference Include="WebGrease">
+    <Reference Include="WebGrease, Version=1.6.5135.21930, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
     </Reference>
   </ItemGroup>
@@ -185,10 +185,12 @@
     <Content Include="assets\AUTHORS.md" />
     <Content Include="assets\LICENSE" />
     <Content Include="assets\new\new.docx" />
+    <Content Include="assets\new\new.docxf" />
     <Content Include="assets\new\new.pptx" />
     <Content Include="assets\new\new.xlsx" />
     <Content Include="assets\sample\csv.csv" />
     <Content Include="assets\sample\sample.docx" />
+    <Content Include="assets\sample\sample.docxf" />
     <Content Include="assets\sample\sample.pptx" />
     <Content Include="assets\sample\sample.xlsx" />
     <None Include="packages.config" />

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

@@ -16,11 +16,24 @@
  *
  */
 
+var directUrl;
+
 if (typeof jQuery != "undefined") {
     jq = jQuery.noConflict();
 
+    directUrl = getUrlVars()["directUrl"] == "true";
+
     mustReload = false;
 
+    if (directUrl)
+        jq("#directUrl").prop("checked", directUrl);
+    else
+        directUrl = jq("#directUrl").prop("checked");
+
+    jq("#directUrl").change(function () {
+        window.location = "?directUrl=" + jq(this).prop("checked");
+    });
+
     jq(function () {
         jq('#fileupload').fileupload({
             dataType: 'json',
@@ -219,7 +232,7 @@ if (typeof jQuery != "undefined") {
 
     jq(document).on("click", "#beginEdit:not(.disable)", function () {
         var fileId = encodeURIComponent(jq('#hiddenFileName').val());
-        var url = UrlEditor + "?fileName=" + fileId;
+        var url = UrlEditor + "?fileName=" + fileId + "&directUrl=" + directUrl;
         window.open(url, "_blank");
         jq('#hiddenFileName').val("");
         jq.unblockUI();
@@ -227,7 +240,7 @@ if (typeof jQuery != "undefined") {
 
     jq(document).on("click", "#beginView:not(.disable)", function () {
         var fileId = encodeURIComponent(jq('#hiddenFileName').val());
-        var url = UrlEditor + "?editorsMode=view&fileName=" + fileId;
+        var url = UrlEditor + "?editorsMode=view&fileName=" + fileId + "&directUrl=" + directUrl;
         window.open(url, "_blank");
         jq('#hiddenFileName').val("");
         jq.unblockUI();
@@ -235,7 +248,7 @@ if (typeof jQuery != "undefined") {
 
     jq(document).on("click", "#beginEmbedded:not(.disable)", function () {
         var fileId = encodeURIComponent(jq('#hiddenFileName').val());
-        var url = UrlEditor + "?editorsType=embedded&editorsMode=embedded&fileName=" + fileId;
+        var url = UrlEditor + "?editorsType=embedded&editorsMode=embedded&fileName=" + fileId + "&directUrl=" + directUrl;
 
         jq("#mainProgress").addClass("embedded");
         jq("#beginEmbedded").addClass("disable");
@@ -289,6 +302,17 @@ if (typeof jQuery != "undefined") {
         }
     };
 
+    function getUrlVars() {
+        var vars = [], hash;
+        var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+        for (var i = 0; i < hashes.length; i++) {
+            hash = hashes[i].split('=');
+            vars.push(hash[0]);
+            vars[hash[0]] = hash[1];
+        }
+        return vars;
+    };
+
     var fileList = jq("tr.tableRow");
 
     var mouseIsOverTooltip = false;
@@ -299,12 +323,12 @@ if (typeof jQuery != "undefined") {
                 if (hideTooltipTimeout != null) {
                     clearTimeout(hideTooltipTimeout);
                 }
-                jq(".info").on("touchend", function () {
+                jq("#info").on("touchend", function () {
                     showUserTooltip(true);
                 });
             }
     } else {
-        jq(".info").mouseover(function (event) {
+        jq("#info").mouseover(function (event) {
             if (fileList.length > 0) {
                 if (hideTooltipTimeout != null) {
                     clearTimeout(hideTooltipTimeout);
@@ -328,4 +352,18 @@ if (typeof jQuery != "undefined") {
             }, 500);
         });
     }
+
+    jq(".info-tooltip").mouseover(function (event) {
+        var target = event.target;
+        var id = target.dataset.id ? target.dataset.id : target.id;
+        var tooltip = target.dataset.tooltip;
+
+        jq("<div class='tooltip'>" + tooltip + "<div class='arrow'></div></div>").appendTo("body");
+
+        var top = jq("#" + id).offset().top + jq("#" + id).outerHeight() / 2 - jq("div.tooltip").outerHeight() / 2;
+        var left = jq("#" + id).offset().left + jq("#" + id).outerWidth() + 20;
+        jq("div.tooltip").css({ "top": top, "left": left });
+    }).mouseout(function () {
+        jq("div.tooltip").remove();
+    });
 }

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

@@ -70,7 +70,7 @@
                                             <a class="try-editor form" data-type="docxf">Form template</a>
                                         </li>
                                     </ul>
-                                    <label class="create-sample">
+                                    <label class="side-option">
                                         <input id="createSample" class="checkbox" type="checkbox" />With sample content
                                     </label>
                                 </div>
@@ -86,7 +86,7 @@
                                     <tr>
                                         <td valign="middle">
                                             <span class="select-user">Username</span>
-                                             <img class="info" src="content/images/info.svg" />
+                                             <img id="info" class="info" src="content/images/info.svg" />
                                              <select class="select-user" id="user">
                                             <% foreach (User user in Users.getAllUsers())
                                                { %>
@@ -97,7 +97,10 @@
                                     </tr>
                                     <tr>
                                         <td valign="middle">
-                                            <span class="select-user">Language editors interface</span>
+                                            <span class="select-user">Language</span>
+                                            <img class="info info-tooltip" data-id="language"
+                                                 data-tooltip="Choose the language for ONLYOFFICE editors interface"
+                                                 src="content/images/info.svg" />
                                             <select class="select-user" id="language">
                                                 <% Dictionary<string, string> languages = DocManagerHelper.GetLanguages(); 
                                                 foreach (var lang in languages)
@@ -107,6 +110,14 @@
                                             </select>
                                         </td>
                                     </tr>
+                                    <tr>
+                                        <td valign="middle">
+                                            <label class="side-option">
+                                                <input id="directUrl" type="checkbox" class="checkbox" />Try opening on client
+                                                <img id="directUrlInfo" class="info info-tooltip" data-id="directUrlInfo" data-tooltip="Some files can be opened in the user's browser without connecting to the document server." src="content/images/info.svg" />
+                                            </label>
+                                        </td>
+                                    </tr>
                                 </tbody>
                             </table>
                         </div>
@@ -156,7 +167,8 @@
                                             <tbody>
                                             <% foreach (var storedFile in storedFiles)
                                                {
-                                                    var editUrl = "doceditor.aspx?fileID=" + HttpUtility.UrlEncode(storedFile.Name);
+                                                            var isEnabledDirectUrl = DocManagerHelper.GetDirectUrl();
+                                                            var editUrl = "doceditor.aspx?fileID=" + HttpUtility.UrlEncode(storedFile.Name);
                                                             var docType = FileUtility.GetFileType(storedFile.Name).ToString().ToLower();
                                                             var ext = Path.GetExtension(storedFile.Name).ToLower();
                                                             var canEdit = DocManagerHelper.EditedExts.Contains(ext);
@@ -165,42 +177,42 @@
 
                                                             <tr class="tableRow" title="<%= storedFile.Name %> [<%= DocManagerHelper.GetFileVersion(storedFile.Name, HttpContext.Current.Request.UserHostAddress.Replace(':', '_')) %>]">
                                                                 <td class="contentCells">
-                                                                    <a class="stored-edit <%= docType %>" href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name }) %>" target="_blank">
+                                                                    <a class="stored-edit <%= docType %>" href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, directUrl = isEnabledDirectUrl }) %>" target="_blank">
                                                                         <span><%= storedFile.Name %></span>
                                                                     </a>
                                                                 </td>
                                                                 <% if (canEdit) { %>
                                                                     <td class="contentCells contentCells-icon">
-                                                                        <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "edit" }) %>" target="_blank">
+                                                                        <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "edit", directUrl = isEnabledDirectUrl }) %>" target="_blank">
                                                                             <img src="content/images/desktop.svg" alt="Open in editor for full size screens" title="Open in editor for full size screens"/>
                                                                         </a>
                                                                     </td>
                                                                     <td class="contentCells contentCells-icon">
-                                                                        <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "mobile", editorsMode = "edit" }) %>" target="_blank">
+                                                                        <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "mobile", editorsMode = "edit", directUrl = isEnabledDirectUrl }) %>" target="_blank">
                                                                             <img src="content/images/mobile.svg" alt="Open in editor for mobile devices" title="Open in editor for mobile devices"/>
                                                                         </a>
                                                                     </td>
                                                                     <td class="contentCells contentCells-icon">
-                                                                        <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "comment" }) %>" target="_blank">
+                                                                        <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "comment", directUrl = isEnabledDirectUrl }) %>" target="_blank">
                                                                             <img src="content/images/comment.svg" alt="Open in editor for comment" title="Open in editor for comment"/>
                                                                         </a>
                                                                     </td>
                                                                     <% if (docType == "word") { %>
                                                                         <td class="contentCells contentCells-icon">
-                                                                            <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "review" }) %>" target="_blank">
+                                                                            <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "review", directUrl = isEnabledDirectUrl }) %>" target="_blank">
                                                                                 <img src="content/images/review.svg" alt="Open in editor for review" title="Open in editor for review"/>
                                                                             </a>
                                                                         </td>
                                                                     <% } else if (docType == "cell") { %>
                                                                         <td class="contentCells contentCells-icon">
-                                                                            <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "filter" }) %>" target="_blank">
+                                                                            <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "filter", directUrl = isEnabledDirectUrl }) %>" target="_blank">
                                                                                 <img src="content/images/filter.svg" alt="Open in editor without access to change the filter" title="Open in editor without access to change the filter" />
                                                                             </a>
                                                                          </td>
                                                                     <% } %>
                                                                     <% if (docType == "word") { %>
                                                                         <td class="contentCells contentCells-icon">
-                                                                            <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "blockcontent" }) %>" target="_blank">
+                                                                            <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "blockcontent", directUrl = isEnabledDirectUrl }) %>" target="_blank">
                                                                                 <img src="content/images/block-content.svg" alt="Open in editor without content control modification" title="Open in editor without content control modification"/>
                                                                             </a>
                                                                         </td>
@@ -212,7 +224,7 @@
                                                                     <% } %>
                                                                     <% if (isFillFormDoc) { %>
                                                                         <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
-                                                                            <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "fillForms" }) %>" target="_blank">
+                                                                            <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "fillForms", directUrl = isEnabledDirectUrl }) %>" target="_blank">
                                                                                 <img src="content/images/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
                                                                             </a>
                                                                         </td>
@@ -222,7 +234,7 @@
                                                                 <% } else if (isFillFormDoc) { %>
                                                                     <td class="contentCells contentCells-icon "></td>
                                                                     <td class="contentCells contentCells-icon">
-                                                                       <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "mobile", editorsMode = "fillForms" }) %>" target="_blank">
+                                                                       <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "mobile", editorsMode = "fillForms", directUrl = isEnabledDirectUrl }) %>" target="_blank">
                                                                            <img src="content/images/mobile-fill-forms.svg" alt="Open in editor for filling in forms for mobile devices" title="Open in editor for filling in forms for mobile devices"/>
                                                                        </a>
                                                                     </td>
@@ -230,7 +242,7 @@
                                                                     <td class="contentCells contentCells-icon "></td>
                                                                     <td class="contentCells contentCells-icon "></td>
                                                                     <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
-                                                                       <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "fillForms" }) %>" target="_blank">
+                                                                       <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "fillForms", directUrl = isEnabledDirectUrl }) %>" target="_blank">
                                                                            <img src="content/images/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
                                                                        </a>
                                                                     </td>
@@ -238,17 +250,17 @@
                                                                     <td class="contentCells contentCells-shift contentCells-icon contentCellsEmpty" colspan="6"></td>
                                                                 <% } %>
                                                                 <td class="contentCells contentCells-icon firstContentCellViewers">
-                                                                    <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "view" }) %>" target="_blank">
+                                                                    <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "view", directUrl = isEnabledDirectUrl }) %>" target="_blank">
                                                                         <img src="content/images/desktop.svg" alt="Open in viewer for full size screens" title="Open in viewer for full size screens"/>
                                                                     </a>
                                                                 </td>
                                                                 <td class="contentCells contentCells-icon">
-                                                                    <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "mobile", editorsMode = "view" }) %>" target="_blank">
+                                                                    <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "mobile", editorsMode = "view", directUrl = isEnabledDirectUrl }) %>" target="_blank">
                                                                         <img src="content/images/mobile.svg" alt="Open in viewer for mobile devices" title="Open in viewer for mobile devices"/>
                                                                     </a>
                                                                 </td>
                                                                 <td class="contentCells contentCells-icon contentCells-shift">
-                                                                    <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "embedded", editorsMode = "embedded" }) %>" target="_blank">
+                                                                    <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "embedded", editorsMode = "embedded", directUrl = isEnabledDirectUrl }) %>" target="_blank">
                                                                         <img src="content/images/embeded.svg" alt="Open in embedded mode" title="Open in embedded mode"/>
                                                                     </a>
                                                                 </td>

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   For more information on how to configure your ASP.NET application, please visit
   http://go.microsoft.com/fwlink/?LinkId=152368
@@ -26,11 +26,11 @@
   </system.web>
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false" />
-	<httpProtocol>
-		<customHeaders>
-			<add name="Access-Control-Allow-Origin" value="*" />
-		</customHeaders>
-	</httpProtocol>
+    <httpProtocol>
+      <customHeaders>
+        <add name="Access-Control-Allow-Origin" value="*" />
+      </customHeaders>
+    </httpProtocol>
     <handlers>
       <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
       <remove name="OPTIONSVerbHandler" />
@@ -46,13 +46,21 @@
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
+        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
         <bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
@@ -63,7 +71,4 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-  <entityFramework>
-    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
-  </entityFramework>
 </configuration>

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

@@ -463,13 +463,13 @@ namespace OnlineEditorsExampleMVC
 
                 if (JwtManager.Enabled && isEmbedded == null)
                 {
-                    string JWTheader = WebConfigurationManager.AppSettings["files.docservice.header"].Equals("") ? "Authorization" : WebConfigurationManager.AppSettings["files.docservice.header"];
+                    string JWTheader = string.IsNullOrEmpty(WebConfigurationManager.AppSettings["files.docservice.header"]) ? "Authorization" : WebConfigurationManager.AppSettings["files.docservice.header"];
 
                     if (context.Request.Headers.AllKeys.Contains(JWTheader, StringComparer.InvariantCultureIgnoreCase))
                     {
                         var headerToken = context.Request.Headers.Get(JWTheader).Substring("Bearer ".Length);
                         string token = JwtManager.Decode(headerToken);
-                        if (token == null || token.Equals(""))
+                        if (string.IsNullOrEmpty(token))
                         {
                             context.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                             context.Response.Write("JWT validation failed");
@@ -479,7 +479,7 @@ namespace OnlineEditorsExampleMVC
                 }
 
                 var filePath = DocManagerHelper.ForcesavePath(fileName, userAddress, false);  // get the path to the force saved document version
-                if (filePath.Equals(""))
+                if (string.IsNullOrEmpty(filePath))
                 {
                     filePath = DocManagerHelper.StoragePath(fileName, userAddress);  // or to the original document
                 }
@@ -520,14 +520,14 @@ namespace OnlineEditorsExampleMVC
 
                 if (JwtManager.Enabled)
                 {
-                    string JWTheader = WebConfigurationManager.AppSettings["files.docservice.header"].Equals("") ? "Authorization" : WebConfigurationManager.AppSettings["files.docservice.header"];
+                    string JWTheader = string.IsNullOrEmpty(WebConfigurationManager.AppSettings["files.docservice.header"]) ? "Authorization" : WebConfigurationManager.AppSettings["files.docservice.header"];
 
                     if (context.Request.Headers.AllKeys.Contains(JWTheader, StringComparer.InvariantCultureIgnoreCase))
                     {
                         var headerToken = context.Request.Headers.Get(JWTheader).Substring("Bearer ".Length);
                         string token = JwtManager.Decode(headerToken);
 
-                        if (token == null || token.Equals(""))
+                        if (string.IsNullOrEmpty(token))
                         {
                             context.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                             context.Response.Write("JWT validation failed");

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

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Antlr" version="3.5.0.2" targetFramework="net45" />
-  <package id="EntityFramework" version="6.4.4" targetFramework="net45" />
+  <package id="Antlr" version="3.5.0.2" targetFramework="net48" />
+  <package id="EntityFramework" version="6.4.4" targetFramework="net48" />
   <package id="JWT" version="9.0.3" targetFramework="net48" />
-  <package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net45" />
-  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net45" />
-  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net45" />
-  <package id="WebGrease" version="1.6.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net48" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net48" />
+  <package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net48" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net48" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net48" />
+  <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net48" />
+  <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net48" />
+  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net48" />
+  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
+  <package id="WebGrease" version="1.6.0" targetFramework="net48" />
 </packages>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <appSettings>
   <clear />
-  <add key="version" value="1.3.0"/>
+  <add key="version" value="1.4.0"/>
 
   <add key="filesize-max" value="52428800"/>
   <add key="storage-path" value=""/>
@@ -16,7 +16,7 @@
 
   <add key="files.docservice.verify-peer-off" value="true"/>
 
-  <add key="files.docservice.languages" value="en:English|az:Azerbaijani|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese|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|lv:Latvian|lo:Lao|nb:Norwegian|pl:Polish|pt:Portuguese|ro:Romanian|ru:Russian|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese"/>
+  <add key="files.docservice.languages" value="en:English|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (People's Republic of China)|zh-TW:Chinese (Traditional, Taiwan)|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|lv:Latvian|lo:Lao|ms:Malay (Malaysia)|nb:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|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/App_Themes/stylesheet.css

@@ -167,7 +167,7 @@ label .checkbox {
     background-image: url("images/file_docxf.svg");
 }
 
-.create-sample {
+.side-option {
     color: #666666;
     line-height: 24px;
 }
@@ -744,3 +744,28 @@ html {
 .user-descr > b {
     margin-left: 25px;
 }
+
+.tooltip {
+    background: #FFFFFF;
+    border-radius: 5px;
+    box-shadow: 0px 7px 25px rgba(85, 85, 85, 0.15);
+    color: #666666;
+    line-height: 160%;
+    max-width: 455px;
+    padding: 14px;
+    position: absolute;
+}
+
+    .tooltip ul {
+        margin: 0;
+    }
+
+.arrow {
+    border-top: 8px solid transparent;
+    border-bottom: 8px solid transparent;
+    border-right: 8px solid #FFFFFF;
+    left: -4px;
+    position: absolute;
+    top: 50%;
+    transform: translate(-50%, -50%);
+}

web/documentserver-example/csharp/Default.aspx

@@ -73,7 +73,7 @@
                                                 <a class="try-editor form" data-type="docxf">Form template</a>
                                             </li>
                                         </ul>
-                                        <label class="create-sample">
+                                        <label class="side-option">
                                             <input id="createSample" class="checkbox" type="checkbox" />With sample content
                                         </label>
                                     </div>
@@ -88,7 +88,7 @@
                                         <tr>
                                             <td valign="middle">
                                                 <span class="select-user">Username</span>
-                                                <img class="info" src="app_themes/images/info.svg" />
+                                                <img id="info" class="info" src="app_themes/images/info.svg" />
                                                 <select class="select-user" id="user">
                                                     <% foreach (User user in Users.getAllUsers())
                                                        { %>
@@ -99,7 +99,10 @@
                                         </tr>
                                         <tr>
                                             <td valign="middle">
-                                                <span class="select-user">Language editors interface</span>
+                                                <span class="select-user">Language</span>
+                                            <img class="info info-tooltip" data-id="language"
+                                                 data-tooltip="Choose the language for ONLYOFFICE editors interface"
+                                                 src="app_themes/images/info.svg" />
                                                 <select class="select-user" id="language">
                                                     <% Dictionary<string, string> languages = GetLanguages(); 
                                                     foreach (var lang in languages)
@@ -109,6 +112,14 @@
                                                 </select>
                                             </td>
                                         </tr>
+                                        <tr>
+                                        <td valign="middle">
+                                            <label class="side-option">
+                                                <input id="directUrl" type="checkbox" class="checkbox" />Try opening on client
+                                                <img id="directUrlInfo" class="info info-tooltip" data-id="directUrlInfo" data-tooltip="Some files can be opened in the user's browser without connecting to the document server." src="app_themes/images/info.svg" />
+                                            </label>
+                                        </td>
+                                    </tr>
                                     </tbody>
                                 </table>
                             </div>
@@ -158,7 +169,8 @@
                                                 <tbody>
                                                 <%  foreach (var storedFile in storedFiles)
                                                     {
-                                                        var editUrl = "doceditor.aspx?fileID=" + HttpUtility.UrlEncode(storedFile.Name);
+                                                        var directUrlParam = GetDirectUrlParam();
+                                                        var editUrl = "doceditor.aspx?fileID=" + HttpUtility.UrlEncode(storedFile.Name) + directUrlParam;
                                                         var ext = Path.GetExtension(storedFile.Name).ToLower();
                                                         var docType = DocumentType(storedFile.Name);
                                                         var canEdit = EditedExts.Contains(ext);

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

@@ -626,5 +626,11 @@ namespace OnlineEditorsExample
             }
             return languages;
         }
+
+        public static string GetDirectUrlParam()
+        {
+            string isEnabledDirectUrl = HttpUtility.ParseQueryString(HttpContext.Current.Request.Url.Query).Get("directUrl");
+            return "&directUrl=" + (isEnabledDirectUrl != null ? isEnabledDirectUrl : "false");
+        }
     }
 }

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

@@ -100,16 +100,17 @@ namespace OnlineEditorsExample
         }
 
         // get url to download a file
-        public static string getDownloadUrl(string fileName)
+        public static string getDownloadUrl(string fileName, Boolean isServer = true)
         {
-            var downloadUrl = new UriBuilder(_Default.GetServerUrl(true));
+            var userAddress = isServer ? "&userAddress=" + HttpUtility.UrlEncode(_Default.CurUserHostAddress(HttpContext.Current.Request.UserHostAddress)) : "";
+            var downloadUrl = new UriBuilder(_Default.GetServerUrl(isServer));
                 downloadUrl.Path =
                     HttpRuntime.AppDomainAppVirtualPath
                     + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
                     + "webeditor.ashx";
                 downloadUrl.Query = "type=download"
                                     + "&fileName=" + HttpUtility.UrlEncode(fileName)
-                                    + "&userAddress=" + HttpUtility.UrlEncode(_Default.CurUserHostAddress(HttpContext.Current.Request.UserHostAddress));
+                                    + userAddress;
                 return downloadUrl.ToString();
         }
 
@@ -165,6 +166,7 @@ namespace OnlineEditorsExample
             var actionLink = Request.GetOrDefault("actionLink", null);  // get the action link (comment or bookmark) if it exists
             var actionData = string.IsNullOrEmpty(actionLink) ? null : jss.DeserializeObject(actionLink);  // get action data for the action link
 
+            var directUrl = getDownloadUrl(FileName, false);
             var createUrl = getCreateUrl(DocumentType, editorsType);
             var templatesImageUrl = GetTemplateImageUrl(ext); // image url for templates
             var templates = new List<Dictionary<string, string>>
@@ -193,6 +195,7 @@ namespace OnlineEditorsExample
                             {
                                 { "title", FileName },
                                 { "url", getDownloadUrl(FileName) },
+                                { "directUrl", IsEnabledDirectUrl() ? directUrl : "" },
                                 { "fileType", ext.Trim('.') },
                                 { "key", Key },
                                 {
@@ -231,6 +234,11 @@ namespace OnlineEditorsExample
                                 { "mode", mode },
                                 { "lang", Request.Cookies.GetOrDefault("ulang", "en") },
                                 { "callbackUrl", CallbackUrl },  // absolute URL to the document storage service
+                                { "coEditing", editorsMode == "view" && user.id.Equals("uid-0") ? 
+                                    new Dictionary<string, object>{
+                                        {"mode", "strict"},
+                                        {"change", false}
+                                    } : null },
                                 { "createUrl", !user.id.Equals("uid-0") ? createUrl : null },
                                 { "templates", user.templates ? templates : null },
                                 {
@@ -246,9 +254,9 @@ namespace OnlineEditorsExample
                                     // the parameters for the embedded document type
                                     "embedded", new Dictionary<string, object>
                                         {
-                                            { "saveUrl", FileUriUser },  // the absolute URL that will allow the document to be saved onto the user personal computer
-                                            { "embedUrl", FileUriUser },  // the absolute URL to the document serving as a source file for the document embedded into the web page
-                                            { "shareUrl", FileUriUser },  // the absolute URL that will allow other users to share this document
+                                            { "saveUrl", directUrl },  // the absolute URL that will allow the document to be saved onto the user personal computer
+                                            { "embedUrl", directUrl },  // the absolute URL to the document serving as a source file for the document embedded into the web page
+                                            { "shareUrl", directUrl },  // the absolute URL that will allow other users to share this document
                                             { "toolbarDocked", "top" }  // the place for the embedded viewer toolbar (top or bottom)
                                         }
                                 },
@@ -360,13 +368,21 @@ namespace OnlineEditorsExample
                     dataObj.Add("fileType", ext.Replace(".", ""));
                     dataObj.Add("key", key);
                     // write file url to the data object
+                    var directPrevFileUrl = i == currentVersion ? _Default.FileUri(FileName, false) : MakePublicHistoryUrl(FileName, i.ToString(), "prev" + ext, false);
                     var prevFileUrl = i == currentVersion ? FileUri : MakePublicHistoryUrl(FileName, i.ToString(), "prev" + ext);
                     if (Path.IsPathRooted(storagePath))
                     {
                         prevFileUrl = i == currentVersion ? getDownloadUrl(FileName) : getDownloadUrl(Directory.GetFiles(verDir, "prev.*")[0].Replace(storagePath + "\\", ""));
+                        directPrevFileUrl = i == currentVersion ? getDownloadUrl(FileName, false) : getDownloadUrl(Directory.GetFiles(verDir, "prev.*")[0].Replace(storagePath + "\\", ""), false);
                     }
 
                     dataObj.Add("url", prevFileUrl);  // write file url to the data object
+
+                    if (IsEnabledDirectUrl())
+                    {
+                        dataObj.Add("directUrl", directPrevFileUrl); // write direct url to the data object
+                    } 
+
                     dataObj.Add("version", i);
                     if (i > 1)  // check if the version number is greater than 1 (the file was modified)
                     {
@@ -384,11 +400,19 @@ namespace OnlineEditorsExample
                         obj.Add("user", change.Count > 0 ? change["user"] : null);
 
                         var prev = (Dictionary<string, object>)histData[(i - 2).ToString()];  // get the history data from the previous file version
-                        dataObj.Add("previous", new Dictionary<string, object>() {  // write information about previous file version to the data object
+
+                        Dictionary<string, object> dataPrev = new Dictionary<string, object>() {  // write information about previous file version to the data object
                             { "fileType", prev["fileType"] },
                             { "key", prev["key"] },  // write key and url information about previous file version
-                            { "url", prev["url"] },
-                        });
+                            { "url", prev["url"] }
+                        };
+
+                        if (IsEnabledDirectUrl())
+                        {
+                            dataPrev.Add("directUrl", prev["directUrl"]);
+                        }
+
+                        dataObj.Add("previous", dataPrev);
                         // write the path to the diff.zip archive with differences in this file version
                         var changesUrl = MakePublicHistoryUrl(FileName, (i - 1).ToString(), "diff.zip");
                         dataObj.Add("changesUrl", changesUrl);
@@ -421,6 +445,11 @@ namespace OnlineEditorsExample
                 + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
                 + "App_Themes\\images\\logo.png";
 
+            var DirectImageUrl = new UriBuilder(_Default.GetServerUrl(false));
+            DirectImageUrl.Path = HttpRuntime.AppDomainAppVirtualPath
+                + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
+                + "App_Themes\\images\\logo.png";
+
             // create a logo config
             Dictionary<string, object> logoConfig = new Dictionary<string, object>
                 {
@@ -428,6 +457,11 @@ namespace OnlineEditorsExample
                     { "url", InsertImageUrl.ToString()}
                 };
 
+            if (IsEnabledDirectUrl())
+            {
+                logoConfig.Add("directUrl", DirectImageUrl.ToString());
+            }
+
             if (JwtManager.Enabled)  // if the secret key to generate token exists
             {
                 var insImageToken = JwtManager.Encode(logoConfig);  // encode logoConfig into the token
@@ -447,6 +481,12 @@ namespace OnlineEditorsExample
                 + "webeditor.ashx";
             compareFileUrl.Query = "type=assets&fileName=" + HttpUtility.UrlEncode("sample.docx");
 
+            var DirectFileUrl = new UriBuilder(_Default.GetServerUrl(false));
+            DirectFileUrl.Path = HttpRuntime.AppDomainAppVirtualPath
+                + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
+                + "webeditor.ashx";
+            DirectFileUrl.Query = "type=assets&fileName=" + HttpUtility.UrlEncode("sample.docx");
+
             // create an object with the information about the compared file
             Dictionary<string, object> dataCompareFile = new Dictionary<string, object>
                 {
@@ -454,6 +494,11 @@ namespace OnlineEditorsExample
                     { "url", compareFileUrl.ToString() }
                 };
 
+            if (IsEnabledDirectUrl())
+            {
+                dataCompareFile.Add("directUrl", DirectFileUrl.ToString());
+            }
+
             if (JwtManager.Enabled)  // if the secret key to generate token exists
             {
                 var compareFileToken = JwtManager.Encode(dataCompareFile);  // encode the dataCompareFile object into the token
@@ -474,6 +519,13 @@ namespace OnlineEditorsExample
                     + "webeditor.ashx";
             mailmergeUrl.Query = "type=csv";
 
+            var DirectMailMergeUrl = new UriBuilder(_Default.GetServerUrl(false));
+            DirectMailMergeUrl.Path =
+                    HttpRuntime.AppDomainAppVirtualPath
+                    + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
+                    + "webeditor.ashx";
+            DirectMailMergeUrl.Query = "type=csv";
+
             // create a mail merge config
             Dictionary<string, object> mailMergeConfig = new Dictionary<string, object>
                 {
@@ -481,6 +533,11 @@ namespace OnlineEditorsExample
                     { "url", mailmergeUrl.ToString() }
                 };
 
+            if (IsEnabledDirectUrl())
+            {
+                mailMergeConfig.Add("directUrl", DirectMailMergeUrl.ToString());
+            }
+
             if (JwtManager.Enabled)  // if the secret key to generate token exists
             {
                 var mailmergeToken = JwtManager.Encode(mailMergeConfig);  // encode mailMergeConfig into the token
@@ -522,15 +579,16 @@ namespace OnlineEditorsExample
 
 
         // create the public history url
-        private string MakePublicHistoryUrl(string filename, string version, string file)
+        private string MakePublicHistoryUrl(string filename, string version, string file, Boolean isServer = true)
         {
-            var fileUrl = new UriBuilder(_Default.GetServerUrl(true));
+            var userAddress = isServer ? "&userAddress=" + HttpUtility.UrlEncode(_Default.CurUserHostAddress(HttpContext.Current.Request.UserHostAddress)) : "";
+            var fileUrl = new UriBuilder(_Default.GetServerUrl(isServer));
             fileUrl.Path = HttpRuntime.AppDomainAppVirtualPath
                 + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
                 + "webeditor.ashx";
             fileUrl.Query = "type=downloadhistory&fileName=" + HttpUtility.UrlEncode(filename)
                 + "&ver=" + version + "&file=" + file
-                + "&userAddress=" + HttpUtility.UrlEncode(_Default.CurUserHostAddress(HttpContext.Current.Request.UserHostAddress));
+                + userAddress;
             return fileUrl.ToString();
         }
 
@@ -581,5 +639,12 @@ namespace OnlineEditorsExample
                 { "name", uname }
             }));
         }
+
+        // get direct url flag
+        private static bool IsEnabledDirectUrl()
+        {
+            string isEnabledDirectUrl = HttpUtility.ParseQueryString(HttpContext.Current.Request.Url.Query).Get("directUrl");
+            return isEnabledDirectUrl != null ? Convert.ToBoolean(isEnabledDirectUrl) : false;
+        }
     }
 }

web/documentserver-example/csharp/DocumentConverter.cs

@@ -132,7 +132,7 @@ namespace ASC.Api.DocumentConverter
                 var payloadToken =  JwtManager.Encode(payload);  // encode the payload object to the payload token
                 var bodyToken = JwtManager.Encode(body);  // encode the body object to the body token
                 // create header token
-                string JWTheader = WebConfigurationManager.AppSettings["files.docservice.header"].Equals("") ? "Authorization" : WebConfigurationManager.AppSettings["files.docservice.header"];
+                string JWTheader = string.IsNullOrEmpty(WebConfigurationManager.AppSettings["files.docservice.header"]) ? "Authorization" : WebConfigurationManager.AppSettings["files.docservice.header"];
                 request.Headers.Add(JWTheader, "Bearer " + payloadToken);  // and add it to the request headers with the Bearer prefix
 
                 body.Add("token", bodyToken);

web/documentserver-example/csharp/OnlineEditorsExample.csproj

@@ -161,10 +161,12 @@
     <Content Include="assets\AUTHORS.md" />
     <Content Include="assets\LICENSE" />
     <Content Include="assets\new\new.docx" />
+    <Content Include="assets\new\new.docxf" />
     <Content Include="assets\new\new.pptx" />
     <Content Include="assets\new\new.xlsx" />
     <Content Include="assets\sample\csv.csv" />
     <Content Include="assets\sample\sample.docx" />
+    <Content Include="assets\sample\sample.docxf" />
     <Content Include="assets\sample\sample.pptx" />
     <Content Include="assets\sample\sample.xlsx" />
     <None Include="packages.config" />

web/documentserver-example/csharp/TrackManager.cs

@@ -57,7 +57,7 @@ namespace OnlineEditorsExample
             // check if the document token is enabled
             if (JwtManager.Enabled)
             {
-                string JWTheader = WebConfigurationManager.AppSettings["files.docservice.header"].Equals("") ? "Authorization" : WebConfigurationManager.AppSettings["files.docservice.header"];
+                string JWTheader = string.IsNullOrEmpty(WebConfigurationManager.AppSettings["files.docservice.header"]) ? "Authorization" : WebConfigurationManager.AppSettings["files.docservice.header"];
 
                 string token = null;
 
@@ -76,7 +76,7 @@ namespace OnlineEditorsExample
                     context.Response.Write("{\"error\":1,\"message\":\"JWT expected\"}");
                 }
 
-                if (token != null && !token.Equals(""))  // invalid signature error
+                if (!string.IsNullOrEmpty(token))  // invalid signature error
                 {
                     fileData = jss.Deserialize<Dictionary<string, object>>(token);
                     if (fileData.ContainsKey("payload"))
@@ -160,7 +160,7 @@ namespace OnlineEditorsExample
             File.WriteAllText(Path.Combine(versionDir, "key.txt"), (string)fileData["key"]);  // write the key value to the key.txt file
 
             string forcesavePath = _Default.ForcesavePath(newFileName, userAddress, false);  // get the path to the forcesaved file version
-            if (!forcesavePath.Equals(""))  // if the forcesaved file version exists
+            if (!string.IsNullOrEmpty(forcesavePath))  // if the forcesaved file version exists
             {
                 File.Delete(forcesavePath);  // remove it
             }
@@ -231,7 +231,7 @@ namespace OnlineEditorsExample
                 }
 
                 forcesavePath = _Default.ForcesavePath(fileName, userAddress, false);
-                if (forcesavePath.Equals(""))  // create forcesave path if it doesn't exist
+                if (string.IsNullOrEmpty(forcesavePath))  // create forcesave path if it doesn't exist
                 {
                     forcesavePath = _Default.ForcesavePath(fileName, userAddress, true);
                 }
@@ -282,7 +282,7 @@ namespace OnlineEditorsExample
 
                 var payloadToken = JwtManager.Encode(payload);  // encode a payload object into a header token
                 var bodyToken = JwtManager.Encode(body);  // encode body into a body token
-                string JWTheader = WebConfigurationManager.AppSettings["files.docservice.header"].Equals("") ? "Authorization" : WebConfigurationManager.AppSettings["files.docservice.header"];
+                string JWTheader = string.IsNullOrEmpty(WebConfigurationManager.AppSettings["files.docservice.header"]) ? "Authorization" : WebConfigurationManager.AppSettings["files.docservice.header"];
                 request.Headers.Add(JWTheader, "Bearer " + payloadToken);  // add a header Authorization with a header token and Authorization prefix in it
 
                 body.Add("token", bodyToken);
@@ -324,6 +324,7 @@ namespace OnlineEditorsExample
             if (string.IsNullOrEmpty(path)) throw new ArgumentException("path");  // file isn't specified
 
             var req = (HttpWebRequest)WebRequest.Create(url);
+            req.Timeout = 5000;
             using (var stream = req.GetResponse().GetResponseStream())  // get input stream of the file information from the url
             {
                 if (stream == null) throw new Exception("stream is null");

web/documentserver-example/csharp/Users.cs

@@ -68,6 +68,7 @@ namespace OnlineEditorsExample
             "Can’t see anyone’s information",
             "Can't rename files from the editor",
             "Can't view chat",
+            "View file without collaboration",
         };
 
         private static List<User> users = new List<User>() {

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

@@ -283,14 +283,14 @@ namespace OnlineEditorsExample
 
                 if (JwtManager.Enabled && isEmbedded == null)
                 {
-                    string JWTheader = WebConfigurationManager.AppSettings["files.docservice.header"].Equals("") ? "Authorization" : WebConfigurationManager.AppSettings["files.docservice.header"];
+                    string JWTheader = string.IsNullOrEmpty(WebConfigurationManager.AppSettings["files.docservice.header"]) ? "Authorization" : WebConfigurationManager.AppSettings["files.docservice.header"];
 
                     if (context.Request.Headers.AllKeys.Contains(JWTheader, StringComparer.InvariantCultureIgnoreCase))
                     {
                         var headerToken = context.Request.Headers.Get(JWTheader).Substring("Bearer ".Length);
                         string token = JwtManager.Decode(headerToken);
 
-                        if (token == null || token.Equals(""))
+                        if (string.IsNullOrEmpty(token))
                         {
                             context.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                             context.Response.Write("JWT validation failed");
@@ -300,7 +300,7 @@ namespace OnlineEditorsExample
                 }
 
                 var filePath = _Default.ForcesavePath(fileName, userAddress, false);  // get the path to the force saved document version
-                if (filePath.Equals(""))
+                if (string.IsNullOrEmpty(filePath))
                 {
                     filePath = _Default.StoragePath(fileName, userAddress);  // or to the original document
                 }
@@ -340,14 +340,14 @@ namespace OnlineEditorsExample
 
                 if (JwtManager.Enabled)
                 {
-                    string JWTheader = WebConfigurationManager.AppSettings["files.docservice.header"].Equals("") ? "Authorization" : WebConfigurationManager.AppSettings["files.docservice.header"];
+                    string JWTheader = string.IsNullOrEmpty(WebConfigurationManager.AppSettings["files.docservice.header"]) ? "Authorization" : WebConfigurationManager.AppSettings["files.docservice.header"];
 
                     if (context.Request.Headers.AllKeys.Contains(JWTheader, StringComparer.InvariantCultureIgnoreCase))
                     {
                         var headerToken = context.Request.Headers.Get(JWTheader).Substring("Bearer ".Length);
                         string token = JwtManager.Decode(headerToken);
 
-                        if (token == null || token.Equals(""))
+                        if (string.IsNullOrEmpty(token))
                         {
                             context.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                             context.Response.Write("JWT validation failed");

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

@@ -16,11 +16,24 @@
  *
  */
 
+var directUrl;
+
 if (typeof jQuery != "undefined") {
     jq = jQuery.noConflict();
 
+    directUrl = getUrlVars()["directUrl"] == "true";
+
     mustReload = false;
 
+    if (directUrl)
+        jq("#directUrl").prop("checked", directUrl);
+    else
+        directUrl = jq("#directUrl").prop("checked");
+
+    jq("#directUrl").change(function () {
+        window.location = "?directUrl=" + jq(this).prop("checked");
+    });
+
     jq(function () {
         jq('#fileupload').fileupload({
             dataType: 'json',
@@ -219,7 +232,7 @@ if (typeof jQuery != "undefined") {
 
     jq(document).on("click", "#beginEdit:not(.disable)", function () {
         var fileId = encodeURIComponent(jq('#hiddenFileName').val());
-        var url = "doceditor.aspx?fileID=" + fileId;
+        var url = "doceditor.aspx?fileID=" + fileId + "&directUrl=" + directUrl;
         window.open(url, "_blank");
         jq('#hiddenFileName').val("");
         jq.unblockUI();
@@ -227,7 +240,7 @@ if (typeof jQuery != "undefined") {
 
     jq(document).on("click", "#beginView:not(.disable)", function () {
         var fileId = encodeURIComponent(jq('#hiddenFileName').val());
-        var url = "doceditor.aspx?editorsMode=view&fileID=" + fileId;
+        var url = "doceditor.aspx?editorsMode=view&fileID=" + fileId + "&directUrl=" + directUrl;
         window.open(url, "_blank");
         jq('#hiddenFileName').val("");
         jq.unblockUI();
@@ -235,7 +248,7 @@ if (typeof jQuery != "undefined") {
 
     jq(document).on("click", "#beginEmbedded:not(.disable)", function () {
         var fileId = encodeURIComponent(jq('#hiddenFileName').val());
-        var url = "doceditor.aspx?editorsType=embedded&editorsMode=embedded&fileID=" + fileId;
+        var url = "doceditor.aspx?editorsType=embedded&editorsMode=embedded&fileID=" + fileId + "&directUrl=" + directUrl;
 
         jq("#mainProgress").addClass("embedded");
         jq("#beginEmbedded").addClass("disable");
@@ -288,6 +301,17 @@ if (typeof jQuery != "undefined") {
         }
     };
 
+    function getUrlVars() {
+        var vars = [], hash;
+        var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+        for (var i = 0; i < hashes.length; i++) {
+            hash = hashes[i].split('=');
+            vars.push(hash[0]);
+            vars[hash[0]] = hash[1];
+        }
+        return vars;
+    };
+
     var fileList = jq("tr.tableRow");
 
     var mouseIsOverTooltip = false;
@@ -298,12 +322,12 @@ if (typeof jQuery != "undefined") {
                 if (hideTooltipTimeout != null) {
                     clearTimeout(hideTooltipTimeout);
                 }
-                jq(".info").on("touchend", function () {
+                jq("#info").on("touchend", function () {
                     showUserTooltip(true);
                 });
             }
     } else {
-        jq(".info").mouseover(function (event) {
+        jq("#info").mouseover(function (event) {
             if (fileList.length > 0) {
                 if (hideTooltipTimeout != null) {
                     clearTimeout(hideTooltipTimeout);
@@ -327,4 +351,18 @@ if (typeof jQuery != "undefined") {
             }, 500);
         });
     }
+
+    jq(".info-tooltip").mouseover(function (event) {
+        var target = event.target;
+        var id = target.dataset.id ? target.dataset.id : target.id;
+        var tooltip = target.dataset.tooltip;
+
+        jq("<div class='tooltip'>" + tooltip + "<div class='arrow'></div></div>").appendTo("body");
+
+        var top = jq("#" + id).offset().top + jq("#" + id).outerHeight() / 2 - jq("div.tooltip").outerHeight() / 2;
+        var left = jq("#" + id).offset().left + jq("#" + id).outerWidth() + 20;
+        jq("div.tooltip").css({ "top": top, "left": left });
+    }).mouseout(function () {
+        jq("div.tooltip").remove();
+    });
 }

web/documentserver-example/csharp/settings.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <appSettings>
   <clear />
-  <add key="version" value="1.3.0"/>
+  <add key="version" value="1.4.0"/>
 
   <add key="filesize-max" value="52428800"/>
   <add key="storage-path" value=""/>
@@ -15,7 +15,7 @@
   <add key="files.docservice.header" value="Authorization" />
   <add key="files.docservice.verify-peer-off" value="true"/>
 
-  <add key="files.docservice.languages" value="en:English|az:Azerbaijani|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese|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|lv:Latvian|lo:Lao|nb:Norwegian|pl:Polish|pt:Portuguese|ro:Romanian|ru:Russian|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese"/>
+  <add key="files.docservice.languages" value="en:English|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (People's Republic of China)|zh-TW:Chinese (Traditional, Taiwan)|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|lv:Latvian|lo:Lao|ms:Malay (Malaysia)|nb:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|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/pom.xml

@@ -61,10 +61,15 @@
 			<version>1.18.20</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>2.13.4</version>
+		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.12.6.1</version>
+			<version>2.13.4.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.modelmapper</groupId>
@@ -78,6 +83,31 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<version>2.17</version>
+				<executions>
+					<execution>
+						<id>validate</id>
+						<phase>validate</phase>
+						<configuration>
+							<configLocation>google_checks.xml</configLocation>
+							<encoding>UTF-8</encoding>
+							<failsOnError>true</failsOnError>
+							<failOnViolation>true</failOnViolation>
+							<logViolationsToConsole>true</logViolationsToConsole>
+							<violationSeverity>warning</violationSeverity>
+							<consoleOutput>true</consoleOutput>
+							<includeTestSourceDirectory>true
+							</includeTestSourceDirectory>
+						</configuration>
+						<goals>
+							<goal>check</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>

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

@@ -43,7 +43,8 @@ public class ExampleData {
                 "Can't create new files from the editor",
                 "Can’t see anyone’s information",
                 "Can't rename files from the editor",
-               "Can't view chat"
+                "Can't view chat",
+                "View file without collaboration"
         );
         List<String> description_user_1 = List.of(  // the description for user 1
                 "File author by default",

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

@@ -26,7 +26,6 @@ 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.documentserver.models.enums.Language;
 import com.onlyoffice.integration.documentserver.models.enums.Type;
 import com.onlyoffice.integration.documentserver.models.filemodel.FileModel;
 import com.onlyoffice.integration.services.UserServices;
@@ -53,6 +52,9 @@ public class EditorController {
     @Value("${files.docservice.url.api}")
     private String docserviceApiUrl;
 
+    @Value("${files.docservice.languages}")
+    private String langs;
+
     @Autowired
     private FileStoragePathBuilder storagePathBuilder;
 
@@ -77,16 +79,25 @@ public class EditorController {
                         @RequestParam(value = "action", required = false) String actionParam,
                         @RequestParam(value = "type", required = false) String typeParam,
                         @RequestParam(value = "actionLink", required = false) String actionLink,
+                        @RequestParam(value = "directUrl", required = false, defaultValue = "false") Boolean directUrl,
                         @CookieValue(value = "uid") String uid,
                         @CookieValue(value = "ulang") String lang,
                         Model model) throws JsonProcessingException {
         Action action = Action.edit;
         Type type = Type.desktop;
-        Language language = Language.en;
+        Locale locale = new Locale("en");
 
         if(actionParam != null) action = Action.valueOf(actionParam);
         if(typeParam != null) type = Type.valueOf(typeParam);
-        if(lang != null) language = Language.valueOf(lang);
+
+        List<String> langsAndKeys = Arrays.asList(langs.split("\\|"));
+        for (String langAndKey : langsAndKeys) {
+            String[] couple = langAndKey.split(":");
+            if (couple[0].equals(lang)) {
+                String[] langAndCountry = couple[0].split("-");
+                locale = new Locale(langAndCountry[0], langAndCountry.length > 1 ? langAndCountry[1] : "");
+            }
+        }
 
         Optional<User> optionalUser = userService.findUserById(Integer.parseInt(uid));
 
@@ -101,10 +112,11 @@ public class EditorController {
                         .builder()
                         .fileName(fileName)
                         .type(type)
-                        .lang(language)
+                        .lang(locale.toLanguageTag())
                         .action(action)
                         .user(user)
                         .actionData(actionLink)
+                        .isEnableDirectUrl(directUrl)
                         .build()
         );
 
@@ -112,9 +124,9 @@ public class EditorController {
         model.addAttribute("model", fileModel);  // add file model with the default parameters to the original model
         model.addAttribute("fileHistory", historyManager.getHistory(fileModel.getDocument()));  // get file history and add it to the model
         model.addAttribute("docserviceApiUrl",docserviceSite + docserviceApiUrl);  // create the document service api URL and add it to the model
-        model.addAttribute("dataInsertImage",  getInsertImage());  // get an image and add it to the model
-        model.addAttribute("dataCompareFile",  getCompareFile());  // get a document for comparison and add it to the model
-        model.addAttribute("dataMailMergeRecipients", getMailMerge());  // get recipients data for mail merging and add it to the model
+        model.addAttribute("dataInsertImage",  getInsertImage(directUrl));  // get an image and add it to the model
+        model.addAttribute("dataCompareFile",  getCompareFile(directUrl));  // get a document for comparison and add it to the model
+        model.addAttribute("dataMailMergeRecipients", getMailMerge(directUrl));  // get recipients data for mail merging and add it to the model
         model.addAttribute("usersForMentions", getUserMentions(uid));  // get user data for mentions and add it to the model
         return "editor.html";
     }
@@ -134,10 +146,13 @@ public class EditorController {
     }
 
     @SneakyThrows
-    private String getInsertImage() {  // get an image that will be inserted into the document
+    private String getInsertImage(Boolean directUrl) {  // get an image that will be inserted into the document
         Map<String, Object> dataInsertImage = new HashMap<>();
         dataInsertImage.put("fileType", "png");
         dataInsertImage.put("url", storagePathBuilder.getServerUrl(true) + "/css/img/logo.png");
+        if (directUrl) {
+            dataInsertImage.put("directUrl", storagePathBuilder.getServerUrl(false) + "/css/img/logo.png");
+        }
 
         // check if the document token is enabled
         if(jwtManager.tokenEnabled()){
@@ -148,10 +163,13 @@ public class EditorController {
     }
 
     @SneakyThrows
-    private String getCompareFile(){  // get a document that will be compared with the current document
+    private String getCompareFile(Boolean directUrl) {  // get a document that will be compared with the current document
         Map<String, Object> dataCompareFile = new HashMap<>();
         dataCompareFile.put("fileType", "docx");
         dataCompareFile.put("url", storagePathBuilder.getServerUrl(true) + "/assets?name=sample.docx");
+        if (directUrl) {
+            dataCompareFile.put("directUrl", storagePathBuilder.getServerUrl(false) + "/assets?name=sample.docx");
+        }
 
         // check if the document token is enabled
         if(jwtManager.tokenEnabled()){
@@ -162,10 +180,13 @@ public class EditorController {
     }
 
     @SneakyThrows
-    private String getMailMerge(){
+    private String getMailMerge(Boolean directUrl) {
         Map<String, Object> dataMailMergeRecipients = new HashMap<>();  // get recipients data for mail merging
         dataMailMergeRecipients.put("fileType", "csv");
         dataMailMergeRecipients.put("url", storagePathBuilder.getServerUrl(true) + "/csv");
+        if (directUrl) {
+            dataMailMergeRecipients.put("directUrl", storagePathBuilder.getServerUrl(false) + "/csv");
+        }
 
         // check if the document token is enabled
         if(jwtManager.tokenEnabled()){

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

@@ -164,7 +164,7 @@ public class FileController {
     public String convert(@RequestBody Converter body,  // convert a file
                           @CookieValue("uid") String uid, @CookieValue("ulang") String lang){
         String fileName = body.getFileName();  // get file name
-        String fileUri = documentManager.getDownloadUrl(fileName);  // get URL for downloading a file with the specified name
+        String fileUri = documentManager.getDownloadUrl(fileName, true);  // get URL for downloading a file with the specified name
         String filePass = body.getFilePass() != null ? body.getFilePass() : null;  // get file password if it exists
         String fileExt = fileUtility.getFileExtension(fileName);  // get file extension
         DocumentType type = fileUtility.getDocumentType(fileName);  // get document type (word, cell or slide)

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

@@ -68,7 +68,8 @@ public class IndexController {
     private String langs;
 
     @GetMapping("${url.index}")
-    public String index(Model model){
+    public String index(@RequestParam(value = "directUrl", required = false) Boolean directUrl,
+                        Model model){
         java.io.File[] files = storageMutator.getStoredFiles();  // get all the stored files from the storage
         List<String> docTypes = new ArrayList<>();
         List<Boolean> filesEditable = new ArrayList<>();
@@ -76,7 +77,7 @@ public class IndexController {
         List<Boolean> isFillFormDoc = new ArrayList<>();
         List<String> langsAndKeys = Arrays.asList(langs.split("\\|"));
 
-        Map<String, String> languages = new HashMap<>();
+        Map<String, String> languages = new LinkedHashMap<>();
 
         langsAndKeys.forEach((str) -> {
             String[] couple = str.split(":");
@@ -107,6 +108,7 @@ public class IndexController {
         model.addAttribute("tooltip", tooltip);
         model.addAttribute("users", users);
         model.addAttribute("languages", languages);
+        model.addAttribute("directUrl", directUrl);
 
         return "index.html";
     }

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

@@ -76,8 +76,15 @@ public class DefaultCallbackManager implements CallbackManager {
 
         URL uri = new URL(url);
         java.net.HttpURLConnection connection = (java.net.HttpURLConnection) uri.openConnection();
+        connection.setConnectTimeout(5000);
         InputStream stream = connection.getInputStream();  // get input stream of the file information from the URL
 
+        int statusCode = connection.getResponseCode();
+        if (statusCode != 200) {  // checking status code
+            connection.disconnect();
+            throw new RuntimeException("Document editing service returned status: " + statusCode);
+        }
+
         if (stream == null) {
             connection.disconnect();
             throw new RuntimeException("Input stream is null");

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

@@ -118,10 +118,10 @@ public class DefaultDocumentManager implements DocumentManager {
             String hostAddress = storagePathBuilder.getStorageLocation();  // get the storage directory
             String filePathDownload = !fileName.contains(InetAddress.getLocalHost().getHostAddress()) ? fileName
                     : fileName.substring(fileName.indexOf(InetAddress.getLocalHost().getHostAddress()) + InetAddress.getLocalHost().getHostAddress().length() + 1);
-
+            String userAddress = forDocumentServer ? "&userAddress" + URLEncoder.encode(hostAddress, java.nio.charset.StandardCharsets.UTF_8.toString()) : "";
             String filePath = serverPath + "/downloadhistory?fileName=" + URLEncoder.encode(filePathDownload, java.nio.charset.StandardCharsets.UTF_8.toString())
                 + "&ver=" + version + "&file="+file
-                + "&userAddress" + URLEncoder.encode(hostAddress, java.nio.charset.StandardCharsets.UTF_8.toString());
+                + userAddress;
             return filePath;
         }
         catch (UnsupportedEncodingException | UnknownHostException e)
@@ -149,15 +149,15 @@ public class DefaultDocumentManager implements DocumentManager {
     }
 
     // get URL to download a file
-    public String getDownloadUrl(String fileName) {
-        String serverPath = storagePathBuilder.getServerUrl(true);
+    public String getDownloadUrl(String fileName, Boolean isServer) {
+        String serverPath = storagePathBuilder.getServerUrl(isServer);
         String storageAddress = storagePathBuilder.getStorageLocation();
         try
         {
+            String userAddress = isServer ? "&userAddress=" + URLEncoder.encode(storageAddress, java.nio.charset.StandardCharsets.UTF_8.toString()) : "";
             String query = downloadUrl+"?fileName="
                     + URLEncoder.encode(fileName, java.nio.charset.StandardCharsets.UTF_8.toString())
-                    + "&userAddress="
-                    + URLEncoder.encode(storageAddress, java.nio.charset.StandardCharsets.UTF_8.toString());
+                    + userAddress;
 
             return serverPath + query;
         }

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

@@ -27,7 +27,7 @@ public interface DocumentManager {
     String getFileUri(String fileName, Boolean forDocumentServer);  // get file URL
     String getHistoryFileUrl(String fileName, Integer version, String file, Boolean forDocumentServer);  // get file URL
     String getCallback(String fileName);  // get the callback URL
-    String getDownloadUrl(String fileName);  // get URL to download a file
+    String getDownloadUrl(String fileName, Boolean forDocumentServer);  // get URL to download a file
     ArrayList<Map<String, Object>> getFilesInfo();  // get file information
     ArrayList<Map<String, Object>> getFilesInfo(String fileId);  // get file information by its ID
     String versionDir(String path, Integer version, boolean historyPath);  // get the path to the file version by the history path and file version

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

@@ -91,6 +91,10 @@ public class DefaultHistoryManager implements HistoryManager {
                 dataObj.put("key", key);
                 dataObj.put("url", i == curVer ? document.getUrl() :
                         documentManager.getHistoryFileUrl(document.getTitle(), i, "prev" + fileUtility.getFileExtension(document.getTitle()), true));
+                if (!document.getDirectUrl().equals("")) {
+                    dataObj.put("directUrl", i == curVer ? document.getDirectUrl() :
+                            documentManager.getHistoryFileUrl(document.getTitle(), i, "prev" + fileUtility.getFileExtension(document.getTitle()), false));
+                }
                 dataObj.put("version", i);
 
                 if (i > 1) {  //check if the version number is greater than 1
@@ -109,6 +113,9 @@ public class DefaultHistoryManager implements HistoryManager {
                     prevInfo.put("fileType", prev.get("fileType"));
                     prevInfo.put("key", prev.get("key"));  // write key and URL information about previous file version
                     prevInfo.put("url", prev.get("url"));
+                    if (!document.getDirectUrl().equals("")) {
+                        prevInfo.put("directUrl", prev.get("directUrl"));
+                    }
                     dataObj.put("previous", prevInfo);  // write information about previous file version to the data object
                     // write the path to the diff.zip archive with differences in this file version
                     Integer verdiff = i - 1;

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/enums/Language.java

@@ -1,55 +0,0 @@
-/**
- *
- * (c) Copyright Ascensio System SIA 2021
- *
- * 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.enums;
-
-public enum Language {
-    en,
-    de,
-    ru,
-    pl,
-    be,
-    bg,
-    ca,
-    zh,
-    cs,
-    da,
-    nl,
-    fi,
-    fr,
-    el,
-    hu,
-    id,
-    it,
-    ja,
-    ko,
-    lv,
-    lo,
-    nb,
-    pt,
-    ro,
-    sk,
-    sl,
-    sv,
-    es,
-    tr,
-    uk,
-    vi,
-    gl,
-    az
-}

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

@@ -39,4 +39,5 @@ public class Document {  // the parameters pertaining to the document (title, ur
     private String urlUser;  // the absolute URL that will allow the document to be saved onto the user personal computer
     private String title;  // the desired file name for the viewed or edited document which will also be used as file name when the document is downloaded
     private String url;  // the absolute URL where the source viewed or edited document is stored
+    private String directUrl;
 }

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

@@ -20,7 +20,6 @@ package com.onlyoffice.integration.documentserver.models.filemodel;
 
 import com.onlyoffice.integration.documentserver.models.configurations.Customization;
 import com.onlyoffice.integration.documentserver.models.configurations.Embedded;
-import com.onlyoffice.integration.documentserver.models.enums.Language;
 import com.onlyoffice.integration.documentserver.models.enums.Mode;
 import lombok.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,12 +37,13 @@ import java.util.List;
 public class EditorConfig {  // the parameters pertaining to the editor interface: opening mode (viewer or editor), interface language, additional buttons, etc.
     private HashMap<String, Object> actionLink = null;  // the data which contains the information about the action in the document that will be scrolled to
     private String callbackUrl;  // the absolute URL to the document storage service
+    private HashMap<String, Object> coEditing = null;
     private String createUrl;  // the absolute URL of the document where it will be created and available after creation
     @Autowired
     private Customization customization;  // the parameters which allow to customize the editor interface so that it looked like your other products (if there are any) and change the presence or absence of the additional buttons, links, change logos and editor owner details
     @Autowired
     private Embedded embedded;  // the parameters which allow to change the settings which define the behavior of the buttons in the embedded mode
-    private Language lang;  // the editor interface language
+    private String lang;  // the editor interface language
     private Mode mode;  // the editor opening mode
     @Autowired
     private User user;  // the user currently viewing or editing the document

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

@@ -95,6 +95,13 @@ public class DefaultServiceConverter implements ServiceConverter
             }
 
             connection.connect();
+
+            int statusCode = connection.getResponseCode();
+            if (statusCode != 200) {  // checking status code
+                connection.disconnect();
+                throw new RuntimeException("Convertation service returned status: " + statusCode);
+            }
+
             try (OutputStream os = connection.getOutputStream()) {
                 os.write(bodyByte);  // write bytes to the output stream
                 os.flush();  // force write data to the output stream that can be cached in the current thread

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

@@ -53,8 +53,9 @@ public class DefaultDocumentConfigurer implements DocumentConfigurer<DefaultDocu
         Permission permission = wrapper.getPermission();  // get the permission parameter from the document wrapper
 
         document.setTitle(fileName);  // set the title to the document config
-        document.setUrl(documentManager.getDownloadUrl(fileName));  // set the URL to download a file to the document config
+        document.setUrl(documentManager.getDownloadUrl(fileName, true));  // set the URL to download a file to the document config
         document.setUrlUser(documentManager.getFileUri(fileName, false));  // set the file URL to the document config
+        document.setDirectUrl(wrapper.getIsEnableDirectUrl() ? documentManager.getDownloadUrl(fileName, false) : "");
         document.setFileType(fileUtility.getFileExtension(fileName).replace(".",""));  // set the file type to the document config
         document.getInfo().setFavorite(wrapper.getFavorite());  // set the favorite parameter to the document config
 

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

@@ -82,6 +82,10 @@ public class DefaultEditorConfigConfigurer implements EditorConfigConfigurer<Def
         config.setLang(wrapper.getLang());  // set the language to the editorConfig
         Boolean canEdit = wrapper.getCanEdit();  // check if the file of the specified type can be edited or not
         Action action = wrapper.getAction();  // get the action parameter from the editorConfig wrapper
+        config.setCoEditing(action.equals(Action.view) && userIsAnon ? new HashMap<String, Object>()  {{ 
+            put("mode", "strict");
+            put("change", false);
+        }} : null);
 
         defaultCustomizationConfigurer.configure(config.getCustomization(), DefaultCustomizationWrapper.builder()  // define the customization configurer
                 .action(action)

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

@@ -37,7 +37,7 @@ public class DefaultEmbeddedConfigurer implements EmbeddedConfigurer<DefaultEmbe
 
     public void configure(Embedded embedded, DefaultEmbeddedWrapper wrapper){  // define the embedded configurer
         if(wrapper.getType().equals(Type.embedded)) {  // check if the type from the embedded wrapper is embedded
-            String url = documentManager.getFileUri(wrapper.getFileName(), false);  // get file URL of the specified file
+            String url = documentManager.getDownloadUrl(wrapper.getFileName(), false);  // get file URL of the specified file
             embedded.setEmbedUrl(url);  // set the embedURL parameter to the embedded config (the absolute URL to the document serving as a source file for the document embedded into the web page)
             embedded.setSaveUrl(url);  // set the saveURL parameter to the embedded config (the absolute URL that will allow the document to be saved onto the user personal computer)
             embedded.setShareUrl(url);  // set the shareURL parameter to the embedded config (the absolute URL that will allow other users to share this document)

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

@@ -80,6 +80,7 @@ public class DefaultFileConfigurer implements FileConfigurer<DefaultFileWrapper>
                     .fileName(fileName)
                     .permission(updatePermissions(userPermissions, action, canEdit))
                     .favorite(wrapper.getUser().getFavorite())
+                    .isEnableDirectUrl(wrapper.getIsEnableDirectUrl())
                     .build();
 
             defaultDocumentConfigurer.configure(fileModel.getDocument(), documentWrapper);  // define the document configurer

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/wrappers/DefaultDocumentWrapper.java

@@ -28,4 +28,5 @@ public class DefaultDocumentWrapper {
     private Permission permission;
     private String fileName;
     private Boolean favorite;
+    private Boolean isEnableDirectUrl;
 }

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/wrappers/DefaultFileWrapper.java

@@ -20,7 +20,6 @@ package com.onlyoffice.integration.services.configurers.wrappers;
 
 import com.onlyoffice.integration.documentserver.models.enums.Action;
 import com.onlyoffice.integration.entities.User;
-import com.onlyoffice.integration.documentserver.models.enums.Language;
 import com.onlyoffice.integration.documentserver.models.enums.Type;
 import lombok.Builder;
 import lombok.Getter;
@@ -33,8 +32,9 @@ public class DefaultFileWrapper {
     private String fileName;
     private Type type;
     private User user;
-    private Language lang;
+    private String lang;
     private Action action;
     private String actionData;
     private Boolean canEdit;
+    private Boolean isEnableDirectUrl;
 }

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

@@ -1,4 +1,4 @@
-server.version=1.3.0
+server.version=1.4.0
 
 server.address=
 server.port=4000
@@ -27,7 +27,7 @@ files.docservice.header=Authorization
 
 files.docservice.verify-peer-off=true
 
-files.docservice.languages=en:English|az:Azerbaijani|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese|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|lv:Latvian|lo:Lao|nb:Norwegian|pl:Polish|pt:Portuguese|ro:Romanian|ru:Russian|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese
+files.docservice.languages=en:English|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (People's Republic of China)|zh-TW:Chinese (Traditional, Taiwan)|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|lv:Latvian|lo:Lao|ms:Malay (Malaysia)|nb:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|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

web/documentserver-example/java-spring/src/main/resources/static/css/stylesheet.css

@@ -72,6 +72,7 @@ header img {
 }
 
 .main{
+    display: table;
     height: calc(100% - 112px);
     min-height: 536px;
 }
@@ -166,7 +167,7 @@ label .checkbox {
     background-image: url("img/file_docxf.svg");
 }
 
-.create-sample {
+.side-option {
     color: #666666;
     line-height: 24px;
 }
@@ -750,3 +751,28 @@ html {
 .user-descr > b {
     margin-left: 25px;
 }
+
+.tooltip {
+    background: #FFFFFF;
+    border-radius: 5px;
+    box-shadow: 0px 7px 25px rgba(85, 85, 85, 0.15);
+    color: #666666;
+    line-height: 160%;
+    max-width: 455px;
+    padding: 14px;
+    position: absolute;
+}
+
+.tooltip ul {
+    margin: 0;
+}
+
+.arrow {
+    border-top: 8px solid transparent;
+    border-bottom: 8px solid transparent;
+    border-right: 8px solid #FFFFFF;
+    left: -4px;
+    position: absolute;
+    top: 50%;
+    transform: translate(-50%, -50%);
+}

web/documentserver-example/java-spring/src/main/resources/static/scripts/jscript.js

@@ -16,11 +16,24 @@
  *
  */
 
+var directUrl;
+
 if (typeof jQuery !== "undefined") {
     jq = jQuery.noConflict();
 
+    directUrl = getUrlVars()["directUrl"] == "true";
+
     mustReload = false;
 
+    if (directUrl)
+        jq("#directUrl").prop("checked", directUrl);
+    else
+        directUrl = jq("#directUrl").prop("checked");
+
+    jq("#directUrl").change(function() {
+        window.location = "?directUrl=" + jq(this).prop("checked");
+    });
+
     jq(function () {
         jq("#fileupload").fileupload({
             dataType: "json",
@@ -228,7 +241,7 @@ if (typeof jQuery !== "undefined") {
 
     jq(document).on("click", "#beginEdit:not(.disable)", function () {
         var fileId = encodeURIComponent(jq("#hiddenFileName").val());
-        var url = UrlEditor + "?action=edit&fileName=" + fileId;
+        var url = UrlEditor + "?action=edit&fileName=" + fileId + "&directUrl=" + directUrl;
         window.open(url, "_blank");
         jq("#hiddenFileName").val("");
         jq.unblockUI();
@@ -236,7 +249,7 @@ if (typeof jQuery !== "undefined") {
 
     jq(document).on("click", "#beginView:not(.disable)", function () {
         var fileId = encodeURIComponent(jq("#hiddenFileName").val());
-        var url = UrlEditor + "?action=view&fileName=" + fileId;
+        var url = UrlEditor + "?action=view&fileName=" + fileId + "&directUrl=" + directUrl;
         window.open(url, "_blank");
         jq("#hiddenFileName").val("");
         jq.unblockUI();
@@ -244,7 +257,7 @@ if (typeof jQuery !== "undefined") {
 
     jq(document).on("click", "#beginEmbedded:not(.disable)", function () {
         var fileId = encodeURIComponent(jq("#hiddenFileName").val());
-        var url = UrlEditor + "?type=embedded&action=embedded&fileName=" + fileId;
+        var url = UrlEditor + "?type=embedded&action=embedded&fileName=" + fileId + "&directUrl=" + directUrl;
 
         jq("#mainProgress").addClass("embedded");
         jq("#beginEmbedded").addClass("disable");
@@ -300,6 +313,17 @@ if (typeof jQuery !== "undefined") {
         }
     };
 
+    function getUrlVars() {
+        var vars = [], hash;
+        var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+        for (var i = 0; i < hashes.length; i++) {
+            hash = hashes[i].split('=');
+            vars.push(hash[0]);
+            vars[hash[0]] = hash[1];
+        }
+        return vars;
+    };
+
     jq("#portal-info")[0].innerHTML += jq("#portal-info")[0].attributes.tooltip.value;
 
     var fileList = jq("tr.tableRow");
@@ -312,12 +336,12 @@ if (typeof jQuery !== "undefined") {
             if (hideTooltipTimeout != null) {
                 clearTimeout(hideTooltipTimeout);
             }
-            jq(".info").on("touchend", function () {
+            jq("#info").on("touchend", function () {
                 showUserTooltip(true);
             });
         }
     } else {
-        jq(".info").mouseover(function (event) {
+        jq("#info").mouseover(function (event) {
             if (fileList.length > 0) {
                 if (hideTooltipTimeout != null) {
                     clearTimeout(hideTooltipTimeout);
@@ -342,4 +366,18 @@ if (typeof jQuery !== "undefined") {
         });
     }
 
+    jq(".info-tooltip").mouseover(function (event) {
+        var target = event.target;
+        var id = target.dataset.id ? target.dataset.id : target.id;
+        var tooltip = target.dataset.tooltip;
+
+        jq("<div class='tooltip'>" + tooltip + "<div class='arrow'></div></div>").appendTo("body");
+
+        var top = jq("#" + id).offset().top + jq("#" + id).outerHeight() / 2 - jq("div.tooltip").outerHeight() / 2;
+        var left = jq("#" + id).offset().left + jq("#" + id).outerWidth() + 20;
+        jq("div.tooltip").css({"top": top, "left": left});
+    }).mouseout(function () {
+        jq("div.tooltip").remove();
+    });
+
 }

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

@@ -59,7 +59,7 @@
                                         <a class="try-editor form" data-type="docxf">Form template</a>
                                     </li>
                                 </ul>
-                                <label class="create-sample">
+                                <label class="side-option">
                                     <input id="createSample" class="checkbox" type="checkbox" />With sample content
                                 </label>
                             </div>
@@ -75,7 +75,7 @@
                                     <tr>
                                         <td valign="middle">
                                             <span class="select-user">Username</span>
-                                            <img class="info" src="css/img/info.svg"/>
+                                            <img id="info" class="info" src="css/img/info.svg"/>
                                             <select class="select-user" id="user">
                                                 <option th:each="user : ${users}"
                                                         th:value="${user.id}"
@@ -85,7 +85,10 @@
                                     </tr>
                                     <tr>
                                         <td valign="middle">
-                                            <span class="select-user">Language editors interface</span>
+                                            <span class="select-user">Language</span>
+                                            <img class="info info-tooltip" data-id="language"
+                                                 data-tooltip="Choose the language for ONLYOFFICE editors interface"
+                                                 src="css/img/info.svg" />
                                             <select class="select-user" id="language">
                                                 <option th:each="language: ${languages}"
                                                         th:value="${language.key}"
@@ -93,6 +96,14 @@
                                             </select>
                                         </td>
                                     </tr>
+                                    <tr>
+                                        <td valign="middle">
+                                            <label class="side-option">
+                                                <input id="directUrl" type="checkbox" class="checkbox" />Try opening on client
+                                                <img id="directUrlInfo" class="info info-tooltip" data-id="directUrlInfo" data-tooltip="Some files can be opened in the user's browser without connecting to the document server." src="css/img/info.svg" />
+                                            </label>
+                                        </td>
+                                    </tr>
                                 </tbody>
                             </table>
                         </div>
@@ -129,43 +140,50 @@
                                         <tr th:each="file,iState : ${files}" class="tableRow" th:title="${files[iState.index].getName() + versions[iState.index]}">
                                             <td class="contentCells">
                                                 <a class="stored-edit" th:classappend="${docTypes[iState.index]}"
-                                                   th:href="@{/editor(fileName=${files[iState.index].getName()})}" target="_blank">
+                                                   th:with="directUrl=${directUrl}"
+                                                   th:href="@{/editor(fileName=${files[iState.index].getName()}, __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
                                                 <span th:text="${files[iState.index].getName()}"></span>
                                                 </a>
                                             </td>
                                             <th:block th:if="${filesEditable[iState.index]}">
                                                 <td class="contentCells contentCells-icon">
-                                                    <a th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='edit')}" target="_blank">
+                                                    <a th:with="directUrl=${directUrl}"
+                                                       th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='edit', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
                                                     <img src="css/img/desktop.svg" alt="Open in editor for full size screens" title="Open in editor for full size screens"/>
                                                     </a>
                                                 </td>
                                                 <td class="contentCells contentCells-icon">
-                                                    <a th:href="@{/editor(fileName=${files[iState.index].getName()},type='mobile',action='edit')}" target="_blank">
+                                                    <a th:with="directUrl=${directUrl}"
+                                                       th:href="@{/editor(fileName=${files[iState.index].getName()},type='mobile',action='edit', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
                                                     <img src="css/img/mobile.svg" alt="Open in editor for mobile devices" title="Open in editor for mobile devices"/>
                                                     </a>
                                                 </td>
                                                 <td class="contentCells contentCells-icon">
-                                                    <a th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='comment')}" target="_blank">
+                                                    <a th:with="directUrl=${directUrl}"
+                                                       th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='comment', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
                                                         <img src="css/img/comment.svg" alt="Open in editor for comment" title="Open in editor for comment"/>
                                                     </a>
                                                 </td>
                                                     <div th:if="${docTypes[iState.index]} eq 'word'">
                                                         <td class="contentCells contentCells-icon">
-                                                            <a th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='review')}" target="_blank">
+                                                            <a th:with="directUrl=${directUrl}"
+                                                               th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='review', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
                                                             <img src="css/img/review.svg" alt="Open in editor for review" title="Open in editor for review"/>
                                                             </a>
                                                         </td>
                                                     </div>
                                                     <div th:if="${docTypes[iState.index]} eq 'cell'">
                                                         <td class="contentCells contentCells-icon">
-                                                            <a th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='filter')}" target="_blank">
+                                                            <a th:with="directUrl=${directUrl}"
+                                                               th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='filter', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
                                                             <img src="css/img/filter.svg" alt="Open in editor without access to change the filter" title="Open in editor without access to change the filter" />
                                                             </a>
                                                         </td>
                                                     </div>
                                                     <div th:if="${docTypes[iState.index]} eq 'word'">
                                                         <td class="contentCells contentCells-icon">
-                                                            <a th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='blockcontent')}" target="_blank">
+                                                            <a th:with="directUrl=${directUrl}"
+                                                               th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='blockcontent', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
                                                             <img src="css/img/block-content.svg" alt="Open in editor without content control modification" title="Open in editor without content control modification"/>
                                                             </a>
                                                         </td>
@@ -178,7 +196,8 @@
                                                     </div>
                                                     <div th:if="${isFillFormDoc[iState.index]}">
                                                         <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
-                                                            <a th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='fillForms')}" target="_blank">
+                                                            <a th:with="directUrl=${directUrl}"
+                                                               th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='fillForms', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
                                                                 <img src="css/img/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
                                                             </a>
                                                         </td>
@@ -190,7 +209,8 @@
                                             <th:block th:if="${isFillFormDoc[iState.index] and not filesEditable[iState.index]}">
                                                 <td class="contentCells contentCells-icon "></td>
                                                 <td class="contentCells contentCells-icon">
-                                                    <a th:href="@{/editor(fileName=${files[iState.index].getName()},type='mobile',action='fillForms')}" target="_blank">
+                                                    <a th:with="directUrl=${directUrl}"
+                                                       th:href="@{/editor(fileName=${files[iState.index].getName()},type='mobile',action='fillForms', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
                                                         <img src="css/img/mobile-fill-forms.svg" alt="Open in editor for filling in forms for mobile devices" title="Open in editor for filling in forms for mobile devices" />
                                                     </a>
                                                 </td>
@@ -198,7 +218,8 @@
                                                 <td class="contentCells contentCells-icon "></td>
                                                 <td class="contentCells contentCells-icon "></td>
                                                 <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
-                                                    <a th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='fillForms')}" target="_blank">
+                                                    <a th:with="directUrl=${directUrl}"
+                                                       th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='fillForms', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
                                                         <img src="css/img/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
                                                     </a>
                                                 </td>
@@ -207,17 +228,20 @@
                                                 <td class="contentCells contentCells-shift contentCells-icon contentCellsEmpty" colspan="6"></td>
                                             </th:block>
                                             <td class="contentCells contentCells-icon firstContentCellViewers">
-                                                <a th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='view')}" target="_blank">
+                                                <a th:with="directUrl=${directUrl}"
+                                                   th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='view', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
                                                 <img src="css/img/desktop.svg" alt="Open in viewer for full size screens" title="Open in viewer for full size screens"/>
                                                 </a>
                                             </td>
                                             <td class="contentCells contentCells-icon">
-                                                <a th:href="@{/editor(fileName=${files[iState.index].getName()},type='mobile',action='view')}" target="_blank">
+                                                <a th:with="directUrl=${directUrl}"
+                                                   th:href="@{/editor(fileName=${files[iState.index].getName()},type='mobile',action='view', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
                                                 <img src="css/img/mobile.svg" alt="Open in viewer for mobile devices" title="Open in viewer for mobile devices"/>
                                                 </a>
                                             </td>
                                             <td class="contentCells contentCells-icon contentCells-shift">
-                                                <a th:href="@{/editor(fileName=${files[iState.index].getName()},type='embedded',action='embedded')}" target="_blank">
+                                                <a th:with="directUrl=${directUrl}"
+                                                   th:href="@{/editor(fileName=${files[iState.index].getName()},type='embedded',action='embedded', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
                                                 <img src="css/img/embeded.svg" alt="Open in embedded mode" title="Open in embedded mode"/>
                                                 </a>
                                             </td>
@@ -318,8 +342,19 @@
     <script type="text/javascript" src="scripts/jscript.js"></script>
     <script type="text/javascript" src="scripts/converter.js"></script>
     <script type="text/javascript">
-        document.addEventListener('DOMContentLoaded', function(){
-	        document.getElementById("language").value="en";
+        document.addEventListener('DOMContentLoaded', function() {
+            var lang = document.cookie
+                    .split('; ')
+                    .find((row) => row.startsWith('ulang='))
+                    ?.split('=')[1];
+
+            var languages = Array.from(document.getElementById("language").options).map(e => e.value)
+
+            if (!languages.includes(lang)) {
+                lang = "en";
+            }
+
+            document.getElementById("language").value=lang;
         });
     </script>
 </body>

web/documentserver-example/java/pom.xml

@@ -85,6 +85,31 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<version>2.17</version>
+				<executions>
+					<execution>
+						<id>validate</id>
+						<phase>validate</phase>
+						<configuration>
+							<configLocation>google_checks.xml</configLocation>
+							<encoding>UTF-8</encoding>
+							<failsOnError>true</failsOnError>
+							<failOnViolation>true</failOnViolation>
+							<logViolationsToConsole>true</logViolationsToConsole>
+							<violationSeverity>warning</violationSeverity>
+							<consoleOutput>true</consoleOutput>
+							<includeTestSourceDirectory>true
+							</includeTestSourceDirectory>
+						</configuration>
+						<goals>
+							<goal>check</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
         </plugins>
     </build>
 

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

@@ -47,6 +47,7 @@ public class EditorServlet extends HttpServlet
         String fileName = FileUtility.GetFileName(request.getParameter("fileName"));
         String fileExt = request.getParameter("fileExt");
         String sample = request.getParameter("sample");
+        Boolean isEnableDirectUrl = Boolean.valueOf(request.getParameter("directUrl"));
 
         // check if there is sample data in the request
         Boolean sampleData = (sample == null || sample.isEmpty()) ? false : sample.toLowerCase().equals("true");
@@ -70,7 +71,7 @@ public class EditorServlet extends HttpServlet
         }
 
         // create file model (get all the necessary parameters from cookies)
-        FileModel file = new FileModel(fileName, cm.getCookie("ulang"), request.getParameter("actionLink"), user);
+        FileModel file = new FileModel(fileName, cm.getCookie("ulang"), request.getParameter("actionLink"), user, isEnableDirectUrl);
         // change type parameter if needed
         file.changeType(request.getParameter("mode"), request.getParameter("type"), user, fileName);
 
@@ -78,16 +79,25 @@ public class EditorServlet extends HttpServlet
         Map<String, Object> dataInsertImage = new HashMap<>();
         dataInsertImage.put("fileType", "png");
         dataInsertImage.put("url", DocumentManager.GetServerUrl(true) + "/css/img/logo.png");
+        if (isEnableDirectUrl) {
+            dataInsertImage.put("directUrl", DocumentManager.GetServerUrl(false) + "/css/img/logo.png");
+        }
 
         // 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&name=sample.docx");
+        if (isEnableDirectUrl) {
+            dataCompareFile.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?type=csv");
+        if (isEnableDirectUrl) {
+            dataMailMergeRecipients.put("directUrl", DocumentManager.GetServerUrl(false) + "/IndexServlet?type=csv");
+        }
 
         // users data for mentions
         List<Map<String, Object>> usersForMentions = Users.getUsersForMentions(user.id);

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

@@ -234,7 +234,7 @@ public class IndexServlet extends HttpServlet
             String fileName = FileUtility.GetFileName((String) body.get("filename"));
             String lang = cm.getCookie("ulang");
             String filePass = body.get("filePass") != null ? (String) body.get("filePass") : null;
-            String fileUri = DocumentManager.GetDownloadUrl(fileName);
+            String fileUri = DocumentManager.GetDownloadUrl(fileName, true);
             String fileExt = FileUtility.GetFileExtension(fileName);
             FileType fileType = FileUtility.GetFileType(fileName);
             String internalFileExt = DocumentManager.GetInternalExtension(fileType);

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

@@ -40,7 +40,7 @@ public class FileModel
     public String token;
 
     // create file model
-    public FileModel(String fileName, String lang, String actionData, User user)
+    public FileModel(String fileName, String lang, String actionData, User user, Boolean isEnableDirectUrl)
     {
         if (fileName == null) fileName = "";
         fileName = fileName.trim();  // remove extra spaces in the file name
@@ -51,7 +51,8 @@ public class FileModel
         // set the document parameters
         document = new Document();
         document.title = fileName;
-        document.url = DocumentManager.GetDownloadUrl(fileName);  // get file url
+        document.url = DocumentManager.GetDownloadUrl(fileName, true);  // get file url
+        document.directUrl = isEnableDirectUrl ? DocumentManager.GetDownloadUrl(fileName, false) : "";  // get direct url
         document.fileType = FileUtility.GetFileExtension(fileName).replace(".", "");  // get file extension from the file name
         // generate document key
         document.key = ServiceConverter.GenerateRevisionId(DocumentManager.CurUserHostAddress(null) + "/" + fileName + "/" + Long.toString(new File(DocumentManager.StoragePath(fileName, null)).lastModified()));
@@ -77,6 +78,12 @@ public class FileModel
         // set the editor config parameters
         editorConfig = new EditorConfig(actionData);
         editorConfig.callbackUrl = DocumentManager.GetCallback(fileName);  // get callback url
+
+        editorConfig.coEditing = mode.equals("view") && user.id.equals("uid-0") ? 
+        new HashMap<String, Object>()  {{ 
+            put("mode", "strict");
+            put("change", false);
+        }} : null;
         
         if (lang != null) editorConfig.lang = lang;  // write language parameter to the config
 
@@ -121,7 +128,7 @@ public class FileModel
 
     public void InitDesktop(String fileName)
     {
-        editorConfig.InitDesktop(DocumentManager.GetDownloadUrl(fileName) + "&dmode=emb");
+        editorConfig.InitDesktop(DocumentManager.GetDownloadUrl(fileName, false) + "&dmode=emb");
     }
 
     // generate document token
@@ -177,7 +184,10 @@ public class FileModel
 
                     dataObj.put("fileType", FileUtility.GetFileExtension(document.title).substring(1));
                     dataObj.put("key", key);
-                    dataObj.put("url", i == curVer ? document.url : DocumentManager.GetDownloadHistoryUrl(document.title, i, "prev" + FileUtility.GetFileExtension(document.title)));
+                    dataObj.put("url", i == curVer ? document.url : DocumentManager.GetDownloadHistoryUrl(document.title, i, "prev" + FileUtility.GetFileExtension(document.title), true));
+                    if (!document.directUrl.equals("")) {
+                        dataObj.put("directUrl", i == curVer ? document.url : DocumentManager.GetDownloadHistoryUrl(document.title, i, "prev" + FileUtility.GetFileExtension(document.title), false));
+                    }
                     dataObj.put("version", i);
 
                     if (i > 1) {  //check if the version number is greater than 1
@@ -199,7 +209,7 @@ public class FileModel
                         dataObj.put("previous", prevInfo);  // write information about previous file version to the data object
                         // write the path to the diff.zip archive with differences in this file version
                         Integer verdiff = i - 1;
-                        String changesUrl = DocumentManager.GetDownloadHistoryUrl(document.title, verdiff, "diff.zip");
+                        String changesUrl = DocumentManager.GetDownloadHistoryUrl(document.title, verdiff, "diff.zip", true);
                         dataObj.put("changesUrl", changesUrl);
                     }
 
@@ -247,6 +257,7 @@ public class FileModel
     {
         public String title;
         public String url;
+        public String directUrl;
         public String fileType;
         public String key;
         public Info info;
@@ -269,6 +280,7 @@ public class FileModel
         public List<String> reviewGroups;
         public CommentGroups commentGroups;
         public List<String> userInfoGroups;
+        //public Gson gson = new Gson();
 
         // defines what can be done with a document
         public Permissions(String mode, String type, Boolean canEdit, User user)
@@ -307,6 +319,7 @@ public class FileModel
         public HashMap<String, Object> actionLink = null;
         public String mode = "edit";
         public String callbackUrl;
+        public HashMap<String, Object> coEditing = null;
         public String lang = "en";
         public String createUrl;
         public List<Map<String, String>> templates;

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

@@ -354,7 +354,7 @@ public class DocumentManager
 
             String filePath = serverPath + "/" + storagePath + "/" + hostAddress + "/" + URLEncoder.encode(fileName, java.nio.charset.StandardCharsets.UTF_8.toString()).replace("+", "%20");
             if (f.isAbsolute() && f.isFile()) {
-                filePath = GetDownloadUrl(fileName);
+                filePath = GetDownloadUrl(fileName, true);
                 if (!Files.isWritable(f.toPath())) {
                     throw new SecurityException("No write permission to path: " + f.toPath());
                 }
@@ -450,12 +450,13 @@ public class DocumentManager
     }
 
     // get url to download a file
-    public static String GetDownloadUrl(String fileName) {
-        String serverPath = GetServerUrl(true);
+    public static String GetDownloadUrl(String fileName, Boolean forDocumentServer) {
+        String serverPath = GetServerUrl(forDocumentServer);
         String hostAddress = CurUserHostAddress(null);
         try
         {
-            String query = "?type=download&fileName=" + URLEncoder.encode(fileName, java.nio.charset.StandardCharsets.UTF_8.toString()) + "&userAddress=" + URLEncoder.encode(hostAddress, java.nio.charset.StandardCharsets.UTF_8.toString());
+            String userAddress = forDocumentServer ? "&userAddress=" + URLEncoder.encode(hostAddress, java.nio.charset.StandardCharsets.UTF_8.toString()) : "";
+            String query = "?type=download&fileName=" + URLEncoder.encode(fileName, java.nio.charset.StandardCharsets.UTF_8.toString()) + userAddress;
 
             return serverPath + "/IndexServlet" + query;
         }
@@ -466,12 +467,13 @@ public class DocumentManager
     }
 
     // get url to download a file to History prev.*
-    public static String GetDownloadHistoryUrl(String fileName, Integer version, String file) {
-        String serverPath = GetServerUrl(true);
+    public static String GetDownloadHistoryUrl(String fileName, Integer version, String file, Boolean forDocumentServer) {
+        String serverPath = GetServerUrl(forDocumentServer);
         String hostAddress = CurUserHostAddress(null);
         try
         {
-            String query = "?type=downloadhistory&fileName=" + URLEncoder.encode(fileName, java.nio.charset.StandardCharsets.UTF_8.toString()) + "&userAddress=" + URLEncoder.encode(hostAddress, java.nio.charset.StandardCharsets.UTF_8.toString());
+            String userAddress = forDocumentServer ? "&userAddress=" + URLEncoder.encode(hostAddress, java.nio.charset.StandardCharsets.UTF_8.toString()) : "";
+            String query = "?type=downloadhistory&fileName=" + URLEncoder.encode(fileName, java.nio.charset.StandardCharsets.UTF_8.toString()) + userAddress;
             query = query + "&ver=" + version + "&file=" + URLEncoder.encode(file, java.nio.charset.StandardCharsets.UTF_8.toString());
 
             return serverPath + "/IndexServlet" + query;
@@ -575,7 +577,7 @@ public class DocumentManager
         String langs = ConfigManager.GetProperty("files.docservice.languages");
         List<String> langsAndKeys = Arrays.asList(langs.split("\\|"));
 
-        Map<String, String> languages = new HashMap<>();
+        Map<String, String> languages = new LinkedHashMap<>();
 
         langsAndKeys.forEach((str) -> {
             String[] couple = str.split(":");

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

@@ -143,6 +143,12 @@ public class ServiceConverter
         }
 
         connection.connect();
+
+        int statusCode = connection.getResponseCode();
+        if (statusCode != 200) {  // checking status code
+            connection.disconnect();
+            throw new Exception("Conversion service returned status: " + statusCode);
+        }
         try (OutputStream os = connection.getOutputStream()) {
             os.write(bodyByte);
         }

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

@@ -253,6 +253,14 @@ public class TrackManager {
 
         URL uri = new URL(url);
         java.net.HttpURLConnection connection = (java.net.HttpURLConnection) uri.openConnection();
+        connection.setConnectTimeout(5000);
+
+        int statusCode = connection.getResponseCode();
+        if (statusCode != 200) {  // checking status code
+            connection.disconnect();
+            throw new RuntimeException("Document editing service returned status: " + statusCode);
+        }
+
         InputStream stream = connection.getInputStream();  // get input stream of the file information from the url
 
         if (stream == null)

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

@@ -66,6 +66,7 @@ public class Users {
         add("Can’t see anyone’s information");
         add("Can't rename files from the editor");
         add("Can't view chat");
+        add("View file without collaboration");
     }};
 
     private static List<User> users = new ArrayList<User>() {{

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

@@ -1,4 +1,4 @@
-version=1.3.0
+version=1.4.0
 
 filesize-max=5242880
 storage-folder=app_data
@@ -16,7 +16,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|az:Azerbaijani|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese|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|lv:Latvian|lo:Lao|nb:Norwegian|pl:Polish|pt:Portuguese|ro:Romanian|ru:Russian|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese
+files.docservice.languages=en:English|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (People's Republic of China)|zh-TW:Chinese (Traditional, Taiwan)|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|lv:Latvian|lo:Lao|ms:Malay (Malaysia)|nb:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|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/css/stylesheet.css

@@ -167,7 +167,7 @@ label .checkbox {
     background-image: url("img/file_docxf.svg");
 }
 
-.create-sample {
+.side-option {
     color: #666666;
     line-height: 24px;
 }
@@ -747,3 +747,28 @@ html {
 .user-descr > b {
     margin-left: 25px;
 }
+
+.tooltip {
+    background: #FFFFFF;
+    border-radius: 5px;
+    box-shadow: 0px 7px 25px rgba(85, 85, 85, 0.15);
+    color: #666666;
+    line-height: 160%;
+    max-width: 455px;
+    padding: 14px;
+    position: absolute;
+}
+
+.tooltip ul {
+    margin: 0;
+}
+
+.arrow {
+    border-top: 8px solid transparent;
+    border-bottom: 8px solid transparent;
+    border-right: 8px solid #FFFFFF;
+    left: -4px;
+    position: absolute;
+    top: 50%;
+    transform: translate(-50%, -50%);
+}

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

@@ -87,7 +87,7 @@
                                             <tr>
                                                 <td valign="middle">
                                                     <span class="select-user">Username</span>
-                                                    <img class="info" src="css/img/info.svg" />
+                                                    <img id="info" class="info" src="css/img/info.svg" />
                                                     <select class="select-user" id="user">
                                                         <% for (User user : Users.getAllUsers()) { %>
                                                             <option value="<%= user.id %>"><%= user.name == null ? "Anonymous" : user.name %></option>
@@ -97,7 +97,10 @@
                                             </tr>
                                             <tr>
                                                 <td valign="middle">
-                                                    <span class="select-user">Language editors interface</span>
+                                                    <span class="select-user">Language</span>
+                                                    <img class="info info-tooltip" data-id="language"
+                                                         data-tooltip="Choose the language for ONLYOFFICE editors interface"
+                                                         src="css/img/info.svg" />
                                                     <select class="select-user" id="language">
                                                         <% Map<String, String> languages = DocumentManager.GetLanguages(); %>
                                                         <% for (Map.Entry<String, String> language : languages.entrySet()) { %>
@@ -106,6 +109,12 @@
                                                     </select>
                                                 </td>
                                             </tr>
+                                            <td valign="middle">
+                                                <label class="side-option">
+                                                    <input id="directUrl" type="checkbox" class="checkbox" />Try opening on client
+                                                    <img id="directUrlInfo" class="info info-tooltip" data-id="directUrlInfo" data-tooltip="Some files can be opened in the user's browser without connecting to the document server." src="css/img/info.svg" />
+                                                </label>
+                                            </td>
                                         </tbody>
                                     </table>
                                 </div>
@@ -159,42 +168,44 @@
                                                     %>
                                                         <tr class="tableRow" title="<%= files[i].getName() %><%= version %>">
                                                             <td class="contentCells">
-                                                                <a class="stored-edit <%= docType %>" href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8") %>" target="_blank">
+                                                                <a class="stored-edit <%= docType %>" href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8").concat(request.getParameter("directUrl") != null ? "&directUrl=".concat(request.getParameter("directUrl")) : "") %>" target="_blank">
                                                                     <span><%= files[i].getName() %></span>
                                                                 </a>
                                                             </td>
                                                             <% if (canEdit) { %>
                                                                 <td class="contentCells contentCells-icon">
-                                                                    <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8") %>&type=desktop&mode=edit" target="_blank">
+                                                                    <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8").concat(request.getParameter("directUrl") != null ? "&directUrl=".concat(request.getParameter("directUrl")) : "") %>&type=desktop&mode=edit" target="_blank">
                                                                         <img src="css/img/desktop.svg" alt="Open in editor for full size screens" title="Open in editor for full size screens"/>
                                                                     </a>
                                                                 </td>
                                                                 <td class="contentCells contentCells-icon">
-                                                                    <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8") %>&type=mobile&mode=edit" target="_blank">
+                                                                    <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8").concat(request.getParameter("directUrl") != null ? "&directUrl=".concat(request.getParameter("directUrl")) : "") %>&type=mobile&mode=edit" target="_blank">
                                                                         <img src="css/img/mobile.svg" alt="Open in editor for mobile devices" title="Open in editor for mobile devices"/>
                                                                     </a>
                                                                 </td>
                                                                 <td class="contentCells contentCells-icon">
-                                                                    <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8") %>&type=desktop&mode=comment" target="_blank">
+                                                                    <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8").concat(request.getParameter("directUrl") != null ? "&directUrl=".concat(request.getParameter("directUrl")) : "") %>&type=desktop&mode=comment" target="_blank">
                                                                         <img src="css/img/comment.svg" alt="Open in editor for comment" title="Open in editor for comment"/>
                                                                     </a>
                                                                 </td>
                                                                 <% if (docType.equals("word")) { %>
                                                                 <td class="contentCells contentCells-icon">
-                                                                    <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8") %>&type=desktop&mode=review" target="_blank">
+                                                                    <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8").concat(request.getParameter("directUrl") != null ? "&directUrl=".concat(request.getParameter("directUrl")) : "") %>&type=desktop&mode=review" target="_blank">
                                                                         <img src="css/img/review.svg" alt="Open in editor for review" title="Open in editor for review"/>
                                                                     </a>
                                                                 </td>
                                                                 <% } else if (docType.equals("cell")) { %>
                                                                 <td class="contentCells contentCells-icon">
-                                                                    <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8") %>&type=desktop&mode=filter" target="_blank">
+                                                                    <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8").concat(request.getParameter("directUrl") != null ? "&directUrl=".concat(request.getParameter("directUrl")) : "") %>&type=desktop&mode=filter" target="_blank">
                                                                         <img src="css/img/filter.svg" alt="Open in editor without access to change the filter" title="Open in editor without access to change the filter"/>
                                                                     </a>
                                                                 </td>
                                                                 <% } %>
                                                                 <% if (docType.equals("word")) { %>
                                                                 <td class="contentCells contentCells-icon">
-                                                                    <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8") %>&type=desktop&mode=blockcontent" target="_blank">
+                                                                    <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8")
+                                                                    .concat(request.getParameter("directUrl") != null ?
+                                                                     "&directUrl=".concat(request.getParameter("directUrl")) : "") %>&type=desktop&mode=blockcontent" target="_blank">
                                                                         <img src="css/img/block-content.svg" alt="Open in editor without content control modification" title="Open in editor without content control modification"/>
                                                                     </a>
                                                                 </td>
@@ -206,7 +217,9 @@
                                                                 <% } %>
                                                                 <% if (isFillFormDoc) { %>
                                                                 <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
-                                                                    <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8") %>&type=desktop&mode=fillForms" target="_blank">
+                                                                    <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8")
+                                                                    .concat(request.getParameter("directUrl") != null ?
+                                                                     "&directUrl=".concat(request.getParameter("directUrl")) : "") %>&type=desktop&mode=fillForms" target="_blank">
                                                                         <img src="css/img/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
                                                                     </a>
                                                                 </td>
@@ -216,7 +229,9 @@
                                                                 <% } else if (isFillFormDoc) {%>
                                                                 <td class="contentCells contentCells-icon "></td>
                                                                 <td class="contentCells contentCells-icon">
-                                                                    <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8") %>&type=mobile&mode=fillForms" target="_blank">
+                                                                    <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8")
+                                                                    .concat(request.getParameter("directUrl") != null ?
+                                                                     "&directUrl=".concat(request.getParameter("directUrl")) : "") %>&type=mobile&mode=fillForms" target="_blank">
                                                                         <img src="css/img/mobile-fill-forms.svg" alt="Open in editor for filling in forms for mobile devices" title="Open in editor for filling in forms for mobile devices" />
                                                                     </a>
                                                                 </td>
@@ -224,24 +239,32 @@
                                                                 <td class="contentCells contentCells-icon "></td>
                                                                 <td class="contentCells contentCells-icon "></td>
                                                                 <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
-                                                                    <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8") %>&type=desktop&mode=fillForms" target="_blank">
+                                                                    <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8")
+                                                                    .concat(request.getParameter("directUrl") != null ?
+                                                                     "&directUrl=".concat(request.getParameter("directUrl")) : "") %>&type=desktop&mode=fillForms" target="_blank">
                                                                         <img src="css/img/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
                                                                     </a>
                                                             <% } else { %>
                                                             <td class="contentCells contentCells-shift contentCells-icon contentCellsEmpty" colspan="6"></td>
                                                             <% } %>
                                                             <td class="contentCells contentCells-icon firstContentCellViewers">
-                                                                <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8") %>&type=desktop&mode=view" target="_blank">
+                                                                <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8")
+                                                                .concat(request.getParameter("directUrl") != null ?
+                                                                 "&directUrl=".concat(request.getParameter("directUrl")) : "") %>&type=desktop&mode=view" target="_blank">
                                                                     <img src="css/img/desktop.svg" alt="Open in viewer for full size screens" title="Open in viewer for full size screens"/>
                                                                 </a>
                                                             </td>
                                                             <td class="contentCells contentCells-icon">
-                                                                <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8") %>&type=mobile&mode=view" target="_blank">
+                                                                <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8")
+                                                                .concat(request.getParameter("directUrl") != null ?
+                                                                 "&directUrl=".concat(request.getParameter("directUrl")) : "") %>&type=mobile&mode=view" target="_blank">
                                                                     <img src="css/img/mobile.svg" alt="Open in viewer for mobile devices" title="Open in viewer for mobile devices"/>
                                                                 </a>
                                                             </td>
                                                             <td class="contentCells contentCells-icon contentCells-shift">
-                                                                <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8") %>&type=embedded&mode=embedded" target="_blank">
+                                                                <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8")
+                                                                .concat(request.getParameter("directUrl") != null ?
+                                                                 "&directUrl=".concat(request.getParameter("directUrl")) : "") %>&type=embedded&mode=embedded" target="_blank">
                                                                     <img src="css/img/embeded.svg" alt="Open in embedded mode" title="Open in embedded mode"/>
                                                                 </a>
                                                             </td>
@@ -349,8 +372,19 @@
             var UrlConverter = "IndexServlet?type=convert";
             var UrlEditor = "EditorServlet";
 
-            document.addEventListener('DOMContentLoaded', function(){
-                document.getElementById("language").value="en";
+            document.addEventListener('DOMContentLoaded', function() {
+                var lang = document.cookie
+                        .split('; ')
+                        .find((row) => row.startsWith('ulang='))
+                        ?.split('=')[1];
+
+                var languages = Array.from(document.getElementById("language").options).map(e => e.value)
+
+                if (!languages.includes(lang)) {
+                    lang = "en";
+                }
+
+                document.getElementById("language").value=lang;
             });
         </script>
     </body>

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

@@ -16,11 +16,24 @@
  *
  */
 
+var directUrl;
+
 if (typeof jQuery !== "undefined") {
     jq = jQuery.noConflict();
 
+    directUrl = getUrlVars()["directUrl"] == "true";
+
     mustReload = false;
 
+    if (directUrl)
+        jq("#directUrl").prop("checked", directUrl);
+    else
+        directUrl = jq("#directUrl").prop("checked");
+
+    jq("#directUrl").change(function() {
+        window.location = "?directUrl=" + jq(this).prop("checked");
+    });
+
     jq(function () {
         jq("#fileupload").fileupload({
             dataType: "json",
@@ -218,7 +231,7 @@ if (typeof jQuery !== "undefined") {
 
     jq(document).on("click", "#beginEdit:not(.disable)", function () {
         var fileId = encodeURIComponent(jq("#hiddenFileName").val());
-        var url = UrlEditor + "?mode=edit&fileName=" + fileId;
+        var url = UrlEditor + "?mode=edit&fileName=" + fileId + "&directUrl=" + directUrl;
         window.open(url, "_blank");
         jq("#hiddenFileName").val("");
         jq.unblockUI();
@@ -226,7 +239,7 @@ if (typeof jQuery !== "undefined") {
 
     jq(document).on("click", "#beginView:not(.disable)", function () {
         var fileId = encodeURIComponent(jq("#hiddenFileName").val());
-        var url = UrlEditor + "?mode=view&fileName=" + fileId;
+        var url = UrlEditor + "?mode=view&fileName=" + fileId + "&directUrl=" + directUrl;
         window.open(url, "_blank");
         jq("#hiddenFileName").val("");
         jq.unblockUI();
@@ -234,7 +247,7 @@ if (typeof jQuery !== "undefined") {
 
     jq(document).on("click", "#beginEmbedded:not(.disable)", function () {
         var fileId = encodeURIComponent(jq("#hiddenFileName").val());
-        var url = UrlEditor + "?type=embedded&mode=embedded&fileName=" + fileId;
+        var url = UrlEditor + "?type=embedded&mode=embedded&fileName=" + fileId + "&directUrl=" + directUrl;
 
         jq("#mainProgress").addClass("embedded");
         jq("#beginEmbedded").addClass("disable");
@@ -287,6 +300,17 @@ if (typeof jQuery !== "undefined") {
         }
     };
 
+    function getUrlVars() {
+        var vars = [], hash;
+        var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+        for (var i = 0; i < hashes.length; i++) {
+            hash = hashes[i].split('=');
+            vars.push(hash[0]);
+            vars[hash[0]] = hash[1];
+        }
+        return vars;
+    };
+
     var fileList = jq("tr.tableRow");
 
     var mouseIsOverTooltip = false;
@@ -297,12 +321,12 @@ if (typeof jQuery !== "undefined") {
                 if (hideTooltipTimeout != null) {
                     clearTimeout(hideTooltipTimeout);
                 }
-                jq(".info").on("touchend", function () {
+                jq("#info").on("touchend", function () {
                     showUserTooltip(true);
                 });
             }
     } else {
-        jq(".info").mouseover(function (event) {
+        jq("#info").mouseover(function (event) {
             if (fileList.length > 0) {
                 if (hideTooltipTimeout != null) {
                     clearTimeout(hideTooltipTimeout);
@@ -326,4 +350,18 @@ if (typeof jQuery !== "undefined") {
             }, 500);
         });
     }
+
+    jq(".info-tooltip").mouseover(function (event) {
+        var target = event.target;
+        var id = target.dataset.id ? target.dataset.id : target.id;
+        var tooltip = target.dataset.tooltip;
+
+        jq("<div class='tooltip'>" + tooltip + "<div class='arrow'></div></div>").appendTo("body");
+
+        var top = jq("#" + id).offset().top + jq("#" + id).outerHeight() / 2 - jq("div.tooltip").outerHeight() / 2;
+        var left = jq("#" + id).offset().left + jq("#" + id).outerWidth() + 20;
+        jq("div.tooltip").css({"top": top, "left": left});
+    }).mouseout(function () {
+        jq("div.tooltip").remove();
+    });
 }

web/documentserver-example/nodejs/.eslintignore

@@ -0,0 +1 @@
+public

web/documentserver-example/nodejs/.eslintrc.js

@@ -0,0 +1,15 @@
+module.exports = {
+  env: {
+    browser: true,
+    commonjs: true,
+    es2021: true,
+  },
+  extends: ['airbnb-base'],
+  overrides: [
+  ],
+  parserOptions: {
+    ecmaVersion: 'latest',
+  },
+  rules: {
+  },
+};

web/documentserver-example/nodejs/app.js

@@ -764,6 +764,7 @@ app.get("/editor", function (req, res) {  // define a handler for editing docume
         var historyData = [];
         var lang = req.docManager.getLang();
         var user = users.getUser(req.query.userid);
+        var userDirectUrl = req.query.directUrl == "true";
 
         var userid = user.id;
         var name = user.name;
@@ -778,6 +779,14 @@ app.get("/editor", function (req, res) {  // define a handler for editing docume
             }
         }
 
+        var type = req.query.type || ""; // type: embedded/mobile/desktop
+        if (type == "") {
+            type = new RegExp(configServer.get("mobileRegEx"), "i").test(req.get('User-Agent')) ? "mobile" : "desktop";
+        } else if (type != "mobile"
+            && type != "embedded") {
+                type = "desktop";
+        }
+
         var templatesImageUrl = req.docManager.getTemplateImageUrl(fileUtility.getFileType(fileName));
         var createUrl = req.docManager.getCreateUrl(fileUtility.getFileType(fileName), userid, type, lang);
         var templates = [
@@ -816,17 +825,9 @@ app.get("/editor", function (req, res) {  // define a handler for editing docume
         }
         var key = req.docManager.getKey(fileName);
         var url = req.docManager.getDownloadUrl(fileName, true);
-        var urlUser = req.docManager.getDownloadUrl(fileName);
+        var directUrl = req.docManager.getDownloadUrl(fileName);
         var mode = req.query.mode || "edit"; // mode: view/edit/review/comment/fillForms/embedded
 
-        var type = req.query.type || ""; // type: embedded/mobile/desktop
-        if (type == "") {
-            type = new RegExp(configServer.get("mobileRegEx"), "i").test(req.get('User-Agent')) ? "mobile" : "desktop";
-        } else if (type != "mobile"
-            && type != "embedded") {
-                type = "desktop";
-        }
-
         var canEdit = configServer.get('editedDocs').indexOf(fileExt) != -1;  // check if this file can be edited
         if ((!canEdit && mode == "edit" || mode == "fillForms") && configServer.get('fillDocs').indexOf(fileExt) != -1) {
             mode = "fillForms";
@@ -861,6 +862,7 @@ app.get("/editor", function (req, res) {  // define a handler for editing docume
                     version: i,
                     key: keyVersion,
                     url: i == countVersion ? url : (`${req.docManager.getServerUrl(true)}/history?fileName=${encodeURIComponent(fileName)}&file=prev${fileExt}&ver=${i}&useraddress=${userAddress}`),
+                    directUrl: !userDirectUrl ? null : i == countVersion ? directUrl : (`${req.docManager.getServerUrl(false)}/history?fileName=${encodeURIComponent(fileName)}&file=prev${fileExt}&ver=${i}`),
                 };
 
                 if (i > 1 && req.docManager.existsSync(req.docManager.diffPath(fileName, userAddress, i-1))) {  // check if the path to the file with document versions differences exists
@@ -868,6 +870,7 @@ app.get("/editor", function (req, res) {  // define a handler for editing docume
                         fileType: historyData[i-2].fileType,
                         key: historyData[i-2].key,
                         url: historyData[i-2].url,
+                        directUrl: !userDirectUrl ? null :  historyData[i-2].directUrl,
                     };
                     let changesUrl = `${req.docManager.getServerUrl(true)}/history?fileName=${encodeURIComponent(fileName)}&file=diff.zip&ver=${i-1}&useraddress=${userAddress}`;
                     historyD.changesUrl = changesUrl;  // get the path to the diff.zip file and write it to the history object
@@ -885,7 +888,8 @@ app.get("/editor", function (req, res) {  // define a handler for editing docume
             historyData.push({
                 version: countVersion,
                 key: key,
-                url: url
+                url: url,
+                directUrl: !userDirectUrl ? null : directUrl,
             });
         }
 
@@ -902,7 +906,8 @@ app.get("/editor", function (req, res) {  // define a handler for editing docume
                 name: fileName,
                 ext: fileUtility.getFileExtension(fileName, true),
                 uri: url,
-                uriUser: urlUser,
+                directUrl: !userDirectUrl ? null : directUrl,
+                uriUser: directUrl,
                 version: countVersion,
                 created: new Date().toDateString(),
                 favorite: user.favorite != null ? user.favorite : "null"
@@ -918,6 +923,7 @@ app.get("/editor", function (req, res) {  // define a handler for editing docume
                 isEdit: canEdit && (mode == "edit" || mode == "view" || mode == "filter" || mode == "blockcontent"),
                 review: canEdit && (mode == "edit" || mode == "review"),
                 chat: userid != "uid-0",
+                coEditing: mode == "view" && userid == "uid-0" ? {mode: "strict", change: false} : null,
                 comment: mode != "view" && mode != "fillForms" && mode != "embedded" && mode != "blockcontent",
                 fillForms: mode != "view" && mode != "comment" && mode != "embedded" && mode != "blockcontent",
                 modifyFilter: mode != "filter",
@@ -945,15 +951,18 @@ app.get("/editor", function (req, res) {  // define a handler for editing docume
             historyData: historyData,
             dataInsertImage: {
                 fileType: "png",
-                url: req.docManager.getServerUrl(true) + "/images/logo.png"
+                url: req.docManager.getServerUrl(true) + "/images/logo.png",
+                directUrl: !userDirectUrl ? null : req.docManager.getServerUrl() + "/images/logo.png",
             },
             dataCompareFile: {
                 fileType: "docx",
-                url: req.docManager.getServerUrl(true) + "/assets/sample/sample.docx"
+                url: req.docManager.getServerUrl(true) + "/assets/sample/sample.docx",
+                directUrl: !userDirectUrl ? null : req.docManager.getServerUrl() + "/assets/sample/sample.docx",
             },
             dataMailMergeRecipients: {
                 fileType: "csv",
-                url: req.docManager.getServerUrl(true) + "/csv"
+                url: req.docManager.getServerUrl(true) + "/csv",
+                directUrl: !userDirectUrl ? null : req.docManager.getServerUrl() + "/csv",
             },
             usersForMentions: user.id != "uid-0" ? users.getUsersForMentions(user.id) : null,
         };

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

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.0",
+  "version": "1.4.0",
   "log": {
     "appenders": [
       {
@@ -48,11 +48,14 @@
     "verify_peer_off": true,
     "languages": {
       "en": "English",
+      "hy": "Armenian",
       "az": "Azerbaijani",
+      "eu": "Basque",
       "be": "Belarusian",
       "bg": "Bulgarian",
       "ca": "Catalan",
-      "zh": "Chinese",
+      "zh" : "Chinese (People's Republic of China)",
+      "zh-TW" : "Chinese (Traditional, Taiwan)",
       "cs": "Czech",
       "da": "Danish",
       "nl": "Dutch",
@@ -68,9 +71,11 @@
       "ko": "Korean",
       "lv": "Latvian",
       "lo": "Lao",
+      "ms": "Malay (Malaysia)",
       "nb": "Norwegian",
       "pl": "Polish",
-      "pt": "Portuguese",
+      "pt" : "Portuguese (Brazil)",
+      "pt-PT" : "Portuguese (Portugal)",
       "ro": "Romanian",
       "ru": "Russian",
       "sk": "Slovak",
@@ -79,7 +84,8 @@
       "sv": "Swedish",
       "tr": "Turkish",
       "uk": "Ukrainian",
-      "vi": "Vietnamese"
+      "vi": "Vietnamese",
+      "aa-AA": "Test Language"
     }
   },
   "plugins": {

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

@@ -66,6 +66,9 @@ docManager.prototype.getCustomParams = function () {
     const lang = this.req.query.lang;  // language
     params += (lang ? "&lang=" + this.getLang() : "");
 
+    const directUrl = this.req.query.directUrl;  // directUrl
+    params += (directUrl ? "&directUrl=" + (directUrl == "true") : "");
+
     const fileName = this.req.query.fileName;  // file name
     params += (fileName ? "&fileName=" + fileName : "");
 

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

@@ -61,6 +61,7 @@ var descr_user_0 = [
     "Can’t see anyone’s information",
     "Can't rename files from the editor",
     "Can't view chat",
+    "View file without collaboration",
     //"Can’t submit forms"
 ];
 

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

@@ -22,9 +22,20 @@ var urlModule = require("url");
 var urllib = require("urllib");
 const xmlParser = require("fast-xml-parser");
 const he = require("he");
+const siteUrl = configServer.get("siteUrl");  // the path to the editors installation
 
 var cache = null;
 
+async function initWopi(docManager) {
+    let absSiteUrl = siteUrl;
+    if (absSiteUrl.indexOf("/") === 0) {
+        absSiteUrl = docManager.getServerHost() + siteUrl;
+    }
+
+    // get the wopi discovery information
+    await getDiscoveryInfo(absSiteUrl);
+}
+
 // get the wopi discovery information
 async function getDiscoveryInfo(siteUrl) {
     let actions = [];
@@ -125,6 +136,7 @@ function getActionUrl(host, userAddress, action, filename) {
     return action.urlsrc.replace(/<.*&>/g, "") + "WOPISrc=" + host + "/wopi/files/" + filename + "@" + userAddress;
 }
 
+exports.initWopi = initWopi;
 exports.getDiscoveryInfo = getDiscoveryInfo;
 exports.getAction = getAction;
 exports.getActions = getActions;

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

@@ -23,7 +23,7 @@ const docManager = require("../docManager");
 const fileUtility = require("../fileUtility");
 const config = require('config');
 const configServer = config.get('server');
-const siteUrl = configServer.get('siteUrl');  // the path to the editors installation
+const siteUrl = configServer.get("siteUrl");  // the path to the editors installation
 const users = require("../users");
 
 exports.registerRoutes = function(app) {
@@ -33,24 +33,10 @@ exports.registerRoutes = function(app) {
 
         req.docManager = new docManager(req, res);
 
-        let absSiteUrl = siteUrl;
-        if (absSiteUrl.indexOf("/") === 0) {
-            absSiteUrl = req.docManager.getServerHost() + siteUrl;
-
-            //todo: remove
-            if (absSiteUrl.indexOf("example") !== -1) {
-                let host = req.get("host");
-                let pos = host.indexOf("/", "https://".length);
-                if (pos > -1)
-                {
-                    host = host.substring(0, pos);
-                }
-                absSiteUrl = req.docManager.getProtocol() + "://" + host + siteUrl;
-            }
-        }
+        await utils.initWopi(req.docManager);
 
         // get the wopi discovery information
-        let actions = await utils.getDiscoveryInfo(absSiteUrl);
+        let actions = await utils.getDiscoveryInfo();
         let wopiEnable = actions.length != 0 ? true : false;
         let docsExtEdit = [];    // Supported extensions for WOPI
 
@@ -111,6 +97,8 @@ exports.registerRoutes = function(app) {
         try {
             req.docManager = new docManager(req, res);
 
+            await utils.initWopi(req.docManager);
+
             var fileName = req.docManager.getCorrectName(req.params['id'])
             var fileExt = fileUtility.getFileExtension(fileName, true);  // get the file extension from the request
             var user = users.getUser(req.query.userid);  // get a user by the id

web/documentserver-example/nodejs/package.json

@@ -3,7 +3,9 @@
   "version": "4.1.0",
   "private": false,
   "scripts": {
-    "start": "node ./bin/www"
+    "start": "node ./bin/www",
+    "lint": "eslint .",
+    "lint:fix": "eslint --fix ."
   },
   "bin": "bin/www",
   "description": "OnlineEditorsExampleNodeJS",
@@ -40,5 +42,10 @@
       "public/**/*",
       "views/*"
     ]
+  },
+  "devDependencies": {
+    "eslint": "^8.28.0",
+    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-plugin-import": "^2.26.0"
   }
 }

web/documentserver-example/nodejs/public/images/wopi-editnew.svg

@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="10" height="2" rx="1" transform="matrix(1.19249e-08 -1 -1 -1.19249e-08 13 13)" fill="#444444"/>
+<path d="M6.57692 19.6154C6.30247 20.2741 6.78642 21 7.5 21H16.5C17.2136 21 17.6975 20.2741 17.4231 19.6154L15.7564 15.6154C15.6011 15.2427 15.237 15 14.8333 15H9.16667C8.76297 15 8.39886 15.2427 8.24359 15.6154L6.57692 19.6154Z" fill="#444444"/>
+<path d="M15 14C15 13.2044 14.6839 12.4413 14.1213 11.8787C13.5587 11.3161 12.7956 11 12 11C11.2044 11 10.4413 11.3161 9.87868 11.8787C9.31607 12.4413 9 13.2044 9 14L12 14H15Z" fill="#444444"/>
+</svg>

web/documentserver-example/nodejs/public/images/wopi-embedview.svg

@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.326 18.6739C13.8912 18.2391 13.8912 17.5342 14.326 17.0994L20.0993 11.3261C20.5341 10.8913 21.239 10.8913 21.6738 11.3261C22.1086 11.7609 22.1086 12.4658 21.6738 12.9006L15.9006 18.6739C15.4658 19.1087 14.7608 19.1087 14.326 18.6739Z" fill="#444444"/>
+<path d="M14.326 5.3261C14.7608 4.8913 15.4658 4.8913 15.9006 5.3261L21.6738 11.0994C22.1086 11.5342 22.1086 12.2391 21.6738 12.6739C21.239 13.1087 20.5341 13.1087 20.0993 12.6739L14.326 6.90063C13.8912 6.46583 13.8912 5.76089 14.326 5.3261Z" fill="#444444"/>
+<path d="M9.67385 5.3261C10.1086 5.76089 10.1086 6.46583 9.67385 6.90063L3.90061 12.6739C3.46582 13.1087 2.76088 13.1087 2.32609 12.6739C1.8913 12.2391 1.8913 11.5342 2.32609 11.0994L8.09933 5.3261C8.53412 4.8913 9.23905 4.8913 9.67385 5.3261Z" fill="#444444"/>
+<path d="M9.67385 18.6739C9.23905 19.1087 8.53412 19.1087 8.09933 18.6739L2.32609 12.9006C1.8913 12.4658 1.8913 11.7609 2.32609 11.3261C2.76088 10.8913 3.46582 10.8913 3.90061 11.3261L9.67385 17.0994C10.1086 17.5342 10.1086 18.2391 9.67385 18.6739Z" fill="#444444"/>
+</svg>

web/documentserver-example/nodejs/public/javascripts/jscript.js

@@ -18,12 +18,14 @@
 
 var language;
 var userid;
+var directUrl;
 
 if (typeof jQuery != "undefined") {
     jq = jQuery.noConflict();
 
     userid = getUrlVars()["userid"];
     language = getUrlVars()["lang"];
+    directUrl = getUrlVars()["directUrl"] == "true";
 
     mustReload = false;
 
@@ -34,19 +36,29 @@ if (typeof jQuery != "undefined") {
 
 
     jq("#language").change(function() {
-        window.location = "?lang=" + jq(this).val() + "&userid=" + userid;
+        window.location = "?lang=" + jq(this).val() + "&userid=" + userid + "&directUrl=" + directUrl;
     });
 
-
     if ("" != userid && undefined != userid)
         jq("#user").val(userid);
     else
         userid = jq("#user").val();
 
     jq("#user").change(function() {
-        window.location = "?lang=" + language + "&userid=" + jq(this).val();
+        window.location = "?lang=" + language + "&userid=" + jq(this).val() + "&directUrl=" + directUrl;
     });
 
+
+    if (directUrl)
+        jq("#directUrl").prop("checked", directUrl);
+    else
+        directUrl = jq("#directUrl").prop("checked");
+
+    jq("#directUrl").change(function() {
+        window.location = "?lang=" + language + "&userid=" + userid + "&directUrl=" + jq(this).prop("checked");
+    });
+
+
     jq(function () {
         jq('#fileupload').fileupload({
             dataType: 'json',
@@ -228,7 +240,7 @@ if (typeof jQuery != "undefined") {
         if (UrlEditor == "wopi-action"){
             var url = UrlEditor + "/" + fileId + "?action=edit";
         }else{
-            var url = UrlEditor + "?fileName=" + fileId + "&lang=" + language + "&userid=" + userid;
+            var url = UrlEditor + "?fileName=" + fileId + "&lang=" + language + "&userid=" + userid + "&directUrl=" + directUrl;
         }
         window.open(url, "_blank");
         jq('#hiddenFileName').val("");
@@ -241,7 +253,7 @@ if (typeof jQuery != "undefined") {
         if (UrlEditor == "wopi-action"){
             var url = UrlEditor + "/" + fileId + "?action=view";
         }else{
-            var url = UrlEditor + "?mode=view&fileName=" + fileId + "&lang=" + language + "&userid=" + userid;
+            var url = UrlEditor + "?mode=view&fileName=" + fileId + "&lang=" + language + "&userid=" + userid + "&directUrl=" + directUrl;
         }
         window.open(url, "_blank");
         jq('#hiddenFileName').val("");
@@ -251,7 +263,7 @@ if (typeof jQuery != "undefined") {
 
     jq(document).on("click", "#beginEmbedded:not(.disable)", function () {
         var fileId = encodeURIComponent(jq('#hiddenFileName').val());
-        var url = UrlEditor + "?type=embedded&fileName=" + fileId + "&lang=" + language + "&userid=" + userid;
+        var url = UrlEditor + "?type=embedded&fileName=" + fileId + "&lang=" + language + "&userid=" + userid + "&directUrl=" + directUrl;
 
         jq("#mainProgress").addClass("embedded");
         jq("#beginEmbedded").addClass("disable");

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

@@ -165,7 +165,7 @@ label .checkbox {
     background-image: url("../images/file_docxf.svg");
 }
 
-.create-sample {
+.side-option {
     color: #666666;
     line-height: 24px;
 }

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

@@ -1,4 +1,5 @@
 "document": {
+    "directUrl": "<%- file.directUrl %>",
     "fileType": "<%- file.ext %>",
     "info": {
         "owner": "Me",
@@ -28,6 +29,7 @@
 "editorConfig": {
     "actionLink": <%- editor.actionData %>,
     "callbackUrl": "<%- editor.callbackUrl %>",
+    "coEditing": <%- JSON.stringify(editor.coEditing) %>,
     "createUrl": <%- JSON.stringify(editor.createUrl) %>,
     "customization": {
         "about": true,

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

@@ -60,7 +60,7 @@
                                             <a class="try-editor form reload-page" target="_blank" href="editor?fileExt=docxf<%= params %>" title="Create new form template">Form template</a>
                                         </li>
                                     </ul>
-                                    <label class="create-sample">
+                                    <label class="side-option">
                                         <input id="createSample" type="checkbox" class="checkbox" />With sample content
                                     </label>
                                 </div>
@@ -95,6 +95,14 @@
                                                 </select>
                                             </td>
                                         </tr>
+                                        <tr>
+                                            <td valign="middle">
+                                                <label class="side-option">
+                                                    <input id="directUrl" type="checkbox" class="checkbox" />Try opening on client
+                                                    <img id="directUrlInfo" class="info info-tooltip" data-id="directUrlInfo" data-tooltip="Some files can be opened in the user's browser without connecting to the document server." src="images/info.svg" />
+                                                </label>
+                                            </td>
+                                        </tr>
                                     </tbody>
                                 </table>
 

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

@@ -158,15 +158,11 @@
                                                     <% if (storedFiles[i].actions && storedFiles[i].actions.length > 0) { %>
                                                         <td class="contentCells contentCells-wopi contentCells-shift">
                                                             <% for (var j = 0; j < storedFiles[i].actions.length; j++) { %>
-                                                                <% if (storedFiles[i].actions[j].name != "editnew") { %>
-                                                                    <a href="<%= serverUrl %>/wopi-action/<%= encodeURIComponent(storedFiles[i].name) %>?action=<%= storedFiles[i].actions[j].name %><%= params %>" target="_blank">
-                                                                        <% if (storedFiles[i].actions[j].name == "edit") { %>
-                                                                            <img src="images/editor.svg" alt="<%= storedFiles[i].actions[j].name %>" title="<%= storedFiles[i].actions[j].name %>" />
-                                                                        <%} else { %>
-                                                                            <img src="images/view.svg" alt="<%= storedFiles[i].actions[j].name %>" title="<%= storedFiles[i].actions[j].name %>" />
-                                                                        <% } %>
-                                                                    </a>
-                                                                <% } %>  
+                                                                <a href="<%= serverUrl %>/wopi-action/<%= encodeURIComponent(storedFiles[i].name) %>?action=<%= storedFiles[i].actions[j].name %><%= params %>" target="_blank">
+                                                                    <img
+                                                                        src="images/wopi-<%= storedFiles[i].actions[j].name %>.svg"
+                                                                        alt="<%= storedFiles[i].actions[j].name %>" title="<%= storedFiles[i].actions[j].name %>" />
+                                                                </a>
                                                             <% } %>
                                                         </td>
                                                     <% } %>

web/documentserver-example/php/config.php

@@ -1,6 +1,6 @@
 <?php
 
-$GLOBALS['version'] = "1.3.0";
+$GLOBALS['version'] = "1.4.0";
 
 $GLOBALS['FILE_SIZE_MAX'] = 5242880;
 $GLOBALS['STORAGE_PATH'] = "";
@@ -48,11 +48,14 @@ $GLOBALS['ExtsDocument'] = array(".doc", ".docx", ".docm",
 
 $GLOBALS['LANGUAGES'] = array(
     'en' => 'English',
+    'hy' => 'Armenian',
     'az' => 'Azerbaijani',
+    'eu' => 'Basque',
     'be' => 'Belarusian',
     'bg' => 'Bulgarian',
     'ca' => 'Catalan',
-    'zh' => 'Chinese',
+    'zh' => 'Chinese (People\'s Republic of China)',
+    'zh-TW' => 'Chinese (Traditional, Taiwan)',
     'cs' => 'Czech',
     'da' => 'Danish',
     'nl' => 'Dutch',
@@ -68,9 +71,11 @@ $GLOBALS['LANGUAGES'] = array(
     'ko' => 'Korean',
     'lv' => 'Latvian',
     'lo' => 'Lao',
+    'ms' => 'Malay (Malaysia)',
     'nb' => 'Norwegian',
     'pl' => 'Polish',
-    'pt' => 'Portuguese',
+    'pt' => 'Portuguese (Brazil)',
+    'pt-PT' => 'Portuguese (Portugal)',
     'ro' => 'Romanian',
     'ru' => 'Russian',
     'sk' => 'Slovak',
@@ -79,6 +84,7 @@ $GLOBALS['LANGUAGES'] = array(
     'sv' => 'Swedish',
     'tr' => 'Turkish',
     'uk' => 'Ukrainian',
-    'vi' => 'Vietnamese'
+    'vi' => 'Vietnamese',
+    'aa-AA' => 'Test Language'
 );
 ?>

web/documentserver-example/php/css/stylesheet.css

@@ -166,7 +166,7 @@ label .checkbox {
     background-image: url("images/file_docxf.svg");
 }
 
-.create-sample {
+.side-option {
     color: #666666;
     line-height: 24px;
 }
@@ -740,3 +740,28 @@ html {
 .user-descr > b {
     margin-left: 25px;
 }
+
+.tooltip {
+    background: #FFFFFF;
+    border-radius: 5px;
+    box-shadow: 0px 7px 25px rgba(85, 85, 85, 0.15);
+    color: #666666;
+    line-height: 160%;
+    max-width: 455px;
+    padding: 14px;
+    position: absolute;
+}
+
+.tooltip ul {
+    margin: 0;
+}
+
+.arrow {
+    border-top: 8px solid transparent;
+    border-bottom: 8px solid transparent;
+    border-right: 8px solid #FFFFFF;
+    left: -4px;
+    position: absolute;
+    top: 50%;
+    transform: translate(-50%, -50%);
+}

web/documentserver-example/php/doceditor.php

@@ -26,6 +26,7 @@
     $filename;
 
     $user = getUser($_GET["user"]);
+    $isEnableDirectUrl = $_GET["directUrl"] != null ? filter_var($_GET["directUrl"], FILTER_VALIDATE_BOOLEAN) : false;
 
     // get the file url and upload it
     $externalUrl = $_GET["fileUrl"];
@@ -53,6 +54,7 @@
 
     $fileuri = FileUri($filename, true);
     $fileuriUser = realpath($GLOBALS['STORAGE_PATH']) === $GLOBALS['STORAGE_PATH'] ? getDownloadUrl($filename) . "&dmode=emb" : FileUri($filename);
+    $directUrl = getDownloadUrl($filename, FALSE);
     $docKey = getDocEditorKey($filename);
     $filetype = strtolower(pathinfo($filename, PATHINFO_EXTENSION));
 
@@ -89,6 +91,7 @@
         "document" => [
             "title" => $filename,
             "url" => getDownloadUrl($filename),
+            "directUrl" => $isEnableDirectUrl ? $directUrl : "",
             "fileType" => $filetype,
             "key" => $docKey,
             "info" => [
@@ -117,6 +120,10 @@
             "mode" => $mode,
             "lang" => empty($_COOKIE["ulang"]) ? "en" : $_COOKIE["ulang"],
             "callbackUrl" => getCallbackUrl($filename),  // absolute URL to the document storage service
+            "coEditing" => $editorsMode == "view" && $user->id == "uid-0" ? [
+                "mode" => "strict", 
+                "change" => false
+            ] : null,
             "createUrl" => $user->id != "uid-0" ? $createUrl : null,
             "templates" => $user->templates ? $templates : null,
             "user" => [  // the user currently viewing or editing the document
@@ -125,9 +132,9 @@
                 "group" => $user->group
             ],
             "embedded" => [  // the parameters for the embedded document type
-                "saveUrl" => $fileuriUser,  // the absolute URL that will allow the document to be saved onto the user personal computer
-                "embedUrl" => $fileuriUser,  // the absolute URL to the document serving as a source file for the document embedded into the web page
-                "shareUrl" => $fileuriUser,  // the absolute URL that will allow other users to share this document
+                "saveUrl" => $directUrl,  // the absolute URL that will allow the document to be saved onto the user personal computer
+                "embedUrl" => $directUrl,  // the absolute URL to the document serving as a source file for the document embedded into the web page
+                "shareUrl" => $directUrl,  // the absolute URL that will allow other users to share this document
                 "toolbarDocked" => "top",  // the place for the embedded viewer toolbar (top or bottom)
             ],
             "customization" => [  // the parameters for the editor interface
@@ -144,19 +151,31 @@
     ];
 
     // an image for inserting
-    $dataInsertImage = [
+    $dataInsertImage = $isEnableDirectUrl ? [
+        "fileType" => "png",
+        "url" => serverPath(true) . "/css/images/logo.png",
+        "directUrl" => serverPath(false) . "/css/images/logo.png"
+    ] : [
         "fileType" => "png",
         "url" => serverPath(true) . "/css/images/logo.png"
     ];
 
     // a document for comparing
-    $dataCompareFile = [
+    $dataCompareFile = $isEnableDirectUrl ? [
+        "fileType" => "docx",
+        "url" => serverPath(true) . "/webeditor-ajax.php?type=assets&name=sample.docx",
+        "directUrl" => serverPath(false) . "/webeditor-ajax.php?type=assets&name=sample.docx"
+    ] : [
         "fileType" => "docx",
         "url" => serverPath(true) . "/webeditor-ajax.php?type=assets&name=sample.docx"
     ];
 
     // recipients data for mail merging
-    $dataMailMergeRecipients = [
+    $dataMailMergeRecipients = $isEnableDirectUrl ? [
+        "fileType" =>"csv",
+        "url" => serverPath(true) . "/webeditor-ajax.php?type=csv",
+        "directUrl" => serverPath(false) . "/webeditor-ajax.php?type=csv"
+    ]  : [
         "fileType" =>"csv",
         "url" => serverPath(true) . "/webeditor-ajax.php?type=csv"
     ];
@@ -209,27 +228,29 @@
                 . "&type=" . $type;
     }
 
-    function getHistoryDownloadUrl($fileName, $version, $file) {
-        return serverPath(TRUE) . '/'
+    function getHistoryDownloadUrl($fileName, $version, $file, $isServer = TRUE) {
+        $userAddress = $isServer ? "&userAddress=" . getClientIp() : "";
+        return serverPath($isServer) . '/'
             . "webeditor-ajax.php"
             . "?type=history"
             . "&fileName=" . urlencode($fileName)
             . "&ver=" . $version
             . "&file=" . urlencode($file)
-            . "&userAddress=" . getClientIp();
+            . $userAddress;
     }
 
     // get url to download a file
-    function getDownloadUrl($fileName) {
-        return serverPath(TRUE) . '/'
+    function getDownloadUrl($fileName, $isServer = TRUE) {
+        $userAddress = $isServer ? "&userAddress=" . getClientIp() : "";
+        return serverPath($isServer) . '/'
             . "webeditor-ajax.php"
             . "?type=download"
             . "&fileName=" . urlencode($fileName)
-            . "&userAddress=" . getClientIp();
+            . $userAddress;
     }
 
     // get document history
-    function getHistory($filename, $filetype, $docKey, $fileuri) {
+    function getHistory($filename, $filetype, $docKey, $fileuri, $isEnableDirectUrl) {
         $storagePath = $GLOBALS['STORAGE_PATH'];
         $histDir = getHistoryDir(getStoragePath($filename));  // get the path to the file history
 
@@ -267,12 +288,19 @@
                 $dataObj["fileType"] = $fileExe;
                 $dataObj["key"] = $key;
 
+                $directUrl =  $i == $curVer ? FileUri($filename, FALSE) : getHistoryDownloadUrl($filename, $i, "prev.".$fileExe, FALSE);
                 $prevFileUrl = $i == $curVer ? $fileuri : getHistoryDownloadUrl($filename, $i, "prev.".$fileExe);
                 if (realpath($storagePath) === $storagePath) {
-                    $prevFileUrl = $i == $curVer ? getDownloadUrl($filename) :  getHistoryDownloadUrl($filename, $i, "prev.".$fileExe);
+                    $prevFileUrl = $i == $curVer ? getDownloadUrl($filename) : getHistoryDownloadUrl($filename, $i, "prev.".$fileExe);
+                    if ($isEnableDirectUrl) {
+                        $directUrl =  $i == $curVer ? getDownloadUrl($filename, FALSE) : getHistoryDownloadUrl($filename, $i, "prev.".$fileExe, FALSE);
+                    }
                 }
 
                 $dataObj["url"] = $prevFileUrl;  // write file url to the data object
+                if ($isEnableDirectUrl) {
+                    $dataObj["directUrl"] = $directUrl;  // write direct url to the data object
+                }
                 $dataObj["version"] = $i;
 
                 if ($i > 1) {  // check if the version number is greater than 1 (the document was modified)
@@ -285,7 +313,12 @@
                     $obj["user"] = $change ? $change["user"] : null;
 
                     $prev = $histData[$i - 2];  // get the history data from the previous file version
-                    $dataObj["previous"] = [  // write information about previous file version to the data object
+                    $dataObj["previous"] = $isEnableDirectUrl ? [  // write information about previous file version to the data object
+                        "fileType" => $prev["fileType"],
+                        "key" => $prev["key"],
+                        "url" => $prev["url"],
+                        "directUrl" => $prev["directUrl"]
+                    ] : [
                         "fileType" => $prev["fileType"],
                         "key" => $prev["key"],
                         "url" => $prev["url"]
@@ -514,7 +547,7 @@
             };
 
             <?php
-                $out = getHistory($filename, $filetype, $docKey, $fileuri);
+                $out = getHistory($filename, $filetype, $docKey, $fileuri, $isEnableDirectUrl);
                 $history = $out[0];
                 $historyData = $out[1];
             ?>

web/documentserver-example/php/index.php

@@ -23,6 +23,7 @@
     require_once( dirname(__FILE__) . '/users.php' );
 
     $user = $_GET["user"];
+    $directUrlArg = $_GET["directUrl"] != null ? "&directUrl=" . $_GET["directUrl"] : "";
 ?>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -73,7 +74,7 @@
                                                     <a class="try-editor form reload-page" target="_blank" href="doceditor.php?fileExt=docxf&user=<?php echo htmlentities($user); ?>">Form template</a>
                                                 </li>
                                             </ul>
-                                            <label class="create-sample">
+                                            <label class="side-option">
                                                 <input type="checkbox" id="createSample" class="checkbox" />With sample content
                                             </label>
                                         </div>
@@ -87,7 +88,7 @@
                                             <tr>
                                                 <td valign="middle">
                                                     <span class="select-user">Username</span>
-                                                    <img class="info" src="css/images/info.svg" />
+                                                    <img id="info" class="info" src="css/images/info.svg" />
                                                     <select class="select-user" id="user">
                                                         <?php foreach(getAllUsers() as $user_l) {
                                                             $name = $user_l->name ? $user_l->name : "Anonymous";
@@ -98,7 +99,10 @@
                                             </tr>
                                             <tr>
                                                 <td valign="middle">
-                                                    <span class="select-user">Language editors interface</span>
+                                                <span class="select-user">Language</span>
+                                            <img class="info info-tooltip" data-id="language"
+                                                 data-tooltip="Choose the language for ONLYOFFICE editors interface"
+                                                 src="css/images/info.svg" />
                                                     <select class="select-user" id="language">
                                                         <?php foreach ($GLOBALS['LANGUAGES'] as $key => $language) { ?>
                                                             <option value="<?=$key?>"><?=$language?></option>
@@ -106,6 +110,14 @@
                                                     </select>
                                                 </td>
                                             </tr>
+                                            <tr>
+                                                <td valign="middle">
+                                                    <label class="side-option">
+                                                        <input id="directUrl" type="checkbox" class="checkbox" />Try opening on client
+                                                        <img id="directUrlInfo" class="info info-tooltip" data-id="directUrlInfo" data-tooltip="Some files can be opened in the user's browser without connecting to the document server." src="css/images/info.svg" />
+                                                    </label>
+                                                </td>
+                                            </tr>
                                         </table>
                                     </div>
                                 </div>
@@ -159,37 +171,37 @@
                                                             <?php foreach ($storedFiles as &$storeFile) {
                                                                 echo '<tr class="tableRow" title="'.$storeFile->name.' ['.getFileVersion(getHistoryDir(getStoragePath($storeFile->name))).']">';
                                                                 echo ' <td class="contentCells">';
-                                                                echo '  <a class="stored-edit '.$storeFile->documentType.'" href="doceditor.php?fileID='.urlencode($storeFile->name).'&user='.htmlentities($user).'" target="_blank">';
+                                                                echo '  <a class="stored-edit '.$storeFile->documentType.'" href="doceditor.php?fileID='.urlencode($storeFile->name).'&user='.htmlentities($user) . $directUrlArg .'" target="_blank">';
                                                                 echo '   <span>'.$storeFile->name.'</span>';
                                                                 echo '  </a>';
                                                                 echo ' </td>';
                                                                 if ($storeFile->canEdit) {
                                                                     echo ' <td class="contentCells contentCells-icon">';
-                                                                    echo '  <a href="doceditor.php?fileID=' . urlencode($storeFile->name) . '&user=' . htmlentities($user) . '&action=edit&type=desktop" target="_blank">';
+                                                                    echo '  <a href="doceditor.php?fileID=' . urlencode($storeFile->name) . '&user=' . htmlentities($user) . $directUrlArg . '&action=edit&type=desktop" target="_blank">';
                                                                     echo '   <img src="css/images/desktop.svg" alt="Open in editor for full size screens" title="Open in editor for full size screens" /></a>';
                                                                     echo ' </td>';
                                                                     echo ' <td class="contentCells contentCells-icon">';
-                                                                    echo '  <a href="doceditor.php?fileID=' . urlencode($storeFile->name) . '&user=' . htmlentities($user) . '&action=edit&type=mobile" target="_blank">';
+                                                                    echo '  <a href="doceditor.php?fileID=' . urlencode($storeFile->name) . '&user=' . htmlentities($user) . $directUrlArg . '&action=edit&type=mobile" target="_blank">';
                                                                     echo '   <img src="css/images/mobile.svg" alt="Open in editor for mobile devices" title="Open in editor for mobile devices" /></a>';
                                                                     echo ' </td>';
                                                                     echo ' <td class="contentCells contentCells-icon">';
-                                                                    echo '  <a href="doceditor.php?fileID=' . urlencode($storeFile->name) . '&user=' . htmlentities($user) . '&action=comment&type=desktop" target="_blank">';
+                                                                    echo '  <a href="doceditor.php?fileID=' . urlencode($storeFile->name) . '&user=' . htmlentities($user) . $directUrlArg . '&action=comment&type=desktop" target="_blank">';
                                                                     echo '   <img src="css/images/comment.svg" alt="Open in editor for comment" title="Open in editor for comment" /></a>';
                                                                     echo ' </td>';
                                                                     if ($storeFile->documentType == "word") {
                                                                         echo ' <td class="contentCells contentCells-icon">';
-                                                                        echo '  <a href="doceditor.php?fileID=' . urlencode($storeFile->name) . '&user=' . htmlentities($user) . '&action=review&type=desktop" target="_blank">';
+                                                                        echo '  <a href="doceditor.php?fileID=' . urlencode($storeFile->name) . '&user=' . htmlentities($user) . $directUrlArg . '&action=review&type=desktop" target="_blank">';
                                                                         echo '   <img src="css/images/review.svg" alt="Open in editor for review" title="Open in editor for review" /></a>';
                                                                         echo ' </td>';
                                                                     } else if ($storeFile->documentType == "cell") {
                                                                         echo ' <td class="contentCells contentCells-icon">';
-                                                                        echo '  <a href="doceditor.php?fileID=' . urlencode($storeFile->name) . '&user=' . htmlentities($user) . '&action=filter&type=desktop" target="_blank">';
+                                                                        echo '  <a href="doceditor.php?fileID=' . urlencode($storeFile->name) . '&user=' . htmlentities($user) . $directUrlArg . '&action=filter&type=desktop" target="_blank">';
                                                                         echo '   <img src="css/images/filter.svg" alt="Open in editor without access to change the filter" title="Open in editor without access to change the filter" /></a>';
                                                                         echo ' </td>';
                                                                     }
                                                                     if ($storeFile->documentType == "word") {
                                                                         echo ' <td class="contentCells contentCells-icon ">';
-                                                                        echo '  <a href="doceditor.php?fileID=' . urlencode($storeFile->name) . '&user=' . htmlentities($user) . '&action=blockcontent&type=desktop" target="_blank">';
+                                                                        echo '  <a href="doceditor.php?fileID=' . urlencode($storeFile->name) . '&user=' . htmlentities($user) . $directUrlArg . '&action=blockcontent&type=desktop" target="_blank">';
                                                                         echo '   <img src="css/images/block-content.svg" alt="Open in editor without content control modification" title="Open in editor without content control modification" /></a>';
                                                                         echo ' </td>';
                                                                     } else{
@@ -200,7 +212,7 @@
                                                                     }
                                                                     if ($storeFile->isFillFormDoc) {
                                                                         echo ' <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">';
-                                                                        echo '  <a href="doceditor.php?fileID=' . urlencode($storeFile->name) . '&user=' . htmlentities($user) . '&action=fillForms&type=desktop" target="_blank">';
+                                                                        echo '  <a href="doceditor.php?fileID=' . urlencode($storeFile->name) . '&user=' . htmlentities($user) . $directUrlArg . '&action=fillForms&type=desktop" target="_blank">';
                                                                         echo '   <img src="css/images/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms" /></a>';
                                                                         echo ' </td>';
                                                                     } else {
@@ -209,29 +221,29 @@
                                                                  } else if ($storeFile->isFillFormDoc) {
                                                                     echo ' <td class="contentCells contentCells-icon"></td>';
                                                                     echo ' <td class="contentCells contentCells-icon">';
-                                                                    echo '  <a href="doceditor.php?fileID=' . urlencode($storeFile->name) . '&user=' . htmlentities($user) . '&action=fillForms&type=desktop" target="_blank">';
+                                                                    echo '  <a href="doceditor.php?fileID=' . urlencode($storeFile->name) . '&user=' . htmlentities($user) . $directUrlArg . '&action=fillForms&type=desktop" target="_blank">';
                                                                     echo '   <img src="css/images/mobile-fill-forms.svg" alt="Open in editor for filling in forms for mobile devices" title="Open in editor for filling in forms for mobile devices" /></a>';
                                                                     echo ' </td>';
                                                                     echo ' <td class="contentCells contentCells-icon"></td>';
                                                                     echo ' <td class="contentCells contentCells-icon"></td>';
                                                                     echo ' <td class="contentCells contentCells-icon"></td>';
                                                                     echo ' <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">';
-                                                                    echo '  <a href="doceditor.php?fileID=' . urlencode($storeFile->name) . '&user=' . htmlentities($user) . '&action=fillForms&type=desktop" target="_blank">';
+                                                                    echo '  <a href="doceditor.php?fileID=' . urlencode($storeFile->name) . '&user=' . htmlentities($user) . $directUrlArg . '&action=fillForms&type=desktop" target="_blank">';
                                                                     echo '   <img src="css/images/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms" /></a>';
                                                                     echo ' </td>';
                                                                 } else {
                                                                     echo '<td class="contentCells contentCells-shift contentCells-icon contentCellsEmpty" colspan="6"></td>';
                                                                 }
                                                                 echo ' <td class="contentCells contentCells-icon firstContentCellViewers">';
-                                                                echo '  <a href="doceditor.php?fileID='.urlencode($storeFile->name).'&user='.htmlentities($user).'&action=view&type=desktop" target="_blank">';
+                                                                echo '  <a href="doceditor.php?fileID='.urlencode($storeFile->name).'&user='.htmlentities($user) . $directUrlArg . '&action=view&type=desktop" target="_blank">';
                                                                 echo '   <img src="css/images/desktop.svg" alt="Open in viewer for full size screens" title="Open in viewer for full size screens" /></a>';
                                                                 echo ' </td>';
                                                                 echo ' <td class="contentCells contentCells-icon">';
-                                                                echo '  <a href="doceditor.php?fileID='.urlencode($storeFile->name).'&user='.htmlentities($user).'&action=view&type=mobile" target="_blank">';
+                                                                echo '  <a href="doceditor.php?fileID='.urlencode($storeFile->name).'&user='.htmlentities($user) . $directUrlArg . '&action=view&type=mobile" target="_blank">';
                                                                 echo '   <img src="css/images/mobile.svg" alt="Open in viewer for mobile devices" title="Open in viewer for mobile devices" /></a>';
                                                                 echo ' </td>';
                                                                 echo ' <td class="contentCells contentCells-icon contentCells-shift">';
-                                                                echo '  <a href="doceditor.php?fileID='.urlencode($storeFile->name).'&user='.htmlentities($user).'&action=embedded&type=embedded" target="_blank">';
+                                                                echo '  <a href="doceditor.php?fileID='.urlencode($storeFile->name).'&user='.htmlentities($user) . $directUrlArg . '&action=embedded&type=embedded" target="_blank">';
                                                                 echo '   <img src="css/images/embeded.svg" alt="Open in embedded mode" title="Open in embedded mode" /></a>';
                                                                 echo ' </td>';
                                                                 echo ' <td class="contentCells contentCells-icon contentCells-shift downloadContentCellShift">';

web/documentserver-example/php/js/jscript.js

@@ -16,11 +16,24 @@
  *
  */
 
+var directUrl;
+
 if (typeof jQuery != "undefined") {
     jq = jQuery.noConflict();
 
+    directUrl = getUrlVars()["directUrl"] == "true";
+
     mustReload = false;
 
+    if (directUrl)
+        jq("#directUrl").prop("checked", directUrl);
+    else
+        directUrl = jq("#directUrl").prop("checked");
+
+    jq("#directUrl").change(function() {
+        window.location = "?directUrl=" + jq(this).prop("checked");
+    });
+
     user = getUrlVars()["user"];
     if ("" != user && undefined != user)
         jq("#user").val(user);
@@ -234,7 +247,7 @@ if (typeof jQuery != "undefined") {
 
     jq(document).on("click", "#beginEdit:not(.disable)", function () {
         var fileId = encodeURIComponent(jq('#hiddenFileName').val());
-        var url = "doceditor.php?fileID=" + fileId + "&user=" + user;
+        var url = "doceditor.php?fileID=" + fileId + "&user=" + user + "&directUrl=" + directUrl;
         window.open(url, "_blank");
         jq('#hiddenFileName').val("");
         jq.unblockUI();
@@ -243,7 +256,7 @@ if (typeof jQuery != "undefined") {
 
     jq(document).on("click", "#beginView:not(.disable)", function () {
         var fileId = encodeURIComponent(jq('#hiddenFileName').val());
-        var url = "doceditor.php?action=view&fileID=" + fileId + "&user=" + user;
+        var url = "doceditor.php?action=view&fileID=" + fileId + "&user=" + user + "&directUrl=" + directUrl;
         window.open(url, "_blank");
         jq('#hiddenFileName').val("");
         jq.unblockUI();
@@ -252,7 +265,7 @@ if (typeof jQuery != "undefined") {
 
     jq(document).on("click", "#beginEmbedded:not(.disable)", function () {
         var fileId = encodeURIComponent(jq('#hiddenFileName').val());
-        var url = "doceditor.php?type=embedded&fileID=" + fileId + "&user=" + user;
+        var url = "doceditor.php?type=embedded&fileID=" + fileId + "&user=" + user + "&directUrl=" + directUrl;
 
         jq("#mainProgress").addClass("embedded");
         jq("#beginEmbedded").addClass("disable");
@@ -330,12 +343,12 @@ if (typeof jQuery != "undefined") {
                 if (hideTooltipTimeout != null) {
                     clearTimeout(hideTooltipTimeout);
                 }
-                jq(".info").on("touchend", function () {
+                jq("#info").on("touchend", function () {
                     showUserTooltip(true);
                 });
             }
     } else {
-        jq(".info").mouseover(function (event) {
+        jq("#info").mouseover(function (event) {
             if (fileList.length > 0) {
                 if (hideTooltipTimeout != null) {
                     clearTimeout(hideTooltipTimeout);
@@ -359,6 +372,20 @@ if (typeof jQuery != "undefined") {
             }, 500);
         });
     }
+
+    jq(".info-tooltip").mouseover(function (event) {
+        var target = event.target;
+        var id = target.dataset.id ? target.dataset.id : target.id;
+        var tooltip = target.dataset.tooltip;
+
+        jq("<div class='tooltip'>" + tooltip + "<div class='arrow'></div></div>").appendTo("body");
+
+        var top = jq("#" + id).offset().top + jq("#" + id).outerHeight() / 2 - jq("div.tooltip").outerHeight() / 2;
+        var left = jq("#" + id).offset().left + jq("#" + id).outerWidth() + 20;
+        jq("div.tooltip").css({"top": top, "left": left});
+    }).mouseout(function () {
+        jq("div.tooltip").remove();
+    });
 }
 
 function getUrlVars() {

web/documentserver-example/php/trackmanager.php

@@ -115,7 +115,8 @@ function processSave($data, $fileName, $userAddress) {
 
     $saved = 1;
 
-    if (!(($new_data = file_get_contents($downloadUri)) === FALSE)) {
+    if (!(($new_data = file_get_contents($downloadUri, false,
+            stream_context_create(["http"=>["timeout"=>5]]))) === FALSE)) {
         $storagePath = getStoragePath($newFileName, $userAddress);  // get the file path
         $histDir = getHistoryDir($storagePath);  // get the path to the history direction
         $verDir = getVersionDir($histDir, getFileVersion($histDir));  // get the path to the file version
@@ -125,7 +126,8 @@ function processSave($data, $fileName, $userAddress) {
         rename(getStoragePath($fileName, $userAddress), $verDir . DIRECTORY_SEPARATOR . "prev" . $curExt);  // get the path to the previous file version and rename the storage path with it
         file_put_contents($storagePath, $new_data, LOCK_EX);  // save file to the storage directory
 
-        if ($changesData = file_get_contents($data->changesurl)) {
+        if ($changesData = file_get_contents($data->changesurl, false,
+            stream_context_create(["http"=>["timeout"=>5]]))) {
             file_put_contents($verDir . DIRECTORY_SEPARATOR . "diff.zip", $changesData, LOCK_EX);  // save file changes to the diff.zip archive
         }
 
@@ -190,7 +192,8 @@ function processForceSave($data, $fileName, $userAddress) {
 
     $saved = 1;
 
-    if (!(($new_data = file_get_contents($downloadUri)) === FALSE)) {
+    if (!(($new_data = file_get_contents($downloadUri, false,
+            stream_context_create(["http"=>["timeout"=>5]]))) === FALSE)) {
         $baseNameWithoutExt = substr($fileName, 0, strlen($fileName) - strlen($curExt));
         $isSubmitForm = $data->forcesavetype == 3;  // SubmitForm
 

web/documentserver-example/php/users.php

@@ -76,6 +76,7 @@ $descr_user_0 = [
     "Can’t see anyone’s information",
     "Can't rename files from the editor",
     "Can't view chat",
+    "View file without collaboration",
 ];
 
 $users = [

web/documentserver-example/python/config.py

@@ -1,6 +1,6 @@
 import os
 
-VERSION = '1.3.0'
+VERSION = '1.4.0'
 
 FILE_SIZE_MAX = 5242880
 STORAGE_PATH = 'app_data'
@@ -55,11 +55,14 @@ EXT_DOCUMENT = [
 
 LANGUAGES = {
     'en': 'English',
+    'hy': 'Armenian',
     'az': 'Azerbaijani',
+    'eu': 'Basque',
     'be': 'Belarusian',
     'bg': 'Bulgarian',
     'ca': 'Catalan',
-    'zh': 'Chinese',
+    'zh' : 'Chinese (People\'s Republic of China)',
+    'zh-TW' : 'Chinese (Traditional, Taiwan)',
     'cs': 'Czech',
     'da': 'Danish',
     'nl': 'Dutch',
@@ -75,9 +78,11 @@ LANGUAGES = {
     'ko': 'Korean',
     'lv': 'Latvian',
     'lo': 'Lao',
+    'ms': 'Malay (Malaysia)',
     'nb': 'Norwegian',
     'pl': 'Polish',
-    'pt': 'Portuguese',
+    'pt' : 'Portuguese (Brazil)',
+    'pt-PT' : 'Portuguese (Portugal)',
     'ro': 'Romanian',
     'ru': 'Russian',
     'sk': 'Slovak',
@@ -86,7 +91,8 @@ LANGUAGES = {
     'sv': 'Swedish',
     'tr': 'Turkish',
     'uk': 'Ukrainian',
-    'vi': 'Vietnamese'
+    'vi': 'Vietnamese',
+    'aa-AA': 'Test Language'
 }
 
 if os.environ.get("EXAMPLE_DOMAIN"):  # generates a link for example domain

web/documentserver-example/python/readme.md

@@ -35,7 +35,7 @@ See the detailed guide to learn how to install Document Server [for Windows](htt
     ```
     pip install Django==3.1.3
     pip install requests==2.25.0
-    pip install pyjwt==2.3.0
+    pip install pyjwt==2.6.0
     pip install python-magic
     ```
 

web/documentserver-example/python/src/utils/docManager.py

@@ -118,10 +118,10 @@ def getCreateUrl(fileType, req):
     return f'{host}/create?fileType={fileType}'
 
 # get url to download a file
-def getDownloadUrl(filename, req):
-    host = getServerUrl(True, req)
-    curAdr = req.META['REMOTE_ADDR']
-    return f'{host}/download?fileName={filename}&userAddress={curAdr}'
+def getDownloadUrl(filename, req, isServerUrl = True):
+    host = getServerUrl(isServerUrl, req)
+    curAdr = f'&userAddress={req.META["REMOTE_ADDR"]}' if isServerUrl else ""
+    return f'{host}/download?fileName={filename}{curAdr}'
 
 # get root folder for the current file
 def getRootFolder(req):
@@ -211,7 +211,9 @@ def createFile(stream, path, req = None, meta = False):
 
 # create file response
 def createFileResponse(response, path, req, meta):
-    response.raise_for_status()
+    status_code = response.status_code
+    if status_code != 200:  # checking status code
+        raise RuntimeError('Document editing service returned status: %s' % status_code)
     with open(path, 'wb') as file:
         for chunk in response.iter_content(chunk_size=8192):
             file.write(chunk)
@@ -219,7 +221,7 @@ def createFileResponse(response, path, req, meta):
 
 # save file from the given url 
 def saveFileFromUri(uri, path, req = None, meta = False):
-    resp = requests.get(uri, stream=True, verify = config.DOC_SERV_VERIFY_PEER)
+    resp = requests.get(uri, stream=True, verify = config.DOC_SERV_VERIFY_PEER, timeout=5)
     createFileResponse(resp, path, req, meta)
     return
 

web/documentserver-example/python/src/utils/historyManager.py

@@ -135,10 +135,10 @@ def readFile(path):
         return stream.read()
 
 # get the url to the history file version with a given extension
-def getPublicHistUri(filename, ver, file, req):
-    host = docManager.getServerUrl(True, req)
-    curAdr = req.META['REMOTE_ADDR']
-    return f'{host}/downloadhistory?fileName={filename}&ver={ver}&file={file}&userAddress={curAdr}'
+def getPublicHistUri(filename, ver, file, req, isServerUrl=True):
+    host = docManager.getServerUrl(isServerUrl, req)
+    curAdr = f'&userAddress={req.META["REMOTE_ADDR"]}' if isServerUrl else ''
+    return f'{host}/downloadhistory?fileName={filename}&ver={ver}&file={file}{curAdr}'
 
 # get the meta data of the file
 def getMeta(storagePath):
@@ -152,7 +152,7 @@ def getMeta(storagePath):
     return None
 
 # get the document history of a given file
-def getHistoryObject(storagePath, filename, docKey, docUrl, req):
+def getHistoryObject(storagePath, filename, docKey, docUrl, isEnableDirectUrl, req):
     histDir = getHistoryDir(storagePath)
     version = getFileVersion(histDir)
     if version > 0: # if the file was modified (the file version is greater than 0)
@@ -184,6 +184,8 @@ def getHistoryObject(storagePath, filename, docKey, docUrl, req):
                         }
                     
                 dataObj['url'] = docUrl if i == version else getPublicHistUri(filename, i, "prev" + fileUtils.getFileExt(filename), req) # write file url to the data object
+                if isEnableDirectUrl:
+                    dataObj['directUrl'] = docManager.getDownloadUrl(filename, req, False) if i == version else getPublicHistUri(filename, i, "prev" + fileUtils.getFileExt(filename), req, False) # write file direct url to the data object
 
                 if i > 1: # check if the version number is greater than 1 (the file was modified)
                     changes = json.loads(readFile(getChangesHistoryPath(prevVerDir))) # get the path to the changes.json file 
@@ -196,6 +198,11 @@ def getHistoryObject(storagePath, filename, docKey, docUrl, req):
 
                     prev = histData[str(i - 2)] # get the history data from the previous file version
                     prevInfo = { # write key and url information about previous file version
+                        'fileType': prev['fileType'],
+                        'key': prev['key'],
+                        'url': prev['url'],
+                        'directUrl': prev['directUrl']
+                    } if isEnableDirectUrl else { # write key and url information about previous file version
                         'fileType': prev['fileType'],
                         'key': prev['key'],
                         'url': prev['url']

web/documentserver-example/python/src/utils/serviceConverter.py

@@ -58,7 +58,10 @@ def getConverterUri(docUri, fromExt, toExt, docKey, isAsync, filePass = None, la
         payload['token'] = jwtManager.encode(payload) # encode a payload object into a body token
         headers[jwtHeader] = f'Bearer {headerToken}' # add a header Authorization with a header token with Authorization prefix in it
 
-    response = requests.post(config.DOC_SERV_SITE_URL + config.DOC_SERV_CONVERTER_URL, json=payload, headers=headers, verify = config.DOC_SERV_VERIFY_PEER) # send the headers and body values to the converter and write the result to the response
+    response = requests.post(config.DOC_SERV_SITE_URL + config.DOC_SERV_CONVERTER_URL, json=payload, headers=headers, verify = config.DOC_SERV_VERIFY_PEER, timeout=5) # send the headers and body values to the converter and write the result to the response
+    status_code = response.status_code
+    if status_code != 200:  # checking status code
+        raise RuntimeError('Convertation service returned status: %s' % status_code)
     json = response.json()
 
     return getResponseUri(json)

web/documentserver-example/python/src/utils/users.py

@@ -82,6 +82,7 @@ descr_user_0 = [
     "Can’t see anyone’s information",
     "Can't rename files from the editor",
     "Can't view chat",
+    "View file without collaboration",
 ]
 
 USERS = [

web/documentserver-example/python/src/views/actions.py

@@ -171,11 +171,13 @@ def rename(request):
 # edit a file
 def edit(request):
     filename = fileUtils.getFileName(request.GET['filename'])
+    isEnableDirectUrl = request.GET['directUrl'].lower() in ("true")  if 'directUrl' in request.GET else False
 
     ext = fileUtils.getFileExt(filename)
 
     fileUri = docManager.getFileUri(filename, True, request)
     fileUriUser = docManager.getDownloadUrl(filename, request) + "&dmode=emb" if os.path.isabs(config.STORAGE_PATH) else docManager.getFileUri(filename, False, request)
+    directUrl = docManager.getDownloadUrl(filename, request, False)
     docKey = docManager.generateFileKey(filename, request)
     fileType = fileUtils.getFileType(filename)
     user = users.getUserFromReq(request)  # get user
@@ -233,6 +235,7 @@ def edit(request):
         'document': {
             'title': filename,
             'url': docManager.getDownloadUrl(filename, request),
+            'directUrl': directUrl if isEnableDirectUrl else "",
             'fileType': ext[1:],
             'key': docKey,
             'info': infObj,
@@ -257,6 +260,11 @@ def edit(request):
             'mode': mode,
             'lang': lang,
             'callbackUrl': docManager.getCallbackUrl(filename, request),  # absolute URL to the document storage service
+            'coEditing': {
+                            "mode": "strict", 
+                            "change": False
+                         } 
+                         if edMode == 'view' and user.id =='uid-0' else None,
             'createUrl' : createUrl if user.id !='uid-0' else None,
             'templates' : templates if user.templates else None,
             'user': {  # the user currently viewing or editing the document
@@ -265,9 +273,9 @@ def edit(request):
                 'group': user.group
             },
             'embedded': {  # the parameters for the embedded document type
-                'saveUrl': fileUriUser,  # the absolute URL that will allow the document to be saved onto the user personal computer
-                'embedUrl': fileUriUser,  # the absolute URL to the document serving as a source file for the document embedded into the web page
-                'shareUrl': fileUriUser,  # the absolute URL that will allow other users to share this document
+                'saveUrl': directUrl,  # the absolute URL that will allow the document to be saved onto the user personal computer
+                'embedUrl': directUrl,  # the absolute URL to the document serving as a source file for the document embedded into the web page
+                'shareUrl': directUrl,  # the absolute URL that will allow other users to share this document
                 'toolbarDocked': 'top'  # the place for the embedded viewer toolbar (top or bottom)
             },
             'customization': {  # the parameters for the editor interface
@@ -285,18 +293,30 @@ def edit(request):
 
     # an image which will be inserted into the document
     dataInsertImage = {
+        'fileType': 'png',
+        'url': docManager.getServerUrl(True, request) + 'static/images/logo.png',
+        'directUrl': docManager.getServerUrl(False, request) + 'static/images/logo.png'
+    } if isEnableDirectUrl else {
         'fileType': 'png',
         'url': docManager.getServerUrl(True, request) + 'static/images/logo.png'
     }
 
     # a document which will be compared with the current document
     dataCompareFile = {
+        'fileType': 'docx',
+        'url': docManager.getServerUrl(True, request) + 'static/sample.docx',
+        'directUrl': docManager.getServerUrl(False, request) + 'static/sample.docx'
+    } if isEnableDirectUrl else {
         'fileType': 'docx',
         'url': docManager.getServerUrl(True, request) + 'static/sample.docx'
     }
 
     # recipient data for mail merging
     dataMailMergeRecipients = {
+        'fileType': 'csv',
+        'url': docManager.getServerUrl(True, request) + 'csv',
+        'directUrl': docManager.getServerUrl(False, request) + 'csv'
+    } if isEnableDirectUrl else {
         'fileType': 'csv',
         'url': docManager.getServerUrl(True, request) + 'csv'
     }
@@ -310,7 +330,7 @@ def edit(request):
         dataCompareFile['token'] = jwtManager.encode(dataCompareFile)  # encode the dataCompareFile object into a token
         dataMailMergeRecipients['token'] = jwtManager.encode(dataMailMergeRecipients)  # encode the dataMailMergeRecipients object into a token
 
-    hist = historyManager.getHistoryObject(storagePath, filename, docKey, fileUri, request)  # get the document history
+    hist = historyManager.getHistoryObject(storagePath, filename, docKey, fileUri, isEnableDirectUrl, request)  # get the document history
 
     context = {  # the data that will be passed to the template
         'cfg': json.dumps(edConfig),  # the document config in json format
@@ -348,8 +368,8 @@ def track(request):
             trackManager.processForceSave(body, filename, usAddr)
 
     except Exception as e:
-        response.setdefault('error', 1)  # set the default error value as 1 (document key is missing or no document with such key could be found)
-        response.setdefault('message', e.args[0])
+        response.setdefault("error", 1)  # set the default error value as 1 (document key is missing or no document with such key could be found)
+        response.setdefault("message", str(e.args[0]))
 
     response.setdefault('error', 0)  # if no exceptions are raised, the default error value is 0 (no errors)
     # the response status is 200 if the changes are saved successfully; otherwise, it is equal to 500