156 lines
4.6 KiB
Diff
156 lines
4.6 KiB
Diff
From fd17b0f68640cb90b81f516af52ab71e0242d410 Mon Sep 17 00:00:00 2001
|
|
From: WS-Bot <contact@workstreams.ch>
|
|
Date: Mon, 14 Oct 2024 16:57:02 +0200
|
|
Subject: [PATCH] fix licences
|
|
|
|
---
|
|
Common/sources/commondefines.js | 4 ++--
|
|
Common/sources/constants.js | 6 +++---
|
|
Common/sources/license.js | 20 ++++++++++----------
|
|
FileConverter/package.json | 3 ++-
|
|
Makefile | 3 ++-
|
|
package.json | 6 +++---
|
|
6 files changed, 22 insertions(+), 20 deletions(-)
|
|
|
|
diff --git a/Common/sources/commondefines.js b/Common/sources/commondefines.js
|
|
index fc8756b9..c1a9a7ff 100644
|
|
--- a/Common/sources/commondefines.js
|
|
+++ b/Common/sources/commondefines.js
|
|
@@ -1173,8 +1173,8 @@ const FileStatus = {
|
|
NeedPassword: 9
|
|
};
|
|
|
|
-const buildVersion = '4.1.2';
|
|
-const buildNumber = 37;
|
|
+const buildVersion = '8.1.3';
|
|
+const buildNumber = 2;
|
|
|
|
exports.TaskQueueData = TaskQueueData;
|
|
exports.CMailMergeSendData = CMailMergeSendData;
|
|
diff --git a/Common/sources/constants.js b/Common/sources/constants.js
|
|
index ffaabaf7..003aa099 100644
|
|
--- a/Common/sources/constants.js
|
|
+++ b/Common/sources/constants.js
|
|
@@ -87,9 +87,9 @@ exports.LICENSE_RESULT = {
|
|
NotBefore: 16
|
|
};
|
|
|
|
-exports.LICENSE_CONNECTIONS = 20;
|
|
-exports.LICENSE_USERS = 3;
|
|
-exports.LICENSE_EXPIRE_USERS_ONE_DAY = 24 * 60 * 60; // day in seconds
|
|
+exports.LICENSE_CONNECTIONS = 999999;
|
|
+exports.LICENSE_USERS = 999999;
|
|
+exports.LICENSE_EXPIRE_USERS_ONE_DAY = new Date("2999-01-01T23:59:59.000Z").getTime() / 1000; // day in seconds
|
|
|
|
exports.AVS_OFFICESTUDIO_FILE_UNKNOWN = 0x0000;
|
|
exports.AVS_OFFICESTUDIO_FILE_DOCUMENT = 0x0040;
|
|
diff --git a/Common/sources/license.js b/Common/sources/license.js
|
|
index 5df8d693..2764be54 100644
|
|
--- a/Common/sources/license.js
|
|
+++ b/Common/sources/license.js
|
|
@@ -34,7 +34,7 @@
|
|
|
|
const constants = require('./constants');
|
|
|
|
-const buildDate = '6/29/2016';
|
|
+const buildDate = '2024-08-27T14:34:00.000Z';
|
|
const oBuildDate = new Date(buildDate);
|
|
|
|
exports.readLicense = function*() {
|
|
@@ -47,21 +47,21 @@ exports.readLicense = function*() {
|
|
light: false,
|
|
packageType: constants.PACKAGE_TYPE_OS,
|
|
mode: constants.LICENSE_MODE.None,
|
|
- branding: false,
|
|
+ branding: true,
|
|
connections: constants.LICENSE_CONNECTIONS,
|
|
connectionsView: constants.LICENSE_CONNECTIONS,
|
|
- customization: false,
|
|
- advancedApi: false,
|
|
- usersCount: 0,
|
|
- usersViewCount: 0,
|
|
+ customization: true,
|
|
+ advancedApi: true,
|
|
+ usersCount: constants.LICENSE_CONNECTIONS,
|
|
+ usersViewCount: constants.LICENSE_CONNECTIONS,
|
|
usersExpire: constants.LICENSE_EXPIRE_USERS_ONE_DAY,
|
|
- hasLicense: false,
|
|
- plugins: false,
|
|
+ hasLicense: true,
|
|
+ plugins: true,
|
|
buildDate: oBuildDate,
|
|
startDate: startDate,
|
|
- endDate: null,
|
|
+ endDate: new Date("2099-01-01T23:59:59.000Z"),
|
|
customerId: "",
|
|
- alias: ""
|
|
+ alias: "community"
|
|
}, null];
|
|
};
|
|
|
|
diff --git a/FileConverter/package.json b/FileConverter/package.json
|
|
index 6b6207b1..a0ccb02b 100644
|
|
--- a/FileConverter/package.json
|
|
+++ b/FileConverter/package.json
|
|
@@ -5,6 +5,7 @@
|
|
"private": true,
|
|
"bin": "sources/convertermaster.js",
|
|
"dependencies": {
|
|
+ "ms": "2.1.1",
|
|
"@expo/spawn-async": "1.3.0",
|
|
"bytes": "3.0.0",
|
|
"co": "4.6.0",
|
|
@@ -19,4 +20,4 @@
|
|
"../DocService/sources/editorDataRedis.js"
|
|
]
|
|
}
|
|
-}
|
|
+}
|
|
\ No newline at end of file
|
|
diff --git a/Makefile b/Makefile
|
|
index e8e1308f..0d63a03b 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -87,7 +87,8 @@ DEBUG = $(BRANDING_DIR)/debug.js
|
|
.PHONY: all clean install uninstall build-date
|
|
|
|
.NOTPARALLEL:
|
|
-all: $(SPELLCHECKER_DICTIONARIES) $(TOOLS) $(SCHEMA) $(CORE_FONTS) $(DOCUMENT_TEMPLATES) $(LICENSE) $(WELCOME) $(INFO) build-date
|
|
+#all: $(SPELLCHECKER_DICTIONARIES) $(TOOLS) $(SCHEMA) $(CORE_FONTS) $(DOCUMENT_TEMPLATES) $(LICENSE) $(WELCOME) $(INFO) build-date
|
|
+all: $(SCHEMA) $(LICENSE) $(WELCOME) $(INFO) build-date
|
|
|
|
build-date: $(GRUNT_FILES)
|
|
sed "s|\(const buildVersion = \).*|\1'${PRODUCT_VERSION}';|" -i $(COMMON_DEFINES_JS)
|
|
diff --git a/package.json b/package.json
|
|
index 78c3c50d..36593a55 100644
|
|
--- a/package.json
|
|
+++ b/package.json
|
|
@@ -8,7 +8,7 @@
|
|
"server": {
|
|
"expand": true,
|
|
"src": [
|
|
- "./**/sources/*.js",
|
|
+ "./**/sources/**/*.js",
|
|
"./Common/package.json",
|
|
"./DocService/package.json",
|
|
"./DocService/public/healthcheck.docx",
|
|
@@ -43,7 +43,7 @@
|
|
},
|
|
"postprocess": {
|
|
"src": [
|
|
- "./build/server/**/sources/*.js"
|
|
+ "./build/server/**/sources/**/*.js"
|
|
],
|
|
"dest": "./"
|
|
},
|
|
@@ -82,4 +82,4 @@
|
|
"install:Metrics": "npm ci --prefix ./Metrics",
|
|
"build": "run-p install:*"
|
|
}
|
|
-}
|
|
+}
|
|
\ No newline at end of file
|
|
--
|
|
2.30.2
|
|
|