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

take out sql code and replace with function from SeedDMS_Core_Document

Browse Source
This commit is contained in:
Uwe Steinmann 2015-12-09 17:49:22 +01:00
parent 2575a675aa
commit 244a90e405
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
op/op.SetReviewersApprovers.php
View File

@ -113,9 +113,6 @@ foreach ($pIndRev as $p) {
// Proposed reviewer is not a current reviewer, so add as a new
// reviewer.
$res = $content->addIndReviewer($docAccess["users"][$accessIndex["i"][$p]], $user);
$unm = $docAccess["users"][$accessIndex["i"][$p]]->getFullName();
$uml = $docAccess["users"][$accessIndex["i"][$p]]->getEmail();
switch ($res) {
case 0:
// Send an email notification to the new reviewer.
@ -160,6 +157,12 @@ foreach ($pIndRev as $p) {
}
}
}
/* $reviewIndex['i'] has now those individual reviewers which are left over
* and must be removed. There are two cases to distinguish: 1. The user may
* access the document but shall no longer review the document, 2. the user
* many not access the document any more.
*/
if (count($reviewIndex["i"]) > 0) {
foreach ($reviewIndex["i"] as $rx=>$rv) {
if ($rv["status"] == 0) {
@ -167,14 +170,15 @@ if (count($reviewIndex["i"]) > 0) {
if (!isset($docAccess["users"][$accessIndex["i"][$rx]])) {
// User does not have any review privileges for this document
// revision or does not exist.
/*
$queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`, `comment`, `date`, `userID`) ".
"VALUES ('". $reviewStatus[$rv["idx"]]["reviewID"] ."', '-2', '".getMLText("removed_reviewer")."', NOW(), '". $user->getID() ."')";
$res = $db->getResult($queryStr);
*/
$res = $content->delIndReviewer($dms->getUser($reviewStatus[$rv["idx"]]["required"]), $user, getMLText("removed_reviewer"));
}
else {
$res = $content->delIndReviewer($docAccess["users"][$accessIndex["i"][$rx]], $user);
$unm = $docAccess["users"][$accessIndex["i"][$rx]]->getFullName();
$uml = $docAccess["users"][$accessIndex["i"][$rx]]->getEmail();
switch ($res) {
case 0:
// Send an email notification to the reviewer.
@ -221,7 +225,6 @@ foreach ($pGrpRev as $p) {
// Proposed reviewer is not a current reviewer, so add as a new
// reviewer.
$res = $content->addGrpReviewer($docAccess["groups"][$accessIndex["g"][$p]], $user);
$gnm = $docAccess["groups"][$accessIndex["g"][$p]]->getName();
switch ($res) {
case 0:
// Send an email notification to the new reviewer.
@ -271,13 +274,15 @@ if (count($reviewIndex["g"]) > 0) {
if (!isset($docAccess["groups"][$accessIndex["g"][$rx]])) {
// Group does not have any review privileges for this document
// revision or does not exist.
/*
$queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`, `comment`, `date`, `userID`) ".
"VALUES ('". $reviewStatus[$rv["idx"]]["reviewID"] ."', '-2', '".getMLText("removed_reviewer")."', NOW(), '". $user->getID() ."')";
$res = $db->getResult($queryStr);
*/
$res = $content->delGrpReviewer($dms->getGroup($reviewStatus[$rv["idx"]]["required"]), $user, getMLText("removed_reviewer"));
}
else {
$res = $content->delGrpReviewer($docAccess["groups"][$accessIndex["g"][$rx]], $user);
$gnm = $docAccess["groups"][$accessIndex["g"][$rx]]->getName();
switch ($res) {
case 0:
// Send an email notification to the review group.
@ -328,8 +333,6 @@ foreach ($pIndApp as $p) {
// Proposed approver is not a current approver, so add as a new
// approver.
$res = $content->addIndApprover($docAccess["users"][$accessIndex["i"][$p]], $user);
$unm = $docAccess["users"][$accessIndex["i"][$p]]->getFullName();
$uml = $docAccess["users"][$accessIndex["i"][$p]]->getEmail();
switch ($res) {
case 0:
// Send an email notification to the new approver.
@ -379,14 +382,15 @@ if (count($approvalIndex["i"]) > 0) {
if (!isset($docAccess["users"][$accessIndex["i"][$rx]])) {
// User does not have any approval privileges for this document
// revision or does not exist.
/*
$queryStr = "INSERT INTO `tblDocumentApproveLog` (`approveID`, `status`, `comment`, `date`, `userID`) ".
"VALUES ('". $approvalStatus[$rv["idx"]]["approveID"] ."', '-2', '".getMLText("removed_approver")."', NOW(), '". $user->getID() ."')";
$res = $db->getResult($queryStr);
*/
$res = $content->delIndApprover($dms->getUser($approvalStatus[$rv["idx"]]["required"]), $user, getMLText("removed_approver"));
}
else {
$res = $content->delIndApprover($docAccess["users"][$accessIndex["i"][$rx]], $user);
$unm = $docAccess["users"][$accessIndex["i"][$rx]]->getFullName();
$uml = $docAccess["users"][$accessIndex["i"][$rx]]->getEmail();
switch ($res) {
case 0:
// Send an email notification to the approver.
@ -433,7 +437,6 @@ foreach ($pGrpApp as $p) {
// Proposed approver is not a current approver, so add as a new
// approver.
$res = $content->addGrpApprover($docAccess["groups"][$accessIndex["g"][$p]], $user);
$gnm = $docAccess["groups"][$accessIndex["g"][$p]]->getName();
switch ($res) {
case 0:
// Send an email notification to the new approver.
@ -483,14 +486,15 @@ if (count($approvalIndex["g"]) > 0) {
if (!isset($docAccess["groups"][$accessIndex["g"][$rx]])) {
// Group does not have any approval privileges for this document
// revision or does not exist.
/*
$queryStr = "INSERT INTO `tblDocumentApproveLog` (`approveID`, `status`, `comment`, `date`, `userID`) ".
"VALUES ('". $approvalStatus[$rv["idx"]]["approveID"] ."', '-2', '".getMLText("removed_approver")."', NOW(), '". $user->getID() ."')";
$res = $db->getResult($queryStr);
*/
$res = $content->delGrpApprover($dms->getGroup($approvalStatus[$rv["idx"]]["required"]), $user, getMLText("removed_approver"));
}
else {
$res = $content->delGrpApprover($docAccess["groups"][$accessIndex["g"][$rx]], $user);
$gnm = $docAccess["groups"][$accessIndex["g"][$rx]]->getName();
switch ($res) {
case 0:
// Send an email notification to the approval group.