From 52559730d9d56e008b7129acef8d3a9ba383fd3f Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 25 Jun 2015 19:52:02 +0200 Subject: [PATCH] use new customizable preview converters --- op/op.Ajax.php | 5 +++- op/op.Preview.php | 1 + op/op.Search.php | 1 + out/out.DocumentVersionDetail.php | 2 +- out/out.ManageNotify.php | 2 +- out/out.MyDocuments.php | 2 +- out/out.TransmittalMgr.php | 2 +- out/out.ViewDocument.php | 1 + out/out.ViewFolder.php | 1 + out/out.WorkflowSummary.php | 2 +- views/bootstrap/class.Bootstrap.php | 7 +++-- .../bootstrap/class.DocumentVersionDetail.php | 2 ++ views/bootstrap/class.ManageNotify.php | 2 ++ views/bootstrap/class.MyDocuments.php | 3 ++- views/bootstrap/class.Search.php | 2 ++ views/bootstrap/class.TransmittalMgr.php | 27 ++++++++++++------- views/bootstrap/class.ViewDocument.php | 2 ++ views/bootstrap/class.ViewFolder.php | 8 +++--- views/bootstrap/class.WorkflowSummary.php | 2 ++ 19 files changed, 50 insertions(+), 24 deletions(-) diff --git a/op/op.Ajax.php b/op/op.Ajax.php index 527a8afcb..ee4f2f201 100644 --- a/op/op.Ajax.php +++ b/op/op.Ajax.php @@ -425,13 +425,16 @@ switch($command) { $content = $view->menuClipboard($session->getClipboard()); break; case 'mainclipboard': - $content = $view->mainClipboard($session->getClipboard()); + $previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir, $settings->_previewWidthList); + $previewer->setConverters($settings->_converters['preview']); + $content = $view->mainClipboard($session->getClipboard(), $previewer); break; case 'documentlistrow': $document = $dms->getDocument($_REQUEST['id']); if($document) { if ($document->getAccessMode($user) >= M_READ) { $previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir, $settings->_previewWidthList); + $previewer->setConverters($settings->_converters['preview']); $view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('showtree', showtree()); $content = $view->documentListRow($document, $previewer, true); diff --git a/op/op.Preview.php b/op/op.Preview.php index 8eacdc31a..a3998c29d 100644 --- a/op/op.Preview.php +++ b/op/op.Preview.php @@ -73,6 +73,7 @@ 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']); if(!$previewer->hasPreview($object)) $previewer->createPreview($object); header('Content-Type: image/png'); diff --git a/op/op.Search.php b/op/op.Search.php index 75dbd4b44..99131f3ad 100644 --- a/op/op.Search.php +++ b/op/op.Search.php @@ -493,6 +493,7 @@ if(count($entries) == 1) { $view->setParam('workflowmode', $settings->_workflowMode); $view->setParam('enablefullsearch', $settings->_enableFullSearch); $view->setParam('previewWidthList', $settings->_previewWidthList); + $view->setParam('previewconverters', $settings->_converters['preview']); $view->show(); exit; } diff --git a/out/out.DocumentVersionDetail.php b/out/out.DocumentVersionDetail.php index 6e3346967..d4d796287 100644 --- a/out/out.DocumentVersionDetail.php +++ b/out/out.DocumentVersionDetail.php @@ -70,7 +70,7 @@ $folder = $document->getFolder(); $accessop = new SeedDMS_AccessOperation($document, $user, $settings); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$version, 'viewonlinefiletypes'=>$settings->_viewOnlineFileTypes, 'enableversionmodification'=>$settings->_enableVersionModification, 'previewwidthdetail'=>$settings->_previewWidthDetail, 'cachedir'=>$settings->_cacheDir)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$version, 'viewonlinefiletypes'=>$settings->_viewOnlineFileTypes, 'enableversionmodification'=>$settings->_enableVersionModification, 'previewwidthdetail'=>$settings->_previewWidthDetail, 'previewconverters'=>$settings->_converters['preview'], 'cachedir'=>$settings->_cacheDir)); if($view) { $view->setParam('accessobject', $accessop); $view->show(); diff --git a/out/out.ManageNotify.php b/out/out.ManageNotify.php index 4f9875cde..a3205239a 100644 --- a/out/out.ManageNotify.php +++ b/out/out.ManageNotify.php @@ -34,7 +34,7 @@ if ($user->isGuest()) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList, 'previewconverters'=>$settings->_converters['preview'])); if($view) { $view->show(); exit; diff --git a/out/out.MyDocuments.php b/out/out.MyDocuments.php index 2eadea3e1..6694d108d 100644 --- a/out/out.MyDocuments.php +++ b/out/out.MyDocuments.php @@ -48,7 +48,7 @@ if (isset($_GET["orderby"]) && strlen($_GET["orderby"])==1 ) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'orderby'=>$orderby, 'showinprocess'=>$showInProcess, 'workflowmode'=>$settings->_workflowMode, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'orderby'=>$orderby, 'showinprocess'=>$showInProcess, 'workflowmode'=>$settings->_workflowMode, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList, 'previewconverters'=>$settings->_converters['preview'])); if($view) { $view->show(); exit; diff --git a/out/out.TransmittalMgr.php b/out/out.TransmittalMgr.php index ea7265ccd..ad072c707 100644 --- a/out/out.TransmittalMgr.php +++ b/out/out.TransmittalMgr.php @@ -42,7 +42,7 @@ if(isset($_GET['transmittalid']) && $_GET['transmittalid']) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'seltransmittal'=>$seltransmittal, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'seltransmittal'=>$seltransmittal, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList, 'previewconverters'=>$settings->_converters['preview'])); if($view) { $view->show(); exit; diff --git a/out/out.ViewDocument.php b/out/out.ViewDocument.php index 527201038..06b098811 100644 --- a/out/out.ViewDocument.php +++ b/out/out.ViewDocument.php @@ -84,6 +84,7 @@ if($view) { $view->setParam('workflowmode', $settings->_workflowMode); $view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('previewWidthDetail', $settings->_previewWidthDetail); + $view->setParam('previewConverters', $settings->_converters['preview']); $view->setParam('checkOutDir', $settings->_checkOutDir); $view->setParam('currenttab', isset($_REQUEST['currenttab']) ? $_REQUEST['currenttab'] : ''); $view->show(); diff --git a/out/out.ViewFolder.php b/out/out.ViewFolder.php index d7fc599f8..10f5700e0 100644 --- a/out/out.ViewFolder.php +++ b/out/out.ViewFolder.php @@ -68,6 +68,7 @@ if($view) { $view->setParam('enableRecursiveCount', $settings->_enableRecursiveCount); $view->setParam('maxRecursiveCount', $settings->_maxRecursiveCount); $view->setParam('previewWidthList', $settings->_previewWidthList); + $view->setParam('previewconverters', $settings->_converters['preview']); $view->show(); exit; } diff --git a/out/out.WorkflowSummary.php b/out/out.WorkflowSummary.php index 1e59569c8..83d5f484c 100644 --- a/out/out.WorkflowSummary.php +++ b/out/out.WorkflowSummary.php @@ -37,7 +37,7 @@ if ($user->isGuest()) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'workflowmode'=>$settings->_workflowMode, 'previewWidthList'=>$settings->_previewWidthList)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'workflowmode'=>$settings->_workflowMode, 'previewWidthList'=>$settings->_previewWidthList, 'previewconverters'=>$settings->_converters['preview'])); if($view) { $view->show(); exit; diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index cdd0df352..ab79bd327 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1334,7 +1334,7 @@ $(function() { * @param array clipboard * @return string rendered html content */ - function mainClipboard($clipboard){ /* {{{ */ + function mainClipboard($clipboard, $previewer){ /* {{{ */ $dms = $this->params['dms']; $content = ''; $foldercount = $doccount = 0; @@ -1359,7 +1359,6 @@ $(function() { } } } - $previewer = new SeedDMS_Preview_Previewer($this->params['cachedir'], 40); if($clipboard['docs']) { foreach($clipboard['docs'] as $docid) { /* FIXME: check for access rights, which could have changed after adding the document to the clipboard */ @@ -1416,10 +1415,10 @@ $(function() { * * @param array clipboard */ - function printClipboard($clipboard){ /* {{{ */ + function printClipboard($clipboard, $previewer){ /* {{{ */ $this->contentHeading(getMLText("clipboard"), true); echo "
\n"; - echo $this->mainClipboard($clipboard); + echo $this->mainClipboard($clipboard, $previewer); echo "
\n"; } /* }}} */ diff --git a/views/bootstrap/class.DocumentVersionDetail.php b/views/bootstrap/class.DocumentVersionDetail.php index f39e03a9f..2e058f376 100644 --- a/views/bootstrap/class.DocumentVersionDetail.php +++ b/views/bootstrap/class.DocumentVersionDetail.php @@ -41,6 +41,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style { $enableversionmodification = $this->params['enableversionmodification']; $cachedir = $this->params['cachedir']; $previewwidthdetail = $this->params['previewwidthdetail']; + $previewconverters = $this->params['previewconverters']; $latestContent = $document->getLatestContent(); $status = $version->getStatus(); @@ -148,6 +149,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style { print ""; $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail); + $previewer->setConverters($previewconverters); $previewer->createPreview($version); if($previewer->hasPreview($version)) { print("getID()."&version=".$version->getVersion()."&width=".$previewwidthdetail."\" title=\"".htmlspecialchars($version->getMimeType())."\">"); diff --git a/views/bootstrap/class.ManageNotify.php b/views/bootstrap/class.ManageNotify.php index e83c9d85c..8cc5d2538 100644 --- a/views/bootstrap/class.ManageNotify.php +++ b/views/bootstrap/class.ManageNotify.php @@ -105,6 +105,7 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style { } else { $previewer = new SeedDMS_Preview_Previewer($this->cachedir, $this->previewwidth); + $previewer->setConverters($this->previewconverters); print ""; print "\n\n"; @@ -153,6 +154,7 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style { $this->user = $this->params['user']; $this->cachedir = $this->params['cachedir']; $this->previewwidth = $this->params['previewWidthList']; + $this->previewconverters = $this->params['previewconverters']; $this->db = $this->dms->getDB(); $this->htmlStartPage(getMLText("my_account")); diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php index b3b86fd02..201e4d77c 100644 --- a/views/bootstrap/class.MyDocuments.php +++ b/views/bootstrap/class.MyDocuments.php @@ -39,9 +39,11 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { $cachedir = $this->params['cachedir']; $workflowmode = $this->params['workflowmode']; $previewwidth = $this->params['previewWidthList']; + $previewconverters = $this->params['previewconverters']; $db = $dms->getDB(); $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth); + $previewer->setConverters($previewconverters); $this->htmlStartPage(getMLText("my_documents")); $this->globalNavigation(); @@ -690,7 +692,6 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print "\n"; print "\n\n\n"; - $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth); foreach ($resArr as $res) { $document = $dms->getDocument($res["documentID"]); diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php index 981102928..6ebd0a93b 100644 --- a/views/bootstrap/class.Search.php +++ b/views/bootstrap/class.Search.php @@ -81,6 +81,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style { $searchin = $this->params['searchin']; $cachedir = $this->params['cachedir']; $previewwidth = $this->params['previewWidthList']; + $previewconverters = $this->params['previewconverters']; $this->htmlStartPage(getMLText("search_results")); $this->globalNavigation(); @@ -468,6 +469,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style { print "\n\n\n"; $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth); + $previewer->setConverters($previewconverters); foreach ($entries as $entry) { if(get_class($entry) == $dms->getClassname('document')) { $txt = $this->callHook('documentListItem', $entry, $previewer); diff --git a/views/bootstrap/class.TransmittalMgr.php b/views/bootstrap/class.TransmittalMgr.php index ffcf0a4e8..aa7b6892e 100644 --- a/views/bootstrap/class.TransmittalMgr.php +++ b/views/bootstrap/class.TransmittalMgr.php @@ -215,9 +215,11 @@ $('#delete-transmittalitem-btn-".$itemid."').popover({ $seltransmittal = $this->params['seltransmittal']; $cachedir = $this->params['cachedir']; $previewwidth = $this->params['previewWidthList']; + $previewconverters = $this->params['previewconverters']; $db = $dms->getDB(); $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth); + $previewer->setConverters($previewconverters); $this->htmlStartPage(getMLText("my_transmittals")); $this->globalNavigation(); @@ -278,17 +280,22 @@ $('#delete-transmittalitem-btn-".$itemid."').popover({ print "\n"; print "\n\n\n"; foreach($items as $item) { - $content = $item->getContent(); - $document = $content->getDocument(); - $latestcontent = $document->getLatestContent(); - if ($document->getAccessMode($user) >= M_READ) { + if($content = $item->getContent()) { + $document = $content->getDocument(); + $latestcontent = $document->getLatestContent(); + if ($document->getAccessMode($user) >= M_READ) { + echo "getID()."\">"; + echo $this->documentListRow($document, $previewer, true, $content->getVersion()); + echo ""; + echo ""; + } + } else { echo "getID()."\">"; - echo $this->documentListRow($document, $previewer, true, $content->getVersion()); - echo ""; + echo ""; echo ""; } } diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index b2f7bac06..afe3cece4 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -123,6 +123,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { $cachedir = $this->params['cachedir']; $previewwidthlist = $this->params['previewWidthList']; $previewwidthdetail = $this->params['previewWidthDetail']; + $previewconverters = $this->params['previewConverters']; $checkoutdir = $this->params['checkOutDir']; $documentid = $document->getId(); $currenttab = $this->params['currenttab']; @@ -387,6 +388,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { print ""; */ $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail); + $previewer->setConverters($previewconverters); $previewer->createPreview($latestContent); if ($file_exists) { if ($viewonlinefiletypes && in_array(strtolower($latestContent->getFileType()), $viewonlinefiletypes)) { diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php index d54c58a76..85d444516 100644 --- a/views/bootstrap/class.ViewFolder.php +++ b/views/bootstrap/class.ViewFolder.php @@ -86,6 +86,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style { $enableRecursiveCount = $this->params['enableRecursiveCount']; $maxRecursiveCount = $this->params['maxRecursiveCount']; $previewwidth = $this->params['previewWidthList']; + $previewconverters = $this->params['previewconverters']; $folderid = $folder->getId(); @@ -102,6 +103,9 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style { $this->pageNavigation($this->getFolderPathHTML($folder), "view_folder", $folder); } + $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth); + $previewer->setConverters($previewconverters); + echo $this->callHook('preContent'); echo "
\n"; @@ -140,7 +144,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style { echo $this->callHook('leftContent'); - if ($enableClipboard) $this->printClipboard($this->params['session']->getClipboard()); + if ($enableClipboard) $this->printClipboard($this->params['session']->getClipboard(), $previewer); echo "
\n"; } @@ -271,8 +275,6 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style { } } - - $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth); foreach($documents as $document) { $txt = $this->callHook('documentListItem', $document, $previewer); if(is_string($txt)) diff --git a/views/bootstrap/class.WorkflowSummary.php b/views/bootstrap/class.WorkflowSummary.php index 5fa086aa1..ab52db5f0 100644 --- a/views/bootstrap/class.WorkflowSummary.php +++ b/views/bootstrap/class.WorkflowSummary.php @@ -36,6 +36,7 @@ class SeedDMS_View_WorkflowSummary extends SeedDMS_Bootstrap_Style { $user = $this->params['user']; $cachedir = $this->params['cachedir']; $previewwidth = $this->params['previewWidthList']; + $previewconverters = $this->params['previewconverters']; $this->htmlStartPage(getMLText("my_documents")); $this->globalNavigation(); @@ -49,6 +50,7 @@ class SeedDMS_View_WorkflowSummary extends SeedDMS_Bootstrap_Style { $workflowStatus = $user->getWorkflowStatus(); $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth); + $previewer->setConverters($previewconverters); $printheader=true; $iRev = array();
".getMLText("expires")."
".getMLText("action")."
"; + $this->printDeleteItemButton($item, getMLText('transmittalitem_removed')); + if($latestcontent->getVersion() != $content->getVersion()) + $this->printUpdateItemButton($item, getMLText('transmittalitem_updated', array('prevversion'=>$content->getVersion(), 'newversion'=>$latestcontent->getVersion()))); + echo "
"; - $this->printDeleteItemButton($item, getMLText('transmittalitem_removed')); - if($latestcontent->getVersion() != $content->getVersion()) - $this->printUpdateItemButton($item, getMLText('transmittalitem_updated', array('prevversion'=>$content->getVersion(), 'newversion'=>$latestcontent->getVersion()))); - echo "
content ist weg