java: change version

java: fix path separator
v5.1.3
2026-04-07 14:06:11 +08:00 · 2018-04-27 15:21:00 +03:00 · 2018-04-27 15:20:05 +03:00 · 2018-04-26 18:26:25 +03:00 · 2018-04-24 17:42:27 +03:00 · 2018-04-24 17:32:31 +03:00
11 changed files with 12 additions and 129 deletions
--- a/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
+++ b/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
@ -145,28 +145,11 @@
                });
        };

-            if (window.addEventListener) {
-                window.addEventListener("load", сonnectEditor);
-            } else if (window.attachEvent) {
-                window.attachEvent("load", сonnectEditor);
-            }
-
-            function getXmlHttp() {
-                var xmlhttp;
-                try {
-                    xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
-                } catch (e) {
-                    try {
-                        xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
-                    } catch (ex) {
-                        xmlhttp = false;
-                    }
-                }
-                if (!xmlhttp && typeof XMLHttpRequest != 'undefined') {
-                    xmlhttp = new XMLHttpRequest();
-                }
-                return xmlhttp;
-            }
+        if (window.addEventListener) {
+            window.addEventListener("load", сonnectEditor);
+        } else if (window.attachEvent) {
+            window.attachEvent("load", сonnectEditor);
+        }

    </script>
 </body>
--- a/web/documentserver-example/csharp/DocEditor.aspx
+++ b/web/documentserver-example/csharp/DocEditor.aspx
@ -143,35 +143,6 @@
            window.attachEvent("load", сonnectEditor);
        }

-        function getXmlHttp() {
-            var xmlhttp;
-            try {
-                xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
-            } catch (e) {
-                try {
-                    xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
-                } catch (ex) {
-                    xmlhttp = false;
-                }
-            }
-            if (!xmlhttp && typeof XMLHttpRequest != 'undefined') {
-                xmlhttp = new XMLHttpRequest();
-            }
-            return xmlhttp;
-        }
-
-        function SaveFileRequest(fileName, fileType, fileUri) {
-            var req = getXmlHttp();
-            var requestAddress = "webeditor.ashx"
-                + "?type=save"
-                + "&filename=" + encodeURIComponent(fileName)
-                + "&filetype=" + encodeURIComponent(fileType)
-                + "&fileuri=" + encodeURIComponent(fileUri);
-            req.open('get', requestAddress, true);
-
-            req.send(fileUri);
-        }
-
    </script>
 </head>
 <body>
--- a/web/documentserver-example/java/pom.xml
+++ b/web/documentserver-example/java/pom.xml
@ -4,7 +4,7 @@

    <groupId>onlyoffice.com</groupId>
    <artifactId>OnlineEditorsExampleJava</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0</version>
    <packaging>war</packaging>

    <name>OnlineEditorsExampleJava</name>
--- a/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java
+++ b/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java
@ -117,7 +117,7 @@ public class DocumentManager
        String storagePath = ConfigManager.GetProperty("storage-folder");
        String hostAddress = CurUserHostAddress(userAddress);
        
-        String directory = serverPath + "\\" + storagePath + "\\";
+        String directory = serverPath + File.separator + storagePath + File.separator;

        File file = new File(directory);
        
@ -126,7 +126,7 @@ public class DocumentManager
            file.mkdir();
        }
        
-        directory = directory + hostAddress + "\\";
+        directory = directory + hostAddress + File.separator;
        file = new File(directory);

        if (!file.exists())
@ -185,7 +185,7 @@ public class DocumentManager
            String storagePath = ConfigManager.GetProperty("storage-folder");
            String hostAddress = CurUserHostAddress(null);
            
-            String filePath = serverPath + "/" + storagePath + "/" + hostAddress + "/" + URLEncoder.encode(fileName, java.nio.charset.StandardCharsets.UTF_8.toString());
+            String filePath = serverPath + "/" + storagePath + "/" + hostAddress + "/" + URLEncoder.encode(fileName, java.nio.charset.StandardCharsets.UTF_8.toString()).replace("+", "%20");
            
            return filePath;
        }
--- a/web/documentserver-example/java/src/main/webapp/editor.jsp
+++ b/web/documentserver-example/java/src/main/webapp/editor.jsp
@ -146,23 +146,6 @@
            window.attachEvent("load", сonnectEditor);
        }

-        function getXmlHttp() {
-            var xmlhttp;
-            try {
-                xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
-            } catch (e) {
-                try {
-                    xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
-                } catch (ex) {
-                    xmlhttp = false;
-                }
-            }
-            if (!xmlhttp && typeof XMLHttpRequest !== "undefined") {
-                xmlhttp = new XMLHttpRequest();
-            }
-            return xmlhttp;
-        }
-
    </script>
        
    </head>
--- a/web/documentserver-example/nodejs/views/index.ejs
+++ b/web/documentserver-example/nodejs/views/index.ejs
@ -164,10 +164,8 @@
                                    <% } %>
                                </td>
                                <td class="contentCells contentCells-shift contentCells-icon">
-                                    <% if (storedFiles[i].documentType == "text") { %>
                                    <a href="editor?type=desktop&mode=comment&fileName=<%= encodeURIComponent(storedFiles[i].name) + params %>" target="_blank">
                                        <img src="images/comment-24.png" alt="Open in editor for comment" title="Open in editor for comment" /></a>
-                                    <% } %>
                                </td>
                                <% } else { %>
                                    <td class="contentCells contentCells-shift contentCells-icon" colspan="4"></td>
--- a/web/documentserver-example/php/common.php
+++ b/web/documentserver-example/php/common.php
@ -150,7 +150,7 @@ function getClientIp() {
 function serverPath($forDocumentServer = NULL) {
    return $forDocumentServer && isset($GLOBALS['EXAMPLE_URL']) && $GLOBALS['EXAMPLE_URL'] != ""
        ? $GLOBALS['EXAMPLE_URL']
-        : ('http://' . $_SERVER['HTTP_HOST']);
+        : (getScheme() . '://' . $_SERVER['HTTP_HOST']);
 }

 function getCurUserHostAddress($userAddress = NULL) {
@ -257,7 +257,7 @@ function getVirtualPath($forDocumentServer) {
 }

 function FileUri($file_name, $forDocumentServer = NULL) {
-    $uri = getVirtualPath($forDocumentServer) . $file_name;
+    $uri = getVirtualPath($forDocumentServer) . rawurlencode($file_name);
    return $uri;
 }

--- a/web/documentserver-example/php/doceditor.php
+++ b/web/documentserver-example/php/doceditor.php
@ -228,23 +228,6 @@
            window.attachEvent("load", сonnectEditor);
        }

-        function getXmlHttp() {
-            var xmlhttp;
-            try {
-                xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
-            } catch (e) {
-                try {
-                    xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
-                } catch (ex) {
-                    xmlhttp = false;
-                }
-            }
-            if (!xmlhttp && typeof XMLHttpRequest != 'undefined') {
-                xmlhttp = new XMLHttpRequest();
-            }
-            return xmlhttp;
-        }
-
    </script>
 </head>
 <body>
--- a/web/documentserver-example/php/index.php
+++ b/web/documentserver-example/php/index.php
@ -177,7 +177,7 @@
                                    echo '  <a class="stored-edit '.$storeFile->documentType.'" href="doceditor.php?fileID='.urlencode($storeFile->name).'&user='.$user.'" target="_blank">';
                                    echo '   <span title="'.$storeFile->name.'">'.$storeFile->name.'</span>';
                                    echo '  </a>';
-                                    echo '  <a href="webeditor-ajax.php?type=download&filename='.$storeFile->name.'">';
+                                    echo '  <a href="'.FileUri($storeFile->name).'">';
                                    echo '   <img class="icon-download" src="css/images/download-24.png" alt="Download" title="Download" /></a>';
                                    echo '  </a>';
                                    echo '  <a class="delete-file" data="'.$storeFile->name.'">';
--- a/web/documentserver-example/php/webeditor-ajax.php
+++ b/web/documentserver-example/php/webeditor-ajax.php
@ -61,9 +61,6 @@ if (isset($_GET["type"]) && !empty($_GET["type"])) { //Checks if type value exis
            $response_array = upload();
            $response_array['status'] = isset($response_array['error']) ? 'error' : 'success';
            die (json_encode($response_array));
-        case "download":
-            download();
-            exit;
        case "convert":
            $response_array = convert();
            $response_array['status'] = 'success';
@ -128,21 +125,6 @@ function upload() {
    return $result;
 }

-function download() {
-    $fileName = $_GET["filename"];
-
-    $filePath = getStoragePath($fileName);
-    if (!file_exists($filePath)) {
-        http_response_code(404);
-        return;
-    }
-    header("Content-Length: " . filesize($filePath));
-    header("Content-Type: " . mime_content_type($fileName));
-
-    header("Content-Disposition: attachment; filename=\"".basename($filePath)."\"");
-    readfile($filePath);
-}
-
 function track() {
    sendlog("Track START", "webedior-ajax.log");
    sendlog("_GET params: " . serialize( $_GET ), "webedior-ajax.log");
--- a/web/documentserver-example/ruby/app/views/home/editor.html.erb
+++ b/web/documentserver-example/ruby/app/views/home/editor.html.erb
@ -105,21 +105,4 @@
        window.attachEvent("load", сonnectEditor);
    }

-    function getXmlHttp() {
-        var xmlhttp;
-        try {
-            xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
-        } catch (e) {
-            try {
-                xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
-            } catch (ex) {
-                xmlhttp = false;
-            }
-        }
-        if (!xmlhttp && typeof XMLHttpRequest != 'undefined') {
-            xmlhttp = new XMLHttpRequest();
-        }
-        return xmlhttp;
-    }
-
 </script>
Author	SHA1	Message	Date
Sergey Linnik	aa8a143338	java: change version	2018-04-27 15:21:00 +03:00
Sergey Linnik	a999b20588	java: fix path separator	2018-04-27 15:20:05 +03:00
Alexey Golubev	cab5f62201	v5.1.3	2018-04-26 18:26:25 +03:00
Sergey Linnik	83c03c97db	php: fix filename in url (`178133a292`)	2018-04-24 17:42:27 +03:00
Sergey Linnik	7b1c56ea2c	php: replace download url	2018-04-24 17:32:31 +03:00
Sergey Linnik	178133a292	php: fix filename in url	2018-04-24 16:55:16 +03:00
Sergey Linnik	f9232788b2	php: using current scheme	2018-04-24 16:54:38 +03:00
Sergey Linnik	c0f8caaf0b	nodejs: comment only for spreadsheet editor	2018-04-19 19:06:40 +03:00
Sergey Linnik	fbb23a5872	recognize type of otf	2018-04-16 15:58:00 +03:00
Sergey Linnik	ec764e0f0e	OpenDocument template	2018-04-16 15:58:00 +03:00
Alexey Golubev	d08d887392	v5.1.2	2018-04-11 14:28:01 +03:00
Alexey Golubev	b039b16fd9	v5.1.2	2018-04-11 14:26:31 +03:00
Sergey Linnik	1df7cc54c1	Merge branch 'develop' of github.com:ONLYOFFICE/document-server-integration into develop	2018-04-06 15:00:12 +03:00
Sergey Linnik	cf6d11bf4e	nodejs: comment only for presentation editor	2018-04-06 14:57:07 +03:00
Sergey Linnik	232fc0d156	Java: fix encoding space	2018-04-05 11:12:24 +03:00
Sergey Linnik	b1352bd897	remove unusing code	2018-03-29 11:52:01 +03:00