From 77dca8e6abdc7cd7daa136fe0194d084961a1b30 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Fri, 19 Jul 2019 13:08:19 +0100
Subject: [PATCH] FEAT #11292 TIME 0:20 create folders table + doc
---
sql/develop.sql | 16 ++++++++++++++++
sql/structure.sql | 12 ++++++++++++
.../convert/controllers/ConvertPdfController.php | 10 +++++-----
3 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/sql/develop.sql b/sql/develop.sql
index 91795e97113..7a179c3e3f6 100755
--- a/sql/develop.sql
+++ b/sql/develop.sql
@@ -60,3 +60,19 @@ ALTER TABLE res_letterbox DROP COLUMN IF EXISTS tnl_result;
ALTER TABLE res_attachments DROP COLUMN IF EXISTS tnl_result;
ALTER TABLE res_version_attachments DROP COLUMN IF EXISTS tnl_result;
ALTER TABLE usergroups DROP COLUMN IF EXISTS enabled;
+
+/* FOLDERS */
+
+ALTER TABLE folders RENAME TO folder_tmp;
+
+CREATE TABLE folders
+(
+ id serial NOT NULL,
+ label character varying(255) NOT NULL,
+ public boolean NOT NULL,
+ sharing jsonb DEFAULT '{"entities" : []}',
+ user_id INTEGER NOT NULL,
+ parent_id INTEGER,
+ CONSTRAINT folders_pkey PRIMARY KEY (id)
+)
+WITH (OIDS=FALSE);
diff --git a/sql/structure.sql b/sql/structure.sql
index a4fff8d9edd..b72b9d0f026 100755
--- a/sql/structure.sql
+++ b/sql/structure.sql
@@ -636,6 +636,18 @@ CREATE TABLE folders
)
WITH (OIDS=FALSE);
+-- CREATE TABLE folders
+-- (
+-- id serial NOT NULL,
+-- label character varying(255) NOT NULL,
+-- public boolean NOT NULL,
+-- sharing jsonb DEFAULT '{"entities" : []}',
+-- user_id INTEGER NOT NULL,
+-- parent_id INTEGER,
+-- CONSTRAINT folders_pkey PRIMARY KEY (id)
+-- )
+-- WITH (OIDS=FALSE);
+
CREATE SEQUENCE foldertype_id_id_seq
INCREMENT 1
MINVALUE 1
diff --git a/src/app/convert/controllers/ConvertPdfController.php b/src/app/convert/controllers/ConvertPdfController.php
index 35d64d13059..92818f6dbc1 100755
--- a/src/app/convert/controllers/ConvertPdfController.php
+++ b/src/app/convert/controllers/ConvertPdfController.php
@@ -14,7 +14,6 @@
namespace Convert\controllers;
-
use Attachment\models\AttachmentModel;
use Convert\models\AdrModel;
use Docserver\controllers\DocserverController;
@@ -37,7 +36,7 @@ class ConvertPdfController
$tmpPath = CoreConfigModel::getTmpPath();
- self::addBom($aArgs['fullFilename']);
+ ConvertPdfController::addBom($aArgs['fullFilename']);
$command = "unoconv -f pdf " . escapeshellarg($aArgs['fullFilename']);
exec('export HOME=' . $tmpPath . ' && '.$command.' 2>&1', $output, $return);
@@ -93,7 +92,7 @@ class ConvertPdfController
copy($pathToDocument, $tmpPath.$fileNameOnTmp.'.'.$docInfo["extension"]);
if (strtolower($docInfo["extension"]) != 'pdf') {
- self::addBom($tmpPath.$fileNameOnTmp.'.'.$docInfo["extension"]);
+ ConvertPdfController::addBom($tmpPath.$fileNameOnTmp.'.'.$docInfo["extension"]);
$command = "unoconv -f pdf " . escapeshellarg($tmpPath.$fileNameOnTmp.'.'.$docInfo["extension"]);
exec('export HOME=' . $tmpPath . ' && '.$command, $output, $return);
@@ -148,7 +147,7 @@ class ConvertPdfController
file_put_contents($tmpPath . $tmpFilename, base64_decode($aArgs['encodedResource']));
- self::addBom($tmpPath.$tmpFilename);
+ ConvertPdfController::addBom($tmpPath.$tmpFilename);
$command = "unoconv -f pdf {$tmpPath}{$tmpFilename}";
exec('export HOME=' . $tmpPath . ' && '.$command, $output, $return);
@@ -206,7 +205,8 @@ class ConvertPdfController
return $canConvert;
}
- public static function addBom($filePath) {
+ public static function addBom($filePath)
+ {
$extension = pathinfo($filePath, PATHINFO_EXTENSION);
if (strtolower($extension) == strtolower('txt')) {
$content = file_get_contents($filePath);
--
GitLab