diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php
index 98014ce7f..e75323c93 100644
--- a/views/bootstrap/class.ObjectCheck.php
+++ b/views/bootstrap/class.ObjectCheck.php
@@ -64,11 +64,13 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
$document->verifyLastestContentExpriry();
if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
- $txt = $this->callHook('documentListItem', $document, $previewer, false);
+ $extracontent = array();
+ $extracontent['below_title'] = $this->getListRowPath($document);
+ $txt = $this->callHook('documentListItem', $document, $previewer, false, 'list', $extracontent);
if(is_string($txt))
echo $txt;
else
- echo $this->documentListRow($document, $previewer, false);
+ echo $this->documentListRow($document, $previewer, false, 0, $extracontent);
} else {
$noaccess++;
}
@@ -118,11 +120,13 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
if($object['object']->isType('document')) {
$document = $object['object'];
if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
- $txt = $this->callHook('documentListItem', $document, $previewer, false);
+ $extracontent = array();
+ $extracontent['below_title'] = $this->getListRowPath($document);
+ $txt = $this->callHook('documentListItem', $document, $previewer, true, 'list', $extracontent);
if(is_string($txt))
echo $txt;
else
- echo $this->documentListRow($document, $previewer, true);
+ echo $this->documentListRow($document, $previewer, true, 0, $extracontent);
echo "
".$object['msg'];
if($repair)
$document->repair();
@@ -133,12 +137,14 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
} elseif($object['object']->isType('documentcontent')) {
$document = $object['object']->getDocument();
if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+ $extracontent = array();
+ $extracontent['below_title'] = $this->getListRowPath($document);
echo $this->documentListRowStart($document);
- $txt = $this->callHook('documentListItem', $document, $previewer, true, $object['object']->getVersion());
+ $txt = $this->callHook('documentListItem', $document, $previewer, true, $object['object']->getVersion(), $extracontent);
if(is_string($txt))
echo $txt;
else
- echo $this->documentListRow($document, $previewer, true, $object['object']->getVersion());
+ echo $this->documentListRow($document, $previewer, true, $object['object']->getVersion(), $extracontent);
echo " | ".$object['msg']." | ";
echo $this->documentListRowEnd($document);
}
@@ -399,10 +405,22 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
$user = $this->params['user'];
$folder = $this->params['folder'];
$duplicateversions = $this->params['duplicateversions'];
+ $conversionmgr = $this->params['conversionmgr'];
+ $cachedir = $this->params['cachedir'];
+ $previewwidth = $this->params['previewWidthList'];
+ $previewconverters = $this->params['previewConverters'];
+ $timeout = $this->params['timeout'];
+
+ $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+ if($conversionmgr)
+ $previewer->setConversionMgr($conversionmgr);
+ else
+ $previewer->setConverters($previewconverters);
$this->contentHeading(getMLText("duplicate_content"));
if($duplicateversions) {
+ /*
print "";
print "\n\n";
print "| ".getMLText("document")." | \n";
@@ -426,6 +444,39 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
print "
\n";
}
print "
\n";
+ */
+
+ print "";
+ print "\n\n";
+ print " | \n";
+ print "".getMLText("name")." | \n";
+ print "".getMLText("status")." | \n";
+ print "".getMLText("action")." | \n";
+ print "".getMLText("duplicates")." | \n";
+ print " | \n";
+ print "
\n\n\n";
+ foreach($duplicateversions as $rec) {
+ $version = $rec['content'];
+ $document = $version->getDocument();
+ if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+ $extracontent = array();
+ $extracontent['below_title'] = $this->getListRowPath($document);
+ $txt = $this->callHook('documentListItem', $document, $previewer, true, 'list', $extracontent);
+ if(is_string($txt))
+ echo $txt;
+ else
+ echo $this->documentListRow($document, $previewer, true, $version->getVersion(), $extracontent);
+ echo "";
+ foreach($rec['duplicates'] as $duplicate) {
+ $dupdoc = $duplicate->getDocument();
+ print "getID()."\">".$dupdoc->getID()."/".$duplicate->getVersion()."";
+ echo " ";
+ }
+ echo " | ";
+ echo $this->documentListRowEnd($document);
+ }
+ }
+ print "
\n";
}
} /* }}} */
@@ -650,7 +701,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
print "".$ug." | ";
print "".$rec['name']." | ".$rec['version']." | ";
print "".$rec['required']." | ";
- print "".getMLText('delete')." | ";
+ print "".getMLText('delete')." | ";
print "\n";
}
print "\n";