From a65101feb77d9f6111376630028d29c8094e2547 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 11 Apr 2017 10:19:36 +0200 Subject: [PATCH 1/4] fix syntax error --- SeedDMS_Core/package.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index 3c3fa4f33..3ad4401f7 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -1373,6 +1373,6 @@ SeedDMS_Core_DMS::getDuplicateDocumentContent() returns complete document - all changes from 4.3.34 merged - + From 0b2d663c56c988f06eb90ab176a457413b557883 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 11 Apr 2017 10:21:23 +0200 Subject: [PATCH 2/4] add empty notes in latest version --- SeedDMS_Core/package.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index de00b956c..c6f354b28 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -24,6 +24,7 @@ GPL License +??? From 1a901f47f32af21c22e79504de5b019462f7d2d5 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 20 Apr 2017 09:59:23 +0200 Subject: [PATCH 3/4] fix reges for mimetype --- op/op.Settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op/op.Settings.php b/op/op.Settings.php index e45084733..4db10939d 100644 --- a/op/op.Settings.php +++ b/op/op.Settings.php @@ -189,7 +189,7 @@ if ($action == "saveSettings") // SETTINGS - ADVANCED - INDEX CMD $settings->_converters['fulltext'] = $_POST["converters"]; - $newmimetype = preg_replace('#[^A-Za-z0-9_/+.-*]+#', '', $_POST["converters_newmimetype"]); + $newmimetype = preg_replace('#[^A-Za-z0-9_/+.*-]+#', '', $_POST["converters_newmimetype"]); if($newmimetype && trim($_POST["converters_newcmd"])) { $settings->_converters['fulltext'][$newmimetype] = trim($_POST["converters_newcmd"]); } From 5484c47ebde22cd6e2a5a3890ed50817e8e57518 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 20 Apr 2017 10:01:15 +0200 Subject: [PATCH 4/4] pass null as first parameter of hooks, will later be the controller --- op/op.UpdateDocument.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php index 25547ef9c..152272ac3 100644 --- a/op/op.UpdateDocument.php +++ b/op/op.UpdateDocument.php @@ -240,7 +240,7 @@ if ($_FILES['userfile']['error'] == 0) { if(isset($GLOBALS['SEEDDMS_HOOKS']['updateDocument'])) { foreach($GLOBALS['SEEDDMS_HOOKS']['updateDocument'] as $hookObj) { if (method_exists($hookObj, 'preUpdateDocument')) { - $hookObj->preUpdateDocument(array('name'=>&$name, 'comment'=>&$comment)); + $hookObj->preUpdateDocument(null, array('name'=>&$name, 'comment'=>&$comment)); } } } @@ -254,7 +254,7 @@ if ($_FILES['userfile']['error'] == 0) { if(isset($GLOBALS['SEEDDMS_HOOKS']['updateDocument'])) { foreach($GLOBALS['SEEDDMS_HOOKS']['updateDocument'] as $hookObj) { if (method_exists($hookObj, 'postUpdateDocument')) { - $hookObj->postUpdateDocument($document); + $hookObj->postUpdateDocument(null, $document); } } }