gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-12-13 11:03:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use $dms->getDocument() in function for checking objects

Browse Source
This commit is contained in:
Uwe Steinmann 2020-12-18 07:51:13 +01:00
parent 02a0ef95f9
commit 9c97564cb4
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
SeedDMS_Core/Core/inc.ClassDMS.php
View File

@ -2934,11 +2934,14 @@ class SeedDMS_Core_DMS {
/** @var SeedDMS_Core_Document[] $versions */ /** @var SeedDMS_Core_Document[] $versions */
$versions = array(); $versions = array();
foreach($resArr as $row) { foreach($resArr as $row) {
/** @var SeedDMS_Core_Document $document */ $document = $this->getDocument($row['document']);
$document = new $this->classnames['document']($row['document'], '', '', '', '', '', '', '', '', '', '', ''); /* getting the document can fail if it is outside the root folder
$document->setDMS($this); * and checkWithinRootDir is enabled.
$version = new $this->classnames['documentcontent']($row['id'], $document, $row['version'], $row['comment'], $row['date'], $row['createdBy'], $row['dir'], $row['orgFileName'], $row['fileType'], $row['mimeType'], $row['fileSize'], $row['checksum'], $row['fileSize'], $row['checksum']); */
$versions[] = $version; if($document) {
$version = new $this->classnames['documentcontent']($row['id'], $document, $row['version'], $row['comment'], $row['date'], $row['createdBy'], $row['dir'], $row['orgFileName'], $row['fileType'], $row['mimeType'], $row['fileSize'], $row['checksum'], $row['fileSize'], $row['checksum']);
$versions[] = $version;
}
} }
return $versions; return $versions;
@ -2961,11 +2964,14 @@ class SeedDMS_Core_DMS {
/** @var SeedDMS_Core_Document[] $versions */ /** @var SeedDMS_Core_Document[] $versions */
$versions = array(); $versions = array();
foreach($resArr as $row) { foreach($resArr as $row) {
/** @var SeedDMS_Core_Document $document */ $document = $this->getDocument($row['document']);
$document = new $this->classnames['document']($row['document'], '', '', '', '', '', '', '', '', '', '', ''); /* getting the document can fail if it is outside the root folder
$document->setDMS($this); * and checkWithinRootDir is enabled.
$version = new $this->classnames['documentcontent']($row['id'], $document, $row['version'], $row['comment'], $row['date'], $row['createdBy'], $row['dir'], $row['orgFileName'], $row['fileType'], $row['mimeType'], $row['fileSize'], $row['checksum']); */
$versions[] = $version; if($document) {
$version = new $this->classnames['documentcontent']($row['id'], $document, $row['version'], $row['comment'], $row['date'], $row['createdBy'], $row['dir'], $row['orgFileName'], $row['fileType'], $row['mimeType'], $row['fileSize'], $row['checksum']);
$versions[] = $version;
}
} }
return $versions; return $versions;
@ -2989,12 +2995,17 @@ class SeedDMS_Core_DMS {
$versions = array(); $versions = array();
foreach($resArr as $row) { foreach($resArr as $row) {
$document = $this->getDocument($row['document']); $document = $this->getDocument($row['document']);
$version = new $this->classnames['documentcontent']($row['id'], $document, $row['version'], $row['comment'], $row['date'], $row['createdBy'], $row['dir'], $row['orgFileName'], $row['fileType'], $row['mimeType'], $row['fileSize'], $row['checksum']); /* getting the document can fail if it is outside the root folder
if(!isset($versions[$row['dupid']])) { * and checkWithinRootDir is enabled.
$versions[$row['id']]['content'] = $version; */
$versions[$row['id']]['duplicates'] = array(); if($document) {
} else $version = new $this->classnames['documentcontent']($row['id'], $document, $row['version'], $row['comment'], $row['date'], $row['createdBy'], $row['dir'], $row['orgFileName'], $row['fileType'], $row['mimeType'], $row['fileSize'], $row['checksum']);
$versions[$row['dupid']]['duplicates'][] = $version; if(!isset($versions[$row['dupid']])) {
$versions[$row['id']]['content'] = $version;
$versions[$row['id']]['duplicates'] = array();
} else
$versions[$row['dupid']]['duplicates'][] = $version;
}
} }
return $versions; return $versions;