From 7b4e73713982209721ffb474b8db286602fe339b Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Fri, 2 Dec 2016 11:55:30 +0300
Subject: [PATCH] php: some changes

---
 web/documentserver-example/php/common.php     |  9 ++++++++-
 .../php/css/stylesheet.css                    |  3 ++-
 web/documentserver-example/php/doceditor.php  |  8 ++------
 web/documentserver-example/php/functions.php  |  1 -
 web/documentserver-example/php/web.config     | 20 +++----------------
 .../php/webeditor-ajax.php                    |  2 +-
 6 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/web/documentserver-example/php/common.php b/web/documentserver-example/php/common.php
index 26d90609..a1321e35 100644
--- a/web/documentserver-example/php/common.php
+++ b/web/documentserver-example/php/common.php
@@ -28,6 +28,7 @@
 <?php
 
 require_once( dirname(__FILE__) . '/config.php' );
+require_once( dirname(__FILE__) . '/functions.php' );
 
 function sendlog($msg, $logFileName) {
     file_put_contents($logFileName, $msg . PHP_EOL, FILE_APPEND);
@@ -249,7 +250,6 @@ function getFileExts() {
     return array_merge($GLOBALS['DOC_SERV_VIEWD'], $GLOBALS['DOC_SERV_EDITED'], $GLOBALS['DOC_SERV_CONVERT']);
 }
 
-
 function GetCorrectName($fileName) {
     $path_parts = pathinfo($fileName);
 
@@ -264,4 +264,11 @@ function GetCorrectName($fileName) {
     return $name;
 }
 
+function getDocEditorKey($fileName) {
+    $key = getCurUserHostAddress() . FileUri($fileName);
+    $stat = filemtime(getStoragePath($fileName));
+    $key = $key . $stat;
+    return GenerateRevisionId($key);
+}
+
 ?>
\ No newline at end of file
diff --git a/web/documentserver-example/php/css/stylesheet.css b/web/documentserver-example/php/css/stylesheet.css
index de7ae2fa..cde458e2 100644
--- a/web/documentserver-example/php/css/stylesheet.css
+++ b/web/documentserver-example/php/css/stylesheet.css
@@ -299,7 +299,7 @@ label .checkbox {
     max-width: 450px;
     margin-bottom: -6px;
     overflow: hidden;
-    padding: 4px 0 1px 34px;
+    padding: 8px 0 1px 34px;
     text-decoration: none;
     text-overflow: ellipsis;
     white-space: nowrap;
@@ -316,6 +316,7 @@ label .checkbox {
 .stored-edit span {
     font-size: 12px;
     line-height: 12px;
+    vertical-align: top;
 }
 .stored-edit:hover span {
     text-decoration: underline;
diff --git a/web/documentserver-example/php/doceditor.php b/web/documentserver-example/php/doceditor.php
index 88e3acd2..c4f9a4b5 100644
--- a/web/documentserver-example/php/doceditor.php
+++ b/web/documentserver-example/php/doceditor.php
@@ -85,10 +85,6 @@
         return $demoFilename;
     }
 
-    function getDocEditorKey($fileUri) {
-        return GenerateRevisionId(getCurUserHostAddress() . "/" . basename($fileUri));
-    }
-
     function getCallbackUrl($fileName) {
         return serverPath() . '/'
                     . "webeditor-ajax.php"
@@ -178,7 +174,7 @@
                         title: fileName,
                         url: "<?php echo $fileuri ?>",
                         fileType: fileType,
-                        key: "<?php echo getDocEditorKey($fileuri) ?>",
+                        key: "<?php echo getDocEditorKey($filename) ?>",
 
                         info: {
                             author: "Me",
@@ -214,7 +210,7 @@
                             about: true,
                             feedback: true,
                             goback: {
-                                url: "<?php echo serverPath() ?>/index.php",
+                                url: "<?php echo serverPath() ?>",
                             },
                         },
                     },
diff --git a/web/documentserver-example/php/functions.php b/web/documentserver-example/php/functions.php
index d1a55873..700bbc25 100644
--- a/web/documentserver-example/php/functions.php
+++ b/web/documentserver-example/php/functions.php
@@ -28,7 +28,6 @@
 <?php
 
 require_once( dirname(__FILE__) . '/config.php' );
-require_once( dirname(__FILE__) . '/common.php' );
 
 
 function GetExternalFileUri($local_uri) {
diff --git a/web/documentserver-example/php/web.config b/web/documentserver-example/php/web.config
index be06aade..c57ab48b 100644
--- a/web/documentserver-example/php/web.config
+++ b/web/documentserver-example/php/web.config
@@ -1,19 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <system.web>
-    <compilation debug="false" targetFramework="4.5">
-      <assemblies>
-        <remove assembly="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-      </assemblies>
-    </compilation>
+  <system.web>
     <customErrors mode="Off"/>
   </system.web>
   <system.webServer>
-    <httpProtocol>
-      <customHeaders>
-        <add name="Cache-Control" value="max-age=300, must-revalidate"/>
-      </customHeaders>
-    </httpProtocol>
     <security>
       <requestFiltering>
         <requestLimits maxAllowedContentLength="300000000">
@@ -23,13 +13,9 @@
         </requestLimits>
       </requestFiltering>
     </security>
-    <modules>
-
-    </modules>
-    <defaultDocument enabled="true">
-    </defaultDocument>
+    <modules/>
+    <defaultDocument enabled="true" />
     <httpErrors errorMode="Detailed"/>
-
     <urlCompression doDynamicCompression="false"/>
   </system.webServer>
 </configuration>
diff --git a/web/documentserver-example/php/webeditor-ajax.php b/web/documentserver-example/php/webeditor-ajax.php
index 5de69288..3df4dea9 100644
--- a/web/documentserver-example/php/webeditor-ajax.php
+++ b/web/documentserver-example/php/webeditor-ajax.php
@@ -181,7 +181,7 @@ function convert() {
         if ($fileUri == "") {
             $fileUri = FileUri($fileName);
         }
-        $key = GenerateRevisionId($fileUri);
+        $key = getDocEditorKey($fileName);
 
         $newFileUri;
         $result;