pass previewer to showVersionDetails()

This commit is contained in:
Uwe Steinmann 2021-05-06 12:52:24 +02:00
parent 8807257aa2
commit 0cbfba4d41

View File

@ -449,7 +449,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
if(is_string($item)) if(is_string($item))
echo "<li class=\"nav-item\">".$item."</li>"; echo "<li class=\"nav-item\">".$item."</li>";
elseif(is_array($item)) { 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'])) { if(!empty($item['attributes'])) {
foreach($item['attributes'] as $attr) { foreach($item['attributes'] as $attr) {
echo ' '.$attr[0].'="'.$attr[1].'"'; echo ' '.$attr[0].'="'.$attr[1].'"';
@ -477,7 +477,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
print "</ul>"; print "</ul>";
} /* }}} */ } /* }}} */
protected function showVersionDetails($latestContent) { /* {{{ */ protected function showVersionDetails($latestContent, $previewer) { /* {{{ */
$dms = $this->params['dms']; $dms = $this->params['dms'];
$user = $this->params['user']; $user = $this->params['user'];
$folder = $this->params['folder']; $folder = $this->params['folder'];
@ -485,12 +485,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
$viewonlinefiletypes = $this->params['viewonlinefiletypes']; $viewonlinefiletypes = $this->params['viewonlinefiletypes'];
$enableownerrevapp = $this->params['enableownerrevapp']; $enableownerrevapp = $this->params['enableownerrevapp'];
$workflowmode = $this->params['workflowmode']; $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 // verify if file exists
$file_exists=file_exists($dms->contentDir . $latestContent->getPath()); $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->contentHeading(htmlspecialchars($latestContent->getOriginalFileName()));
$this->rowStart(); $this->rowStart();
$this->columnStart(4); $this->columnStart(4);
$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail, $timeout, $xsendfile);
$previewer->setConverters($previewconverters);
$previewer->createPreview($latestContent);
if ($file_exists) { if ($file_exists) {
if ($viewonlinefiletypes && (in_array(strtolower($latestContent->getFileType()), $viewonlinefiletypes) || in_array(strtolower($latestContent->getMimeType()), $viewonlinefiletypes))) { 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()."\">"; 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()."\">"; print "<a href=\"../op/op.Download.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."\">";
} }
} }
$previewer->createPreview($latestContent);
if($previewer->hasPreview($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())."\">"); 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 { } else {
@ -775,7 +767,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
echo $txt; echo $txt;
$this->contentContainerStart(); $this->contentContainerStart();
$this->showVersionDetails($latestContent); $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail, $timeout, $xsendfile);
$previewer->setConverters($previewconverters);
$this->showVersionDetails($latestContent, $previewer);
$this->contentContainerEnd(); $this->contentContainerEnd();
if($user->isAdmin()) { if($user->isAdmin()) {