From 29c5ae0f51b85f2d382abfb02e55449ce1f13a3b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 3 Mar 2017 10:32:41 +0100 Subject: [PATCH 1/2] pass null for controller when calling hook preIndexDocument --- op/op.Ajax.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op/op.Ajax.php b/op/op.Ajax.php index 766bb6a93..daea4c29e 100644 --- a/op/op.Ajax.php +++ b/op/op.Ajax.php @@ -686,7 +686,7 @@ switch($command) { if(isset($GLOBALS['SEEDDMS_HOOKS']['addDocument'])) { foreach($GLOBALS['SEEDDMS_HOOKS']['addDocument'] as $hookObj) { if (method_exists($hookObj, 'preIndexDocument')) { - $hookObj->preIndexDocument($document, $idoc); + $hookObj->preIndexDocument(null, $document, $idoc); } } } From 02e016d74ceb7a82b0d675e844c85a2772dc9232 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 3 Mar 2017 10:34:46 +0100 Subject: [PATCH 2/2] use utf8_basename() instead of basename() --- op/op.Ajax.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/op/op.Ajax.php b/op/op.Ajax.php index 7bb728f34..3aade023b 100644 --- a/op/op.Ajax.php +++ b/op/op.Ajax.php @@ -562,7 +562,7 @@ switch($command) { if (!empty($_POST["name"])) $name = $_POST["name"]; else - $name = basename($userfilename); + $name = utf8_basename($userfilename); /* Check if name already exists in the folder */ if(!$settings->_enableDuplicateDocNames) { @@ -631,7 +631,7 @@ switch($command) { $filesize = SeedDMS_Core_File::fileSize($userfiletmp); $res = $folder->addDocument($name, '', $expires, $user, '', - array(), $userfiletmp, basename($userfilename), + array(), $userfiletmp, utf8_basename($userfilename), $fileType, $userfiletype, 0, $reviewers, $approvers, 1, '', array(), array(), $workflow);