diff --git a/web/documentserver-example/csharp-mvc/Models/FileUtility.cs b/web/documentserver-example/csharp-mvc/Models/FileUtility.cs index db9c3955..ada80f50 100644 --- a/web/documentserver-example/csharp-mvc/Models/FileUtility.cs +++ b/web/documentserver-example/csharp-mvc/Models/FileUtility.cs @@ -53,7 +53,7 @@ namespace OnlineEditorsExampleMVC.Models { ".doc", ".docx", ".docm", ".dot", ".dotx", ".dotm", - ".odt", ".rtf", ".txt", + ".odt", ".fodt", ".rtf", ".txt", ".html", ".htm", ".mht", ".pdf", ".djvu", ".fb2", ".epub", ".xps" }; @@ -62,7 +62,7 @@ namespace OnlineEditorsExampleMVC.Models { ".xls", ".xlsx", ".xlsm", ".xlt", ".xltx", ".xltm", - ".ods", ".csv" + ".ods", ".fods", ".csv" }; public static readonly List ExtsPresentation = new List @@ -70,7 +70,7 @@ namespace OnlineEditorsExampleMVC.Models ".pps", ".ppsx", ".ppsm", ".ppt", ".pptx", ".pptm", ".pot", ".potx", ".potm", - ".odp" + ".odp", ".fodp" }; } } \ No newline at end of file diff --git a/web/documentserver-example/csharp-mvc/web.appsettings.config b/web/documentserver-example/csharp-mvc/web.appsettings.config index ee637d38..884eb0c3 100644 --- a/web/documentserver-example/csharp-mvc/web.appsettings.config +++ b/web/documentserver-example/csharp-mvc/web.appsettings.config @@ -11,7 +11,7 @@ - + diff --git a/web/documentserver-example/csharp/Default.aspx.cs b/web/documentserver-example/csharp/Default.aspx.cs index 933c3b90..879c6d15 100644 --- a/web/documentserver-example/csharp/Default.aspx.cs +++ b/web/documentserver-example/csharp/Default.aspx.cs @@ -44,7 +44,7 @@ namespace OnlineEditorsExample { ".xls", ".xlsx", ".xlsm", ".xlt", ".xltx", ".xltm", - ".ods", ".csv" + ".ods", ".fods", ".csv" }; public static readonly List ExtsPresentation = new List @@ -52,14 +52,14 @@ namespace OnlineEditorsExample ".pps", ".ppsx", ".ppsm", ".ppt", ".pptx", ".pptm", ".pot", ".potx", ".potm", - ".odp" + ".odp", ".fodp" }; public static readonly List ExtsDocument = new List { ".doc", ".docx", ".docm", ".dot", ".dotx", ".dotm", - ".odt", ".rtf", ".txt", + ".odt", ".fodt", ".rtf", ".txt", ".html", ".htm", ".mht", ".pdf", ".djvu", ".fb2", ".epub", ".xps" }; diff --git a/web/documentserver-example/csharp/settings.config b/web/documentserver-example/csharp/settings.config index 865f4158..a4881f04 100644 --- a/web/documentserver-example/csharp/settings.config +++ b/web/documentserver-example/csharp/settings.config @@ -7,7 +7,7 @@ - + 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 b87e1fde..e40de5f0 100644 --- a/web/documentserver-example/java/src/main/java/helpers/FileUtility.java +++ b/web/documentserver-example/java/src/main/java/helpers/FileUtility.java @@ -37,14 +37,14 @@ import java.util.Map; public class FileUtility { static {} - + public static FileType GetFileType(String fileName) { String ext = GetFileExtension(fileName).toLowerCase(); if (ExtsDocument.contains(ext)) return FileType.Text; - + if (ExtsSpreadsheet.contains(ext)) return FileType.Spreadsheet; @@ -58,7 +58,7 @@ public class FileUtility ( ".doc", ".docx", ".docm", ".dot", ".dotx", ".dotm", - ".odt", ".rtf", ".txt", + ".odt", ".fodt", ".rtf", ".txt", ".html", ".htm", ".mht", ".pdf", ".djvu", ".fb2", ".epub", ".xps" ); @@ -67,7 +67,7 @@ public class FileUtility ( ".xls", ".xlsx", ".xlsm", ".xlt", ".xltx", ".xltm", - ".ods", ".csv" + ".ods", ".fods", ".csv" ); public static List ExtsPresentation = Arrays.asList @@ -75,14 +75,14 @@ public class FileUtility ".pps", ".ppsx", ".ppsm", ".ppt", ".pptx", ".pptm", ".pot", ".potx", ".potm", - ".odp" + ".odp", ".fodp" ); - + public static String GetFileName (String url) { if(url == null) return null; - + //for external file url String tempstorage = ConfigManager.GetProperty("files.docservice.url.tempstorage"); if(!tempstorage.isEmpty() && url.startsWith(tempstorage)) @@ -94,7 +94,7 @@ public class FileUtility String fileName = url.substring(url.lastIndexOf('/')+1, url.length()); return fileName; } - + public static String GetFileNameWithoutExtension (String url) { String fileName = GetFileName(url); diff --git a/web/documentserver-example/java/src/main/resources/settings.properties b/web/documentserver-example/java/src/main/resources/settings.properties index c04cb021..6e953259 100644 --- a/web/documentserver-example/java/src/main/resources/settings.properties +++ b/web/documentserver-example/java/src/main/resources/settings.properties @@ -3,7 +3,7 @@ storage-folder=app_data files.docservice.viewed-docs=.pdf|.djvu|.xps files.docservice.edited-docs=.docx|.xlsx|.csv|.pptx|.ppsx|.txt -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.convert-docs=.docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.pptm|.ppt|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.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 b3085bb3..ee607740 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 (".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"; + if (".doc.docx.docm.dot.dotx.dotm.odt.fodt.rtf.txt.html.htm.mht.pdf.djvu.fb2.epub.xps".indexOf(ext) != -1) return "text"; + if (".xls.xlsx.xlsm.xlt.xltx.xltm.ods.fods.csv".indexOf(ext) != -1) return "spreadsheet"; + if (".pps.ppsx.ppsm.ppt.pptx.pptm.pot.potx.potm.odp.fodp".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 dff5a67e..4f899e94 100644 --- a/web/documentserver-example/nodejs/config/default.json +++ b/web/documentserver-example/nodejs/config/default.json @@ -22,7 +22,7 @@ "exampleUrl": null, "viewedDocs": [".pdf", ".djvu", ".xps"], "editedDocs": [".docx", ".xlsx", ".csv", ".pptx", ".ppsx", ".txt"], - "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"], + "convertedDocs": [".docm", ".doc", ".dotx", ".dotm", ".dot", ".odt", ".fodt", ".xlsm", ".xls", ".xltx", ".xltm", ".xlt", ".ods", ".fods", ".pptm", ".ppt", ".ppsm", ".pps", ".potx", ".potm", ".pot", ".odp", ".fodp", ".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 b31ce65a..620be24f 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 = [".doc", ".docx", ".docm", ".dot", ".dotx", ".dotm", ".odt", ".rtf", ".txt", ".html", ".htm", ".mht", ".pdf", ".djvu", ".fb2", ".epub", ".xps"]; +fileUtility.documentExts = [".doc", ".docx", ".docm", ".dot", ".dotx", ".dotm", ".odt", ".fodt", ".rtf", ".txt", ".html", ".htm", ".mht", ".pdf", ".djvu", ".fb2", ".epub", ".xps"]; -fileUtility.spreadsheetExts = [".xls", ".xlsx", ".xlsm", ".xlt", ".xltx", ".xltm", ".ods", ".csv"]; +fileUtility.spreadsheetExts = [".xls", ".xlsx", ".xlsm", ".xlt", ".xltx", ".xltm", ".ods", ".fods", ".csv"]; -fileUtility.presentationExts = [".pps", ".ppsx", ".ppsm", ".ppt", ".pptx", ".pptm", ".pot", ".potx", ".potm", ".odp"]; +fileUtility.presentationExts = [".pps", ".ppsx", ".ppsm", ".ppt", ".pptx", ".pptm", ".pot", ".potx", ".potm", ".odp", ".fodp"]; function getUrlParams(url) { try { diff --git a/web/documentserver-example/php/config.php b/web/documentserver-example/php/config.php index 55d1f546..c1f3483c 100644 --- a/web/documentserver-example/php/config.php +++ b/web/documentserver-example/php/config.php @@ -8,7 +8,7 @@ $GLOBALS['MODE'] = ""; $GLOBALS['DOC_SERV_VIEWD'] = array(".pdf", ".djvu", ".xps"); $GLOBALS['DOC_SERV_EDITED'] = array(".docx", ".xlsx", ".csv", ".pptx", ".ppsx", ".txt"); -$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_CONVERT'] = array(".docm", ".doc", ".dotx", ".dotm", ".dot", ".odt", ".fodt", ".xlsm", ".xls", ".xltx", ".xltm", ".xlt", ".ods", ".fods", ".pptm", ".ppt", ".ppsm", ".pps", ".potx", ".potm", ".pot", ".odp", ".fodp", ".rtf", ".mht", ".html", ".htm", ".epub"); $GLOBALS['DOC_SERV_TIMEOUT'] = "120000"; @@ -25,16 +25,16 @@ $GLOBALS['MOBILE_REGEX'] = "android|avantgo|playbook|blackberry|blazer|compal|el $GLOBALS['ExtsSpreadsheet'] = array(".xls", ".xlsx", ".xlsm", ".xlt", ".xltx", ".xltm", - ".ods", ".csv"); + ".ods", ".fods", ".csv"); $GLOBALS['ExtsPresentation'] = array(".pps", ".ppsx", ".ppsm", ".ppt", ".pptx", ".pptm", ".pot", ".potx", ".potm", - ".odp"); + ".odp", ".fodp"); $GLOBALS['ExtsDocument'] = array(".doc", ".docx", ".docm", ".dot", ".dotx", ".dotm", - ".odt", ".rtf", ".txt", + ".odt", ".fodt", ".rtf", ".txt", ".html", ".htm", ".mht", ".pdf", ".djvu", ".fb2", ".epub", ".xps"); diff --git a/web/documentserver-example/ruby/app/models/file_utility.rb b/web/documentserver-example/ruby/app/models/file_utility.rb index 6951c305..0a439613 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(.doc .docx .docm .dot .dotx .dotm .odt .rtf .txt .html .htm .mht .pdf .djvu .fb2 .epub .xps) + @@exts_document = %w(.doc .docx .docm .dot .dotx .dotm .odt .fodt .rtf .txt .html .htm .mht .pdf .djvu .fb2 .epub .xps) - @@exts_spreadsheet = %w(.xls .xlsx .xlsm .xlt .xltx .xltm .ods .csv) + @@exts_spreadsheet = %w(.xls .xlsx .xlsm .xlt .xltx .xltm .ods .fods .csv) - @@exts_presentation = %w(.pps .ppsx .ppsm .ppt .pptx .pptm .pot .potx .potm .odp) + @@exts_presentation = %w(.pps .ppsx .ppsm .ppt .pptx .pptm .pot .potx .potm .odp .fodp) class << self diff --git a/web/documentserver-example/ruby/config/application.rb b/web/documentserver-example/ruby/config/application.rb index 94f95884..3d36b696 100644 --- a/web/documentserver-example/ruby/config/application.rb +++ b/web/documentserver-example/ruby/config/application.rb @@ -37,7 +37,7 @@ module OnlineEditorsExampleRuby Rails.configuration.viewedDocs=".pdf|.djvu|.xps" Rails.configuration.editedDocs=".docx|.xlsx|.csv|.pptx|.ppsx|.txt" - 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.convertDocs=".docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.pptm|.ppt|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.rtf|.mht|.html|.htm|.epub" Rails.configuration.urlStorage="https://doc.onlyoffice.com/FileUploader.ashx" Rails.configuration.urlConverter="https://doc.onlyoffice.com/ConvertService.ashx"