Fix #287 Fix #285 Fix #284 Fix #280

Build(deps)/bot recommendations

CHANGELOG.md

@@ -0,0 +1,26 @@
+# Change Log
+
+- zh-TW, pt-PT
+
+## 1.2.0
+- ruby v3.0
+- set filetype in setHistoryData
+- read filetype from input request
+- creating file on WOPI
+- upload on WOPI page
+- fix xss
+- set userInfoGroups
+- check JWT on downloading history
+- upload dialog on mobile
+- anonymous without id
+- renaming from editor
+- new skin languages
+- ignore certificate
+
+## 1.1.0
+- creating docxf
+- opening docxf, oform
+
+
+## 1.0.0
+- added java spring

web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx

@@ -166,6 +166,7 @@
             var data = {
                 newfilename: newfilename,
                 dockey: config.document.key,
+                ext: config.document.fileType
             };
 
             let xhr = new XMLHttpRequest();

web/documentserver-example/csharp-mvc/WebEditor.ashx.cs

@@ -575,7 +575,15 @@ namespace OnlineEditorsExampleMVC
             var jss = new JavaScriptSerializer();
             var body = jss.Deserialize<Dictionary<string, object>>(fileData);
             var newFileName = (string) body["newfilename"];
-            var docKey = (string) body["dockey"]; 
+            var docKey = (string) body["dockey"];
+
+            var origExt = '.' + (string) body["ext"];
+            var curExt = Path.GetExtension(newFileName).ToLower();
+
+            if (string.Compare(origExt, curExt, true) != 0)
+            {
+                newFileName += origExt;
+            }
             var meta =  new Dictionary<string, object>() {
                 { "title", newFileName }
             };

web/documentserver-example/csharp-mvc/web.appsettings.config

@@ -16,7 +16,7 @@
 
   <add key="files.docservice.verify-peer-off" value="true"/>
 
-  <add key="files.docservice.languages" value="en:English|az:Azerbaijani|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese|cs:Czech|da:Danish|nl:Dutch|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lv:Latvian|lo:Lao|nb:Norwegian|pl:Polish|pt:Portuguese|ro:Romanian|ru:Russian|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese"/>
+  <add key="files.docservice.languages" value="en:English|az:Azerbaijani|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (People's Republic of China)|zh-TW:Chinese (Traditional, Taiwan)|cs:Czech|da:Danish|nl:Dutch|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lv:Latvian|lo:Lao|nb:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese"/>
 
   <add key="files.docservice.url.site" value="http://documentserver/"/>
 

web/documentserver-example/csharp/DocEditor.aspx

@@ -178,6 +178,7 @@
             var data = {
                 newfilename: newfilename,
                 dockey: config.document.key,
+                ext: config.document.fileType
             };
 
             let xhr = new XMLHttpRequest();

web/documentserver-example/csharp/WebEditor.ashx.cs

@@ -394,6 +394,15 @@ namespace OnlineEditorsExample
             var body = jss.Deserialize<Dictionary<string, object>>(fileData);
             var newFileName = (string) body["newfilename"];
             var docKey = (string) body["dockey"];
+
+            var origExt = '.' + (string) body["ext"];
+            var curExt = Path.GetExtension(newFileName).ToLower();
+
+            if (string.Compare(origExt, curExt, true) != 0)
+            {
+                newFileName += origExt;
+            }
+
             var meta =  new Dictionary<string, object>() {
                 { "title", newFileName }
             };

web/documentserver-example/csharp/settings.config

@@ -15,7 +15,7 @@
   <add key="files.docservice.header" value="Authorization" />
   <add key="files.docservice.verify-peer-off" value="true"/>
 
-  <add key="files.docservice.languages" value="en:English|az:Azerbaijani|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese|cs:Czech|da:Danish|nl:Dutch|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lv:Latvian|lo:Lao|nb:Norwegian|pl:Polish|pt:Portuguese|ro:Romanian|ru:Russian|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese"/>
+  <add key="files.docservice.languages" value="en:English|az:Azerbaijani|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (People's Republic of China)|zh-TW:Chinese (Traditional, Taiwan)|cs:Czech|da:Danish|nl:Dutch|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lv:Latvian|lo:Lao|nb:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese"/>
 
   <add key="files.docservice.url.site" value="http://documentserver/"/>
 

web/documentserver-example/java-spring/pom.xml

@@ -48,7 +48,7 @@
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.8.5</version>
+			<version>2.8.9</version>
 		</dependency>
 		<dependency>
 			<groupId>com.inversoft</groupId>
@@ -64,7 +64,7 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.12.2</version>
+			<version>2.12.6.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.modelmapper</groupId>

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java

@@ -371,6 +371,16 @@ public class FileController {
     public String rename(@RequestBody JSONObject body) {
         String newfilename = (String) body.get("newfilename");
         String dockey = (String) body.get("dockey");
+        String origExt = "." + (String) body.get("ext");
+        String curExt = newfilename;
+
+        if(newfilename.indexOf(".") != -1) {
+            curExt = (String) fileUtility.getFileExtension(newfilename);
+        }
+
+        if(origExt.compareTo(curExt) != 0) {
+            newfilename += origExt;
+        }
 
         HashMap<String, String> meta = new HashMap<>();
         meta.put("title", newfilename);

web/documentserver-example/java-spring/src/main/resources/application.properties

@@ -27,7 +27,7 @@ files.docservice.header=Authorization
 
 files.docservice.verify-peer-off=true
 
-files.docservice.languages=en:English|az:Azerbaijani|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese|cs:Czech|da:Danish|nl:Dutch|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lv:Latvian|lo:Lao|nb:Norwegian|pl:Polish|pt:Portuguese|ro:Romanian|ru:Russian|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese
+files.docservice.languages=en:English|az:Azerbaijani|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (People's Republic of China)|zh-TW:Chinese (Traditional, Taiwan)|cs:Czech|da:Danish|nl:Dutch|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lv:Latvian|lo:Lao|nb:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese
 
 spring.datasource.url=jdbc:h2:mem:usersdb
 spring.datasource.driverClassName=org.h2.Driver

web/documentserver-example/java-spring/src/main/resources/templates/editor.html

@@ -149,6 +149,7 @@
                     var data = {
                         newfilename: newfilename,
                         dockey: config.document.key,
+                        ext: config.document.fileType
                     };
                     let xhr = new XMLHttpRequest();
                     xhr.open("POST", "rename");

web/documentserver-example/java/pom.xml

@@ -29,7 +29,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.5</version>
+            <version>2.8.9</version>
         </dependency>
         <dependency>
             <groupId>com.inversoft</groupId>

web/documentserver-example/java/src/main/java/controllers/IndexServlet.java

@@ -573,6 +573,17 @@ public class IndexServlet extends HttpServlet
             String newfilename = (String) body.get("newfilename");
             String dockey = (String) body.get("dockey");
 
+            String origExt = "." + (String) body.get("ext");
+            String curExt = newfilename;
+
+            if(newfilename.indexOf(".") != -1) {
+                curExt = (String) FileUtility.GetFileExtension(newfilename);
+            }
+
+            if(origExt.compareTo(curExt) != 0) {
+                newfilename += origExt;
+            }
+
             HashMap<String, String> meta = new HashMap<>();
             meta.put("title", newfilename);
 

web/documentserver-example/java/src/main/resources/settings.properties

@@ -16,7 +16,7 @@ files.docservice.url.api=web-apps/apps/api/documents/api.js
 files.docservice.url.preloader=web-apps/apps/api/documents/cache-scripts.html
 files.docservice.url.example=
 
-files.docservice.languages=en:English|az:Azerbaijani|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese|cs:Czech|da:Danish|nl:Dutch|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lv:Latvian|lo:Lao|nb:Norwegian|pl:Polish|pt:Portuguese|ro:Romanian|ru:Russian|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese
+files.docservice.languages=en:English|az:Azerbaijani|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (People's Republic of China)|zh-TW:Chinese (Traditional, Taiwan)|cs:Czech|da:Danish|nl:Dutch|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lv:Latvian|lo:Lao|nb:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese
 
 files.docservice.secret=
 files.docservice.header=Authorization

web/documentserver-example/java/src/main/webapp/editor.jsp

@@ -150,6 +150,7 @@
             var data = {
                 newfilename: newfilename,
                 dockey: config.document.key,
+                ext: config.document.fileType
             };
             let xhr = new XMLHttpRequest();
             xhr.open("POST", "IndexServlet?type=rename");

web/documentserver-example/nodejs/app.js

@@ -128,9 +128,8 @@ app.get("/download", function(req, res) {  // define a handler for downloading f
 
     var fileName = fileUtility.getFileName(req.query.fileName);
     var userAddress = req.query.useraddress;
-    var isEmbedded = req.query.dmode;
 
-    if ((cfgSignatureEnable && cfgSignatureUseForRequest) && isEmbedded == null ) {
+    if ((cfgSignatureEnable && cfgSignatureUseForRequest)) {
         var authorization = req.get(cfgSignatureAuthorizationHeader);
         if (authorization && authorization.startsWith(cfgSignatureAuthorizationHeaderPrefix)) {
             var token = authorization.substring(cfgSignatureAuthorizationHeaderPrefix.length);
@@ -325,7 +324,7 @@ app.post("/convert", function (req, res) {  // define a handler for converting f
     var fileName = fileUtility.getFileName(req.body.filename);
     var filePass = req.body.filePass ? req.body.filePass : null;
     var lang = req.body.lang ? req.body.lang : null;
-    var fileUri = req.docManager.getFileUri(fileName);
+    var fileUri = req.docManager.getDownloadUrl(fileName, true);
     var fileExt = fileUtility.getFileExtension(fileName);
     var fileType = fileUtility.getFileType(fileName);
     var internalFileExt = req.docManager.getInternalExtension(fileType);
@@ -807,8 +806,8 @@ app.get("/editor", function (req, res) {  // define a handler for editing docume
             };
         }
         var key = req.docManager.getKey(fileName);
-        var url = req.docManager.getDownloadUrl(fileName);
-        var urlUser = path.isAbsolute(storageFolder) ? req.docManager.getDownloadUrl(fileName) + "&dmode=emb" : req.docManager.getlocalFileUri(fileName, 0, false);
+        var url = req.docManager.getDownloadUrl(fileName, true);
+        var urlUser = req.docManager.getDownloadUrl(fileName);
         var mode = req.query.mode || "edit"; // mode: view/edit/review/comment/fillForms/embedded
 
         var type = req.query.type || ""; // type: embedded/mobile/desktop
@@ -852,7 +851,7 @@ app.get("/editor", function (req, res) {  // define a handler for editing docume
                     fileType: fileExt.slice(1),
                     version: i,
                     key: keyVersion,
-                    url: i == countVersion ? url : (`${req.docManager.getServerUrl(false)}/history?fileName=${encodeURIComponent(fileName)}&file=prev${fileExt}&ver=${i}&useraddress=${userAddress}`),
+                    url: i == countVersion ? url : (`${req.docManager.getServerUrl(true)}/history?fileName=${encodeURIComponent(fileName)}&file=prev${fileExt}&ver=${i}&useraddress=${userAddress}`),
                 };
 
                 if (i > 1 && req.docManager.existsSync(req.docManager.diffPath(fileName, userAddress, i-1))) {  // check if the path to the file with document versions differences exists
@@ -861,7 +860,7 @@ app.get("/editor", function (req, res) {  // define a handler for editing docume
                         key: historyData[i-2].key,
                         url: historyData[i-2].url,
                     };
-                    let changesUrl = `${req.docManager.getServerUrl(false)}/history?fileName=${encodeURIComponent(fileName)}&file=diff.zip&ver=${i-1}&useraddress=${userAddress}`;
+                    let changesUrl = `${req.docManager.getServerUrl(true)}/history?fileName=${encodeURIComponent(fileName)}&file=diff.zip&ver=${i-1}&useraddress=${userAddress}`;
                     historyD.changesUrl = changesUrl;  // get the path to the diff.zip file and write it to the history object
                 }
 
@@ -909,6 +908,8 @@ app.get("/editor", function (req, res) {  // define a handler for editing docume
                 templates: user.templates ? templates : null,
                 isEdit: canEdit && (mode == "edit" || mode == "view" || mode == "filter" || mode == "blockcontent"),
                 review: canEdit && (mode == "edit" || mode == "review"),
+                chat: userid != "uid-0",
+                coEditing: mode == "view" && userid == "uid-0" ? {mode: "strict", change: false} : null,
                 comment: mode != "view" && mode != "fillForms" && mode != "embedded" && mode != "blockcontent",
                 fillForms: mode != "view" && mode != "comment" && mode != "embedded" && mode != "blockcontent",
                 modifyFilter: mode != "filter",
@@ -976,6 +977,12 @@ app.get("/editor", function (req, res) {  // define a handler for editing docume
 app.post("/rename", function (req, res) { //define a handler for renaming file
 
     var newfilename = req.body.newfilename;
+    var origExt = req.body.ext;
+    var curExt = fileUtility.getFileExtension(newfilename, true);
+    if (curExt !== origExt) {
+        newfilename += '.' + origExt;
+    }
+
     var dockey = req.body.dockey;
     var meta = {title: newfilename};
 

web/documentserver-example/nodejs/config/default.json

@@ -52,7 +52,8 @@
       "be": "Belarusian",
       "bg": "Bulgarian",
       "ca": "Catalan",
-      "zh": "Chinese",
+      "zh" : "Chinese (People's Republic of China)",
+      "zh-TW" : "Chinese (Traditional, Taiwan)",
       "cs": "Czech",
       "da": "Danish",
       "nl": "Dutch",
@@ -70,7 +71,8 @@
       "lo": "Lao",
       "nb": "Norwegian",
       "pl": "Polish",
-      "pt": "Portuguese",
+      "pt" : "Portuguese (Brazil)",
+      "pt-PT" : "Portuguese (Portugal)",
       "ro": "Romanian",
       "ru": "Russian",
       "sk": "Slovak",

web/documentserver-example/nodejs/helpers/docManager.js

@@ -163,22 +163,6 @@ docManager.prototype.getFileData = function (fileName, userAddress) {
     return ((fileSystem.readFileSync(history)).toString()).split(",");
 };
 
-// get url to the original file
-docManager.prototype.getFileUri = function (fileName) {
-    return this.getlocalFileUri(fileName, 0, true);
-};
-
-// get local file url
-docManager.prototype.getlocalFileUri = function (fileName, version, forDocumentServer) {
-    const serverPath = this.getServerUrl(forDocumentServer);
-    const hostAddress = this.curUserHostAddress();
-    let url = serverPath + configServer.get("storagePath") + "/" + hostAddress + "/" + encodeURIComponent(fileName);  // get full url address to the file
-    if (!version) {
-        return url;
-    }
-    return url + "-history/" + version;  // return history path to the specified file version
-};
-
 // get server url
 docManager.prototype.getServerUrl = function (forDocumentServer) {
     return (forDocumentServer && !!configServer.get("exampleUrl")) ? configServer.get("exampleUrl") : this.getServerPath();
@@ -218,10 +202,13 @@ docManager.prototype.getCreateUrl = function (docType, userid, type, lang) {
 }
 
 // get url to download a file
-docManager.prototype.getDownloadUrl = function (fileName) {
-    const server = this.getServerUrl(true);
-    const hostAddress = this.curUserHostAddress();
-    const handler = "/download?fileName=" + encodeURIComponent(fileName) + "&useraddress=" + encodeURIComponent(hostAddress);
+docManager.prototype.getDownloadUrl = function (fileName, forDocumentServer) {
+    const server = this.getServerUrl(forDocumentServer);
+    var handler = "/download?fileName=" + encodeURIComponent(fileName);
+    if (forDocumentServer) {
+        const hostAddress = this.curUserHostAddress();
+        handler += "&useraddress=" + encodeURIComponent(hostAddress);
+    }
 
     return server + handler;
 };
@@ -387,7 +374,7 @@ docManager.prototype.getTemplateImageUrl = function (fileType) {
 // get document key
 docManager.prototype.getKey = function (fileName, userAddress) {
     userAddress = userAddress || this.curUserHostAddress();
-    let key = userAddress + this.getlocalFileUri(fileName);  // get document key by adding local file url to the current user host address
+    let key = userAddress + fileName;  // get document key by adding local file url to the current user host address
 
     let historyPath = this.historyPath(fileName, userAddress);  // get the path to the file history
     if (historyPath != ""){  // if the path to the file history exists

web/documentserver-example/nodejs/helpers/users.js

@@ -60,6 +60,8 @@ var descr_user_0 = [
     "Can't create new files from the editor",
     "Can’t see anyone’s information",
     "Can't rename files from the editor",
+    "Can't view chat",
+    "View file without collaboration",
     //"Can’t submit forms"
 ];
 

web/documentserver-example/nodejs/views/config.ejs

@@ -14,6 +14,7 @@
         "favorite": <%- file.favorite %>
     },
     "permissions": {
+        "chat": <%- editor.chat %>,
         "comment": <%- editor.comment %>,
         "copy": <%- editor.copy %>,
         "download": <%- editor.download %>,
@@ -30,6 +31,7 @@
 },
 "editorConfig": {
     "actionLink": <%- editor.actionData %>,
+    "coEditing": <%- JSON.stringify(editor.coEditing) %>,
     "mode": "<%- editor.mode %>",
     "lang": "<%- editor.lang %>",
     "callbackUrl": "<%- editor.callbackUrl %>",

web/documentserver-example/nodejs/views/editor.ejs

@@ -175,6 +175,7 @@
             var data = {
                 newfilename: newfilename,
                 dockey: config.document.key,
+                ext: config.document.fileType
             };
             let xhr = new XMLHttpRequest();
             xhr.open("POST", "rename");

web/documentserver-example/php/config.php

@@ -52,7 +52,8 @@ $GLOBALS['LANGUAGES'] = array(
     'be' => 'Belarusian',
     'bg' => 'Bulgarian',
     'ca' => 'Catalan',
-    'zh' => 'Chinese',
+    'zh' => 'Chinese (People\'s Republic of China)',
+    'zh-TW' => 'Chinese (Traditional, Taiwan)',
     'cs' => 'Czech',
     'da' => 'Danish',
     'nl' => 'Dutch',
@@ -70,7 +71,8 @@ $GLOBALS['LANGUAGES'] = array(
     'lo' => 'Lao',
     'nb' => 'Norwegian',
     'pl' => 'Polish',
-    'pt' => 'Portuguese',
+    'pt' => 'Portuguese (Brazil)',
+    'pt-PT' => 'Portuguese (Portugal)',
     'ro' => 'Romanian',
     'ru' => 'Russian',
     'sk' => 'Slovak',

web/documentserver-example/php/doceditor.php

@@ -474,6 +474,7 @@
             var data = {
                 newfilename: newfilename,
                 dockey: config.document.key,
+                ext: config.document.fileType
             };
 
             let xhr = new XMLHttpRequest();

web/documentserver-example/php/webeditor-ajax.php

@@ -259,7 +259,7 @@ function convert() {
     $internalExtension = trim(getInternalExtension($fileName),'.');
 
     // check if the file with such an extension can be converted
-    if (in_array("." + $extension, $GLOBALS['DOC_SERV_CONVERT']) && $internalExtension != "") {
+    if (in_array("." . $extension, $GLOBALS['DOC_SERV_CONVERT']) && $internalExtension != "") {
 
         $fileUri = $post["fileUri"];
         if ($fileUri == NULL || $fileUri == "") {
@@ -469,6 +469,13 @@ function delTree($dir) {
 function renamefile() {
     $post = json_decode(file_get_contents('php://input'), true);
     $newfilename = $post["newfilename"];
+
+    $curExt = strtolower(array_pop(explode('.', $newfilename)));
+    $origExt = $post["ext"];
+    if($origExt !== $curExt){
+        $newfilename .= '.' . $origExt;
+    }
+
     $dockey = $post["dockey"];
     $meta = ["title" => $newfilename];
 

web/documentserver-example/python/config.py

@@ -59,7 +59,8 @@ LANGUAGES = {
     'be': 'Belarusian',
     'bg': 'Bulgarian',
     'ca': 'Catalan',
-    'zh': 'Chinese',
+    'zh' : 'Chinese (People\'s Republic of China)',
+    'zh-TW' : 'Chinese (Traditional, Taiwan)',
     'cs': 'Czech',
     'da': 'Danish',
     'nl': 'Dutch',
@@ -77,7 +78,8 @@ LANGUAGES = {
     'lo': 'Lao',
     'nb': 'Norwegian',
     'pl': 'Polish',
-    'pt': 'Portuguese',
+    'pt' : 'Portuguese (Brazil)',
+    'pt-PT' : 'Portuguese (Portugal)',
     'ro': 'Romanian',
     'ru': 'Russian',
     'sk': 'Slovak',

web/documentserver-example/python/src/views/actions.py

@@ -153,6 +153,12 @@ def rename(request):
 
     body = json.loads(request.body)
     newfilename = body['newfilename']
+
+    origExt = '.' + body['ext']
+    curExt = fileUtils.getFileExt(newfilename)
+    if (origExt != curExt):
+        newfilename += origExt
+
     dockey = body['dockey']
     meta = {'title': newfilename}
 

web/documentserver-example/python/templates/editor.html

@@ -165,6 +165,7 @@
             var data = {
                 newfilename: newfilename,
                 dockey: config.document.key,
+                ext: config.document.fileType
             };
             let xhr = new XMLHttpRequest();
             xhr.open("POST", "rename");

web/documentserver-example/ruby/Gemfile.lock

@@ -83,6 +83,7 @@ GEM
     debug_inspector (1.1.0)
     erubi (1.10.0)
     execjs (2.8.1)
+    ffi (1.15.5)
     ffi (1.15.5-x64-mingw32)
     globalid (1.0.0)
       activesupport (>= 5.0)
@@ -94,7 +95,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.3.0)
+    json (1.8.6)
     loofah (2.13.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -107,15 +108,10 @@ GEM
     mini_mime (1.1.2)
     minitest (5.15.0)
     nio4r (2.5.8)
-    nokogiri (1.13.3)
-      mini_portile2 (~> 2.8.0)
-      racc (~> 1.4)
-    nokogiri (1.13.3-x64-mingw32)
-      racc (~> 1.4)
-    nokogiri (1.13.3-x86_64-linux)
+    nokogiri (1.13.6-x86_64-linux)
       racc (~> 1.4)
     racc (1.6.0)
-    rack (2.2.3)
+    rack (2.2.3.1)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
     rack-test (1.1.0)
@@ -147,9 +143,11 @@ GEM
       rake (>= 0.13)
       thor (~> 1.0)
     rake (13.0.6)
-    rdoc (6.3.1)
+    rdoc (4.3.0)
     sass-rails (6.0.0)
       sassc-rails (~> 2.1, >= 2.1.1)
+    sassc (2.4.0)
+      ffi (~> 1.9)
     sassc (2.4.0-x64-mingw32)
       ffi (~> 1.9)
     sassc-rails (2.1.2)
@@ -196,6 +194,7 @@ GEM
 
 PLATFORMS
   x64-mingw32
+  x86_64-linux
 
 DEPENDENCIES
   byebug

web/documentserver-example/ruby/app/controllers/home_controller.rb

@@ -351,6 +351,13 @@ class HomeController < ApplicationController
       body = JSON.parse(request.body.read)
       dockey = body["dockey"]
       newfilename = body["newfilename"]
+
+      orig_ext = '.' + body["ext"]
+      cur_ext = File.extname(newfilename).downcase
+      if orig_ext != cur_ext
+        newfilename += orig_ext
+      end
+
       meta = {
         :title => newfilename
       }

web/documentserver-example/ruby/app/views/home/editor.html.erb

@@ -140,6 +140,7 @@
         var data = {
             newfilename: newfilename,
             dockey: config.document.key,
+            ext: config.document.fileType
         };
         let xhr = new XMLHttpRequest();
         xhr.open("POST", "rename");

web/documentserver-example/ruby/config/application.rb

@@ -56,13 +56,14 @@ module OnlineEditorsExampleRuby
       'be' => 'Belarusian',
       'bg' => 'Bulgarian',
       'ca' => 'Catalan',
-      'zh' => 'Chinese',
+      'zh' => 'Chinese (People\'s Republic of China)',
+      'zh-TW' => 'Chinese (Traditional, Taiwan)',
       'cs' => 'Czech',
       'da' => 'Danish',
       'nl' => 'Dutch',
       'fi' => 'Finnish',
       'fr' => 'French',
-      'gl' => 'Galego'
+      'gl' => 'Galego',
       'de' => 'German',
       'el' => 'Greek',
       'hu' => 'Hungarian',
@@ -74,7 +75,8 @@ module OnlineEditorsExampleRuby
       'lo' => 'Lao',
       'nb' => 'Norwegian',
       'pl' => 'Polish',
-      'pt' => 'Portuguese',
+      'pt' => 'Portuguese (Brazil)',
+      'pt-PT' => 'Portuguese (Portugal)',
       'ro' => 'Romanian',
       'ru' => 'Russian',
       'sk' => 'Slovak',