From 99d1d1455c407123f25e88a76e91d3d5ec08edb0 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 3 May 2022 18:14:50 +0200 Subject: [PATCH] use conversion manager --- views/bootstrap/class.ObjectCheck.php | 6 +++++- .../class.RemoveUserFromProcesses.php | 20 +++++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php index a6d31147f..fba181150 100644 --- a/views/bootstrap/class.ObjectCheck.php +++ b/views/bootstrap/class.ObjectCheck.php @@ -188,6 +188,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style { $setchecksum = $this->params['setchecksum']; $rootfolder = $this->params['rootfolder']; $this->enableClipboard = $this->params['enableclipboard']; + $conversionmgr = $this->params['conversionmgr']; $cachedir = $this->params['cachedir']; $previewwidth = $this->params['previewWidthList']; $previewconverters = $this->params['previewConverters']; @@ -195,7 +196,10 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style { $xsendfile = $this->params['xsendfile']; $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile); - $previewer->setConverters($previewconverters); + if($conversionmgr) + $previewer->setConversionMgr($conversionmgr); + else + $previewer->setConverters($previewconverters); $this->htmlStartPage(getMLText("admin_tools")); $this->globalNavigation(); diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php index ce9c28ac8..076e147fc 100644 --- a/views/bootstrap/class.RemoveUserFromProcesses.php +++ b/views/bootstrap/class.RemoveUserFromProcesses.php @@ -52,20 +52,24 @@ $(document).ready( function() { function printList() { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; - $settings = $this->params['settings']; - $cachedir = $this->params['cachedir']; - $rootfolder = $this->params['rootfolder']; - $previewwidth = $this->params['previewWidthList']; - $previewconverters = $this->params['previewconverters']; - $timeout = $this->params['timeout']; + $settings = $this->params['settings']; + $cachedir = $this->params['cachedir']; + $rootfolder = $this->params['rootfolder']; + $conversionmgr = $this->params['conversionmgr']; + $previewwidth = $this->params['previewWidthList']; + $previewconverters = $this->params['previewconverters']; + $timeout = $this->params['timeout']; $rmuser = $this->params['rmuser']; $task = $this->params['task']; if(!$task) return; - $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout); - $previewer->setConverters($previewconverters); + $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout); + if($conversionmgr) + $previewer->setConversionMgr($conversionmgr); + else + $previewer->setConverters($previewconverters); $docs = array(); switch($task) {