gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-20 00:21:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into seeddms-5.1.x

Browse Source
This commit is contained in:
Uwe Steinmann 2016-04-15 13:22:33 +02:00
commit 9a44f8439e
10 changed files with 74 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
out/out.ApprovalSummary.php
View File

@ -31,16 +31,20 @@ include("../inc/inc.Authentication.php");
*/ */
require_once("SeedDMS/Preview.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()) { if ($user->isGuest()) {
UI::exitError(getMLText("my_documents"),getMLText("access_denied")); 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) { if($view) {
$view->setParam('cachedir', $settings->_cacheDir); $view->setParam('cachedir', $settings->_cacheDir);
$view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('previewWidthList', $settings->_previewWidthList);
$view->setParam('previewconverters', $settings->_converters['preview']);
$view->setParam('timeout', $settings->_cmdTimeout); $view->setParam('timeout', $settings->_cmdTimeout);
$view->setParam('accessobject', $accessop);
$view($_GET); $view($_GET);
exit; exit;
} }

16
out/out.ReceiptSummary.php
View File

@ -27,13 +27,25 @@ include("../inc/inc.DBInit.php");
include("../inc/inc.ClassUI.php"); include("../inc/inc.ClassUI.php");
include("../inc/inc.Authentication.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()) { if ($user->isGuest()) {
UI::exitError(getMLText("my_documents"),getMLText("access_denied")); 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) { 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); $view($_GET);
exit; exit;
} }

8
out/out.ReviewSummary.php
View File

@ -32,16 +32,20 @@ include("../inc/inc.Authentication.php");
*/ */
require_once("SeedDMS/Preview.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()) { if ($user->isGuest()) {
UI::exitError(getMLText("my_documents"),getMLText("access_denied")); 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) { if($view) {
$view->setParam('cachedir', $settings->_cacheDir); $view->setParam('cachedir', $settings->_cacheDir);
$view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('previewWidthList', $settings->_previewWidthList);
$view->setParam('previewconverters', $settings->_converters['preview']);
$view->setParam('timeout', $settings->_cmdTimeout); $view->setParam('timeout', $settings->_cmdTimeout);
$view->setParam('accessobject', $accessop);
$view($_GET); $view($_GET);
exit; exit;
} }

7
out/out.TransmittalMgr.php
View File

@ -31,6 +31,10 @@ include("../inc/inc.Authentication.php");
*/ */
require_once("SeedDMS/Preview.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()) { if ($user->isGuest()) {
UI::exitError(getMLText("my_transmittals"),getMLText("access_denied")); UI::exitError(getMLText("my_transmittals"),getMLText("access_denied"));
} }
@ -41,13 +45,12 @@ if(isset($_GET['transmittalid']) && $_GET['transmittalid']) {
$seltransmittal = null; $seltransmittal = null;
} }
$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
if($view) { if($view) {
$view->setParam('seltransmittal', $seltransmittal); $view->setParam('seltransmittal', $seltransmittal);
$view->setParam('cachedir', $settings->_cacheDir); $view->setParam('cachedir', $settings->_cacheDir);
$view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('previewWidthList', $settings->_previewWidthList);
$view->setParam('previewconverters', $settings->_converters['preview']); $view->setParam('previewconverters', $settings->_converters['preview']);
$view->setParam('accessobject', $accessop);
$view($_GET); $view($_GET);
exit; exit;
} }

7
out/out.WorkflowSummary.php
View File

@ -32,18 +32,21 @@ include("../inc/inc.Authentication.php");
*/ */
require_once("SeedDMS/Preview.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()) { if ($user->isGuest()) {
UI::exitError(getMLText("my_documents"),getMLText("access_denied")); 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) { if($view) {
$view->setParam('cachedir', $settings->_cacheDir); $view->setParam('cachedir', $settings->_cacheDir);
$view->setParam('workflowmode', $settings->_workflowMode); $view->setParam('workflowmode', $settings->_workflowMode);
$view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('previewWidthList', $settings->_previewWidthList);
$view->setParam('previewconverters', $settings->_converters['preview']); $view->setParam('previewconverters', $settings->_converters['preview']);
$view->setParam('timeout', $settings->_cmdTimeout); $view->setParam('timeout', $settings->_cmdTimeout);
$view->setParam('accessobject', $accessop);
$view($_GET); $view($_GET);
exit; exit;
} }

2
views/bootstrap/class.ApprovalSummary.php
View File

@ -36,9 +36,11 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
$user = $this->params['user']; $user = $this->params['user'];
$cachedir = $this->params['cachedir']; $cachedir = $this->params['cachedir'];
$previewwidth = $this->params['previewWidthList']; $previewwidth = $this->params['previewWidthList'];
$previewconverters = $this->params['previewconverters'];
$timeout = $this->params['timeout']; $timeout = $this->params['timeout'];
$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout); $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
$previewer->setConverters($previewconverters);
$this->htmlStartPage(getMLText("approval_summary")); $this->htmlStartPage(getMLText("approval_summary"));
$this->globalNavigation(); $this->globalNavigation();

16
views/bootstrap/class.CheckOutSummary.php
View File

@ -34,6 +34,13 @@ class SeedDMS_View_CheckOutSummary extends SeedDMS_Bootstrap_Style {
function show() { /* {{{ */ function show() { /* {{{ */
$dms = $this->params['dms']; $dms = $this->params['dms'];
$user = $this->params['user']; $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->htmlStartPage(getMLText("my_documents"));
$this->globalNavigation(); $this->globalNavigation();
@ -64,6 +71,7 @@ class SeedDMS_View_CheckOutSummary extends SeedDMS_Bootstrap_Style {
if ($printheader){ if ($printheader){
print "<table class=\"table-condensed\">"; print "<table class=\"table-condensed\">";
print "<thead>\n<tr>\n"; print "<thead>\n<tr>\n";
print "<th></th>\n";
print "<th>".getMLText("name")."</th>\n"; print "<th>".getMLText("name")."</th>\n";
print "<th>".getMLText("owner")."</th>\n"; print "<th>".getMLText("owner")."</th>\n";
print "<th>".getMLText("status")."</th>\n"; print "<th>".getMLText("status")."</th>\n";
@ -75,6 +83,14 @@ class SeedDMS_View_CheckOutSummary extends SeedDMS_Bootstrap_Style {
} }
print "<tr>\n"; print "<tr>\n";
$previewer->createPreview($version);
print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
if($previewer->hasPreview($version)) {
print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
} else {
print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
}
print "</a></td>";
print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">".htmlspecialchars($document->getName())."</a></td>"; print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">".htmlspecialchars($document->getName())."</a></td>";
print "<td>".htmlspecialchars($owner->getFullName())."</td>"; print "<td>".htmlspecialchars($owner->getFullName())."</td>";
print "<td>".getOverallStatusText($st["status"])."</td>"; print "<td>".getOverallStatusText($st["status"])."</td>";

16
views/bootstrap/class.ReceiptSummary.php
View File

@ -34,6 +34,13 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style {
function show() { /* {{{ */ function show() { /* {{{ */
$dms = $this->params['dms']; $dms = $this->params['dms'];
$user = $this->params['user']; $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->htmlStartPage(getMLText("my_documents"));
$this->globalNavigation(); $this->globalNavigation();
@ -66,6 +73,7 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style {
if ($printheader){ if ($printheader){
print "<table class=\"table-condensed\">"; print "<table class=\"table-condensed\">";
print "<thead>\n<tr>\n"; print "<thead>\n<tr>\n";
print "<th></th>\n";
print "<th>".getMLText("name")."</th>\n"; print "<th>".getMLText("name")."</th>\n";
print "<th>".getMLText("owner")."</th>\n"; print "<th>".getMLText("owner")."</th>\n";
print "<th>".getMLText("status")."</th>\n"; print "<th>".getMLText("status")."</th>\n";
@ -77,6 +85,14 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style {
} }
print "<tr>\n"; print "<tr>\n";
$previewer->createPreview($version);
print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
if($previewer->hasPreview($version)) {
print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
} else {
print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
}
print "</a></td>";
print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">".htmlspecialchars($document->getName())."</a></td>"; print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">".htmlspecialchars($document->getName())."</a></td>";
print "<td>".htmlspecialchars($owner->getFullName())."</td>"; print "<td>".htmlspecialchars($owner->getFullName())."</td>";
print "<td>".getOverallStatusText($st["status"])."</td>"; print "<td>".getOverallStatusText($st["status"])."</td>";

2
views/bootstrap/class.ReviewSummary.php
View File

@ -36,9 +36,11 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
$user = $this->params['user']; $user = $this->params['user'];
$cachedir = $this->params['cachedir']; $cachedir = $this->params['cachedir'];
$previewwidth = $this->params['previewWidthList']; $previewwidth = $this->params['previewWidthList'];
$previewconverters = $this->params['previewconverters'];
$timeout = $this->params['timeout']; $timeout = $this->params['timeout'];
$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout); $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
$previewer->setConverters($previewconverters);
$this->htmlStartPage(getMLText("my_documents")); $this->htmlStartPage(getMLText("my_documents"));
$this->globalNavigation(); $this->globalNavigation();

4
views/bootstrap/class.TransmittalMgr.php
View File

@ -230,9 +230,9 @@ class SeedDMS_View_TransmittalMgr extends SeedDMS_Bootstrap_Style {
$cachedir = $this->params['cachedir']; $cachedir = $this->params['cachedir'];
$previewwidth = $this->params['previewWidthList']; $previewwidth = $this->params['previewWidthList'];
$previewconverters = $this->params['previewconverters']; $previewconverters = $this->params['previewconverters'];
$timeout = $this->params['timeout'];
$db = $dms->getDB(); $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
$previewer->setConverters($previewconverters); $previewer->setConverters($previewconverters);
$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js'); $this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');