Fix Bug 33279 - add onOutdatedVersion event

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

@@ -78,6 +78,10 @@
                 innerAlert(event.data);
         };
 
+        var onOutdatedVersion = function (event) {
+            location.reload(true);
+        };
+
         var сonnectEditor = function () {
 
             docEditor = new DocsAPI.DocEditor("iframeEditor",
@@ -135,6 +139,7 @@
                         'onDocumentStateChange': onDocumentStateChange,
                         'onRequestEditRights': onRequestEditRights,
                         'onError': onError,
+                        'onOutdatedVersion': onOutdatedVersion,
                     }
                 });
         };

web/documentserver-example/csharp/DocEditor.aspx

@@ -71,6 +71,10 @@
                 innerAlert(event.data);
         };
 
+        var onOutdatedVersion = function (event) {
+            location.reload(true);
+        };
+
         var сonnectEditor = function () {
 
             docEditor = new DocsAPI.DocEditor("iframeEditor",
@@ -127,7 +131,8 @@
                         'onReady': onReady,
                         'onDocumentStateChange': onDocumentStateChange,
                         'onRequestEditRights': onRequestEditRights,
-                        'onError': onError
+                        'onError': onError,
+                        'onOutdatedVersion': onOutdatedVersion,
                     }
                 });
         };

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

@@ -72,6 +72,10 @@
                 innerAlert(event.data);
         };
 
+        var onOutdatedVersion = function (event) {
+            location.reload(true);
+        };
+
         var сonnectEditor = function () {
 
             docEditor = new DocsAPI.DocEditor("iframeEditor",
@@ -129,6 +133,7 @@
                         "onDocumentStateChange": onDocumentStateChange,
                         'onRequestEditRights': onRequestEditRights,
                         "onError": onError,
+                        "onOutdatedVersion": onOutdatedVersion,
                     }
                 });
         };

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

@@ -96,6 +96,10 @@
                 innerAlert(event.data);
         };
 
+        var onOutdatedVersion = function (event) {
+            location.reload(true);
+        };
+
         var connectEditor = function () {
 
             docEditor = new DocsAPI.DocEditor("iframeEditor",
@@ -152,7 +156,8 @@
                         "onError": onError,
                         "onRequestHistory":  onRequestHistory,
                         "onRequestHistoryData": onRequestHistoryData,
-                        "onRequestHistoryClose": onRequestHistoryClose
+                        "onRequestHistoryClose": onRequestHistoryClose,
+                        "onOutdatedVersion": onOutdatedVersion,
                     }
             });
         };

web/documentserver-example/php/common.php

@@ -142,8 +142,10 @@ function getClientIp() {
     return $ipaddress;
 }
 
-function serverPath() {
-    return 'http://' . $_SERVER['HTTP_HOST'];
+function serverPath($forDocumentServer) {
+    return $forDocumentServer && isset($GLOBALS['EXAMPLE_URL']) && $GLOBALS['EXAMPLE_URL'] != "" 
+        ? $GLOBALS['EXAMPLE_URL'] 
+        : ('http://' . $_SERVER['HTTP_HOST']);
 }
 
 function getCurUserHostAddress($userAddress = NULL) {
@@ -223,35 +225,35 @@ function getStoredFiles() {
     } 
 
     $cdir = scandir($directory);
-    foreach ($cdir as $key => $fileName)
-    {
-        if (!in_array($fileName,array(".","..")))
-        {
-            if (!is_dir($directory . DIRECTORY_SEPARATOR . $fileName))
-            {
-                $result[] = (object) array(
-                'name' => $fileName,
-                'url' => FileUri($fileName),
-                'documentType' => getDocumentType($fileName)
-                );
+    $result = array();
+    foreach($cdir as $key => $fileName) {
+        if (!in_array($fileName,array(".", ".."))) {
+            if (!is_dir($directory . DIRECTORY_SEPARATOR . $fileName)) {   
+                $dat = filemtime($directory . DIRECTORY_SEPARATOR . $fileName);
+                $result[$dat] = (object) array(
+                        "name" => $fileName,
+                        "url" => FileUri($fileName),
+                        "documentType" => getDocumentType($fileName)
+                    );
             }
         }
     }
-    return $result;
+    ksort($result);
+    return array_reverse($result);
 }
 
-function getVirtualPath() {
+function getVirtualPath($forDocumentServer) {
     $storagePath = trim(str_replace(array('/','\\'), '/', $GLOBALS['STORAGE_PATH']), '/');
     $storagePath = $storagePath != "" ? $storagePath . '/' : "";
 
 
-    $virtPath = serverPath() . '/' . $storagePath . getCurUserHostAddress() . '/';
+    $virtPath = serverPath($forDocumentServer) . '/' . $storagePath . getCurUserHostAddress() . '/';
     sendlog("getVirtualPath virtPath: " . $virtPath, "logs/common.log");
     return $virtPath;
 }
 
-function FileUri($file_name) {
-    $uri = getVirtualPath() . $file_name;
+function FileUri($file_name, $forDocumentServer) {
+    $uri = getVirtualPath($forDocumentServer) . $file_name;
     return $uri;
 }
 

web/documentserver-example/php/config.php

@@ -18,6 +18,8 @@ $GLOBALS['DOC_SERV_API_URL'] = "https://doc.onlyoffice.com/web-apps/apps/api/doc
 
 $GLOBALS['DOC_SERV_PRELOADER_URL'] = "https://doc.onlyoffice.com/web-apps/apps/api/documents/cache-scripts.html";
 
+$GLOBALS['EXAMPLE_URL'] = "";
+
 
 $GLOBALS['ExtsSpreadsheet'] = array(".xls", ".xlsx",
                                     ".ods", ".csv");

web/documentserver-example/php/doceditor.php

@@ -31,7 +31,6 @@
     require_once( dirname(__FILE__) . '/functions.php' );
 
     $filename;
-    $fileuri;
 
     $externalUrl = $_GET["fileUrl"];
     if (!empty($externalUrl))
@@ -53,8 +52,8 @@
         exit;
     }
 
-    $fileuri = FileUri($filename);
-
+    $fileuri = FileUri($filename, true);
+    $fileuriUser = FileUri($filename);
 
     function tryGetDefaultByType($createExt) {
         $demoName = ($_GET["sample"] ? "demo." : "new.") . $createExt;
@@ -70,7 +69,7 @@
     }
 
     function getCallbackUrl($fileName) {
-        return serverPath() . '/'
+        return serverPath(TRUE) . '/'
                     . "webeditor-ajax.php"
                     . "?type=track&userAddress=" . getClientIp()
                     . "&fileName=" . urlencode($fileName);
@@ -145,6 +144,10 @@
                 innerAlert(event.data);
         };
 
+        var onOutdatedVersion = function (event) {
+            location.reload(true);
+        };
+
         var сonnectEditor = function () {
 
             <?php
@@ -189,9 +192,9 @@
                         user: user,
 
                         embedded: {
-                            saveUrl: "<?php echo $fileuri ?>",
-                            embedUrl: "<?php echo $fileuri ?>",
-                            shareUrl: "<?php echo $fileuri ?>",
+                            saveUrl: "<?php echo $fileuriUser ?>",
+                            embedUrl: "<?php echo $fileuriUser ?>",
+                            shareUrl: "<?php echo $fileuriUser ?>",
                             toolbarDocked: "top",
                         },
 
@@ -208,6 +211,7 @@
                         'onDocumentStateChange': onDocumentStateChange,
                         'onRequestEditRights': onRequestEditRights,
                         'onError': onError,
+                        'onOutdatedVersion': onOutdatedVersion,
                     }
                 });
         };

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

@@ -201,8 +201,8 @@ function convert() {
     if (in_array("." + $extension, $GLOBALS['DOC_SERV_CONVERT']) && $internalExtension != "") {
 
         $fileUri = $_GET["fileUri"];
-        if ($fileUri == "") {
-            $fileUri = FileUri($fileName);
+        if ($fileUri == NULL || $fileUri == "") {
+            $fileUri = FileUri($fileName, TRUE);
         }
         $key = getDocEditorKey($fileName);
 

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

@@ -34,6 +34,10 @@
             innerAlert(event.data);
     };
 
+    var onOutdatedVersion = function (event) {
+        location.reload(true);
+    };
+
     var сonnectEditor = function () {
 
         docEditor = new DocsAPI.DocEditor("iframeEditor",
@@ -90,6 +94,7 @@
                         'onReady': onReady,
                         'onDocumentStateChange': onDocumentStateChange,
                         'onError': onError,
+                        'onOutdatedVersion': onOutdatedVersion,
                     },
                 });
     };