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

add callback onCheckAccessDocument(), reload workflow

Browse Source
This commit is contained in:
Uwe Steinmann 2018-07-12 21:10:16 +02:00
parent 4c6f40c29c
commit 34255ecded
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
SeedDMS_Core/Core/inc.ClassDocument.php
View File

@ -1022,6 +1022,15 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
if(!$user) if(!$user)
return M_NONE; return M_NONE;
/* Check if 'onCheckAccessDocument' callback is set */
if(isset($this->_dms->callbacks['onCheckAccessDocument'])) {
foreach($this->_dms->callbacks['onCheckAccessDocument'] as $callback) {
if(($ret = call_user_func($callback[0], $callback[1], $this, $user)) > 0) {
return $ret;
}
}
}
/* Administrators have unrestricted access */ /* Administrators have unrestricted access */
if ($user->isAdmin()) return M_ALL; if ($user->isAdmin()) return M_ALL;
@ -1640,7 +1649,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
$classname = $this->_dms->getClassname('documentcontent'); $classname = $this->_dms->getClassname('documentcontent');
$user = $this->_dms->getLoggedInUser(); $user = $this->_dms->getLoggedInUser();
foreach ($resArr as $row) { foreach ($resArr as $row) {
/** @var SeedDMS_Core_DocumentContent $content */ /** @var SeedDMS_Core_DocumentContent $content */
$content = new $classname($row["id"], $this, $row["version"], $row["comment"], $row["date"], $row["createdBy"], $row["dir"], $row["orgFileName"], $row["fileType"], $row["mimeType"], $row['fileSize'], $row['checksum']); $content = new $classname($row["id"], $this, $row["version"], $row["comment"], $row["date"], $row["createdBy"], $row["dir"], $row["orgFileName"], $row["fileType"], $row["mimeType"], $row['fileSize'], $row['checksum']);
if($user) { if($user) {
if($content->getAccessMode($user) >= M_READ) if($content->getAccessMode($user) >= M_READ)
@ -2651,6 +2660,9 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
if (!$ignorecurrentstatus && ($st["status"]==S_OBSOLETE || $st["status"]==S_REJECTED || $st["status"]==S_EXPIRED )) return; if (!$ignorecurrentstatus && ($st["status"]==S_OBSOLETE || $st["status"]==S_REJECTED || $st["status"]==S_EXPIRED )) return;
unset($this->_workflow); // force to be reloaded from DB
$hasworkflow = $this->getWorkflow() ? true : false;
$pendingReview=false; $pendingReview=false;
unset($this->_reviewStatus); // force to be reloaded from DB unset($this->_reviewStatus); // force to be reloaded from DB
$reviewStatus=$this->getReviewStatus(); $reviewStatus=$this->getReviewStatus();
@ -2969,7 +2981,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
$this->getStatus(); $this->getStatus();
} }
if ($this->_status["status"]==$status) { if ($this->_status["status"]==$status) {
return false; return true;
} }
if($date) if($date)
$ddate = $db->qstr($date); $ddate = $db->qstr($date);