Merge remote-tracking branch 'remotes/origin/feature/pdf-type' into release/v8.0.0

.gitmodules

@@ -5,7 +5,7 @@
 [submodule "web/documentserver-example/nodejs/public/assets/document-formats"]
 	path = web/documentserver-example/nodejs/public/assets/document-formats
 	url = https://github.com/ONLYOFFICE/document-formats
-	branch = master
+	branch = feature/v8.0
 [submodule "web/documentserver-example/csharp-mvc/assets/document-templates"]
 	path = web/documentserver-example/csharp-mvc/assets/document-templates
 	url = https://github.com/ONLYOFFICE/document-templates

web/documentserver-example/java-spring/checkstyle-suppressions.xml

@@ -10,4 +10,5 @@
     <suppress checks="JavadocPackage" files="."/>
     <suppress checks="JavadocVariable" files="."/>
     <suppress checks="MissingJavadocMethod" files="."/>
+    <suppress checks="MagicNumber" files="DefaultDocumentManager.java"/>
 </suppressions>

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/document/DefaultDocumentManager.java

@@ -20,11 +20,14 @@ package com.onlyoffice.integration.documentserver.managers.document;
 
 import com.onlyoffice.integration.documentserver.storage.FileStorageMutator;
 import com.onlyoffice.integration.documentserver.storage.FileStoragePathBuilder;
+import com.onlyoffice.integration.documentserver.util.Constants;
 import com.onlyoffice.integration.documentserver.util.file.FileUtility;
 import com.onlyoffice.integration.documentserver.util.service.ServiceConverter;
+import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Primary;
+import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Component;
 
 import java.io.File;
@@ -243,4 +246,52 @@ public class DefaultDocumentManager implements DocumentManager {
 
         return fileName;
     }
+
+    @SneakyThrows
+    public Boolean isExtendedPDFFile(final String fileName) {
+        Resource resource = storageMutator.loadFileAsResource(fileName);
+
+        byte[] bytes = resource.getInputStream().readNBytes(4096);
+
+        String pBuffer = new String(bytes, "Windows-1252");
+
+        int indexFirst = pBuffer.indexOf("%\315\312\322\251\015");
+        if (indexFirst == -1) {
+            return false;
+        }
+
+        String pFirst = pBuffer.substring(indexFirst + 6);
+
+        if (!pFirst.startsWith("1 0 obj\012<<\012")) {
+            return false;
+        }
+
+        pFirst = pFirst.substring(11);
+
+        int indexStream = pFirst.indexOf("stream\015\012");
+        int indexMeta = pFirst.indexOf(Constants.G_FORMAT_OFORM_PDF_META_TAG);
+
+        if (indexStream == -1 || indexMeta == -1 || indexStream < indexMeta) {
+            return false;
+        }
+
+        String pMeta = pFirst.substring(indexMeta);
+        pMeta = pMeta.substring(Constants.G_FORMAT_OFORM_PDF_META_TAG.length() + 3);
+
+        int indexMetaLast = pMeta.indexOf(" ");
+
+        if (indexMetaLast == -1) {
+            return false;
+        }
+
+        pMeta = pMeta.substring(indexMetaLast + 1);
+
+        indexMetaLast = pMeta.indexOf(" ");
+
+        if (indexMetaLast == -1) {
+            return false;
+        }
+
+        return true;
+    }
 }

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/document/DocumentManager.java

@@ -39,4 +39,5 @@ public interface DocumentManager {
     // create demo document
     String createDemo(String fileExt, Boolean sample, String uid, String uname) throws Exception;
     String getCreateUrl(String fileName, Boolean sample);  // get URL to the created file
+    Boolean isExtendedPDFFile(String fileName);
 }

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/Constants.java

@@ -27,6 +27,7 @@ public final class Constants {
     public static final Integer MAX_KEY_LENGTH = 20;
     public static final Integer ANONYMOUS_USER_ID = 4;
     public static final Integer KILOBYTE_SIZE = 1024;
+    public static final String G_FORMAT_OFORM_PDF_META_TAG = "ONLYOFFICEFORM";
 
     private Constants() { }
 }

web/documentserver-example/nodejs/app.js

@@ -994,19 +994,27 @@ app.get('/editor', (req, res) => { // define a handler for editing document
     if (!canEdit && mode === 'edit') {
       mode = 'view';
     }
-    const submitForm = mode === 'fillForms' && userid === 'uid-1';
+
+    let submitForm = false;
+    const ext = fileUtility.getFileExtension(fileName, true);
+    let isForm = 'null';
+    if (mode === 'fillForms') {
+      submitForm = userid === 'uid-1';
+      isForm = req.DocManager.isExtendedPDFFile(fileName);
+    }
 
     // file config data
     const argss = {
       apiUrl: siteUrl + configServer.get('apiUrl'),
       file: {
         name: fileName,
-        ext: fileUtility.getFileExtension(fileName, true),
+        ext: ext,
         uri: url,
         directUrl: !userDirectUrl ? null : directUrl,
         uriUser: directUrl,
         created: new Date().toDateString(),
         favorite: user.favorite != null ? user.favorite : 'null',
+        isForm: isForm,
       },
       editor: {
         type,

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

@@ -26,6 +26,7 @@
     "storagePath": "/files",
     "maxFileSize": 1073741824,
     "maxNameLength": 50,
+    "gFormatOformPdfMetaTag": "ONLYOFFICEFORM",
     "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",
     "token": {
         "enable": false,

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

@@ -381,6 +381,10 @@ DocManager.prototype.getInternalExtension = function getInternalExtension(fileTy
     return '.pptx';
   }
 
+  if (fileType === fileUtility.fileType.pdf) { // .pptx for pdf type
+    return '.pdf';
+  }
+
   return '.docx'; // the default value is .docx
 };
 
@@ -606,6 +610,59 @@ DocManager.prototype.getFilesInfo = function getFilesInfo(fileId) {
   } return responseArray;
 };
 
+DocManager.prototype.isExtendedPDFFile = function isExtendedPDFFile(fileName) {
+  let filePath = this.forcesavePath(fileName, null, false);
+  if (filePath === '') {
+    filePath = this.storagePath(fileName);
+  }
+
+  const bufferSize = 110;
+  const buffer = Buffer.alloc(bufferSize);
+  const fd = fileSystem.openSync(filePath, 'r');
+
+  fileSystem.readSync(fd, buffer, 0, bufferSize);
+  fileSystem.closeSync(fd);
+
+  const pBuffer = buffer.toString('latin1');
+
+  const indexFirst = pBuffer.indexOf('%\xCD\xCA\xD2\xA9\x0D');
+  if (indexFirst === -1) {
+    return false;
+  }
+
+  let pFirst = pBuffer.substring(indexFirst + 6);
+
+  if (!pFirst.startsWith('1 0 obj\x0A<<\x0A')) {
+    return false;
+  }
+
+  pFirst = pFirst.substring(11);
+
+  const indexStream = pFirst.indexOf('stream\x0D\x0A');
+  const indexMeta = pFirst.indexOf(configServer.get('gFormatOformPdfMetaTag'));
+
+  if (indexStream === -1 || indexMeta === -1 || indexStream < indexMeta) {
+    return false;
+  }
+
+  let pMeta = pFirst.substring(indexMeta);
+  pMeta = pMeta.substring(configServer.get('gFormatOformPdfMetaTag').length + 3);
+
+  let indexMetaLast = pMeta.indexOf(' ');
+  if (indexMetaLast === -1) {
+    return false;
+  }
+
+  pMeta = pMeta.substring(indexMetaLast + 1);
+
+  indexMetaLast = pMeta.indexOf(' ');
+  if (indexMetaLast === -1) {
+    return false;
+  }
+
+  return true;
+};
+
 DocManager.prototype.getInstanceId = function getInstanceId() {
   return this.getServerUrl();
 };

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

@@ -64,6 +64,7 @@ fileUtility.fileType = {
   word: 'word',
   cell: 'cell',
   slide: 'slide',
+  pdf: 'pdf',
 };
 
 fileUtility.getSuppotredExtensions = function getSuppotredExtensions() {

web/documentserver-example/nodejs/public/images/icon_pdf.svg

@@ -0,0 +1 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M2 1h8l4 4v10H2V1z" fill="#fff"/><path fill-rule="evenodd" clip-rule="evenodd" d="M14 5l-4-4H2v14h12V5zm-4-5l5 5v11H1V0h9z" fill="#BFBFBF"/><path fill="#9E1919" d="M3 10h10v4H3z"/><path d="M7 7V2H3v5h4zM8 3V2h2v1H8zM8 5V4h5v1H8zM13 6H8v1h5V6zM13 8H3v1h10V8z" fill="#BFBFBF"/><path opacity=".3" d="M9 1h1v3h4l1 1H9V1z" fill="#333"/></svg>

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

@@ -470,6 +470,11 @@ footer table tr td:first-child {
     background-image: url("../images/icon_pptx.svg");
 }
 
+.stored-edit.pdf,
+.uploadFileName.pdf {
+    background-image: url("../images/icon_pdf.svg");
+}
+
 .stored-edit span {
     font-size: 12px;
     line-height: 12px;

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

@@ -6,6 +6,7 @@
         "uploaded": "<%- file.created %>",
         "favorite": <%- file.favorite %>
     },
+    "isForm": <%- file.isForm %>,
     "key": "<%- editor.key %>",
     "permissions": {
         "chat": <%- editor.chat %>,