Merge branch 'master' into release/v6.0.0

# Conflicts:
#	LICENSE.txt

.gitignore

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

3rd-Party.txt

@@ -28,3 +28,17 @@ Steve Matteson
 
 License:        Apache License, version 2.0
 
+
+6. requests - Requests is an elegant and simple HTTP library for Python
+
+License:        Apache License, version 2.0
+
+
+7. pyjwt - JSON Web Token implementation in Python
+
+License:        MIT
+
+
+8. django - Django is a high-level Python Web framework that encourages rapid development and clean, pragmatic design
+
+License:        BSD

LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.

Readme.md

@@ -1,5 +1,5 @@
 
-[![License](https://img.shields.io/badge/License-MIT-green.svg?style=flat)](https://opensource.org/licenses/MIT) ![Release](https://img.shields.io/badge/Release-v4.1.2-blue.svg?style=flat)
+[![License](https://img.shields.io/badge/License-MIT-green.svg?style=flat)](https://opensource.org/licenses/MIT) ![Release](https://img.shields.io/badge/Release-v6.0.0-blue.svg?style=flat)
 
 ## Document Server integration example
 
@@ -15,6 +15,34 @@ You should change `http://documentserver` to your server address in these files:
 
 More information on how to use these examples can be found here: [http://api.onlyoffice.com/editors/demopreview](http://api.onlyoffice.com/editors/demopreview "http://api.onlyoffice.com/editors/demopreview")
 
+## API methods for test examples
+
+The methods described below are available for all of the test examples.
+
+### POST `/upload`
+
+|                        |                                                              |
+| ---------------------- | ------------------------------------------------------------ |
+| **Summary**            | Upload file to test example via request                      |
+| **URL**                | /upload                                                      |
+| **Method**             | POST                                                         |
+| **Request<br>Headers** | `Content-Type: multipart/form-data`                          |
+| **Request<br>Body**    | `uploadedFile=@<filepath>`<br> `filepath` - file for uploading<br />Multipart body with the file binary contents |
+| **Response**           | **Code:** 200 OK <br />**Content on success:**<br /> `{ "filename": <filename>}`<br />**Content on error:**<br /> `{ "error": "Uploaded file not found"}` <br /> Or <br /> `{ "error": "File size is incorrect"}` |
+| **Sample**             | `curl -X POST -F uploadedFile=@filename.docx http://localhost/upload` |
+
+
+### DELETE `/file`
+
+|                    |                                                              |
+| ------------------ | ------------------------------------------------------------ |
+| **Summary**        | Delete one file or all files                     
+| **URL**            | /file                                                        |
+| **Method**         | DELETE                                                       |
+| ****URL Params**** | **Optional:**<br /> `filename=[string]` - file for deleting. <br /> *WARNING! Without this parameter, all files will be deleted* |
+| **Response**       | **Code:** 200 OK <br /> **Success:**<br /> `{"success":true}` |
+| **Sample**         | **Delete one file:**<br />`curl -X DELETE http://localhost/file?filename=filename.docx`<br />**Delete all files:**<br />`curl -X DELETE http://localhost/file`<br /> |
+
 ## Project Information
 
 Official website: [https://www.onlyoffice.com](https://www.onlyoffice.com/?utm_source=github&utm_medium=cpc&utm_campaign=GitHubIntegrationEx)

build/msbuild/zip.proj

@@ -16,6 +16,8 @@
     <DirPHP>$(RootDir)web\documentserver-example\php\</DirPHP>
     <NameRuby>$(To)Ruby Example</NameRuby>
     <DirRuby>$(RootDir)web\documentserver-example\ruby\</DirRuby>
+    <NamePython>$(To)Python Example</NamePython>
+    <DirPython>$(RootDir)web\documentserver-example\python\</DirPython>
   </PropertyGroup>
 
   <Target Name="Build">
@@ -56,6 +58,12 @@
     </ItemGroup>
     <Copy SourceFiles="@(ZipFilesRuby)" DestinationFiles="@(ZipFilesRuby->'$(NameRuby)\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Zip Files="$(NameRuby)" WorkingDirectory="$(To)" ZipFileName="$(NameRuby).zip" />
+
+    <ItemGroup>
+      <ZipFilesPython Include="$(DirPython)**" />
+    </ItemGroup>
+    <Copy SourceFiles="@(ZipFilesPython)" DestinationFiles="@(ZipFilesPython->'$(NamePython)\%(RecursiveDir)%(Filename)%(Extension)')" />
+    <Zip Files="$(NamePython)" WorkingDirectory="$(To)" ZipFileName="$(NamePython).zip" />
   </Target>
 
 </Project>

licences/3rd-Party.txt

@@ -25,3 +25,18 @@ License:        MIT
 5. Prime JWT - Prime JWT is intended to be fast and easy to use. Prime JWT has a single external dependency on Jackson.
 
 License:        Apache-2.0
+
+
+6. requests - Requests is an elegant and simple HTTP library for Python
+
+License:        Apache License, version 2.0
+
+
+7. pyjwt - JSON Web Token implementation in Python
+
+License:        MIT
+
+
+8. django - Django is a high-level Python Web framework that encourages rapid development and clean, pragmatic design
+
+License:        BSD

licences/django.license

@@ -0,0 +1,27 @@
+Copyright (c) Django Software Foundation and individual contributors.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    3. Neither the name of Django nor the names of its contributors may be used
+       to endorse or promote products derived from this software without
+       specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

licences/pyjwt.license

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

licences/requests.license

@@ -0,0 +1,13 @@
+Copyright 2019 Kenneth Reitz
+
+   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
+
+       https://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.

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *
@@ -52,7 +52,7 @@ namespace OnlineEditorsExampleMVC.Controllers
         public ActionResult Sample(string fileExt, bool? sample)
         {
             var fileName = DocManagerHelper.CreateDemo(fileExt, sample ?? false);
-            DocManagerHelper.CreateMeta(fileName, Request.Cookies["uid"]?.Value, Request.Cookies["uname"]?.Value);
+            DocManagerHelper.CreateMeta(fileName, Request.Cookies.GetOrDefault("uid", ""), Request.Cookies.GetOrDefault("uname", ""));
             Response.Redirect(Url.Action("Editor", "Home", new { fileName = fileName }));
             return null;
         }

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

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

@@ -0,0 +1,21 @@
+using System.Web;
+
+namespace OnlineEditorsExampleMVC.Helpers
+{
+    public static class Utils
+    {
+        public static string GetOrDefault(this HttpRequest request, string header, string def)
+        {
+            var value = request[header];
+            if (value != null) return value;
+            return def;
+        }
+
+        public static string GetOrDefault(this HttpCookieCollection cookies, string cookie, string def)
+        {
+            var cook = cookies[cookie];
+            if (cook != null && !string.IsNullOrEmpty(cook.Value)) return cook.Value;
+            return def;
+        }
+    }
+}

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

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

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *
@@ -64,12 +64,17 @@ namespace OnlineEditorsExampleMVC.Models
 
         public string GetDocConfig(HttpRequest request, UrlHelper url)
         {
+            var jss = new JavaScriptSerializer();
+
             var ext = Path.GetExtension(FileName);
             var editorsMode = Mode ?? "edit";
 
             var canEdit = DocManagerHelper.EditedExts.Contains(ext);
             var mode = canEdit && editorsMode != "view" ? "edit" : "view";
 
+            var actionLink = request.GetOrDefault("actionLink", null);
+            var actionData = string.IsNullOrEmpty(actionLink) ? null : jss.DeserializeObject(actionLink);
+
             var config = new Dictionary<string, object>
                 {
                     { "type", Type ?? "desktop" },
@@ -91,11 +96,12 @@ namespace OnlineEditorsExampleMVC.Models
                                 {
                                     "permissions", new Dictionary<string, object>
                                         {
-                                            { "comment", editorsMode != "view" && editorsMode != "fillForms" && editorsMode != "embedded" },
+                                            { "comment", editorsMode != "view" && editorsMode != "fillForms" && editorsMode != "embedded" && editorsMode != "blockcontent" },
                                             { "download", true },
-                                            { "edit", canEdit && (editorsMode == "edit" || editorsMode == "filter") },
-                                            { "fillForms", editorsMode != "view" && editorsMode != "comment" && editorsMode != "embedded" },
+                                            { "edit", canEdit && (editorsMode == "edit" || editorsMode == "filter") || editorsMode == "blockcontent" },
+                                            { "fillForms", editorsMode != "view" && editorsMode != "comment" && editorsMode != "embedded" && editorsMode != "blockcontent" },
                                             { "modifyFilter", editorsMode != "filter" },
+                                            { "modifyContentControl", editorsMode != "blockcontent" },
                                             { "review", editorsMode == "edit" || editorsMode == "review" }
                                         }
                                 }
@@ -104,14 +110,15 @@ namespace OnlineEditorsExampleMVC.Models
                     {
                         "editorConfig", new Dictionary<string, object>
                             {
+                                { "actionLink", actionData },
                                 { "mode", mode },
-                                { "lang", request.Cookies["ulang"]?.Value ?? "en" },
+                                { "lang", request.Cookies.GetOrDefault("ulang", "en") },
                                 { "callbackUrl", CallbackUrl },
                                 {
                                     "user", new Dictionary<string, object>
                                         {
-                                            { "id", request.Cookies["uid"]?.Value ?? "uid-1" },
-                                            { "name", request.Cookies["uname"]?.Value ?? "John Smith" }
+                                            { "id", request.Cookies.GetOrDefault("uid", "uid-1") },
+                                            { "name", request.Cookies.GetOrDefault("uname", "John Smith") }
                                         }
                                 },
                                 {
@@ -146,7 +153,7 @@ namespace OnlineEditorsExampleMVC.Models
                 config.Add("token", token);
             }
 
-            return new JavaScriptSerializer().Serialize(config);
+            return jss.Serialize(config);
         }
 
         public void GetHistory(out string history, out string historyData)

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

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

@@ -137,6 +137,7 @@
     <Compile Include="Helpers\DocManagerHelper.cs" />
     <Compile Include="Helpers\DocumentConverter.cs" />
     <Compile Include="Helpers\JwtManager.cs" />
+    <Compile Include="Helpers\Utils.cs" />
     <Compile Include="Models\FileModel.cs" />
     <Compile Include="Models\FileUtility.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -147,6 +148,7 @@
   <ItemGroup>
     <Content Include="Content\editor.css" />
     <Content Include="Content\images\alert.png" />
+    <Content Include="Content\images\block-content-24.png" />
     <Content Include="Content\images\close.png" />
     <Content Include="Content\images\comment-24.png" />
     <Content Include="Content\images\corner.png" />

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

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

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

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

@@ -1,6 +1,6 @@
 <!--*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *
@@ -35,7 +35,9 @@
 <head runat="server">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no, minimal-ui" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="mobile-web-app-capable" content="yes" />
     <link rel="icon" href="~/favicon.ico" type="image/x-icon" />
     <title><%= Model.FileName + " - ONLYOFFICE" %></title>
     
@@ -81,17 +83,40 @@
             location.reload(true);
         };
 
-        var config = {
-            width: "100%",
-            height: "100%",
-
-            events: {
-                'onAppReady': onAppReady,
-                'onDocumentStateChange': onDocumentStateChange,
-                'onRequestEditRights': onRequestEditRights,
-                'onError': onError,
-                'onOutdatedVersion': onOutdatedVersion,
+        var replaceActionLink = function(href, linkParam) {
+            var link;
+            var actionIndex = href.indexOf("&actionLink=");
+            if (actionIndex != -1) {
+                var endIndex = href.indexOf("&", actionIndex + "&actionLink=".length);
+                if (endIndex != -1) {
+                    link = href.substring(0, actionIndex) + href.substring(endIndex) + "&actionLink=" + encodeURIComponent(linkParam);
+                } else {
+                    link = href.substring(0, actionIndex) + "&actionLink=" + encodeURIComponent(linkParam);
+                }
+            } else {
+                link = href + "&actionLink=" + encodeURIComponent(linkParam);
             }
+            return link;
+        }
+
+        var onMakeActionLink = function (event) {
+            var actionData = event.data;
+            var linkParam = JSON.stringify(actionData);
+            docEditor.setActionLink(replaceActionLink(location.href, linkParam));
+        };
+
+        var config = <%= Model.GetDocConfig(Request, Url) %>;
+
+        config.width = "100%";
+        config.height = "100%";
+
+        config.events = {
+            'onAppReady': onAppReady,
+            'onDocumentStateChange': onDocumentStateChange,
+            'onRequestEditRights': onRequestEditRights,
+            'onError': onError,
+            'onOutdatedVersion': onOutdatedVersion,
+            "onMakeActionLink": onMakeActionLink,
         };
 
         <% string hist, histData; %>
@@ -112,7 +137,7 @@
         <% } %>
 
         var сonnectEditor = function () {
-            docEditor = new DocsAPI.DocEditor("iframeEditor", Object.assign(config, <%= Model.GetDocConfig(Request, Url) %>));
+            docEditor = new DocsAPI.DocEditor("iframeEditor", config);
         };
 
         if (window.addEventListener) {

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

@@ -1,6 +1,6 @@
 <!--*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *
@@ -59,7 +59,7 @@
                     <td width="30%" valign="middle">
                         <span class="select-user">Username:</span>
                         <select class="select-user" id="user">
-                            <option value="uid-1">Jonn Smith</option>
+                            <option value="uid-1">John Smith</option>
                             <option value="uid-2">Mark Pottato</option>
                             <option value="uid-3">Hamish Mitchell</option>
                         </select>
@@ -139,7 +139,7 @@
                     <thead>
                         <tr class="tableHeader">
                             <td class="tableHeaderCell tableHeaderCellFileName">Filename</td>
-                            <td colspan="5" class="tableHeaderCell contentCells-shift">Editors</td>
+                            <td colspan="6" class="tableHeaderCell contentCells-shift">Editors</td>
                             <td colspan="3" class="tableHeaderCell">Viewers</td>
                         </tr>
                     </thead>
@@ -189,13 +189,20 @@
                                         <img src="content/images/comment-24.png" alt="Open in editor for comment" title="Open in editor for comment"/>
                                     </a>
                                 </td>
-                                <td class="contentCells contentCells-shift contentCells-icon">
+                                <td class="contentCells contentCells-icon">
                                     <% if (docType == "text") { %>
                                         <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile, editorsType = "desktop", editorsMode = "fillForms" }) %>" target="_blank">
                                             <img src="content/images/fill-forms-24.png" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
                                         </a>
                                     <% } %>
                                 </td>
+                                <td class="contentCells contentCells-shift contentCells-icon">
+                                    <% if (docType == "text") { %>
+                                        <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile, editorsType = "desktop", editorsMode = "blockcontent" }) %>" target="_blank">
+                                            <img src="content/images/block-content-24.png" alt="Open in editor without content control modification" title="Open in editor without content control modification"/>
+                                        </a>
+                                    <% } %>
+                                </td>
 
                                 <td class="contentCells contentCells-icon">
                                     <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile, editorsType = "desktop", editorsMode = "view" }) %>" target="_blank">

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *
@@ -95,7 +95,7 @@ namespace OnlineEditorsExampleMVC
 
                 var savedFileName = DocManagerHelper.StoragePath(fileName);
                 httpPostedFile.SaveAs(savedFileName);
-                DocManagerHelper.CreateMeta(fileName, context.Request.Cookies["uid"]?.Value, context.Request.Cookies["uname"]?.Value);
+                DocManagerHelper.CreateMeta(fileName, context.Request.Cookies.GetOrDefault("uid", ""), context.Request.Cookies.GetOrDefault("uname", ""));
 
                 context.Response.Write("{ \"filename\": \"" + fileName + "\"}");
             }
@@ -151,7 +151,7 @@ namespace OnlineEditorsExampleMVC
 
                     Remove(fileName);
                     fileName = correctName;
-                    DocManagerHelper.CreateMeta(fileName, context.Request.Cookies["uid"]?.Value, context.Request.Cookies["uname"]?.Value);
+                    DocManagerHelper.CreateMeta(fileName, context.Request.Cookies.GetOrDefault("uid", ""), context.Request.Cookies.GetOrDefault("uname", ""));
                 }
 
                 context.Response.Write("{ \"filename\" : \"" + fileName + "\"}");

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

web/documentserver-example/csharp/Default.aspx

@@ -54,7 +54,7 @@
                         <td width="30%" valign="middle">
                             <span class="select-user">Username:</span>
                             <select class="select-user" id="user">
-                                <option value="uid-1">Jonn Smith</option>
+                                <option value="uid-1">John Smith</option>
                                 <option value="uid-2">Mark Pottato</option>
                                 <option value="uid-3">Hamish Mitchell</option>
                             </select>
@@ -134,7 +134,7 @@
                         <thead>
                             <tr class="tableHeader">
                                 <td class="tableHeaderCell tableHeaderCellFileName">Filename</td>
-                                <td colspan="5" class="tableHeaderCell contentCells-shift">Editors</td>
+                                <td colspan="6" class="tableHeaderCell contentCells-shift">Editors</td>
                                 <td colspan="3" class="tableHeaderCell">Viewers</td>
                             </tr>
                         </thead>
@@ -184,13 +184,20 @@
                                             <img src="app_themes/images/comment-24.png" alt="Open in editor for comment" title="Open in editor for comment"/>
                                         </a>
                                     </td>
-                                    <td class="contentCells contentCells-shift contentCells-icon">
+                                    <td class="contentCells contentCells-icon">
                                         <% if (docType == "text") { %>
                                             <a href="<%= editUrl + "&editorsType=desktop&editorsMode=fillForms" %>" target="_blank">
                                                 <img src="app_themes/images/fill-forms-24.png" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
                                             </a>
                                         <% } %>
                                     </td>
+                                    <td class="contentCells contentCells-icon contentCells-shift">
+                                        <% if (docType == "text") { %>
+                                            <a href="<%= editUrl + "&editorsType=desktop&editorsMode=blockcontent" %>" target="_blank">
+                                                <img src="app_themes/images/block-content-24.png" alt="Open in editor without content control modification" title="Open in editor without content control modification"/>
+                                            </a>
+                                        <% } %>
+                                    </td>
 
                                     <td class="contentCells contentCells-icon">
                                         <a href="<%= editUrl + "&editorsType=desktop&editorsMode=view" %>" target="_blank">

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *
@@ -241,8 +241,8 @@ namespace OnlineEditorsExample
             Directory.CreateDirectory(histDir);
             File.WriteAllText(Path.Combine(histDir, "createdInfo.json"), new JavaScriptSerializer().Serialize(new Dictionary<string, object> {
                 { "created", DateTime.Now.ToString() },
-                { "id", context.Request.Cookies["uid"]?.Value ?? "uid-1" },
-                { "name", context.Request.Cookies["uname"]?.Value ?? "John Smith" }
+                { "id", context.Request.Cookies.GetOrDefault("uid", "uid-1") },
+                { "name", context.Request.Cookies.GetOrDefault("uname", "John Smith") }
             }));
 
             return _fileName;
@@ -288,8 +288,8 @@ namespace OnlineEditorsExample
                 Directory.CreateDirectory(histDir);
                 File.WriteAllText(Path.Combine(histDir, "createdInfo.json"), new JavaScriptSerializer().Serialize(new Dictionary<string, object> {
                     { "created", DateTime.Now.ToString() },
-                    { "id", request.Cookies["uid"]?.Value ?? "uid-1" },
-                    { "name", request.Cookies["uname"]?.Value ?? "John Smith" }
+                    { "id", request.Cookies.GetOrDefault("uid", "uid-1") },
+                    { "name", request.Cookies.GetOrDefault("uname", "John Smith") }
                 }));
             }
             catch (Exception)
@@ -354,8 +354,8 @@ namespace OnlineEditorsExample
                 Directory.CreateDirectory(histDir);
                 File.WriteAllText(Path.Combine(histDir, "createdInfo.json"), new JavaScriptSerializer().Serialize(new Dictionary<string, object> {
                     { "created", DateTime.Now.ToString() },
-                    { "id", context.Request.Cookies["uid"]?.Value ?? "uid-1" },
-                    { "name", context.Request.Cookies["uname"]?.Value ?? "John Smith" }
+                    { "id", context.Request.Cookies.GetOrDefault("uid", "uid-1") },
+                    { "name", context.Request.Cookies.GetOrDefault("uname", "John Smith") }
                 }));
             }
 

web/documentserver-example/csharp/DocEditor.aspx

@@ -8,6 +8,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no, minimal-ui" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="mobile-web-app-capable" content="yes" />
     <link rel="icon" href="~/favicon.ico" type="image/x-icon" />
     <title>ONLYOFFICE</title>
 
@@ -61,7 +64,7 @@
         };
 
         var onRequestEditRights = function () {
-            location.href = location.href.replace(RegExp("action=view\&?", "i"), "");
+            location.href = location.href.replace(RegExp("editorsMode=view\&?", "i"), "");
         };
 
         var onError = function (event) {
@@ -73,17 +76,40 @@
             location.reload(true);
         };
 
-        var config = {
-            width: "100%",
-            height: "100%",
-
-            events: {
-                'onAppReady': onAppReady,
-                'onDocumentStateChange': onDocumentStateChange,
-                'onRequestEditRights': onRequestEditRights,
-                'onError': onError,
-                'onOutdatedVersion': onOutdatedVersion,
+        var replaceActionLink = function(href, linkParam) {
+            var link;
+            var actionIndex = href.indexOf("&actionLink=");
+            if (actionIndex != -1) {
+                var endIndex = href.indexOf("&", actionIndex + "&actionLink=".length);
+                if (endIndex != -1) {
+                    link = href.substring(0, actionIndex) + href.substring(endIndex) + "&actionLink=" + encodeURIComponent(linkParam);
+                } else {
+                    link = href.substring(0, actionIndex) + "&actionLink=" + encodeURIComponent(linkParam);
+                }
+            } else {
+                link = href + "&actionLink=" + encodeURIComponent(linkParam);
             }
+            return link;
+        }
+
+        var onMakeActionLink = function (event) {
+            var actionData = event.data;
+            var linkParam = JSON.stringify(actionData);
+            docEditor.setActionLink(replaceActionLink(location.href, linkParam));
+        };
+
+        var config = <%= DocConfig %>;
+
+        config.width = "100%";
+        config.height = "100%";
+
+        config.events = {
+            'onAppReady': onAppReady,
+            'onDocumentStateChange': onDocumentStateChange,
+            'onRequestEditRights': onRequestEditRights,
+            'onError': onError,
+            'onOutdatedVersion': onOutdatedVersion,
+            'onMakeActionLink': onMakeActionLink,
         };
 
         <% if (!string.IsNullOrEmpty(History) && !string.IsNullOrEmpty(HistoryData))
@@ -102,7 +128,7 @@
         <% } %>
 
         var сonnectEditor = function () {
-            docEditor = new DocsAPI.DocEditor("iframeEditor", Object.assign(config, <%= DocConfig %>));
+            docEditor = new DocsAPI.DocEditor("iframeEditor", config);
         };
 
         if (window.addEventListener) {

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *
@@ -101,14 +101,19 @@ namespace OnlineEditorsExample
 
             var ext = Path.GetExtension(FileName);
 
-            var editorsMode = Request["editorsMode"] ?? "edit";
+            var editorsMode = Request.GetOrDefault("editorsMode", "edit");
 
             var canEdit = _Default.EditedExts.Contains(ext);
             var mode = canEdit && editorsMode != "view" ? "edit" : "view";
 
+            var jss = new JavaScriptSerializer();
+
+            var actionLink = Request.GetOrDefault("actionLink", null);
+            var actionData = string.IsNullOrEmpty(actionLink) ? null : jss.DeserializeObject(actionLink);
+
             var config = new Dictionary<string, object>
                 {
-                    { "type", Request["editorsType"] ?? "desktop" },
+                    { "type", Request.GetOrDefault("editorsType", "desktop") },
                     { "documentType", _Default.DocumentType(FileName) },
                     {
                         "document", new Dictionary<string, object>
@@ -127,11 +132,12 @@ namespace OnlineEditorsExample
                                 {
                                     "permissions", new Dictionary<string, object>
                                         {
-                                            { "comment", editorsMode != "view" && editorsMode != "fillForms" && editorsMode != "embedded" },
+                                            { "comment", editorsMode != "view" && editorsMode != "fillForms" && editorsMode != "embedded" && editorsMode != "blockcontent"},
                                             { "download", true },
-                                            { "edit", canEdit && (editorsMode == "edit" || editorsMode == "filter") },
-                                            { "fillForms", editorsMode != "view" && editorsMode != "comment" && editorsMode != "embedded" },
+                                            { "edit", canEdit && (editorsMode == "edit" || editorsMode == "filter") || editorsMode == "blockcontent" },
+                                            { "fillForms", editorsMode != "view" && editorsMode != "comment" && editorsMode != "embedded" && editorsMode != "blockcontent" },
                                             { "modifyFilter", editorsMode != "filter" },
+                                            { "modifyContentControl", editorsMode != "blockcontent" },
                                             { "review", editorsMode == "edit" || editorsMode == "review" }
                                         }
                                 }
@@ -140,14 +146,15 @@ namespace OnlineEditorsExample
                     {
                         "editorConfig", new Dictionary<string, object>
                             {
+                                { "actionLink", actionData },
                                 { "mode", mode },
-                                { "lang", Request.Cookies["ulang"]?.Value ?? "en" },
+                                { "lang", Request.Cookies.GetOrDefault("ulang", "en") },
                                 { "callbackUrl", CallbackUrl },
                                 {
                                     "user", new Dictionary<string, object>
                                         {
-                                            { "id", Request.Cookies["uid"]?.Value ?? "uid-1" },
-                                            { "name", Request.Cookies["uname"]?.Value ?? "John Smith" }
+                                            { "id", Request.Cookies.GetOrDefault("uid", "uid-1") },
+                                            { "name", Request.Cookies.GetOrDefault("uname", "John Smith") }
                                         }
                                 },
                                 {
@@ -182,13 +189,13 @@ namespace OnlineEditorsExample
                 config.Add("token", token);
             }
 
-            var jss = new JavaScriptSerializer();
-
             DocConfig = jss.Serialize(config);
 
             try
             {
-                GetHistory(out var hist, out var histData);
+                Dictionary<string, object> hist;
+                Dictionary<string, object> histData;
+                GetHistory(out hist, out histData);
                 if (hist != null && histData != null)
                 {
                     History = jss.Serialize(hist);
@@ -304,8 +311,8 @@ namespace OnlineEditorsExample
             Directory.CreateDirectory(histDir);
             File.WriteAllText(Path.Combine(histDir, "createdInfo.json"), new JavaScriptSerializer().Serialize(new Dictionary<string, object> {
                 { "created", DateTime.Now.ToString() },
-                { "id", request.Cookies["uid"]?.Value ?? "uid-1" },
-                { "name", request.Cookies["uname"]?.Value ?? "John Smith" }
+                { "id", request.Cookies.GetOrDefault("uid", "uid-1") },
+                { "name", request.Cookies.GetOrDefault("uname", "John Smith") }
             }));
         }
     }

web/documentserver-example/csharp/DocumentConverter.cs

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

web/documentserver-example/csharp/JwtManager.cs

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

web/documentserver-example/csharp/LICENSE.txt

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

web/documentserver-example/csharp/OnlineEditorsExample.csproj

@@ -52,6 +52,7 @@
     <Reference Include="System.Web.Services" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="App_Themes\images\block-content-24.png" />
     <Content Include="App_Themes\images\comment-24.png" />
     <Content Include="App_Themes\images\delete-24.png" />
     <Content Include="App_Themes\images\desktop-24.png" />
@@ -91,6 +92,7 @@
     <Compile Include="Default.aspx.designer.cs">
       <DependentUpon>Default.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Utils.cs" />
     <Compile Include="WebEditor.ashx.cs">
       <DependentUpon>WebEditor.ashx</DependentUpon>
     </Compile>

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

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

web/documentserver-example/csharp/Utils.cs

@@ -0,0 +1,21 @@
+using System.Web;
+
+namespace OnlineEditorsExample
+{
+    public static class Utils
+    {
+        public static string GetOrDefault(this HttpRequest request, string header, string def)
+        {
+            var value = request[header];
+            if (value != null) return value;
+            return def;
+        }
+
+        public static string GetOrDefault(this HttpCookieCollection cookies, string cookie, string def)
+        {
+            var cook = cookies[cookie];
+            if (cook != null && !string.IsNullOrEmpty(cook.Value)) return cook.Value;
+            return def;
+        }
+    }
+}

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

web/documentserver-example/java/LICENSE.txt

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

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *
@@ -69,7 +69,7 @@ public class EditorServlet extends HttpServlet
             }
         }
 
-        FileModel file = new FileModel(fileName, cm.getCookie("ulang"), cm.getCookie("uid"), cm.getCookie("uname"));
+        FileModel file = new FileModel(fileName, cm.getCookie("ulang"), cm.getCookie("uid"), cm.getCookie("uname"), request.getParameter("actionLink"));
         file.changeType(request.getParameter("mode"), request.getParameter("type"));
 
         if (DocumentManager.TokenEnabled())

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *
@@ -272,14 +272,21 @@ public class IndexServlet extends HttpServlet
             String token = (String) jsonObj.get("token");
 
             if (token == null) {
-                String header = (String) request.getHeader(DocumentJwtHeader == "" ? "Authorization" : DocumentJwtHeader);
-                token = header.startsWith("Bearer ") ? header.substring(7) : header;
+                String header = (String) request.getHeader(DocumentJwtHeader == null || DocumentJwtHeader.isEmpty() ? "Authorization" : DocumentJwtHeader);
+                if (header != null && !header.isEmpty()) {
+                    token = header.startsWith("Bearer ") ? header.substring(7) : header;
+                }
+            }
+
+            if (token == null || token.isEmpty()) {
+                writer.write("{\"error\":1,\"message\":\"JWT expected\"}");
+                return;
             }
 
             JWT jwt = DocumentManager.ReadToken(token);
             if (jwt == null)
             {
-                writer.write("JWT.parse error");
+                writer.write("{\"error\":1,\"message\":\"JWT validation failed\"}");
                 return;
             }
 
@@ -291,7 +298,7 @@ public class IndexServlet extends HttpServlet
                     jwt.claims = payload;
                 }
                 catch (Exception ex) {
-                    writer.write("Wrong payload");
+                    writer.write("{\"error\":1,\"message\":\"Wrong payload\"}");
                     return;
                 }
             }

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *
@@ -38,6 +38,7 @@ import helpers.DocumentManager;
 import helpers.ServiceConverter;
 import helpers.FileUtility;
 import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
@@ -52,7 +53,7 @@ public class FileModel
     public EditorConfig editorConfig;
     public String token;
 
-    public FileModel(String fileName, String lang, String uid, String uname)
+    public FileModel(String fileName, String lang, String uid, String uname, String actionData)
     {
         if (fileName == null) fileName = "";
         fileName = fileName.trim();
@@ -65,7 +66,7 @@ public class FileModel
         document.fileType = FileUtility.GetFileExtension(fileName).replace(".", "");
         document.key = ServiceConverter.GenerateRevisionId(DocumentManager.CurUserHostAddress(null) + "/" + fileName + "/" + Long.toString(new File(DocumentManager.StoragePath(fileName, null)).lastModified()));
 
-        editorConfig = new EditorConfig();
+        editorConfig = new EditorConfig(actionData);
         editorConfig.callbackUrl = DocumentManager.GetCallback(fileName);
         if (lang != null) editorConfig.lang = lang;
 
@@ -210,21 +211,24 @@ public class FileModel
         public Boolean edit;
         public Boolean fillForms;
         public Boolean modifyFilter;
+        public Boolean modifyContentControl;
         public Boolean review;
 
         public Permissions(String mode, String type, Boolean canEdit)
         {
-            comment = !mode.equals("view") && !mode.equals("fillForms") && !mode.equals("embedded");
+            comment = !mode.equals("view") && !mode.equals("fillForms") && !mode.equals("embedded") && !mode.equals("blockcontent");
             download = true;
-            edit = canEdit && (mode.equals("edit") || mode.equals("filter"));
-            fillForms = !mode.equals("view") && !mode.equals("comment") && !mode.equals("embedded");
+            edit = canEdit && (mode.equals("edit") || mode.equals("filter") || mode.equals("blockcontent"));
+            fillForms = !mode.equals("view") && !mode.equals("comment") && !mode.equals("embedded") && !mode.equals("blockcontent");
             modifyFilter = !mode.equals("filter");
+            modifyContentControl = !mode.equals("blockcontent");
             review = mode.equals("edit") || mode.equals("review");
         }
     }
 
     public class EditorConfig
     {
+        public HashMap<String, Object> actionLink = null;
         public String mode = "edit";
         public String callbackUrl;
         public String lang = "en";
@@ -232,8 +236,12 @@ public class FileModel
         public Customization customization;
         public Embedded embedded;
 
-        public EditorConfig()
+        public EditorConfig(String actionData)
         {
+            if (actionData != null) {
+                Gson gson = new Gson();
+                actionLink = gson.fromJson(actionData, new TypeToken<HashMap<String, Object>>() { }.getType());
+            }
             user = new User();
             customization = new Customization();
         }

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

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

@@ -1,6 +1,6 @@
 <!--*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *
@@ -31,6 +31,9 @@
 <html>
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no, minimal-ui" />
+        <meta name="apple-mobile-web-app-capable" content="yes" />
+        <meta name="mobile-web-app-capable" content="yes" />
         <title>ONLYOFFICE</title>
         <link rel="icon" href="favicon.ico" type="image/x-icon" />
         <link rel="stylesheet" type="text/css" href="css/editor.css" />
@@ -70,6 +73,28 @@
             location.reload(true);
         };
 
+        var replaceActionLink = function(href, linkParam) {
+            var link;
+            var actionIndex = href.indexOf("&actionLink=");
+            if (actionIndex != -1) {
+                var endIndex = href.indexOf("&", actionIndex + "&actionLink=".length);
+                if (endIndex != -1) {
+                    link = href.substring(0, actionIndex) + href.substring(endIndex) + "&actionLink=" + encodeURIComponent(linkParam);
+                } else {
+                    link = href.substring(0, actionIndex) + "&actionLink=" + encodeURIComponent(linkParam);
+                }
+            } else {
+                link = href + "&actionLink=" + encodeURIComponent(linkParam);
+            }
+            return link;
+        }
+
+        var onMakeActionLink = function (event) {
+            var actionData = event.data;
+            var linkParam = JSON.stringify(actionData);
+            docEditor.setActionLink(replaceActionLink(location.href, linkParam));
+        };
+
         var config = JSON.parse('<%= FileModel.Serialize(Model) %>');
         config.width = "100%";
         config.height = "100%";
@@ -79,6 +104,7 @@
             'onRequestEditRights': onRequestEditRights,
             "onError": onError,
             "onOutdatedVersion": onOutdatedVersion,
+            "onMakeActionLink": onMakeActionLink,
         };
 
         <%

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

@@ -1,6 +1,6 @@
 <!--*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *
@@ -58,7 +58,7 @@
                         <td width="30%" valign="middle">
                             <span class="select-user">Username:</span>
                             <select class="select-user" id="user">
-                                <option value="uid-1">Jonn Smith</option>
+                                <option value="uid-1">John Smith</option>
                                 <option value="uid-2">Mark Pottato</option>
                                 <option value="uid-3">Hamish Mitchell</option>
                             </select>
@@ -139,7 +139,7 @@
                             <thead>
                                 <tr class="tableHeader">
                                     <td class="tableHeaderCell tableHeaderCellFileName">Filename</td>
-                                    <td colspan="5" class="tableHeaderCell contentCells-shift">Editors</td>
+                                    <td colspan="6" class="tableHeaderCell contentCells-shift">Editors</td>
                                     <td colspan="3" class="tableHeaderCell">Viewers</td>
                                 </tr>
                             </thead>
@@ -185,13 +185,20 @@
                                                 <img src="css/img/comment-24.png" alt="Open in editor for comment" title="Open in editor for comment"/>
                                             </a>
                                         </td>
-                                        <td class="contentCells contentCells-shift contentCells-icon">
+                                        <td class="contentCells contentCells-icon">
                                             <% if (docType.equals("text")) { %>
                                                 <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8") %>&type=desktop&mode=fillForms" target="_blank">
                                                     <img src="css/img/fill-forms-24.png" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
                                                 </a>
                                             <% } %>
                                         </td>
+                                        <td class="contentCells contentCells-shift contentCells-icon">
+                                            <% if (docType.equals("text")) { %>
+                                                <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8") %>&type=desktop&mode=blockcontent" target="_blank">
+                                                    <img src="css/img/block-content-24.png" alt="Open in editor without content control modification" title="Open in editor without content control modification"/>
+                                                </a>
+                                            <% } %>
+                                        </td>
 
                                         <td class="contentCells contentCells-icon">
                                             <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8") %>&type=desktop&mode=view" target="_blank">

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

web/documentserver-example/js/LICENSE.txt

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

web/documentserver-example/js/OnlineEditorsExampleJS.html

@@ -1,6 +1,6 @@
 <!--*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

web/documentserver-example/js/init.js

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

web/documentserver-example/js/stylesheet.css

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

web/documentserver-example/nodejs/LICENSE.txt

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

web/documentserver-example/nodejs/app.js

@@ -1,7 +1,7 @@
 "use strict";
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *
@@ -35,6 +35,7 @@ const syncRequest = require("sync-request");
 const jwt = require('jsonwebtoken');
 const config = require('config');
 const configServer = config.get('server');
+const storageFolder = configServer.get("storageFolder");
 const mime = require("mime");
 const docManager = require("./helpers/docManager");
 const documentService = require("./helpers/documentService");
@@ -99,7 +100,7 @@ app.use(bodyParser.urlencoded({ extended: false }));
 app.get("/", function (req, res) {
     try {
 
-        docManager.init(__dirname, req, res);
+        docManager.init(storageFolder, req, res);
 
         res.render("index", {
             preloaderUrl: siteUrl + configServer.get('preloaderUrl'),
@@ -119,7 +120,7 @@ app.get("/", function (req, res) {
 });
 
 app.get("/download", function(req, res) {
-    docManager.init(__dirname, req, res);
+    docManager.init(storageFolder, req, res);
 
     var fileName = fileUtility.getFileName(req.query.fileName);
     var userAddress = docManager.curUserHostAddress();
@@ -140,11 +141,11 @@ app.get("/download", function(req, res) {
 
 app.post("/upload", function (req, res) {
 
-    docManager.init(__dirname, req, res);
+    docManager.init(storageFolder, req, res);
     docManager.storagePath(""); //mkdir if not exist
 
     const userIp = docManager.curUserHostAddress();
-    const uploadDir = path.join("./public", configServer.get('storageFolder'), userIp);
+    const uploadDir = path.join(storageFolder, userIp);
     const uploadDirTmp = path.join(uploadDir, 'tmp');
     docManager.createDirectory(uploadDirTmp);
 
@@ -201,7 +202,7 @@ app.post("/upload", function (req, res) {
                 res.write("{ \"filename\": \"" + file.name + "\"}");
 
                 const userid = req.query.userid ? req.query.userid : "uid-1";
-                const name = req.query.name ? req.query.name : "Jonn Smith";
+                const name = req.query.name ? req.query.name : "John Smith";
 
                 docManager.saveFileData(file.name, userid, name);
             }
@@ -297,7 +298,7 @@ app.get("/convert", function (req, res) {
 
 app.delete("/file", function (req, res) {
     try {
-    	docManager.init(__dirname, req, res);
+    	docManager.init(storageFolder, req, res);
         let fileName = req.query.filename;
         if (fileName) {
 			fileName = fileUtility.getFileName(fileName);
@@ -322,7 +323,7 @@ app.delete("/file", function (req, res) {
 
 app.post("/track", function (req, res) {
 
-    docManager.init(__dirname, req, res);
+    docManager.init(storageFolder, req, res);
 
     var userAddress = req.query.useraddress;
     var fileName = fileUtility.getFileName(req.query.filename);
@@ -513,14 +514,15 @@ app.post("/track", function (req, res) {
 app.get("/editor", function (req, res) {
     try {
 
-        docManager.init(__dirname, req, res);
+        docManager.init(storageFolder, req, res);
 
         var fileExt = req.query.fileExt;
         var history = [];
         var historyData = [];
         var lang = docManager.getLang();
         var userid = req.query.userid ? req.query.userid : "uid-1";
-        var name = req.query.name ? req.query.name : "Jonn Smith";
+        var name = req.query.name ? req.query.name : "John Smith";
+        var actionData = req.query.action ? req.query.action : "null";
 
         if (fileExt != null) {
             var fileName = docManager.createDemo((req.query.sample ? "sample." : "new.") + fileExt, userid, name);
@@ -616,20 +618,22 @@ app.get("/editor", function (req, res) {
                 key: key,
                 token: "",
                 callbackUrl: docManager.getCallback(fileName),
-                isEdit: canEdit && (mode == "edit" || mode == "filter"),
+                isEdit: canEdit && (mode == "edit" || mode == "filter" || mode == "blockcontent"),
                 review: mode == "edit" || mode == "review",
-                comment: mode != "view" && mode != "fillForms" && mode != "embedded",
-                fillForms: mode != "view" && mode != "comment" && mode != "embedded",
+                comment: mode != "view" && mode != "fillForms" && mode != "embedded" && mode != "blockcontent",
+                fillForms: mode != "view" && mode != "comment" && mode != "embedded" && mode != "blockcontent",
                 modifyFilter: mode != "filter",
+                modifyContentControl: mode != "blockcontent",
                 mode: canEdit && mode != "view" ? "edit" : "view",
                 canBackToFolder: type != "embedded",
-                backUrl: docManager.getServerUrl(),
+                backUrl: docManager.getServerUrl() + "/",
                 curUserHostAddress: docManager.curUserHostAddress(),
                 lang: lang,
                 userid: userid,
                 name: name,
                 fileChoiceUrl: fileChoiceUrl,
-                plugins: JSON.stringify(plugins)
+                plugins: JSON.stringify(plugins),
+                actionData: actionData
             },
             history: history,
             historyData: historyData

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

@@ -22,13 +22,14 @@
     "viewedDocs": [".pdf", ".djvu", ".xps"],
     "editedDocs": [".docx", ".xlsx", ".csv", ".pptx", ".txt"],
     "convertedDocs": [".docm", ".doc", ".dotx", ".dotm", ".dot", ".odt", ".fodt", ".ott", ".xlsm", ".xls", ".xltx", ".xltm", ".xlt", ".ods", ".fods", ".ots", ".pptm", ".ppt", ".ppsx", ".ppsm", ".pps", ".potx", ".potm", ".pot", ".odp", ".fodp", ".otp", ".rtf", ".mht", ".html", ".htm", ".epub"],
-    "storageFolder": "files",
+    "storageFolder": "./files",
+    "storagePath": "/files",
     "maxFileSize": 1073741824,
     "mobileRegEx": "android|avantgo|playbook|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od|ad)|iris|kindle|lge |maemo|midp|mmp|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\\/|plucker|pocket|psp|symbian|treo|up\\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino",
     "static":[
       {
-        "name": "/public",
-        "path": "public"
+        "name": "/files",
+        "path": "./files"
       }
     ],
     "token": {

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

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

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

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

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

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

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

@@ -4,8 +4,8 @@
     "maxFileSize": 104857600,
     "static":[
       {
-        "name": "/public",
-        "path": "public",
+        "name": "/files",
+        "path": "./files",
         "options": {"maxAge": "7d"}
       }
     ]

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

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

@@ -1,7 +1,7 @@
 "use strict";
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *
@@ -32,7 +32,6 @@ const documentService = require("./documentService");
 const cacheManager = require("./cacheManager");
 const guidManager = require("./guidManager");
 const configServer = require('config').get('server');
-const storageFolder = configServer.get('storageFolder');
 const os = require("os");
 
 let docManager = {};
@@ -60,8 +59,6 @@ docManager.init = function (dir, req, res) {
     docManager.dir = dir;
     docManager.req = req;
     docManager.res = res;
-
-    this.createDirectory(path.join(docManager.dir, "public", storageFolder));
 };
 
 docManager.getLang = function () {
@@ -113,7 +110,7 @@ docManager.getCorrectName = function (fileName, userAddress) {
 docManager.createDemo = function (demoName, userid, username) {
     const fileName = docManager.getCorrectName(demoName);
 
-    docManager.copyFile(path.join(docManager.dir, "public", "samples", demoName), docManager.storagePath(fileName));
+    docManager.copyFile(path.join(__dirname, "..","public", "samples", demoName), docManager.storagePath(fileName));
 
     docManager.saveFileData(fileName, userid, username);
 
@@ -149,9 +146,8 @@ docManager.getFileUri = function (fileName) {
 
 docManager.getlocalFileUri = function (fileName, version, forDocumentServer) {
     const serverPath = docManager.getServerUrl(forDocumentServer);
-    const storagePath = storageFolder.length ? storageFolder + "/" : "";
     const hostAddress = docManager.curUserHostAddress();
-    const url = serverPath + "/" + storagePath + hostAddress + "/" + encodeURIComponent(fileName);
+    const url = serverPath + configServer.get("storagePath") + "/" + hostAddress + "/" + encodeURIComponent(fileName);
     if (!version) {
         return url;
     }
@@ -172,13 +168,13 @@ docManager.getCallback = function (fileName) {
 
 docManager.storagePath = function (fileName, userAddress) {
     fileName = fileUtility.getFileName(fileName);
-    const directory = path.join(docManager.dir, "public", storageFolder, docManager.curUserHostAddress(userAddress));
+    const directory = path.join(docManager.dir, docManager.curUserHostAddress(userAddress));
     this.createDirectory(directory);
     return path.join(directory, fileName);
 };
 
 docManager.forcesavePath = function (fileName, userAddress, create) {
-    let directory = path.join(docManager.dir, "public", storageFolder, docManager.curUserHostAddress(userAddress));
+    let directory = path.join(docManager.dir, docManager.curUserHostAddress(userAddress));
     if (!this.existsSync(directory)) {
         return "";
     }
@@ -195,7 +191,7 @@ docManager.forcesavePath = function (fileName, userAddress, create) {
 };
 
 docManager.historyPath = function (fileName, userAddress, create) {
-    let directory = path.join(docManager.dir, "public", storageFolder, docManager.curUserHostAddress(userAddress));
+    let directory = path.join(docManager.dir, docManager.curUserHostAddress(userAddress));
     if (!this.existsSync(directory)) {
         return "";
     }
@@ -233,7 +229,7 @@ docManager.changesUser = function (fileName, userAddress, version) {
 
 docManager.getStoredFiles = function () {
     const userAddress = docManager.curUserHostAddress();
-    const directory = path.join(docManager.dir, "public", storageFolder, userAddress);
+    const directory = path.join(docManager.dir, userAddress);
     this.createDirectory(directory);
     const result = [];
     const storedFiles = fileSystem.readdirSync(directory);

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

web/documentserver-example/nodejs/npm-shrinkwrap.json

@@ -187,18 +187,11 @@
       "integrity": "sha512-vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ=="
     },
     "debug": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-      "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "requires": {
-        "ms": "0.7.1"
-      },
-      "dependencies": {
-        "ms": {
-          "version": "0.7.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg="
-        }
+        "ms": "2.0.0"
       }
     },
     "deep-is": {

web/documentserver-example/nodejs/package.json

@@ -5,6 +5,7 @@
   "scripts": {
     "start": "node ./bin/www"
   },
+  "bin": "bin/www",
   "description": "OnlineEditorsExampleNodeJS",
   "author": {
     "name": "ONLYOFFICE",
@@ -16,7 +17,7 @@
   "dependencies": {
     "body-parser": "^1.16.1",
     "config": "^1.21.0",
-    "debug": "~2.2.0",
+    "debug": "~2.6.9",
     "ejs": "~2.5.1",
     "express": "^4.14.1",
     "formidable": "^1.1.1",
@@ -32,5 +33,11 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ONLYOFFICE/document-server-integration.git"
+  },
+  "pkg": {
+    "assets": [
+      "public/**/*",
+      "views/*"
+    ]
   }
 }

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *
@@ -290,7 +290,7 @@ footer {
     background-repeat: no-repeat;
     display: inline-block;
     height: 16px;
-    max-width: 250px;
+    max-width: 200px;
     margin-bottom: -6px;
     overflow: hidden;
     padding: 8px 0 1px 34px;

web/documentserver-example/nodejs/run-develop.py

@@ -0,0 +1,19 @@
+#!/usr/bin/env python
+import sys
+sys.path.append('../../../../build_tools/scripts')
+import os
+import base
+
+def install_module():
+  base.print_info('Install')
+  base.cmd('npm', ['install'])
+
+def run_integration_example():
+  install_module()
+  base.set_env('NODE_CONFIG_DIR', './config')
+  base.print_info('run integration example')
+  base.run_nodejs(['bin/www'])
+
+base.set_env('NODE_ENV', 'development-' + base.host_platform())
+
+run_integration_example()

web/documentserver-example/nodejs/run-mac.command

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-BASEDIR="$(cd "$(dirname "$0")" && pwd)"
-
-cd $BASEDIR
-
-echo "----------------------------------------"
-echo "Install nodejs modules "
-echo "----------------------------------------"
-
-npm install
-
-
-echo "----------------------------------------"
-echo "Run server  "
-echo "----------------------------------------"
-
-export NODE_CONFIG_DIR=$BASEDIR/config && export NODE_ENV=development-mac && node bin/www

web/documentserver-example/nodejs/run.bat

@@ -1,15 +0,0 @@
-ECHO OFF
-
-ECHO.
-ECHO ----------------------------------------
-ECHO Install node.js modules 
-ECHO ----------------------------------------
-call npm install
-
-ECHO.
-ECHO ----------------------------------------
-ECHO Run server 
-ECHO ----------------------------------------
-SET NODE_CONFIG_DIR=%~dp0\config
-SET NODE_ENV=development-windows
-start /min /b node bin/www

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

@@ -18,10 +18,12 @@
         "edit": <%- editor.isEdit %>,
         "fillForms": <%- editor.fillForms %>,
         "modifyFilter": <%- editor.modifyFilter %>,
+        "modifyContentControl": <%- editor.modifyContentControl %>,
         "review": <%- editor.review %>
     }
 },
 "editorConfig": {
+    "actionLink": <%- editor.actionData %>,
     "mode": "<%- editor.mode %>",
     "lang": "<%- editor.lang %>",
     "callbackUrl": "<%- editor.callbackUrl %>",

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

@@ -1,6 +1,6 @@
 <!--*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *
@@ -96,6 +96,28 @@
             location.reload(true);
         };
 
+        var replaceActionLink = function(href, linkParam) {
+            var link;
+            var actionIndex = href.indexOf("&action=");
+            if (actionIndex != -1) {
+                var endIndex = href.indexOf("&", actionIndex + "&action=".length);
+                if (endIndex != -1) {
+                    link = href.substring(0, actionIndex) + href.substring(endIndex) + "&action=" + encodeURIComponent(linkParam);
+                } else {
+                    link = href.substring(0, actionIndex) + "&action=" + encodeURIComponent(linkParam);
+                }
+            } else {
+                link = href + "&action=" + encodeURIComponent(linkParam);
+            }
+            return link;
+        }
+
+        var onMakeActionLink = function (event) {
+            var actionData = event.data;
+            var linkParam = JSON.stringify(actionData);
+            docEditor.setActionLink(replaceActionLink(location.href, linkParam));
+        };
+
         var connectEditor = function () {
 
             docEditor = new DocsAPI.DocEditor("iframeEditor", {<% include config %>,
@@ -108,6 +130,7 @@
                         "onRequestHistoryData": onRequestHistoryData,
                         "onRequestHistoryClose": onRequestHistoryClose,
                         "onOutdatedVersion": onOutdatedVersion,
+                        "onMakeActionLink": onMakeActionLink,
                     }
             });
 

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

@@ -1,6 +1,6 @@
 <!--*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *
@@ -53,7 +53,7 @@
                 <td valign="middle" width="30%">
                     <span class="select-user">Username:</span>
                     <select class="select-user" id="user">
-                        <option value="uid-1">Jonn Smith</option>
+                        <option value="uid-1">John Smith</option>
                         <option value="uid-2">Mark Pottato</option>
                         <option value="uid-3">Hamish Mitchell</option>
                     </select>
@@ -86,7 +86,7 @@
                         <option value="vi">Vietnamese</option>
                     </select>
                 </td>
-                <td valign="middle" width="70%">Choose the language for ONLYOFFICE&trade; editors interface.</td>
+                <td valign="middle" width="70%">Choose the language for ONLYOFFICE editors interface.</td>
             </tr>
         </table>
         <br />
@@ -143,7 +143,7 @@
                     <thead>
                         <tr class="tableHeader">
                             <td class="tableHeaderCell tableHeaderCellFileName">Filename</td>
-                            <td colspan="5" class="tableHeaderCell contentCells-shift">Editors</td>
+                            <td colspan="6" class="tableHeaderCell contentCells-shift">Editors</td>
                             <td colspan="3" class="tableHeaderCell">Viewers</td>
                         </tr>
                     </thead>
@@ -180,12 +180,18 @@
                                     <a href="editor?type=desktop&mode=comment&fileName=<%= encodeURIComponent(storedFiles[i].name) + params %>" target="_blank">
                                         <img src="images/comment-24.png" alt="Open in editor for comment" title="Open in editor for comment" /></a>
                                 </td>
-                                <td class="contentCells contentCells-shift contentCells-icon">
+                                <td class="contentCells contentCells-icon">
                                     <% if (storedFiles[i].documentType == "text") { %>
                                     <a href="editor?type=desktop&mode=fillForms&fileName=<%= encodeURIComponent(storedFiles[i].name) + params %>" target="_blank">
                                         <img src="images/fill-forms-24.png" alt="Open in editor for filling in forms" title="Open in editor for filling in forms" /></a>
                                     <% } %>
                                 </td>
+                                <td class="contentCells contentCells-shift contentCells-icon">
+                                    <% if (storedFiles[i].documentType == "text") { %>
+                                    <a href="editor?type=desktop&mode=blockcontent&fileName=<%= encodeURIComponent(storedFiles[i].name) + params %>" target="_blank">
+                                        <img src="images/block-content-24.png" alt="Open in editor without content control modification" title="Open in editor without content control modification" /></a>
+                                    <% } %>
+                                </td>
                                 <% } else { %>
                                     <td class="contentCells contentCells-shift contentCells-icon" colspan="5"></td>
                                 <% } %>
@@ -257,7 +263,7 @@
 
     <span id="loadScripts" data-docs="<%= preloaderUrl %>"></span>
 
-    <footer>&copy; Ascensio Systems SIA 2019. All rights reserved.</footer>
+    <footer>&copy; Ascensio Systems SIA 2020. All rights reserved.</footer>
 
     <script type="text/javascript" src="javascripts/jquery-1.8.2.js"></script>
     <script type="text/javascript" src="javascripts/jquery-ui.js"></script>

web/documentserver-example/php/LICENSE.txt

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

web/documentserver-example/php/ajax.php

@@ -1,7 +1,7 @@
 <?php
 /*
  *
- * (c) Copyright Ascensio System SIA 2019
+ * (c) Copyright Ascensio System SIA 2020
  *
  * The MIT License (MIT)
  *