Merge pull request #132 from ONLYOFFICE/feature/fill-forms

Feature/fill forms
ruby: added postfix -form isSubmitForm
2026-04-07 14:06:11 +08:00 · 2021-03-22 12:47:47 +03:00 · 2021-03-19 15:02:05 +03:00 · 2021-03-19 14:53:34 +03:00 · 2021-03-19 14:43:58 +03:00 · 2021-03-19 14:34:25 +03:00
115 changed files with 225 additions and 188 deletions
--- a/web/documentserver-example/csharp-mvc/App_Start/BundleConfig.cs
+++ b/web/documentserver-example/csharp-mvc/App_Start/BundleConfig.cs
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/csharp-mvc/App_Start/FilterConfig.cs
+++ b/web/documentserver-example/csharp-mvc/App_Start/FilterConfig.cs
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/csharp-mvc/App_Start/RouteConfig.cs
+++ b/web/documentserver-example/csharp-mvc/App_Start/RouteConfig.cs
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/csharp-mvc/App_Start/WebApiConfig.cs
+++ b/web/documentserver-example/csharp-mvc/App_Start/WebApiConfig.cs
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/csharp-mvc/Content/editor.css
+++ b/web/documentserver-example/csharp-mvc/Content/editor.css
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/csharp-mvc/Content/stylesheet.css
+++ b/web/documentserver-example/csharp-mvc/Content/stylesheet.css
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/csharp-mvc/Controllers/HomeController.cs
+++ b/web/documentserver-example/csharp-mvc/Controllers/HomeController.cs
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/csharp-mvc/Global.asax.cs
+++ b/web/documentserver-example/csharp-mvc/Global.asax.cs
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs
+++ b/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/csharp-mvc/Helpers/DocumentConverter.cs
+++ b/web/documentserver-example/csharp-mvc/Helpers/DocumentConverter.cs
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/csharp-mvc/Helpers/JwtManager.cs
+++ b/web/documentserver-example/csharp-mvc/Helpers/JwtManager.cs
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/csharp-mvc/Helpers/TrackManager.cs
+++ b/web/documentserver-example/csharp-mvc/Helpers/TrackManager.cs
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -152,7 +152,7 @@ namespace OnlineEditorsExampleMVC.Helpers

            string curExt = Path.GetExtension(fileName);
            string downloadExt = Path.GetExtension(downloadUri);
-            var newFileName = fileName;
+            Boolean newFileName = false;

            if (!curExt.Equals(downloadExt))
            {
@ -162,7 +162,7 @@ namespace OnlineEditorsExampleMVC.Helpers
                    var result = ServiceConverter.GetConvertedUri(downloadUri, downloadExt, curExt, ServiceConverter.GenerateRevisionId(downloadUri), false, out newFileUri);
                    if (string.IsNullOrEmpty(newFileUri))
                    {
-                        newFileName = DocManagerHelper.GetCorrectName(Path.GetFileNameWithoutExtension(fileName) + downloadExt, userAddress);
+                        newFileName = true;
                    }
                    else 
                    {
@ -171,7 +171,7 @@ namespace OnlineEditorsExampleMVC.Helpers
                } 
                catch (Exception)
                {
-                    newFileName = DocManagerHelper.GetCorrectName(Path.GetFileNameWithoutExtension(fileName) + downloadExt, userAddress);
+                    newFileName = true;
                }
            }

@ -180,18 +180,25 @@ namespace OnlineEditorsExampleMVC.Helpers

            if (isSubmitForm)
            {
-                if (newFileName.Equals(fileName))
+                if (newFileName)
                {
-                    newFileName = DocManagerHelper.GetCorrectName(fileName, userAddress);
+                    fileName = DocManagerHelper.GetCorrectName(Path.GetFileNameWithoutExtension(fileName) + "-form" + downloadExt, userAddress);
+                } else
+                {
+                    fileName = DocManagerHelper.GetCorrectName(Path.GetFileNameWithoutExtension(fileName) + "-form" + curExt, userAddress);
                }
-                forcesavePath = DocManagerHelper.StoragePath(newFileName, userAddress);
+                forcesavePath = DocManagerHelper.StoragePath(fileName, userAddress);
            }
            else
            {
-                forcesavePath = DocManagerHelper.ForcesavePath(newFileName, userAddress, false);
+                if (newFileName)
+                {
+                    fileName = DocManagerHelper.GetCorrectName(Path.GetFileNameWithoutExtension(fileName) + downloadExt, userAddress);
+                }
+                forcesavePath = DocManagerHelper.ForcesavePath(fileName, userAddress, false);
                if (forcesavePath.Equals(""))
                {
-                    forcesavePath = DocManagerHelper.ForcesavePath(newFileName, userAddress, true);
+                    forcesavePath = DocManagerHelper.ForcesavePath(fileName, userAddress, true);
                }
            }

@ -203,7 +210,7 @@ namespace OnlineEditorsExampleMVC.Helpers
                var actions = jss.Deserialize<List<object>>(jss.Serialize(fileData["actions"]));
                var action = jss.Deserialize<Dictionary<string, object>>(jss.Serialize(actions[0]));
                var user = action["userid"].ToString();
-                DocManagerHelper.CreateMeta(newFileName, user, "Filling Form", userAddress);
+                DocManagerHelper.CreateMeta(fileName, user, "Filling Form", userAddress);
            }

            return 0;
--- a/web/documentserver-example/csharp-mvc/Models/FileModel.cs
+++ b/web/documentserver-example/csharp-mvc/Models/FileModel.cs
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/csharp-mvc/Models/FileUtility.cs
+++ b/web/documentserver-example/csharp-mvc/Models/FileUtility.cs
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/csharp-mvc/Properties/AssemblyInfo.cs
+++ b/web/documentserver-example/csharp-mvc/Properties/AssemblyInfo.cs
@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Ascensio System SIA")]
 [assembly: AssemblyProduct("OnlineEditorsExampleMVC")]
-[assembly: AssemblyCopyright("Ascensio System SIA 2020")]
+[assembly: AssemblyCopyright("Ascensio System SIA 2021")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/web/documentserver-example/csharp-mvc/Scripts/jquery.dropdownToggle.js
+++ b/web/documentserver-example/csharp-mvc/Scripts/jquery.dropdownToggle.js
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/csharp-mvc/Scripts/jscript.js
+++ b/web/documentserver-example/csharp-mvc/Scripts/jscript.js
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
+++ b/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
@ -14,7 +14,7 @@
    <meta name="mobile-web-app-capable" content="yes" />
    <!--
    *
-    * (c) Copyright Ascensio System SIA 2020
+    * (c) Copyright Ascensio System SIA 2021
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
+++ b/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
@ -13,7 +13,7 @@
    <meta name="viewport" content="width=device-width" />
    <!--
    *
-    * (c) Copyright Ascensio System SIA 2020
+    * (c) Copyright Ascensio System SIA 2021
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/csharp-mvc/Views/Shared/Error.aspx
+++ b/web/documentserver-example/csharp-mvc/Views/Shared/Error.aspx
@ -5,7 +5,7 @@
    <meta name="viewport" content="width=device-width" />
    <!--
    *
-    * (c) Copyright Ascensio System SIA 2020
+    * (c) Copyright Ascensio System SIA 2021
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
+++ b/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/csharp/App_Themes/stylesheet.css
+++ b/web/documentserver-example/csharp/App_Themes/stylesheet.css
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/csharp/Default.aspx
+++ b/web/documentserver-example/csharp/Default.aspx
@ -12,7 +12,7 @@
    <title>ONLYOFFICE</title>
    <!--
    *
-    * (c) Copyright Ascensio System SIA 2020
+    * (c) Copyright Ascensio System SIA 2021
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/csharp/Default.aspx.cs
+++ b/web/documentserver-example/csharp/Default.aspx.cs
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/csharp/DocEditor.aspx
+++ b/web/documentserver-example/csharp/DocEditor.aspx
@ -15,7 +15,7 @@
    <title>ONLYOFFICE</title>
    <!--
    *
-    * (c) Copyright Ascensio System SIA 2020
+    * (c) Copyright Ascensio System SIA 2021
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/csharp/DocEditor.aspx.cs
+++ b/web/documentserver-example/csharp/DocEditor.aspx.cs
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/csharp/DocumentConverter.cs
+++ b/web/documentserver-example/csharp/DocumentConverter.cs
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/csharp/JwtManager.cs
+++ b/web/documentserver-example/csharp/JwtManager.cs
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/csharp/Properties/AssemblyInfo.cs
+++ b/web/documentserver-example/csharp/Properties/AssemblyInfo.cs
@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Ascensio System SIA")]
 [assembly: AssemblyProduct("OnlineEditorsExample")]
-[assembly: AssemblyCopyright("Ascensio System SIA 2020")]
+[assembly: AssemblyCopyright("Ascensio System SIA 2021")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/web/documentserver-example/csharp/TrackManager.cs
+++ b/web/documentserver-example/csharp/TrackManager.cs
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -160,7 +160,7 @@ namespace OnlineEditorsExample

            string curExt = Path.GetExtension(fileName);
            string downloadExt = Path.GetExtension(downloadUri);
-            var newFileName = fileName;
+            Boolean newFileName = false;

            if (!curExt.Equals(downloadExt))
            {
@ -170,7 +170,7 @@ namespace OnlineEditorsExample
                    var result = ServiceConverter.GetConvertedUri(downloadUri, downloadExt, curExt, ServiceConverter.GenerateRevisionId(downloadUri), false, out newFileUri);
                    if (string.IsNullOrEmpty(newFileUri))
                    {
-                        newFileName = _Default.GetCorrectName(Path.GetFileNameWithoutExtension(fileName) + downloadExt, userAddress);
+                        newFileName = true;
                    }
                    else
                    {
@ -179,7 +179,7 @@ namespace OnlineEditorsExample
                }
                catch (Exception)
                {
-                    newFileName = _Default.GetCorrectName(Path.GetFileNameWithoutExtension(fileName) + downloadExt, userAddress);
+                    newFileName = true;
                }
            }

@ -194,18 +194,26 @@ namespace OnlineEditorsExample

            if (isSubmitForm)
            {
-                if (newFileName.Equals(fileName))
+                if (newFileName)
                {
-                    newFileName = _Default.GetCorrectName(fileName, userAddress);
+                    fileName = _Default.GetCorrectName(Path.GetFileNameWithoutExtension(fileName) + "-form" + downloadExt, userAddress);
+                } else
+                {
+                    fileName = _Default.GetCorrectName(Path.GetFileNameWithoutExtension(fileName) + "-form" + curExt, userAddress);
                }
-                forcesavePath = _Default.StoragePath(newFileName, userAddress);
+                forcesavePath = _Default.StoragePath(fileName, userAddress);
            }
            else
            {
-                forcesavePath = _Default.ForcesavePath(newFileName, userAddress, false);
+                if (newFileName)
+                {
+                    fileName = _Default.GetCorrectName(Path.GetFileNameWithoutExtension(fileName) + downloadExt, userAddress);
+                }
+
+                forcesavePath = _Default.ForcesavePath(fileName, userAddress, false);
                if (forcesavePath.Equals(""))
                {
-                    forcesavePath = _Default.ForcesavePath(newFileName, userAddress, true);
+                    forcesavePath = _Default.ForcesavePath(fileName, userAddress, true);
                }
            }

@ -217,7 +225,7 @@ namespace OnlineEditorsExample
                var actions = jss.Deserialize<List<object>>(jss.Serialize(fileData["actions"]));
                var action = jss.Deserialize<Dictionary<string, object>>(jss.Serialize(actions[0]));
                var user = action["userid"].ToString();
-                DocEditor.CreateMeta(newFileName, user, "Filling Form", userAddress);
+                DocEditor.CreateMeta(fileName, user, "Filling Form", userAddress);
            }

            return 0;
--- a/web/documentserver-example/csharp/WebEditor.ashx.cs
+++ b/web/documentserver-example/csharp/WebEditor.ashx.cs
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/csharp/script/jquery.dropdownToggle.js
+++ b/web/documentserver-example/csharp/script/jquery.dropdownToggle.js
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/csharp/script/jscript.js
+++ b/web/documentserver-example/csharp/script/jscript.js
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/java/src/main/java/controllers/EditorServlet.java
+++ b/web/documentserver-example/java/src/main/java/controllers/EditorServlet.java
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/java/src/main/java/controllers/GlobalServletContextListener.java
+++ b/web/documentserver-example/java/src/main/java/controllers/GlobalServletContextListener.java
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java
+++ b/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/java/src/main/java/entities/FileModel.java
+++ b/web/documentserver-example/java/src/main/java/entities/FileModel.java
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/java/src/main/java/entities/FileType.java
+++ b/web/documentserver-example/java/src/main/java/entities/FileType.java
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/java/src/main/java/helpers/ConfigManager.java
+++ b/web/documentserver-example/java/src/main/java/helpers/ConfigManager.java
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/java/src/main/java/helpers/CookieManager.java
+++ b/web/documentserver-example/java/src/main/java/helpers/CookieManager.java
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java
+++ b/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/java/src/main/java/helpers/FileUtility.java
+++ b/web/documentserver-example/java/src/main/java/helpers/FileUtility.java
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/java/src/main/java/helpers/ServiceConverter.java
+++ b/web/documentserver-example/java/src/main/java/helpers/ServiceConverter.java
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/java/src/main/java/helpers/TrackManager.java
+++ b/web/documentserver-example/java/src/main/java/helpers/TrackManager.java
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -177,18 +177,18 @@ public class TrackManager {

        String curExt = FileUtility.GetFileExtension(fileName);
        String downloadExt = FileUtility.GetFileExtension(downloadUri);
-        String newFileName = fileName;
+        Boolean newFileName = false;

        if (!curExt.equals(downloadExt)) {
            try {
                String newFileUri = ServiceConverter.GetConvertedUri(downloadUri, downloadExt, curExt, ServiceConverter.GenerateRevisionId(downloadUri), false);
                if (newFileUri.isEmpty()) {
-                    newFileName = DocumentManager.GetCorrectName(FileUtility.GetFileNameWithoutExtension(fileName) + downloadExt, userAddress);
+                    newFileName = true;
                } else {
                    downloadUri = newFileUri;
                }
            } catch (Exception e){
-                newFileName = DocumentManager.GetCorrectName(FileUtility.GetFileNameWithoutExtension(fileName) + downloadExt, userAddress);
+                newFileName = true;
            }
        }

@ -197,14 +197,20 @@ public class TrackManager {

        if (isSubmitForm) {
            //new file
-            if (newFileName.equals(fileName)){
-                newFileName = DocumentManager.GetCorrectName(fileName, userAddress);
+            if (newFileName){
+                fileName = DocumentManager.GetCorrectName(FileUtility.GetFileNameWithoutExtension(fileName) + "-form" + downloadExt, userAddress);
+            } else {
+                fileName = DocumentManager.GetCorrectName(FileUtility.GetFileNameWithoutExtension(fileName) + "-form" + curExt, userAddress);
            }
-            forcesavePath = DocumentManager.StoragePath(newFileName, userAddress);
+            forcesavePath = DocumentManager.StoragePath(fileName, userAddress);
        } else {
-            forcesavePath = DocumentManager.ForcesavePath(newFileName, userAddress, false);
+            if (newFileName){
+                fileName = DocumentManager.GetCorrectName(FileUtility.GetFileNameWithoutExtension(fileName) + downloadExt, userAddress);
+            }
+
+            forcesavePath = DocumentManager.ForcesavePath(fileName, userAddress, false);
            if (forcesavePath == "") {
-                forcesavePath = DocumentManager.ForcesavePath(newFileName, userAddress, true);
+                forcesavePath = DocumentManager.ForcesavePath(fileName, userAddress, true);
            }
        }

@ -215,7 +221,7 @@ public class TrackManager {
            JSONArray actions = (JSONArray) body.get("actions");
            JSONObject action = (JSONObject) actions.get(0);
            String user = (String) action.get("userid");
-            DocumentManager.CreateMeta(newFileName, user, "Filling Form", userAddress);
+            DocumentManager.CreateMeta(fileName, user, "Filling Form", userAddress);
        }
    }

--- a/web/documentserver-example/java/src/main/webapp/css/editor.css
+++ b/web/documentserver-example/java/src/main/webapp/css/editor.css
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/java/src/main/webapp/css/stylesheet.css
+++ b/web/documentserver-example/java/src/main/webapp/css/stylesheet.css
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/java/src/main/webapp/editor.jsp
+++ b/web/documentserver-example/java/src/main/webapp/editor.jsp
@ -12,7 +12,7 @@
        <meta name="mobile-web-app-capable" content="yes" />
        <!--
        *
-        * (c) Copyright Ascensio System SIA 2020
+        * (c) Copyright Ascensio System SIA 2021
        *
        * Licensed under the Apache License, Version 2.0 (the "License");
        * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/java/src/main/webapp/index.jsp
+++ b/web/documentserver-example/java/src/main/webapp/index.jsp
@ -12,7 +12,7 @@
        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
        <!--
        *
-        * (c) Copyright Ascensio System SIA 2020
+        * (c) Copyright Ascensio System SIA 2021
        *
        * Licensed under the Apache License, Version 2.0 (the "License");
        * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/java/src/main/webapp/scripts/jquery.dropdownToggle.js
+++ b/web/documentserver-example/java/src/main/webapp/scripts/jquery.dropdownToggle.js
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/java/src/main/webapp/scripts/jscript.js
+++ b/web/documentserver-example/java/src/main/webapp/scripts/jscript.js
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/js/OnlineEditorsExampleJS.html
+++ b/web/documentserver-example/js/OnlineEditorsExampleJS.html
@ -3,7 +3,7 @@
    <meta http-equiv='Content-Type' content='text/html; charset=utf-8'>
    <!--
    *
-    * (c) Copyright Ascensio System SIA 2020
+    * (c) Copyright Ascensio System SIA 2021
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/js/init.js
+++ b/web/documentserver-example/js/init.js
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/js/stylesheet.css
+++ b/web/documentserver-example/js/stylesheet.css
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/nodejs/app.js
+++ b/web/documentserver-example/nodejs/app.js
@ -1,7 +1,7 @@
 "use strict";
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -447,20 +447,27 @@ app.post("/track", function (req, res) {
            callbackProcessSave(downloadUri, body, fileName, userAddress, newFileName);
        };

-        var callbackProcessForceSave = function (downloadUri, body, fileName, userAddress, newFileName){
+        var callbackProcessForceSave = function (downloadUri, body, fileName, userAddress, newFileName = false){
            try {
+                var downloadExt = fileUtility.getFileExtension(downloadUri);
                var isSubmitForm = body.forcesavetype === 3; //SubmitForm

                if (isSubmitForm) {
                    //new file
-                    if (newFileName == fileName){
-                        newFileName = docManager.getCorrectName(fileName, userAddress);
+                    if (newFileName){
+                        fileName = docManager.getCorrectName(fileUtility.getFileName(fileName, true) + "-form" + downloadExt, userAddress);
+                    } else {
+                        var ext = fileUtility.getFileExtension(fileName);
+                        fileName = docManager.getCorrectName(fileUtility.getFileName(fileName, true) + "-form" + ext, userAddress);
                    }
-                    var forcesavePath = docManager.storagePath(newFileName, userAddress);
+                    var forcesavePath = docManager.storagePath(fileName, userAddress);
                } else {
-                    forcesavePath = docManager.forcesavePath(newFileName, userAddress, false);
+                    if (newFileName){
+                        fileName = docManager.getCorrectName(fileUtility.getFileName(fileName, true) + downloadExt, userAddress);
+                    }
+                    forcesavePath = docManager.forcesavePath(fileName, userAddress, false);
                    if (forcesavePath == "") {
-                        forcesavePath = docManager.forcesavePath(newFileName, userAddress, true);
+                        forcesavePath = docManager.forcesavePath(fileName, userAddress, true);
                    }
                }

@ -469,7 +476,7 @@ app.post("/track", function (req, res) {

                if (isSubmitForm) {
                    var uid =body.actions[0].userid
-                    docManager.saveFileData(newFileName, uid, "Filling Form", userAddress);
+                    docManager.saveFileData(fileName, uid, "Filling Form", userAddress);
                }
            } catch (ex) {
                response.write("{\"error\":1}");
@ -484,25 +491,22 @@ app.post("/track", function (req, res) {
        var processForceSave = function (downloadUri, body, fileName, userAddress, resp) {
            var curExt = fileUtility.getFileExtension(fileName);
            var downloadExt = fileUtility.getFileExtension(downloadUri);
-            var newFileName = fileName;

            if (downloadExt != curExt) {
                var key = documentService.generateRevisionId(downloadUri);
                try {
                    documentService.getConvertedUriSync(downloadUri, downloadExt, curExt, key, function (err, data) {
                        if (err) {
-                            newFileName = docManager.getCorrectName(fileUtility.getFileName(fileName, true) + downloadExt, userAddress);
-                            callbackProcessForceSave(downloadUri, body, fileName, userAddress, newFileName);
+                            callbackProcessForceSave(downloadUri, body, fileName, userAddress, true);
                            return;
                        }
                        try {
                            var res = documentService.getResponseUri(data);
-                            callbackProcessForceSave(res.value, body, fileName, userAddress, newFileName);
+                            callbackProcessForceSave(res.value, body, fileName, userAddress, false);
                            return;
                        } catch (ex) {
                            console.log(ex);
-                            newFileName = docManager.getCorrectName(fileUtility.getFileName(fileName, true) + downloadExt, userAddress);
-                            callbackProcessForceSave(downloadUri, body, fileName, userAddress, newFileName);
+                            callbackProcessForceSave(downloadUri, body, fileName, userAddress, true);
                            return;
                        }
                    });
@ -511,7 +515,7 @@ app.post("/track", function (req, res) {
                    console.log(ex);
                }
            }
-            callbackProcessForceSave (downloadUri, body, fileName, userAddress, newFileName);
+            callbackProcessForceSave (downloadUri, body, fileName, userAddress, false);
        };

        if (body.status == 1) { //Editing
--- a/web/documentserver-example/nodejs/helpers/cacheManager.js
+++ b/web/documentserver-example/nodejs/helpers/cacheManager.js
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/nodejs/helpers/docManager.js
+++ b/web/documentserver-example/nodejs/helpers/docManager.js
@ -1,7 +1,7 @@
 "use strict";
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/nodejs/helpers/documentService.js
+++ b/web/documentserver-example/nodejs/helpers/documentService.js
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/nodejs/helpers/fileUtility.js
+++ b/web/documentserver-example/nodejs/helpers/fileUtility.js
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/nodejs/helpers/guidManager.js
+++ b/web/documentserver-example/nodejs/helpers/guidManager.js
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/nodejs/licenses/config.license
+++ b/web/documentserver-example/nodejs/licenses/config.license
@ -1,4 +1,4 @@
-// Copyright 2010-2020, Loren West and other contributors
+// Copyright 2010-2021, Loren West and other contributors

 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to
--- a/web/documentserver-example/nodejs/public/javascripts/jquery.dropdownToggle.js
+++ b/web/documentserver-example/nodejs/public/javascripts/jquery.dropdownToggle.js
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/nodejs/public/javascripts/jscript.js
+++ b/web/documentserver-example/nodejs/public/javascripts/jscript.js
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/nodejs/public/stylesheets/editor.css
+++ b/web/documentserver-example/nodejs/public/stylesheets/editor.css
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/nodejs/public/stylesheets/stylesheet.css
+++ b/web/documentserver-example/nodejs/public/stylesheets/stylesheet.css
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/nodejs/views/editor.ejs
+++ b/web/documentserver-example/nodejs/views/editor.ejs
@ -8,7 +8,7 @@
    <meta name="mobile-web-app-capable" content="yes" />
    <!--
    *
-    * (c) Copyright Ascensio System SIA 2020
+    * (c) Copyright Ascensio System SIA 2021
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/nodejs/views/error.ejs
+++ b/web/documentserver-example/nodejs/views/error.ejs
@ -4,7 +4,7 @@
    <meta name="viewport" content="width=device-width" />
    <!--
    *
-    * (c) Copyright Ascensio System SIA 2020
+    * (c) Copyright Ascensio System SIA 2021
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/nodejs/views/index.ejs
+++ b/web/documentserver-example/nodejs/views/index.ejs
@ -7,7 +7,7 @@
    <meta name="viewport" content="width=device-width" />
    <!--
    *
-    * (c) Copyright Ascensio System SIA 2020
+    * (c) Copyright Ascensio System SIA 2021
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
@ -265,7 +265,7 @@

    <span id="loadScripts" data-docs="<%= preloaderUrl %>"></span>

-    <footer>&copy; Ascensio Systems SIA 2020. All rights reserved.</footer>
+    <footer>&copy; Ascensio Systems SIA 2021. All rights reserved.</footer>

    <script type="text/javascript" src="javascripts/jquery-1.8.2.js"></script>
    <script type="text/javascript" src="javascripts/jquery-ui.js"></script>
--- a/web/documentserver-example/php/ajax.php
+++ b/web/documentserver-example/php/ajax.php
@ -1,7 +1,7 @@
 <?php
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/php/common.php
+++ b/web/documentserver-example/php/common.php
@ -1,7 +1,7 @@
 <?php
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/php/config.php
+++ b/web/documentserver-example/php/config.php
@ -11,7 +11,7 @@ $GLOBALS['DOC_SERV_CONVERT'] = array(".docm", ".doc", ".dotx", ".dotm", ".dot",
 $GLOBALS['DOC_SERV_TIMEOUT'] = "120000";


-$GLOBALS['DOC_SERV_SITE_URL'] = "https://documentserver/";
+$GLOBALS['DOC_SERV_SITE_URL'] = "http://192.168.0.142/";

 $GLOBALS['DOC_SERV_CONVERTER_URL'] = "ConvertService.ashx";
 $GLOBALS['DOC_SERV_API_URL'] = "web-apps/apps/api/documents/api.js";
--- a/web/documentserver-example/php/css/stylesheet.css
+++ b/web/documentserver-example/php/css/stylesheet.css
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/php/doceditor.php
+++ b/web/documentserver-example/php/doceditor.php
@ -1,7 +1,7 @@
 <?php
    /**
     *
-     * (c) Copyright Ascensio System SIA 2020
+     * (c) Copyright Ascensio System SIA 2021
     *
     * Licensed under the Apache License, Version 2.0 (the "License");
     * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/php/functions.php
+++ b/web/documentserver-example/php/functions.php
@ -1,7 +1,7 @@
 <?php
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/php/index.php
+++ b/web/documentserver-example/php/index.php
@ -1,7 +1,7 @@
 <?php
    /**
     *
-     * (c) Copyright Ascensio System SIA 2020
+     * (c) Copyright Ascensio System SIA 2021
     *
     * Licensed under the Apache License, Version 2.0 (the "License");
     * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/php/js/jquery.dropdownToggle.js
+++ b/web/documentserver-example/php/js/jquery.dropdownToggle.js
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/php/js/jscript.js
+++ b/web/documentserver-example/php/js/jscript.js
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/php/jwtmanager.php
+++ b/web/documentserver-example/php/jwtmanager.php
@ -1,7 +1,7 @@
 <?php
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/php/trackmanager.php
+++ b/web/documentserver-example/php/trackmanager.php
@ -1,7 +1,7 @@
 <?php
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -140,7 +140,7 @@ function processForceSave($data, $fileName, $userAddress) {

    $curExt = strtolower('.' . pathinfo($fileName, PATHINFO_EXTENSION));
    $downloadExt = strtolower('.' . pathinfo($downloadUri, PATHINFO_EXTENSION));
-    $newFileName = $fileName;
+    $newFileName = false;

    if ($downloadExt != $curExt) {
        $key = GenerateRevisionId($downloadUri);
@ -153,31 +153,34 @@ function processForceSave($data, $fileName, $userAddress) {
                $downloadUri = $convertedUri;
            } else {
                sendlog("   Convert after save convertedUri is empty", "webedior-ajax.log");
-                $baseNameWithoutExt = substr($fileName, 0, strlen($fileName) - strlen($curExt));
-                $newFileName = GetCorrectName($baseNameWithoutExt . $downloadExt, $userAddress);
+                $newFileName = true;
            }
        } catch (Exception $e) {
            sendlog("   Convert after save ".$e->getMessage(), "webedior-ajax.log");
-            $baseNameWithoutExt = substr($fileName, 0, strlen($fileName) - strlen($curExt));
-            $newFileName = GetCorrectName($baseNameWithoutExt . $downloadExt, $userAddress);
+            $newFileName = true;
        }
    }

    $saved = 1;

    if (!(($new_data = file_get_contents($downloadUri)) === FALSE)) {
-
+        $baseNameWithoutExt = substr($fileName, 0, strlen($fileName) - strlen($curExt));
        $isSubmitForm = $data["forcesavetype"] == 3;

        if ($isSubmitForm) {
-            if ($newFileName == $fileName){
-                $newFileName = GetCorrectName($fileName, $userAddress);
+            if ($newFileName){
+                $fileName = GetCorrectName($baseNameWithoutExt . "-form" . $downloadExt, $userAddress);
+            } else {
+                $fileName = GetCorrectName($baseNameWithoutExt . "-form" . $curExt, $userAddress);
            }
-            $forcesavePath = getStoragePath($newFileName, $userAddress);
+            $forcesavePath = getStoragePath($fileName, $userAddress);
        } else {
-            $forcesavePath = getForcesavePath($newFileName, $userAddress, false);
+            if ($newFileName){
+                $fileName = GetCorrectName($baseNameWithoutExt . $downloadExt, $userAddress);
+            }
+            $forcesavePath = getForcesavePath($fileName, $userAddress, false);
            if ($forcesavePath == "") {
-                $forcesavePath = getForcesavePath($newFileName, $userAddress, true);
+                $forcesavePath = getForcesavePath($fileName, $userAddress, true);
            }
        }

@ -185,7 +188,7 @@ function processForceSave($data, $fileName, $userAddress) {

        if ($isSubmitForm) {
            $user = $data["actions"][0]["userid"];
-            createMeta($newFileName, $user, $userAddress);
+            createMeta($fileName, $user, $userAddress);
        }

        $saved = 0;
--- a/web/documentserver-example/php/webeditor-ajax.php
+++ b/web/documentserver-example/php/webeditor-ajax.php
@ -1,7 +1,7 @@
 <?php
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/python/src/urls.py
+++ b/web/documentserver-example/python/src/urls.py
@ -1,6 +1,6 @@
 """

- (c) Copyright Ascensio System SIA 2020
+ (c) Copyright Ascensio System SIA 2021
 *
 The MIT License (MIT)

--- a/web/documentserver-example/python/src/utils/docManager.py
+++ b/web/documentserver-example/python/src/utils/docManager.py
@ -1,6 +1,6 @@
 """

- (c) Copyright Ascensio System SIA 2020
+ (c) Copyright Ascensio System SIA 2021
 *
 The MIT License (MIT)

--- a/web/documentserver-example/python/src/utils/fileUtils.py
+++ b/web/documentserver-example/python/src/utils/fileUtils.py
@ -1,6 +1,6 @@
 """

- (c) Copyright Ascensio System SIA 2020
+ (c) Copyright Ascensio System SIA 2021
 *
 The MIT License (MIT)

--- a/web/documentserver-example/python/src/utils/historyManager.py
+++ b/web/documentserver-example/python/src/utils/historyManager.py
@ -1,6 +1,6 @@
 """

- (c) Copyright Ascensio System SIA 2020
+ (c) Copyright Ascensio System SIA 2021
 *
 The MIT License (MIT)

--- a/web/documentserver-example/python/src/utils/jwtManager.py
+++ b/web/documentserver-example/python/src/utils/jwtManager.py
@ -1,6 +1,6 @@
 """

- (c) Copyright Ascensio System SIA 2020
+ (c) Copyright Ascensio System SIA 2021
 *
 The MIT License (MIT)

--- a/web/documentserver-example/python/src/utils/serviceConverter.py
+++ b/web/documentserver-example/python/src/utils/serviceConverter.py
@ -1,6 +1,6 @@
 """

- (c) Copyright Ascensio System SIA 2020
+ (c) Copyright Ascensio System SIA 2021
 *
 The MIT License (MIT)

--- a/web/documentserver-example/python/src/utils/trackManager.py
+++ b/web/documentserver-example/python/src/utils/trackManager.py
@ -1,6 +1,6 @@
 """

- (c) Copyright Ascensio System SIA 2020
+ (c) Copyright Ascensio System SIA 2021
 *
 The MIT License (MIT)

@ -100,34 +100,38 @@ def processForceSave(body, filename, usAddr):

    curExt = fileUtils.getFileExt(filename)
    downloadExt = fileUtils.getFileExt(download)
-    newFilename = filename
+    newFilename = False

    if (curExt != downloadExt):
        try:
            newUri = serviceConverter.getConverterUri(download, downloadExt, curExt, docManager.generateRevisionId(download), False)
            if not newUri:
-                newFilename = docManager.getCorrectName(fileUtils.getFileNameWithoutExt(filename) + downloadExt, usAddr)
+                newFilename = True
            else:
                download = newUri
        except Exception:
-            newFilename = docManager.getCorrectName(fileUtils.getFileNameWithoutExt(filename) + downloadExt, usAddr)
+            newFilename = True

    isSubmitForm = body.get('forcesavetype') == 3

    if(isSubmitForm):
-        if (newFilename == filename):
-            newFilename = docManager.getCorrectName(filename, usAddr)
-        forcesavePath = docManager.getStoragePath(newFilename, usAddr)
+        if (newFilename):
+            filename = docManager.getCorrectName(fileUtils.getFileNameWithoutExt(filename) + "-form" + downloadExt, usAddr)
+        else :
+            filename = docManager.getCorrectName(fileUtils.getFileNameWithoutExt(filename) + "-form" + curExt, usAddr)
+        forcesavePath = docManager.getStoragePath(filename, usAddr)
    else:
-        forcesavePath = docManager.getForcesavePath(newFilename, usAddr, False)
+        if (newFilename):
+            filename = docManager.getCorrectName(fileUtils.getFileNameWithoutExt(filename) + downloadExt, usAddr)
+        forcesavePath = docManager.getForcesavePath(filename, usAddr, False)
        if (forcesavePath == ""):
-            forcesavePath = docManager.getForcesavePath(newFilename, usAddr, True)
+            forcesavePath = docManager.getForcesavePath(filename, usAddr, True)

    docManager.saveFileFromUri(download, forcesavePath)

    if(isSubmitForm):
        uid = body['actions'][0]['userid']
-        historyManager.createMetaData(newFilename, uid, "Filling Form", usAddr)
+        historyManager.createMetaData(filename, uid, "Filling Form", usAddr)
    return

 def commandRequest(method, key):
--- a/web/documentserver-example/python/src/utils/users.py
+++ b/web/documentserver-example/python/src/utils/users.py
@ -1,6 +1,6 @@
 """

- (c) Copyright Ascensio System SIA 2020
+ (c) Copyright Ascensio System SIA 2021
 *
 The MIT License (MIT)

--- a/web/documentserver-example/python/src/views/actions.py
+++ b/web/documentserver-example/python/src/views/actions.py
@ -1,6 +1,6 @@
 """

- (c) Copyright Ascensio System SIA 2020
+ (c) Copyright Ascensio System SIA 2021
 *
 The MIT License (MIT)

--- a/web/documentserver-example/python/src/views/index.py
+++ b/web/documentserver-example/python/src/views/index.py
@ -1,6 +1,6 @@
 """

- (c) Copyright Ascensio System SIA 2020
+ (c) Copyright Ascensio System SIA 2021
 *
 The MIT License (MIT)

--- a/web/documentserver-example/python/static/css/editor.css
+++ b/web/documentserver-example/python/static/css/editor.css
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/python/static/css/stylesheet.css
+++ b/web/documentserver-example/python/static/css/stylesheet.css
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/python/static/js/jscript.js
+++ b/web/documentserver-example/python/static/js/jscript.js
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/python/templates/editor.html
+++ b/web/documentserver-example/python/templates/editor.html
@ -1,6 +1,6 @@
 <!--*
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/python/templates/index.html
+++ b/web/documentserver-example/python/templates/index.html
@ -1,6 +1,6 @@
 <!--*
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * The MIT License (MIT)
 *
@ -258,7 +258,7 @@

    <span id="loadScripts" data-docs="{{ preloadurl }}"></span>

-    <footer>&copy; Ascensio Systems SIA 2020. All rights reserved.</footer>
+    <footer>&copy; Ascensio Systems SIA 2021. All rights reserved.</footer>

    <script type="text/javascript" src="{% static "js/jquery-1.8.2.js" %}"></script>
    <script type="text/javascript" src="{% static "js/jquery-ui.js" %}"></script>
--- a/web/documentserver-example/ruby/Gemfile.lock
+++ b/web/documentserver-example/ruby/Gemfile.lock
@ -163,7 +163,7 @@ GEM
    turbolinks-source (5.2.0)
    tzinfo (1.2.7)
      thread_safe (~> 0.1)
-    tzinfo-data (1.2020.1)
+    tzinfo-data (1.2021.1)
      tzinfo (>= 1.0.0)
    uglifier (4.2.0)
      execjs (>= 0.3.0, < 3)
--- a/web/documentserver-example/ruby/app/assets/javascripts/jquery.dropdownToggle.js
+++ b/web/documentserver-example/ruby/app/assets/javascripts/jquery.dropdownToggle.js
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/ruby/app/assets/javascripts/jscript.js
+++ b/web/documentserver-example/ruby/app/assets/javascripts/jscript.js
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/ruby/app/assets/stylesheets/editor.scss
+++ b/web/documentserver-example/ruby/app/assets/stylesheets/editor.scss
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/ruby/app/assets/stylesheets/stylesheet.scss
+++ b/web/documentserver-example/ruby/app/assets/stylesheets/stylesheet.scss
@ -1,6 +1,6 @@
 /**
 *
- * (c) Copyright Ascensio System SIA 2020
+ * (c) Copyright Ascensio System SIA 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/web/documentserver-example/ruby/app/controllers/application_controller.rb
+++ b/web/documentserver-example/ruby/app/controllers/application_controller.rb
@ -1,5 +1,5 @@
 #
-# (c) Copyright Ascensio System SIA 2020
+# (c) Copyright Ascensio System SIA 2021
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sergey Linnik	b5b7cd91c4	Merge pull request #132 from ONLYOFFICE/feature/fill-forms Feature/fill forms	2021-03-22 12:47:47 +03:00
Alexandr Fedorov	e7445dbc46	ruby: added postfix -form isSubmitForm	2021-03-19 15:02:05 +03:00
Alexandr Fedorov	42b24e4307	python: added postfix -form isSubmitForm	2021-03-19 14:53:34 +03:00
Alexandr Fedorov	1ba0577521	csharp-mvc: added postfix -form isSubmitForm	2021-03-19 14:43:58 +03:00
Alexandr Fedorov	3335a135a0	csharp: added postfix -form isSubmitForm	2021-03-19 14:34:25 +03:00
Alexandr Fedorov	c2a75b3e28	php: added postfix -form isSubmitForm	2021-03-19 14:15:23 +03:00
Alexandr Fedorov	4e2fe9e607	java: added postfix -form isSubmitForm	2021-03-19 14:13:43 +03:00
Alexandr Fedorov	3eb2061b9f	nodejs: added postfix -form isSubmitForm	2021-03-19 13:50:26 +03:00
Sergey Linnik	fcdcefe662	nodejs: revert local configuration	2021-03-18 15:32:55 +03:00
Sergey Linnik	714b514f66	Copyright 2021	2021-03-15 11:54:47 +03:00
Sergey Linnik	89e6ac8571	Merge remote-tracking branch 'remotes/origin/release/v6.3.0' into develop	2021-03-05 11:20:57 +03:00
Alexander Trofimov	9f9ac0c30d	Merge remote-tracking branch 'origin/release/v6.3.0' into develop	2021-03-04 16:10:51 +03:00