From 70836bb67d4dd8d4b0df9d5714c9770fd64597eb Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Tue, 9 Nov 2021 14:42:35 +0300
Subject: [PATCH 01/62] nodejs: using innerAlert

---
 web/documentserver-example/nodejs/views/editor.ejs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/web/documentserver-example/nodejs/views/editor.ejs b/web/documentserver-example/nodejs/views/editor.ejs
index 0cac3a38..d87c6cb4 100644
--- a/web/documentserver-example/nodejs/views/editor.ejs
+++ b/web/documentserver-example/nodejs/views/editor.ejs
@@ -139,10 +139,9 @@
         };
 
         var onRequestSendNotify = function(event) {  // the user is mentioned in a comment
-            var actionLink = JSON.stringify(event.data.actionLink);
-            console.log("onRequestSendNotify:");
-            console.log(event.data);
-            console.log("Link to comment: " + replaceActionLink(location.href, actionLink));
+            event.data.actionLink = replaceActionLink(location.href, event.data.actionLink);
+            var data = JSON.stringify(event.data);
+            innerAlert("onRequestSendNotify: " + data);
         };
 
         var config = {<%- include("config") %>,

From 1cd275188bac55166c874db3ddb135f0701d656b Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Tue, 12 Oct 2021 17:55:23 +0300
Subject: [PATCH 02/62] nodejs: onRequestSaveAs event

---
 web/documentserver-example/nodejs/app.js      | 48 +++++++++++++++++++
 .../nodejs/views/editor.ejs                   | 25 +++++++++-
 2 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/web/documentserver-example/nodejs/app.js b/web/documentserver-example/nodejs/app.js
index ca0e27a1..710e172b 100644
--- a/web/documentserver-example/nodejs/app.js
+++ b/web/documentserver-example/nodejs/app.js
@@ -224,6 +224,54 @@ app.post("/upload", function (req, res) {  // define a handler for uploading fil
     });
 });
 
+app.post("/create", function (req, res) {
+    var title = req.body.title;
+    var fileUrl = req.body.url;
+
+    try {
+        docManager.init(storageFolder, req, res);
+        docManager.storagePath(""); // mkdir if not exist
+
+        var fileName = docManager.getCorrectName(title);
+        var userAddress = docManager.curUserHostAddress();
+        docManager.historyPath(fileName, userAddress, true);
+
+        urllib.request(fileUrl, {method: "GET"},function(err, data) {
+            if (configServer.get("maxFileSize") < data.length || data.length <= 0) {  // check if the file size exceeds the maximum file size
+                res.writeHead(200, { "Content-Type": "application/json" });
+                res.write(JSON.stringify({ "error": "File size is incorrect" }));
+                res.end();
+                return;
+            }
+
+            const exts = [].concat(configServer.get("viewedDocs"), configServer.get("editedDocs"), configServer.get("convertedDocs"));  // all the supported file extensions
+            const curExt = fileUtility.getFileExtension(fileName);
+
+            if (exts.indexOf(curExt) == -1) {  // check if the file extension is supported
+                res.writeHead(200, { "Content-Type": "application/json" });  // and write the error status and message to the response
+                res.write(JSON.stringify({ "error": "File type is not supported" }));
+                res.end();
+                return;
+            }
+
+            fileSystem.writeFileSync(docManager.storagePath(fileName), data);
+
+            res.writeHead(200, { "Content-Type": "application/json" });
+            res.write(JSON.stringify({ "file" : fileName }));
+            res.end();
+
+        });
+
+    } catch (e) {
+        res.status(500);
+        res.write(JSON.stringify({
+            error: 1,
+            message: e.message
+        }));
+        res.end();
+    }
+});
+
 app.post("/convert", function (req, res) {  // define a handler for converting files
 
     var fileName = fileUtility.getFileName(req.body.filename);
diff --git a/web/documentserver-example/nodejs/views/editor.ejs b/web/documentserver-example/nodejs/views/editor.ejs
index d87c6cb4..472def6b 100644
--- a/web/documentserver-example/nodejs/views/editor.ejs
+++ b/web/documentserver-example/nodejs/views/editor.ejs
@@ -39,9 +39,11 @@
 
         var docEditor;
 
-        var innerAlert = function (message) {
+        var innerAlert = function (message, inEditor) {
             if (console && console.log)
                 console.log(message);
+            if (inEditor && docEditor)
+                docEditor.showMessage(message);
         };
 
         var onAppReady = function () {  // the application is loaded into the browser
@@ -144,6 +146,23 @@
             innerAlert("onRequestSendNotify: " + data);
         };
 
+        var onRequestSaveAs = function (event) {  //  the user is trying to save file by clicking Save Copy as... button
+            var title = event.data.title;
+            var url = event.data.url;
+            var data = {
+                title: title,
+                url: url
+            }
+            let xhr = new XMLHttpRequest();
+            xhr.open("POST", "create");
+            xhr.setRequestHeader( 'Content-Type', 'application/json');
+            xhr.send(JSON.stringify(data));
+            xhr.onload = function () {
+                innerAlert(xhr.responseText);
+                innerAlert(JSON.parse(xhr.responseText).file, true);
+            }
+        }
+
         var config = {<%- include("config") %>,
                 events: {
                     "onAppReady": onAppReady,
@@ -167,6 +186,10 @@
             config.events.onRequestSendNotify = onRequestSendNotify;
         }
 
+        if (config.editorConfig.createUrl) {
+            config.events.onRequestSaveAs = onRequestSaveAs;
+        }
+
         var connectEditor = function () {
             docEditor = new DocsAPI.DocEditor("iframeEditor", config);
             fixSize();

From 8e60c60e469c6c3424be5f3c65568f722fd27b41 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Mon, 6 Sep 2021 17:44:59 +0300
Subject: [PATCH 03/62] nodejs: oform

---
 web/documentserver-example/nodejs/app.js      | 16 +++++++++----
 .../nodejs/config/default.json                |  1 +
 .../nodejs/helpers/fileUtility.js             |  2 +-
 .../nodejs/helpers/users.js                   | 12 ++++++----
 .../nodejs/views/index.ejs                    | 23 +++++++++++--------
 5 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/web/documentserver-example/nodejs/app.js b/web/documentserver-example/nodejs/app.js
index 710e172b..cfb315ce 100644
--- a/web/documentserver-example/nodejs/app.js
+++ b/web/documentserver-example/nodejs/app.js
@@ -103,6 +103,7 @@ app.get("/", function (req, res) {  // define a handler for default page
             preloaderUrl: siteUrl + configServer.get('preloaderUrl'),
             convertExts: configServer.get('convertedDocs').join(","),
             editedExts: configServer.get('editedDocs').join(","),
+            fillExts: configServer.get("fillDocs").join(","),
             storedFiles: docManager.getStoredFiles(),
             params: docManager.getCustomParams(),
             users: users,
@@ -195,7 +196,7 @@ app.post("/upload", function (req, res) {  // define a handler for uploading fil
             return;
         }
 
-        const exts = [].concat(configServer.get('viewedDocs'), configServer.get('editedDocs'), configServer.get('convertedDocs'));  // all the supported file extensions
+        const exts = [].concat(configServer.get('viewedDocs'), configServer.get('editedDocs'), configServer.get('convertedDocs'), configServer.get("fillDocs"));  // all the supported file extensions
         const curExt = fileUtility.getFileExtension(file.name);
         const documentType = fileUtility.getFileType(file.name);
 
@@ -244,7 +245,7 @@ app.post("/create", function (req, res) {
                 return;
             }
 
-            const exts = [].concat(configServer.get("viewedDocs"), configServer.get("editedDocs"), configServer.get("convertedDocs"));  // all the supported file extensions
+            const exts = [].concat(configServer.get("viewedDocs"), configServer.get("editedDocs"), configServer.get("convertedDocs"), configServer.get("fillDocs"));  // all the supported file extensions
             const curExt = fileUtility.getFileExtension(fileName);
 
             if (exts.indexOf(curExt) == -1) {  // check if the file extension is supported
@@ -734,6 +735,7 @@ app.get("/editor", function (req, res) {  // define a handler for editing docume
             res.redirect(redirectPath);
             return;
         }
+        fileExt = fileUtility.getFileExtension(fileName);
 
         var userAddress = docManager.curUserHostAddress();
         if (!docManager.existsSync(docManager.storagePath(fileName, userAddress))) {  // if the file with a given name doesn't exist
@@ -750,8 +752,12 @@ app.get("/editor", function (req, res) {  // define a handler for editing docume
                 type = new RegExp(configServer.get("mobileRegEx"), "i").test(req.get('User-Agent')) ? "mobile" : "desktop";
             }
 
-        var canEdit = configServer.get('editedDocs').indexOf(fileUtility.getFileExtension(fileName)) != -1;  // check if this file can be edited
-        var submitForm = canEdit && (mode == "edit" || mode == "fillForms");
+        var canEdit = configServer.get('editedDocs').indexOf(fileExt) != -1;  // check if this file can be edited
+        if ((mode == "edit" || mode == "fillForms") && configServer.get('fillDocs').indexOf(fileExt) != -1) {
+            mode = "fillForms";
+            canEdit = true;
+        }
+        var submitForm = mode == "fillForms" && userid == "uid-1";
 
         var countVersion = 1;
 
@@ -775,7 +781,7 @@ app.get("/editor", function (req, res) {  // define a handler for editing docume
                 var historyD = {
                     version: i,
                     key: keyVersion,
-                    url: i == countVersion ? url : (docManager.getlocalFileUri(fileName, i, true) + "/prev" + fileUtility.getFileExtension(fileName)),
+                    url: i == countVersion ? url : (docManager.getlocalFileUri(fileName, i, true) + "/prev" + fileExt),
                 };
 
                 if (i > 1 && docManager.existsSync(docManager.diffPath(fileName, userAddress, i-1))) {  // check if the path to the file with document versions differences exists
diff --git a/web/documentserver-example/nodejs/config/default.json b/web/documentserver-example/nodejs/config/default.json
index 5bc3f7b5..1fa06edb 100644
--- a/web/documentserver-example/nodejs/config/default.json
+++ b/web/documentserver-example/nodejs/config/default.json
@@ -24,6 +24,7 @@
     "exampleUrl": null,
     "viewedDocs": [".pdf", ".djvu", ".xps", ".oxps"],
     "editedDocs": [".docx", ".xlsx", ".csv", ".pptx", ".txt"],
+    "fillDocs": [".oform"],
     "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", ".xml", ".epub", ".fb2"],
     "storageFolder": "./files",
     "storagePath": "/files",
diff --git a/web/documentserver-example/nodejs/helpers/fileUtility.js b/web/documentserver-example/nodejs/helpers/fileUtility.js
index 39dbd9ee..4dd32c48 100644
--- a/web/documentserver-example/nodejs/helpers/fileUtility.js
+++ b/web/documentserver-example/nodejs/helpers/fileUtility.js
@@ -63,7 +63,7 @@ fileUtility.fileType = {
 }
 
 // the document extension list
-fileUtility.documentExts = [".doc", ".docx", ".docm", ".dot", ".dotx", ".dotm", ".odt", ".fodt", ".ott", ".rtf", ".txt", ".html", ".htm", ".mht", ".xml", ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps"];
+fileUtility.documentExts = [".doc", ".docx", ".oform", ".docm", ".dot", ".dotx", ".dotm", ".odt", ".fodt", ".ott", ".rtf", ".txt", ".html", ".htm", ".mht", ".xml", ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps"];
 
 // the spreadsheet extension list
 fileUtility.spreadsheetExts = [".xls", ".xlsx", ".xlsm", ".xlt", ".xltx", ".xltm", ".ods", ".fods", ".ots", ".csv"];
diff --git a/web/documentserver-example/nodejs/helpers/users.js b/web/documentserver-example/nodejs/helpers/users.js
index b04f71ed..d68474a5 100644
--- a/web/documentserver-example/nodejs/helpers/users.js
+++ b/web/documentserver-example/nodejs/helpers/users.js
@@ -22,7 +22,8 @@ var descr_user_1 = [
     "Can review all the changes",
     "Can perform all actions with comments",
     "The file favorite state is undefined",
-    "Can create files from templates using data from the editor"
+    "Can create files from templates using data from the editor",
+    "Can submit forms"
 ];
 
 var descr_user_2 = [
@@ -30,7 +31,8 @@ var descr_user_2 = [
     "Can review only his own changes or changes made by users with no group",
     "Can view comments, edit his own comments and comments left by users with no group. Can remove his own comments only",
     "This file is marked as favorite",
-    "Can create new files from the editor"
+    "Can create new files from the editor",
+    "Can’t submit forms"
 ];
 
 var descr_user_3 = [
@@ -41,7 +43,8 @@ var descr_user_3 = [
     "Can’t copy data from the file to clipboard",
     "Can’t download the file",
     "Can’t print the file",
-    "Can create new files from the editor"
+    "Can create new files from the editor",
+    "Can’t submit forms"
 ];
 
 var descr_user_0 = [
@@ -51,7 +54,8 @@ var descr_user_0 = [
     "Can perform all actions with comments",
     "The file favorite state is undefined",
     "Can't mention others in comments",
-    "Can't create new files from the editor"
+    "Can't create new files from the editor",
+    "Can’t submit forms"
 ];
 
 var users = [
diff --git a/web/documentserver-example/nodejs/views/index.ejs b/web/documentserver-example/nodejs/views/index.ejs
index abb8b3b1..be0ba23e 100644
--- a/web/documentserver-example/nodejs/views/index.ejs
+++ b/web/documentserver-example/nodejs/views/index.ejs
@@ -202,23 +202,26 @@
                                                         <% } %>
                                                         <% if (storedFiles[i].documentType == "word") { %>
                                                             <td class="contentCells contentCells-icon">
-                                                                <a href="editor?type=desktop&mode=fillForms&fileName=<%= encodeURIComponent(storedFiles[i].name) + params %>" target="_blank">
-                                                                    <img src="images/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms" /></a>
-                                                            </td>
-                                                        <% } else { %>
-                                                            <td class="contentCells contentCells-icon "></td>
-                                                        <% } %>
-                                                        <% if (storedFiles[i].documentType == "word") { %>
-                                                            <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
                                                                 <a href="editor?type=desktop&mode=blockcontent&fileName=<%= encodeURIComponent(storedFiles[i].name) + params %>" target="_blank">
                                                                     <img src="images/block-content.svg" 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 firstContentCellShift"></td>
+                                                            <td class="contentCells contentCells-icon"></td>
                                                         <% } %>
                                                         <% if (storedFiles[i].documentType !== "word" && storedFiles[i].documentType !== "cell") {%>
                                                             <td class="contentCells contentCells-icon "></td>
-                                                        <%}%>
+                                                        <% } %>
+                                                        <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
+                                                    <% } else if (fillExts.indexOf(storedFiles[i].name.substring(storedFiles[i].name.lastIndexOf('.')).trim().toLowerCase()) !== -1) { %>
+                                                        <td class="contentCells contentCells-icon "></td>
+                                                        <td class="contentCells contentCells-icon "></td>
+                                                        <td class="contentCells contentCells-icon "></td>
+                                                        <td class="contentCells contentCells-icon "></td>
+                                                        <td class="contentCells contentCells-icon "></td>
+                                                        <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"">
+                                                            <a href="editor?type=desktop&mode=fillForms&fileName=<%= encodeURIComponent(storedFiles[i].name) + params %>" target="_blank">
+                                                                <img src="images/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms" /></a>
+                                                        </td>
                                                     <% } else { %>
                                                         <td class="contentCells contentCells-shift contentCells-icon contentCellsEmpty" colspan="6"></td>
                                                     <% } %>

From 94cb70c0db0c384c75fa38fcf0f08985e37abe5b Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Fri, 22 Oct 2021 15:25:46 +0300
Subject: [PATCH 04/62] nodejs: hide submit button

---
 web/documentserver-example/nodejs/app.js           | 2 +-
 web/documentserver-example/nodejs/helpers/users.js | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/documentserver-example/nodejs/app.js b/web/documentserver-example/nodejs/app.js
index cfb315ce..962e4d9b 100644
--- a/web/documentserver-example/nodejs/app.js
+++ b/web/documentserver-example/nodejs/app.js
@@ -757,7 +757,7 @@ app.get("/editor", function (req, res) {  // define a handler for editing docume
             mode = "fillForms";
             canEdit = true;
         }
-        var submitForm = mode == "fillForms" && userid == "uid-1";
+        var submitForm = mode == "fillForms" && userid == "uid-1" && !1;
 
         var countVersion = 1;
 
diff --git a/web/documentserver-example/nodejs/helpers/users.js b/web/documentserver-example/nodejs/helpers/users.js
index d68474a5..f60961da 100644
--- a/web/documentserver-example/nodejs/helpers/users.js
+++ b/web/documentserver-example/nodejs/helpers/users.js
@@ -23,7 +23,7 @@ var descr_user_1 = [
     "Can perform all actions with comments",
     "The file favorite state is undefined",
     "Can create files from templates using data from the editor",
-    "Can submit forms"
+    //"Can submit forms"
 ];
 
 var descr_user_2 = [
@@ -32,7 +32,7 @@ var descr_user_2 = [
     "Can view comments, edit his own comments and comments left by users with no group. Can remove his own comments only",
     "This file is marked as favorite",
     "Can create new files from the editor",
-    "Can’t submit forms"
+    //"Can’t submit forms"
 ];
 
 var descr_user_3 = [
@@ -44,7 +44,7 @@ var descr_user_3 = [
     "Can’t download the file",
     "Can’t print the file",
     "Can create new files from the editor",
-    "Can’t submit forms"
+    //"Can’t submit forms"
 ];
 
 var descr_user_0 = [
@@ -55,7 +55,7 @@ var descr_user_0 = [
     "The file favorite state is undefined",
     "Can't mention others in comments",
     "Can't create new files from the editor",
-    "Can’t submit forms"
+    //"Can’t submit forms"
 ];
 
 var users = [

From a497401b30400998109f4b666bf68758ed50c6d5 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Mon, 25 Oct 2021 14:06:51 +0300
Subject: [PATCH 05/62] nodejs: revert filling in docx

---
 web/documentserver-example/nodejs/app.js              | 2 +-
 web/documentserver-example/nodejs/config/default.json | 2 +-
 web/documentserver-example/nodejs/views/index.ejs     | 9 ++++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/web/documentserver-example/nodejs/app.js b/web/documentserver-example/nodejs/app.js
index 962e4d9b..e513dbb6 100644
--- a/web/documentserver-example/nodejs/app.js
+++ b/web/documentserver-example/nodejs/app.js
@@ -753,7 +753,7 @@ app.get("/editor", function (req, res) {  // define a handler for editing docume
             }
 
         var canEdit = configServer.get('editedDocs').indexOf(fileExt) != -1;  // check if this file can be edited
-        if ((mode == "edit" || mode == "fillForms") && configServer.get('fillDocs').indexOf(fileExt) != -1) {
+        if ((!canEdit && mode == "edit" || mode == "fillForms") && configServer.get('fillDocs').indexOf(fileExt) != -1) {
             mode = "fillForms";
             canEdit = true;
         }
diff --git a/web/documentserver-example/nodejs/config/default.json b/web/documentserver-example/nodejs/config/default.json
index 1fa06edb..319b4290 100644
--- a/web/documentserver-example/nodejs/config/default.json
+++ b/web/documentserver-example/nodejs/config/default.json
@@ -24,7 +24,7 @@
     "exampleUrl": null,
     "viewedDocs": [".pdf", ".djvu", ".xps", ".oxps"],
     "editedDocs": [".docx", ".xlsx", ".csv", ".pptx", ".txt"],
-    "fillDocs": [".oform"],
+    "fillDocs": [".docx", ".oform"],
     "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", ".xml", ".epub", ".fb2"],
     "storageFolder": "./files",
     "storagePath": "/files",
diff --git a/web/documentserver-example/nodejs/views/index.ejs b/web/documentserver-example/nodejs/views/index.ejs
index be0ba23e..0f48b6a2 100644
--- a/web/documentserver-example/nodejs/views/index.ejs
+++ b/web/documentserver-example/nodejs/views/index.ejs
@@ -211,7 +211,14 @@
                                                         <% if (storedFiles[i].documentType !== "word" && storedFiles[i].documentType !== "cell") {%>
                                                             <td class="contentCells contentCells-icon "></td>
                                                         <% } %>
-                                                        <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
+                                                        <% if (fillExts.indexOf(storedFiles[i].name.substring(storedFiles[i].name.lastIndexOf('.')).trim().toLowerCase()) !== -1) { %>
+                                                            <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
+                                                                <a href="editor?type=desktop&mode=fillForms&fileName=<%= encodeURIComponent(storedFiles[i].name) + params %>" target="_blank">
+                                                                    <img src="images/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms" /></a>
+                                                            </td>
+                                                        <% } else {%>
+                                                            <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
+                                                        <%}%>
                                                     <% } else if (fillExts.indexOf(storedFiles[i].name.substring(storedFiles[i].name.lastIndexOf('.')).trim().toLowerCase()) !== -1) { %>
                                                         <td class="contentCells contentCells-icon "></td>
                                                         <td class="contentCells contentCells-icon "></td>

From 4d852a23cd1891230b6728b948bba9a860aacf33 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Mon, 25 Oct 2021 14:10:35 +0300
Subject: [PATCH 06/62] nodejs: filling on mobile

---
 .../nodejs/public/images/mobile-fill-forms.svg              | 6 ++++++
 web/documentserver-example/nodejs/views/index.ejs           | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 web/documentserver-example/nodejs/public/images/mobile-fill-forms.svg

diff --git a/web/documentserver-example/nodejs/public/images/mobile-fill-forms.svg b/web/documentserver-example/nodejs/public/images/mobile-fill-forms.svg
new file mode 100644
index 00000000..31db5ea7
--- /dev/null
+++ b/web/documentserver-example/nodejs/public/images/mobile-fill-forms.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 fill-rule="evenodd" clip-rule="evenodd" d="M5 5C5 3.89543 5.89543 3 7 3H16C17.1046 3 18 3.89543 18 5V8H17V6H6V18H17V16H18V19C18 20.1046 17.1046 21 16 21H7C5.89543 21 5 20.1046 5 19V5ZM13 4H10V5H13V4ZM12 19.5C12 19.7761 11.7761 20 11.5 20C11.2239 20 11 19.7761 11 19.5C11 19.2239 11.2239 19 11.5 19C11.7761 19 12 19.2239 12 19.5Z" fill="#444444"/>
+<rect x="7" y="9" width="1" height="6" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 8V9L11 9V15H12V16H9V15H10V9H9V8H12Z" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15 10H18V14H15H14H13V15H14H18C18.5523 15 19 14.5523 19 14V10C19 9.44772 18.5523 9 18 9H14H13V10H14H15Z" fill="#444444"/>
+</svg>
diff --git a/web/documentserver-example/nodejs/views/index.ejs b/web/documentserver-example/nodejs/views/index.ejs
index 0f48b6a2..eeccd8cd 100644
--- a/web/documentserver-example/nodejs/views/index.ejs
+++ b/web/documentserver-example/nodejs/views/index.ejs
@@ -221,7 +221,10 @@
                                                         <%}%>
                                                     <% } else if (fillExts.indexOf(storedFiles[i].name.substring(storedFiles[i].name.lastIndexOf('.')).trim().toLowerCase()) !== -1) { %>
                                                         <td class="contentCells contentCells-icon "></td>
-                                                        <td class="contentCells contentCells-icon "></td>
+                                                        <td class="contentCells contentCells-icon">
+                                                            <a href="editor?type=mobile&mode=fillForms&fileName=<%= encodeURIComponent(storedFiles[i].name) + params %>" target="_blank">
+                                                                <img src="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>
                                                         <td class="contentCells contentCells-icon "></td>
                                                         <td class="contentCells contentCells-icon "></td>
                                                         <td class="contentCells contentCells-icon "></td>

From 9bab8edc3c65b0598344aa0c225fce7e0ebb8c55 Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Mon, 15 Nov 2021 11:47:31 +0300
Subject: [PATCH 07/62] using innerAlert in onRequestSendNotify

---
 .../csharp-mvc/Views/Home/Editor.aspx                    | 7 +++----
 web/documentserver-example/csharp/DocEditor.aspx         | 7 +++----
 .../java-spring/src/main/resources/templates/editor.html | 9 +++------
 .../java/src/main/webapp/editor.jsp                      | 7 +++----
 web/documentserver-example/php/doceditor.php             | 7 +++----
 web/documentserver-example/python/templates/editor.html  | 7 +++----
 .../ruby/app/views/home/editor.html.erb                  | 7 +++----
 7 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx b/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
index 14d4d78b..698f5146 100644
--- a/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
+++ b/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
@@ -185,10 +185,9 @@
         };
         // the user is mentioned in a comment
         config.events['onRequestSendNotify'] = function (event) {
-            var actionLink = JSON.stringify(event.data.actionLink);
-            console.log("onRequestSendNotify:");
-            console.log(event.data);
-            console.log("Link to comment: " + replaceActionLink(location.href, actionLink));
+            event.data.actionLink = replaceActionLink(location.href, event.data.actionLink);
+            var data = JSON.stringify(event.data);
+            innerAlert("onRequestSendNotify: " + data);
         };
         <% } %>
 
diff --git a/web/documentserver-example/csharp/DocEditor.aspx b/web/documentserver-example/csharp/DocEditor.aspx
index 858e3d34..2324251c 100644
--- a/web/documentserver-example/csharp/DocEditor.aspx
+++ b/web/documentserver-example/csharp/DocEditor.aspx
@@ -190,10 +190,9 @@
         };
         // the user is mentioned in a comment
         config.events['onRequestSendNotify'] = function (event) {
-            var actionLink = JSON.stringify(event.data.actionLink);
-            console.log("onRequestSendNotify:");
-            console.log(event.data);
-            console.log("Link to comment: " + replaceActionLink(location.href, actionLink));
+            event.data.actionLink = replaceActionLink(location.href, event.data.actionLink);
+            var data = JSON.stringify(event.data);
+            innerAlert("onRequestSendNotify: " + data);
         };
         <% } %>
 
diff --git a/web/documentserver-example/java-spring/src/main/resources/templates/editor.html b/web/documentserver-example/java-spring/src/main/resources/templates/editor.html
index 3b3f5cfb..0999b526 100755
--- a/web/documentserver-example/java-spring/src/main/resources/templates/editor.html
+++ b/web/documentserver-example/java-spring/src/main/resources/templates/editor.html
@@ -149,12 +149,9 @@
                         });
                     };
                     config.events['onRequestSendNotify'] = function (event) {
-                        var actionLink = JSON.stringify(event.data.actionLink);
-                        var replaceLink =replaceActionLink(location.href, actionLink);
-                        docEditor.setActionLink(replaceLink);
-                        console.log("onRequestSendNotify:");
-                        console.log(event.data);
-                        console.log("Link to comment: " + replaceLink);
+                        event.data.actionLink = replaceActionLink(location.href, event.data.actionLink);
+                        var data = JSON.stringify(event.data);
+                        innerAlert("onRequestSendNotify: " + data);
                     };
                 }
 
diff --git a/web/documentserver-example/java/src/main/webapp/editor.jsp b/web/documentserver-example/java/src/main/webapp/editor.jsp
index 709d8537..836bbe7d 100644
--- a/web/documentserver-example/java/src/main/webapp/editor.jsp
+++ b/web/documentserver-example/java/src/main/webapp/editor.jsp
@@ -168,10 +168,9 @@
             };
             // the user is mentioned in a comment
             config.events['onRequestSendNotify'] = function (event) {
-                var actionLink = JSON.stringify(event.data.actionLink);
-                console.log("onRequestSendNotify:");
-                console.log(event.data);
-                console.log("Link to comment: " + replaceActionLink(location.href, actionLink));
+                event.data.actionLink = replaceActionLink(location.href, event.data.actionLink);
+                var data = JSON.stringify(event.data);
+                innerAlert("onRequestSendNotify: " + data);
             };
         <% } %>
 
diff --git a/web/documentserver-example/php/doceditor.php b/web/documentserver-example/php/doceditor.php
index 8ef3fb92..5a7cec9c 100644
--- a/web/documentserver-example/php/doceditor.php
+++ b/web/documentserver-example/php/doceditor.php
@@ -472,10 +472,9 @@
             };
             // the user is mentioned in a comment
             config.events['onRequestSendNotify'] = function (event) {
-                var actionLink = JSON.stringify(event.data.actionLink);
-                console.log("onRequestSendNotify:");
-                console.log(event.data);
-                console.log("Link to comment: " + replaceActionLink(location.href, actionLink));
+                event.data.actionLink = replaceActionLink(location.href, event.data.actionLink);
+                var data = JSON.stringify(event.data);
+                innerAlert("onRequestSendNotify: " + data);
             };
             <?php endif; ?>
 
diff --git a/web/documentserver-example/python/templates/editor.html b/web/documentserver-example/python/templates/editor.html
index 90210c47..c0a117fe 100644
--- a/web/documentserver-example/python/templates/editor.html
+++ b/web/documentserver-example/python/templates/editor.html
@@ -181,10 +181,9 @@
                 };
                 // the user is mentioned in a comment
                 config.events['onRequestSendNotify'] = function (event) {
-                    var actionLink = JSON.stringify(event.data.actionLink);
-                    console.log("onRequestSendNotify:");
-                    console.log(event.data);
-                    console.log("Link to comment: " + replaceActionLink(location.href, actionLink));
+                    event.data.actionLink = replaceActionLink(location.href, event.data.actionLink);
+                    var data = JSON.stringify(event.data);
+                    innerAlert("onRequestSendNotify: " + data);
                 };
 
             {% endif %}
diff --git a/web/documentserver-example/ruby/app/views/home/editor.html.erb b/web/documentserver-example/ruby/app/views/home/editor.html.erb
index 472a5851..73cf88b5 100644
--- a/web/documentserver-example/ruby/app/views/home/editor.html.erb
+++ b/web/documentserver-example/ruby/app/views/home/editor.html.erb
@@ -159,10 +159,9 @@
             };
             // the user is mentioned in a comment
             config.events['onRequestSendNotify'] = function (event) {
-                var actionLink = JSON.stringify(event.data.actionLink);
-                console.log("onRequestSendNotify:");
-                console.log(event.data);
-                console.log("Link to comment: " + replaceActionLink(location.href, actionLink));
+                event.data.actionLink = replaceActionLink(location.href, event.data.actionLink);
+                var data = JSON.stringify(event.data);
+                innerAlert("onRequestSendNotify: " + data);
             };
             <% end
         %>

From be7a1e8ab26036d647627dc7d74a2fcdddd67b97 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Mon, 15 Nov 2021 12:15:09 +0300
Subject: [PATCH 08/62] nodejs: opening uploaded form

---
 .../nodejs/public/javascripts/jscript.js                       | 3 ++-
 web/documentserver-example/nodejs/views/index.ejs              | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/documentserver-example/nodejs/public/javascripts/jscript.js b/web/documentserver-example/nodejs/public/javascripts/jscript.js
index b95a025d..d0e5a7dd 100644
--- a/web/documentserver-example/nodejs/public/javascripts/jscript.js
+++ b/web/documentserver-example/nodejs/public/javascripts/jscript.js
@@ -198,7 +198,8 @@ if (typeof jQuery != "undefined") {
         var posExt = fileName.lastIndexOf('.');
         posExt = 0 <= posExt ? fileName.substring(posExt).trim().toLowerCase() : '';
 
-        if (EditedExtList.indexOf(posExt) != -1) {
+        if (EditedExtList.indexOf(posExt) != -1
+            || FilledExtList.indexOf(posExt) != -1) {
             jq("#beginEdit").removeClass("disable");
         }
     };
diff --git a/web/documentserver-example/nodejs/views/index.ejs b/web/documentserver-example/nodejs/views/index.ejs
index eeccd8cd..f072ccee 100644
--- a/web/documentserver-example/nodejs/views/index.ejs
+++ b/web/documentserver-example/nodejs/views/index.ejs
@@ -344,6 +344,7 @@
     <script type="text/javascript">
         var ConverExtList = "<%= convertExts %>";
         var EditedExtList = "<%= editedExts %>";
+        var FilledExtList = "<%= fillExts %>";
         var UrlConverter = "convert";
         var UrlEditor = "editor";
     </script>

From f44af24267ce57c27645132123d5a8b3c94a1a93 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Tue, 12 Oct 2021 11:01:29 +0300
Subject: [PATCH 09/62] nodejs: docxf

---
 web/documentserver-example/nodejs/config/default.json       | 2 +-
 web/documentserver-example/nodejs/public/assets             | 2 +-
 .../nodejs/public/images/file_docxf.svg                     | 6 ++++++
 .../nodejs/public/stylesheets/stylesheet.css                | 4 ++++
 web/documentserver-example/nodejs/views/index.ejs           | 3 +++
 5 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 web/documentserver-example/nodejs/public/images/file_docxf.svg

diff --git a/web/documentserver-example/nodejs/config/default.json b/web/documentserver-example/nodejs/config/default.json
index 319b4290..ec446cd4 100644
--- a/web/documentserver-example/nodejs/config/default.json
+++ b/web/documentserver-example/nodejs/config/default.json
@@ -23,7 +23,7 @@
     "preloaderUrl": "web-apps/apps/api/documents/cache-scripts.html",
     "exampleUrl": null,
     "viewedDocs": [".pdf", ".djvu", ".xps", ".oxps"],
-    "editedDocs": [".docx", ".xlsx", ".csv", ".pptx", ".txt"],
+    "editedDocs": [".docx", ".xlsx", ".csv", ".pptx", ".txt", ".docxf"],
     "fillDocs": [".docx", ".oform"],
     "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", ".xml", ".epub", ".fb2"],
     "storageFolder": "./files",
diff --git a/web/documentserver-example/nodejs/public/assets b/web/documentserver-example/nodejs/public/assets
index f9fc118e..346236dd 160000
--- a/web/documentserver-example/nodejs/public/assets
+++ b/web/documentserver-example/nodejs/public/assets
@@ -1 +1 @@
-Subproject commit f9fc118e433ac604f1bc62fc4aa71fa334e97756
+Subproject commit 346236dd127c29febc9119aeb6d55aad5ad190b4
diff --git a/web/documentserver-example/nodejs/public/images/file_docxf.svg b/web/documentserver-example/nodejs/public/images/file_docxf.svg
new file mode 100644
index 00000000..984761e6
--- /dev/null
+++ b/web/documentserver-example/nodejs/public/images/file_docxf.svg
@@ -0,0 +1,6 @@
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#27ABA3"/>
+<path d="M22.9165 0L29.9998 7.08333H25.9165C24.2597 7.08333 22.9165 5.74019 22.9165 4.08333V0Z" fill="#008078"/>
+<rect x="6.5" y="15.5" width="17" height="5" stroke="white"/>
+<rect x="6.5" y="23.5" width="17" height="5" stroke="white"/>
+</svg>
diff --git a/web/documentserver-example/nodejs/public/stylesheets/stylesheet.css b/web/documentserver-example/nodejs/public/stylesheets/stylesheet.css
index b4458e9d..f6d6bd2a 100644
--- a/web/documentserver-example/nodejs/public/stylesheets/stylesheet.css
+++ b/web/documentserver-example/nodejs/public/stylesheets/stylesheet.css
@@ -157,6 +157,10 @@ label .checkbox {
     background-image: url("../images/file_pptx.svg");
 }
 
+.try-editor.form {
+    background-image: url("../images/file_docxf.svg");
+}
+
 .create-sample {
     color: #666666;
     line-height: 24px;
diff --git a/web/documentserver-example/nodejs/views/index.ejs b/web/documentserver-example/nodejs/views/index.ejs
index f072ccee..67159243 100644
--- a/web/documentserver-example/nodejs/views/index.ejs
+++ b/web/documentserver-example/nodejs/views/index.ejs
@@ -56,6 +56,9 @@
                                         <li>
                                             <a class="try-editor slide reload-page" target="_blank" href="editor?fileExt=pptx<%= params %>" title="Create new presentation">Presentation</a>
                                         </li>
+                                        <li>
+                                            <a class="try-editor form reload-page" target="_blank" href="editor?fileExt=docxf<%= params %>" title="Create new master form">Master form</a>
+                                        </li>
                                     </ul>
                                     <label class="create-sample">
                                         <input id="createSample" type="checkbox" class="checkbox" />With sample content

From 7cd7f1bf664c586d8ec1b8e5806404b32fde764e Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Mon, 15 Nov 2021 13:12:18 +0300
Subject: [PATCH 10/62] java-spring: add Save Copy as...

---
 .../controllers/FileController.java           | 34 +++++++++++++++++++
 .../src/main/resources/templates/editor.html  | 25 +++++++++++++-
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java
index 8bfceaa6..81c08e28 100755
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java
@@ -58,6 +58,9 @@ public class FileController {
     @Value("${files.docservice.header}")
     private String documentJwtHeader;
 
+    @Value("${filesize-max}")
+    private String filesizeMax;
+
     @Autowired
     private FileUtility fileUtility;
     @Autowired
@@ -278,4 +281,35 @@ public class FileController {
 
         return"{\"error\":" + error + "}";
     }
+
+    @PostMapping("/saveas")
+    @ResponseBody
+    public String saveAs(@RequestBody JSONObject body, @CookieValue("uid") String uid) {
+        String title = (String) body.get("title");
+        String saveAsFileUrl = (String) body.get("url");
+
+        try {
+            String fileName = documentManager.getCorrectName(title);
+            String curExt = fileUtility.getFileExtension(fileName);
+
+            if (!fileUtility.getFileExts().contains(curExt)) {
+                return "{\"error\":\"File type is not supported\"}";
+            }
+
+            URL url = new URL(saveAsFileUrl);
+            java.net.HttpURLConnection connection = (java.net.HttpURLConnection) url.openConnection();
+            InputStream stream = connection.getInputStream();
+
+            if (Integer.parseInt(filesizeMax) < stream.available() || stream.available() <= 0) {
+                return "{\"error\":\"File size is incorrect\"}";
+            }
+            storageMutator.createFile(Path.of(storagePathBuilder.getFileLocation(fileName)), stream);
+            createUserMetadata(uid, fileName);
+
+            return "{\"file\":  \"" + fileName + "\"}";
+        } catch (IOException e) {
+            e.printStackTrace();
+            return "{ \"error\" : 1, \"message\" : \"" + e.getMessage() + "\"}";
+        }
+    }
 }
diff --git a/web/documentserver-example/java-spring/src/main/resources/templates/editor.html b/web/documentserver-example/java-spring/src/main/resources/templates/editor.html
index 0999b526..567077b6 100755
--- a/web/documentserver-example/java-spring/src/main/resources/templates/editor.html
+++ b/web/documentserver-example/java-spring/src/main/resources/templates/editor.html
@@ -31,9 +31,11 @@
         <script th:inline="javascript">
                 var docEditor;
 
-                var innerAlert = function (message) {
+                var innerAlert = function (message, inEditor) {
                     if (console && console.log)
                         console.log(message);
+                    if (inEditor && docEditor)
+                        docEditor.showMessage(message);
                 };
 
                 var onAppReady = function () {
@@ -108,6 +110,23 @@
                     config.editorConfig.user.name = "";
                 }
 
+                var onRequestSaveAs = function (event) {  //  the user is trying to save file by clicking Save Copy as... button
+                    var title = event.data.title;
+                    var url = event.data.url;
+                    var data = {
+                        title: title,
+                        url: url
+                    };
+                    let xhr = new XMLHttpRequest();
+                    xhr.open("POST", "saveas");
+                    xhr.setRequestHeader( 'Content-Type', 'application/json');
+                    xhr.send(JSON.stringify(data));
+                    xhr.onload = function () {
+                        innerAlert(xhr.responseText);
+                        innerAlert(JSON.parse(xhr.responseText).file, true);
+                    }
+                };
+
                 config.width = "100%";
                 config.height = "100%";
                 config.events = {
@@ -155,6 +174,10 @@
                     };
                 }
 
+                if (config.editorConfig.createUrl) {
+                    config.events.onRequestSaveAs = onRequestSaveAs;
+                };
+
                 var сonnectEditor = function () {
                     docEditor = new DocsAPI.DocEditor("iframeEditor", config);
                 };

From 7f4165f9589d89c75ca4764886c2e36fb286bf13 Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Mon, 15 Nov 2021 13:48:55 +0300
Subject: [PATCH 11/62] java: add Save Copy as...

---
 .../main/java/controllers/IndexServlet.java   | 42 +++++++++++++++++
 .../main/java/helpers/DocumentManager.java    | 46 +++++++++++--------
 .../java/src/main/webapp/editor.jsp           | 25 +++++++++-
 3 files changed, 93 insertions(+), 20 deletions(-)

diff --git a/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java b/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java
index 488462bd..6e7eeb02 100644
--- a/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java
+++ b/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java
@@ -40,6 +40,7 @@ import entities.FileType;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
 import org.primeframework.jwt.Verifier;
 import org.primeframework.jwt.domain.JWT;
 import org.primeframework.jwt.hmac.HMACVerifier;
@@ -89,6 +90,47 @@ public class IndexServlet extends HttpServlet
             case "files":
                 Files(request, response, writer);
                 break;
+            case "saveas":
+                SaveAs(request, response, writer);
+                break;
+        }
+    }
+
+    private static void SaveAs(HttpServletRequest request, HttpServletResponse response, PrintWriter writer) {
+        response.setContentType("text/plain");
+        try {
+            Scanner scanner = new Scanner(request.getInputStream());
+            scanner.useDelimiter("\\A");
+            String bodyString = scanner.hasNext() ? scanner.next() : "";
+            scanner.close();
+
+            JSONParser parser = new JSONParser();
+            JSONObject body = (JSONObject) parser.parse(bodyString);
+
+            CookieManager cm = new CookieManager(request);
+            User user = Users.getUser(cm.getCookie("uid"));
+
+            String title = (String) body.get("title");
+            String saveAsFileUrl = (String) body.get("url");
+            int filesizeMax = Integer.parseInt(ConfigManager.GetProperty("filesize-max"));
+
+            URL url = new URL(saveAsFileUrl);
+            java.net.HttpURLConnection connection = (java.net.HttpURLConnection) url.openConnection();
+            InputStream stream = connection.getInputStream();
+
+            if (filesizeMax < stream.available() || stream.available() <= 0) {
+                writer.write( "{\"error\":\"File size is incorrect\"}");
+            }
+
+            String fileName = DocumentManager.GetCorrectName(title, null);
+            DocumentManager.CreateFile(Paths.get(DocumentManager.StoragePath(fileName, null)), stream);
+
+            DocumentManager.CreateMeta(fileName, user.id, user.name, null);
+
+            writer.write( "{\"file\":  \"" + fileName + "\"}");
+        } catch (Exception e) {
+            e.printStackTrace();
+            writer.write("{ \"error\" : 1, \"message\" : \"" + e.getMessage() + "\"}");
         }
     }
 
diff --git a/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java b/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java
index b63a045c..8704fdfb 100644
--- a/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java
+++ b/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java
@@ -18,16 +18,14 @@
 
 package helpers;
 
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
+import java.io.*;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.net.InetAddress;
 import java.net.URLEncoder;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import javax.servlet.http.HttpServletRequest;
@@ -279,19 +277,7 @@ public class DocumentManager
 
         InputStream stream = Thread.currentThread().getContextClassLoader().getResourceAsStream(demoPath + demoName);  // get the input file stream
 
-        File file = new File(StoragePath(fileName, null));
-
-        try (FileOutputStream out = new FileOutputStream(file))
-        {
-            int read;
-            final byte[] bytes = new byte[1024];
-            while ((read = stream.read(bytes)) != -1)
-            {
-                out.write(bytes, 0, read);  // write bytes to the output stream
-            }
-            // force write data to the output stream that can be cached in the current thread
-            out.flush();
-        }
+        CreateFile(Paths.get(StoragePath(fileName, null)), stream);
 
         // create meta information of the demo file
         CreateMeta(fileName, user.id, user.name, null);
@@ -299,6 +285,28 @@ public class DocumentManager
         return fileName;
     }
 
+    public static boolean CreateFile(Path path, InputStream stream) {
+        if (Files.exists(path)){
+            return true;
+        }
+        try {
+            File file = Files.createFile(path).toFile();
+            try (FileOutputStream out = new FileOutputStream(file))
+            {
+                int read;
+                final byte[] bytes = new byte[1024];
+                while ((read = stream.read(bytes)) != -1)
+                {
+                    out.write(bytes, 0, read);
+                }
+                out.flush();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
     // get file url
     public static String GetFileUri(String fileName, Boolean forDocumentServer)
     {
diff --git a/web/documentserver-example/java/src/main/webapp/editor.jsp b/web/documentserver-example/java/src/main/webapp/editor.jsp
index 836bbe7d..971855c7 100644
--- a/web/documentserver-example/java/src/main/webapp/editor.jsp
+++ b/web/documentserver-example/java/src/main/webapp/editor.jsp
@@ -37,9 +37,11 @@
 
         var docEditor;
 
-        var innerAlert = function (message) {
+        var innerAlert = function (message, inEditor) {
             if (console && console.log)
                 console.log(message);
+            if (inEditor && docEditor)
+                docEditor.showMessage(message);
         };
 
         // the application is loaded into the browser
@@ -119,6 +121,23 @@
             docEditor.setMailMergeRecipients(${dataMailMergeRecipients});  // insert recipient data for mail merge into the file
         };
 
+        var onRequestSaveAs = function (event) {  //  the user is trying to save file by clicking Save Copy as... button
+            var title = event.data.title;
+            var url = event.data.url;
+            var data = {
+                title: title,
+                url: url
+            };
+            let xhr = new XMLHttpRequest();
+            xhr.open("POST", "IndexServlet?type=saveas");
+            xhr.setRequestHeader( 'Content-Type', 'application/json');
+            xhr.send(JSON.stringify(data));
+            xhr.onload = function () {
+                innerAlert(xhr.responseText);
+                innerAlert(JSON.parse(xhr.responseText).file, true);
+            }
+        };
+
         var config = JSON.parse('<%= FileModel.Serialize(Model) %>');
         config.width = "100%";
         config.height = "100%";
@@ -174,6 +193,10 @@
             };
         <% } %>
 
+        if (config.editorConfig.createUrl) {
+            config.events.onRequestSaveAs = onRequestSaveAs;
+        };
+
         var сonnectEditor = function () {
             docEditor = new DocsAPI.DocEditor("iframeEditor", config);
         };

From 5ecb4226e8d99a77c7ac66317ae83dff3ea6c153 Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Mon, 15 Nov 2021 14:23:54 +0300
Subject: [PATCH 12/62] python: add Save Copy as...

---
 web/documentserver-example/python/src/urls.py |  3 +-
 .../python/src/views/actions.py               | 32 +++++++++++++++++++
 .../python/templates/editor.html              | 24 +++++++++++++-
 3 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/web/documentserver-example/python/src/urls.py b/web/documentserver-example/python/src/urls.py
index 502398ee..44f150e2 100644
--- a/web/documentserver-example/python/src/urls.py
+++ b/web/documentserver-example/python/src/urls.py
@@ -39,7 +39,8 @@ urlpatterns = [
     path('track', actions.track),
     path('remove', actions.remove),
     path('csv', actions.csv),
-    path('files', actions.files)
+    path('files', actions.files),
+    path('saveas', actions.saveAs)
 ]
 
 urlpatterns += staticfiles_urlpatterns()
\ No newline at end of file
diff --git a/web/documentserver-example/python/src/views/actions.py b/web/documentserver-example/python/src/views/actions.py
index b0eaf05b..479cfdc2 100644
--- a/web/documentserver-example/python/src/views/actions.py
+++ b/web/documentserver-example/python/src/views/actions.py
@@ -23,6 +23,7 @@
  SOFTWARE.
 
 """
+import requests
 
 import config
 import json
@@ -115,6 +116,37 @@ def createNew(request):
 
     return HttpResponse(json.dumps(response), content_type='application/json')
 
+# save file as...
+def saveAs(request):
+    response ={}
+
+    try:
+        body = json.loads(request.body)
+        saveAsFileUrl = body.get('url')
+        title = body.get('title')
+
+        filename = docManager.getCorrectName(title, request)
+        path = docManager.getStoragePath(filename, request)
+        resp = requests.get(saveAsFileUrl)
+
+        if ((len(resp.content) > config.FILE_SIZE_MAX) | (len(resp.content) <= 0)):  # check if the file size exceeds the maximum size allowed (5242880)
+            response.setdefault('error', 'File size is incorrect')
+            raise Exception('File size is incorrect')
+
+        curExt = fileUtils.getFileExt(filename)
+        if not docManager.isSupportedExt(curExt):  # check if the file extension is supported by the document manager
+            response.setdefault('error', 'File type is not supported')
+            raise Exception('File type is not supported')
+
+        docManager.saveFileFromUri(saveAsFileUrl, path, request, True)  # save the file from the new url in the storage directory
+
+        response.setdefault('file', filename)
+    except Exception as e:
+        response.setdefault('error', 1)
+        response.setdefault('message', e.args[0])
+
+    return HttpResponse(json.dumps(response), content_type='application/json')
+
 # edit a file
 def edit(request):
     filename = fileUtils.getFileName(request.GET['filename'])
diff --git a/web/documentserver-example/python/templates/editor.html b/web/documentserver-example/python/templates/editor.html
index c0a117fe..25a8223d 100644
--- a/web/documentserver-example/python/templates/editor.html
+++ b/web/documentserver-example/python/templates/editor.html
@@ -50,9 +50,11 @@
 
         var docEditor;
 
-        var innerAlert = function (message) {
+        var innerAlert = function (message, inEditor) {
             if (console && console.log)
                 console.log(message);
+            if (inEditor && docEditor)
+                docEditor.showMessage(message);
         };
 
         // the application is loaded into the browser
@@ -134,6 +136,23 @@
             );
         };
 
+        var onRequestSaveAs = function (event) {  //  the user is trying to save file by clicking Save Copy as... button
+            var title = event.data.title;
+            var url = event.data.url;
+            var data = {
+                title: title,
+                url: url
+            };
+            let xhr = new XMLHttpRequest();
+            xhr.open("POST", "saveas");
+            xhr.setRequestHeader( 'Content-Type', 'application/json');
+            xhr.send(JSON.stringify(data));
+            xhr.onload = function () {
+                innerAlert(xhr.responseText);
+                innerAlert(JSON.parse(xhr.responseText).file, true);
+            }
+        };
+
         var connectEditor = function () {
 
             config = {{ cfg | safe }}
@@ -188,6 +207,9 @@
 
             {% endif %}
 
+            if (config.editorConfig.createUrl) {
+                config.events.onRequestSaveAs = onRequestSaveAs;
+            };
             docEditor = new DocsAPI.DocEditor("iframeEditor", config);
 
             fixSize();

From 2429668b5703c0c56a20b0c0713f5d14e678355c Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Mon, 15 Nov 2021 16:01:57 +0300
Subject: [PATCH 13/62] ruby: add Copy File as...

---
 .../ruby/app/controllers/home_controller.rb   | 42 +++++++++++++++++++
 .../ruby/app/views/home/editor.html.erb       | 25 ++++++++++-
 .../ruby/config/routes.rb                     |  1 +
 3 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb
index c264552c..ec49a36c 100644
--- a/web/documentserver-example/ruby/app/controllers/home_controller.rb
+++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb
@@ -265,4 +265,46 @@ class HomeController < ApplicationController
       render plain: '{ "error": "File not found"}'
     end
   end
+
+  # Save Copy as...
+  def saveas
+    begin
+      body = JSON.parse(request.body.read)
+      file_url = body["url"]
+      title = body["title"]
+      file_name = DocumentHelper.get_correct_name(title, nil)
+      extension = File.extname(file_name).downcase
+      all_exts = DocumentHelper.convert_exts + DocumentHelper.edited_exts + DocumentHelper.viewed_exts
+
+      unless all_exts.include?(extension)
+        render plain: '{"error": "File type is not supported"}'
+      end
+
+      uri = URI.parse(file_url)  # create the request url
+      http = Net::HTTP.new(uri.host, uri.port)  # create a connection to the http server
+
+      if file_url.start_with?('https')
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE  # set the flags for the server certificate verification at the beginning of SSL session
+      end
+      req = Net::HTTP::Get.new(uri.request_uri)  # create the get requets
+      res = http.request(req)
+      data = res.body
+
+      if data.size <= 0 || data.size > Rails.configuration.fileSizeMax
+        render plain: '{"error": "File size is incorrect"}'
+      end
+
+      File.open(DocumentHelper.storage_path(file_name, nil), 'wb') do |file|
+        file.write(data)
+      end
+      user = Users.get_user(cookies[:uid])
+      DocumentHelper.create_meta(file_name, user.id, user.name, nil)  # create meta data of the new file
+
+      render plain: '{"file" : "' + file_name + '"}'
+    rescue => ex
+      render plain: '{"error":1, "message": "' + ex.message + '"}'
+      return
+    end
+  end
 end
\ No newline at end of file
diff --git a/web/documentserver-example/ruby/app/views/home/editor.html.erb b/web/documentserver-example/ruby/app/views/home/editor.html.erb
index 73cf88b5..5bf5d31d 100644
--- a/web/documentserver-example/ruby/app/views/home/editor.html.erb
+++ b/web/documentserver-example/ruby/app/views/home/editor.html.erb
@@ -27,9 +27,11 @@
 
     var docEditor;
 
-    var innerAlert = function (message) {
+    var innerAlert = function (message, inEditor) {
         if (console && console.log)
             console.log(message);
+        if (inEditor && docEditor)
+            docEditor.showMessage(message);
     };
 
     // the application is loaded into the browser
@@ -109,6 +111,23 @@
         docEditor.setMailMergeRecipients(<%= raw @file.dataMailMergeRecipients.to_json %>);  // insert recipient data for mail merge into the file
     };
 
+    var onRequestSaveAs = function (event) {  //  the user is trying to save file by clicking Save Copy as... button
+        var title = event.data.title;
+        var url = event.data.url;
+        var data = {
+            title: title,
+            url: url
+        };
+        let xhr = new XMLHttpRequest();
+        xhr.open("POST", "saveas");
+        xhr.setRequestHeader( 'Content-Type', 'application/json');
+        xhr.send(JSON.stringify(data));
+        xhr.onload = function () {
+            innerAlert(xhr.responseText);
+            innerAlert(JSON.parse(xhr.responseText).file, true);
+        }
+    };
+
     var сonnectEditor = function () {
 
         var config = <%= raw @file.get_config.to_json %>;
@@ -166,6 +185,10 @@
             <% end
         %>
 
+        if (config.editorConfig.createUrl) {
+            config.events.onRequestSaveAs = onRequestSaveAs;
+        };
+
         docEditor = new DocsAPI.DocEditor("iframeEditor", config);
     };
 
diff --git a/web/documentserver-example/ruby/config/routes.rb b/web/documentserver-example/ruby/config/routes.rb
index dbb51624..35fafb97 100644
--- a/web/documentserver-example/ruby/config/routes.rb
+++ b/web/documentserver-example/ruby/config/routes.rb
@@ -11,6 +11,7 @@ Rails.application.routes.draw do
   match '/track',    to: 'home#track',    via: 'post'
   match '/csv',    to: 'home#csv',    via: 'get'
   match '/files',    to: 'home#files',    via: 'get'
+  match '/saveas',    to: 'home#saveas',    via: 'post'
 
   # The priority is based upon order of creation: first created -> highest priority.
   # See how all your routes lay out with "rake routes".

From 605028151f3c77a3b7f2dd1155c2510af2c10579 Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Mon, 15 Nov 2021 16:59:34 +0300
Subject: [PATCH 14/62] csharp: add Copy File as...

---
 .../csharp/Default.aspx.cs                    | 66 +++++++++++++++++++
 .../csharp/DocEditor.aspx                     | 25 ++++++-
 .../csharp/WebEditor.ashx.cs                  | 17 +++++
 3 files changed, 107 insertions(+), 1 deletion(-)

diff --git a/web/documentserver-example/csharp/Default.aspx.cs b/web/documentserver-example/csharp/Default.aspx.cs
index bde7ee1f..9150a345 100644
--- a/web/documentserver-example/csharp/Default.aspx.cs
+++ b/web/documentserver-example/csharp/Default.aspx.cs
@@ -346,6 +346,72 @@ namespace OnlineEditorsExample
             return _fileName;
         }
 
+        public static string DoSaveAs(HttpContext context)
+        {
+            string fileData;
+            try
+            {
+                using (var receiveStream = context.Request.InputStream)
+                using (var readStream = new StreamReader(receiveStream))
+                {
+                    fileData = readStream.ReadToEnd();
+                    if (string.IsNullOrEmpty(fileData)) return "{\"error\":1,\"message\":\"Request stream is empty\"}";
+                }
+            }
+            catch (Exception e)
+            {
+                throw new HttpException((int)HttpStatusCode.BadRequest, e.Message);
+            }
+
+            var jss = new JavaScriptSerializer();
+            var body = jss.Deserialize<Dictionary<string, object>>(fileData);
+            var fileUrl = (string) body["url"];
+            var title = (string) body["title"];
+            var fileName = GetCorrectName(title);
+            var extension = "." + (Path.GetExtension(fileName).ToLower() ?? "").Trim('.');
+
+            var allExt = ConvertExts.Concat(EditedExts).Concat(ViewedExts).ToArray();
+
+            if (!allExt.Contains(extension))
+            {
+                return "{\"error\":1,\"message\":\"File type is not supported\"}";
+            }
+            
+            var req = (HttpWebRequest)WebRequest.Create(fileUrl);
+            
+            // hack. http://ubuntuforums.org/showthread.php?t=1841740
+            if (IsMono)
+            {
+                ServicePointManager.ServerCertificateValidationCallback += (s, ce, ca, p) => true;
+            }
+            
+            using (var stream = req.GetResponse().GetResponseStream())
+            {
+                
+                if (stream == null || req.GetResponse().ContentLength <= 0 || req.GetResponse().ContentLength > MaxFileSize)
+                {
+                    return "{\"error\":1,\"message\":\"File size is incorrect\"}";
+                }
+                const int bufferSize = 4096;
+            
+                using (var fs = File.Open(StoragePath(fileName, null), FileMode.Create))
+                {
+                    var buffer = new byte[bufferSize];
+                    int readed;
+                    while ((readed = stream.Read(buffer, 0, bufferSize)) != 0)
+                    {
+                        fs.Write(buffer, 0, readed);  // write bytes to the output stream
+                    }
+                }
+            }
+                
+            var id = context.Request.Cookies.GetOrDefault("uid", null);
+            var user = Users.getUser(id);  // get the user
+            DocEditor.CreateMeta(fileName, user.id, user.name, null);
+
+            return "{ \"file\": \"" + fileName + "\"}";
+        }
+
         // converting a file
         public static string DoConvert(HttpContext context)
         {
diff --git a/web/documentserver-example/csharp/DocEditor.aspx b/web/documentserver-example/csharp/DocEditor.aspx
index 2324251c..91da585d 100644
--- a/web/documentserver-example/csharp/DocEditor.aspx
+++ b/web/documentserver-example/csharp/DocEditor.aspx
@@ -65,9 +65,11 @@
 
         var docEditor;
 
-        var innerAlert = function (message) {
+        var innerAlert = function (message, inEditor) {
             if (console && console.log)
                 console.log(message);
+            if (inEditor && docEditor)
+                docEditor.showMessage(message);
         };
 
         // the application is loaded into the browser
@@ -146,6 +148,23 @@
         var onRequestMailMergeRecipients = function (event) {
             docEditor.setMailMergeRecipients(<%= DataMailMergeRecipients %>);  // insert recipient data for mail merge into the file
         };
+        
+        var onRequestSaveAs = function (event) {  //  the user is trying to save file by clicking Save Copy as... button
+            var title = event.data.title;
+            var url = event.data.url;
+            var data = {
+                title: title,
+                url: url
+            };
+            let xhr = new XMLHttpRequest();
+            xhr.open("POST", "webeditor.ashx?type=saveas");
+            xhr.setRequestHeader( 'Content-Type', 'application/json');
+            xhr.send(JSON.stringify(data));
+            xhr.onload = function () {
+                innerAlert(xhr.responseText);
+                innerAlert(JSON.parse(xhr.responseText).file, true);
+            }
+        };
 
         var config = <%= DocConfig %>;
 
@@ -195,6 +214,10 @@
             innerAlert("onRequestSendNotify: " + data);
         };
         <% } %>
+        
+        if (config.editorConfig.createUrl) {
+            config.events.onRequestSaveAs = onRequestSaveAs;
+        };
 
         var сonnectEditor = function () {
             docEditor = new DocsAPI.DocEditor("iframeEditor", config);
diff --git a/web/documentserver-example/csharp/WebEditor.ashx.cs b/web/documentserver-example/csharp/WebEditor.ashx.cs
index aaa83a72..7c087fe6 100644
--- a/web/documentserver-example/csharp/WebEditor.ashx.cs
+++ b/web/documentserver-example/csharp/WebEditor.ashx.cs
@@ -62,6 +62,23 @@ namespace OnlineEditorsExample
                 case "files":
                     Files(context);
                     break;
+                case "saveas":
+                    SaveAs(context);
+                    break;
+            }
+        }
+
+        private static void SaveAs(HttpContext context)
+        {
+            context.Response.ContentType = "text/plain";
+            try
+            {
+                var result = _Default.DoSaveAs(context);
+                context.Response.Write(result);
+            }
+            catch (Exception e)
+            {
+                context.Response.Write("{ \"error\": \"" + 1 + "\", \"documentType\": \"" + e.Message + "\"}");
             }
         }
 

From 873267a78448271a7becc7958ca812485efd49f1 Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Mon, 15 Nov 2021 17:08:13 +0300
Subject: [PATCH 15/62] csharp-mvc: add Copy File as...

---
 .../csharp-mvc/Views/Home/Editor.aspx         | 25 ++++++-
 .../csharp-mvc/WebEditor.ashx.cs              | 74 +++++++++++++++++++
 2 files changed, 98 insertions(+), 1 deletion(-)

diff --git a/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx b/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
index 698f5146..c266e8a9 100644
--- a/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
+++ b/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
@@ -47,9 +47,11 @@
 
         var docEditor;
 
-        var innerAlert = function (message) {
+        var innerAlert = function (message, inEditor) {
             if (console && console.log)
                 console.log(message);
+            if (inEditor && docEditor)
+                docEditor.showMessage(message);
         };
 
         // the application is loaded into the browser
@@ -134,6 +136,23 @@
             <% Model.GetMailMergeConfig(out dataMailMergeRecipients); %>
             docEditor.setMailMergeRecipients(<%= dataMailMergeRecipients%>);  // insert recipient data for mail merge into the file
         };
+        
+         var onRequestSaveAs = function (event) {  //  the user is trying to save file by clicking Save Copy as... button
+             var title = event.data.title;
+             var url = event.data.url;
+             var data = {
+                 title: title,
+                 url: url
+             };
+             let xhr = new XMLHttpRequest();
+             xhr.open("POST", "webeditor.ashx?type=saveas");
+             xhr.setRequestHeader( 'Content-Type', 'application/json');
+             xhr.send(JSON.stringify(data));
+             xhr.onload = function () {
+                 innerAlert(xhr.responseText);
+                 innerAlert(JSON.parse(xhr.responseText).file, true);
+             }
+         };
 
         var config = <%= Model.GetDocConfig(Request, Url) %>;
 
@@ -190,6 +209,10 @@
             innerAlert("onRequestSendNotify: " + data);
         };
         <% } %>
+        
+        if (config.editorConfig.createUrl) {
+            config.events.onRequestSaveAs = onRequestSaveAs;
+        };
 
         var сonnectEditor = function () {
             docEditor = new DocsAPI.DocEditor("iframeEditor", config);
diff --git a/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs b/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
index 701b3128..ce578ef6 100644
--- a/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
+++ b/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
@@ -64,6 +64,80 @@ namespace OnlineEditorsExampleMVC
                 case "files":
                     Files(context);
                     break;
+                case "saveas":
+                    SaveAs(context);
+                    break;
+            }
+        }
+
+        private static void SaveAs(HttpContext context)
+        {
+            context.Response.ContentType = "text/plain";
+            try
+            {
+                    string fileData;
+                try
+                {
+                    using (var receiveStream = context.Request.InputStream)
+                    using (var readStream = new StreamReader(receiveStream))
+                    {
+                        fileData = readStream.ReadToEnd();
+                        if (string.IsNullOrEmpty(fileData)) context.Response.Write("{\"error\":1,\"message\":\"Request stream is empty\"}");
+                    }
+                }
+                catch (Exception e)
+                {
+                    throw new HttpException((int)HttpStatusCode.BadRequest, e.Message);
+                }
+    
+                var jss = new JavaScriptSerializer();
+                var body = jss.Deserialize<Dictionary<string, object>>(fileData);
+                var fileUrl = (string) body["url"];
+                var title = (string) body["title"];
+                var fileName = DocManagerHelper.GetCorrectName(title);
+                var extension = "." + (Path.GetExtension(fileName).ToLower() ?? "").Trim('.');
+    
+                var allExt = DocManagerHelper.ConvertExts
+                    .Concat(DocManagerHelper.EditedExts)
+                    .Concat(DocManagerHelper.ViewedExts)
+                    .ToArray();
+    
+                if (!allExt.Contains(extension))
+                { 
+                    context.Response.Write("{\"error\":1,\"message\":\"File type is not supported\"}");
+                }
+                
+                var req = (HttpWebRequest)WebRequest.Create(fileUrl);
+    
+                using (var stream = req.GetResponse().GetResponseStream())
+                {
+                    
+                    if (stream == null || req.GetResponse().ContentLength <= 0 || req.GetResponse().ContentLength > DocManagerHelper.MaxFileSize)
+                    {
+                        context.Response.Write("{\"error\":1,\"message\":\"File size is incorrect\"}");
+                    }
+                    const int bufferSize = 4096;
+                
+                    using (var fs = File.Open(DocManagerHelper.StoragePath(fileName, null), FileMode.Create))
+                    {
+                        var buffer = new byte[bufferSize];
+                        int readed;
+                        while ((readed = stream.Read(buffer, 0, bufferSize)) != 0)
+                        {
+                            fs.Write(buffer, 0, readed);  // write bytes to the output stream
+                        }
+                    }
+                }
+                    
+                var id = context.Request.Cookies.GetOrDefault("uid", null);
+                var user = Users.getUser(id);  // get the user
+                DocManagerHelper.CreateMeta(fileName, user.id, user.name, null);
+    
+                context.Response.Write("{ \"file\": \"" + fileName + "\"}");
+            }
+            catch (Exception e)
+            {
+                context.Response.Write("{ \"error\": \"" + 1 + "\", \"documentType\": \"" + e.Message + "\"}");
             }
         }
 

From 4418d8e5d5ab10cb77b734710f6cb78c8167561c Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Mon, 15 Nov 2021 17:38:20 +0300
Subject: [PATCH 16/62] csharp and csharp-mvc: fix error messages

---
 web/documentserver-example/csharp-mvc/WebEditor.ashx.cs | 8 ++++----
 web/documentserver-example/csharp/Default.aspx.cs       | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs b/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
index ce578ef6..5ef974e1 100644
--- a/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
+++ b/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
@@ -82,7 +82,7 @@ namespace OnlineEditorsExampleMVC
                     using (var readStream = new StreamReader(receiveStream))
                     {
                         fileData = readStream.ReadToEnd();
-                        if (string.IsNullOrEmpty(fileData)) context.Response.Write("{\"error\":1,\"message\":\"Request stream is empty\"}");
+                        if (string.IsNullOrEmpty(fileData)) context.Response.Write("{\"error\":\"Request stream is empty\"}");
                     }
                 }
                 catch (Exception e)
@@ -104,7 +104,7 @@ namespace OnlineEditorsExampleMVC
     
                 if (!allExt.Contains(extension))
                 { 
-                    context.Response.Write("{\"error\":1,\"message\":\"File type is not supported\"}");
+                    context.Response.Write("{\"error\":\"File type is not supported\"}");
                 }
                 
                 var req = (HttpWebRequest)WebRequest.Create(fileUrl);
@@ -114,7 +114,7 @@ namespace OnlineEditorsExampleMVC
                     
                     if (stream == null || req.GetResponse().ContentLength <= 0 || req.GetResponse().ContentLength > DocManagerHelper.MaxFileSize)
                     {
-                        context.Response.Write("{\"error\":1,\"message\":\"File size is incorrect\"}");
+                        context.Response.Write("{\"error\": \"File size is incorrect\"}");
                     }
                     const int bufferSize = 4096;
                 
@@ -137,7 +137,7 @@ namespace OnlineEditorsExampleMVC
             }
             catch (Exception e)
             {
-                context.Response.Write("{ \"error\": \"" + 1 + "\", \"documentType\": \"" + e.Message + "\"}");
+                context.Response.Write("{ \"error\": \"" + 1 + "\", \"message\": \"" + e.Message + "\"}");
             }
         }
 
diff --git a/web/documentserver-example/csharp/Default.aspx.cs b/web/documentserver-example/csharp/Default.aspx.cs
index 9150a345..2f0709c9 100644
--- a/web/documentserver-example/csharp/Default.aspx.cs
+++ b/web/documentserver-example/csharp/Default.aspx.cs
@@ -355,7 +355,7 @@ namespace OnlineEditorsExample
                 using (var readStream = new StreamReader(receiveStream))
                 {
                     fileData = readStream.ReadToEnd();
-                    if (string.IsNullOrEmpty(fileData)) return "{\"error\":1,\"message\":\"Request stream is empty\"}";
+                    if (string.IsNullOrEmpty(fileData)) return "{\"error\":\"Request stream is empty\"}";
                 }
             }
             catch (Exception e)
@@ -374,7 +374,7 @@ namespace OnlineEditorsExample
 
             if (!allExt.Contains(extension))
             {
-                return "{\"error\":1,\"message\":\"File type is not supported\"}";
+                return "{\"error\":\"File type is not supported\"}";
             }
             
             var req = (HttpWebRequest)WebRequest.Create(fileUrl);
@@ -390,7 +390,7 @@ namespace OnlineEditorsExample
                 
                 if (stream == null || req.GetResponse().ContentLength <= 0 || req.GetResponse().ContentLength > MaxFileSize)
                 {
-                    return "{\"error\":1,\"message\":\"File size is incorrect\"}";
+                    return "{\"error\": \"File size is incorrect\"}";
                 }
                 const int bufferSize = 4096;
             
@@ -409,7 +409,7 @@ namespace OnlineEditorsExample
             var user = Users.getUser(id);  // get the user
             DocEditor.CreateMeta(fileName, user.id, user.name, null);
 
-            return "{ \"file\": \"" + fileName + "\"}";
+            return "{\"file\": \"" + fileName + "\"}";
         }
 
         // converting a file

From bee95b4e6a0e1dbcc47ae4a3115ac720419398ed Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Mon, 15 Nov 2021 18:15:20 +0300
Subject: [PATCH 17/62] php: add Copy File as...

---
 .../csharp/WebEditor.ashx.cs                  |  2 +-
 web/documentserver-example/php/doceditor.php  | 25 ++++++++++-
 .../php/webeditor-ajax.php                    | 45 ++++++++++++++++++-
 3 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/web/documentserver-example/csharp/WebEditor.ashx.cs b/web/documentserver-example/csharp/WebEditor.ashx.cs
index 7c087fe6..099e68dc 100644
--- a/web/documentserver-example/csharp/WebEditor.ashx.cs
+++ b/web/documentserver-example/csharp/WebEditor.ashx.cs
@@ -78,7 +78,7 @@ namespace OnlineEditorsExample
             }
             catch (Exception e)
             {
-                context.Response.Write("{ \"error\": \"" + 1 + "\", \"documentType\": \"" + e.Message + "\"}");
+                context.Response.Write("{ \"error\": \"" + 1 + "\", \"message\": \"" + e.Message + "\"}");
             }
         }
 
diff --git a/web/documentserver-example/php/doceditor.php b/web/documentserver-example/php/doceditor.php
index 5a7cec9c..126cd7c5 100644
--- a/web/documentserver-example/php/doceditor.php
+++ b/web/documentserver-example/php/doceditor.php
@@ -333,9 +333,11 @@
 
         var docEditor;
 
-        var innerAlert = function (message) {
+        var innerAlert = function (message, inEditor) {
             if (console && console.log)
                 console.log(message);
+            if (inEditor && docEditor)
+                docEditor.showMessage(message);
         };
 
         // the application is loaded into the browser
@@ -415,6 +417,23 @@
             docEditor.setMailMergeRecipients(<?php echo json_encode($dataMailMergeRecipients) ?>);  // insert recipient data for mail merge into the file
         };
 
+        var onRequestSaveAs = function (event) {  //  the user is trying to save file by clicking Save Copy as... button
+            var title = event.data.title;
+            var url = event.data.url;
+            var data = {
+                title: title,
+                url: url
+            };
+            let xhr = new XMLHttpRequest();
+            xhr.open("POST", "webeditor-ajax.php?type=saveas");
+            xhr.setRequestHeader( 'Content-Type', 'application/json');
+            xhr.send(JSON.stringify(data));
+            xhr.onload = function () {
+                innerAlert(xhr.responseText);
+                innerAlert(JSON.parse(xhr.responseText.substring(xhr.responseText.indexOf("{"))).file, true);
+            }
+        };
+
         var сonnectEditor = function () {
 
             <?php
@@ -478,6 +497,10 @@
             };
             <?php endif; ?>
 
+            if (config.editorConfig.createUrl) {
+                config.events.onRequestSaveAs = onRequestSaveAs;
+            };
+
             docEditor = new DocsAPI.DocEditor("iframeEditor", config);
         };
 
diff --git a/web/documentserver-example/php/webeditor-ajax.php b/web/documentserver-example/php/webeditor-ajax.php
index caf54875..f096e5ba 100644
--- a/web/documentserver-example/php/webeditor-ajax.php
+++ b/web/documentserver-example/php/webeditor-ajax.php
@@ -87,6 +87,10 @@ if (isset($_GET["type"]) && !empty($_GET["type"])) {
         case "files":
             $response_array = files();
             die (json_encode($response_array));
+        case "saveas":
+            $response_array = saveas();
+            $response_array['status'] = 'success';
+            die (json_encode($response_array));
         default:
             $response_array['status'] = 'error';
             $response_array['error'] = '404 Method not found';
@@ -94,6 +98,43 @@ if (isset($_GET["type"]) && !empty($_GET["type"])) {
     }
 }
 
+// save copy as...
+function saveas() {
+   try {
+       $result;
+       $post = json_decode(file_get_contents('php://input'), true);
+       $fileurl = $post["url"];
+       $title = $post["title"];
+       $extension = strtolower(pathinfo($title, PATHINFO_EXTENSION));
+       $allexts = array_merge($GLOBALS['DOC_SERV_CONVERT'], $GLOBALS['DOC_SERV_EDITED'], $GLOBALS['DOC_SERV_VIEWD']);
+       $filename = GetCorrectName($title);
+
+       if (!in_array("." . $extension, $allexts)) {
+           $result["error"] = "File type is not supported";
+           return $result;
+       }
+       $headers = get_headers($fileurl, 1);
+       $content_length = $headers["Content-Length"];
+       $data = file_get_contents(str_replace(" ","%20",$fileurl));
+
+       if ($data === false || $content_length <= 0 || $content_length > $GLOBALS['FILE_SIZE_MAX']) {
+           $result["error"] = "File size is incorrect";
+           return $result;
+       }
+
+       file_put_contents(getStoragePath($filename), $data, LOCK_EX);  // write data to the new file
+       $user = getUser($_GET["user"]);
+       createMeta($filename, $user->id, $user->name);  // and create meta data for this file
+
+       $result["file"] = $filename;
+       return $result;
+   } catch (Exception $e) {
+       sendlog("SaveAs: ".$e->getMessage(), "webedior-ajax.log");
+       $result["error"] = "error: " . 1 . "message:" . $e->getMessage();
+       return $result;
+   }
+}
+
 // uploading a file
 function upload() {
     $result; $filename;
@@ -107,7 +148,7 @@ function upload() {
     $tmp = $_FILES['files']['tmp_name'];
 
     // if the temporary name doesn't exist, then an error occurs
-    if (empty(tmp)) {
+    if (empty($tmp)) {
         $result["error"] = 'No file sent';
         return $result;
     }
@@ -157,7 +198,7 @@ function track() {
 
     // get the body of the post request and check if it is correct
     $data = readBody();
-    if ($data["error"]){
+    if (!empty($data["error"])){
         return $data;
     }
 

From 19ebecd4d080264a8c7980e0d1d1ac2ce49cce7f Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Tue, 16 Nov 2021 12:19:36 +0300
Subject: [PATCH 18/62] java-spring: oform

---
 .../controllers/IndexController.java          |  4 +++
 .../util/file/DefaultFileUtility.java         | 11 +++++++-
 .../documentserver/util/file/FileUtility.java |  1 +
 .../DefaultCustomizationConfigurer.java       |  5 ++--
 .../DefaultEditorConfigConfigurer.java        | 10 +++++--
 .../wrappers/DefaultCustomizationWrapper.java |  3 ++-
 .../src/main/resources/application.properties |  1 +
 .../src/main/resources/templates/index.html   | 27 ++++++++++---------
 8 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/IndexController.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/IndexController.java
index 9a22382a..f9e28586 100755
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/IndexController.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/IndexController.java
@@ -70,6 +70,7 @@ public class IndexController {
         List<String> docTypes = new ArrayList<>();
         List<Boolean> filesEditable = new ArrayList<>();
         List<String> versions = new ArrayList<>();
+        List<Boolean> isFillFormDoc = new ArrayList<>();
 
         List<User> users = userService.findAll();
 
@@ -82,8 +83,10 @@ public class IndexController {
             docTypes.add(fileUtility.getDocumentType(fileName).toString().toLowerCase());
             filesEditable.add(fileUtility.getEditedExts().contains(fileUtility.getFileExtension(fileName)));
             versions.add(" ["+storagePathBuilder.getFileVersion(fileName, true)+"]");
+            isFillFormDoc.add(fileUtility.getFillExts().contains(fileUtility.getFileExtension(fileName)));
         }
 
+        model.addAttribute("isFillFormDoc", isFillFormDoc);
         model.addAttribute("versions",versions);
         model.addAttribute("files", files);
         model.addAttribute("docTypes", docTypes);
@@ -100,6 +103,7 @@ public class IndexController {
     public HashMap<String, String> configParameters(){
         HashMap<String, String> configuration = new HashMap<>();
 
+        configuration.put("FillExtList", String.join(",", fileUtility.getFillExts()));
         configuration.put("ConverExtList", String.join(",",fileUtility.getConvertExts()));
         configuration.put("EditedExtList", String.join(",",fileUtility.getEditedExts()));
         configuration.put("UrlConverter", urlConverter);
diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/file/DefaultFileUtility.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/file/DefaultFileUtility.java
index 23e115d5..d2338f14 100755
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/file/DefaultFileUtility.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/file/DefaultFileUtility.java
@@ -46,12 +46,15 @@ public class DefaultFileUtility implements FileUtility {
     @Value("${files.docservice.convert-docs}")
     private String docserviceConvertDocs;
 
+    @Value("${files.docservice.fillforms-docs}")
+    private String docserviceFillDocs;
+
     private List<String> ExtsDocument = Arrays.asList(
                             ".doc", ".docx", ".docm",
                             ".dot", ".dotx", ".dotm",
                             ".odt", ".fodt", ".ott", ".rtf", ".txt",
                             ".html", ".htm", ".mht", ".xml",
-                            ".pdf", ".djvu", ".fb2", ".epub", ".xps");
+                            ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oform");
 
     private List<String> ExtsSpreadsheet = Arrays.asList(
                             ".xls", ".xlsx", ".xlsm",
@@ -118,6 +121,11 @@ public class DefaultFileUtility implements FileUtility {
         return ".docx";
     }
 
+    public List<String> getFillExts()
+    {
+        return Arrays.asList(docserviceFillDocs.split("\\|"));
+    }
+
     public List<String> getViewedExts()
     {
         return Arrays.asList(docserviceViewedDocs.split("\\|"));
@@ -139,6 +147,7 @@ public class DefaultFileUtility implements FileUtility {
         res.addAll(getViewedExts());
         res.addAll(getEditedExts());
         res.addAll(getConvertExts());
+        res.addAll(getFillExts());
 
         return res;
     }
diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/file/FileUtility.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/file/FileUtility.java
index 25b622ed..5a6eaca4 100755
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/file/FileUtility.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/file/FileUtility.java
@@ -30,6 +30,7 @@ public interface FileUtility {
     String getFileExtension(String url);
     String getInternalExtension(DocumentType type);
     List<String> getFileExts();
+    List<String> getFillExts();
     List<String> getViewedExts();
     List<String> getEditedExts();
     List<String> getConvertExts();
diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultCustomizationConfigurer.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultCustomizationConfigurer.java
index 022c0c6b..626d52cb 100644
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultCustomizationConfigurer.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultCustomizationConfigurer.java
@@ -20,6 +20,7 @@ package com.onlyoffice.integration.services.configurers.implementations;
 
 import com.onlyoffice.integration.documentserver.models.enums.Action;
 import com.onlyoffice.integration.documentserver.models.configurations.Customization;
+import com.onlyoffice.integration.entities.User;
 import com.onlyoffice.integration.services.configurers.CustomizationConfigurer;
 import com.onlyoffice.integration.services.configurers.wrappers.DefaultCustomizationWrapper;
 import org.springframework.context.annotation.Primary;
@@ -31,7 +32,7 @@ public class DefaultCustomizationConfigurer implements CustomizationConfigurer<D
     @Override
     public void configure(Customization customization, DefaultCustomizationWrapper wrapper){
         Action action = wrapper.getAction();
-        Boolean canEdit = wrapper.getCanEdit();
-        customization.setSubmitForm(canEdit && (action.equals(Action.edit) || action.equals(Action.fillForms)));
+        User user = wrapper.getUser();
+        customization.setSubmitForm(action.equals(Action.fillForms) && user.getId() == 1);
     }
 }
diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultEditorConfigConfigurer.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultEditorConfigConfigurer.java
index d5c24117..d28639fc 100644
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultEditorConfigConfigurer.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultEditorConfigConfigurer.java
@@ -73,18 +73,24 @@ public class DefaultEditorConfigConfigurer implements EditorConfigConfigurer<Def
             config.setActionLink(objectMapper.readValue(wrapper.getActionData(), (JavaType) new TypeToken<HashMap<String, Object>>() { }.getType()));
         }
         String fileName = wrapper.getFileName();
+        String fileExt = fileUtility.getFileExtension(fileName);
         boolean userIsAnon = wrapper.getUser().getName().equals("Anonymous");
 
         config.setTemplates(userIsAnon ? null : templateManager.createTemplates(fileName));
         config.setCallbackUrl(documentManager.getCallback(fileName));
         config.setCreateUrl(userIsAnon ? null : documentManager.getCreateUrl(fileName, false));
         config.setLang(wrapper.getLang());
-        Boolean canEdit = fileUtility.getEditedExts().contains(fileUtility.getFileExtension(fileName));
+        Boolean canEdit = fileUtility.getEditedExts().contains(fileExt);
         Action action = wrapper.getAction();
 
+        if ((action.equals(Action.edit) || action.equals(Action.fillForms)) && fileUtility.getFillExts().contains(fileExt)) {
+            canEdit = true;
+            action = Action.fillForms;
+        }
+
         defaultCustomizationConfigurer.configure(config.getCustomization(), DefaultCustomizationWrapper.builder()
                 .action(action)
-                .canEdit(canEdit)
+                .user(wrapper.getUser())
                 .build());
         config.setMode(canEdit && !action.equals(Action.view) ? Mode.edit : Mode.view);
         config.setUser(mapper.toModel(wrapper.getUser()));
diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/wrappers/DefaultCustomizationWrapper.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/wrappers/DefaultCustomizationWrapper.java
index 0b8ff7d5..dfe8b5fc 100644
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/wrappers/DefaultCustomizationWrapper.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/wrappers/DefaultCustomizationWrapper.java
@@ -19,6 +19,7 @@
 package com.onlyoffice.integration.services.configurers.wrappers;
 
 import com.onlyoffice.integration.documentserver.models.enums.Action;
+import com.onlyoffice.integration.entities.User;
 import lombok.Builder;
 import lombok.Getter;
 
@@ -26,5 +27,5 @@ import lombok.Getter;
 @Builder
 public class DefaultCustomizationWrapper {
     private Action action;
-    private Boolean canEdit;
+    private User user;
 }
diff --git a/web/documentserver-example/java-spring/src/main/resources/application.properties b/web/documentserver-example/java-spring/src/main/resources/application.properties
index 509fe98d..d5cf8030 100755
--- a/web/documentserver-example/java-spring/src/main/resources/application.properties
+++ b/web/documentserver-example/java-spring/src/main/resources/application.properties
@@ -8,6 +8,7 @@ filesize-max=5242880
 files.storage=
 files.storage.folder=documents
 
+files.docservice.fillforms-docs=.oform
 files.docservice.viewed-docs=.pdf|.djvu|.xps|.oxps
 files.docservice.edited-docs=.docx|.xlsx|.csv|.pptx|.txt
 files.docservice.convert-docs=.docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2
diff --git a/web/documentserver-example/java-spring/src/main/resources/templates/index.html b/web/documentserver-example/java-spring/src/main/resources/templates/index.html
index 76163926..0ca27acb 100755
--- a/web/documentserver-example/java-spring/src/main/resources/templates/index.html
+++ b/web/documentserver-example/java-spring/src/main/resources/templates/index.html
@@ -156,7 +156,7 @@
                                                 <span th:text="${files[iState.index].getName()}"></span>
                                                 </a>
                                             </td>
-                                            <th:block th:if="${filesEditable[iState.index]}">
+                                            <th:block th:if="${filesEditable[iState.index] and not isFillFormDoc[iState.index]}">
                                                 <td class="contentCells contentCells-icon">
                                                     <a th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='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"/>
@@ -191,28 +191,31 @@
                                                 </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='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>
-                                                    </div>
-                                                    <div th:if="not (${docTypes[iState.index]}  eq 'word')">
-                                                        <td class="contentCells contentCells-icon "></td>
-                                                    </div>
-                                                    <div th:if="${docTypes[iState.index]} eq 'word'">
-                                                        <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
                                                             <a th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='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>
                                                     </div>
                                                     <div th:if="not (${docTypes[iState.index]}  eq 'word')">
-                                                        <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift "></td>
+                                                        <td class="contentCells contentCells-icon"></td>
                                                     </div>
                                                     <div th:if="${docTypes[iState.index]} eq 'slide'">
                                                         <td class="contentCells contentCells-icon "></td>
                                                     </div>
                                             </th:block>
+                                            <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
+                                            <th:block th:if="${isFillFormDoc[iState.index]}">
+                                                <td class="contentCells contentCells-icon "></td>
+                                                <td class="contentCells contentCells-icon "></td>
+                                                <td class="contentCells contentCells-icon "></td>
+                                                <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">
+                                                        <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>
+                                            </th:block>
                                             <th:block th:if="${not filesEditable[iState.index]}">
                                                 <td class="contentCells contentCells-shift contentCells-icon contentCellsEmpty" colspan="6"></td>
                                             </th:block>

From 73797dcf31a081b53b31bdb4a059a29b3baa760b Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Tue, 16 Nov 2021 12:21:52 +0300
Subject: [PATCH 19/62] java-spring: hide submit button

---
 .../implementations/DefaultCustomizationConfigurer.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultCustomizationConfigurer.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultCustomizationConfigurer.java
index 626d52cb..98444687 100644
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultCustomizationConfigurer.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultCustomizationConfigurer.java
@@ -33,6 +33,6 @@ public class DefaultCustomizationConfigurer implements CustomizationConfigurer<D
     public void configure(Customization customization, DefaultCustomizationWrapper wrapper){
         Action action = wrapper.getAction();
         User user = wrapper.getUser();
-        customization.setSubmitForm(action.equals(Action.fillForms) && user.getId() == 1);
+        customization.setSubmitForm(action.equals(Action.fillForms) && user.getId() == 1 && false);
     }
 }

From c6a8cd0ff1ca95cda0bc416f9cbdc542876bd284 Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Tue, 16 Nov 2021 12:32:21 +0300
Subject: [PATCH 20/62] java-spring: revert filling in docx

---
 .../DefaultEditorConfigConfigurer.java            |  2 +-
 .../src/main/resources/application.properties     |  2 +-
 .../src/main/resources/templates/index.html       | 15 ++++++++++++---
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultEditorConfigConfigurer.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultEditorConfigConfigurer.java
index d28639fc..031ce920 100644
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultEditorConfigConfigurer.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultEditorConfigConfigurer.java
@@ -83,7 +83,7 @@ public class DefaultEditorConfigConfigurer implements EditorConfigConfigurer<Def
         Boolean canEdit = fileUtility.getEditedExts().contains(fileExt);
         Action action = wrapper.getAction();
 
-        if ((action.equals(Action.edit) || action.equals(Action.fillForms)) && fileUtility.getFillExts().contains(fileExt)) {
+        if ((!canEdit && action.equals(Action.edit) || action.equals(Action.fillForms)) && fileUtility.getFillExts().contains(fileExt)) {
             canEdit = true;
             action = Action.fillForms;
         }
diff --git a/web/documentserver-example/java-spring/src/main/resources/application.properties b/web/documentserver-example/java-spring/src/main/resources/application.properties
index d5cf8030..6cc95d79 100755
--- a/web/documentserver-example/java-spring/src/main/resources/application.properties
+++ b/web/documentserver-example/java-spring/src/main/resources/application.properties
@@ -8,7 +8,7 @@ filesize-max=5242880
 files.storage=
 files.storage.folder=documents
 
-files.docservice.fillforms-docs=.oform
+files.docservice.fillforms-docs=.oform|.docx
 files.docservice.viewed-docs=.pdf|.djvu|.xps|.oxps
 files.docservice.edited-docs=.docx|.xlsx|.csv|.pptx|.txt
 files.docservice.convert-docs=.docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2
diff --git a/web/documentserver-example/java-spring/src/main/resources/templates/index.html b/web/documentserver-example/java-spring/src/main/resources/templates/index.html
index 0ca27acb..79469712 100755
--- a/web/documentserver-example/java-spring/src/main/resources/templates/index.html
+++ b/web/documentserver-example/java-spring/src/main/resources/templates/index.html
@@ -156,7 +156,7 @@
                                                 <span th:text="${files[iState.index].getName()}"></span>
                                                 </a>
                                             </td>
-                                            <th:block th:if="${filesEditable[iState.index] and not isFillFormDoc[iState.index]}">
+                                            <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">
                                                     <img src="css/img/desktop.svg" alt="Open in editor for full size screens" title="Open in editor for full size screens"/>
@@ -202,9 +202,18 @@
                                                     <div th:if="${docTypes[iState.index]} eq 'slide'">
                                                         <td class="contentCells contentCells-icon "></td>
                                                     </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">
+                                                                <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>
+                                                    </div>
+                                                    <div th:if="${not isFillFormDoc[iState.index]}">
+                                                        <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
+                                                    </div>
                                             </th:block>
-                                            <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
-                                            <th:block th:if="${isFillFormDoc[iState.index]}">
+                                            <th:block th:if="${isFillFormDoc[iState.index] and not filesEditable[iState.index]}">
                                                 <td class="contentCells contentCells-icon "></td>
                                                 <td class="contentCells contentCells-icon "></td>
                                                 <td class="contentCells contentCells-icon "></td>

From 7fd0882c06926f6995ccfe916a190d29a971a427 Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Tue, 16 Nov 2021 12:51:36 +0300
Subject: [PATCH 21/62] java-spring: filling on mobile

---
 .../java-spring/src/main/resources/templates/index.html     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/web/documentserver-example/java-spring/src/main/resources/templates/index.html b/web/documentserver-example/java-spring/src/main/resources/templates/index.html
index 79469712..1939d578 100755
--- a/web/documentserver-example/java-spring/src/main/resources/templates/index.html
+++ b/web/documentserver-example/java-spring/src/main/resources/templates/index.html
@@ -215,7 +215,11 @@
                                             </th:block>
                                             <th:block th:if="${isFillFormDoc[iState.index] and not filesEditable[iState.index]}">
                                                 <td class="contentCells contentCells-icon "></td>
-                                                <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">
+                                                        <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>
                                                 <td class="contentCells contentCells-icon "></td>
                                                 <td class="contentCells contentCells-icon "></td>
                                                 <td class="contentCells contentCells-icon "></td>

From 5f8e9370a77f140911900aa7ea3eb89ea2268d0d Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Tue, 16 Nov 2021 12:52:09 +0300
Subject: [PATCH 22/62] java-spring: mobile-fill-forms.svg

---
 .../src/main/resources/static/css/img/mobile-fill-forms.svg | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 web/documentserver-example/java-spring/src/main/resources/static/css/img/mobile-fill-forms.svg

diff --git a/web/documentserver-example/java-spring/src/main/resources/static/css/img/mobile-fill-forms.svg b/web/documentserver-example/java-spring/src/main/resources/static/css/img/mobile-fill-forms.svg
new file mode 100644
index 00000000..31db5ea7
--- /dev/null
+++ b/web/documentserver-example/java-spring/src/main/resources/static/css/img/mobile-fill-forms.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 fill-rule="evenodd" clip-rule="evenodd" d="M5 5C5 3.89543 5.89543 3 7 3H16C17.1046 3 18 3.89543 18 5V8H17V6H6V18H17V16H18V19C18 20.1046 17.1046 21 16 21H7C5.89543 21 5 20.1046 5 19V5ZM13 4H10V5H13V4ZM12 19.5C12 19.7761 11.7761 20 11.5 20C11.2239 20 11 19.7761 11 19.5C11 19.2239 11.2239 19 11.5 19C11.7761 19 12 19.2239 12 19.5Z" fill="#444444"/>
+<rect x="7" y="9" width="1" height="6" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 8V9L11 9V15H12V16H9V15H10V9H9V8H12Z" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15 10H18V14H15H14H13V15H14H18C18.5523 15 19 14.5523 19 14V10C19 9.44772 18.5523 9 18 9H14H13V10H14H15Z" fill="#444444"/>
+</svg>

From c8aac65af621fe9c33274973d743ef505966c1fc Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Tue, 16 Nov 2021 12:56:28 +0300
Subject: [PATCH 23/62] java-spring: opening uploaded form

---
 .../java-spring/src/main/resources/static/scripts/converter.js  | 2 ++
 .../java-spring/src/main/resources/static/scripts/jscript.js    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/documentserver-example/java-spring/src/main/resources/static/scripts/converter.js b/web/documentserver-example/java-spring/src/main/resources/static/scripts/converter.js
index 43594e88..f8ae3ca8 100755
--- a/web/documentserver-example/java-spring/src/main/resources/static/scripts/converter.js
+++ b/web/documentserver-example/java-spring/src/main/resources/static/scripts/converter.js
@@ -20,10 +20,12 @@ var ConverExtList;
 var EditedExtList;
 var UrlConverter;
 var UrlEditor;
+var FillExtList;
 
 if (typeof jQuery !== "undefined") {
     jQuery.post('/config',
         function(data) {
+            FillExtList = data.FillExtList;
             ConverExtList = data.ConverExtList;
             EditedExtList = data.EditedExtList;
             UrlConverter = data.UrlConverter;
diff --git a/web/documentserver-example/java-spring/src/main/resources/static/scripts/jscript.js b/web/documentserver-example/java-spring/src/main/resources/static/scripts/jscript.js
index ecc65215..5393d329 100755
--- a/web/documentserver-example/java-spring/src/main/resources/static/scripts/jscript.js
+++ b/web/documentserver-example/java-spring/src/main/resources/static/scripts/jscript.js
@@ -167,7 +167,7 @@ if (typeof jQuery !== "undefined") {
         var posExt = fileName.lastIndexOf(".");
         posExt = 0 <= posExt ? fileName.substring(posExt).trim().toLowerCase() : "";
 
-        if (EditedExtList.indexOf(posExt) !== -1) {
+        if (EditedExtList.indexOf(posExt) !== -1 || FillExtList.indexOf(posExt) !== -1) {
             jq("#beginEdit").removeClass("disable");
         }
     };

From 1a2c68abe8b6e1e535de3abde31f57c58e014b3c Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Tue, 16 Nov 2021 13:24:30 +0300
Subject: [PATCH 24/62] java: oform

---
 .../src/main/java/entities/FileModel.java     | 10 ++++++--
 .../main/java/helpers/DocumentManager.java    |  6 +++++
 .../src/main/resources/settings.properties    |  1 +
 .../java/src/main/webapp/index.jsp            | 23 +++++++++++--------
 4 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/web/documentserver-example/java/src/main/java/entities/FileModel.java b/web/documentserver-example/java/src/main/java/entities/FileModel.java
index a73b241d..e4e6ceeb 100755
--- a/web/documentserver-example/java/src/main/java/entities/FileModel.java
+++ b/web/documentserver-example/java/src/main/java/entities/FileModel.java
@@ -104,9 +104,15 @@ public class FileModel
         if (_type != null) type = _type;
 
         // check if the file with such an extension can be edited
-        Boolean canEdit = DocumentManager.GetEditedExts().contains(FileUtility.GetFileExtension(document.title));
+        String fileExt = FileUtility.GetFileExtension(document.title);
+        Boolean canEdit = DocumentManager.GetEditedExts().contains(fileExt);
         // check if the Submit form button is displayed or not
-        editorConfig.customization.submitForm = canEdit && (mode.equals("edit") || mode.equals("fillForms"));
+        editorConfig.customization.submitForm = mode.equals("fillForms") && user.id.equals("uid-1");
+
+        if ((mode.equals("edit") || mode.equals("fillForms")) && DocumentManager.GetFillExts().contains(fileExt)) {
+            canEdit = true;
+            mode = "fillForms";
+        }
         // set the mode parameter: change it to view if the document can't be edited
         editorConfig.mode = canEdit && !mode.equals("view") ? "edit" : "view";
 
diff --git a/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java b/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java
index b63a045c..72135c6f 100644
--- a/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java
+++ b/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java
@@ -76,10 +76,16 @@ public class DocumentManager
         res.addAll(GetViewedExts());
         res.addAll(GetEditedExts());
         res.addAll(GetConvertExts());
+        res.addAll(GetFillExts());
 
         return res;
     }
 
+    public static List<String> GetFillExts() {
+        String exts = ConfigManager.GetProperty("files.docservice.fill-docs");
+        return Arrays.asList(exts.split("\\|"));
+    }
+
     // get file extensions that can be viewed
     public static List<String> GetViewedExts()
     {
diff --git a/web/documentserver-example/java/src/main/resources/settings.properties b/web/documentserver-example/java/src/main/resources/settings.properties
index bc88de10..ac6a6625 100644
--- a/web/documentserver-example/java/src/main/resources/settings.properties
+++ b/web/documentserver-example/java/src/main/resources/settings.properties
@@ -3,6 +3,7 @@ version=1.0.0
 filesize-max=5242880
 storage-folder=app_data
 
+files.docservice.fill-docs=.oform
 files.docservice.viewed-docs=.pdf|.djvu|.xps|.oxps
 files.docservice.edited-docs=.docx|.xlsx|.csv|.pptx|.txt
 files.docservice.convert-docs=.docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2
diff --git a/web/documentserver-example/java/src/main/webapp/index.jsp b/web/documentserver-example/java/src/main/webapp/index.jsp
index 15d00546..dd9a4134 100644
--- a/web/documentserver-example/java/src/main/webapp/index.jsp
+++ b/web/documentserver-example/java/src/main/webapp/index.jsp
@@ -172,6 +172,7 @@
                                             <table cellspacing="0" cellpadding="0" width="100%">
                                                 <tbody>
                                                     <% for (Integer i = 0; i < files.length; i++) {
+                                                        Boolean isFillFormDoc = DocumentManager.GetFillExts().contains(FileUtility.GetFileExtension(files[i].getName()).toLowerCase());
                                                         String docType = FileUtility.GetFileType(files[i].getName()).toString().toLowerCase();
                                                         Boolean canEdit = DocumentManager.GetEditedExts().contains(FileUtility.GetFileExtension(files[i].getName()));
                                                         String version=" ["+DocumentManager.GetFileVersion(DocumentManager.HistoryDir(DocumentManager.StoragePath(files[i].getName(), null)))+"]";
@@ -216,25 +217,27 @@
                                                                 <% } %>
                                                                 <% if (docType.equals("word")) { %>
                                                                 <td class="contentCells contentCells-icon">
-                                                                    <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8") %>&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>
-                                                                <% } else { %>
-                                                                <td class="contentCells contentCells-icon "></td>
-                                                                <% } %>
-                                                                <% if (docType.equals("word")) { %>
-                                                                <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
                                                                     <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8") %>&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>
                                                                 <% } else { %>
-                                                                <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
+                                                                <td class="contentCells contentCells-icon"></td>
                                                                 <% } %>
                                                                 <% if (!docType.equals("cell") && !docType.equals("word")) { %>
                                                                 <td class="contentCells contentCells-icon "></td>
                                                                 <% } %>
+                                                                <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
+                                                                <% } else if (isFillFormDoc) {%>
+                                                                <td class="contentCells contentCells-icon "></td>
+                                                                <td class="contentCells contentCells-icon "></td>
+                                                                <td class="contentCells contentCells-icon "></td>
+                                                                <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">
+                                                                        <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>
                                                             <% } %>

From 5cb3267660ea37b692f62dbcde5a14cc90b3da43 Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Tue, 16 Nov 2021 13:25:24 +0300
Subject: [PATCH 25/62] java: hide submit button

---
 .../java/src/main/java/entities/FileModel.java                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/documentserver-example/java/src/main/java/entities/FileModel.java b/web/documentserver-example/java/src/main/java/entities/FileModel.java
index e4e6ceeb..320735bb 100755
--- a/web/documentserver-example/java/src/main/java/entities/FileModel.java
+++ b/web/documentserver-example/java/src/main/java/entities/FileModel.java
@@ -107,7 +107,7 @@ public class FileModel
         String fileExt = FileUtility.GetFileExtension(document.title);
         Boolean canEdit = DocumentManager.GetEditedExts().contains(fileExt);
         // check if the Submit form button is displayed or not
-        editorConfig.customization.submitForm = mode.equals("fillForms") && user.id.equals("uid-1");
+        editorConfig.customization.submitForm = mode.equals("fillForms") && user.id.equals("uid-1") && false;
 
         if ((mode.equals("edit") || mode.equals("fillForms")) && DocumentManager.GetFillExts().contains(fileExt)) {
             canEdit = true;

From c7cd0ba828244e9c82772946afe8247c0315fc51 Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Tue, 16 Nov 2021 13:32:15 +0300
Subject: [PATCH 26/62] java: filling on mobile

---
 .../java/src/main/webapp/css/img/mobile-fill-forms.svg      | 6 ++++++
 web/documentserver-example/java/src/main/webapp/index.jsp   | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 web/documentserver-example/java/src/main/webapp/css/img/mobile-fill-forms.svg

diff --git a/web/documentserver-example/java/src/main/webapp/css/img/mobile-fill-forms.svg b/web/documentserver-example/java/src/main/webapp/css/img/mobile-fill-forms.svg
new file mode 100644
index 00000000..31db5ea7
--- /dev/null
+++ b/web/documentserver-example/java/src/main/webapp/css/img/mobile-fill-forms.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 fill-rule="evenodd" clip-rule="evenodd" d="M5 5C5 3.89543 5.89543 3 7 3H16C17.1046 3 18 3.89543 18 5V8H17V6H6V18H17V16H18V19C18 20.1046 17.1046 21 16 21H7C5.89543 21 5 20.1046 5 19V5ZM13 4H10V5H13V4ZM12 19.5C12 19.7761 11.7761 20 11.5 20C11.2239 20 11 19.7761 11 19.5C11 19.2239 11.2239 19 11.5 19C11.7761 19 12 19.2239 12 19.5Z" fill="#444444"/>
+<rect x="7" y="9" width="1" height="6" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 8V9L11 9V15H12V16H9V15H10V9H9V8H12Z" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15 10H18V14H15H14H13V15H14H18C18.5523 15 19 14.5523 19 14V10C19 9.44772 18.5523 9 18 9H14H13V10H14H15Z" fill="#444444"/>
+</svg>
diff --git a/web/documentserver-example/java/src/main/webapp/index.jsp b/web/documentserver-example/java/src/main/webapp/index.jsp
index dd9a4134..8a7ef84e 100644
--- a/web/documentserver-example/java/src/main/webapp/index.jsp
+++ b/web/documentserver-example/java/src/main/webapp/index.jsp
@@ -230,7 +230,11 @@
                                                                 <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
                                                                 <% } else if (isFillFormDoc) {%>
                                                                 <td class="contentCells contentCells-icon "></td>
-                                                                <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">
+                                                                        <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>
                                                                 <td class="contentCells contentCells-icon "></td>
                                                                 <td class="contentCells contentCells-icon "></td>
                                                                 <td class="contentCells contentCells-icon "></td>

From d3cd62f5aecf836b6e307b85f2ebcd90323537dc Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Tue, 16 Nov 2021 13:35:43 +0300
Subject: [PATCH 27/62] java: opening uploaded form

---
 web/documentserver-example/java/src/main/webapp/index.jsp       | 1 +
 .../java/src/main/webapp/scripts/jscript.js                     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/documentserver-example/java/src/main/webapp/index.jsp b/web/documentserver-example/java/src/main/webapp/index.jsp
index 8a7ef84e..23b9300c 100644
--- a/web/documentserver-example/java/src/main/webapp/index.jsp
+++ b/web/documentserver-example/java/src/main/webapp/index.jsp
@@ -358,6 +358,7 @@
         <script type="text/javascript" src="scripts/jscript.js"></script>
 
         <script language="javascript" type="text/javascript">
+            var FillExtList = "<%= String.join(",", DocumentManager.GetFillExts()) %>";
             var ConverExtList = "<%= String.join(",", DocumentManager.GetConvertExts()) %>";
             var EditedExtList = "<%= String.join(",", DocumentManager.GetEditedExts()) %>";
             var UrlConverter = "IndexServlet?type=convert";
diff --git a/web/documentserver-example/java/src/main/webapp/scripts/jscript.js b/web/documentserver-example/java/src/main/webapp/scripts/jscript.js
index 953d727e..824ca76f 100644
--- a/web/documentserver-example/java/src/main/webapp/scripts/jscript.js
+++ b/web/documentserver-example/java/src/main/webapp/scripts/jscript.js
@@ -167,7 +167,7 @@ if (typeof jQuery !== "undefined") {
         var posExt = fileName.lastIndexOf(".");
         posExt = 0 <= posExt ? fileName.substring(posExt).trim().toLowerCase() : "";
 
-        if (EditedExtList.indexOf(posExt) !== -1) {
+        if (EditedExtList.indexOf(posExt) !== -1 || FillExtList.indexOf(posExt) !== -1) {
             jq("#beginEdit").removeClass("disable");
         }
     };

From ace2677062303780b404bbb16c1dea9c2c8b9f53 Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Tue, 16 Nov 2021 13:56:02 +0300
Subject: [PATCH 28/62] java: revert filling in docx

---
 .../java/src/main/java/entities/FileModel.java            | 2 +-
 .../java/src/main/resources/settings.properties           | 2 +-
 web/documentserver-example/java/src/main/webapp/index.jsp | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/web/documentserver-example/java/src/main/java/entities/FileModel.java b/web/documentserver-example/java/src/main/java/entities/FileModel.java
index 320735bb..d5f9bc94 100755
--- a/web/documentserver-example/java/src/main/java/entities/FileModel.java
+++ b/web/documentserver-example/java/src/main/java/entities/FileModel.java
@@ -109,7 +109,7 @@ public class FileModel
         // check if the Submit form button is displayed or not
         editorConfig.customization.submitForm = mode.equals("fillForms") && user.id.equals("uid-1") && false;
 
-        if ((mode.equals("edit") || mode.equals("fillForms")) && DocumentManager.GetFillExts().contains(fileExt)) {
+        if ((!canEdit && mode.equals("edit") || mode.equals("fillForms")) && DocumentManager.GetFillExts().contains(fileExt)) {
             canEdit = true;
             mode = "fillForms";
         }
diff --git a/web/documentserver-example/java/src/main/resources/settings.properties b/web/documentserver-example/java/src/main/resources/settings.properties
index ac6a6625..04c009a7 100644
--- a/web/documentserver-example/java/src/main/resources/settings.properties
+++ b/web/documentserver-example/java/src/main/resources/settings.properties
@@ -3,7 +3,7 @@ version=1.0.0
 filesize-max=5242880
 storage-folder=app_data
 
-files.docservice.fill-docs=.oform
+files.docservice.fill-docs=.oform|.docx
 files.docservice.viewed-docs=.pdf|.djvu|.xps|.oxps
 files.docservice.edited-docs=.docx|.xlsx|.csv|.pptx|.txt
 files.docservice.convert-docs=.docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2
diff --git a/web/documentserver-example/java/src/main/webapp/index.jsp b/web/documentserver-example/java/src/main/webapp/index.jsp
index 23b9300c..9c3b8970 100644
--- a/web/documentserver-example/java/src/main/webapp/index.jsp
+++ b/web/documentserver-example/java/src/main/webapp/index.jsp
@@ -227,7 +227,15 @@
                                                                 <% if (!docType.equals("cell") && !docType.equals("word")) { %>
                                                                 <td class="contentCells contentCells-icon "></td>
                                                                 <% } %>
+                                                                <% 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">
+                                                                        <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>
+                                                                <% } else { %>
                                                                 <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
+                                                                <% }%>
                                                                 <% } else if (isFillFormDoc) {%>
                                                                 <td class="contentCells contentCells-icon "></td>
                                                                 <td class="contentCells contentCells-icon">

From 4568dcfdceecf2d22babfb0b21f3528fe788ebfa Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Tue, 16 Nov 2021 15:04:59 +0300
Subject: [PATCH 29/62] ruby: oform

---
 .../src/main/java/helpers/FileUtility.java    |  2 +-
 .../ruby/app/models/document_helper.rb        | 10 +++++++-
 .../ruby/app/models/file_model.rb             |  6 ++++-
 .../ruby/app/models/file_utility.rb           |  2 +-
 .../ruby/app/views/home/index.html.erb        | 24 +++++++++++--------
 .../ruby/config/application.rb                |  1 +
 6 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/web/documentserver-example/java/src/main/java/helpers/FileUtility.java b/web/documentserver-example/java/src/main/java/helpers/FileUtility.java
index 5e89c491..9d158e50 100644
--- a/web/documentserver-example/java/src/main/java/helpers/FileUtility.java
+++ b/web/documentserver-example/java/src/main/java/helpers/FileUtility.java
@@ -57,7 +57,7 @@ public class FileUtility
                     ".dot", ".dotx", ".dotm",
                     ".odt", ".fodt", ".ott", ".rtf", ".txt",
                     ".html", ".htm", ".mht", ".xml",
-                    ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps"
+                    ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps", ".oform"
             );
 
     // spreadsheet extensions
diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb
index a9abf3d3..08b45830 100644
--- a/web/documentserver-example/ruby/app/models/document_helper.rb
+++ b/web/documentserver-example/ruby/app/models/document_helper.rb
@@ -38,7 +38,15 @@ class DocumentHelper
 
     # all the supported file extensions
     def file_exts
-      [].concat(viewed_exts).concat(edited_exts).concat(convert_exts)
+      [].concat(viewed_exts).concat(edited_exts).concat(convert_exts).concat(fill_forms_exts)
+    end
+
+    def fill_forms_exts
+      if Rails.configuration.fillDocs.empty?
+        []
+      else
+        Rails.configuration.fillDocs.split("|")
+      end
     end
 
     # file extensions that can be viewed
diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb
index 6b7fde99..52e37c7b 100644
--- a/web/documentserver-example/ruby/app/models/file_model.rb
+++ b/web/documentserver-example/ruby/app/models/file_model.rb
@@ -84,7 +84,11 @@ class FileModel
   def get_config
     editorsmode = @mode ? @mode : "edit"  # mode: view/edit/review/comment/fillForms/embedded
     canEdit = DocumentHelper.edited_exts.include?(file_ext)  # check if the document can be edited
-    submitForm = canEdit && (editorsmode.eql?("edit") || editorsmode.eql?("fillForms"))  # the Submit form button state
+    if (editorsmode.eql?("edit") || editorsmode.eql?("fillForms")) && DocumentHelper.fill_forms_exts.include?(file_ext)
+      editorsmode = "fillForms"
+      canEdit = true
+    end
+    submitForm = editorsmode.eql?("fillForms") && @user.id.eql?("uid-1")  # the Submit form button state
     mode = canEdit && !editorsmode.eql?("view") ? "edit" : "view"
     templatesImageUrl = DocumentHelper.get_template_image_url(document_type) # templates image url in the "From Template" section
     templates = [
diff --git a/web/documentserver-example/ruby/app/models/file_utility.rb b/web/documentserver-example/ruby/app/models/file_utility.rb
index 7c5be1ff..8aa006f7 100644
--- a/web/documentserver-example/ruby/app/models/file_utility.rb
+++ b/web/documentserver-example/ruby/app/models/file_utility.rb
@@ -18,7 +18,7 @@ class FileUtility
 
   
   # the document extension list
-  @@exts_document = %w(.doc .docx .docm .dot .dotx .dotm .odt .fodt .ott .rtf .txt .html .htm .mht .xml .pdf .djvu .fb2 .epub .xps .oxps)
+  @@exts_document = %w(.doc .docx .docm .oform .dot .dotx .dotm .odt .fodt .ott .rtf .txt .html .htm .mht .xml .pdf .djvu .fb2 .epub .xps .oxps)
 
   # the spreadsheet extension list
   @@exts_spreadsheet = %w(.xls .xlsx .xlsm .xlt .xltx .xltm .ods .fods .ots .csv)
diff --git a/web/documentserver-example/ruby/app/views/home/index.html.erb b/web/documentserver-example/ruby/app/views/home/index.html.erb
index 9a069d4b..0762bf1e 100644
--- a/web/documentserver-example/ruby/app/views/home/index.html.erb
+++ b/web/documentserver-example/ruby/app/views/home/index.html.erb
@@ -151,6 +151,7 @@
                     <tbody>
                       <% 
                         docs.each { |d|
+                          isFillFormDoc = DocumentHelper.fill_forms_exts.include?(File.extname(d).downcase)
                           editUrl = "editor?fileName=#{URI::encode(d)}"
                           docType = FileUtility.get_file_type(d) 
                           canEdit = DocumentHelper.edited_exts.include?(File.extname(d).downcase) %>
@@ -194,25 +195,28 @@
                               <% end %>
                                   <% if docType.eql?("word") %>
                                     <td class="contentCells contentCells-icon">
-                                        <a href="<%= "#{editUrl}&editorsType=desktop&editorsMode=fillForms" %>" target="_blank">
-                                            <img src="assets/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
-                                        </a>
-                                    </td>
-                                  <% else %>
-                                    <td class="contentCells  contentCells-icon "></td>
-                                  <% end %>
-                                  <% if docType.eql?("word") %>
-                                    <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
                                         <a href="<%= "#{editUrl}&editorsType=desktop&editorsMode=blockcontent" %>" target="_blank">
                                             <img src="assets/block-content.svg" 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 firstContentCellShift" ></td>
+                                    <td class="contentCells contentCells-icon"></td>
                                   <% end %>
                                   <% if !docType.eql?("word") && !docType.eql?("cell")%>
                                       <td class="contentCells contentCells-icon "></td>
                                   <% end %>
+                                    <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
+                                  <% elsif isFillFormDoc %>
+                                    <td class="contentCells contentCells-icon"></td>
+                                    <td class="contentCells contentCells-icon"></td>
+                                    <td class="contentCells contentCells-icon"></td>
+                                    <td class="contentCells contentCells-icon"></td>
+                                    <td class="contentCells contentCells-icon"></td>
+                                    <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
+                                      <a href="<%= "#{editUrl}&editorsType=desktop&editorsMode=fillForms" %>" target="_blank">
+                                        <img src="assets/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
+                                      </a>
+                                    </td>
                             <% else %>
                               <td class="contentCells contentCells-shift contentCells-icon contentCellsEmpty" colspan="6"></td>
                             <% end %>
diff --git a/web/documentserver-example/ruby/config/application.rb b/web/documentserver-example/ruby/config/application.rb
index 04496928..895d2d38 100644
--- a/web/documentserver-example/ruby/config/application.rb
+++ b/web/documentserver-example/ruby/config/application.rb
@@ -32,6 +32,7 @@ module OnlineEditorsExampleRuby
     Rails.configuration.storagePath="app_data"
     Rails.configuration.timeout=120
 
+    Rails.configuration.fillDocs=".oform"
     Rails.configuration.viewedDocs=".pdf|.djvu|.xps|.oxps"
     Rails.configuration.editedDocs=".docx|.xlsx|.csv|.pptx|.txt"
     Rails.configuration.convertDocs=".docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2"

From 8cd0297917e20891a25a1814581a31741b73b29a Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Tue, 16 Nov 2021 15:05:56 +0300
Subject: [PATCH 30/62] ruby: hide submit button

---
 web/documentserver-example/ruby/app/models/file_model.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb
index 52e37c7b..55b318f7 100644
--- a/web/documentserver-example/ruby/app/models/file_model.rb
+++ b/web/documentserver-example/ruby/app/models/file_model.rb
@@ -88,7 +88,7 @@ class FileModel
       editorsmode = "fillForms"
       canEdit = true
     end
-    submitForm = editorsmode.eql?("fillForms") && @user.id.eql?("uid-1")  # the Submit form button state
+    submitForm = editorsmode.eql?("fillForms") && @user.id.eql?("uid-1") && false  # the Submit form button state
     mode = canEdit && !editorsmode.eql?("view") ? "edit" : "view"
     templatesImageUrl = DocumentHelper.get_template_image_url(document_type) # templates image url in the "From Template" section
     templates = [

From cd1a312aba124ae63fa833d4bb16857f07968101 Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Tue, 16 Nov 2021 15:13:08 +0300
Subject: [PATCH 31/62] ruby: revert filling in docx

---
 web/documentserver-example/ruby/app/models/file_model.rb  | 2 +-
 .../ruby/app/views/home/index.html.erb                    | 8 ++++++++
 web/documentserver-example/ruby/config/application.rb     | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb
index 55b318f7..9ca92bf1 100644
--- a/web/documentserver-example/ruby/app/models/file_model.rb
+++ b/web/documentserver-example/ruby/app/models/file_model.rb
@@ -84,7 +84,7 @@ class FileModel
   def get_config
     editorsmode = @mode ? @mode : "edit"  # mode: view/edit/review/comment/fillForms/embedded
     canEdit = DocumentHelper.edited_exts.include?(file_ext)  # check if the document can be edited
-    if (editorsmode.eql?("edit") || editorsmode.eql?("fillForms")) && DocumentHelper.fill_forms_exts.include?(file_ext)
+    if (!canEdit && editorsmode.eql?("edit") || editorsmode.eql?("fillForms")) && DocumentHelper.fill_forms_exts.include?(file_ext)
       editorsmode = "fillForms"
       canEdit = true
     end
diff --git a/web/documentserver-example/ruby/app/views/home/index.html.erb b/web/documentserver-example/ruby/app/views/home/index.html.erb
index 0762bf1e..6c56b426 100644
--- a/web/documentserver-example/ruby/app/views/home/index.html.erb
+++ b/web/documentserver-example/ruby/app/views/home/index.html.erb
@@ -205,7 +205,15 @@
                                   <% if !docType.eql?("word") && !docType.eql?("cell")%>
                                       <td class="contentCells contentCells-icon "></td>
                                   <% end %>
+                                  <% if isFillFormDoc%>
+                                    <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
+                                      <a href="<%= "#{editUrl}&editorsType=desktop&editorsMode=fillForms" %>" target="_blank">
+                                        <img src="assets/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
+                                      </a>
+                                    </td>
+                                  <% else %>
                                     <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
+                                  <% end %>
                                   <% elsif isFillFormDoc %>
                                     <td class="contentCells contentCells-icon"></td>
                                     <td class="contentCells contentCells-icon"></td>
diff --git a/web/documentserver-example/ruby/config/application.rb b/web/documentserver-example/ruby/config/application.rb
index 895d2d38..0267d9d7 100644
--- a/web/documentserver-example/ruby/config/application.rb
+++ b/web/documentserver-example/ruby/config/application.rb
@@ -32,7 +32,7 @@ module OnlineEditorsExampleRuby
     Rails.configuration.storagePath="app_data"
     Rails.configuration.timeout=120
 
-    Rails.configuration.fillDocs=".oform"
+    Rails.configuration.fillDocs=".oform|.docx"
     Rails.configuration.viewedDocs=".pdf|.djvu|.xps|.oxps"
     Rails.configuration.editedDocs=".docx|.xlsx|.csv|.pptx|.txt"
     Rails.configuration.convertDocs=".docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2"

From 6b4f56373e57a48802551692a4b796f776458105 Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Tue, 16 Nov 2021 15:17:18 +0300
Subject: [PATCH 32/62] ruby: filling on mobile

---
 .../ruby/app/assets/images/mobile-fill-forms.svg            | 6 ++++++
 .../ruby/app/views/home/index.html.erb                      | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 web/documentserver-example/ruby/app/assets/images/mobile-fill-forms.svg

diff --git a/web/documentserver-example/ruby/app/assets/images/mobile-fill-forms.svg b/web/documentserver-example/ruby/app/assets/images/mobile-fill-forms.svg
new file mode 100644
index 00000000..31db5ea7
--- /dev/null
+++ b/web/documentserver-example/ruby/app/assets/images/mobile-fill-forms.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 fill-rule="evenodd" clip-rule="evenodd" d="M5 5C5 3.89543 5.89543 3 7 3H16C17.1046 3 18 3.89543 18 5V8H17V6H6V18H17V16H18V19C18 20.1046 17.1046 21 16 21H7C5.89543 21 5 20.1046 5 19V5ZM13 4H10V5H13V4ZM12 19.5C12 19.7761 11.7761 20 11.5 20C11.2239 20 11 19.7761 11 19.5C11 19.2239 11.2239 19 11.5 19C11.7761 19 12 19.2239 12 19.5Z" fill="#444444"/>
+<rect x="7" y="9" width="1" height="6" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 8V9L11 9V15H12V16H9V15H10V9H9V8H12Z" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15 10H18V14H15H14H13V15H14H18C18.5523 15 19 14.5523 19 14V10C19 9.44772 18.5523 9 18 9H14H13V10H14H15Z" fill="#444444"/>
+</svg>
diff --git a/web/documentserver-example/ruby/app/views/home/index.html.erb b/web/documentserver-example/ruby/app/views/home/index.html.erb
index 6c56b426..f97d8199 100644
--- a/web/documentserver-example/ruby/app/views/home/index.html.erb
+++ b/web/documentserver-example/ruby/app/views/home/index.html.erb
@@ -216,7 +216,11 @@
                                   <% end %>
                                   <% elsif isFillFormDoc %>
                                     <td class="contentCells contentCells-icon"></td>
-                                    <td class="contentCells contentCells-icon"></td>
+                                    <td class="contentCells contentCells-icon">
+                                      <a href="<%= "#{editUrl}&editorsType=mobile&editorsMode=fillForms" %>" target="_blank">
+                                        <img src="assets/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>
                                     <td class="contentCells contentCells-icon"></td>
                                     <td class="contentCells contentCells-icon"></td>
                                     <td class="contentCells contentCells-icon"></td>

From 3233e257cb031d8db4216b63b7609cef042cf79a Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Tue, 16 Nov 2021 15:19:30 +0300
Subject: [PATCH 33/62] ruby: opening uploaded form

---
 .../ruby/app/assets/javascripts/jscript.js                      | 2 +-
 web/documentserver-example/ruby/app/views/home/index.html.erb   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/documentserver-example/ruby/app/assets/javascripts/jscript.js b/web/documentserver-example/ruby/app/assets/javascripts/jscript.js
index 7d41c159..2a4159c3 100644
--- a/web/documentserver-example/ruby/app/assets/javascripts/jscript.js
+++ b/web/documentserver-example/ruby/app/assets/javascripts/jscript.js
@@ -167,7 +167,7 @@ if (typeof jQuery != "undefined") {
         var posExt = fileName.lastIndexOf('.');
         posExt = 0 <= posExt ? fileName.substring(posExt).trim().toLowerCase() : '';
 
-        if (EditedExtList.indexOf(posExt) != -1) {
+        if (EditedExtList.indexOf(posExt) != -1 || FillExtList.indexOf(posExt) != -1) {
             jq("#beginEdit").removeClass("disable");
         }
     };
diff --git a/web/documentserver-example/ruby/app/views/home/index.html.erb b/web/documentserver-example/ruby/app/views/home/index.html.erb
index f97d8199..15ffd06b 100644
--- a/web/documentserver-example/ruby/app/views/home/index.html.erb
+++ b/web/documentserver-example/ruby/app/views/home/index.html.erb
@@ -341,6 +341,7 @@
 <%= javascript_include_tag "application" %>
 
 <script language="javascript" type="text/javascript">
+    var FillExtList = '<%= DocumentHelper.fill_forms_exts.join"," %>';
     var ConvertExtList = '<%= DocumentHelper.convert_exts.join(",") %>';
     var EditedExtList = '<%= DocumentHelper.edited_exts.join(",") %>';
     var UrlConverter = '<%= convert_path %>';

From 59801951e6cdeee471f50fa8edbafb7915fd7d96 Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Tue, 16 Nov 2021 16:07:28 +0300
Subject: [PATCH 34/62] python: oform

---
 web/documentserver-example/python/config.py   |  3 ++-
 .../python/src/utils/docManager.py            |  7 +++++--
 .../python/src/views/actions.py               |  6 +++++-
 .../python/templates/index.html               | 21 +++++++++++--------
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/web/documentserver-example/python/config.py b/web/documentserver-example/python/config.py
index dcb9dc1c..6932e893 100644
--- a/web/documentserver-example/python/config.py
+++ b/web/documentserver-example/python/config.py
@@ -5,6 +5,7 @@ VERSION = '1.0.0'
 FILE_SIZE_MAX = 5242880
 STORAGE_PATH = 'app_data'
 
+DOC_SERV_FILLFORMS = [".oform"]
 DOC_SERV_VIEWED = [".pdf", ".djvu", ".xps", ".oxps"]  # file extensions that can be viewed
 DOC_SERV_EDITED = [".docx", ".xlsx", ".csv", ".pptx", ".txt"]  # file extensions that can be edited
 DOC_SERV_CONVERT = [                                           # file extensions that can be converted
@@ -47,7 +48,7 @@ EXT_DOCUMENT = [
     ".dot", ".dotx", ".dotm",
     ".odt", ".fodt", ".ott", ".rtf", ".txt",
     ".html", ".htm", ".mht", ".xml",
-    ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps"
+    ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps", ".oform"
 ]
 
 if os.environ.get("EXAMPLE_DOMAIN"):  # generates a link for example domain
diff --git a/web/documentserver-example/python/src/utils/docManager.py b/web/documentserver-example/python/src/utils/docManager.py
index 91c51a15..133ae601 100644
--- a/web/documentserver-example/python/src/utils/docManager.py
+++ b/web/documentserver-example/python/src/utils/docManager.py
@@ -73,6 +73,9 @@ LANGUAGES = {
     'vi': 'Vietnamese'
 }
 
+def isCanFillForms(ext):
+    return ext in config.DOC_SERV_FILLFORMS
+
 # check if the file extension can be viewed
 def isCanView(ext):
     return ext in config.DOC_SERV_VIEWED
@@ -87,7 +90,7 @@ def isCanConvert(ext):
 
 # check if the file extension is supported by the editor (it can be viewed or edited or converted)
 def isSupportedExt(ext):
-    return isCanView(ext) | isCanEdit(ext) | isCanConvert(ext)
+    return isCanView(ext) | isCanEdit(ext) | isCanConvert(ext) | isCanFillForms(ext)
 
 # get internal extension for a given file type
 def getInternalExtension(fileType):
@@ -208,7 +211,7 @@ def getStoredFiles(req):
 
     for f in files:
         if os.path.isfile(os.path.join(directory, f)):
-            fileInfos.append({'version':historyManager.getFileVersion(historyManager.getHistoryDir(getStoragePath(f, req))), 'type': fileUtils.getFileType(f), 'title': f, 'url': getFileUri(f, True, req), 'canEdit': isCanEdit(fileUtils.getFileExt(f))}) # write information about file type, title and url
+            fileInfos.append({'isFillFormDoc': isCanFillForms(fileUtils.getFileExt(f)),'version':historyManager.getFileVersion(historyManager.getHistoryDir(getStoragePath(f, req))), 'type': fileUtils.getFileType(f), 'title': f, 'url': getFileUri(f, True, req), 'canEdit': isCanEdit(fileUtils.getFileExt(f))}) # write information about file type, title and url
 
     return fileInfos
 
diff --git a/web/documentserver-example/python/src/views/actions.py b/web/documentserver-example/python/src/views/actions.py
index b0eaf05b..caafe99b 100644
--- a/web/documentserver-example/python/src/views/actions.py
+++ b/web/documentserver-example/python/src/views/actions.py
@@ -129,7 +129,11 @@ def edit(request):
 
     edMode = request.GET.get('mode') if request.GET.get('mode') else 'edit'  # get the editor mode: view/edit/review/comment/fillForms/embedded (the default mode is edit)
     canEdit = docManager.isCanEdit(ext)  # check if the file with this extension can be edited
-    submitForm = canEdit & ((edMode == 'edit') | (edMode == 'fillForms'))  # if the Submit form button is displayed or hidden
+
+    if (edMode == 'edit' or edMode == 'fillForms') and docManager.isCanFillForms(ext) :
+        edMode = 'fillForms'
+        canEdit = True
+    submitForm = edMode == 'fillForms' and user.id == 'uid-1'  # if the Submit form button is displayed or hidden
     mode = 'edit' if canEdit & (edMode != 'view') else 'view'  # if the file can't be edited, the mode is view
 
     edType = request.GET.get('type') if request.GET.get('type') else 'desktop'  # get the editor type: embedded/mobile/desktop (the default type is desktop)
diff --git a/web/documentserver-example/python/templates/index.html b/web/documentserver-example/python/templates/index.html
index dc2f7d13..224f7680 100644
--- a/web/documentserver-example/python/templates/index.html
+++ b/web/documentserver-example/python/templates/index.html
@@ -187,15 +187,6 @@
                                                             {% endif %}
                                                             {% if file.type == 'word' %}
                                                                 <td class="contentCells contentCells-icon">
-                                                                    <a href="edit?filename={{ file.title }}&type=desktop&mode=fillForms" target="_blank">
-                                                                        <img src="{% static "images/fill-forms.svg" %}" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
-                                                                    </a>
-                                                                </td>
-                                                            {% else %}
-                                                                <td class="contentCells contentCells-icon "></td>
-                                                            {% endif %}
-                                                            {% if file.type == 'word' %}
-                                                                <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
                                                                     <a href="edit?filename={{ file.title }}&type=desktop&mode=blockcontent" target="_blank">
                                                                         <img src="{% static "images/block-content.svg" %}" alt="Open in editor without content control modification" title="Open in editor without content control modification"/>
                                                                     </a>
@@ -206,6 +197,18 @@
                                                             {% if file.type == 'slide' %}
                                                                 <td class="contentCells contentCells-icon "></td>
                                                             {% endif %}
+                                                            <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
+                                                        {% elif file.isFillFormDoc %}
+                                                            <td class="contentCells contentCells-icon"></td>
+                                                            <td class="contentCells contentCells-icon"></td>
+                                                            <td class="contentCells contentCells-icon"></td>
+                                                            <td class="contentCells contentCells-icon"></td>
+                                                            <td class="contentCells contentCells-icon"></td>
+                                                            <td class="contentCells contentCells-icon">
+                                                                <a href="edit?filename={{ file.title }}&type=desktop&mode=fillForms" target="_blank">
+                                                                    <img src="{% static "images/fill-forms.svg" %}" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
+                                                                </a>
+                                                            </td>
                                                         {% else %}
                                                             <td class="contentCells contentCells-shift contentCells-icon contentCellsEmpty" colspan="6"></td>
                                                         {% endif %}

From 2314e74ade65748e65e2510858ff699da6d3d586 Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Tue, 16 Nov 2021 16:08:27 +0300
Subject: [PATCH 35/62] python: hide submit button

---
 web/documentserver-example/python/src/views/actions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/documentserver-example/python/src/views/actions.py b/web/documentserver-example/python/src/views/actions.py
index caafe99b..ec351db9 100644
--- a/web/documentserver-example/python/src/views/actions.py
+++ b/web/documentserver-example/python/src/views/actions.py
@@ -133,7 +133,7 @@ def edit(request):
     if (edMode == 'edit' or edMode == 'fillForms') and docManager.isCanFillForms(ext) :
         edMode = 'fillForms'
         canEdit = True
-    submitForm = edMode == 'fillForms' and user.id == 'uid-1'  # if the Submit form button is displayed or hidden
+    submitForm = edMode == 'fillForms' and user.id == 'uid-1' and False  # if the Submit form button is displayed or hidden
     mode = 'edit' if canEdit & (edMode != 'view') else 'view'  # if the file can't be edited, the mode is view
 
     edType = request.GET.get('type') if request.GET.get('type') else 'desktop'  # get the editor type: embedded/mobile/desktop (the default type is desktop)

From b52196ec9186360d39e17a2262dbca78c6eb84d3 Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Tue, 16 Nov 2021 16:13:34 +0300
Subject: [PATCH 36/62] python: revert filling in docx

---
 web/documentserver-example/python/config.py            |  2 +-
 web/documentserver-example/python/src/views/actions.py |  2 +-
 web/documentserver-example/python/templates/index.html | 10 +++++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/web/documentserver-example/python/config.py b/web/documentserver-example/python/config.py
index 6932e893..3bb91e89 100644
--- a/web/documentserver-example/python/config.py
+++ b/web/documentserver-example/python/config.py
@@ -5,7 +5,7 @@ VERSION = '1.0.0'
 FILE_SIZE_MAX = 5242880
 STORAGE_PATH = 'app_data'
 
-DOC_SERV_FILLFORMS = [".oform"]
+DOC_SERV_FILLFORMS = [".oform", ".docx"]
 DOC_SERV_VIEWED = [".pdf", ".djvu", ".xps", ".oxps"]  # file extensions that can be viewed
 DOC_SERV_EDITED = [".docx", ".xlsx", ".csv", ".pptx", ".txt"]  # file extensions that can be edited
 DOC_SERV_CONVERT = [                                           # file extensions that can be converted
diff --git a/web/documentserver-example/python/src/views/actions.py b/web/documentserver-example/python/src/views/actions.py
index ec351db9..fae2421c 100644
--- a/web/documentserver-example/python/src/views/actions.py
+++ b/web/documentserver-example/python/src/views/actions.py
@@ -130,7 +130,7 @@ def edit(request):
     edMode = request.GET.get('mode') if request.GET.get('mode') else 'edit'  # get the editor mode: view/edit/review/comment/fillForms/embedded (the default mode is edit)
     canEdit = docManager.isCanEdit(ext)  # check if the file with this extension can be edited
 
-    if (edMode == 'edit' or edMode == 'fillForms') and docManager.isCanFillForms(ext) :
+    if (((not canEdit) and edMode == 'edit') or edMode == 'fillForms') and docManager.isCanFillForms(ext) :
         edMode = 'fillForms'
         canEdit = True
     submitForm = edMode == 'fillForms' and user.id == 'uid-1' and False  # if the Submit form button is displayed or hidden
diff --git a/web/documentserver-example/python/templates/index.html b/web/documentserver-example/python/templates/index.html
index 224f7680..53650ea6 100644
--- a/web/documentserver-example/python/templates/index.html
+++ b/web/documentserver-example/python/templates/index.html
@@ -197,7 +197,15 @@
                                                             {% if file.type == 'slide' %}
                                                                 <td class="contentCells contentCells-icon "></td>
                                                             {% endif %}
-                                                            <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
+                                                            {% if file.isFillFormDoc %}
+                                                                <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
+                                                                    <a href="edit?filename={{ file.title }}&type=desktop&mode=fillForms" target="_blank">
+                                                                        <img src="{% static "images/fill-forms.svg" %}" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
+                                                                    </a>
+                                                                </td>
+                                                            {% else %}
+                                                                <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
+                                                            {% endif %}
                                                         {% elif file.isFillFormDoc %}
                                                             <td class="contentCells contentCells-icon"></td>
                                                             <td class="contentCells contentCells-icon"></td>

From a4600b31a6e3e8fa35cd6831680508f963dace4c Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Tue, 16 Nov 2021 16:16:08 +0300
Subject: [PATCH 37/62] python: filling on mobile

---
 .../python/static/images/mobile-fill-forms.svg              | 6 ++++++
 web/documentserver-example/python/templates/index.html      | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 web/documentserver-example/python/static/images/mobile-fill-forms.svg

diff --git a/web/documentserver-example/python/static/images/mobile-fill-forms.svg b/web/documentserver-example/python/static/images/mobile-fill-forms.svg
new file mode 100644
index 00000000..31db5ea7
--- /dev/null
+++ b/web/documentserver-example/python/static/images/mobile-fill-forms.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 fill-rule="evenodd" clip-rule="evenodd" d="M5 5C5 3.89543 5.89543 3 7 3H16C17.1046 3 18 3.89543 18 5V8H17V6H6V18H17V16H18V19C18 20.1046 17.1046 21 16 21H7C5.89543 21 5 20.1046 5 19V5ZM13 4H10V5H13V4ZM12 19.5C12 19.7761 11.7761 20 11.5 20C11.2239 20 11 19.7761 11 19.5C11 19.2239 11.2239 19 11.5 19C11.7761 19 12 19.2239 12 19.5Z" fill="#444444"/>
+<rect x="7" y="9" width="1" height="6" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 8V9L11 9V15H12V16H9V15H10V9H9V8H12Z" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15 10H18V14H15H14H13V15H14H18C18.5523 15 19 14.5523 19 14V10C19 9.44772 18.5523 9 18 9H14H13V10H14H15Z" fill="#444444"/>
+</svg>
diff --git a/web/documentserver-example/python/templates/index.html b/web/documentserver-example/python/templates/index.html
index 53650ea6..82db68e9 100644
--- a/web/documentserver-example/python/templates/index.html
+++ b/web/documentserver-example/python/templates/index.html
@@ -208,7 +208,11 @@
                                                             {% endif %}
                                                         {% elif file.isFillFormDoc %}
                                                             <td class="contentCells contentCells-icon"></td>
-                                                            <td class="contentCells contentCells-icon"></td>
+                                                            <td class="contentCells contentCells-icon">
+                                                                <a href="edit?filename={{ file.title }}&type=mobile&mode=fillForms" target="_blank">
+                                                                    <img src="{% static "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>
                                                             <td class="contentCells contentCells-icon"></td>
                                                             <td class="contentCells contentCells-icon"></td>
                                                             <td class="contentCells contentCells-icon"></td>

From fac436f5e6a93eb52cc09e9c920e9631c65bfab4 Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Tue, 16 Nov 2021 16:19:43 +0300
Subject: [PATCH 38/62] python: opening uploaded form

---
 web/documentserver-example/python/src/views/index.py   | 3 ++-
 web/documentserver-example/python/static/js/jscript.js | 2 +-
 web/documentserver-example/python/templates/index.html | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/web/documentserver-example/python/src/views/index.py b/web/documentserver-example/python/src/views/index.py
index a658095d..0e74d9c5 100644
--- a/web/documentserver-example/python/src/views/index.py
+++ b/web/documentserver-example/python/src/views/index.py
@@ -39,6 +39,7 @@ def default(request):  # default parameters that will be passed to the template
         'preloadurl': config.DOC_SERV_SITE_URL + config.DOC_SERV_PRELOADER_URL,
         'editExt': json.dumps(config.DOC_SERV_EDITED),  # file extensions that can be edited
         'convExt': json.dumps(config.DOC_SERV_CONVERT),  # file extensions that can be converted
-        'files': docManager.getStoredFiles(request)  # information about stored files
+        'files': docManager.getStoredFiles(request),  # information about stored files
+        'fillExt': json.dumps(config.DOC_SERV_FILLFORMS)
     }
     return render(request, 'index.html', context)  # execute the "index.html" template with context data and return http response in json format
\ No newline at end of file
diff --git a/web/documentserver-example/python/static/js/jscript.js b/web/documentserver-example/python/static/js/jscript.js
index f919ca9b..c2e0db31 100644
--- a/web/documentserver-example/python/static/js/jscript.js
+++ b/web/documentserver-example/python/static/js/jscript.js
@@ -175,7 +175,7 @@ if (typeof jQuery !== "undefined") {
         var posExt = fileName.lastIndexOf(".");
         posExt = 0 <= posExt ? fileName.substring(posExt).trim().toLowerCase() : "";
 
-        if (EditedExtList.indexOf(posExt) !== -1) {
+        if (EditedExtList.indexOf(posExt) !== -1 || FillExtList.indexOf(posExt) !== -1) {
             jq("#beginEdit").removeClass("disable");
         }
     };
diff --git a/web/documentserver-example/python/templates/index.html b/web/documentserver-example/python/templates/index.html
index 82db68e9..1ad34ec1 100644
--- a/web/documentserver-example/python/templates/index.html
+++ b/web/documentserver-example/python/templates/index.html
@@ -335,6 +335,7 @@
     <script type="text/javascript" src="{% static "js/jscript.js" %}"></script>
 
     <script type="text/javascript">
+        var FillExtList = {{ fillExt | safe }};
         var ConverExtList = {{ convExt | safe }};
         var EditedExtList = {{ editExt | safe }};
         var UrlConverter = "convert";

From 79aac3ccd6cdbafa6085b2f429c9c595cb482ee5 Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Tue, 16 Nov 2021 16:55:37 +0300
Subject: [PATCH 39/62] csharp-mvc: oform

---
 .../csharp-mvc/Helpers/DocManagerHelper.cs    |  7 ++++-
 .../csharp-mvc/Models/FileModel.cs            |  7 ++++-
 .../csharp-mvc/Models/FileUtility.cs          |  2 +-
 .../csharp-mvc/Views/Home/Index.aspx          | 27 +++++++++++--------
 .../csharp-mvc/web.appsettings.config         |  1 +
 5 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs b/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs
index 1d7792e1..07eecf6b 100644
--- a/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs
+++ b/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs
@@ -44,7 +44,7 @@ namespace OnlineEditorsExampleMVC.Helpers
         // get all the supported file extensions
         public static List<string> FileExts
         {
-            get { return ViewedExts.Concat(EditedExts).Concat(ConvertExts).ToList(); }
+            get { return ViewedExts.Concat(EditedExts).Concat(ConvertExts).Concat(FillFormExts).ToList(); }
         }
 
         // get file extensions that can be viewed
@@ -53,6 +53,11 @@ namespace OnlineEditorsExampleMVC.Helpers
             get { return (WebConfigurationManager.AppSettings["files.docservice.viewed-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
         }
 
+        public static List<string> FillFormExts
+        {
+            get { return (WebConfigurationManager.AppSettings["files.docservice.fillform-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
+        }
+
         // get file extensions that can be edited
         public static List<string> EditedExts
         {
diff --git a/web/documentserver-example/csharp-mvc/Models/FileModel.cs b/web/documentserver-example/csharp-mvc/Models/FileModel.cs
index 3f7f1ade..e2b1d343 100644
--- a/web/documentserver-example/csharp-mvc/Models/FileModel.cs
+++ b/web/documentserver-example/csharp-mvc/Models/FileModel.cs
@@ -80,10 +80,15 @@ namespace OnlineEditorsExampleMVC.Models
 
             var canEdit = DocManagerHelper.EditedExts.Contains(ext);  // check if the file with such an extension can be edited
             var mode = canEdit && editorsMode != "view" ? "edit" : "view";  // set the mode parameter: change it to view if the document can't be edited
-            var submitForm = canEdit && (editorsMode.Equals("edit") || editorsMode.Equals("fillForms"));  // check if the Submit form button is displayed or not
 
             var id = request.Cookies.GetOrDefault("uid", null);
             var user = Users.getUser(id);  // get the user
+            
+            if ((editorsMode.Equals("edit") || editorsMode.Equals("fillForms")) && DocManagerHelper.FillFormExts.Contains(ext)) {
+                editorsMode = "fillForms";
+                canEdit = true;
+            }
+            var submitForm = editorsMode.Equals("fillForms") && id.Equals("uid-1");  // check if the Submit form button is displayed or not
 
             // favorite icon state
             bool? favorite = user.favorite;
diff --git a/web/documentserver-example/csharp-mvc/Models/FileUtility.cs b/web/documentserver-example/csharp-mvc/Models/FileUtility.cs
index adec7d08..e240ae0b 100644
--- a/web/documentserver-example/csharp-mvc/Models/FileUtility.cs
+++ b/web/documentserver-example/csharp-mvc/Models/FileUtility.cs
@@ -49,7 +49,7 @@ namespace OnlineEditorsExampleMVC.Models
                 ".dot", ".dotx", ".dotm",
                 ".odt", ".fodt", ".ott", ".rtf", ".txt",
                 ".html", ".htm", ".mht", ".xml",
-                ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps"
+                ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps", ".oform"
             };
 
         // spreadsheet extensions
diff --git a/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx b/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
index bb207b79..ed954bfe 100644
--- a/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
+++ b/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
@@ -178,8 +178,10 @@
                                             <% foreach (var storedFile in storedFiles)
                                                {
                                                     var editUrl = "doceditor.aspx?fileID=" + HttpUtility.UrlEncode(storedFile.Name);
-                                                            var docType = FileUtility.GetFileType(storedFile.Name).ToString().ToLower(); 
-                                                            var canEdit = DocManagerHelper.EditedExts.Contains(Path.GetExtension(storedFile.Name).ToLower());
+                                                            var docType = FileUtility.GetFileType(storedFile.Name).ToString().ToLower();
+                                                            var ext = Path.GetExtension(storedFile.Name).ToLower();
+                                                            var canEdit = DocManagerHelper.EditedExts.Contains(ext);
+                                                            var isFillFormDoc = DocManagerHelper.FillFormExts.Contains(ext);
                                                         %>
 
                                                             <tr class="tableRow" title="<%= storedFile.Name %> [<%= DocManagerHelper.GetFileVersion(storedFile.Name, HttpContext.Current.Request.UserHostAddress) %>]">
@@ -222,15 +224,6 @@
                                                                     <% } %>
                                                                     <% if (docType == "word") { %>
                                                                         <td class="contentCells contentCells-icon">
-                                                                            <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "fillForms" }) %>" 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>
-                                                                     <% } else { %>
-                                                                        <td class="contentCells contentCells-icon"></td>
-                                                                    <% } %>
-                                                                    <% if (docType == "word"){ %>
-                                                                        <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
                                                                             <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "blockcontent" }) %>" 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>
@@ -241,6 +234,18 @@
                                                                     <% if (docType != "word" && docType != "cell") { %>
                                                                         <td class="contentCells contentCells-icon "></td>
                                                                     <% } %>
+                                                                    <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
+                                                                <% }else if (isFillFormDoc) { %>
+                                                                    <td class="contentCells contentCells-icon "></td>
+                                                                    <td class="contentCells contentCells-icon "></td>
+                                                                    <td class="contentCells contentCells-icon "></td>
+                                                                    <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">
+                                                                           <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>
                                                                 <% } else { %>
                                                                     <td class="contentCells contentCells-shift contentCells-icon contentCellsEmpty" colspan="6"></td>
                                                                 <% } %>
diff --git a/web/documentserver-example/csharp-mvc/web.appsettings.config b/web/documentserver-example/csharp-mvc/web.appsettings.config
index 3cb4b5d1..9225122b 100644
--- a/web/documentserver-example/csharp-mvc/web.appsettings.config
+++ b/web/documentserver-example/csharp-mvc/web.appsettings.config
@@ -5,6 +5,7 @@
 
   <add key="filesize-max" value="52428800"/>
 
+  <add key="files.docservice.fillform-docs" value=".oform"/>
   <add key="files.docservice.viewed-docs" value=".pdf|.djvu|.xps|.oxps"/>
   <add key="files.docservice.edited-docs" value=".docx|.xlsx|.csv|.pptx|.txt"/>
   <add key="files.docservice.convert-docs" value=".docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2"/>

From 18bd45e4ab3cb49a3cb0b37b31009d7ab6046082 Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Tue, 16 Nov 2021 17:27:46 +0300
Subject: [PATCH 40/62] csharp-mvc: hide submit button

---
 web/documentserver-example/csharp-mvc/Models/FileModel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/documentserver-example/csharp-mvc/Models/FileModel.cs b/web/documentserver-example/csharp-mvc/Models/FileModel.cs
index e2b1d343..f57f4af6 100644
--- a/web/documentserver-example/csharp-mvc/Models/FileModel.cs
+++ b/web/documentserver-example/csharp-mvc/Models/FileModel.cs
@@ -88,7 +88,7 @@ namespace OnlineEditorsExampleMVC.Models
                 editorsMode = "fillForms";
                 canEdit = true;
             }
-            var submitForm = editorsMode.Equals("fillForms") && id.Equals("uid-1");  // check if the Submit form button is displayed or not
+            var submitForm = editorsMode.Equals("fillForms") && id.Equals("uid-1") && false;  // check if the Submit form button is displayed or not
 
             // favorite icon state
             bool? favorite = user.favorite;

From 50821067d7151d20168a71b74dcafc2076d0f7ae Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Tue, 16 Nov 2021 17:32:07 +0300
Subject: [PATCH 41/62] csharp-mvc: revert filling in docx

---
 .../csharp-mvc/Models/FileModel.cs                   |  2 +-
 .../csharp-mvc/Views/Home/Index.aspx                 | 12 ++++++++++--
 .../csharp-mvc/web.appsettings.config                |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/web/documentserver-example/csharp-mvc/Models/FileModel.cs b/web/documentserver-example/csharp-mvc/Models/FileModel.cs
index f57f4af6..a8cb2edd 100644
--- a/web/documentserver-example/csharp-mvc/Models/FileModel.cs
+++ b/web/documentserver-example/csharp-mvc/Models/FileModel.cs
@@ -84,7 +84,7 @@ namespace OnlineEditorsExampleMVC.Models
             var id = request.Cookies.GetOrDefault("uid", null);
             var user = Users.getUser(id);  // get the user
             
-            if ((editorsMode.Equals("edit") || editorsMode.Equals("fillForms")) && DocManagerHelper.FillFormExts.Contains(ext)) {
+            if ((!canEdit && editorsMode.Equals("edit") || editorsMode.Equals("fillForms")) && DocManagerHelper.FillFormExts.Contains(ext)) {
                 editorsMode = "fillForms";
                 canEdit = true;
             }
diff --git a/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx b/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
index ed954bfe..038cb9dd 100644
--- a/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
+++ b/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
@@ -234,8 +234,16 @@
                                                                     <% if (docType != "word" && docType != "cell") { %>
                                                                         <td class="contentCells contentCells-icon "></td>
                                                                     <% } %>
-                                                                    <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
-                                                                <% }else if (isFillFormDoc) { %>
+                                                                    <% 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">
+                                                                                <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>
+                                                                    <% } else { %>
+                                                                        <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
+                                                                        <% } %>
+                                                                <% } else if (isFillFormDoc) { %>
                                                                     <td class="contentCells contentCells-icon "></td>
                                                                     <td class="contentCells contentCells-icon "></td>
                                                                     <td class="contentCells contentCells-icon "></td>
diff --git a/web/documentserver-example/csharp-mvc/web.appsettings.config b/web/documentserver-example/csharp-mvc/web.appsettings.config
index 9225122b..6b7e8248 100644
--- a/web/documentserver-example/csharp-mvc/web.appsettings.config
+++ b/web/documentserver-example/csharp-mvc/web.appsettings.config
@@ -5,7 +5,7 @@
 
   <add key="filesize-max" value="52428800"/>
 
-  <add key="files.docservice.fillform-docs" value=".oform"/>
+  <add key="files.docservice.fillform-docs" value=".oform|.docx"/>
   <add key="files.docservice.viewed-docs" value=".pdf|.djvu|.xps|.oxps"/>
   <add key="files.docservice.edited-docs" value=".docx|.xlsx|.csv|.pptx|.txt"/>
   <add key="files.docservice.convert-docs" value=".docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2"/>

From c3878a94312ae9e17b8425967dc73a9c7961ad82 Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Tue, 16 Nov 2021 17:37:00 +0300
Subject: [PATCH 42/62] csharp-mvc: filling on mobile

---
 .../csharp-mvc/Content/images/mobile-fill-forms.svg         | 6 ++++++
 .../csharp-mvc/OnlineEditorsExampleMVC.csproj               | 1 +
 web/documentserver-example/csharp-mvc/Views/Home/Index.aspx | 6 +++++-
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 web/documentserver-example/csharp-mvc/Content/images/mobile-fill-forms.svg

diff --git a/web/documentserver-example/csharp-mvc/Content/images/mobile-fill-forms.svg b/web/documentserver-example/csharp-mvc/Content/images/mobile-fill-forms.svg
new file mode 100644
index 00000000..31db5ea7
--- /dev/null
+++ b/web/documentserver-example/csharp-mvc/Content/images/mobile-fill-forms.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 fill-rule="evenodd" clip-rule="evenodd" d="M5 5C5 3.89543 5.89543 3 7 3H16C17.1046 3 18 3.89543 18 5V8H17V6H6V18H17V16H18V19C18 20.1046 17.1046 21 16 21H7C5.89543 21 5 20.1046 5 19V5ZM13 4H10V5H13V4ZM12 19.5C12 19.7761 11.7761 20 11.5 20C11.2239 20 11 19.7761 11 19.5C11 19.2239 11.2239 19 11.5 19C11.7761 19 12 19.2239 12 19.5Z" fill="#444444"/>
+<rect x="7" y="9" width="1" height="6" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 8V9L11 9V15H12V16H9V15H10V9H9V8H12Z" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15 10H18V14H15H14H13V15H14H18C18.5523 15 19 14.5523 19 14V10C19 9.44772 18.5523 9 18 9H14H13V10H14H15Z" fill="#444444"/>
+</svg>
diff --git a/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj b/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj
index 017d7e5b..8c9740e6 100644
--- a/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj
+++ b/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj
@@ -143,6 +143,7 @@
     <Content Include="Content\images\loader16.gif" />
     <Content Include="Content\images\logo.png" />
     <Content Include="Content\images\logo.svg" />
+    <Content Include="Content\images\mobile-fill-forms.svg" />
     <Content Include="Content\images\mobile.svg" />
     <Content Include="Content\images\notdone.svg" />
     <Content Include="Content\images\review.svg" />
diff --git a/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx b/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
index 038cb9dd..2ac5d61b 100644
--- a/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
+++ b/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
@@ -245,7 +245,11 @@
                                                                         <% } %>
                                                                 <% } else if (isFillFormDoc) { %>
                                                                     <td class="contentCells contentCells-icon "></td>
-                                                                    <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">
+                                                                           <img src="content/images/mobile-fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
+                                                                       </a>
+                                                                    </td>
                                                                     <td class="contentCells contentCells-icon "></td>
                                                                     <td class="contentCells contentCells-icon "></td>
                                                                     <td class="contentCells contentCells-icon "></td>

From cb583e48e30a6d82844c6078b48f44314a1a0472 Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Tue, 16 Nov 2021 17:43:40 +0300
Subject: [PATCH 43/62] csharp-mvc: opening uploaded form

---
 web/documentserver-example/csharp-mvc/Scripts/jscript.js    | 2 +-
 web/documentserver-example/csharp-mvc/Views/Home/Index.aspx | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/documentserver-example/csharp-mvc/Scripts/jscript.js b/web/documentserver-example/csharp-mvc/Scripts/jscript.js
index e810a914..b4889c08 100644
--- a/web/documentserver-example/csharp-mvc/Scripts/jscript.js
+++ b/web/documentserver-example/csharp-mvc/Scripts/jscript.js
@@ -168,7 +168,7 @@ if (typeof jQuery != "undefined") {
         var posExt = fileName.lastIndexOf('.');
         posExt = 0 <= posExt ? fileName.substring(posExt).trim().toLowerCase() : '';
 
-        if (EditedExtList.indexOf(posExt) != -1) {
+        if (EditedExtList.indexOf(posExt) != -1 || FillExtList.indexOf(posExt) != -1) {
             jq("#beginEdit").removeClass("disable");
         }
     };
diff --git a/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx b/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
index 2ac5d61b..eb70bcc2 100644
--- a/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
+++ b/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
@@ -368,6 +368,7 @@
     <%: Scripts.Render("~/bundles/jquery", "~/bundles/scripts") %>
 
     <script language="javascript" type="text/javascript">
+        var FillExtList = '<%= string.Join(",", DocManagerHelper.FillFormExts.ToArray()) %>';
         var ConverExtList = '<%= string.Join(",", DocManagerHelper.ConvertExts.ToArray()) %>';
         var EditedExtList = '<%= string.Join(",", DocManagerHelper.EditedExts.ToArray()) %>';
         var UrlConverter = '<%= Url.Content("~/webeditor.ashx?type=convert") %>';

From f1a64c92d27ac032ac29a071f7ad5ca3b12b5e58 Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Wed, 17 Nov 2021 10:47:40 +0300
Subject: [PATCH 44/62] csharp: oform

---
 .../csharp/Default.aspx                       | 25 +++++++++++--------
 .../csharp/Default.aspx.cs                    |  9 +++++--
 .../csharp/DocEditor.aspx.cs                  |  7 +++++-
 .../csharp/settings.config                    |  1 +
 4 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/web/documentserver-example/csharp/Default.aspx b/web/documentserver-example/csharp/Default.aspx
index 1e5c7ba9..c99da360 100644
--- a/web/documentserver-example/csharp/Default.aspx
+++ b/web/documentserver-example/csharp/Default.aspx
@@ -179,8 +179,10 @@
                                                 <%  foreach (var storedFile in storedFiles)
                                                     {
                                                         var editUrl = "doceditor.aspx?fileID=" + HttpUtility.UrlEncode(storedFile.Name);
+                                                        var ext = Path.GetExtension(storedFile.Name).ToLower();
                                                         var docType = DocumentType(storedFile.Name);
-                                                        var canEdit = EditedExts.Contains(Path.GetExtension(storedFile.Name).ToLower());
+                                                        var canEdit = EditedExts.Contains(ext);
+                                                        var isFillFormDoc = FillFormsExts.Contains(ext);
                                                         %>
 
                                                         <tr class="tableRow" title="<%= storedFile.Name %> [<%= GetFileVersion(storedFile.Name, HttpContext.Current.Request.UserHostAddress) %>]">
@@ -223,15 +225,6 @@
                                                                 <% } %>
                                                                 <% if (docType == "word") { %>
                                                                     <td class="contentCells contentCells-icon">
-                                                                    <a href="<%= editUrl + "&editorsType=desktop&editorsMode=fillForms" %>" target="_blank">
-                                                                        <img src="app_themes/images/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
-                                                                    </a>
-                                                                </td>
-                                                                <% } else { %>
-                                                                    <td class="contentCells contentCells-icon"></td>
-                                                                <% } %>
-                                                                <% if (docType == "word") { %>
-                                                                    <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
                                                                         <a href="<%= editUrl + "&editorsType=desktop&editorsMode=blockcontent" %>" target="_blank">
                                                                             <img src="app_themes/images/block-content.svg" alt="Open in editor without content control modification" title="Open in editor without content control modification"/>
                                                                         </a>
@@ -242,6 +235,18 @@
                                                                 <%if (docType != "word" && docType != "cell"){%>
                                                                     <td class="contentCells contentCells-icon "></td>
                                                                 <% } %>
+                                                                    <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
+                                                                <% } else if (isFillFormDoc) { %>
+                                                                    <td class="contentCells contentCells-icon "></td>
+                                                                    <td class="contentCells contentCells-icon "></td>
+                                                                    <td class="contentCells contentCells-icon "></td>
+                                                                    <td class="contentCells contentCells-icon "></td>
+                                                                    <td class="contentCells contentCells-icon "></td>
+                                                                    <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
+                                                                        <a href="<%= editUrl + "&editorsType=desktop&editorsMode=fillForms" %>" target="_blank">
+                                                                            <img src="app_themes/images/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
+                                                                        </a>
+                                                                    </td>
                                                             <% } else { %>
                                                                 <td class="contentCells contentCells-shift contentCells-icon contentCellsEmpty" colspan="6"></td>
                                                             <% } %>
diff --git a/web/documentserver-example/csharp/Default.aspx.cs b/web/documentserver-example/csharp/Default.aspx.cs
index bde7ee1f..3582bfcf 100644
--- a/web/documentserver-example/csharp/Default.aspx.cs
+++ b/web/documentserver-example/csharp/Default.aspx.cs
@@ -56,7 +56,7 @@ namespace OnlineEditorsExample
                 ".dot", ".dotx", ".dotm",
                 ".odt", ".fodt", ".ott", ".rtf", ".txt",
                 ".html", ".htm", ".mht", ".xml",
-                ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps"
+                ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps", ".oform"
             };
 
         // get an internal file extension
@@ -107,7 +107,7 @@ namespace OnlineEditorsExample
         // get all the supported file extensions
         private static List<string> FileExts
         {
-            get { return ViewedExts.Concat(EditedExts).Concat(ConvertExts).ToList(); }
+            get { return ViewedExts.Concat(EditedExts).Concat(ConvertExts).Concat(FillFormsExts).ToList(); }
         }
 
         // file extensions that can be viewed
@@ -115,6 +115,11 @@ namespace OnlineEditorsExample
         {
             get { return (WebConfigurationManager.AppSettings["files.docservice.viewed-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
         }
+        
+        public static List<string> FillFormsExts
+        {
+            get { return (WebConfigurationManager.AppSettings["files.docservice.fillform-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
+        }
 
         // file extensions that can be edited
         public static List<string> EditedExts
diff --git a/web/documentserver-example/csharp/DocEditor.aspx.cs b/web/documentserver-example/csharp/DocEditor.aspx.cs
index 3017137a..ecf9f712 100644
--- a/web/documentserver-example/csharp/DocEditor.aspx.cs
+++ b/web/documentserver-example/csharp/DocEditor.aspx.cs
@@ -149,11 +149,16 @@ namespace OnlineEditorsExample
 
             var canEdit = _Default.EditedExts.Contains(ext);  // check if this file can be edited
             var mode = canEdit && editorsMode != "view" ? "edit" : "view";  // get the editor opening mode (edit or view)
-            var submitForm = canEdit && (editorsMode.Equals("edit") || editorsMode.Equals("fillForms"));  // check if the Submit form button is displayed or hidden
             var editorsType = Request.GetOrDefault("editorsType", "desktop");
 
             var id = Request.Cookies.GetOrDefault("uid", null);
             var user = Users.getUser(id);  // get the user
+            
+            if ((editorsMode.Equals("edit") || editorsMode.Equals("fillForms")) && _Default.FillFormsExts.Contains(ext)) {
+                editorsMode = "fillForms";
+                canEdit = true;
+            }            
+            var submitForm = editorsMode.Equals("fillForms") && id.Equals("uid-1");  // check if the Submit form button is displayed or hidden
 
             var jss = new JavaScriptSerializer();
 
diff --git a/web/documentserver-example/csharp/settings.config b/web/documentserver-example/csharp/settings.config
index e1727602..946b41a8 100644
--- a/web/documentserver-example/csharp/settings.config
+++ b/web/documentserver-example/csharp/settings.config
@@ -6,6 +6,7 @@
   <add key="filesize-max" value="52428800"/>
   <add key="storage-path" value=""/>
 
+  <add key="files.docservice.fillform-docs" value=".oform"/>
   <add key="files.docservice.viewed-docs" value=".pdf|.djvu|.xps|.oxps"/>
   <add key="files.docservice.edited-docs" value=".docx|.xlsx|.csv|.pptx|.txt"/>
   <add key="files.docservice.convert-docs" value=".docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2"/>

From 83cefae85b090ba357a41cbc9a00a4451677f10c Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Wed, 17 Nov 2021 10:48:21 +0300
Subject: [PATCH 45/62] csharp: hide submit button

---
 web/documentserver-example/csharp/DocEditor.aspx.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/documentserver-example/csharp/DocEditor.aspx.cs b/web/documentserver-example/csharp/DocEditor.aspx.cs
index ecf9f712..f7d35826 100644
--- a/web/documentserver-example/csharp/DocEditor.aspx.cs
+++ b/web/documentserver-example/csharp/DocEditor.aspx.cs
@@ -158,7 +158,7 @@ namespace OnlineEditorsExample
                 editorsMode = "fillForms";
                 canEdit = true;
             }            
-            var submitForm = editorsMode.Equals("fillForms") && id.Equals("uid-1");  // check if the Submit form button is displayed or hidden
+            var submitForm = editorsMode.Equals("fillForms") && id.Equals("uid-1") && false;  // check if the Submit form button is displayed or hidden
 
             var jss = new JavaScriptSerializer();
 

From d1fee87d8d81853de4ae8429fa8280a05b96ac0b Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Wed, 17 Nov 2021 11:00:03 +0300
Subject: [PATCH 46/62] python, csharp-mvc: fix layout

---
 web/documentserver-example/csharp-mvc/Views/Home/Index.aspx | 2 +-
 web/documentserver-example/python/templates/index.html      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx b/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
index eb70bcc2..a5d04868 100644
--- a/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
+++ b/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
@@ -229,7 +229,7 @@
                                                                             </a>
                                                                         </td>
                                                                     <% } else { %>
-                                                                        <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
+                                                                        <td class="contentCells contentCells-icon"></td>
                                                                     <% } %>
                                                                     <% if (docType != "word" && docType != "cell") { %>
                                                                         <td class="contentCells contentCells-icon "></td>
diff --git a/web/documentserver-example/python/templates/index.html b/web/documentserver-example/python/templates/index.html
index 1ad34ec1..b01a7b02 100644
--- a/web/documentserver-example/python/templates/index.html
+++ b/web/documentserver-example/python/templates/index.html
@@ -192,7 +192,7 @@
                                                                     </a>
                                                                 </td>
                                                             {% else %}
-                                                                 <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
+                                                                 <td class="contentCells contentCells-icon"></td>
                                                             {% endif %}
                                                             {% if file.type == 'slide' %}
                                                                 <td class="contentCells contentCells-icon "></td>

From 08119d7458cd34d74a9e392573eff5ca29734eaf Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Wed, 17 Nov 2021 11:00:49 +0300
Subject: [PATCH 47/62] csharp: revert filling in docx

---
 web/documentserver-example/csharp/Default.aspx      | 10 +++++++++-
 web/documentserver-example/csharp/DocEditor.aspx.cs |  2 +-
 web/documentserver-example/csharp/settings.config   |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/web/documentserver-example/csharp/Default.aspx b/web/documentserver-example/csharp/Default.aspx
index c99da360..95a41802 100644
--- a/web/documentserver-example/csharp/Default.aspx
+++ b/web/documentserver-example/csharp/Default.aspx
@@ -230,12 +230,20 @@
                                                                         </a>
                                                                     </td>
                                                                 <% } else{%>
-                                                                    <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
+                                                                    <td class="contentCells contentCells-icon"></td>
                                                                 <%} %>
                                                                 <%if (docType != "word" && docType != "cell"){%>
                                                                     <td class="contentCells contentCells-icon "></td>
                                                                 <% } %>
+                                                                    <% if (isFillFormDoc) { %>
+                                                                        <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
+                                                                            <a href="<%= editUrl + "&editorsType=desktop&editorsMode=fillForms" %>" target="_blank">
+                                                                                <img src="app_themes/images/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
+                                                                            </a>
+                                                                        </td>
+                                                                <% } else { %>
                                                                     <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
+                                                                <% } %>
                                                                 <% } else if (isFillFormDoc) { %>
                                                                     <td class="contentCells contentCells-icon "></td>
                                                                     <td class="contentCells contentCells-icon "></td>
diff --git a/web/documentserver-example/csharp/DocEditor.aspx.cs b/web/documentserver-example/csharp/DocEditor.aspx.cs
index f7d35826..596a7d10 100644
--- a/web/documentserver-example/csharp/DocEditor.aspx.cs
+++ b/web/documentserver-example/csharp/DocEditor.aspx.cs
@@ -154,7 +154,7 @@ namespace OnlineEditorsExample
             var id = Request.Cookies.GetOrDefault("uid", null);
             var user = Users.getUser(id);  // get the user
             
-            if ((editorsMode.Equals("edit") || editorsMode.Equals("fillForms")) && _Default.FillFormsExts.Contains(ext)) {
+            if ((!canEdit && editorsMode.Equals("edit") || editorsMode.Equals("fillForms")) && _Default.FillFormsExts.Contains(ext)) {
                 editorsMode = "fillForms";
                 canEdit = true;
             }            
diff --git a/web/documentserver-example/csharp/settings.config b/web/documentserver-example/csharp/settings.config
index 946b41a8..e25595ff 100644
--- a/web/documentserver-example/csharp/settings.config
+++ b/web/documentserver-example/csharp/settings.config
@@ -6,7 +6,7 @@
   <add key="filesize-max" value="52428800"/>
   <add key="storage-path" value=""/>
 
-  <add key="files.docservice.fillform-docs" value=".oform"/>
+  <add key="files.docservice.fillform-docs" value=".oform|.docx"/>
   <add key="files.docservice.viewed-docs" value=".pdf|.djvu|.xps|.oxps"/>
   <add key="files.docservice.edited-docs" value=".docx|.xlsx|.csv|.pptx|.txt"/>
   <add key="files.docservice.convert-docs" value=".docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2"/>

From 901b2a83fad3009ec23b15d46111d95adbe20d3d Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Wed, 17 Nov 2021 11:08:07 +0300
Subject: [PATCH 48/62] csharp: filling on mobile

---
 web/documentserver-example/csharp-mvc/Views/Home/Index.aspx | 2 +-
 .../csharp/App_Themes/images/mobile-fill-forms.svg          | 6 ++++++
 web/documentserver-example/csharp/Default.aspx              | 6 +++++-
 .../csharp/OnlineEditorsExample.csproj                      | 1 +
 4 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 web/documentserver-example/csharp/App_Themes/images/mobile-fill-forms.svg

diff --git a/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx b/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
index a5d04868..40c56f72 100644
--- a/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
+++ b/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
@@ -247,7 +247,7 @@
                                                                     <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">
-                                                                           <img src="content/images/mobile-fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
+                                                                           <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>
                                                                     <td class="contentCells contentCells-icon "></td>
diff --git a/web/documentserver-example/csharp/App_Themes/images/mobile-fill-forms.svg b/web/documentserver-example/csharp/App_Themes/images/mobile-fill-forms.svg
new file mode 100644
index 00000000..31db5ea7
--- /dev/null
+++ b/web/documentserver-example/csharp/App_Themes/images/mobile-fill-forms.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 fill-rule="evenodd" clip-rule="evenodd" d="M5 5C5 3.89543 5.89543 3 7 3H16C17.1046 3 18 3.89543 18 5V8H17V6H6V18H17V16H18V19C18 20.1046 17.1046 21 16 21H7C5.89543 21 5 20.1046 5 19V5ZM13 4H10V5H13V4ZM12 19.5C12 19.7761 11.7761 20 11.5 20C11.2239 20 11 19.7761 11 19.5C11 19.2239 11.2239 19 11.5 19C11.7761 19 12 19.2239 12 19.5Z" fill="#444444"/>
+<rect x="7" y="9" width="1" height="6" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 8V9L11 9V15H12V16H9V15H10V9H9V8H12Z" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15 10H18V14H15H14H13V15H14H18C18.5523 15 19 14.5523 19 14V10C19 9.44772 18.5523 9 18 9H14H13V10H14H15Z" fill="#444444"/>
+</svg>
diff --git a/web/documentserver-example/csharp/Default.aspx b/web/documentserver-example/csharp/Default.aspx
index 95a41802..15fc306c 100644
--- a/web/documentserver-example/csharp/Default.aspx
+++ b/web/documentserver-example/csharp/Default.aspx
@@ -246,7 +246,11 @@
                                                                 <% } %>
                                                                 <% } else if (isFillFormDoc) { %>
                                                                     <td class="contentCells contentCells-icon "></td>
-                                                                    <td class="contentCells contentCells-icon "></td>
+                                                                    <td class="contentCells contentCells-icon">
+                                                                        <a href="<%= editUrl + "&editorsType=mobile&editorsMode=fillForms" %>" target="_blank">
+                                                                           <img src="app_themes/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>
                                                                     <td class="contentCells contentCells-icon "></td>
                                                                     <td class="contentCells contentCells-icon "></td>
                                                                     <td class="contentCells contentCells-icon "></td>
diff --git a/web/documentserver-example/csharp/OnlineEditorsExample.csproj b/web/documentserver-example/csharp/OnlineEditorsExample.csproj
index de99848b..0b9d55af 100644
--- a/web/documentserver-example/csharp/OnlineEditorsExample.csproj
+++ b/web/documentserver-example/csharp/OnlineEditorsExample.csproj
@@ -90,6 +90,7 @@
     <Content Include="App_Themes\images\icon_xlsx.svg" />
     <Content Include="App_Themes\images\info.svg" />
     <Content Include="App_Themes\images\logo.svg" />
+    <Content Include="App_Themes\images\mobile-fill-forms.svg" />
     <Content Include="App_Themes\images\mobile.svg" />
     <Content Include="App_Themes\images\notdone.svg" />
     <Content Include="App_Themes\images\review.svg" />

From d673fd86e01b923e76b1088804b697449fd6dde4 Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Wed, 17 Nov 2021 11:10:09 +0300
Subject: [PATCH 49/62] csharp: opening uploaded form

---
 web/documentserver-example/csharp/Default.aspx      | 1 +
 web/documentserver-example/csharp/script/jscript.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/documentserver-example/csharp/Default.aspx b/web/documentserver-example/csharp/Default.aspx
index 15fc306c..7962dec8 100644
--- a/web/documentserver-example/csharp/Default.aspx
+++ b/web/documentserver-example/csharp/Default.aspx
@@ -375,6 +375,7 @@
     <script language="javascript" type="text/javascript" src="script/jquery.dropdownToggle.js"></script>
     <script language="javascript" type="text/javascript" src="script/jscript.js"></script>
     <script language="javascript" type="text/javascript">
+        var FillFormExtList = '<%= string.Join(",", FillFormsExts.ToArray()) %>';
         var ConverExtList = '<%= string.Join(",", ConvertExts.ToArray()) %>';
         var EditedExtList = '<%= string.Join(",", EditedExts.ToArray()) %>';
     </script>
diff --git a/web/documentserver-example/csharp/script/jscript.js b/web/documentserver-example/csharp/script/jscript.js
index 13910eb3..36a87ce5 100644
--- a/web/documentserver-example/csharp/script/jscript.js
+++ b/web/documentserver-example/csharp/script/jscript.js
@@ -168,7 +168,7 @@ if (typeof jQuery != "undefined") {
         var posExt = fileName.lastIndexOf('.');
         posExt = 0 <= posExt ? fileName.substring(posExt).trim().toLowerCase() : '';
 
-        if (EditedExtList.indexOf(posExt) != -1) {
+        if (EditedExtList.indexOf(posExt) != -1 || FillFormExtList.indexOf(posExt) != -1) {
             jq("#beginEdit").removeClass("disable");
         }
     };

From e89b6040fb96de792a6375ef5c7afc89fd889d82 Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Wed, 17 Nov 2021 11:53:43 +0300
Subject: [PATCH 50/62] php: oform

---
 web/documentserver-example/php/common.php     |  6 +++--
 web/documentserver-example/php/config.php     |  3 ++-
 web/documentserver-example/php/doceditor.php  |  9 ++++++--
 web/documentserver-example/php/index.php      | 22 ++++++++++---------
 .../php/webeditor-ajax.php                    |  2 +-
 5 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/web/documentserver-example/php/common.php b/web/documentserver-example/php/common.php
index d6a81690..766f9c97 100644
--- a/web/documentserver-example/php/common.php
+++ b/web/documentserver-example/php/common.php
@@ -299,11 +299,13 @@ function getStoredFiles() {
     foreach($cdir as $key => $fileName) {  // run through all the file and folder names
         if (!in_array($fileName,array(".", ".."))) {
             if (!is_dir($directory . DIRECTORY_SEPARATOR . $fileName)) {  // if an element isn't a directory
+                $ext = strtolower('.' . pathinfo($fileName, PATHINFO_EXTENSION));
                 $dat = filemtime($directory . DIRECTORY_SEPARATOR . $fileName);  // get the time of element modification
                 $result[$dat] = (object) array(  // and write the file to the result
                         "name" => $fileName,
                         "documentType" => getDocumentType($fileName),
-                        "canEdit" => in_array(strtolower('.' . pathinfo($fileName, PATHINFO_EXTENSION)), $GLOBALS['DOC_SERV_EDITED'])
+                        "canEdit" => in_array($ext, $GLOBALS['DOC_SERV_EDITED']),
+                        "isFillFormDoc" => in_array($ext, $GLOBALS['DOC_SERV_FILLFORMS'])
                     );
             }
         }
@@ -379,7 +381,7 @@ function getFileInfo($fileId){
 
 // get all the supported file extensions
 function getFileExts() {
-    return array_merge($GLOBALS['DOC_SERV_VIEWD'], $GLOBALS['DOC_SERV_EDITED'], $GLOBALS['DOC_SERV_CONVERT']);
+    return array_merge($GLOBALS['DOC_SERV_VIEWD'], $GLOBALS['DOC_SERV_EDITED'], $GLOBALS['DOC_SERV_CONVERT'], $GLOBALS['DOC_SERV_FILLFORMS']);
 }
 
 // get the correct file name if such a name already exists
diff --git a/web/documentserver-example/php/config.php b/web/documentserver-example/php/config.php
index 9236a28d..8e9d3f24 100644
--- a/web/documentserver-example/php/config.php
+++ b/web/documentserver-example/php/config.php
@@ -6,6 +6,7 @@ $GLOBALS['FILE_SIZE_MAX'] = 5242880;
 $GLOBALS['STORAGE_PATH'] = "";
 $GLOBALS['ALONE'] = FALSE;
 
+$GLOBALS['DOC_SERV_FILLFORMS'] = array(".oform");
 $GLOBALS['DOC_SERV_VIEWD'] = array(".pdf", ".djvu", ".xps", ".oxps");
 $GLOBALS['DOC_SERV_EDITED'] = array(".docx", ".xlsx", ".csv", ".pptx", ".txt");
 $GLOBALS['DOC_SERV_CONVERT'] = array(".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", ".xml", ".epub", ".fb2");
@@ -41,7 +42,7 @@ $GLOBALS['ExtsDocument'] = array(".doc", ".docx", ".docm",
                                  ".dot", ".dotx", ".dotm",
                                  ".odt", ".fodt", ".ott", ".rtf", ".txt",
                                  ".html", ".htm", ".mht", ".xml",
-                                 ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps");
+                                 ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps", ".oform");
 
 
 ?>
\ No newline at end of file
diff --git a/web/documentserver-example/php/doceditor.php b/web/documentserver-example/php/doceditor.php
index 8ef3fb92..b943224b 100644
--- a/web/documentserver-example/php/doceditor.php
+++ b/web/documentserver-example/php/doceditor.php
@@ -56,9 +56,14 @@
     $docKey = getDocEditorKey($filename);
     $filetype = strtolower(pathinfo($filename, PATHINFO_EXTENSION));
 
+    $ext = strtolower('.' . pathinfo($filename, PATHINFO_EXTENSION));
     $editorsMode = empty($_GET["action"]) ? "edit" : $_GET["action"];  // get the editors mode
-    $canEdit = in_array(strtolower('.' . pathinfo($filename, PATHINFO_EXTENSION)), $GLOBALS['DOC_SERV_EDITED']);  // check if the file can be edited
-    $submitForm = $canEdit && ($editorsMode == "edit" || $editorsMode == "fillForms");  // check if the Submit form button is displayed or not
+    $canEdit = in_array($ext, $GLOBALS['DOC_SERV_EDITED']);  // check if the file can be edited
+    if (($editorsMode == "edit" || $editorsMode == "fillForms") && in_array($ext, $GLOBALS['DOC_SERV_FILLFORMS'])) {
+        $editorsMode = "fillForms";
+        $canEdit = true;
+    }
+    $submitForm = $editorsMode == "fillForms" && $user->id == "uid-1";  // check if the Submit form button is displayed or not
     $mode = $canEdit && $editorsMode != "view" ? "edit" : "view";  // define if the editing mode is edit or view
     $type = empty($_GET["type"]) ? "desktop" : $_GET["type"];
 
diff --git a/web/documentserver-example/php/index.php b/web/documentserver-example/php/index.php
index 497bbce1..9c29962e 100644
--- a/web/documentserver-example/php/index.php
+++ b/web/documentserver-example/php/index.php
@@ -215,24 +215,26 @@
                                                                     }
                                                                     if ($storeFile->documentType == "word") {
                                                                         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 '   <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-icon "></td> ';
-                                                                    }
-                                                                    if ($storeFile->documentType == "word") {
-                                                                        echo ' <td class="contentCells contentCells-icon contentCells-shift firstContentCellShift">';
                                                                         echo '  <a href="doceditor.php?fileID=' . urlencode($storeFile->name) . '&user=' . htmlentities($user) . '&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{
-                                                                       echo ' <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td> ';
+                                                                       echo ' <td class="contentCells contentCells-icon"></td> ';
                                                                     }
                                                                     if($storeFile->documentType!="word" && $storeFile->documentType!="cell"){
                                                                         echo ' <td class="contentCells contentCells-icon"></td>';
                                                                     }
+                                                                    echo ' <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td> ';
+                                                                 } else if ($storeFile->isFillFormDoc) {
+                                                                    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-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 '   <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>';
                                                                 }
diff --git a/web/documentserver-example/php/webeditor-ajax.php b/web/documentserver-example/php/webeditor-ajax.php
index caf54875..90d568a4 100644
--- a/web/documentserver-example/php/webeditor-ajax.php
+++ b/web/documentserver-example/php/webeditor-ajax.php
@@ -107,7 +107,7 @@ function upload() {
     $tmp = $_FILES['files']['tmp_name'];
 
     // if the temporary name doesn't exist, then an error occurs
-    if (empty(tmp)) {
+    if (empty($tmp)) {
         $result["error"] = 'No file sent';
         return $result;
     }

From 946819926f7ee6c4e73e624403c67b09f54302ce Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Wed, 17 Nov 2021 11:55:10 +0300
Subject: [PATCH 51/62] php: hide submit button

---
 web/documentserver-example/php/doceditor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/documentserver-example/php/doceditor.php b/web/documentserver-example/php/doceditor.php
index b943224b..16897998 100644
--- a/web/documentserver-example/php/doceditor.php
+++ b/web/documentserver-example/php/doceditor.php
@@ -63,7 +63,7 @@
         $editorsMode = "fillForms";
         $canEdit = true;
     }
-    $submitForm = $editorsMode == "fillForms" && $user->id == "uid-1";  // check if the Submit form button is displayed or not
+    $submitForm = $editorsMode == "fillForms" && $user->id == "uid-1" && !1;  // check if the Submit form button is displayed or not
     $mode = $canEdit && $editorsMode != "view" ? "edit" : "view";  // define if the editing mode is edit or view
     $type = empty($_GET["type"]) ? "desktop" : $_GET["type"];
 

From e97fe56914680fa3a6b2da3d4be27c5a5a46c28a Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Wed, 17 Nov 2021 12:06:18 +0300
Subject: [PATCH 52/62] php: revert filling in docx

---
 web/documentserver-example/php/config.php    | 2 +-
 web/documentserver-example/php/doceditor.php | 2 +-
 web/documentserver-example/php/index.php     | 9 ++++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/web/documentserver-example/php/config.php b/web/documentserver-example/php/config.php
index 8e9d3f24..ee36edae 100644
--- a/web/documentserver-example/php/config.php
+++ b/web/documentserver-example/php/config.php
@@ -6,7 +6,7 @@ $GLOBALS['FILE_SIZE_MAX'] = 5242880;
 $GLOBALS['STORAGE_PATH'] = "";
 $GLOBALS['ALONE'] = FALSE;
 
-$GLOBALS['DOC_SERV_FILLFORMS'] = array(".oform");
+$GLOBALS['DOC_SERV_FILLFORMS'] = array(".oform", ".docx");
 $GLOBALS['DOC_SERV_VIEWD'] = array(".pdf", ".djvu", ".xps", ".oxps");
 $GLOBALS['DOC_SERV_EDITED'] = array(".docx", ".xlsx", ".csv", ".pptx", ".txt");
 $GLOBALS['DOC_SERV_CONVERT'] = array(".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", ".xml", ".epub", ".fb2");
diff --git a/web/documentserver-example/php/doceditor.php b/web/documentserver-example/php/doceditor.php
index 16897998..59dc3935 100644
--- a/web/documentserver-example/php/doceditor.php
+++ b/web/documentserver-example/php/doceditor.php
@@ -59,7 +59,7 @@
     $ext = strtolower('.' . pathinfo($filename, PATHINFO_EXTENSION));
     $editorsMode = empty($_GET["action"]) ? "edit" : $_GET["action"];  // get the editors mode
     $canEdit = in_array($ext, $GLOBALS['DOC_SERV_EDITED']);  // check if the file can be edited
-    if (($editorsMode == "edit" || $editorsMode == "fillForms") && in_array($ext, $GLOBALS['DOC_SERV_FILLFORMS'])) {
+    if ((!$canEdit && $editorsMode == "edit" || $editorsMode == "fillForms") && in_array($ext, $GLOBALS['DOC_SERV_FILLFORMS'])) {
         $editorsMode = "fillForms";
         $canEdit = true;
     }
diff --git a/web/documentserver-example/php/index.php b/web/documentserver-example/php/index.php
index 9c29962e..29032893 100644
--- a/web/documentserver-example/php/index.php
+++ b/web/documentserver-example/php/index.php
@@ -224,7 +224,14 @@
                                                                     if($storeFile->documentType!="word" && $storeFile->documentType!="cell"){
                                                                         echo ' <td class="contentCells contentCells-icon"></td>';
                                                                     }
-                                                                    echo ' <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td> ';
+                                                                    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 '   <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 firstContentCellShift"></td> ';
+                                                                    }
                                                                  } else if ($storeFile->isFillFormDoc) {
                                                                     echo ' <td class="contentCells contentCells-icon"></td>';
                                                                     echo ' <td class="contentCells contentCells-icon"></td>';

From 6d67b740b6e1d1ead4a783f59c8e249b26ff123c Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Wed, 17 Nov 2021 12:09:59 +0300
Subject: [PATCH 53/62] php: filling on mobile

---
 .../php/css/images/mobile-fill-forms.svg                    | 6 ++++++
 web/documentserver-example/php/index.php                    | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 web/documentserver-example/php/css/images/mobile-fill-forms.svg

diff --git a/web/documentserver-example/php/css/images/mobile-fill-forms.svg b/web/documentserver-example/php/css/images/mobile-fill-forms.svg
new file mode 100644
index 00000000..31db5ea7
--- /dev/null
+++ b/web/documentserver-example/php/css/images/mobile-fill-forms.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 fill-rule="evenodd" clip-rule="evenodd" d="M5 5C5 3.89543 5.89543 3 7 3H16C17.1046 3 18 3.89543 18 5V8H17V6H6V18H17V16H18V19C18 20.1046 17.1046 21 16 21H7C5.89543 21 5 20.1046 5 19V5ZM13 4H10V5H13V4ZM12 19.5C12 19.7761 11.7761 20 11.5 20C11.2239 20 11 19.7761 11 19.5C11 19.2239 11.2239 19 11.5 19C11.7761 19 12 19.2239 12 19.5Z" fill="#444444"/>
+<rect x="7" y="9" width="1" height="6" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 8V9L11 9V15H12V16H9V15H10V9H9V8H12Z" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15 10H18V14H15H14H13V15H14H18C18.5523 15 19 14.5523 19 14V10C19 9.44772 18.5523 9 18 9H14H13V10H14H15Z" fill="#444444"/>
+</svg>
diff --git a/web/documentserver-example/php/index.php b/web/documentserver-example/php/index.php
index 29032893..e97c46f1 100644
--- a/web/documentserver-example/php/index.php
+++ b/web/documentserver-example/php/index.php
@@ -234,7 +234,10 @@
                                                                     }
                                                                  } else if ($storeFile->isFillFormDoc) {
                                                                     echo ' <td class="contentCells contentCells-icon"></td>';
-                                                                    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 '   <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>';

From 56a4f6073db1fb231be81eaaf47dfab628cf6fa8 Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Wed, 17 Nov 2021 12:14:23 +0300
Subject: [PATCH 54/62] php: opening uploaded form

---
 web/documentserver-example/php/index.php     | 1 +
 web/documentserver-example/php/js/jscript.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/documentserver-example/php/index.php b/web/documentserver-example/php/index.php
index e97c46f1..c2aceda6 100644
--- a/web/documentserver-example/php/index.php
+++ b/web/documentserver-example/php/index.php
@@ -359,6 +359,7 @@
         <script type="text/javascript" src="js/jquery.dropdownToggle.js"></script>
         <script type="text/javascript" src="js/jscript.js"></script>
         <script type="text/javascript">
+            var FillFormsExtList = '<?php echo implode(",", $GLOBALS["DOC_SERV_FILLFORMS"]) ?>';
             var ConverExtList = '<?php echo implode(",", $GLOBALS["DOC_SERV_CONVERT"]) ?>';
             var EditedExtList = '<?php echo implode(",", $GLOBALS["DOC_SERV_EDITED"]) ?>';
         </script>
diff --git a/web/documentserver-example/php/js/jscript.js b/web/documentserver-example/php/js/jscript.js
index 776525cc..f05b9bbf 100644
--- a/web/documentserver-example/php/js/jscript.js
+++ b/web/documentserver-example/php/js/jscript.js
@@ -189,7 +189,7 @@ if (typeof jQuery != "undefined") {
         var posExt = fileName.lastIndexOf('.');
         posExt = 0 <= posExt ? fileName.substring(posExt).trim().toLowerCase() : '';
 
-        if (EditedExtList.indexOf(posExt) != -1) {
+        if (EditedExtList.indexOf(posExt) != -1 || FillFormsExtList.indexOf(posExt) != -1) {
             jq("#beginEdit").removeClass("disable");
         }
     };

From 7309d942d6d66140ac077f3af2cc70fe1e6b064a Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Wed, 17 Nov 2021 15:11:12 +0300
Subject: [PATCH 55/62] java-spring: fix permissions

---
 .../DefaultDocumentConfigurer.java            |  2 +-
 .../DefaultEditorConfigConfigurer.java        |  7 +--
 .../DefaultFileConfigurer.java                | 43 ++++++++++++++++---
 .../wrappers/DefaultFileWrapper.java          |  3 ++
 4 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultDocumentConfigurer.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultDocumentConfigurer.java
index db644644..d67084f3 100644
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultDocumentConfigurer.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultDocumentConfigurer.java
@@ -55,7 +55,7 @@ public class DefaultDocumentConfigurer implements DocumentConfigurer<DefaultDocu
         document.setTitle(fileName);
         document.setUrl(documentManager.getDownloadUrl(fileName));
         document.setUrlUser(documentManager.getFileUri(fileName, false));
-        document.setFileType(fileUtility.getInternalExtension(fileUtility.getDocumentType(fileName)).replace(".",""));
+        document.setFileType(fileUtility.getFileExtension(fileName).replace(".",""));
         document.getInfo().setFavorite(wrapper.getFavorite());
 
         String key =  serviceConverter.
diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultEditorConfigConfigurer.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultEditorConfigConfigurer.java
index 031ce920..216a813e 100644
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultEditorConfigConfigurer.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultEditorConfigConfigurer.java
@@ -80,14 +80,9 @@ public class DefaultEditorConfigConfigurer implements EditorConfigConfigurer<Def
         config.setCallbackUrl(documentManager.getCallback(fileName));
         config.setCreateUrl(userIsAnon ? null : documentManager.getCreateUrl(fileName, false));
         config.setLang(wrapper.getLang());
-        Boolean canEdit = fileUtility.getEditedExts().contains(fileExt);
+        Boolean canEdit = wrapper.getCanEdit();
         Action action = wrapper.getAction();
 
-        if ((!canEdit && action.equals(Action.edit) || action.equals(Action.fillForms)) && fileUtility.getFillExts().contains(fileExt)) {
-            canEdit = true;
-            action = Action.fillForms;
-        }
-
         defaultCustomizationConfigurer.configure(config.getCustomization(), DefaultCustomizationWrapper.builder()
                 .action(action)
                 .user(wrapper.getUser())
diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultFileConfigurer.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultFileConfigurer.java
index 9feb7348..ef30ff02 100755
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultFileConfigurer.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultFileConfigurer.java
@@ -66,17 +66,19 @@ public class DefaultFileConfigurer implements FileConfigurer<DefaultFileWrapper>
             fileModel.setType(wrapper.getType());
 
             Permission userPermissions = mapper.toModel(wrapper.getUser().getPermissions());
-            userPermissions.setComment(
-                    !action.equals(Action.view)
-                            && !action.equals(Action.fillForms)
-                            && !action.equals(Action.embedded)
-                            && !action.equals(Action.blockcontent)
-            );
+
+            String fileExt = fileUtility.getFileExtension(wrapper.getFileName());
+            Boolean canEdit = fileUtility.getEditedExts().contains(fileExt);
+            if ((!canEdit && action.equals(Action.edit) || action.equals(Action.fillForms)) && fileUtility.getFillExts().contains(fileExt)) {
+                canEdit = true;
+                wrapper.setAction(Action.fillForms);
+            }
+            wrapper.setCanEdit(canEdit);
 
             DefaultDocumentWrapper documentWrapper = DefaultDocumentWrapper
                     .builder()
                     .fileName(fileName)
-                    .permission(userPermissions)
+                    .permission(updatePermissions(userPermissions, action, canEdit))
                     .favorite(wrapper.getUser().getFavorite())
                     .build();
 
@@ -99,4 +101,31 @@ public class DefaultFileConfigurer implements FileConfigurer<DefaultFileWrapper>
         configure(fileModel, wrapper);
         return fileModel;
     }
+
+    private Permission updatePermissions(Permission userPermissions, Action action, Boolean canEdit) {
+        userPermissions.setComment(
+                !action.equals(Action.view)
+                        && !action.equals(Action.fillForms)
+                        && !action.equals(Action.embedded)
+                        && !action.equals(Action.blockcontent)
+        );
+
+        userPermissions.setFillForms(
+                !action.equals(Action.view)
+                        && !action.equals(Action.comment)
+                        && !action.equals(Action.embedded)
+                        && !action.equals(Action.blockcontent)
+        );
+
+        userPermissions.setReview(canEdit &&
+                (action.equals(Action.review) || action.equals(Action.edit)));
+
+        userPermissions.setEdit(canEdit &&
+                (action.equals(Action.view)
+                || action.equals(Action.edit)
+                || action.equals(Action.filter)
+                || action.equals(Action.blockcontent)));
+
+        return userPermissions;
+    }
 }
diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/wrappers/DefaultFileWrapper.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/wrappers/DefaultFileWrapper.java
index 81b53e9d..79b1097a 100644
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/wrappers/DefaultFileWrapper.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/wrappers/DefaultFileWrapper.java
@@ -24,9 +24,11 @@ import com.onlyoffice.integration.documentserver.models.enums.Language;
 import com.onlyoffice.integration.documentserver.models.enums.Type;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.Setter;
 
 @Getter
 @Builder
+@Setter
 public class DefaultFileWrapper {
     private String fileName;
     private Type type;
@@ -34,4 +36,5 @@ public class DefaultFileWrapper {
     private Language lang;
     private Action action;
     private String actionData;
+    private Boolean canEdit;
 }

From 796433cf8a22396a5ae448db41349fb3f660c2a6 Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Wed, 17 Nov 2021 15:15:31 +0300
Subject: [PATCH 56/62] java-spring: docxf

---
 .../java-spring/src/main/resources/application.properties     | 2 +-
 .../java-spring/src/main/resources/assets                     | 2 +-
 .../java-spring/src/main/resources/static/css/stylesheet.css  | 4 ++++
 .../java-spring/src/main/resources/templates/index.html       | 3 +++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/web/documentserver-example/java-spring/src/main/resources/application.properties b/web/documentserver-example/java-spring/src/main/resources/application.properties
index 6cc95d79..6fccee58 100755
--- a/web/documentserver-example/java-spring/src/main/resources/application.properties
+++ b/web/documentserver-example/java-spring/src/main/resources/application.properties
@@ -10,7 +10,7 @@ files.storage.folder=documents
 
 files.docservice.fillforms-docs=.oform|.docx
 files.docservice.viewed-docs=.pdf|.djvu|.xps|.oxps
-files.docservice.edited-docs=.docx|.xlsx|.csv|.pptx|.txt
+files.docservice.edited-docs=.docx|.xlsx|.csv|.pptx|.txt|.docxf
 files.docservice.convert-docs=.docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2
 files.docservice.timeout=120000
 files.docservice.history.postfix=-hist
diff --git a/web/documentserver-example/java-spring/src/main/resources/assets b/web/documentserver-example/java-spring/src/main/resources/assets
index 65addf50..346236dd 160000
--- a/web/documentserver-example/java-spring/src/main/resources/assets
+++ b/web/documentserver-example/java-spring/src/main/resources/assets
@@ -1 +1 @@
-Subproject commit 65addf50e40c1a9fceb7c270b6c4b0f6bc5cf2ca
+Subproject commit 346236dd127c29febc9119aeb6d55aad5ad190b4
diff --git a/web/documentserver-example/java-spring/src/main/resources/static/css/stylesheet.css b/web/documentserver-example/java-spring/src/main/resources/static/css/stylesheet.css
index d00c56c7..dde198c4 100755
--- a/web/documentserver-example/java-spring/src/main/resources/static/css/stylesheet.css
+++ b/web/documentserver-example/java-spring/src/main/resources/static/css/stylesheet.css
@@ -158,6 +158,10 @@ label .checkbox {
     background-image: url("img/file_pptx.svg");
 }
 
+.try-editor.form {
+    background-image: url("img/file_docxf.svg");
+}
+
 .create-sample {
     color: #666666;
     line-height: 24px;
diff --git a/web/documentserver-example/java-spring/src/main/resources/templates/index.html b/web/documentserver-example/java-spring/src/main/resources/templates/index.html
index 1939d578..88ce2335 100755
--- a/web/documentserver-example/java-spring/src/main/resources/templates/index.html
+++ b/web/documentserver-example/java-spring/src/main/resources/templates/index.html
@@ -54,6 +54,9 @@
                                     <li>
                                         <a class="try-editor slide" data-type="pptx">Presentation</a>
                                     </li>
+                                    <li>
+                                        <a class="try-editor form" data-type="docxf">Master form</a>
+                                    </li>
                                 </ul>
                                 <label class="create-sample">
                                     <input id="createSample" class="checkbox" type="checkbox" />With sample content

From a3e84f50fac36cb636beac963223074fc9d94e58 Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Wed, 17 Nov 2021 15:27:28 +0300
Subject: [PATCH 57/62] java: docxf

---
 .../src/main/resources/static/css/img/file_docxf.svg        | 6 ++++++
 web/documentserver-example/java/src/main/resources/assets   | 2 +-
 .../java/src/main/resources/settings.properties             | 2 +-
 .../java/src/main/webapp/css/img/file_docxf.svg             | 6 ++++++
 .../java/src/main/webapp/css/stylesheet.css                 | 4 ++++
 web/documentserver-example/java/src/main/webapp/index.jsp   | 3 +++
 6 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 web/documentserver-example/java-spring/src/main/resources/static/css/img/file_docxf.svg
 create mode 100644 web/documentserver-example/java/src/main/webapp/css/img/file_docxf.svg

diff --git a/web/documentserver-example/java-spring/src/main/resources/static/css/img/file_docxf.svg b/web/documentserver-example/java-spring/src/main/resources/static/css/img/file_docxf.svg
new file mode 100644
index 00000000..984761e6
--- /dev/null
+++ b/web/documentserver-example/java-spring/src/main/resources/static/css/img/file_docxf.svg
@@ -0,0 +1,6 @@
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#27ABA3"/>
+<path d="M22.9165 0L29.9998 7.08333H25.9165C24.2597 7.08333 22.9165 5.74019 22.9165 4.08333V0Z" fill="#008078"/>
+<rect x="6.5" y="15.5" width="17" height="5" stroke="white"/>
+<rect x="6.5" y="23.5" width="17" height="5" stroke="white"/>
+</svg>
diff --git a/web/documentserver-example/java/src/main/resources/assets b/web/documentserver-example/java/src/main/resources/assets
index f9fc118e..346236dd 160000
--- a/web/documentserver-example/java/src/main/resources/assets
+++ b/web/documentserver-example/java/src/main/resources/assets
@@ -1 +1 @@
-Subproject commit f9fc118e433ac604f1bc62fc4aa71fa334e97756
+Subproject commit 346236dd127c29febc9119aeb6d55aad5ad190b4
diff --git a/web/documentserver-example/java/src/main/resources/settings.properties b/web/documentserver-example/java/src/main/resources/settings.properties
index 04c009a7..493c5a25 100644
--- a/web/documentserver-example/java/src/main/resources/settings.properties
+++ b/web/documentserver-example/java/src/main/resources/settings.properties
@@ -5,7 +5,7 @@ storage-folder=app_data
 
 files.docservice.fill-docs=.oform|.docx
 files.docservice.viewed-docs=.pdf|.djvu|.xps|.oxps
-files.docservice.edited-docs=.docx|.xlsx|.csv|.pptx|.txt
+files.docservice.edited-docs=.docx|.xlsx|.csv|.pptx|.txt|.docxf
 files.docservice.convert-docs=.docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2
 files.docservice.timeout=120000
 
diff --git a/web/documentserver-example/java/src/main/webapp/css/img/file_docxf.svg b/web/documentserver-example/java/src/main/webapp/css/img/file_docxf.svg
new file mode 100644
index 00000000..984761e6
--- /dev/null
+++ b/web/documentserver-example/java/src/main/webapp/css/img/file_docxf.svg
@@ -0,0 +1,6 @@
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#27ABA3"/>
+<path d="M22.9165 0L29.9998 7.08333H25.9165C24.2597 7.08333 22.9165 5.74019 22.9165 4.08333V0Z" fill="#008078"/>
+<rect x="6.5" y="15.5" width="17" height="5" stroke="white"/>
+<rect x="6.5" y="23.5" width="17" height="5" stroke="white"/>
+</svg>
diff --git a/web/documentserver-example/java/src/main/webapp/css/stylesheet.css b/web/documentserver-example/java/src/main/webapp/css/stylesheet.css
index 565c8d3d..cb68a6ee 100644
--- a/web/documentserver-example/java/src/main/webapp/css/stylesheet.css
+++ b/web/documentserver-example/java/src/main/webapp/css/stylesheet.css
@@ -157,6 +157,10 @@ label .checkbox {
     background-image: url("img/file_pptx.svg");
 }
 
+.try-editor.form {
+    background-image: url("img/file_docxf.svg");
+}
+
 .create-sample {
     color: #666666;
     line-height: 24px;
diff --git a/web/documentserver-example/java/src/main/webapp/index.jsp b/web/documentserver-example/java/src/main/webapp/index.jsp
index 9c3b8970..7a7bee72 100644
--- a/web/documentserver-example/java/src/main/webapp/index.jsp
+++ b/web/documentserver-example/java/src/main/webapp/index.jsp
@@ -64,6 +64,9 @@
                                             <li>
                                                 <a class="try-editor slide" data-type="pptx">Presentation</a>
                                             </li>
+                                            <li>
+                                                <a class="try-editor form" data-type="docxf">Master form</a>
+                                            </li>
                                         </ul>
                                         <label class="create-sample">
                                             <input id="createSample" class="checkbox" type="checkbox" />With sample content

From 80e1be2261499c952f78085fa6bec8d61d3679ef Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Wed, 17 Nov 2021 15:37:59 +0300
Subject: [PATCH 58/62] python: docxf

---
 web/documentserver-example/python/assets                    | 2 +-
 web/documentserver-example/python/config.py                 | 2 +-
 web/documentserver-example/python/src/utils/docManager.py   | 3 ++-
 web/documentserver-example/python/static/css/stylesheet.css | 4 ++++
 .../python/static/images/file_docxf.svg                     | 6 ++++++
 web/documentserver-example/python/templates/index.html      | 3 +++
 6 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 web/documentserver-example/python/static/images/file_docxf.svg

diff --git a/web/documentserver-example/python/assets b/web/documentserver-example/python/assets
index f9fc118e..346236dd 160000
--- a/web/documentserver-example/python/assets
+++ b/web/documentserver-example/python/assets
@@ -1 +1 @@
-Subproject commit f9fc118e433ac604f1bc62fc4aa71fa334e97756
+Subproject commit 346236dd127c29febc9119aeb6d55aad5ad190b4
diff --git a/web/documentserver-example/python/config.py b/web/documentserver-example/python/config.py
index 3bb91e89..184f3791 100644
--- a/web/documentserver-example/python/config.py
+++ b/web/documentserver-example/python/config.py
@@ -7,7 +7,7 @@ STORAGE_PATH = 'app_data'
 
 DOC_SERV_FILLFORMS = [".oform", ".docx"]
 DOC_SERV_VIEWED = [".pdf", ".djvu", ".xps", ".oxps"]  # file extensions that can be viewed
-DOC_SERV_EDITED = [".docx", ".xlsx", ".csv", ".pptx", ".txt"]  # file extensions that can be edited
+DOC_SERV_EDITED = [".docx", ".xlsx", ".csv", ".pptx", ".txt", ".docxf"]  # file extensions that can be edited
 DOC_SERV_CONVERT = [                                           # file extensions that can be converted
     ".docm", ".doc", ".dotx", ".dotm", ".dot", ".odt",
     ".fodt", ".ott", ".xlsm", ".xls", ".xltx", ".xltm",
diff --git a/web/documentserver-example/python/src/utils/docManager.py b/web/documentserver-example/python/src/utils/docManager.py
index 133ae601..61e99330 100644
--- a/web/documentserver-example/python/src/utils/docManager.py
+++ b/web/documentserver-example/python/src/utils/docManager.py
@@ -97,7 +97,8 @@ def getInternalExtension(fileType):
     mapping = {
         'word': '.docx',
         'cell': '.xlsx',
-        'slide': '.pptx'
+        'slide': '.pptx',
+        'docxf': '.docxf'
     }
 
     return mapping.get(fileType, '.docx') # the default file type is .docx
diff --git a/web/documentserver-example/python/static/css/stylesheet.css b/web/documentserver-example/python/static/css/stylesheet.css
index f560c757..5fd245b9 100644
--- a/web/documentserver-example/python/static/css/stylesheet.css
+++ b/web/documentserver-example/python/static/css/stylesheet.css
@@ -165,6 +165,10 @@ label .checkbox {
     background-image: url("../images/file_pptx.svg");
 }
 
+.try-editor.form {
+    background-image: url("../images/file_docxf.svg");
+}
+
 .create-sample {
     color: #666666;
     line-height: 24px;
diff --git a/web/documentserver-example/python/static/images/file_docxf.svg b/web/documentserver-example/python/static/images/file_docxf.svg
new file mode 100644
index 00000000..984761e6
--- /dev/null
+++ b/web/documentserver-example/python/static/images/file_docxf.svg
@@ -0,0 +1,6 @@
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#27ABA3"/>
+<path d="M22.9165 0L29.9998 7.08333H25.9165C24.2597 7.08333 22.9165 5.74019 22.9165 4.08333V0Z" fill="#008078"/>
+<rect x="6.5" y="15.5" width="17" height="5" stroke="white"/>
+<rect x="6.5" y="23.5" width="17" height="5" stroke="white"/>
+</svg>
diff --git a/web/documentserver-example/python/templates/index.html b/web/documentserver-example/python/templates/index.html
index b01a7b02..0edbcd5c 100644
--- a/web/documentserver-example/python/templates/index.html
+++ b/web/documentserver-example/python/templates/index.html
@@ -67,6 +67,9 @@
                                         <li>
                                             <a class="try-editor slide reload-page" target="_blank" data-type="slide">Presentation</a>
                                         </li>
+                                        <li>
+                                            <a class="try-editor form reload-page" target="_blank" data-type="docxf">Master form</a>
+                                        </li>
                                     </ul>
                                     <label class="create-sample">
                                         <input type="checkbox" id="createSample" class="checkbox" />With sample content

From cf2f60f8cdebfbb9a09326416c9e5726bc92fb95 Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Wed, 17 Nov 2021 16:24:44 +0300
Subject: [PATCH 59/62] ruby: docxf

---
 .../ruby/app/assets/images/file_docxf.svg                  | 6 ++++++
 .../ruby/app/assets/stylesheets/stylesheet.scss            | 4 ++++
 .../ruby/app/controllers/home_controller.rb                | 7 +++++--
 .../ruby/app/views/home/index.html.erb                     | 3 +++
 web/documentserver-example/ruby/config/application.rb      | 2 +-
 web/documentserver-example/ruby/public/assets              | 2 +-
 6 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 web/documentserver-example/ruby/app/assets/images/file_docxf.svg

diff --git a/web/documentserver-example/ruby/app/assets/images/file_docxf.svg b/web/documentserver-example/ruby/app/assets/images/file_docxf.svg
new file mode 100644
index 00000000..984761e6
--- /dev/null
+++ b/web/documentserver-example/ruby/app/assets/images/file_docxf.svg
@@ -0,0 +1,6 @@
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#27ABA3"/>
+<path d="M22.9165 0L29.9998 7.08333H25.9165C24.2597 7.08333 22.9165 5.74019 22.9165 4.08333V0Z" fill="#008078"/>
+<rect x="6.5" y="15.5" width="17" height="5" stroke="white"/>
+<rect x="6.5" y="23.5" width="17" height="5" stroke="white"/>
+</svg>
diff --git a/web/documentserver-example/ruby/app/assets/stylesheets/stylesheet.scss b/web/documentserver-example/ruby/app/assets/stylesheets/stylesheet.scss
index c0c7d162..fa915442 100644
--- a/web/documentserver-example/ruby/app/assets/stylesheets/stylesheet.scss
+++ b/web/documentserver-example/ruby/app/assets/stylesheets/stylesheet.scss
@@ -157,6 +157,10 @@ label .checkbox {
     background-image: url("file_pptx.svg");
 }
 
+.try-editor.form {
+  background-image: url("file_docxf.svg");
+}
+
 .create-sample {
     color: #666666;
     line-height: 24px;
diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb
index ec49a36c..e891428f 100644
--- a/web/documentserver-example/ruby/app/controllers/home_controller.rb
+++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb
@@ -257,7 +257,7 @@ class HomeController < ApplicationController
 
       # add headers to the response to specify the page parameters
       response.headers['Content-Length'] = File.size(file_path).to_s
-      response.headers['Content-Type'] = MimeMagic.by_path(file_path).type
+      response.headers['Content-Type'] = MimeMagic.by_path(file_path).eql?(nil) ? nil : MimeMagic.by_path(file_path).type
       response.headers['Content-Disposition'] = "attachment;filename*=UTF-8\'\'" + URI.escape(file_name, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
 
       send_file file_path, :x_sendfile => true
@@ -274,10 +274,11 @@ class HomeController < ApplicationController
       title = body["title"]
       file_name = DocumentHelper.get_correct_name(title, nil)
       extension = File.extname(file_name).downcase
-      all_exts = DocumentHelper.convert_exts + DocumentHelper.edited_exts + DocumentHelper.viewed_exts
+      all_exts = DocumentHelper.convert_exts + DocumentHelper.edited_exts + DocumentHelper.viewed_exts + DocumentHelper.fill_forms_exts
 
       unless all_exts.include?(extension)
         render plain: '{"error": "File type is not supported"}'
+        return
       end
 
       uri = URI.parse(file_url)  # create the request url
@@ -293,6 +294,7 @@ class HomeController < ApplicationController
 
       if data.size <= 0 || data.size > Rails.configuration.fileSizeMax
         render plain: '{"error": "File size is incorrect"}'
+        return
       end
 
       File.open(DocumentHelper.storage_path(file_name, nil), 'wb') do |file|
@@ -302,6 +304,7 @@ class HomeController < ApplicationController
       DocumentHelper.create_meta(file_name, user.id, user.name, nil)  # create meta data of the new file
 
       render plain: '{"file" : "' + file_name + '"}'
+      return
     rescue => ex
       render plain: '{"error":1, "message": "' + ex.message + '"}'
       return
diff --git a/web/documentserver-example/ruby/app/views/home/index.html.erb b/web/documentserver-example/ruby/app/views/home/index.html.erb
index 15ffd06b..a2b451d0 100644
--- a/web/documentserver-example/ruby/app/views/home/index.html.erb
+++ b/web/documentserver-example/ruby/app/views/home/index.html.erb
@@ -40,6 +40,9 @@
                       <li>
                         <a class="try-editor slide" data-type="pptx">Presentation</a>
                       </li>
+                      <li>
+                        <a class="try-editor form" data-type="docxf">Master form</a>
+                      </li>
                   </ul>
                   <label class="create-sample">
                       <input id="createSample" class="checkbox" type="checkbox" />With sample content
diff --git a/web/documentserver-example/ruby/config/application.rb b/web/documentserver-example/ruby/config/application.rb
index 0267d9d7..f88f5b64 100644
--- a/web/documentserver-example/ruby/config/application.rb
+++ b/web/documentserver-example/ruby/config/application.rb
@@ -34,7 +34,7 @@ module OnlineEditorsExampleRuby
 
     Rails.configuration.fillDocs=".oform|.docx"
     Rails.configuration.viewedDocs=".pdf|.djvu|.xps|.oxps"
-    Rails.configuration.editedDocs=".docx|.xlsx|.csv|.pptx|.txt"
+    Rails.configuration.editedDocs=".docx|.xlsx|.csv|.pptx|.txt|.docxf"
     Rails.configuration.convertDocs=".docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2"
 
     Rails.configuration.urlSite="http://documentserver/"
diff --git a/web/documentserver-example/ruby/public/assets b/web/documentserver-example/ruby/public/assets
index f9fc118e..346236dd 160000
--- a/web/documentserver-example/ruby/public/assets
+++ b/web/documentserver-example/ruby/public/assets
@@ -1 +1 @@
-Subproject commit f9fc118e433ac604f1bc62fc4aa71fa334e97756
+Subproject commit 346236dd127c29febc9119aeb6d55aad5ad190b4

From a26a559921c81cae154fdc4f1d47b8b5adaf59c4 Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Wed, 17 Nov 2021 16:33:53 +0300
Subject: [PATCH 60/62] csharp-mvc: docxf

---
 .../csharp-mvc/Content/images/file_docxf.svg                | 6 ++++++
 .../csharp-mvc/Content/stylesheet.css                       | 4 ++++
 web/documentserver-example/csharp-mvc/Models/FileModel.cs   | 2 +-
 .../csharp-mvc/OnlineEditorsExampleMVC.csproj               | 1 +
 web/documentserver-example/csharp-mvc/Views/Home/Index.aspx | 3 +++
 web/documentserver-example/csharp-mvc/WebEditor.ashx.cs     | 1 +
 web/documentserver-example/csharp-mvc/assets                | 2 +-
 .../csharp-mvc/web.appsettings.config                       | 2 +-
 8 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 web/documentserver-example/csharp-mvc/Content/images/file_docxf.svg

diff --git a/web/documentserver-example/csharp-mvc/Content/images/file_docxf.svg b/web/documentserver-example/csharp-mvc/Content/images/file_docxf.svg
new file mode 100644
index 00000000..984761e6
--- /dev/null
+++ b/web/documentserver-example/csharp-mvc/Content/images/file_docxf.svg
@@ -0,0 +1,6 @@
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#27ABA3"/>
+<path d="M22.9165 0L29.9998 7.08333H25.9165C24.2597 7.08333 22.9165 5.74019 22.9165 4.08333V0Z" fill="#008078"/>
+<rect x="6.5" y="15.5" width="17" height="5" stroke="white"/>
+<rect x="6.5" y="23.5" width="17" height="5" stroke="white"/>
+</svg>
diff --git a/web/documentserver-example/csharp-mvc/Content/stylesheet.css b/web/documentserver-example/csharp-mvc/Content/stylesheet.css
index 18648dd2..591d0e80 100644
--- a/web/documentserver-example/csharp-mvc/Content/stylesheet.css
+++ b/web/documentserver-example/csharp-mvc/Content/stylesheet.css
@@ -157,6 +157,10 @@ label .checkbox {
     background-image: url("images/file_pptx.svg");
 }
 
+.try-editor.form {
+    background-image: url("images/file_docxf.svg");
+}
+
 .create-sample {
     color: #666666;
     line-height: 24px;
diff --git a/web/documentserver-example/csharp-mvc/Models/FileModel.cs b/web/documentserver-example/csharp-mvc/Models/FileModel.cs
index a8cb2edd..d0804611 100644
--- a/web/documentserver-example/csharp-mvc/Models/FileModel.cs
+++ b/web/documentserver-example/csharp-mvc/Models/FileModel.cs
@@ -79,7 +79,6 @@ namespace OnlineEditorsExampleMVC.Models
             var editorsMode = Mode ?? "edit";  // get editor mode
 
             var canEdit = DocManagerHelper.EditedExts.Contains(ext);  // check if the file with such an extension can be edited
-            var mode = canEdit && editorsMode != "view" ? "edit" : "view";  // set the mode parameter: change it to view if the document can't be edited
 
             var id = request.Cookies.GetOrDefault("uid", null);
             var user = Users.getUser(id);  // get the user
@@ -89,6 +88,7 @@ namespace OnlineEditorsExampleMVC.Models
                 canEdit = true;
             }
             var submitForm = editorsMode.Equals("fillForms") && id.Equals("uid-1") && false;  // check if the Submit form button is displayed or not
+            var mode = canEdit && editorsMode != "view" ? "edit" : "view";  // set the mode parameter: change it to view if the document can't be edited
 
             // favorite icon state
             bool? favorite = user.favorite;
diff --git a/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj b/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj
index 8c9740e6..cc4955f8 100644
--- a/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj
+++ b/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj
@@ -131,6 +131,7 @@
     <Content Include="Content\images\embeded.svg" />
     <Content Include="Content\images\error.svg" />
     <Content Include="Content\images\file_docx.svg" />
+    <Content Include="Content\images\file_docxf.svg" />
     <Content Include="Content\images\file_pptx.svg" />
     <Content Include="Content\images\file_upload.svg" />
     <Content Include="Content\images\file_xlsx.svg" />
diff --git a/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx b/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
index 40c56f72..b6e33437 100644
--- a/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
+++ b/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
@@ -65,6 +65,9 @@
                                         <li>
                                             <a class="try-editor slide" data-type="pptx">Presentation</a>
                                         </li>
+                                        <li>
+                                            <a class="try-editor form" data-type="docxf">Master form</a>
+                                        </li>
                                     </ul>
                                     <label class="create-sample">
                                         <input id="createSample" class="checkbox" type="checkbox" />With sample content
diff --git a/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs b/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
index 5ef974e1..2dc42479 100644
--- a/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
+++ b/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
@@ -100,6 +100,7 @@ namespace OnlineEditorsExampleMVC
                 var allExt = DocManagerHelper.ConvertExts
                     .Concat(DocManagerHelper.EditedExts)
                     .Concat(DocManagerHelper.ViewedExts)
+                    .Concat(DocManagerHelper.FillFormExts)
                     .ToArray();
     
                 if (!allExt.Contains(extension))
diff --git a/web/documentserver-example/csharp-mvc/assets b/web/documentserver-example/csharp-mvc/assets
index f9fc118e..346236dd 160000
--- a/web/documentserver-example/csharp-mvc/assets
+++ b/web/documentserver-example/csharp-mvc/assets
@@ -1 +1 @@
-Subproject commit f9fc118e433ac604f1bc62fc4aa71fa334e97756
+Subproject commit 346236dd127c29febc9119aeb6d55aad5ad190b4
diff --git a/web/documentserver-example/csharp-mvc/web.appsettings.config b/web/documentserver-example/csharp-mvc/web.appsettings.config
index 6b7e8248..e9802518 100644
--- a/web/documentserver-example/csharp-mvc/web.appsettings.config
+++ b/web/documentserver-example/csharp-mvc/web.appsettings.config
@@ -7,7 +7,7 @@
 
   <add key="files.docservice.fillform-docs" value=".oform|.docx"/>
   <add key="files.docservice.viewed-docs" value=".pdf|.djvu|.xps|.oxps"/>
-  <add key="files.docservice.edited-docs" value=".docx|.xlsx|.csv|.pptx|.txt"/>
+  <add key="files.docservice.edited-docs" value=".docx|.xlsx|.csv|.pptx|.txt|.docxf"/>
   <add key="files.docservice.convert-docs" value=".docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2"/>
   <add key="files.docservice.timeout" value="120000" />
   <add key="files.docservice.secret" value="" />

From ad9d627c82d9dcb06c7c971aa583c67b2559c9f8 Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Wed, 17 Nov 2021 16:45:57 +0300
Subject: [PATCH 61/62] csharp: docxf

---
 .../csharp/App_Themes/images/file_docxf.svg                 | 6 ++++++
 web/documentserver-example/csharp/App_Themes/stylesheet.css | 4 ++++
 web/documentserver-example/csharp/Default.aspx              | 3 +++
 web/documentserver-example/csharp/Default.aspx.cs           | 2 +-
 web/documentserver-example/csharp/DocEditor.aspx.cs         | 5 ++++-
 .../csharp/OnlineEditorsExample.csproj                      | 1 +
 web/documentserver-example/csharp/assets                    | 2 +-
 web/documentserver-example/csharp/settings.config           | 2 +-
 8 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 web/documentserver-example/csharp/App_Themes/images/file_docxf.svg

diff --git a/web/documentserver-example/csharp/App_Themes/images/file_docxf.svg b/web/documentserver-example/csharp/App_Themes/images/file_docxf.svg
new file mode 100644
index 00000000..984761e6
--- /dev/null
+++ b/web/documentserver-example/csharp/App_Themes/images/file_docxf.svg
@@ -0,0 +1,6 @@
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#27ABA3"/>
+<path d="M22.9165 0L29.9998 7.08333H25.9165C24.2597 7.08333 22.9165 5.74019 22.9165 4.08333V0Z" fill="#008078"/>
+<rect x="6.5" y="15.5" width="17" height="5" stroke="white"/>
+<rect x="6.5" y="23.5" width="17" height="5" stroke="white"/>
+</svg>
diff --git a/web/documentserver-example/csharp/App_Themes/stylesheet.css b/web/documentserver-example/csharp/App_Themes/stylesheet.css
index 518c8a36..35d63865 100644
--- a/web/documentserver-example/csharp/App_Themes/stylesheet.css
+++ b/web/documentserver-example/csharp/App_Themes/stylesheet.css
@@ -157,6 +157,10 @@ label .checkbox {
     background-image: url("images/file_pptx.svg");
 }
 
+.try-editor.form {
+    background-image: url("images/file_docxf.svg");
+}
+
 .create-sample {
     color: #666666;
     line-height: 24px;
diff --git a/web/documentserver-example/csharp/Default.aspx b/web/documentserver-example/csharp/Default.aspx
index 7962dec8..2a6368d9 100644
--- a/web/documentserver-example/csharp/Default.aspx
+++ b/web/documentserver-example/csharp/Default.aspx
@@ -67,6 +67,9 @@
                                             <li>
                                                 <a class="try-editor slide" data-type="slide">Presentation</a>
                                             </li>
+                                            <li>
+                                                <a class="try-editor form" data-type="docxf">Master form</a>
+                                            </li>
                                         </ul>
                                         <label class="create-sample">
                                             <input id="createSample" class="checkbox" type="checkbox" />With sample content
diff --git a/web/documentserver-example/csharp/Default.aspx.cs b/web/documentserver-example/csharp/Default.aspx.cs
index 08662b69..85e5812c 100644
--- a/web/documentserver-example/csharp/Default.aspx.cs
+++ b/web/documentserver-example/csharp/Default.aspx.cs
@@ -375,7 +375,7 @@ namespace OnlineEditorsExample
             var fileName = GetCorrectName(title);
             var extension = "." + (Path.GetExtension(fileName).ToLower() ?? "").Trim('.');
 
-            var allExt = ConvertExts.Concat(EditedExts).Concat(ViewedExts).ToArray();
+            var allExt = ConvertExts.Concat(EditedExts).Concat(ViewedExts).Concat(FillFormsExts).ToArray();
 
             if (!allExt.Contains(extension))
             {
diff --git a/web/documentserver-example/csharp/DocEditor.aspx.cs b/web/documentserver-example/csharp/DocEditor.aspx.cs
index 596a7d10..6e3f98a2 100644
--- a/web/documentserver-example/csharp/DocEditor.aspx.cs
+++ b/web/documentserver-example/csharp/DocEditor.aspx.cs
@@ -148,7 +148,6 @@ namespace OnlineEditorsExample
             var editorsMode = Request.GetOrDefault("editorsMode", "edit");
 
             var canEdit = _Default.EditedExts.Contains(ext);  // check if this file can be edited
-            var mode = canEdit && editorsMode != "view" ? "edit" : "view";  // get the editor opening mode (edit or view)
             var editorsType = Request.GetOrDefault("editorsType", "desktop");
 
             var id = Request.Cookies.GetOrDefault("uid", null);
@@ -159,6 +158,7 @@ namespace OnlineEditorsExample
                 canEdit = true;
             }            
             var submitForm = editorsMode.Equals("fillForms") && id.Equals("uid-1") && false;  // check if the Submit form button is displayed or hidden
+            var mode = canEdit && editorsMode != "view" ? "edit" : "view";  // get the editor opening mode (edit or view)
 
             var jss = new JavaScriptSerializer();
 
@@ -522,6 +522,9 @@ namespace OnlineEditorsExample
                 case "slide":
                     ext = ".pptx";  // .pptx for slide document type
                     break;
+                case "docxf":
+                    ext = ".docxf";
+                    break;
                 default:
                     return;
             }
diff --git a/web/documentserver-example/csharp/OnlineEditorsExample.csproj b/web/documentserver-example/csharp/OnlineEditorsExample.csproj
index 0b9d55af..da373506 100644
--- a/web/documentserver-example/csharp/OnlineEditorsExample.csproj
+++ b/web/documentserver-example/csharp/OnlineEditorsExample.csproj
@@ -80,6 +80,7 @@
     <Content Include="App_Themes\images\embeded.svg" />
     <Content Include="App_Themes\images\error.svg" />
     <Content Include="App_Themes\images\file_docx.svg" />
+    <Content Include="App_Themes\images\file_docxf.svg" />
     <Content Include="App_Themes\images\file_pptx.svg" />
     <Content Include="App_Themes\images\file_upload.svg" />
     <Content Include="App_Themes\images\file_xlsx.svg" />
diff --git a/web/documentserver-example/csharp/assets b/web/documentserver-example/csharp/assets
index f9fc118e..346236dd 160000
--- a/web/documentserver-example/csharp/assets
+++ b/web/documentserver-example/csharp/assets
@@ -1 +1 @@
-Subproject commit f9fc118e433ac604f1bc62fc4aa71fa334e97756
+Subproject commit 346236dd127c29febc9119aeb6d55aad5ad190b4
diff --git a/web/documentserver-example/csharp/settings.config b/web/documentserver-example/csharp/settings.config
index e25595ff..f98711f6 100644
--- a/web/documentserver-example/csharp/settings.config
+++ b/web/documentserver-example/csharp/settings.config
@@ -8,7 +8,7 @@
 
   <add key="files.docservice.fillform-docs" value=".oform|.docx"/>
   <add key="files.docservice.viewed-docs" value=".pdf|.djvu|.xps|.oxps"/>
-  <add key="files.docservice.edited-docs" value=".docx|.xlsx|.csv|.pptx|.txt"/>
+  <add key="files.docservice.edited-docs" value=".docx|.xlsx|.csv|.pptx|.txt|.docxf"/>
   <add key="files.docservice.convert-docs" value=".docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2"/>
   <add key="files.docservice.timeout" value="120000" />
   <add key="files.docservice.secret" value="" />

From 3be5035ab35dc178fee29d813199277546c80ce8 Mon Sep 17 00:00:00 2001
From: Oleg Sinizin <oleg.sinizin@onlyoffice.com>
Date: Wed, 17 Nov 2021 16:52:10 +0300
Subject: [PATCH 62/62] php: docxf

---
 web/documentserver-example/php/assets                    | 2 +-
 web/documentserver-example/php/config.php                | 2 +-
 web/documentserver-example/php/css/images/file_docxf.svg | 6 ++++++
 web/documentserver-example/php/css/stylesheet.css        | 4 ++++
 web/documentserver-example/php/index.php                 | 3 +++
 web/documentserver-example/php/webeditor-ajax.php        | 2 +-
 6 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 web/documentserver-example/php/css/images/file_docxf.svg

diff --git a/web/documentserver-example/php/assets b/web/documentserver-example/php/assets
index f9fc118e..346236dd 160000
--- a/web/documentserver-example/php/assets
+++ b/web/documentserver-example/php/assets
@@ -1 +1 @@
-Subproject commit f9fc118e433ac604f1bc62fc4aa71fa334e97756
+Subproject commit 346236dd127c29febc9119aeb6d55aad5ad190b4
diff --git a/web/documentserver-example/php/config.php b/web/documentserver-example/php/config.php
index ee36edae..7f83cfb3 100644
--- a/web/documentserver-example/php/config.php
+++ b/web/documentserver-example/php/config.php
@@ -8,7 +8,7 @@ $GLOBALS['ALONE'] = FALSE;
 
 $GLOBALS['DOC_SERV_FILLFORMS'] = array(".oform", ".docx");
 $GLOBALS['DOC_SERV_VIEWD'] = array(".pdf", ".djvu", ".xps", ".oxps");
-$GLOBALS['DOC_SERV_EDITED'] = array(".docx", ".xlsx", ".csv", ".pptx", ".txt");
+$GLOBALS['DOC_SERV_EDITED'] = array(".docx", ".xlsx", ".csv", ".pptx", ".txt", ".docxf");
 $GLOBALS['DOC_SERV_CONVERT'] = array(".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", ".xml", ".epub", ".fb2");
 
 $GLOBALS['DOC_SERV_TIMEOUT'] = "120000";
diff --git a/web/documentserver-example/php/css/images/file_docxf.svg b/web/documentserver-example/php/css/images/file_docxf.svg
new file mode 100644
index 00000000..984761e6
--- /dev/null
+++ b/web/documentserver-example/php/css/images/file_docxf.svg
@@ -0,0 +1,6 @@
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#27ABA3"/>
+<path d="M22.9165 0L29.9998 7.08333H25.9165C24.2597 7.08333 22.9165 5.74019 22.9165 4.08333V0Z" fill="#008078"/>
+<rect x="6.5" y="15.5" width="17" height="5" stroke="white"/>
+<rect x="6.5" y="23.5" width="17" height="5" stroke="white"/>
+</svg>
diff --git a/web/documentserver-example/php/css/stylesheet.css b/web/documentserver-example/php/css/stylesheet.css
index 8189350b..ca73b5ad 100644
--- a/web/documentserver-example/php/css/stylesheet.css
+++ b/web/documentserver-example/php/css/stylesheet.css
@@ -156,6 +156,10 @@ label .checkbox {
     background-image: url("images/file_pptx.svg");
 }
 
+.try-editor.form {
+    background-image: url("images/file_docxf.svg");
+}
+
 .create-sample {
     color: #666666;
     line-height: 24px;
diff --git a/web/documentserver-example/php/index.php b/web/documentserver-example/php/index.php
index c2aceda6..00de5b61 100644
--- a/web/documentserver-example/php/index.php
+++ b/web/documentserver-example/php/index.php
@@ -68,6 +68,9 @@
                                                 <li>
                                                     <a class="try-editor slide reload-page" target="_blank" href="doceditor.php?fileExt=pptx&user=<?php echo htmlentities($user); ?>">Presentation</a>
                                                 </li>
+                                                <li>
+                                                    <a class="try-editor form reload-page" target="_blank" href="doceditor.php?fileExt=docxf&user=<?php echo htmlentities($user); ?>">Master form</a>
+                                                </li>
                                             </ul>
                                             <label class="create-sample">
                                                 <input type="checkbox" id="createSample" class="checkbox" />With sample content
diff --git a/web/documentserver-example/php/webeditor-ajax.php b/web/documentserver-example/php/webeditor-ajax.php
index f096e5ba..bddb7cc4 100644
--- a/web/documentserver-example/php/webeditor-ajax.php
+++ b/web/documentserver-example/php/webeditor-ajax.php
@@ -106,7 +106,7 @@ function saveas() {
        $fileurl = $post["url"];
        $title = $post["title"];
        $extension = strtolower(pathinfo($title, PATHINFO_EXTENSION));
-       $allexts = array_merge($GLOBALS['DOC_SERV_CONVERT'], $GLOBALS['DOC_SERV_EDITED'], $GLOBALS['DOC_SERV_VIEWD']);
+       $allexts = array_merge($GLOBALS['DOC_SERV_CONVERT'], $GLOBALS['DOC_SERV_EDITED'], $GLOBALS['DOC_SERV_VIEWD'], $GLOBALS['DOC_SERV_FILLFORMS']);
        $filename = GetCorrectName($title);
 
        if (!in_array("." . $extension, $allexts)) {