From 0cbfba4d41f77e46e6e028868d0f4da741ac9ab0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 6 May 2021 12:52:24 +0200
Subject: [PATCH] pass previewer to showVersionDetails()

---
 views/bootstrap/class.ViewDocument.php | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 0d9ef7d95..1f77cb57b 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -449,7 +449,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 			if(is_string($item))
 				echo "<li class=\"nav-item\">".$item."</li>";
 			elseif(is_array($item)) {
-				echo "<li class=\"nav-item m-1\"><a class=\"_nav-link btn btn-outline-primary btn-sm".(!empty($item['class']) ? ' '. $item['class'] : '')."\"".(isset($item['link']) ? " href=\"".$item['link']."\"" : '').(!empty($item['target']) ? ' target="'.$item['target'].'"' : '');
+				echo "<li class=\"nav-item m-1\"><a class=\"_nav-link btn btn-mini btn-outline-primary btn-sm".(!empty($item['class']) ? ' '. $item['class'] : '')."\"".(isset($item['link']) ? " href=\"".$item['link']."\"" : '').(!empty($item['target']) ? ' target="'.$item['target'].'"' : '');
 				if(!empty($item['attributes'])) {
 					foreach($item['attributes'] as $attr) {
 						echo ' '.$attr[0].'="'.$attr[1].'"';
@@ -477,7 +477,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 		print "</ul>";
 	} /* }}} */
 
-	protected function showVersionDetails($latestContent) { /* {{{ */
+	protected function showVersionDetails($latestContent, $previewer) { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$folder = $this->params['folder'];
@@ -485,12 +485,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 		$viewonlinefiletypes = $this->params['viewonlinefiletypes'];
 		$enableownerrevapp = $this->params['enableownerrevapp'];
 		$workflowmode = $this->params['workflowmode'];
-		$cachedir = $this->params['cachedir'];
-		$previewwidthlist = $this->params['previewWidthList'];
-		$previewwidthdetail = $this->params['previewWidthDetail'];
-		$previewconverters = $this->params['previewConverters'];
-		$timeout = $this->params['timeout'];
-		$xsendfile = $this->params['xsendfile'];
 
 		// verify if file exists
 		$file_exists=file_exists($dms->contentDir . $latestContent->getPath());
@@ -506,9 +500,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 		$this->contentHeading(htmlspecialchars($latestContent->getOriginalFileName()));
 		$this->rowStart();
 		$this->columnStart(4);
-		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail, $timeout, $xsendfile);
-		$previewer->setConverters($previewconverters);
-		$previewer->createPreview($latestContent);
 		if ($file_exists) {
 			if ($viewonlinefiletypes && (in_array(strtolower($latestContent->getFileType()), $viewonlinefiletypes) || in_array(strtolower($latestContent->getMimeType()), $viewonlinefiletypes))) {
 				print "<a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$latestContent->getDocument()->getId()."&version=". $latestContent->getVersion()."\">";
@@ -516,6 +507,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 				print "<a href=\"../op/op.Download.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."\">";
 			}
 		}
+		$previewer->createPreview($latestContent);
 		if($previewer->hasPreview($latestContent)) {
 			print("<img class=\"mimeicon\" width=\"".$previewwidthdetail."\" src=\"../op/op.Preview.php?documentid=".$latestContent->getDocument()->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidthdetail."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">");
 		} else {
@@ -775,7 +767,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 			echo $txt;
 
 		$this->contentContainerStart();
-		$this->showVersionDetails($latestContent);
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail, $timeout, $xsendfile);
+		$previewer->setConverters($previewconverters);
+		$this->showVersionDetails($latestContent, $previewer);
 		$this->contentContainerEnd();
 
 		if($user->isAdmin()) {