From f8adb0cecfcdb15a3d70a3e2ba81214498dd6801 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 15 Apr 2016 13:20:56 +0200 Subject: [PATCH] show previews were possible, pass accessobject to view --- out/out.ApprovalSummary.php | 8 ++++++-- out/out.ReceiptSummary.php | 16 ++++++++++++++-- out/out.ReviewSummary.php | 8 ++++++-- out/out.TransmittalMgr.php | 7 +++++-- out/out.WorkflowSummary.php | 7 +++++-- views/bootstrap/class.ApprovalSummary.php | 2 ++ views/bootstrap/class.CheckOutSummary.php | 16 ++++++++++++++++ views/bootstrap/class.ReceiptSummary.php | 16 ++++++++++++++++ views/bootstrap/class.ReviewSummary.php | 2 ++ views/bootstrap/class.TransmittalMgr.php | 4 ++-- 10 files changed, 74 insertions(+), 12 deletions(-) diff --git a/out/out.ApprovalSummary.php b/out/out.ApprovalSummary.php index f43f02e69..2aa2be0b2 100644 --- a/out/out.ApprovalSummary.php +++ b/out/out.ApprovalSummary.php @@ -31,16 +31,20 @@ include("../inc/inc.Authentication.php"); */ require_once("SeedDMS/Preview.php"); +$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); +$accessop = new SeedDMS_AccessOperation($dms, $user, $settings); + if ($user->isGuest()) { UI::exitError(getMLText("my_documents"),getMLText("access_denied")); } -$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { $view->setParam('cachedir', $settings->_cacheDir); $view->setParam('previewWidthList', $settings->_previewWidthList); + $view->setParam('previewconverters', $settings->_converters['preview']); $view->setParam('timeout', $settings->_cmdTimeout); + $view->setParam('accessobject', $accessop); $view($_GET); exit; } diff --git a/out/out.ReceiptSummary.php b/out/out.ReceiptSummary.php index 73c636f0d..977ff6efd 100644 --- a/out/out.ReceiptSummary.php +++ b/out/out.ReceiptSummary.php @@ -27,13 +27,25 @@ include("../inc/inc.DBInit.php"); include("../inc/inc.ClassUI.php"); include("../inc/inc.Authentication.php"); +/** + * Include class to preview documents + */ +require_once("SeedDMS/Preview.php"); + +$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); +$accessop = new SeedDMS_AccessOperation($dms, $user, $settings); + if ($user->isGuest()) { UI::exitError(getMLText("my_documents"),getMLText("access_denied")); } -$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { + $view->setParam('cachedir', $settings->_cacheDir); + $view->setParam('previewWidthList', $settings->_previewWidthList); + $view->setParam('previewconverters', $settings->_converters['preview']); + $view->setParam('timeout', $settings->_cmdTimeout); + $view->setParam('accessobject', $accessop); $view($_GET); exit; } diff --git a/out/out.ReviewSummary.php b/out/out.ReviewSummary.php index 0f68c80c5..977ff6efd 100644 --- a/out/out.ReviewSummary.php +++ b/out/out.ReviewSummary.php @@ -32,16 +32,20 @@ include("../inc/inc.Authentication.php"); */ require_once("SeedDMS/Preview.php"); +$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); +$accessop = new SeedDMS_AccessOperation($dms, $user, $settings); + if ($user->isGuest()) { UI::exitError(getMLText("my_documents"),getMLText("access_denied")); } -$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { $view->setParam('cachedir', $settings->_cacheDir); $view->setParam('previewWidthList', $settings->_previewWidthList); + $view->setParam('previewconverters', $settings->_converters['preview']); $view->setParam('timeout', $settings->_cmdTimeout); + $view->setParam('accessobject', $accessop); $view($_GET); exit; } diff --git a/out/out.TransmittalMgr.php b/out/out.TransmittalMgr.php index d0df6a02b..e9642f828 100644 --- a/out/out.TransmittalMgr.php +++ b/out/out.TransmittalMgr.php @@ -31,6 +31,10 @@ include("../inc/inc.Authentication.php"); */ require_once("SeedDMS/Preview.php"); +$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); +$accessop = new SeedDMS_AccessOperation($dms, $user, $settings); + if ($user->isGuest()) { UI::exitError(getMLText("my_transmittals"),getMLText("access_denied")); } @@ -41,13 +45,12 @@ if(isset($_GET['transmittalid']) && $_GET['transmittalid']) { $seltransmittal = null; } -$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { $view->setParam('seltransmittal', $seltransmittal); $view->setParam('cachedir', $settings->_cacheDir); $view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('previewconverters', $settings->_converters['preview']); + $view->setParam('accessobject', $accessop); $view($_GET); exit; } diff --git a/out/out.WorkflowSummary.php b/out/out.WorkflowSummary.php index 8d31d3865..027718fd2 100644 --- a/out/out.WorkflowSummary.php +++ b/out/out.WorkflowSummary.php @@ -32,18 +32,21 @@ include("../inc/inc.Authentication.php"); */ require_once("SeedDMS/Preview.php"); +$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); +$accessop = new SeedDMS_AccessOperation($dms, $user, $settings); + if ($user->isGuest()) { UI::exitError(getMLText("my_documents"),getMLText("access_denied")); } -$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { $view->setParam('cachedir', $settings->_cacheDir); $view->setParam('workflowmode', $settings->_workflowMode); $view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('previewconverters', $settings->_converters['preview']); $view->setParam('timeout', $settings->_cmdTimeout); + $view->setParam('accessobject', $accessop); $view($_GET); exit; } diff --git a/views/bootstrap/class.ApprovalSummary.php b/views/bootstrap/class.ApprovalSummary.php index 6e2e513c4..ea00eedeb 100644 --- a/views/bootstrap/class.ApprovalSummary.php +++ b/views/bootstrap/class.ApprovalSummary.php @@ -36,9 +36,11 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style { $user = $this->params['user']; $cachedir = $this->params['cachedir']; $previewwidth = $this->params['previewWidthList']; + $previewconverters = $this->params['previewconverters']; $timeout = $this->params['timeout']; $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout); + $previewer->setConverters($previewconverters); $this->htmlStartPage(getMLText("approval_summary")); $this->globalNavigation(); diff --git a/views/bootstrap/class.CheckOutSummary.php b/views/bootstrap/class.CheckOutSummary.php index 396856fd7..a243df01b 100644 --- a/views/bootstrap/class.CheckOutSummary.php +++ b/views/bootstrap/class.CheckOutSummary.php @@ -34,6 +34,13 @@ class SeedDMS_View_CheckOutSummary extends SeedDMS_Bootstrap_Style { function show() { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; + $cachedir = $this->params['cachedir']; + $previewwidth = $this->params['previewWidthList']; + $previewconverters = $this->params['previewconverters']; + $timeout = $this->params['timeout']; + + $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout); + $previewer->setConverters($previewconverters); $this->htmlStartPage(getMLText("my_documents")); $this->globalNavigation(); @@ -64,6 +71,7 @@ class SeedDMS_View_CheckOutSummary extends SeedDMS_Bootstrap_Style { if ($printheader){ print ""; print "\n\n"; + print "\n"; print "\n"; print "\n"; print "\n"; @@ -75,6 +83,14 @@ class SeedDMS_View_CheckOutSummary extends SeedDMS_Bootstrap_Style { } print "\n"; + $previewer->createPreview($version); + print ""; print ""; print ""; print ""; diff --git a/views/bootstrap/class.ReceiptSummary.php b/views/bootstrap/class.ReceiptSummary.php index 516fd6f9a..06014a48b 100644 --- a/views/bootstrap/class.ReceiptSummary.php +++ b/views/bootstrap/class.ReceiptSummary.php @@ -34,6 +34,13 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style { function show() { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; + $cachedir = $this->params['cachedir']; + $previewwidth = $this->params['previewWidthList']; + $previewconverters = $this->params['previewconverters']; + $timeout = $this->params['timeout']; + + $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout); + $previewer->setConverters($previewconverters); $this->htmlStartPage(getMLText("my_documents")); $this->globalNavigation(); @@ -66,6 +73,7 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style { if ($printheader){ print "
".getMLText("name")."".getMLText("owner")."".getMLText("status")."
"; + if($previewer->hasPreview($version)) { + print "getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; + } else { + print "getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; + } + print "".htmlspecialchars($document->getName())."".htmlspecialchars($owner->getFullName())."".getOverallStatusText($st["status"])."
"; print "\n\n"; + print "\n"; print "\n"; print "\n"; print "\n"; @@ -77,6 +85,14 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style { } print "\n"; + $previewer->createPreview($version); + print ""; print ""; print ""; print ""; diff --git a/views/bootstrap/class.ReviewSummary.php b/views/bootstrap/class.ReviewSummary.php index 95a3dd819..1c0b531d8 100644 --- a/views/bootstrap/class.ReviewSummary.php +++ b/views/bootstrap/class.ReviewSummary.php @@ -36,9 +36,11 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style { $user = $this->params['user']; $cachedir = $this->params['cachedir']; $previewwidth = $this->params['previewWidthList']; + $previewconverters = $this->params['previewconverters']; $timeout = $this->params['timeout']; $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout); + $previewer->setConverters($previewconverters); $this->htmlStartPage(getMLText("my_documents")); $this->globalNavigation(); diff --git a/views/bootstrap/class.TransmittalMgr.php b/views/bootstrap/class.TransmittalMgr.php index 52d2320f9..8a79b829c 100644 --- a/views/bootstrap/class.TransmittalMgr.php +++ b/views/bootstrap/class.TransmittalMgr.php @@ -230,9 +230,9 @@ class SeedDMS_View_TransmittalMgr extends SeedDMS_Bootstrap_Style { $cachedir = $this->params['cachedir']; $previewwidth = $this->params['previewWidthList']; $previewconverters = $this->params['previewconverters']; + $timeout = $this->params['timeout']; - $db = $dms->getDB(); - $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth); + $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout); $previewer->setConverters($previewconverters); $this->htmlAddHeader(''."\n", 'js');
".getMLText("name")."".getMLText("owner")."".getMLText("status")."
"; + if($previewer->hasPreview($version)) { + print "getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; + } else { + print "getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; + } + print "".htmlspecialchars($document->getName())."".htmlspecialchars($owner->getFullName())."".getOverallStatusText($st["status"])."