diff --git a/web/documentserver-example/csharp-mvc/Scripts/jscript.js b/web/documentserver-example/csharp-mvc/Scripts/jscript.js index 520095a03..3adcd21f4 100644 --- a/web/documentserver-example/csharp-mvc/Scripts/jscript.js +++ b/web/documentserver-example/csharp-mvc/Scripts/jscript.js @@ -109,7 +109,7 @@ if (typeof jQuery != "undefined") { var timer = null; var checkConvert = function (filePass, fileType) { - filePass = filePass ? filePass : null; + filePass = filePass ? filePass : null; if (timer != null) { clearTimeout(timer); } diff --git a/web/documentserver-example/csharp/Forgotten.aspx.cs b/web/documentserver-example/csharp/Forgotten.aspx.cs index 43249e422..96b9a77b1 100755 --- a/web/documentserver-example/csharp/Forgotten.aspx.cs +++ b/web/documentserver-example/csharp/Forgotten.aspx.cs @@ -46,6 +46,7 @@ public static string DocumentType(string fileName) { var ext = Path.GetExtension(fileName).ToLower(); + if (FormatManager.PdfExtensions().Contains(ext)) return "pdf"; // pdf for pdf extensions if (FormatManager.DocumentExtensions().Contains(ext)) return "word"; // word for text document extensions if (FormatManager.SpreadsheetExtensions().Contains(ext)) return "cell"; // cell for spreadsheet extensions if (FormatManager.PresentationExtensions().Contains(ext)) return "slide"; // slide for presentation extensions diff --git a/web/documentserver-example/csharp/script/jscript.js b/web/documentserver-example/csharp/script/jscript.js index 5e9051c3c..4f8324837 100644 --- a/web/documentserver-example/csharp/script/jscript.js +++ b/web/documentserver-example/csharp/script/jscript.js @@ -109,7 +109,7 @@ if (typeof jQuery != "undefined") { var timer = null; var checkConvert = function (filePass, fileType) { - filePass = filePass ? filePass : null; + filePass = filePass ? filePass : null; if (timer != null) { clearTimeout(timer); } diff --git a/web/documentserver-example/java-spring/pom.xml b/web/documentserver-example/java-spring/pom.xml index cce34e2e3..eb02f794a 100644 --- a/web/documentserver-example/java-spring/pom.xml +++ b/web/documentserver-example/java-spring/pom.xml @@ -84,7 +84,7 @@ com.onlyoffice docs-integration-sdk - 1.1.4-SNAPSHOT + 1.2.1-SNAPSHOT diff --git a/web/documentserver-example/java/src/main/java/helpers/Users.java b/web/documentserver-example/java/src/main/java/helpers/Users.java index 2cb7ad389..20a038566 100755 --- a/web/documentserver-example/java/src/main/java/helpers/Users.java +++ b/web/documentserver-example/java/src/main/java/helpers/Users.java @@ -93,7 +93,7 @@ public final class Users { "group-2", Arrays.asList("group-2", ""), new CommentGroups(null, Arrays.asList("group-2", ""), Arrays.asList("group-2")), Arrays.asList("group-2", ""), true, new ArrayList(), descriptionUserSecond, false, true, - new Goback("Go to Documents", null))); + new Goback("Go to Documents", false))); add(new User("uid-3", "Hamish Mitchell", null, "group-3", Arrays.asList("group-2"), new CommentGroups(Arrays.asList("group-3", "group-2"), Arrays.asList("group-2"), null), Arrays.asList("group-2"), diff --git a/web/documentserver-example/php/src/ajax.php b/web/documentserver-example/php/src/ajax.php index 16d45fc60..71b6d829d 100644 --- a/web/documentserver-example/php/src/ajax.php +++ b/web/documentserver-example/php/src/ajax.php @@ -61,7 +61,7 @@ function saveas() $formatManager = new FormatManager(); $post = json_decode(file_get_contents('php://input'), true); - $fileurl = $post["url"]; + $fileurl = str_replace("//localhost", "//proxy", $post["url"]); $title = $post["title"]; $extension = mb_strtolower(pathinfo($title, PATHINFO_EXTENSION)); $allexts = $formatManager->allExtensions(); diff --git a/web/documentserver-example/python/src/utils/trackManager.py b/web/documentserver-example/python/src/utils/trackManager.py index 234edc822..a2d4c7dd3 100755 --- a/web/documentserver-example/python/src/utils/trackManager.py +++ b/web/documentserver-example/python/src/utils/trackManager.py @@ -203,7 +203,7 @@ def commandRequest(method, key, meta=None): verify=config_manager.ssl_verify_peer_mode_enabled(), timeout=5) error = response.json()["error"] - if not error == 0: + if error not in (4, 0): raise Exception(f"Command Service Error #{error}") return response diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 93b125b4d..569e370ad 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -314,7 +314,7 @@ def self.command_request(method, key, meta = nil) res = http.request(req) # get the response data = res.body # and take its body result = JSON.parse(data) # convert the response body into the json format - raise("Command service error: #{result['error']}") if result['error'] != 0 + raise("Command service error: #{result['error']}") if [4, 0].exclude?(result['error']) rescue StandardError => e raise(e.message) end