Merge pull request #1019 from ONLYOFFICE/fix/bugfix

Fix Bug 51343

apps/documenteditor/embed/index.html

@@ -155,8 +155,7 @@
             }
 
             function encodeUrlParam(str) {
-                return str.replace(/&/g, '&')
-                        .replace(/"/g, '"')
+                return str.replace(/"/g, '"')
                         .replace(/'/g, ''')
                         .replace(/</g, '&lt;')
                         .replace(/>/g, '&gt;');

apps/documenteditor/embed/index.html.deploy

@@ -148,8 +148,7 @@
             }
 
             function encodeUrlParam(str) {
-                return str.replace(/&/g, '&')
-                        .replace(/"/g, '"')
+                return str.replace(/"/g, '"')
                         .replace(/'/g, ''')
                         .replace(/</g, '&lt;')
                         .replace(/>/g, '&gt;');

apps/documenteditor/embed/index_loader.html

@@ -225,8 +225,7 @@
             }
 
             function encodeUrlParam(str) {
-                return str.replace(/&/g, '&')
-                        .replace(/"/g, '"')
+                return str.replace(/"/g, '"')
                         .replace(/'/g, ''')
                         .replace(/</g, '&lt;')
                         .replace(/>/g, '&gt;');

apps/documenteditor/embed/index_loader.html.deploy

@@ -217,8 +217,7 @@
             }
 
             function encodeUrlParam(str) {
-                return str.replace(/&/g, '&')
-                        .replace(/"/g, '"')
+                return str.replace(/"/g, '"')
                         .replace(/'/g, ''')
                         .replace(/</g, '&lt;')
                         .replace(/>/g, '&gt;');

apps/documenteditor/embed/js/ApplicationController.js

@@ -625,6 +625,11 @@ DE.ApplicationController = new(function(){
                 message = me.errorEditingDownloadas;
                 break;
 
+            case Asc.c_oAscError.ID.ForceSaveButton:
+            case Asc.c_oAscError.ID.ForceSaveTimeout:
+                message = me.errorForceSave;
+                break;
+
             default:
                 message = me.errorDefaultMessage.replace('%1', id);
                 break;
@@ -806,6 +811,7 @@ DE.ApplicationController = new(function(){
         textGuest: 'Guest',
         textAnonymous: 'Anonymous',
         textRequired: 'Fill all required fields to send form.',
-        textGotIt: 'Got it'
+        textGotIt: 'Got it',
+        errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later."
     }
 })();

apps/documenteditor/embed/locale/en.json

@@ -17,6 +17,7 @@
   "DE.ApplicationController.errorSubmit": "Submit failed.",
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.<br>Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.",
   "DE.ApplicationController.errorUserDrop": "The file cannot be accessed right now.",
+  "DE.ApplicationController.errorForceSave": "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.",
   "DE.ApplicationController.notcriticalErrorTitle": "Warning",
   "DE.ApplicationController.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.",
   "DE.ApplicationController.textAnonymous": "Anonymous",

apps/documenteditor/main/index.html

@@ -225,8 +225,7 @@
         }
 
         function encodeUrlParam(str) {
-            return str.replace(/&/g, '&')
-                    .replace(/"/g, '"')
+            return str.replace(/"/g, '"')
                     .replace(/'/g, ''')
                     .replace(/</g, '&lt;')
                     .replace(/>/g, '&gt;');

apps/documenteditor/main/index.html.deploy

@@ -197,8 +197,7 @@
         }
 
         function encodeUrlParam(str) {
-            return str.replace(/&/g, '&')
-                    .replace(/"/g, '"')
+            return str.replace(/"/g, '"')
                     .replace(/'/g, ''')
                     .replace(/</g, '&lt;')
                     .replace(/>/g, '&gt;');

apps/documenteditor/main/index_loader.html

@@ -199,8 +199,7 @@
             return urlParams;
         }
         function encodeUrlParam(str) {
-            return str.replace(/&/g, '&')
-                .replace(/"/g, '"')
+            return str.replace(/"/g, '"')
                 .replace(/'/g, ''')
                 .replace(/</g, '&lt;')
                 .replace(/>/g, '&gt;');

apps/documenteditor/main/index_loader.html.deploy

@@ -218,8 +218,7 @@
         }
 
         function encodeUrlParam(str) {
-            return str.replace(/&/g, '&')
-                    .replace(/"/g, '"')
+            return str.replace(/"/g, '"')
                     .replace(/'/g, ''')
                     .replace(/</g, '&lt;')
                     .replace(/>/g, '&gt;');

apps/presentationeditor/embed/index.html

@@ -206,8 +206,7 @@
           }
 
           function encodeUrlParam(str) {
-              return str.replace(/&/g, '&')
-                      .replace(/"/g, '"')
+              return str.replace(/"/g, '"')
                       .replace(/'/g, ''')
                       .replace(/</g, '&lt;')
                       .replace(/>/g, '&gt;');

apps/presentationeditor/embed/index.html.deploy

@@ -200,8 +200,7 @@
         }
 
         function encodeUrlParam(str) {
-            return str.replace(/&/g, '&')
-                    .replace(/"/g, '"')
+            return str.replace(/"/g, '"')
                     .replace(/'/g, ''')
                     .replace(/</g, '&lt;')
                     .replace(/>/g, '&gt;');

apps/presentationeditor/embed/index_loader.html

@@ -224,8 +224,7 @@
           }
 
           function encodeUrlParam(str) {
-              return str.replace(/&/g, '&')
-                      .replace(/"/g, '"')
+              return str.replace(/"/g, '"')
                       .replace(/'/g, ''')
                       .replace(/</g, '&lt;')
                       .replace(/>/g, '&gt;');

apps/presentationeditor/embed/index_loader.html.deploy

@@ -217,8 +217,7 @@
         }
 
         function encodeUrlParam(str) {
-            return str.replace(/&/g, '&')
-                    .replace(/"/g, '"')
+            return str.replace(/"/g, '"')
                     .replace(/'/g, ''')
                     .replace(/</g, '&lt;')
                     .replace(/>/g, '&gt;');

apps/presentationeditor/embed/js/ApplicationController.js

@@ -568,6 +568,11 @@ PE.ApplicationController = new(function(){
                 message = me.errorAccessDeny;
                 break;
 
+            case Asc.c_oAscError.ID.ForceSaveButton:
+            case Asc.c_oAscError.ID.ForceSaveTimeout:
+                message = me.errorForceSave;
+                break;
+
             default:
                 message = me.errorDefaultMessage.replace('%1', id);
                 break;
@@ -712,6 +717,7 @@ PE.ApplicationController = new(function(){
         errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.',
         errorUpdateVersionOnDisconnect: 'Internet connection has been restored, and the file version has been changed.<br>Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.',
         textGuest: 'Guest',
-        textAnonymous: 'Anonymous'
+        textAnonymous: 'Anonymous',
+        errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later."
     }
 })();

apps/presentationeditor/embed/locale/en.json

@@ -15,6 +15,7 @@
   "PE.ApplicationController.errorFileSizeExceed": "The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.",
   "PE.ApplicationController.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.<br>Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.",
   "PE.ApplicationController.errorUserDrop": "The file cannot be accessed right now.",
+  "PE.ApplicationController.errorForceSave": "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.",
   "PE.ApplicationController.notcriticalErrorTitle": "Warning",
   "PE.ApplicationController.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.",
   "PE.ApplicationController.textAnonymous": "Anonymous",

apps/presentationeditor/main/index.html

@@ -247,8 +247,7 @@
         }
 
         function encodeUrlParam(str) {
-            return str.replace(/&/g, '&')
-                    .replace(/"/g, '"')
+            return str.replace(/"/g, '"')
                     .replace(/'/g, ''')
                     .replace(/</g, '&lt;')
                     .replace(/>/g, '&gt;');

apps/presentationeditor/main/index.html.deploy

@@ -239,8 +239,7 @@
         }
 
         function encodeUrlParam(str) {
-            return str.replace(/&/g, '&')
-                    .replace(/"/g, '"')
+            return str.replace(/"/g, '"')
                     .replace(/'/g, ''')
                     .replace(/</g, '&lt;')
                     .replace(/>/g, '&gt;');

apps/presentationeditor/main/index_loader.html

@@ -190,8 +190,7 @@
             return urlParams;
         }
         function encodeUrlParam(str) {
-            return str.replace(/&/g, '&')
-                .replace(/"/g, '"')
+            return str.replace(/"/g, '"')
                 .replace(/'/g, ''')
                 .replace(/</g, '&lt;')
                 .replace(/>/g, '&gt;');

apps/presentationeditor/main/index_loader.html.deploy

@@ -218,8 +218,7 @@
         }
 
         function encodeUrlParam(str) {
-            return str.replace(/&/g, '&')
-                    .replace(/"/g, '"')
+            return str.replace(/"/g, '"')
                     .replace(/'/g, ''')
                     .replace(/</g, '&lt;')
                     .replace(/>/g, '&gt;');

apps/spreadsheeteditor/embed/index.html

@@ -181,8 +181,7 @@
           }
 
           function encodeUrlParam(str) {
-              return str.replace(/&/g, '&')
-                      .replace(/"/g, '"')
+              return str.replace(/"/g, '"')
                       .replace(/'/g, ''')
                       .replace(/</g, '&lt;')
                       .replace(/>/g, '&gt;');

apps/spreadsheeteditor/embed/index.html.deploy

@@ -173,8 +173,7 @@
         }
 
         function encodeUrlParam(str) {
-            return str.replace(/&/g, '&')
-                    .replace(/"/g, '"')
+            return str.replace(/"/g, '"')
                     .replace(/'/g, ''')
                     .replace(/</g, '&lt;')
                     .replace(/>/g, '&gt;');

apps/spreadsheeteditor/embed/index_loader.html

@@ -225,8 +225,7 @@
           }
 
           function encodeUrlParam(str) {
-              return str.replace(/&/g, '&')
-                      .replace(/"/g, '"')
+              return str.replace(/"/g, '"')
                       .replace(/'/g, ''')
                       .replace(/</g, '&lt;')
                       .replace(/>/g, '&gt;');

apps/spreadsheeteditor/embed/index_loader.html.deploy

@@ -217,8 +217,7 @@
         }
 
         function encodeUrlParam(str) {
-            return str.replace(/&/g, '&')
-                    .replace(/"/g, '"')
+            return str.replace(/"/g, '"')
                     .replace(/'/g, ''')
                     .replace(/</g, '&lt;')
                     .replace(/>/g, '&gt;');

apps/spreadsheeteditor/embed/js/ApplicationController.js

@@ -481,6 +481,11 @@ SSE.ApplicationController = new(function(){
                 message = me.errorAccessDeny;
                 break;
 
+            case Asc.c_oAscError.ID.ForceSaveButton:
+            case Asc.c_oAscError.ID.ForceSaveTimeout:
+                message = me.errorForceSave;
+                break;
+
             default:
                 message = me.errorDefaultMessage.replace('%1', id);
                 break;
@@ -663,6 +668,7 @@ SSE.ApplicationController = new(function(){
         errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.',
         errorUpdateVersionOnDisconnect: 'Internet connection has been restored, and the file version has been changed.<br>Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.',
         textGuest: 'Guest',
-        textAnonymous: 'Anonymous'
+        textAnonymous: 'Anonymous',
+        errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later."
     }
 })();

apps/spreadsheeteditor/embed/locale/en.json

@@ -15,6 +15,7 @@
   "SSE.ApplicationController.errorFileSizeExceed": "The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.",
   "SSE.ApplicationController.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.<br>Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.",
   "SSE.ApplicationController.errorUserDrop": "The file cannot be accessed right now.",
+  "SSE.ApplicationController.errorForceSave": "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.",
   "SSE.ApplicationController.notcriticalErrorTitle": "Warning",
   "SSE.ApplicationController.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.",
   "SSE.ApplicationController.textAnonymous": "Anonymous",

apps/spreadsheeteditor/main/index.html

@@ -254,8 +254,7 @@
         }
 
         function encodeUrlParam(str) {
-            return str.replace(/&/g, '&')
-                    .replace(/"/g, '"')
+            return str.replace(/"/g, '"')
                     .replace(/'/g, ''')
                     .replace(/</g, '&lt;')
                     .replace(/>/g, '&gt;');

apps/spreadsheeteditor/main/index.html.deploy

@@ -239,8 +239,7 @@
         }
 
         function encodeUrlParam(str) {
-            return str.replace(/&/g, '&')
-                    .replace(/"/g, '"')
+            return str.replace(/"/g, '"')
                     .replace(/'/g, ''')
                     .replace(/</g, '&lt;')
                     .replace(/>/g, '&gt;');

apps/spreadsheeteditor/main/index_loader.html

@@ -189,8 +189,7 @@
             return urlParams;
         }
         function encodeUrlParam(str) {
-            return str.replace(/&/g, '&')
-                .replace(/"/g, '"')
+            return str.replace(/"/g, '"')
                 .replace(/'/g, ''')
                 .replace(/</g, '&lt;')
                 .replace(/>/g, '&gt;');

apps/spreadsheeteditor/main/index_loader.html.deploy

@@ -217,8 +217,7 @@
         }
 
         function encodeUrlParam(str) {
-            return str.replace(/&/g, '&')
-                    .replace(/"/g, '"')
+            return str.replace(/"/g, '"')
                     .replace(/'/g, ''')
                     .replace(/</g, '&lt;')
                     .replace(/>/g, '&gt;');