diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js
index a31e565baf..a74c5cccb6 100644
--- a/apps/documenteditor/embed/js/ApplicationController.js
+++ b/apps/documenteditor/embed/js/ApplicationController.js
@@ -89,7 +89,6 @@ DE.ApplicationController = new(function(){
ttOffset[1] = 40;
}
- config.mode = 'view'; // always view for embedded
config.canCloseEditor = false;
var _canback = false;
if (typeof config.customization === 'object') {
@@ -832,6 +831,10 @@ DE.ApplicationController = new(function(){
message = me.errorTokenExpire;
break;
+ case Asc.c_oAscError.ID.VKeyEncrypt:
+ message= me.errorToken;
+ break;
+
case Asc.c_oAscError.ID.ConvertationOpenFormat:
if (errData === 'pdf')
message = me.errorInconsistentExtPdf.replace('%1', docConfig.fileType || '');
@@ -1086,6 +1089,7 @@ DE.ApplicationController = new(function(){
warnLicenseBefore: 'License not active. Please contact your administrator.',
warnLicenseExp: 'Your license has expired. Please update your license and refresh the page.',
textConvertFormDownload: 'Download file as a fillable PDF form to be able to fill it out.',
- textDownloadPdf: 'Download pdf'
+ textDownloadPdf: 'Download pdf',
+ errorToken: 'The document security token is not correctly formed.
Please contact your Document Server administrator.'
}
})();
\ No newline at end of file
diff --git a/apps/documenteditor/embed/locale/en.json b/apps/documenteditor/embed/locale/en.json
index 7a71a613a3..e922da7c6a 100644
--- a/apps/documenteditor/embed/locale/en.json
+++ b/apps/documenteditor/embed/locale/en.json
@@ -26,6 +26,7 @@
"DE.ApplicationController.errorInconsistentExtXlsx": "An error has occurred while opening the file.
The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
"DE.ApplicationController.errorLoadingFont": "Fonts are not loaded.
Please contact your Document Server administrator.",
"DE.ApplicationController.errorSubmit": "Submit failed.",
+ "DE.ApplicationController.errorToken": "The document security token is not correctly formed.
Please contact your Document Server administrator.",
"DE.ApplicationController.errorTokenExpire": "The document security token has expired.
Please contact your Document Server administrator.",
"DE.ApplicationController.errorUpdateVersionOnDisconnect": "Connection has been restored, and the file version has been changed.
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.",
diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js
index e207cdac64..0f78d8b030 100644
--- a/apps/presentationeditor/embed/js/ApplicationController.js
+++ b/apps/presentationeditor/embed/js/ApplicationController.js
@@ -86,7 +86,6 @@ PE.ApplicationController = new(function(){
$('#box-preview').addClass('top');
}
- config.mode = 'view'; // always view for embedded
config.canCloseEditor = false;
var _canback = false;
if (typeof config.customization === 'object') {
@@ -664,6 +663,10 @@ PE.ApplicationController = new(function(){
message = me.errorTokenExpire;
break;
+ case Asc.c_oAscError.ID.VKeyEncrypt:
+ message= me.errorToken;
+ break;
+
case Asc.c_oAscError.ID.ConvertationOpenFormat:
if (errData === 'pdf')
message = me.errorInconsistentExtPdf.replace('%1', docConfig.fileType || '');
@@ -874,5 +877,6 @@ PE.ApplicationController = new(function(){
warnLicenseBefore: 'License not active. Please contact your administrator.',
warnLicenseExp: 'Your license has expired. Please update your license and refresh the page.',
errorEditingDownloadas: 'An error occurred during the work with the document.
Use the \'Download as...\' option to save the file backup copy to your computer hard drive.',
+ errorToken: 'The document security token is not correctly formed.
Please contact your Document Server administrator.'
}
})();
diff --git a/apps/presentationeditor/embed/locale/en.json b/apps/presentationeditor/embed/locale/en.json
index 7b127f5a0e..4780d49c48 100644
--- a/apps/presentationeditor/embed/locale/en.json
+++ b/apps/presentationeditor/embed/locale/en.json
@@ -25,6 +25,7 @@
"PE.ApplicationController.errorInconsistentExtPptx": "An error has occurred while opening the file.
The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
"PE.ApplicationController.errorInconsistentExtXlsx": "An error has occurred while opening the file.
The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
"PE.ApplicationController.errorLoadingFont": "Fonts are not loaded.
Please contact your Document Server administrator.",
+ "PE.ApplicationController.errorToken": "The document security token is not correctly formed.
Please contact your Document Server administrator.",
"PE.ApplicationController.errorTokenExpire": "The document security token has expired.
Please contact your Document Server administrator.",
"PE.ApplicationController.errorUpdateVersionOnDisconnect": "Connection has been restored, and the file version has been changed.
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.",
diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js
index 4e0bad42a9..775a8e41ea 100644
--- a/apps/spreadsheeteditor/embed/js/ApplicationController.js
+++ b/apps/spreadsheeteditor/embed/js/ApplicationController.js
@@ -86,7 +86,6 @@ SSE.ApplicationController = new(function(){
$('.viewer').addClass('top');
}
- config.mode = 'view'; // always view for embedded
config.canCloseEditor = false;
var _canback = false;
if (typeof config.customization === 'object') {
@@ -670,6 +669,10 @@ SSE.ApplicationController = new(function(){
message = me.errorTokenExpire;
break;
+ case Asc.c_oAscError.ID.VKeyEncrypt:
+ message= me.errorToken;
+ break;
+
case Asc.c_oAscError.ID.ConvertationOpenFormat:
if (errData === 'pdf')
message = me.errorInconsistentExtPdf.replace('%1', docConfig.fileType || '');
@@ -918,5 +921,6 @@ SSE.ApplicationController = new(function(){
warnLicenseBefore: 'License not active. Please contact your administrator.',
warnLicenseExp: 'Your license has expired. Please update your license and refresh the page.',
errorEditingDownloadas: 'An error occurred during the work with the document.
Use the \'Download as...\' option to save the file backup copy to your computer hard drive.',
+ errorToken: 'The document security token is not correctly formed.
Please contact your Document Server administrator.'
}
})();
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/embed/locale/en.json b/apps/spreadsheeteditor/embed/locale/en.json
index f15ec803b0..f9e0159495 100644
--- a/apps/spreadsheeteditor/embed/locale/en.json
+++ b/apps/spreadsheeteditor/embed/locale/en.json
@@ -25,6 +25,7 @@
"SSE.ApplicationController.errorInconsistentExtPptx": "An error has occurred while opening the file.
The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
"SSE.ApplicationController.errorInconsistentExtXlsx": "An error has occurred while opening the file.
The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
"SSE.ApplicationController.errorLoadingFont": "Fonts are not loaded.
Please contact your Document Server administrator.",
+ "SSE.ApplicationController.errorToken": "The document security token is not correctly formed.
Please contact your Document Server administrator.",
"SSE.ApplicationController.errorTokenExpire": "The document security token has expired.
Please contact your Document Server administrator.",
"SSE.ApplicationController.errorUpdateVersionOnDisconnect": "Connection has been restored, and the file version has been changed.
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.",