mirror of
https://git.code.sf.net/p/seeddms/code
synced 2024-11-26 15:32:13 +00:00
use new methods to inform approvers/reviewers about deleting/adding a review/approval
This commit is contained in:
parent
df8e0c29e9
commit
200806effd
|
@ -132,19 +132,7 @@ foreach ($pIndRev as $p) {
|
|||
// Send an email notification to the new reviewer.
|
||||
if($settings->_enableNotificationAppRev) {
|
||||
if ($notifier) {
|
||||
$subject = "review_request_email_subject";
|
||||
$message = "review_request_email_body";
|
||||
$params = array();
|
||||
$params['name'] = $document->getName();
|
||||
$params['folder_path'] = $folder->getFolderPathPlain();
|
||||
$params['version'] = $content->getVersion();
|
||||
$params['comment'] = $content->getComment();
|
||||
$params['username'] = $user->getFullName();
|
||||
$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
|
||||
$params['sitename'] = $settings->_siteName;
|
||||
$params['http_root'] = $settings->_httpRoot;
|
||||
|
||||
$notifier->toIndividual($user, $docAccess["users"][$accessIndex["i"][$p]], $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
|
||||
$notifier->sendAddReviewMail($content, $user, $docAccess["users"][$accessIndex["i"][$p]]);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
@ -198,6 +186,8 @@ if (count($reviewIndex["i"]) > 0) {
|
|||
// Send an email notification to the reviewer.
|
||||
if($settings->_enableNotificationAppRev) {
|
||||
if ($notifier) {
|
||||
$notifier->sendDeleteReviewMail($content, $user, $docAccess["users"][$accessIndex["i"][$rx]]);
|
||||
/*
|
||||
$subject = "review_deletion_email_subject";
|
||||
$message = "review_deletion_email_body";
|
||||
$params = array();
|
||||
|
@ -211,6 +201,7 @@ if (count($reviewIndex["i"]) > 0) {
|
|||
$params['http_root'] = $settings->_httpRoot;
|
||||
|
||||
$notifier->toIndividual($user, $docAccess["users"][$accessIndex["i"][$rx]], $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
|
||||
*/
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
@ -244,19 +235,7 @@ foreach ($pGrpRev as $p) {
|
|||
// Send an email notification to the new reviewer.
|
||||
if($settings->_enableNotificationAppRev) {
|
||||
if ($notifier) {
|
||||
$subject = "review_request_email_subject";
|
||||
$message = "review_request_email_body";
|
||||
$params = array();
|
||||
$params['name'] = $document->getName();
|
||||
$params['folder_path'] = $folder->getFolderPathPlain();
|
||||
$params['version'] = $content->getVersion();
|
||||
$params['comment'] = $content->getComment();
|
||||
$params['username'] = $user->getFullName();
|
||||
$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
|
||||
$params['sitename'] = $settings->_siteName;
|
||||
$params['http_root'] = $settings->_httpRoot;
|
||||
|
||||
$notifier->toGroup($user, $docAccess["groups"][$accessIndex["g"][$p]], $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
|
||||
$notifier->sendAddReviewMail($content, $user, $docAccess["groups"][$accessIndex["g"][$p]]);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
@ -302,6 +281,8 @@ if (count($reviewIndex["g"]) > 0) {
|
|||
// Send an email notification to the review group.
|
||||
if($settings->_enableNotificationAppRev) {
|
||||
if ($notifier) {
|
||||
$notifier->sendDeleteReviewMail($content, $user, $docAccess["groups"][$accessIndex["g"][$rx]]);
|
||||
/*
|
||||
$subject = "review_deletion_email_subject";
|
||||
$message = "review_deletion_email_body";
|
||||
$params = array();
|
||||
|
@ -315,6 +296,7 @@ if (count($reviewIndex["g"]) > 0) {
|
|||
$params['http_root'] = $settings->_httpRoot;
|
||||
|
||||
$notifier->toGroup($user, $docAccess["groups"][$accessIndex["g"][$rx]], $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
|
||||
*/
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
@ -363,20 +345,12 @@ foreach ($pIndApp as $p) {
|
|||
case 0:
|
||||
// Send an email notification to the new approver.
|
||||
if($settings->_enableNotificationAppRev) {
|
||||
/* Send notification only if document is currently not in review state,
|
||||
* because then the approvers will be informed anyway when review state
|
||||
* is left and approval state is entered.
|
||||
*/
|
||||
if ($overallStatus["status"]!=0 && $notifier) {
|
||||
$subject = "approval_request_email_subject";
|
||||
$message = "approval_request_email_body";
|
||||
$params = array();
|
||||
$params['name'] = $document->getName();
|
||||
$params['folder_path'] = $folder->getFolderPathPlain();
|
||||
$params['version'] = $content->getVersion();
|
||||
$params['comment'] = $content->getComment();
|
||||
$params['username'] = $user->getFullName();
|
||||
$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
|
||||
$params['sitename'] = $settings->_siteName;
|
||||
$params['http_root'] = $settings->_httpRoot;
|
||||
|
||||
$notifier->toIndividual($user, $docAccess["users"][$accessIndex["i"][$p]], $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
|
||||
$notifier->sendAddApprovalMail($content, $user, $docAccess["users"][$accessIndex["i"][$p]]);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
@ -422,6 +396,8 @@ if (count($approvalIndex["i"]) > 0) {
|
|||
// Send an email notification to the approver.
|
||||
if($settings->_enableNotificationAppRev) {
|
||||
if ($notifier) {
|
||||
$notifier->sendDeleteApprovalMail($content, $user, $docAccess["users"][$accessIndex["i"][$rx]]);
|
||||
/*
|
||||
$subject = "approval_deletion_email_subject";
|
||||
$message = "approval_deletion_email_body";
|
||||
$params = array();
|
||||
|
@ -435,6 +411,7 @@ if (count($approvalIndex["i"]) > 0) {
|
|||
$params['http_root'] = $settings->_httpRoot;
|
||||
|
||||
$notifier->toIndividual($user, $docAccess["users"][$accessIndex["i"][$rx]], $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
|
||||
*/
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
@ -467,20 +444,12 @@ foreach ($pGrpApp as $p) {
|
|||
case 0:
|
||||
// Send an email notification to the new approver.
|
||||
if($settings->_enableNotificationAppRev) {
|
||||
/* Send notification only if document is currently not in review state,
|
||||
* because then the approvers will be informed anyway when review state
|
||||
* is left and approval state is entered.
|
||||
*/
|
||||
if ($overallStatus["status"]!=0 && $notifier) {
|
||||
$subject = "approval_request_email_subject";
|
||||
$message = "approval_request_email_body";
|
||||
$params = array();
|
||||
$params['name'] = $document->getName();
|
||||
$params['folder_path'] = $folder->getFolderPathPlain();
|
||||
$params['version'] = $content->getVersion();
|
||||
$params['comment'] = $content->getComment();
|
||||
$params['username'] = $user->getFullName();
|
||||
$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
|
||||
$params['sitename'] = $settings->_siteName;
|
||||
$params['http_root'] = $settings->_httpRoot;
|
||||
|
||||
$notifier->toGroup($user, $docAccess["groups"][$accessIndex["g"][$p]], $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
|
||||
$notifier->sendAddApprovalMail($content, $user, $docAccess["groups"][$accessIndex["g"][$p]]);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
@ -526,6 +495,8 @@ if (count($approvalIndex["g"]) > 0) {
|
|||
// Send an email notification to the approval group.
|
||||
if($settings->_enableNotificationAppRev) {
|
||||
if ($notifier) {
|
||||
$notifier->sendDeleteApprovalMail($content, $user, $docAccess["groups"][$accessIndex["g"][$rx]]);
|
||||
/*
|
||||
$subject = "approval_deletion_email_subject";
|
||||
$message = "approval_deletion_email_body";
|
||||
$params = array();
|
||||
|
@ -539,6 +510,7 @@ if (count($approvalIndex["g"]) > 0) {
|
|||
$params['http_root'] = $settings->_httpRoot;
|
||||
|
||||
$notifier->toGroup($user, $docAccess["groups"][$accessIndex["g"][$rx]], $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
|
||||
*/
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
|
Loading…
Reference in New Issue
Block a user