gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-16 06:31:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make it work with 6.0.17

Browse Source
This commit is contained in:
Uwe Steinmann 2022-01-31 07:14:52 +01:00
parent b7315c501f
commit d9d434a7be
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
utils/adddoc.php
View File

@ -122,9 +122,9 @@ if(isset($options['f'])) {
exit(1); exit(1);
} }
$mimetype = ''; $mymimetype = '';
if(isset($options['t'])) { if(isset($options['t'])) {
$mimetype = $options['t']; $mymimetype = $options['t'];
} }
$reqversion = 0; $reqversion = 0;
@ -248,8 +248,8 @@ if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
if(is_readable($filename)) { if(is_readable($filename)) {
if(filesize($filename)) { if(filesize($filename)) {
$finfo = new finfo(FILEINFO_MIME_TYPE); $finfo = new finfo(FILEINFO_MIME_TYPE);
if(!$mimetype) { if(!$mymimetype) {
$mimetype = $finfo->file($filename); $mymimetype = $finfo->file($filename);
} }
$filetype = "." . pathinfo($filename, PATHINFO_EXTENSION); $filetype = "." . pathinfo($filename, PATHINFO_EXTENSION);
} else { } else {
@ -304,20 +304,11 @@ $filetmp = $filename;
$reviewers = array(); $reviewers = array();
$approvers = array(); $approvers = array();
if($settings->_enableFullSearch) {
$index = $indexconf['Indexer']::open($settings->_luceneDir);
$indexconf['Indexer']::init($settings->_stopWordsFile);
} else {
$index = null;
$indexconf = null;
}
if($folder) { if($folder) {
$controller = Controller::factory('AddDocument', array('dms'=>$dms, 'user'=>$user)); $controller = Controller::factory('AddDocument', array('dms'=>$dms, 'user'=>$user));
$controller->setParam('documentsource', 'script'); $controller->setParam('documentsource', 'script');
$controller->setParam('folder', $folder); $controller->setParam('folder', $folder);
$controller->setParam('index', $index); $controller->setParam('fulltextservice', $fulltextservice);
$controller->setParam('indexconf', $indexconf);
$controller->setParam('name', $name); $controller->setParam('name', $name);
$controller->setParam('comment', $comment); $controller->setParam('comment', $comment);
$controller->setParam('expires', $expires); $controller->setParam('expires', $expires);
@ -327,7 +318,7 @@ if($folder) {
$controller->setParam('userfiletmp', $filetmp); $controller->setParam('userfiletmp', $filetmp);
$controller->setParam('userfilename', basename($filename)); $controller->setParam('userfilename', basename($filename));
$controller->setParam('filetype', $filetype); $controller->setParam('filetype', $filetype);
$controller->setParam('userfiletype', $mimetype); $controller->setParam('userfiletype', $mymimetype);
$minmax = $folder->getDocumentsMinMax(); $minmax = $folder->getDocumentsMinMax();
if($settings->_defaultDocPosition == 'start') if($settings->_defaultDocPosition == 'start')
$controller->setParam('sequence', $minmax['min'] - 1); $controller->setParam('sequence', $minmax['min'] - 1);