diff --git a/web/documentserver-example/csharp-mvc/Models/FileUtility.cs b/web/documentserver-example/csharp-mvc/Models/FileUtility.cs index 50c26755..db9c3955 100644 --- a/web/documentserver-example/csharp-mvc/Models/FileUtility.cs +++ b/web/documentserver-example/csharp-mvc/Models/FileUtility.cs @@ -51,14 +51,17 @@ namespace OnlineEditorsExampleMVC.Models public static readonly List ExtsDocument = new List { - ".docx", ".docm", ".doc", ".odt", ".rtf", ".txt", - ".html", ".htm", ".mht", ".pdf", ".djvu", - ".fb2", ".epub", ".xps" + ".doc", ".docx", ".docm", + ".dot", ".dotx", ".dotm", + ".odt", ".rtf", ".txt", + ".html", ".htm", ".mht", + ".pdf", ".djvu", ".fb2", ".epub", ".xps" }; public static readonly List ExtsSpreadsheet = new List { ".xls", ".xlsx", ".xlsm", + ".xlt", ".xltx", ".xltm", ".ods", ".csv" }; @@ -66,6 +69,7 @@ namespace OnlineEditorsExampleMVC.Models { ".pps", ".ppsx", ".ppsm", ".ppt", ".pptx", ".pptm", + ".pot", ".potx", ".potm", ".odp" }; } diff --git a/web/documentserver-example/csharp-mvc/web.appsettings.config b/web/documentserver-example/csharp-mvc/web.appsettings.config index 029e4d4c..ffbd851a 100644 --- a/web/documentserver-example/csharp-mvc/web.appsettings.config +++ b/web/documentserver-example/csharp-mvc/web.appsettings.config @@ -10,8 +10,8 @@ - - + + diff --git a/web/documentserver-example/csharp/Default.aspx.cs b/web/documentserver-example/csharp/Default.aspx.cs index a9fe8d3b..933c3b90 100644 --- a/web/documentserver-example/csharp/Default.aspx.cs +++ b/web/documentserver-example/csharp/Default.aspx.cs @@ -43,6 +43,7 @@ namespace OnlineEditorsExample public static readonly List ExtsSpreadsheet = new List { ".xls", ".xlsx", ".xlsm", + ".xlt", ".xltx", ".xltm", ".ods", ".csv" }; @@ -50,14 +51,17 @@ namespace OnlineEditorsExample { ".pps", ".ppsx", ".ppsm", ".ppt", ".pptx", ".pptm", + ".pot", ".potx", ".potm", ".odp" }; public static readonly List ExtsDocument = new List { - ".docx", ".docm", ".doc", ".odt", ".rtf", ".txt", - ".html", ".htm", ".mht", ".pdf", ".djvu", - ".fb2", ".epub", ".xps" + ".doc", ".docx", ".docm", + ".dot", ".dotx", ".dotm", + ".odt", ".rtf", ".txt", + ".html", ".htm", ".mht", + ".pdf", ".djvu", ".fb2", ".epub", ".xps" }; public static string GetInternalExtension(string extension) diff --git a/web/documentserver-example/csharp/settings.config b/web/documentserver-example/csharp/settings.config index 19a01f49..d70280ad 100644 --- a/web/documentserver-example/csharp/settings.config +++ b/web/documentserver-example/csharp/settings.config @@ -6,8 +6,8 @@ - - + + 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 333bfe18..b87e1fde 100644 --- a/web/documentserver-example/java/src/main/java/helpers/FileUtility.java +++ b/web/documentserver-example/java/src/main/java/helpers/FileUtility.java @@ -56,19 +56,26 @@ public class FileUtility public static List ExtsDocument = Arrays.asList ( - ".docx", ".docm", ".doc", ".odt", ".rtf", ".txt", - ".html", ".htm", ".mht", ".pdf", ".djvu", - ".fb2", ".epub", ".xps" + ".doc", ".docx", ".docm", + ".dot", ".dotx", ".dotm", + ".odt", ".rtf", ".txt", + ".html", ".htm", ".mht", + ".pdf", ".djvu", ".fb2", ".epub", ".xps" ); public static List ExtsSpreadsheet = Arrays.asList ( - ".xls", ".xlsx", ".xlsm", ".ods", ".csv" + ".xls", ".xlsx", ".xlsm", + ".xlt", ".xltx", ".xltm", + ".ods", ".csv" ); public static List ExtsPresentation = Arrays.asList ( - ".pps", ".ppsx", ".ppsm", ".ppt", ".pptx", ".pptm", ".odp" + ".pps", ".ppsx", ".ppsm", + ".ppt", ".pptx", ".pptm", + ".pot", ".potx", ".potm", + ".odp" ); diff --git a/web/documentserver-example/java/src/main/resources/settings.properties b/web/documentserver-example/java/src/main/resources/settings.properties index 65f09f27..8772397c 100644 --- a/web/documentserver-example/java/src/main/resources/settings.properties +++ b/web/documentserver-example/java/src/main/resources/settings.properties @@ -2,8 +2,8 @@ filesize-max=5242880 storage-folder=app_data files.docservice.viewed-docs=.pdf|.djvu|.xps -files.docservice.edited-docs=.docx|.docm|.doc|.odt|.xlsx|.xlsm|.xls|.ods|.csv|.pptx|.pptm|.ppt|.ppsx|.ppsm|.pps|.odp|.rtf|.txt|.mht|.html|.htm -files.docservice.convert-docs=.docm|.doc|.odt|.xlsm|.xls|.ods|.pptm|.ppt|.ppsm|.pps|.odp|.rtf|.mht|.html|.htm|.epub +files.docservice.edited-docs=.docx|.docm|.doc|.dotx|.dotm|.dot|.odt|.xlsx|.xlsm|.xls|.xltx|.xltm|.xlt|.ods|.csv|.pptx|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.rtf|.txt|.mht|.html|.htm +files.docservice.convert-docs=.docm|.dotx|.dotm|.dot|.doc|.odt|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.pptm|.ppt|.ppsm|.pps|.potx|.potm|.pot|.odp|.rtf|.mht|.html|.htm|.epub files.docservice.timeout=120000 files.docservice.url.storage=https://doc.onlyoffice.com/FileUploader.ashx diff --git a/web/documentserver-example/js/init.js b/web/documentserver-example/js/init.js index 02f3a2f8..b3085bb3 100644 --- a/web/documentserver-example/js/init.js +++ b/web/documentserver-example/js/init.js @@ -73,8 +73,8 @@ function key(k) { }; var getDocumentType = function (ext) { - if (".docx.docm.doc.odt.rtf.txt.html.htm.mht.pdf.djvu.fb2.epub.xps".indexOf(ext) != -1) return "text"; - if (".xls.xlsx.xlsm.ods.csv".indexOf(ext) != -1) return "spreadsheet"; - if (".pps.ppsx.ppsm.ppt.pptx.pptm.odp".indexOf(ext) != -1) return "presentation"; + if (".doc.docx.docm.dot.dotx.dotm.odt.rtf.txt.html.htm.mht.pdf.djvu.fb2.epub.xps".indexOf(ext) != -1) return "text"; + if (".xls.xlsx.xlsm.xlt.xltx.xltm.ods.csv".indexOf(ext) != -1) return "spreadsheet"; + if (".pps.ppsx.ppsm.ppt.pptx.pptm.pot.potx.potm.odp".indexOf(ext) != -1) return "presentation"; return null; }; \ No newline at end of file diff --git a/web/documentserver-example/nodejs/config/default.json b/web/documentserver-example/nodejs/config/default.json index 4a9fb9b8..5b1a428e 100644 --- a/web/documentserver-example/nodejs/config/default.json +++ b/web/documentserver-example/nodejs/config/default.json @@ -21,8 +21,8 @@ "preloaderUrl": "web-apps/apps/api/documents/cache-scripts.html", "exampleUrl": null, "viewedDocs": [".pdf", ".djvu", ".xps"], - "editedDocs": [".docx", ".docm", ".doc", ".odt", ".xlsx", ".xlsm", ".xls", ".ods", ".csv", ".pptx", ".pptm", ".ppt", ".ppsx", ".ppsm", ".pps", ".odp", ".rtf", ".txt", ".mht", ".html", ".htm"], - "convertedDocs": [".docm", ".doc", ".odt", ".xlsm", ".xls", ".ods", ".pptm", ".ppt", ".ppsm", ".pps", ".odp", ".rtf", ".mht", ".html", ".htm", ".epub"], + "editedDocs": [".docx", ".docm", ".doc", ".dotx", ".dotm", ".dot", ".odt", ".xlsx", ".xlsm", ".xls", ".xltx", ".xltm", ".xlt", ".ods", ".csv", ".pptx", ".pptm", ".ppt", ".ppsx", ".ppsm", ".potx", ".potm", ".pot", ".pps", ".odp", ".rtf", ".txt", ".mht", ".html", ".htm"], + "convertedDocs": [".docm", ".doc", ".dotx", ".dotm", ".dot", ".odt", ".xlsm", ".xls", ".xltx", ".xltm", ".xlt", ".ods", ".pptm", ".ppt", ".ppsm", ".pps", ".potx", ".potm", ".pot", ".odp", ".rtf", ".mht", ".html", ".htm", ".epub"], "storageFolder": "files", "maxFileSize": 1073741824, "mobileRegEx": "android|avantgo|playbook|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od|ad)|iris|kindle|lge |maemo|midp|mmp|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\\/|plucker|pocket|psp|symbian|treo|up\\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino", diff --git a/web/documentserver-example/nodejs/helpers/fileUtility.js b/web/documentserver-example/nodejs/helpers/fileUtility.js index 484cc1c0..b31ce65a 100644 --- a/web/documentserver-example/nodejs/helpers/fileUtility.js +++ b/web/documentserver-example/nodejs/helpers/fileUtility.js @@ -77,11 +77,11 @@ fileUtility.fileType = { presentation: "presentation" } -fileUtility.documentExts = [".docx", ".docm", ".doc", ".odt", ".rtf", ".txt", ".html", ".htm", ".mht", ".pdf", ".djvu", ".fb2", ".epub", ".xps"]; +fileUtility.documentExts = [".doc", ".docx", ".docm", ".dot", ".dotx", ".dotm", ".odt", ".rtf", ".txt", ".html", ".htm", ".mht", ".pdf", ".djvu", ".fb2", ".epub", ".xps"]; -fileUtility.spreadsheetExts = [".xls", ".xlsx", ".xlsm", ".ods", ".csv"]; +fileUtility.spreadsheetExts = [".xls", ".xlsx", ".xlsm", ".xlt", ".xltx", ".xltm", ".ods", ".csv"]; -fileUtility.presentationExts = [".pps", ".ppsx", ".ppsm", ".ppt", ".pptx", ".pptm", ".odp"]; +fileUtility.presentationExts = [".pps", ".ppsx", ".ppsm", ".ppt", ".pptx", ".pptm", ".pot", ".potx", ".potm", ".odp"]; function getUrlParams(url) { try { diff --git a/web/documentserver-example/php/config.php b/web/documentserver-example/php/config.php index 4694cbce..a0994532 100644 --- a/web/documentserver-example/php/config.php +++ b/web/documentserver-example/php/config.php @@ -6,9 +6,9 @@ $GLOBALS['ALONE'] = FALSE; $GLOBALS['MODE'] = ""; -$GLOBALS['DOC_SERV_VIEWD'] = array(".pdf",".djvu",".xps"); -$GLOBALS['DOC_SERV_EDITED'] = array(".docx",".docm",".doc",".odt",".xlsx",".xlsm",".xls",".ods",".csv",".pptx",".pptm",".ppt",".ppsx",".ppsm",".pps",".odp",".rtf",".txt",".mht",".html",".htm"); -$GLOBALS['DOC_SERV_CONVERT'] = array(".docm",".doc",".odt",".xlsm",".xls",".ods",".pptm",".ppt",".ppsm",".pps",".odp",".rtf",".mht",".html",".htm",".epub"); +$GLOBALS['DOC_SERV_VIEWD'] = array(".pdf", ".djvu", ".xps"); +$GLOBALS['DOC_SERV_EDITED'] = array(".docx", ".docm", ".doc", ".dotx", ".dotm", ".dot", ".odt", ".xlsx", ".xlsm", ".xls", ".xltx", ".xltm", ".xlt", ".ods", ".csv", ".pptx", ".pptm", ".ppt", ".ppsx", ".ppsm", ".potx", ".potm", ".pot", ".pps", ".odp", ".rtf", ".txt", ".mht", ".html", ".htm"); +$GLOBALS['DOC_SERV_CONVERT'] = array(".docm", ".doc", ".dotx", ".dotm", ".dot", ".odt", ".xlsm", ".xls", ".xltx", ".xltm", ".xlt", ".ods", ".pptm", ".ppt", ".ppsm", ".pps", ".potx", ".potm", ".pot", ".odp", ".rtf", ".mht", ".html", ".htm", ".epub"); $GLOBALS['DOC_SERV_TIMEOUT'] = "120000"; @@ -24,15 +24,19 @@ $GLOBALS['MOBILE_REGEX'] = "android|avantgo|playbook|blackberry|blazer|compal|el $GLOBALS['ExtsSpreadsheet'] = array(".xls", ".xlsx", ".xlsm", + ".xlt", ".xltx", ".xltm", ".ods", ".csv"); $GLOBALS['ExtsPresentation'] = array(".pps", ".ppsx", ".ppsm", - ".ppt", ".pptx", ".pptm", - ".odp"); + ".ppt", ".pptx", ".pptm", + ".pot", ".potx", ".potm", + ".odp"); -$GLOBALS['ExtsDocument'] = array(".docx", ".docm", ".doc", ".odt", ".rtf", ".txt", - ".html", ".htm", ".mht", ".pdf", ".djvu", - ".fb2", ".epub", ".xps"); +$GLOBALS['ExtsDocument'] = array(".doc", ".docx", ".docm", + ".dot", ".dotx", ".dotm", + ".odt", ".rtf", ".txt", + ".html", ".htm", ".mht", + ".pdf", ".djvu", ".fb2", ".epub", ".xps"); if ( !defined('ServiceConverterMaxTry') ) define( 'ServiceConverterMaxTry', 3); diff --git a/web/documentserver-example/ruby/app/models/file_utility.rb b/web/documentserver-example/ruby/app/models/file_utility.rb index 3e176cc7..6951c305 100644 --- a/web/documentserver-example/ruby/app/models/file_utility.rb +++ b/web/documentserver-example/ruby/app/models/file_utility.rb @@ -1,10 +1,10 @@ class FileUtility - @@exts_document = %w(.docx .docm .doc .odt .rtf .txt .html .htm .mht .pdf .djvu .fb2 .epub .xps) + @@exts_document = %w(.doc .docx .docm .dot .dotx .dotm .odt .rtf .txt .html .htm .mht .pdf .djvu .fb2 .epub .xps) - @@exts_spreadsheet = %w(.xls .xlsx .xlsm .ods .csv) + @@exts_spreadsheet = %w(.xls .xlsx .xlsm .xlt .xltx .xltm .ods .csv) - @@exts_presentation = %w(.pps .ppsx .ppsm .ppt .pptx .pptm .odp) + @@exts_presentation = %w(.pps .ppsx .ppsm .ppt .pptx .pptm .pot .potx .potm .odp) class << self diff --git a/web/documentserver-example/ruby/config/application.rb b/web/documentserver-example/ruby/config/application.rb index e512623b..2336a018 100644 --- a/web/documentserver-example/ruby/config/application.rb +++ b/web/documentserver-example/ruby/config/application.rb @@ -36,8 +36,8 @@ module OnlineEditorsExampleRuby Rails.configuration.timeout=120 Rails.configuration.viewedDocs=".pdf|.djvu|.xps" - Rails.configuration.editedDocs=".docx|.docm|.doc|.odt|.xlsx|.xlsm|.xls|.ods|.csv|.pptx|.pptm|.ppt|.ppsx|.ppsm|.pps|.odp|.rtf|.txt|.mht|.html|.htm" - Rails.configuration.convertDocs=".docm|.doc|.odt|.xlsm|.xls|.ods|.pptm|.ppt|.ppsm|.pps|.odp|.rtf|.mht|.html|.htm|.epub" + Rails.configuration.editedDocs=".docx|.docm|.doc|.dotx|.dotm|.dot|.odt|.xlsx|.xlsm|.xls|.xltx|.xltm|.xlt|.ods|.csv|.pptx|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.rtf|.txt|.mht|.html|.htm" + Rails.configuration.convertDocs=".docm|.dotx|.dotm|.dot|.doc|.odt|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.pptm|.ppt|.ppsm|.pps|.potx|.potm|.pot|.odp|.rtf|.mht|.html|.htm|.epub" Rails.configuration.urlStorage="https://doc.onlyoffice.com/FileUploader.ashx" Rails.configuration.urlConverter="https://doc.onlyoffice.com/ConvertService.ashx"