From e31c532c68893b673a3c31fcf9e4f91a497cf612 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 5 Aug 2022 13:32:46 +0200 Subject: [PATCH] get rid of old code, use actions for 'version' and 'file' --- controllers/class.Preview.php | 169 +++++++++++++++++----------------- op/op.Preview.php | 38 +------- 2 files changed, 87 insertions(+), 120 deletions(-) diff --git a/controllers/class.Preview.php b/controllers/class.Preview.php index 3cea95428..c626794cb 100644 --- a/controllers/class.Preview.php +++ b/controllers/class.Preview.php @@ -22,96 +22,91 @@ */ class SeedDMS_Controller_Preview extends SeedDMS_Controller_Common { - public function run() { - global $theme; + public function version() { $dms = $this->params['dms']; - $type = $this->params['type']; $settings = $this->params['settings']; $conversionmgr = $this->params['conversionmgr']; - switch($type) { - case "version": - $version = $this->params['version']; - $document = $this->params['document']; - $width = $this->params['width']; - if($version < 1) { - $content = $this->callHook('documentLatestContent', $document); - if($content === null) - $content = $document->getLatestContent(); - } else { - $content = $this->callHook('documentContent', $document, $version); - if($content === null) - $content = $document->getContentByVersion($version); - } - if (!is_object($content)) { - $this->errormsg = 'invalid_version'; - return false; - } - /* set params['content'] for compatiblity with older extensions which - * expect the content in the controller - */ - $this->params['content'] = $content; - if(null === $this->callHook('version')) { - if($width) - $previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir, $width, $settings->_cmdTimeout); - else - $previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir); - if($conversionmgr) - $previewer->setConversionMgr($conversionmgr); - else - $previewer->setConverters($settings->_converters['preview']); - $previewer->setXsendfile($settings->_enableXsendfile); - if(!$previewer->hasPreview($content)) { - add_log_line(""); - if(!$previewer->createPreview($content)) { - add_log_line("", PEAR_LOG_ERR); - } - } - if(!$previewer->hasPreview($content)) { - header('Content-Type: image/svg+xml'); - readfile('../views/'.$theme.'/images/empty.svg'); - exit; - } - header('Content-Type: image/png'); - $previewer->getPreview($content); - } - break; - case "file": - $object = $this->params['object']; - $document = $this->params['document']; - $width = $this->params['width']; - if (!is_object($object)) { - $this->errormsg = 'invalid_version'; - return false; - } - - if(null === $this->callHook('file')) { - if($width) - $previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir, $width, $settings->_cmdTimeout); - else - $previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir); - if($conversionmgr) - $previewer->setConversionMgr($conversionmgr); - else - $previewer->setConverters($settings->_converters['preview']); - $previewer->setXsendfile($settings->_enableXsendfile); - - if(!$previewer->hasPreview($object)) { - add_log_line(""); - if(!$previewer->createPreview($object)) { - add_log_line("", PEAR_LOG_ERR); - } - } - if(!$previewer->hasPreview($object)) { - header('Content-Type: image/svg+xml'); - readfile('../views/'.$theme.'/images/empty.svg'); - exit; - } - header('Content-Type: image/png'); - $previewer->getPreview($object); - } - break; + $version = $this->params['version']; + $document = $this->params['document']; + $width = $this->params['width']; + if($version < 1) { + $content = $this->callHook('documentLatestContent', $document); + if($content === null) + $content = $document->getLatestContent(); + } else { + $content = $this->callHook('documentContent', $document, $version); + if($content === null) + $content = $document->getContentByVersion($version); } - return true; - } + if (!is_object($content)) { + $this->errormsg = 'invalid_version'; + return false; + } + /* set params['content'] for compatiblity with older extensions which + * expect the content in the controller + */ + $this->params['content'] = $content; + if(null === $this->callHook('version')) { + if($width) + $previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir, $width, $settings->_cmdTimeout); + else + $previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir); + if($conversionmgr) + $previewer->setConversionMgr($conversionmgr); + else + $previewer->setConverters($settings->_converters['preview']); + $previewer->setXsendfile($settings->_enableXsendfile); + if(!$previewer->hasPreview($content)) { + add_log_line(""); + if(!$previewer->createPreview($content)) { + add_log_line("", PEAR_LOG_ERR); + } + } + if(!$previewer->hasPreview($content)) { + return false; + } + header('Content-Type: image/png'); + $previewer->getPreview($content); + } + } /* }}} */ + + public function file() { + $dms = $this->params['dms']; + $settings = $this->params['settings']; + $conversionmgr = $this->params['conversionmgr']; + + $object = $this->params['object']; + $document = $this->params['document']; + $width = $this->params['width']; + if (!is_object($object)) { + $this->errormsg = 'invalid_version'; + return false; + } + + if(null === $this->callHook('file')) { + if($width) + $previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir, $width, $settings->_cmdTimeout); + else + $previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir); + if($conversionmgr) + $previewer->setConversionMgr($conversionmgr); + else + $previewer->setConverters($settings->_converters['preview']); + $previewer->setXsendfile($settings->_enableXsendfile); + + if(!$previewer->hasPreview($object)) { + add_log_line(""); + if(!$previewer->createPreview($object)) { + add_log_line("", PEAR_LOG_ERR); + } + } + if(!$previewer->hasPreview($object)) { + return false; + } + header('Content-Type: image/png'); + $previewer->getPreview($object); + } + } /* }}} */ + } diff --git a/op/op.Preview.php b/op/op.Preview.php index 53de6a141..d62d4a31c 100644 --- a/op/op.Preview.php +++ b/op/op.Preview.php @@ -55,15 +55,15 @@ if ($document->getAccessMode($user) < M_READ) { } $controller->setParam('conversionmgr', $conversionmgr); +$controller->setParam('width', !empty($_GET["width"]) ? $_GET["width"] : null); +$controller->setParam('document', $document); if(isset($_GET['version'])) { $version = $_GET["version"]; if (!is_numeric($version)) exit; - $controller->setParam('width', !empty($_GET["width"]) ? $_GET["width"] : null); - $controller->setParam('document', $document); + $controller->setParam('action', 'version'); $controller->setParam('version', $version); - $controller->setParam('type', 'version'); if(!$controller()) { header('Content-Type: image/svg+xml'); readfile('../views/'.$theme.'/images/empty.svg'); @@ -75,11 +75,9 @@ if(isset($_GET['version'])) { if (!is_numeric($file) || intval($file)<1) exit; $object = $document->getDocumentFile($file); - $controller->setParam('width', !empty($_GET["width"]) ? $_GET["width"] : null); - $controller->setParam('document', $document); + $controller->setParam('action', 'file'); $controller->setParam('object', $object); - $controller->setParam('type', 'file'); - if(!$controller->run()) { + if(!$controller()) { header('Content-Type: image/svg+xml'); readfile('../views/'.$theme.'/images/empty.svg'); exit; @@ -88,29 +86,3 @@ if(isset($_GET['version'])) { } else { exit; } - -/* From here on old code which isn't used anymore -if (!is_object($object)) { - exit; -} - -if(!empty($_GET["width"])) - $previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir, $_GET["width"]); -else - $previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir); -$previewer->setConverters($settings->_converters['preview']); -$previewer->setXsendfile($settings->_enableXsendfile); -if(!$previewer->hasPreview($object)) { - add_log_line(""); - if(!$previewer->createPreview($object)) { - } -} -if(!$previewer->hasPreview($object)) { - header('Content-Type: image/svg+xml'); - readfile('../views/'.$theme.'/images/empty.svg'); - exit; -} -header('Content-Type: image/png'); -$previewer->getPreview($object); - */ -?>