Fix Bug 33954 - open mobile editor by user agent

web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs

@@ -129,8 +129,8 @@ namespace OnlineEditorsExampleMVC.Helpers
                     + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
                     + "webeditor.ashx",
                 Query = "type=track"
-                        + "&userAddress=" + HttpUtility.UrlEncode(HttpContext.Current.Request.UserHostAddress)
                         + "&fileName=" + HttpUtility.UrlEncode(fileName)
+                        + "&userAddress=" + HttpUtility.UrlEncode(HttpContext.Current.Request.UserHostAddress)
             };
             return callbackUrl.ToString();
         }

web/documentserver-example/csharp/DocEditor.aspx.cs

@@ -61,8 +61,8 @@ namespace OnlineEditorsExample
                     + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
                     + "webeditor.ashx";
                 callbackUrl.Query = "type=track"
-                                    + "&userAddress=" + HttpUtility.UrlEncode(HttpContext.Current.Request.UserHostAddress)
-                                    + "&fileName=" + HttpUtility.UrlEncode(FileName);
+                                    + "&fileName=" + HttpUtility.UrlEncode(FileName)
+                                    + "&userAddress=" + HttpUtility.UrlEncode(HttpContext.Current.Request.UserHostAddress);
                 return callbackUrl.ToString();
             }
         }

web/documentserver-example/java/src/main/java/helpers/DocumentManager.java

@@ -191,7 +191,7 @@ public class DocumentManager
     {
         String serverPath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + request.getContextPath();
         String hostAddress = CurUserHostAddress(null);
-        String query = "?type=track&userAddress=" + URLEncoder.encode(hostAddress) + "&fileName=" + URLEncoder.encode(fileName);
+        String query = "?type=track&fileName=" + URLEncoder.encode(fileName) + "&userAddress=" + URLEncoder.encode(hostAddress);
         
         return serverPath + "/IndexServlet" + query;
     }

web/documentserver-example/nodejs/app.js

@@ -422,7 +422,11 @@ app.get("/editor", function (req, res) {
         var key = docManager.getKey(fileName);
         var url = docManager.getFileUri(fileName);
         var mode = req.query.mode || "edit"; //mode: view/edit 
-        var type = req.query.type || "desktop"; //type: embedded/mobile/desktop
+        var type = req.query.type || ""; //type: embedded/mobile/desktop
+        if (type == "") {
+                type = new RegExp(configServer.get("mobileRegEx"), "i").test(req.get('User-Agent')) ? "mobile" : "desktop";
+            }
+
         var canEdit = configServer.get('editedDocs').indexOf(fileUtility.getFileExtension(fileName)) != -1;
 
         var countVersion = 1;

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

@@ -24,6 +24,7 @@
     "convertedDocs": [".doc", ".odt", ".xls", ".ods", ".ppt", ".pps", ".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",
     "static":[
       {
         "name": "/public",

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

@@ -169,7 +169,7 @@ docManager.getServerUrl = function () {
 docManager.getCallback = function (fileName) {
     var server = docManager.getServerUrl();
     var hostAddress = docManager.curUserHostAddress();
-    var handler = "/track?useraddress=" + encodeURIComponent(hostAddress) + "&filename=" + encodeURIComponent(fileName);
+    var handler = "/track?filename=" + encodeURIComponent(fileName) + "&useraddress=" + encodeURIComponent(hostAddress);
 
     return server + handler;
 };

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

@@ -145,7 +145,7 @@
                                         <img class="icon-delete" src="images/delete-24.png" alt="Delete" title="Delete" /></a>
                                 </td>
                                 <td class="contentCells contentCells-icon">
-                                    <a href="editor?fileName=<%= encodeURIComponent(storedFiles[i].name) + params %>" target="_blank">
+                                    <a href="editor?type=desktop&fileName=<%= encodeURIComponent(storedFiles[i].name) + params %>" target="_blank">
                                         <img src="images/desktop-24.png" alt="Open in editor for full size screens" title="Open in editor for full size screens" /></a>
                                 </td>
                                 <td class="contentCells contentCells-icon">
@@ -154,12 +154,12 @@
                                 </td>
                                 <td class="contentCells contentCells-shift contentCells-icon">
                                     <% if (storedFiles[i].documentType == "text") { %>
-                                    <a href="editor?mode=review&fileName=<%= encodeURIComponent(storedFiles[i].name) + params %>" target="_blank">
+                                    <a href="editor?type=desktop&mode=review&fileName=<%= encodeURIComponent(storedFiles[i].name) + params %>" target="_blank">
                                         <img src="images/review-24.png" alt="Open in editor for review" title="Open in editor for review" /></a>
                                     <% } %>
                                 </td>
                                 <td class="contentCells contentCells-icon">
-                                    <a href="editor?mode=view&fileName=<%= encodeURIComponent(storedFiles[i].name) + params %>" target="_blank">
+                                    <a href="editor?type=desktop&mode=view&fileName=<%= encodeURIComponent(storedFiles[i].name) + params %>" target="_blank">
                                         <img src="images/desktop-24.png" alt="Open in viewer for full size screens" title="Open in viewer for full size screens" /></a>
                                 </td>
                                 <td class="contentCells contentCells-icon">

web/documentserver-example/php/config.php

@@ -20,6 +20,8 @@ $GLOBALS['DOC_SERV_PRELOADER_URL'] = "https://doc.onlyoffice.com/web-apps/apps/a
 
 $GLOBALS['EXAMPLE_URL'] = "";
 
+$GLOBALS['MOBILE_REGEX'] = "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";
+
 
 $GLOBALS['ExtsSpreadsheet'] = array(".xls", ".xlsx",
                                     ".ods", ".csv");

web/documentserver-example/php/doceditor.php

@@ -71,8 +71,9 @@
     function getCallbackUrl($fileName) {
         return serverPath(TRUE) . '/'
                     . "webeditor-ajax.php"
-                    . "?type=track&userAddress=" . getClientIp()
-                    . "&fileName=" . urlencode($fileName);
+                    . "?type=track"
+                    . "&fileName=" . urlencode($fileName)
+                    . "&userAddress=" . getClientIp();
     }
 
 ?>
@@ -156,14 +157,18 @@
                 }
             ?>
 
-            var user = [{id:"0","name":"Jonn Smith"}, {id:"1","name":"Mark Pottato"}, {id:"2","name":"Hamish Mitchell"}]["<?php echo $_GET["user"] ?>" || 0];            
+            var user = [{id:"0","name":"Jonn Smith"}, {id:"1","name":"Mark Pottato"}, {id:"2","name":"Hamish Mitchell"}]["<?php echo $_GET["user"] ?>" || 0];
+            var type = "<?php echo ($_GET["type"] == "mobile" ? "mobile" : ($_GET["type"] == "embedded" ? "embedded" : ($_GET["type"] == "desktop" ? "desktop" : ""))) ?>";
+            if (type == "") {
+                type = new RegExp("<?php echo $GLOBALS['MOBILE_REGEX'] ?>", "i").test(window.navigator.userAgent) ? "mobile" : "desktop";
+            }
 
             docEditor = new DocsAPI.DocEditor("iframeEditor",
                 {
                     width: "100%",
                     height: "100%",
 
-                    type: "<?php echo ($_GET["type"] == "mobile" ? "mobile" : ($_GET["type"] == "embedded" ? "embedded" : "desktop")) ?>",
+                    type: type,
                     documentType: "<?php echo getDocumentType($filename) ?>",
                     document: {
                         title: fileName,

web/documentserver-example/php/index.php

@@ -184,7 +184,7 @@
                                     echo '  </a>';
                                     echo ' </td>';
                                     echo ' <td class="contentCells contentCells-icon">';
-                                    echo '  <a href="doceditor.php?fileID='.urlencode($storeFile->name).'&user='.$user.'" target="_blank">';
+                                    echo '  <a href="doceditor.php?fileID='.urlencode($storeFile->name).'&user='.$user.'&type=desktop" target="_blank">';
                                     echo '   <img src="css/images/desktop-24.png" alt="Open in editor for full size screens" title="Open in editor for full size screens" /></a>';
                                     echo '  </a>';
                                     echo ' </td>';
@@ -194,13 +194,13 @@
                                     echo '  </a>';
                                     echo ' <td class="contentCells contentCells-shift contentCells-icon">';
                                     if ($storeFile->documentType == "text") {
-                                    echo '  <a href="doceditor.php?fileID='.urlencode($storeFile->name).'&user='.$user.'&action=review" target="_blank">';
+                                    echo '  <a href="doceditor.php?fileID='.urlencode($storeFile->name).'&user='.$user.'&action=review&type=desktop" target="_blank">';
                                     echo '   <img src="css/images/review-24.png" alt="Open in editor for review" title="Open in editor for review" /></a>';
                                     echo '  </a>';
                                     }
                                     echo ' </td>';
                                     echo ' <td class="contentCells contentCells-icon">';
-                                    echo '  <a href="doceditor.php?fileID='.urlencode($storeFile->name).'&user='.$user.'&action=view" target="_blank">';
+                                    echo '  <a href="doceditor.php?fileID='.urlencode($storeFile->name).'&user='.$user.'&action=view&type=desktop" target="_blank">';
                                     echo '   <img src="css/images/desktop-24.png" alt="Open in viewer for full size screens" title="Open in viewer for full size screens" /></a>';
                                     echo '  </a>';
                                     echo ' </td>';

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

@@ -58,7 +58,7 @@ if (isset($_GET["type"]) && !empty($_GET["type"])) { //Checks if type value exis
     switch($type) { //Switch case for value of type
         case "upload":
             $response_array = upload();
-            $response_array['status'] = $response_array['error'] != NULL ? 'error' : 'success';
+            $response_array['status'] = isset($response_array['error']) ? 'error' : 'success';
             die (json_encode($response_array));
         case "convert":
             $response_array = convert();

web/documentserver-example/ruby/app/models/document_helper.rb

@@ -94,7 +94,7 @@ class DocumentHelper
 
     def get_callback(file_name)
 
-      @@base_url + '/track?type=track&userAddress=' + cur_user_host_address(nil)  + '&fileName=' + URI::encode(file_name)
+      @@base_url + '/track?type=track&fileName=' + URI::encode(file_name)  + '&userAddress=' + cur_user_host_address(nil)
 
     end