From d9d434a7bea7910394c1f1e249a7d4b392348a17 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 31 Jan 2022 07:14:52 +0100 Subject: [PATCH] make it work with 6.0.17 --- utils/adddoc.php | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/utils/adddoc.php b/utils/adddoc.php index 925d86d59..9ff44051f 100644 --- a/utils/adddoc.php +++ b/utils/adddoc.php @@ -122,9 +122,9 @@ if(isset($options['f'])) { exit(1); } -$mimetype = ''; +$mymimetype = ''; if(isset($options['t'])) { - $mimetype = $options['t']; + $mymimetype = $options['t']; } $reqversion = 0; @@ -248,8 +248,8 @@ if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) { if(is_readable($filename)) { if(filesize($filename)) { $finfo = new finfo(FILEINFO_MIME_TYPE); - if(!$mimetype) { - $mimetype = $finfo->file($filename); + if(!$mymimetype) { + $mymimetype = $finfo->file($filename); } $filetype = "." . pathinfo($filename, PATHINFO_EXTENSION); } else { @@ -304,20 +304,11 @@ $filetmp = $filename; $reviewers = array(); $approvers = array(); -if($settings->_enableFullSearch) { - $index = $indexconf['Indexer']::open($settings->_luceneDir); - $indexconf['Indexer']::init($settings->_stopWordsFile); -} else { - $index = null; - $indexconf = null; -} - if($folder) { $controller = Controller::factory('AddDocument', array('dms'=>$dms, 'user'=>$user)); $controller->setParam('documentsource', 'script'); $controller->setParam('folder', $folder); - $controller->setParam('index', $index); - $controller->setParam('indexconf', $indexconf); + $controller->setParam('fulltextservice', $fulltextservice); $controller->setParam('name', $name); $controller->setParam('comment', $comment); $controller->setParam('expires', $expires); @@ -327,7 +318,7 @@ if($folder) { $controller->setParam('userfiletmp', $filetmp); $controller->setParam('userfilename', basename($filename)); $controller->setParam('filetype', $filetype); - $controller->setParam('userfiletype', $mimetype); + $controller->setParam('userfiletype', $mymimetype); $minmax = $folder->getDocumentsMinMax(); if($settings->_defaultDocPosition == 'start') $controller->setParam('sequence', $minmax['min'] - 1);