Disabled jwt

Feature/token

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 ONLYOFFICE
+Copyright (c) 2017 ONLYOFFICE
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

build/msbuild/build.proj

@@ -1,13 +1,13 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <UsingTask AssemblyFile="App_Data\MSBuild.Community.Tasks.dll" TaskName="MSBuild.Community.Tasks.Zip" />
-  
+
   <PropertyGroup>
     <To Condition=" '$(To)' == '' ">..\deploy\</To>
 
     <RootDir Condition="$(RootDir)==''">..\..\</RootDir>
-	<DirCSharp>$(RootDir)web\documentserver-example\csharp\</DirCSharp>
-	<DirMvc>$(RootDir)web\documentserver-example\csharp-mvc\</DirMvc>
+    <DirCSharp>$(RootDir)web\documentserver-example\csharp\</DirCSharp>
+    <DirMvc>$(RootDir)web\documentserver-example\csharp-mvc\</DirMvc>
   </PropertyGroup>
 
   <ItemGroup>

build/msbuild/zip.proj

@@ -1,20 +1,20 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <UsingTask AssemblyFile="MSBuild.Community.Tasks.dll" TaskName="MSBuild.Community.Tasks.Zip" />
-  
+
   <PropertyGroup>
     <To Condition=" '$(To)' == '' ">..\deploy\</To>
     <RootDir Condition="$(RootDir)==''">..\..\</RootDir>
-	<DirCSharp>$(RootDir)web\documentserver-example\csharp\</DirCSharp>
-	<DirMvc>$(RootDir)web\documentserver-example\csharp-mvc\</DirMvc>
-	<DirJava>$(RootDir)web\documentserver-example\java\</DirJava>
-	<DirNodeJS>$(RootDir)web\documentserver-example\nodejs\</DirNodeJS>
-	<DirPHP>$(RootDir)web\documentserver-example\php\</DirPHP>
-	<DirRuby>$(RootDir)web\documentserver-example\ruby\</DirRuby>
+    <DirCSharp>$(RootDir)web\documentserver-example\csharp\</DirCSharp>
+    <DirMvc>$(RootDir)web\documentserver-example\csharp-mvc\</DirMvc>
+    <DirJava>$(RootDir)web\documentserver-example\java\</DirJava>
+    <DirNodeJS>$(RootDir)web\documentserver-example\nodejs\</DirNodeJS>
+    <DirPHP>$(RootDir)web\documentserver-example\php\</DirPHP>
+    <DirRuby>$(RootDir)web\documentserver-example\ruby\</DirRuby>
   </PropertyGroup>
 
   <Target Name="Build">
     <ItemGroup>
-      <ZipFilesCSharp Include="$(DirCSharp)**" Exclude="$(DirCSharp)App_Data\*.dll;$(DirCSharp)obj\**;" />
+      <ZipFilesCSharp Include="$(DirCSharp)**" Exclude="$(DirCSharp)obj\**;" />
     </ItemGroup>
     <Zip Files="@(ZipFilesCSharp)" WorkingDirectory="$(DirCSharp)" ZipFileName="$(To).Net (C#) Example.zip" />
 
@@ -29,7 +29,7 @@
     <Zip Files="@(ZipFilesJava)" WorkingDirectory="$(DirJava)" ZipFileName="$(To)Java Example.zip" />
 
     <ItemGroup>
-      <ZipFilesNodeJS Include="$(DirNodeJS)**" Exclude="$(DirNodeJS)node_modules\**;$(DirNodeJS)run.bat" />
+      <ZipFilesNodeJS Include="$(DirNodeJS)**" Exclude="$(DirNodeJS)node_modules\**" />
     </ItemGroup>
     <Zip Files="@(ZipFilesNodeJS)" WorkingDirectory="$(DirNodeJS)" ZipFileName="$(To)Node.js Example.zip" />
 

web/documentserver-example/csharp-mvc/App_Start/BundleConfig.cs

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

web/documentserver-example/csharp-mvc/App_Start/FilterConfig.cs

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

web/documentserver-example/csharp-mvc/App_Start/RouteConfig.cs

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

web/documentserver-example/csharp-mvc/App_Start/WebApiConfig.cs

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

web/documentserver-example/csharp-mvc/Content/editor.css

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

web/documentserver-example/csharp-mvc/Content/stylesheet.css

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

web/documentserver-example/csharp-mvc/Controllers/HomeController.cs

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

web/documentserver-example/csharp-mvc/Global.asax.cs

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
@@ -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-mvc/Helpers/DocumentConverter.cs

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
@@ -26,6 +26,7 @@
 using System;
 using System.IO;
 using System.Net;
+using System.Text;
 using System.Text.RegularExpressions;
 using System.Web;
 using System.Web.Configuration;
@@ -213,20 +214,26 @@ namespace OnlineEditorsExampleMVC.Helpers
                                      : documentRevisionId;
             documentRevisionId = GenerateRevisionId(documentRevisionId);
 
-            var urlDocumentService = DocumentConverterUrl + ConvertParams;
-            var urlToConverter = String.Format(urlDocumentService,
-                                               HttpUtility.UrlEncode(documentUri),
-                                               toExtension.Trim('.'),
-                                               fromExtension.Trim('.'),
-                                               title,
-                                               documentRevisionId);
-
-            if (isAsync)
-                urlToConverter += "&async=true";
-
-            var req = (HttpWebRequest) WebRequest.Create(urlToConverter);
+            var req = (HttpWebRequest)WebRequest.Create(DocumentConverterUrl);
+            req.Method = "POST";
+            req.ContentType = "text/json";
             req.Timeout = ConvertTimeout;
 
+            var bodyString = string.Format("{{\"async\": {0},\"filetype\": \"{1}\",\"key\": \"{2}\",\"outputtype\": \"{3}\",\"title\": \"{4}\",\"url\": \"{5}\"}}",
+                                           isAsync.ToString().ToLower(),
+                                           fromExtension.Trim('.'),
+                                           documentRevisionId,
+                                           toExtension.Trim('.'),
+                                           title,
+                                           documentUri);
+
+            var bytes = Encoding.UTF8.GetBytes(bodyString);
+            req.ContentLength = bytes.Length;
+            using (var requestStream = req.GetRequestStream())
+            {
+                requestStream.Write(bytes, 0, bytes.Length);
+            }
+
             Stream stream = null;
             var countTry = 0;
             while (countTry < MaxTry)

web/documentserver-example/csharp-mvc/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 ONLYOFFICE
+Copyright (c) 2017 ONLYOFFICE
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

web/documentserver-example/csharp-mvc/Models/FileModel.cs

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

web/documentserver-example/csharp-mvc/Models/FileUtility.cs

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

web/documentserver-example/csharp-mvc/Properties/AssemblyInfo.cs

@@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Ascensio System SIA")]
 [assembly: AssemblyProduct("OnlineEditorsExampleMVC")]
-[assembly: AssemblyCopyright("Ascensio System SIA 2016")]
+[assembly: AssemblyCopyright("Ascensio System SIA 2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

web/documentserver-example/csharp-mvc/Scripts/jscript.js

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

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

@@ -1,6 +1,6 @@
 <!--*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
@@ -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-mvc/Views/Home/Index.aspx

@@ -1,6 +1,6 @@
 <!--*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

web/documentserver-example/csharp/App_Themes/stylesheet.css

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

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/csharp/DocEditor.aspx.cs

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
@@ -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/csharp/DocumentConverter.cs

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
@@ -23,6 +23,7 @@
  *
 */
 
+using System.Text;
 using OnlineEditorsExample;
 using System;
 using System.IO;
@@ -220,22 +221,28 @@ namespace ASC.Api.DocumentConverter
                                      : documentRevisionId;
             documentRevisionId = GenerateRevisionId(documentRevisionId);
 
-            var urlDocumentService = DocumentConverterUrl + ConvertParams;
-            var urlToConverter = String.Format(urlDocumentService,
-                                               HttpUtility.UrlEncode(documentUri),
-                                               toExtension.Trim('.'),
-                                               fromExtension.Trim('.'),
-                                               title,
-                                               documentRevisionId);
-
-            if (isAsync)
-                urlToConverter += "&async=true";
-
-            var req = (HttpWebRequest) WebRequest.Create(urlToConverter);
+            var req = (HttpWebRequest)WebRequest.Create(DocumentConverterUrl);
+            req.Method = "POST";
+            req.ContentType = "text/json";
             req.Timeout = ConvertTimeout;
 
-            Stream stream = null;
+            var bodyString = string.Format("{{\"async\": {0},\"filetype\": \"{1}\",\"key\": \"{2}\",\"outputtype\": \"{3}\",\"title\": \"{4}\",\"url\": \"{5}\"}}",
+                                           isAsync.ToString().ToLower(),
+                                           fromExtension.Trim('.'),
+                                           documentRevisionId,
+                                           toExtension.Trim('.'),
+                                           title,
+                                           documentUri);
+
+            var bytes = Encoding.UTF8.GetBytes(bodyString);
+            req.ContentLength = bytes.Length;
+            using (var requestStream = req.GetRequestStream())
+            {
+                requestStream.Write(bytes, 0, bytes.Length);
+            }
+
             var countTry = 0;
+            Stream stream = null;
 
             // hack. http://ubuntuforums.org/showthread.php?t=1841740
             if (_Default.IsMono)

web/documentserver-example/csharp/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 ONLYOFFICE
+Copyright (c) 2017 ONLYOFFICE
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

web/documentserver-example/csharp/Properties/AssemblyInfo.cs

@@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Ascensio System SIA")]
 [assembly: AssemblyProduct("OnlineEditorsExample")]
-[assembly: AssemblyCopyright("Ascensio System SIA 2016")]
+[assembly: AssemblyCopyright("Ascensio System SIA 2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

web/documentserver-example/csharp/script/jscript.js

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

web/documentserver-example/java/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 ONLYOFFICE
+Copyright (c) 2017 ONLYOFFICE
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

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/java/src/main/webapp/css/editor.css

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

web/documentserver-example/java/src/main/webapp/css/stylesheet.css

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

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

@@ -1,6 +1,6 @@
 <!--*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
@@ -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/java/src/main/webapp/index.jsp

@@ -1,6 +1,6 @@
 <!--*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

web/documentserver-example/java/src/main/webapp/scripts/jscript.js

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

web/documentserver-example/js/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 ONLYOFFICE
+Copyright (c) 2017 ONLYOFFICE
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

web/documentserver-example/js/OnlineEditorsExampleJS.html

@@ -1,6 +1,6 @@
 <!--*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

web/documentserver-example/js/init.js

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

web/documentserver-example/js/stylesheet.css

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

web/documentserver-example/nodejs/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 ONLYOFFICE
+Copyright (c) 2017 ONLYOFFICE
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

web/documentserver-example/nodejs/app.js

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
@@ -23,37 +23,44 @@
  *
 */
 
-var express = require("express");
-var path = require("path");
-var favicon = require("serve-favicon");
-var bodyParser = require("body-parser");
-var fileSystem = require("fs");
-var formidable = require("formidable");
-var syncRequest = require("sync-request");
-var config = require('config');
-var configServer = config.get('server');
-var docManager = require("./helpers/docManager");
-var documentService = require("./helpers/documentService");
-var fileUtility = require("./helpers/fileUtility");
-var siteUrl = configServer.get('siteUrl');
-var fileChoiceUrl = configServer.has('fileChoiceUrl') ? configServer.get('fileChoiceUrl') : "";
-var plugins = config.get('plugins');
+const express = require("express");
+const path = require("path");
+const favicon = require("serve-favicon");
+const bodyParser = require("body-parser");
+const fileSystem = require("fs");
+const formidable = require("formidable");
+const syncRequest = require("sync-request");
+const jwt = require('jsonwebtoken');
+const config = require('config');
+const configServer = config.get('server');
+const docManager = require("./helpers/docManager");
+const documentService = require("./helpers/documentService");
+const fileUtility = require("./helpers/fileUtility");
+const siteUrl = configServer.get('siteUrl');
+const fileChoiceUrl = configServer.has('fileChoiceUrl') ? configServer.get('fileChoiceUrl') : "";
+const plugins = config.get('plugins');
+const cfgSignatureEnable = configServer.get('token.enable');
+const cfgSignatureUseForRequest = configServer.get('token.useforrequest');
+const cfgSignatureSecretExpiresIn = configServer.get('token.expiresIn');
+const cfgSignatureSecret = configServer.get('token.secret');
 
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
 
 
 String.prototype.hashCode = function () {
-    for (var ret = 0, i = 0, len = this.length; i < len; i++) {
+	const len = this.length;
+	let ret = 0;
+    for (let i = 0; i < len; i++) {
         ret = (31 * ret + this.charCodeAt(i)) << 0;
     }
     return ret;
 };
 String.prototype.format = function () {
-    var text = this.toString();
+    let text = this.toString();
 
     if (!arguments.length) return text;
 
-    for (var i = 0; i < arguments.length; i++) {
+    for (let i = 0; i < arguments.length; i++) {
         text = text.replace(new RegExp("\\{" + i + "\\}", "gi"), arguments[i]);
     }
 
@@ -61,11 +68,9 @@ String.prototype.format = function () {
 };
 
 
-var app = express();
-
-
+const app = express();
 app.set("views", path.join(__dirname, "views"));
-app.set("view engine", "ejs")
+app.set("view engine", "ejs");
 
 
 app.use(function (req, res, next) {
@@ -75,9 +80,9 @@ app.use(function (req, res, next) {
 
 app.use(express.static(path.join(__dirname, "public")));
 if (config.has('server.static')) {
-  var staticContent = config.get('server.static');
-  for (var i = 0; i < staticContent.length; ++i) {
-    var staticContentElem = staticContent[i];
+  const staticContent = config.get('server.static');
+  for (let i = 0; i < staticContent.length; ++i) {
+    const staticContentElem = staticContent[i];
     app.use(staticContentElem['name'], express.static(staticContentElem['path'], staticContentElem['options']));
   }
 }
@@ -115,32 +120,48 @@ app.post("/upload", function (req, res) {
     docManager.init(__dirname, req, res);
     docManager.storagePath(""); //mkdir if not exist
 
-    var userIp = docManager.curUserHostAddress();
-    var uploadDir = "./public/" + configServer.get('storageFolder') + "/" + userIp;
+    const userIp = docManager.curUserHostAddress();
+    const uploadDir = path.join("./public", configServer.get('storageFolder'), userIp);
+    const uploadDirTmp = path.join(uploadDir, 'tmp');
+    docManager.createDirectory(uploadDirTmp);
 
-    var form = new formidable.IncomingForm();
-    form.uploadDir = uploadDir;
+    const form = new formidable.IncomingForm();
+    form.uploadDir = uploadDirTmp;
     form.keepExtensions = true;
 
     form.parse(req, function (err, fields, files) {
+    	if (err) {
+			docManager.cleanFolderRecursive(uploadDirTmp, true);
+			res.writeHead(200, { "Content-Type": "text/plain" });
+			res.write("{ \"error\": \"" + err.message + "\"}");
+			res.end();
+			return;
+		}
 
-        var file = files.uploadedFile;
+        const file = files.uploadedFile;
+
+        if (file == undefined) {
+            res.writeHead(200, { "Content-Type": "text/plain" });
+            res.write("{ \"error\": \"Uploaded file not found\"}");
+            res.end();
+            return;
+        }
 
         file.name = docManager.getCorrectName(file.name);
 
         if (configServer.get('maxFileSize') < file.size || file.size <= 0) {
-            fileSystem.unlinkSync(file.path);
+			docManager.cleanFolderRecursive(uploadDirTmp, true);
             res.writeHead(200, { "Content-Type": "text/plain" });
             res.write("{ \"error\": \"File size is incorrect\"}");
             res.end();
             return;
         }
 
-        var exts = [].concat(configServer.get('viewedDocs'), configServer.get('editedDocs'), configServer.get('convertedDocs'));
-        var curExt = fileUtility.getFileExtension(file.name);
+        const exts = [].concat(configServer.get('viewedDocs'), configServer.get('editedDocs'), configServer.get('convertedDocs'));
+        const curExt = fileUtility.getFileExtension(file.name);
 
         if (exts.indexOf(curExt) == -1) {
-            fileSystem.unlinkSync(file.path);
+			docManager.cleanFolderRecursive(uploadDirTmp, true);
             res.writeHead(200, { "Content-Type": "text/plain" });
             res.write("{ \"error\": \"File type is not supported\"}");
             res.end();
@@ -148,14 +169,15 @@ app.post("/upload", function (req, res) {
         }
 
         fileSystem.rename(file.path, uploadDir + "/" + file.name, function (err) {
+			docManager.cleanFolderRecursive(uploadDirTmp, true);
             res.writeHead(200, { "Content-Type": "text/plain" });
             if (err) {
                 res.write("{ \"error\": \"" + err + "\"}");
             } else {
                 res.write("{ \"filename\": \"" + file.name + "\"}");
 
-                var userid = req.query.userid ? req.query.userid : "uid-1";
-                var name = req.query.name ? req.query.name : "Jonn Smith";
+                const userid = req.query.userid ? req.query.userid : "uid-1";
+                const name = req.query.name ? req.query.name : "Jonn Smith";
 
                 docManager.saveFileData(file.name, userid, name);
             }
@@ -233,8 +255,8 @@ app.get("/convert", function (req, res) {
 
     try {
         if (configServer.get('convertedDocs').indexOf(fileExt) != -1) {
-            var key = documentService.generateRevisionId(fileUri);
-            documentService.getConvertedUriAsync(fileUri, fileExt, internalFileExt, key, callback);
+            const key = documentService.generateRevisionId(fileUri);
+            documentService.getConvertedUri(fileUri, fileExt, internalFileExt, key, true, callback);
         } else {
             writeResult(fileName, null, null);
         }
@@ -246,31 +268,20 @@ app.get("/convert", function (req, res) {
 
 app.delete("/file", function (req, res) {
     try {
-        docManager.init(__dirname, req, res);
+    	docManager.init(__dirname, req, res);
+        let fileName = req.query.filename;
+        if (fileName) {
+			fileName = fileUtility.getFileName(fileName);
 
-        var fileName = fileUtility.getFileName(req.query.filename);
+			const filePath = docManager.storagePath(fileName);
+			fileSystem.unlinkSync(filePath);
 
-        var filePath = docManager.storagePath(fileName)
-        fileSystem.unlinkSync(filePath);
-
-        var userAddress = docManager.curUserHostAddress();
-        var historyPath = docManager.historyPath(fileName, userAddress, true);
-
-        var deleteFolderRecursive = function (path) {
-            if (fileSystem.existsSync(path)) {
-                var files = fileSystem.readdirSync(path);
-                files.forEach(function (file, index) {
-                    var curPath = path + "/" + file;
-                    if (fileSystem.lstatSync(curPath).isDirectory()) {
-                        deleteFolderRecursive(curPath);
-                    } else {
-                        fileSystem.unlinkSync(curPath);
-                    }
-                });
-                fileSystem.rmdirSync(path);
-            }
-        };
-        deleteFolderRecursive(historyPath);
+			const userAddress = docManager.curUserHostAddress();
+			const historyPath = docManager.historyPath(fileName, userAddress, true);
+			docManager.cleanFolderRecursive(historyPath, true);
+		} else {
+			docManager.cleanFolderRecursive(docManager.storagePath(''), false);
+		}
 
         res.write("{\"success\":true}");
     } catch (ex) {
@@ -290,9 +301,7 @@ app.post("/track", function (req, res) {
 
     var processTrack = function (response, body, fileName, userAddress) {
 
-        var processSave = function (body, fileName, userAddress, newVersion) {
-
-            var downloadUri = body.url;
+        var processSave = function (downloadUri, body, fileName, userAddress, resp, newVersion) {
             var curExt = fileUtility.getFileExtension(fileName);
             var downloadExt = fileUtility.getFileExtension(downloadUri);
 
@@ -300,7 +309,10 @@ app.post("/track", function (req, res) {
                 var key = documentService.generateRevisionId(downloadUri);
 
                 try {
-                    downloadUri = documentService.getConvertedUri(downloadUri, downloadExt, curExt, key);
+                    documentService.getConvertedUriSync(downloadUri, downloadExt, curExt, key, function(dUri){
+                        processSave(dUri, body, fileName, userAddress, resp, newVersion)
+                    });
+                    return;
                 } catch (ex) {
                     console.log(ex);
                     fileName = docManager.getCorrectName(fileUtility.getFileName(fileName, true) + downloadExt, userAddress)
@@ -348,7 +360,10 @@ app.post("/track", function (req, res) {
             } catch (ex) {
                 console.log(ex);
             }
-        }
+
+            response.write("{\"error\":0}");
+            response.end();
+        };
 
         if (body.status == 1) { //Editing
             if (body.actions && body.actions[0].type == 0) { //finished edit
@@ -362,15 +377,17 @@ app.post("/track", function (req, res) {
                     }
                 }
             }
-        } else if (body.status == 2 || body.status == 3) { //MustSave, Corrupted
-            processSave(body, fileName, userAddress, true);
-        } else if (body.status == 6 || body.status == 7) { //MustForceSave, CorruptedForceSave
-            processSave(body, fileName, userAddress);
+
+        } else if (body.status == 2 || body.status == 3 //MustSave, Corrupted
+                   || body.status == 6 || body.status == 7) { //MustForceSave, CorruptedForceSave
+            var newVersion = (body.status == 2 || body.status == 3);
+            processSave(body.url, body, fileName, userAddress, response, newVersion);
+            return;
         }
 
         response.write("{\"error\":0}");
         response.end();
-    }
+    };
 
     var readbody = function (request, response, fileName, userAddress) {
         var content = "";
@@ -381,6 +398,29 @@ app.post("/track", function (req, res) {
             var body = JSON.parse(content);
             processTrack(response, body, fileName, userAddress);
         });
+    };
+
+    //checkjwt
+    if (cfgSignatureEnable && cfgSignatureUseForRequest) {
+        var checkJwtHeaderRes = documentService.checkJwtHeader(req);
+        if (checkJwtHeaderRes) {
+            if (checkJwtHeaderRes.payload) {
+                body = checkJwtHeaderRes.payload;
+            }
+            if (checkJwtHeaderRes.query) {
+                if (checkJwtHeaderRes.query.useraddress) {
+                    userAddress = checkJwtHeaderRes.query.useraddress;
+                }
+                if (checkJwtHeaderRes.query.filename) {
+                    fileName = fileUtility.getFileName(checkJwtHeaderRes.query.filename);
+                }
+            }
+            processTrack(res, body, fileName, userAddress);
+        } else {
+            res.write("{\"error\":1}");
+            res.end();
+        }
+        return;
     }
 
     if (req.body.hasOwnProperty("status")) {
@@ -406,7 +446,7 @@ app.get("/editor", function (req, res) {
         if (fileExt != null) {
             var fileName = docManager.createDemo((req.query.sample ? "sample." : "new.") + fileExt, userid, name);
 
-            var redirectPath = docManager.getProtocol() + "://" + docManager.req.get("host") + "/editor?fileName=" + encodeURIComponent(fileName) + docManager.getCustomParams();
+            var redirectPath = docManager.getServerUrl() + "/editor?fileName=" + encodeURIComponent(fileName) + docManager.getCustomParams();
             res.redirect(redirectPath);
             return;
         }
@@ -416,7 +456,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;
@@ -456,23 +500,25 @@ app.get("/editor", function (req, res) {
                 name: fileName,
                 ext: fileUtility.getFileExtension(fileName, true),
                 uri: url,
-                version: countVersion
+                version: countVersion,
+                created: new Date().toDateString()
             },
             editor: {
                 type: type,
                 documentType: fileUtility.getFileType(fileName),
                 key: key,
+                token: "",
                 callbackUrl: docManager.getCallback(fileName),
-                isEdit: canEdit,
+                isEdit: canEdit && mode != "review",
                 mode: canEdit && mode != "view" ? "edit" : "view",
                 canBackToFolder: type != "embedded",
-                getServerUrl: docManager.getServerUrl(),
+                getServerUrl: type == "embedded" ? null : "\"" + docManager.getServerUrl() + "\"",
                 curUserHostAddress: docManager.curUserHostAddress(),
                 lang: lang,
                 userid: userid,
                 name: name,
                 fileChoiceUrl: fileChoiceUrl,
-                plugins: plugins
+                plugins: JSON.stringify(plugins)
             },
             history: history,
             setHistoryData: {
@@ -481,7 +527,18 @@ app.get("/editor", function (req, res) {
             }
         };
 
-        res.render("editor", argss);
+        if (cfgSignatureEnable) {
+            app.render('config', argss, function(err, html){
+                if (err) {
+                    console.log(err);
+                } else {
+                    argss.editor.token = jwt.sign(JSON.parse("{"+html+"}"), cfgSignatureSecret, {expiresIn: cfgSignatureSecretExpiresIn});
+                }
+                res.render("editor", argss);
+              });
+        } else {
+              res.render("editor", argss);
+        }
     }
     catch (ex) {
         console.log(ex);
@@ -491,7 +548,7 @@ app.get("/editor", function (req, res) {
 });
 
 app.use(function (req, res, next) {
-    var err = new Error("Not Found");
+    const err = new Error("Not Found");
     err.status = 404;
     next(err);
 });

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

@@ -24,23 +24,25 @@
     "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",
         "path": "public"
       }
-    ]
+    ],
+    "token": {
+        "enable": false,
+        "useforrequest": true,
+        "algorithmRequest": "HS256",
+        "authorizationHeader": "Authorization",
+        "authorizationHeaderPrefix": "Bearer ",
+        "secret": "secret",
+        "expiresIn": "5m"
+    }
   },
   "plugins": {
-    "url": "../../../../sdkjs-plugins/",
-    "pluginsData": [
-		"helloworld/config.json",
-		"chess/config.json",
-		"speech/config.json",
-		"youtube/config.json",
-		"cbr/config.json",
-		"ocr/config.json",
-		"clipart/config.json"
-    ]
+    "url": "",
+    "pluginsData": []
   }
-}
+}

web/documentserver-example/nodejs/config/development-windows.json

@@ -2,22 +2,5 @@
   "server": {
     "port": 80,
     "siteUrl": "http://127.0.0.1:8001/"
-  },
-  "plugins": {
-    "pluginsData": [
-		"helloworld/config.json",
-		"chess/config.json",
-		"glavred/config.json",
-		"speech/config.json",
-		"youtube/config.json",
-		"cbr/config.json",
-		"num2word/config.json",
-		"ocr/config.json",
-		"yandextranslaterus/config.json",
-		"clipart/config.json",
-		"translate/config.json",
-		"templates/config.json"
-    ],
-    "UIpluginsData": []
   }
 }

web/documentserver-example/nodejs/config/production-linux.json

@@ -2,8 +2,5 @@
   "server": {
     "siteUrl": "/",
     "maxFileSize": 104857600
-  },
-  "plugins": {
-    "url": "/sdkjs-plugins/"
   }
 }

web/documentserver-example/nodejs/config/production-windows.json

@@ -7,15 +7,7 @@
         "name": "/public",
         "path": "public",
         "options": {"maxAge": "7d"}
-      },
-      {
-        "name": "/sdkjs-plugins",
-        "path": "sdkjs-plugins",
-        "options": {"maxAge": "7d"}
       }
     ]
-  },
-  "plugins": {
-    "url": "/sdkjs-plugins/"
   }
 }

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
@@ -23,15 +23,15 @@
  *
 */
 
-var path = require("path");
-var fileSystem = require("fs");
-var fileUtility = require("./fileUtility");
-var documentService = require("./documentService");
-var cacheManager = require("./cacheManager");
-var guidManager = require("./guidManager");
-var configServer = require('config').get('server');
-var storageFolder = configServer.get('storageFolder');
-var os = require("os");
+const path = require("path");
+const fileSystem = require("fs");
+const fileUtility = require("./fileUtility");
+const documentService = require("./documentService");
+const cacheManager = require("./cacheManager");
+const guidManager = require("./guidManager");
+const configServer = require('config').get('server');
+const storageFolder = configServer.get('storageFolder');
+const os = require("os");
 const readline = require('readline');
 
 const rl = readline.createInterface({
@@ -39,14 +39,14 @@ const rl = readline.createInterface({
   output: process.stdout
 });
 
-var docManager = {};
+let docManager = {};
 
 docManager.dir = null;
 docManager.req = null;
 docManager.res = null;
 
 docManager.existsSync = function(path) {
-    var res = true;
+    let res = true;
     try {
         fileSystem.accessSync(path, fileSystem.F_OK);
     } catch (e) {
@@ -77,34 +77,34 @@ docManager.getLang = function () {
 };
 
 docManager.getCustomParams = function () {
-    var params = "";
+    let params = "";
 
-    var userid = docManager.req.query.userid;
+	const userid = docManager.req.query.userid;
     params += (userid ? "&userid=" + userid : "");
 
-    var name = docManager.req.query.name;
+	const name = docManager.req.query.name;
     params += (name ? "&name=" + name : "");
 
-    var lang = docManager.req.query.lang;
+	const lang = docManager.req.query.lang;
     params += (lang ? "&lang=" + docManager.getLang() : "");
 
-    var fileName = docManager.req.query.fileName;
+	const fileName = docManager.req.query.fileName;
     params += (fileName ? "&fileName=" + fileName : "");
 
-    var mode = docManager.req.query.mode;
+	const mode = docManager.req.query.mode;
     params += (mode ? "&mode=" + mode : "");
 
-    var type = docManager.req.query.type;
+	const type = docManager.req.query.type;
     params += (type ? "&type=" + type : "");
 
     return params;
 };
 
 docManager.getCorrectName = function (fileName, userAddress) {
-    var baseName = fileUtility.getFileName(fileName, true);
-    var ext = fileUtility.getFileExtension(fileName);
-    var name = baseName + ext;
-    var index = 1;
+	const baseName = fileUtility.getFileName(fileName, true);
+	const ext = fileUtility.getFileExtension(fileName);
+    let name = baseName + ext;
+    let index = 1;
 
     while (this.existsSync(docManager.storagePath(name, userAddress))) {
         name = baseName + " (" + index + ")" + ext;
@@ -115,7 +115,7 @@ docManager.getCorrectName = function (fileName, userAddress) {
 };
 
 docManager.createDemo = function (demoName, userid, username) {
-    var fileName = docManager.getCorrectName(demoName);
+    const fileName = docManager.getCorrectName(demoName);
 
     docManager.copyFile(path.join(docManager.dir, "public", "samples", demoName), docManager.storagePath(fileName));
 
@@ -125,26 +125,26 @@ docManager.createDemo = function (demoName, userid, username) {
 };
 
 docManager.saveFileData = function (fileName, userid, username) {
-    var userAddress = docManager.curUserHostAddress();
-    var date_create = fileSystem.statSync(docManager.storagePath(fileName)).mtime;
-    var minutes = (date_create.getMinutes() < 10 ? '0' : '') + date_create.getMinutes().toString();
-    var month = (date_create.getMonth() < 10 ? '0' : '') + (parseInt(date_create.getMonth().toString()) + 1);
-    var sec = (date_create.getSeconds() < 10 ? '0' : '') + date_create.getSeconds().toString();
-    var date_format = date_create.getFullYear() + "-" + month + "-" + date_create.getDate() + " " + date_create.getHours() + ":" + minutes + ":" + sec;
+	const userAddress = docManager.curUserHostAddress();
+	const date_create = fileSystem.statSync(docManager.storagePath(fileName)).mtime;
+	const minutes = (date_create.getMinutes() < 10 ? '0' : '') + date_create.getMinutes().toString();
+	const month = (date_create.getMonth() < 10 ? '0' : '') + (parseInt(date_create.getMonth().toString()) + 1);
+	const sec = (date_create.getSeconds() < 10 ? '0' : '') + date_create.getSeconds().toString();
+	const date_format = date_create.getFullYear() + "-" + month + "-" + date_create.getDate() + " " + date_create.getHours() + ":" + minutes + ":" + sec;
 
-    var file_info = docManager.historyPath(fileName, userAddress, true);
+	const file_info = docManager.historyPath(fileName, userAddress, true);
     this.createDirectory(file_info);
 
     fileSystem.writeFileSync(path.join(file_info, fileName + ".txt"), date_format + "," + userid + "," + username);
 };
 
 docManager.getFileData = function (fileName, userAddress) {
-    var file_info = docManager.historyPath(fileName, userAddress, true);
-    if (!this.existsSync(file_info)) {
-        return ["2016-01-01", "uid-1", "John Smith"];
+    const history = path.join(docManager.historyPath(fileName, userAddress, true), fileName + ".txt");
+    if (!this.existsSync(history)) {
+        return ["2017-01-01", "uid-1", "John Smith"];
     }
 
-    return ((fileSystem.readFileSync(path.join(file_info, fileName + ".txt"))).toString()).split(",");
+    return ((fileSystem.readFileSync(history)).toString()).split(",");
 };
 
 docManager.getFileUri = function (fileName) {
@@ -152,10 +152,10 @@ docManager.getFileUri = function (fileName) {
 };
 
 docManager.getlocalFileUri = function (fileName, version) {
-    var serverPath = docManager.getProtocol() + "://" + docManager.req.get("host");
-    var storagePath = storageFolder.length ? storageFolder + "/" : "";
-    var hostAddress = docManager.curUserHostAddress();
-    var url = serverPath + "/" + storagePath + hostAddress + "/" + encodeURIComponent(fileName);
+	const serverPath = docManager.getServerUrl();
+	const storagePath = storageFolder.length ? storageFolder + "/" : "";
+	const hostAddress = docManager.curUserHostAddress();
+	const url = serverPath + "/" + storagePath + hostAddress + "/" + encodeURIComponent(fileName);
     if (!version) {
         return url;
     }
@@ -167,22 +167,22 @@ docManager.getServerUrl = function () {
 };
 
 docManager.getCallback = function (fileName) {
-    var server = docManager.getProtocol() + "://" + docManager.req.get("host");
-    var hostAddress = docManager.curUserHostAddress();
-    var handler = "/track?useraddress=" + encodeURIComponent(hostAddress) + "&filename=" + encodeURIComponent(fileName);
+	const server = docManager.getServerUrl();
+	const hostAddress = docManager.curUserHostAddress();
+	const handler = "/track?filename=" + encodeURIComponent(fileName) + "&useraddress=" + encodeURIComponent(hostAddress);
 
     return server + handler;
 };
 
 docManager.storagePath = function (fileName, userAddress) {
     fileName = fileUtility.getFileName(fileName);
-    var directory = path.join(docManager.dir, "public", storageFolder, docManager.curUserHostAddress(userAddress));
+    const directory = path.join(docManager.dir, "public", storageFolder, docManager.curUserHostAddress(userAddress));
     this.createDirectory(directory);
     return path.join(directory, fileName);
 };
 
 docManager.historyPath = function (fileName, userAddress, create) {
-    var directory = path.join(docManager.dir, "public", storageFolder, docManager.curUserHostAddress(userAddress));
+    let directory = path.join(docManager.dir, "public", storageFolder, docManager.curUserHostAddress(userAddress));
     if (!this.existsSync(directory)) {
         return "";
     }
@@ -194,7 +194,7 @@ docManager.historyPath = function (fileName, userAddress, create) {
 };
 
 docManager.versionPath = function (fileName, userAddress, version) {
-    var historyPath = docManager.historyPath(fileName, userAddress, true);
+	const historyPath = docManager.historyPath(fileName, userAddress, true);
     return path.join(historyPath, "" + version);
 };
 
@@ -219,17 +219,17 @@ docManager.changesUser = function (fileName, userAddress, version) {
 };
 
 docManager.getStoredFiles = function () {
-    var directory = path.join(docManager.dir, "public", storageFolder, docManager.curUserHostAddress());
+	const directory = path.join(docManager.dir, "public", storageFolder, docManager.curUserHostAddress());
     this.createDirectory(directory);
-    var result = [];
-    var storedFiles = fileSystem.readdirSync(directory);
-    for (var i = 0; i < storedFiles.length; i++) {
-        var stats = fileSystem.lstatSync(path.join(directory, storedFiles[i]));
+	const result = [];
+	const storedFiles = fileSystem.readdirSync(directory);
+    for (let i = 0; i < storedFiles.length; i++) {
+		const stats = fileSystem.lstatSync(path.join(directory, storedFiles[i]));
 
         if (!stats.isDirectory()) {
 
-            var time = stats.mtime.getTime();
-            var item = {
+			const time = stats.mtime.getTime();
+			const item = {
                 time: time,
                 name: storedFiles[i],
                 url: docManager.getlocalFileUri(storedFiles[i]),
@@ -239,7 +239,8 @@ docManager.getStoredFiles = function () {
             if (!result.length) {
                 result.push(item);
             } else {
-                for (var j = 0; j < result.length; j++) {
+                let j = 0;
+                for (; j < result.length; j++) {
                     if (time > result[j].time) {
                         break;
                     }
@@ -280,23 +281,23 @@ docManager.getInternalExtension = function (fileType) {
 };
 
 docManager.getKey = function (fileName) {
-    var userAddress = docManager.curUserHostAddress();
-    var key = userAddress + docManager.getlocalFileUri(fileName);
+	const userAddress = docManager.curUserHostAddress();
+    let key = userAddress + docManager.getlocalFileUri(fileName);
 
-    var historyPath = docManager.historyPath(fileName, userAddress);
+	let historyPath = docManager.historyPath(fileName, userAddress);
     if (historyPath != ""){
         key += docManager.countVersion(historyPath);
     }
 
     historyPath = docManager.historyPath(fileName, userAddress, true);
-    var stat = fileSystem.statSync(historyPath);
+    const stat = fileSystem.statSync(historyPath);
     key += stat.mtime.toString();
 
     return documentService.generateRevisionId(key);
 };
 
 docManager.getDate = function (date) {
-    var minutes = (date.getMinutes() < 10 ? '0' : '') + date.getMinutes().toString();
+    const minutes = (date.getMinutes() < 10 ? '0' : '') + date.getMinutes().toString();
     return date.getMonth() + "/" + date.getDate() + "/" + date.getFullYear() + " " + date.getHours() + ":" + minutes;
 };
 
@@ -305,7 +306,7 @@ docManager.getChanges = function (fileName) {
 };
 
 docManager.countVersion = function(directory) {
-    var i = 0;
+    let i = 0;
     while (this.existsSync(path.join(directory, '' + (i + 1)))) {
         i++;
     }
@@ -313,8 +314,8 @@ docManager.countVersion = function(directory) {
 };
 
 docManager.getHistory = function (fileName, content, keyVersion, version) {
-    var oldVersion = false;
-    var contentJson = null;
+    let oldVersion = false;
+    let contentJson = null;
     if (content) {
         if (content.changes) {
             contentJson = content.changes[0];
@@ -324,11 +325,11 @@ docManager.getHistory = function (fileName, content, keyVersion, version) {
         }
     }
 
-    var userAddress = docManager.curUserHostAddress();
-    var username = content ? (oldVersion ? contentJson.username : contentJson.user.name) : (docManager.getFileData(fileName, userAddress))[2];
-    var userid = content ? (oldVersion ? contentJson.userid : contentJson.user.id) : (docManager.getFileData(fileName, userAddress))[1];
-    var created = content ? (oldVersion ? contentJson.date : contentJson.created) : (docManager.getFileData(fileName, userAddress))[0];
-    var res = (content && !oldVersion) ? content : {changes: content};
+    const userAddress = docManager.curUserHostAddress();
+    const username = content ? (oldVersion ? contentJson.username : contentJson.user.name) : (docManager.getFileData(fileName, userAddress))[2];
+	const userid = content ? (oldVersion ? contentJson.userid : contentJson.user.id) : (docManager.getFileData(fileName, userAddress))[1];
+	const created = content ? (oldVersion ? contentJson.date : contentJson.created) : (docManager.getFileData(fileName, userAddress))[0];
+    const res = (content && !oldVersion) ? content : {changes: content};
     res.key = keyVersion;
     res.version = version;
     res.created = created;
@@ -340,4 +341,21 @@ docManager.getHistory = function (fileName, content, keyVersion, version) {
     return res;
 };
 
+docManager.cleanFolderRecursive = function (folder, me) {
+	if (fileSystem.existsSync(folder)) {
+		const files = fileSystem.readdirSync(folder);
+		files.forEach((file) => {
+			const curPath = path.join(folder, file);
+			if (fileSystem.lstatSync(curPath).isDirectory()) {
+				this.cleanFolderRecursive(curPath, true);
+			} else {
+				fileSystem.unlinkSync(curPath);
+			}
+		});
+		if (me) {
+			fileSystem.rmdirSync(folder);
+		}
+	}
+};
+
 module.exports = docManager;

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
@@ -24,62 +24,104 @@
 */
 
 var path = require("path");
+var urlModule = require("url");
 var urllib = require("urllib");
-var syncRequest = require("sync-request");
 var xml2js = require("xml2js");
+var jwt = require("jsonwebtoken");
+var jwa = require("jwa");
 var fileUtility = require("./fileUtility");
 var guidManager = require("./guidManager");
 var configServer = require('config').get('server');
 var siteUrl = configServer.get('siteUrl');
+var cfgSignatureEnable = configServer.get('token.enable');
+var cfgSignatureUseForRequest = configServer.get('token.useforrequest');
+var cfgSignatureAuthorizationHeader = configServer.get('token.authorizationHeader');
+var cfgSignatureAuthorizationHeaderPrefix = configServer.get('token.authorizationHeaderPrefix');
+var cfgSignatureSecretExpiresIn = configServer.get('token.expiresIn');
+var cfgSignatureSecret = configServer.get('token.secret');
+var cfgSignatureSecretAlgorithmRequest = configServer.get('token.algorithmRequest');
 
 var documentService = {};
 
-documentService.convertParams = "?url={0}&outputtype={1}&filetype={2}&title={3}&key={4}";
-documentService.commandParams = "?c={0}&key={1}";
 documentService.userIp = null;
 
-documentService.getConvertedUri = function (documentUri, fromExtension, toExtension, documentRevisionId) {
-    var xml = documentService.sendRequestToConvertService(documentUri, fromExtension, toExtension, documentRevisionId);
+documentService.getConvertedUriSync = function (documentUri, fromExtension, toExtension, documentRevisionId, callback) {
+    documentRevisionId = documentService.generateRevisionId(documentRevisionId || documentUri);
 
-    var res = documentService.getResponseUri(xml);
-
-    return res.value;
+    documentService.getConvertedUri(documentUri, fromExtension, toExtension, documentRevisionId, false, function (err, data) {
+        if (err) {
+            callback();
+            return;
+        }
+        var res = documentService.getResponseUri(data);
+        callback(res.value);
+    });
 };
 
-documentService.getConvertedUriAsync = function (documentUri, fromExtension, toExtension, documentRevisionId, callback) {
+documentService.getConvertedUri = function (documentUri, fromExtension, toExtension, documentRevisionId, async, callback) {
     fromExtension = fromExtension || fileUtility.getFileExtension(documentUri);
 
     var title = fileUtility.getFileName(documentUri) || guidManager.newGuid();
 
     documentRevisionId = documentService.generateRevisionId(documentRevisionId || documentUri);
 
-    var params = documentService.convertParams.format(
-    encodeURIComponent(documentUri),
-    toExtension.replace(".", ""),
-    fromExtension.replace(".", ""),
-    title,
-    documentRevisionId);
+    var params = {
+        async: async,
+        url: documentUri,
+        outputtype: toExtension.replace(".", ""),
+        filetype: fromExtension.replace(".", ""),
+        title: title,
+        key: documentRevisionId
+    };
 
-    urllib.request(siteUrl + configServer.get('converterUrl') + params, callback);
+    var uri = siteUrl + configServer.get('converterUrl');
+    var headers = {
+        'Content-Type': 'application/json'
+    };
+
+    if (cfgSignatureEnable && cfgSignatureUseForRequest) {
+        headers[cfgSignatureAuthorizationHeader] = cfgSignatureAuthorizationHeaderPrefix + this.fillJwtByUrl(uri, params);
+    }
+
+    urllib.request(uri,
+        {
+            method: "POST",
+            headers: headers,
+            data: params
+        },
+        callback);
 };
 
-documentService.getExternalUri = function (fileStream, contentLength, contentType, documentRevisionId) {
-    var params = documentService.convertParams.format("", "", "", "", documentRevisionId);
+documentService.getExternalUri = function (fileStream, contentLength, contentType, documentRevisionId, callback) {
+    documentRevisionId = documentService.generateRevisionId(documentRevisionId);
 
-    var urlTostorage = siteUrl + configServer.get('storageUrl') + params;
+    var urlTostorage = siteUrl + configServer.get('storageUrl') + "?key=" + documentRevisionId;
+    var headers = {
+        "Content-Type": contentType == null ? "application/octet-stream" : contentType,
+        "Content-Length": contentLength.toString(),
+        "charset": "utf-8"
+    };
 
-    var response = syncRequest("POST", urlTostorage, {
-        headers: {
-            "Content-Type": contentType == null ? "application/octet-stream" : contentType,
-            "Content-Length": contentLength.toString(),
-            "charset": "utf-8"
+    if (cfgSignatureEnable && cfgSignatureUseForRequest) {
+        const hmac = jwa(cfgSignatureSecretAlgorithmRequest);
+        var payloadhash = hmac.sign(fileStream, cfgSignatureSecret);
+        headers[cfgSignatureAuthorizationHeader] = cfgSignatureAuthorizationHeaderPrefix + this.fillJwtByUrl(urlTostorage, undefined, undefined, payloadhash);
+    }
+
+    urllib.request(urlTostorage,
+        {
+            method: "POST",
+            headers: headers,
+            data: fileStream
         },
-        body: fileStream
-    });
-
-    var res = documentService.getResponseUri(response.body.toString());
-
-    return res.value;
+        function (err, data) {
+            if (err) {
+                callback();
+                return;
+            }
+            var res = documentService.getResponseUri(data);
+            callback(res.value);
+        });
 };
 
 documentService.generateRevisionId = function (expectedKey) {
@@ -92,34 +134,16 @@ documentService.generateRevisionId = function (expectedKey) {
     return key.substring(0, Math.min(key.length, 20));
 };
 
-documentService.sendRequestToConvertService = function (documentUri, fromExtension, toExtension, documentRevisionId) {
-    fromExtension = fromExtension || fileUtility.getFileExtension(documentUri);
-
-    var title = fileUtility.getFileName(documentUri) || guidManager.newGuid();
-
-    documentRevisionId = documentService.generateRevisionId(documentRevisionId || documentUri);
-
-    var params = documentService.convertParams.format(
-    encodeURIComponent(documentUri),
-    toExtension.replace(".", ""),
-    fromExtension.replace(".", ""),
-    title,
-    documentRevisionId);
-
-    var res = syncRequest("GET", siteUrl + configServer.get('converterUrl') + params);
-    return res.getBody("utf8");
-};
-
 documentService.processConvertServiceResponceError = function (errorCode) {
     var errorMessage = "";
     var errorMessageTemplate = "Error occurred in the ConvertService: ";
 
     switch (errorCode) {
         case -20:
-            errorMessage = errorMessageTemplate + "vkey deciphering error";
+            errorMessage = errorMessageTemplate + "Error encrypt signature";
             break;
         case -8:
-            errorMessage = errorMessageTemplate + "Error document VKey";
+            errorMessage = errorMessageTemplate + "Error document signature";
             break;
         case -7:
             errorMessage = errorMessageTemplate + "Error document request";
@@ -200,14 +224,50 @@ documentService.convertXmlStringToJson = function (xml) {
     return res;
 };
 
-documentService.commandRequest = function (method, documentRevisionId) {
+documentService.commandRequest = function (method, documentRevisionId, callback) {
     documentRevisionId = documentService.generateRevisionId(documentRevisionId);
-    var params = documentService.commandParams.format(
-    method,
-    documentRevisionId);
+    var params = {
+        c: method,
+        key: documentRevisionId
+    };
 
-    var res = syncRequest("GET", siteUrl + configServer.get('commandUrl') + params).getBody("utf8");
-    return JSON.parse(res).error;
+    var uri = siteUrl + configServer.get('commandUrl');
+    var headers = {
+        'Content-Type': 'application/json'
+    };
+    if (cfgSignatureEnable && cfgSignatureUseForRequest) {
+        headers[cfgSignatureAuthorizationHeader] = cfgSignatureAuthorizationHeaderPrefix + this.fillJwtByUrl(uri, params);
+    }
+
+    urllib.request(uri,
+        {
+            method: "POST",
+            headers: headers,
+            data: params
+        },
+        callback);
 };
 
+documentService.checkJwtHeader = function (req) {
+  var decoded = null;
+  var authorization = req.get(cfgSignatureAuthorizationHeader);
+  if (authorization && authorization.startsWith(cfgSignatureAuthorizationHeaderPrefix)) {
+    var token = authorization.substring(cfgSignatureAuthorizationHeaderPrefix.length);
+    try {
+      decoded = jwt.verify(token, cfgSignatureSecret);
+    } catch (err) {
+        console.log('checkJwtHeader error: name = ' + err.name + ' message = ' + err.message + ' token = ' + token)
+    }
+  }
+  return decoded;
+}
+
+documentService.fillJwtByUrl = function (uri, opt_dataObject, opt_iss, opt_payloadhash) {
+  var parseObject = urlModule.parse(uri, true);
+  var payload = {query: parseObject.query, payload: opt_dataObject, payloadhash: opt_payloadhash};
+
+  var options = {algorithm: cfgSignatureSecretAlgorithmRequest, expiresIn: cfgSignatureSecretExpiresIn, issuer: opt_iss};
+  return jwt.sign(payload, cfgSignatureSecret, options);
+}
+
 module.exports = documentService;

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

web/documentserver-example/nodejs/package.json

@@ -14,16 +14,18 @@
     "url": "https://github.com/ONLYOFFICE/document-server-integration/issues"
   },
   "dependencies": {
-    "body-parser": "~1.15.2",
+    "body-parser": "^1.16.1",
     "config": "^1.21.0",
     "debug": "~2.2.0",
     "ejs": "~2.5.1",
-    "express": "^4.14.0",
-    "formidable": "~1.0.17",
+    "express": "^4.14.1",
+    "formidable": "^1.1.1",
+    "jsonwebtoken": "^7.1.9",
+    "jwa": "^1.1.4",
     "log4js": "^0.6.38",
     "serve-favicon": "~2.3.0",
-    "sync-request": "~3.0.1",
-    "urllib": "~2.11.0",
+    "sync-request": "^4.0.1",
+    "urllib": "^2.20.0",
     "xml2js": "~0.4.17"
   },
   "license": "MIT",

web/documentserver-example/nodejs/public/javascripts/jscript.js

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
@@ -25,12 +25,12 @@
 
 var language;
 var userid;
-var name;
+var username;
 
 if (typeof jQuery != "undefined") {
     jq = jQuery.noConflict();
 
-    name = getUrlVars()["name"];
+    username = getUrlVars()["name"];
     userid = getUrlVars()["userid"];
     language = getUrlVars()["lang"];
 
@@ -41,26 +41,26 @@ if (typeof jQuery != "undefined") {
 
 
     jq("#language").change(function() {
-        var name = jq('#user option:selected').text();
-        window.location = "?lang=" + jq(this).val() + "&userid=" + userid + "&name=" + name;
+        var username = jq('#user option:selected').text();
+        window.location = "?lang=" + jq(this).val() + "&userid=" + userid + "&name=" + username;
     });
-    
+
 
     if ("" != userid && undefined != userid)
         jq("#user").val(userid);
     else
         userid = jq("#user").val();
 
-    if ("" != name && undefined != name) {
-        name=getUrlVars()["name"];
+    if ("" != username && undefined != username) {
+        username = getUrlVars()["name"];
     }
     else {
-        name = jq('#user option:selected').text();
+        username = jq('#user option:selected').text();
     }
 
     jq("#user").change(function() {
-        var name = jq('#user option:selected').text();
-        window.location = "?lang=" + language + "&userid=" + jq(this).val() + "&name=" + name;
+        var username = jq('#user option:selected').text();
+        window.location = "?lang=" + language + "&userid=" + jq(this).val() + "&name=" + username;
     });
 
     jq(function () {
@@ -198,7 +198,7 @@ if (typeof jQuery != "undefined") {
 
     jq(document).on("click", "#beginEdit:not(.disable)", function () {
         var fileId = encodeURIComponent(jq('#hiddenFileName').val());
-        var url = UrlEditor + "?fileName=" + fileId + "&lang=" + language + "&userid=" + userid + "&name=" + name;
+        var url = UrlEditor + "?fileName=" + fileId + "&lang=" + language + "&userid=" + userid + "&name=" + username;
         window.open(url, "_blank");
         jq('#hiddenFileName').val("");
         jq.unblockUI();
@@ -207,7 +207,7 @@ if (typeof jQuery != "undefined") {
 
     jq(document).on("click", "#beginView:not(.disable)", function () {
         var fileId = encodeURIComponent(jq('#hiddenFileName').val());
-        var url = UrlEditor + "?mode=view&fileName=" + fileId + "&lang=" + language + "&userid=" + userid + "&name=" + name;
+        var url = UrlEditor + "?mode=view&fileName=" + fileId + "&lang=" + language + "&userid=" + userid + "&name=" + username;
         window.open(url, "_blank");
         jq('#hiddenFileName').val("");
         jq.unblockUI();
@@ -216,7 +216,7 @@ if (typeof jQuery != "undefined") {
 
     jq(document).on("click", "#beginEmbedded:not(.disable)", function () {
         var fileId = encodeURIComponent(jq('#hiddenFileName').val());
-        var url = UrlEditor + "?type=embedded&fileName=" + fileId + "&lang=" + language + "&userid=" + userid + "&name=" + name;
+        var url = UrlEditor + "?type=embedded&fileName=" + fileId + "&lang=" + language + "&userid=" + userid + "&name=" + username;
 
         jq("#mainProgress").addClass("embedded");
         jq("#beginEmbedded").addClass("disable");

web/documentserver-example/nodejs/public/stylesheets/editor.css

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

web/documentserver-example/nodejs/public/stylesheets/stylesheet.css

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
@@ -288,7 +288,7 @@ footer {
     background-repeat: no-repeat;
     display: inline-block;
     height: 16px;
-    max-width: 450px;
+    max-width: 250px;
     margin-bottom: -6px;
     overflow: hidden;
     padding: 8px 0 1px 34px;

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

@@ -0,0 +1,46 @@
+"width": "100%",
+"height": "100%",
+"type": "<%= editor.type %>",
+"documentType": "<%= editor.documentType %>",
+"token": "<%= editor.token %>",
+"document": {
+    "title": "<%= file.name %>",
+    "url": "<%= file.uri %>",
+    "fileType": "<%= file.ext %>",
+    "key": "<%= editor.key %>",
+    "info": {
+        "author": "Me",
+        "created": "<%= file.created %>"
+    },
+    "permissions": {
+        "download": true,
+        "edit": "<%= editor.isEdit %>",
+        "review": true
+    }
+},
+"editorConfig": {
+    "mode": "<%= editor.mode %>",
+    "lang": "<%= editor.lang %>",
+    "callbackUrl": "<%- editor.callbackUrl %>",
+    "user": {
+        "id": "<%= editor.userid %>",
+        "name": "<%= editor.name %>"
+    },
+    "embedded": {
+        "saveUrl": "<%= file.uri %>",
+        "embedUrl": "<%= file.uri %>",
+        "shareUrl": "<%= file.uri %>",
+        "toolbarDocked": "top"
+    },
+    "customization": {
+        "about": true,
+        "chat": true,
+        "comments": true,
+        "feedback": true,
+        "goback": {
+            "url": <%- editor.getServerUrl %>
+        }
+    },
+    "fileChoiceUrl": "<%= editor.fileChoiceUrl %>",
+    "plugins": <%- editor.plugins %>
+}

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

@@ -1,6 +1,6 @@
 <!--*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
@@ -28,7 +28,9 @@
 <head runat="server">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="mobile-web-app-capable" content="yes" />
     <title>ONLYOFFICE</title>
     <link rel="icon" href="images/favicon.ico" type="image/x-icon" />
     <link rel="stylesheet" type="text/css" href="stylesheets/editor.css" />
@@ -42,8 +44,6 @@
     <script type="text/javascript" language="javascript">
 
         var docEditor;
-        var fileName = "<%= file.name %>";
-        var fileType = "<%= file.ext %>";
 
         var innerAlert = function (message) {
             if (console && console.log)
@@ -94,54 +94,13 @@
                 innerAlert(event.data);
         };
 
+        var onOutdatedVersion = function (event) {
+            location.reload(true);
+        };
+
         var connectEditor = function () {
 
-            docEditor = new DocsAPI.DocEditor("iframeEditor",
-                {
-                    width: "100%",
-                    height: "100%",
-                    type: "<%= editor.type %>",
-                    documentType: "<%= editor.documentType %>",
-                    document: {
-                        title: fileName,
-                        url: "<%= file.uri %>",
-                        fileType: fileType,
-                        key: "<%= editor.key %>",
-                        info: {
-                            author: "Me",
-                            created: new Date().toDateString()
-                        },
-                        permissions: {
-                            edit: "<%= editor.isEdit %>" == "true",
-                            download: true
-                        }   
-                    },
-                    editorConfig: {
-                        mode: "<%= editor.mode %>",
-                        lang: "<%= editor.lang %>",
-                        callbackUrl: "<%- editor.callbackUrl %>",
-                        user: {
-                            id: "<%= editor.userid %>",
-                            name: "<%= editor.name %>",
-                        },
-                        embedded: {
-                            saveUrl: "<%= file.uri %>",
-                            embedUrl: "<%= file.uri %>",
-                            shareUrl: "<%= file.uri %>",
-                            toolbarDocked: "top"
-                        },
-                        customization: {
-                            about: true,
-                            chat: true,
-                            comments: true,
-                            feedback: true,
-                            goback: {
-                                url: ("<%= editor.type %>" == "embedded" ? null : "<%= editor.getServerUrl %>")
-                            }
-                        },
-                        fileChoiceUrl: "<%= editor.fileChoiceUrl %>",
-                        plugins: <%- JSON.stringify(editor.plugins) %>
-                    },
+            docEditor = new DocsAPI.DocEditor("iframeEditor", {<% include config %>,
                     events: {
                         "onReady": onReady,
                         "onDocumentStateChange": onDocumentStateChange,
@@ -149,7 +108,8 @@
                         "onError": onError,
                         "onRequestHistory":  onRequestHistory,
                         "onRequestHistoryData": onRequestHistoryData,
-                        "onRequestHistoryClose": onRequestHistoryClose
+                        "onRequestHistoryClose": onRequestHistoryClose,
+                        "onOutdatedVersion": onOutdatedVersion,
                     }
             });
         };

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

@@ -1,6 +1,6 @@
 <!--*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
@@ -129,7 +129,7 @@
                     <thead>
                         <tr class="tableHeader">
                             <td class="tableHeaderCell tableHeaderCellFileName">Filename</td>
-                            <td colspan="2" class="tableHeaderCell contentCells-shift">Editors</td>
+                            <td colspan="3" class="tableHeaderCell contentCells-shift">Editors</td>
                             <td colspan="3" class="tableHeaderCell">Viewers</td>
                         </tr>
                     </thead>
@@ -137,7 +137,7 @@
                         <% for (var i = 0; i < storedFiles.length; i++) { %>
                             <tr class="tableRow" title="<%=storedFiles[i].name%>">
                                 <td class="contentCells">
-                                    <a class="stored-edit <%= storedFiles[i].documentType%>" href="editor?fileName=<%= encodeURIComponent(storedFiles[i].name) + params %>" target="_blank">
+                                    <a class="stored-edit <%= storedFiles[i].documentType %>" href="editor?fileName=<%= encodeURIComponent(storedFiles[i].name) + params %>" target="_blank">
                                         <span title="<%= storedFiles[i].url %>"><%= storedFiles[i].name %></span></a>
                                     <a href="<%= storedFiles[i].url %>">
                                         <img class="icon-download" src="images/download-24.png" alt="Download" title="Download" /></a>
@@ -145,15 +145,21 @@
                                         <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-shift contentCells-icon">
+                                <td class="contentCells contentCells-icon">
                                     <a href="editor?type=mobile&mode=edit&fileName=<%= encodeURIComponent(storedFiles[i].name) + params %>" target="_blank">
                                         <img src="images/mobile-24.png" alt="Open in editor for mobile devices" title="Open in editor for mobile devices" /></a>
                                 </td>
+                                <td class="contentCells contentCells-shift contentCells-icon">
+                                    <% if (storedFiles[i].documentType == "text") { %>
+                                    <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">
@@ -221,7 +227,7 @@
 
     <span id="loadScripts" data-docs="<%= preloaderUrl %>"></span>
 
-    <footer>&copy; Ascensio Systems Inc 2016. All rights reserved.</footer>
+    <footer>&copy; Ascensio Systems Inc 2017. All rights reserved.</footer>
 
     <script type="text/javascript" src="javascripts/jquery-1.8.2.js"></script>
     <script type="text/javascript" src="javascripts/jquery-ui.js"></script>

web/documentserver-example/php/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 ONLYOFFICE
+Copyright (c) 2017 ONLYOFFICE
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

web/documentserver-example/php/common.php

@@ -1,7 +1,7 @@
 <?php
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
@@ -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,10 @@ $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['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/css/stylesheet.css

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
@@ -291,7 +291,7 @@ footer {
     background-repeat: no-repeat;
     display: inline-block;
     height: 16px;
-    max-width: 450px;
+    max-width: 250px;
     margin-bottom: -6px;
     overflow: hidden;
     padding: 8px 0 1px 34px;

web/documentserver-example/php/doceditor.php

@@ -1,7 +1,7 @@
 <?php
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
@@ -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,10 +69,11 @@
     }
 
     function getCallbackUrl($fileName) {
-        return serverPath() . '/'
+        return serverPath(TRUE) . '/'
                     . "webeditor-ajax.php"
-                    . "?type=track&userAddress=" . getClientIp()
-                    . "&fileName=" . urlencode($fileName);
+                    . "?type=track"
+                    . "&fileName=" . urlencode($fileName)
+                    . "&userAddress=" . getClientIp();
     }
 
 ?>
@@ -145,6 +145,10 @@
                 innerAlert(event.data);
         };
 
+        var onOutdatedVersion = function (event) {
+            location.reload(true);
+        };
+
         var сonnectEditor = function () {
 
             <?php
@@ -153,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,
@@ -174,8 +182,9 @@
                         },
 
                         permissions: {
-                            edit: <?php echo (in_array(strtolower('.' . pathinfo($filename, PATHINFO_EXTENSION)), $GLOBALS['DOC_SERV_EDITED']) ? "true" : "false") ?>,
                             download: true,
+                            edit: <?php echo (in_array(strtolower('.' . pathinfo($filename, PATHINFO_EXTENSION)), $GLOBALS['DOC_SERV_EDITED']) && $_GET["action"] != "review" ? "true" : "false") ?>,
+                            review: true
                         }
                     },
                     editorConfig: {
@@ -188,9 +197,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",
                         },
 
@@ -207,6 +216,7 @@
                         'onDocumentStateChange': onDocumentStateChange,
                         'onRequestEditRights': onRequestEditRights,
                         'onError': onError,
+                        'onOutdatedVersion': onOutdatedVersion,
                     }
                 });
         };

web/documentserver-example/php/functions.php

@@ -1,7 +1,7 @@
 <?php
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
@@ -100,23 +100,6 @@ function DoUpload($fileUri) {
 }
 
 
-function generateUrlToConverter($document_uri, $from_extension, $to_extension, $title, $document_revision_id, $is_async) {
-    $urlToConverterParams = array(
-                                "url" => $document_uri,
-                                "outputtype" => trim($to_extension,'.'),
-                                "filetype" => trim($from_extension, '.'),
-                                "title" => $title,
-                                "key" => $document_revision_id);
-
-    $urlToConverter = $GLOBALS['DOC_SERV_CONVERTER_URL'] . "?" . http_build_query($urlToConverterParams);
-
-    if ($is_async)
-        $urlToConverter = $urlToConverter . "&async=true";
-
-    return $urlToConverter;
-}
-
-
 function generateUrlToStorage($document_uri, $from_extension, $to_extension, $title, $document_revision_id) {
 
     return $GLOBALS['DOC_SERV_STORAGE_URL'] . "?" . http_build_query(
@@ -221,16 +204,29 @@ function SendRequestToConvertService($document_uri, $from_extension, $to_extensi
 
     $document_revision_id = GenerateRevisionId($document_revision_id);
 
-    $urlToConverter = generateUrlToConverter($document_uri, $from_extension, $to_extension, $title, $document_revision_id, $is_async);
+    $urlToConverter = $GLOBALS['DOC_SERV_CONVERTER_URL'];
+
+    $data = json_encode(
+        array(
+            "async" => $is_async,
+            "url" => $document_uri,
+            "outputtype" => trim($to_extension,'.'),
+            "filetype" => trim($from_extension, '.'),
+            "title" => $title,
+            "key" => $document_revision_id
+        )
+    );
 
     $response_xml_data;
     $countTry = 0;
 
     $opts = array('http' => array(
-            'method'  => 'GET',
-            'timeout' => $GLOBALS['DOC_SERV_TIMEOUT'] 
-        )
-    );
+                'method'  => 'POST',
+                'timeout' => $GLOBALS['DOC_SERV_TIMEOUT'],
+                'header'=> "Content-type: application/json\r\n",
+                'content' => $data
+            )
+        );
 
     if (substr($urlToConverter, 0, strlen("https")) === "https") {
         $opts['ssl'] = array( 'verify_peer'   => FALSE );
@@ -253,8 +249,8 @@ function SendRequestToConvertService($document_uri, $from_extension, $to_extensi
     if (!function_exists('simplexml_load_file')){
          throw new Exception("Server can't read xml");
     }
-    $data = simplexml_load_string($response_xml_data);
-    if (!$data) {
+    $response_data = simplexml_load_string($response_xml_data);
+    if (!$response_data) {
         $exc = "Bad Response. Errors: ";
         foreach(libxml_get_errors() as $error) {
             $exc = $exc . "\t" . $error->message;
@@ -262,7 +258,7 @@ function SendRequestToConvertService($document_uri, $from_extension, $to_extensi
         throw new Exception ($exc);
     }
 
-    return $data;
+    return $response_data;
 }
 
 

web/documentserver-example/php/index.php

@@ -1,7 +1,7 @@
 <?php
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
@@ -163,7 +163,7 @@
                             <thead>
                                 <tr class="tableHeader">
                                     <td class="tableHeaderCell tableHeaderCellFileName">Filename</td>
-                                    <td colspan="2" class="tableHeaderCell contentCells-shift">Editors</td>
+                                    <td colspan="3" class="tableHeaderCell contentCells-shift">Editors</td>
                                     <td colspan="3" class="tableHeaderCell">Viewers</td>
                                 </tr>
                             </thead>
@@ -184,17 +184,23 @@
                                     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>';
-                                    echo ' <td class="contentCells contentCells-shift contentCells-icon">';
+                                    echo ' <td class="contentCells contentCells-icon">';
                                     echo '  <a href="doceditor.php?fileID='.urlencode($storeFile->name).'&user='.$user.'&type=mobile" target="_blank">';
                                     echo '   <img src="css/images/mobile-24.png" alt="Open in editor for mobile devices" title="Open in editor for mobile devices" /></a>';
                                     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&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/js/jscript.js

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

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

@@ -1,7 +1,7 @@
 <?php
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
@@ -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();
@@ -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/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 ONLYOFFICE
+Copyright (c) 2017 ONLYOFFICE
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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
 

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,
                     },
                 });
     };

web/welcome/css/stylesheet.css

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 

web/welcome/index.html

@@ -3,7 +3,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <!--*
  *
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2017
  *
  * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
  * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
@@ -89,6 +89,6 @@ onlyoffice4enterprise/documentserver-ee</pre>
         </div>
     </div>
 
-    <footer>© Ascensio Systems Inc 2016. All rights reserved.</footer>
+    <footer>© Ascensio Systems Inc 2017. All rights reserved.</footer>
 </body>
 </html>