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

set new/old status code in notification mail, fix sending mail

Browse Source
This commit is contained in:
Uwe Steinmann 2021-02-10 15:36:52 +01:00
parent 6fa0849924
commit 3931227789
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
op/op.ApproveDocument.php
View File

@ -89,7 +89,7 @@ if($_FILES["approvalfile"]["tmp_name"]) {
} }
$controller->setParam('document', $document); $controller->setParam('document', $document);
$controller->setParam('content', $latestContent); $controller->setParam('content', $content);
$controller->setParam('approvalstatus', $_POST["approvalStatus"]); $controller->setParam('approvalstatus', $_POST["approvalStatus"]);
$controller->setParam('approvaltype', $_POST["approvalType"]); $controller->setParam('approvaltype', $_POST["approvalType"]);
if ($_POST["approvalType"] == "grp") { if ($_POST["approvalType"] == "grp") {
@ -147,8 +147,9 @@ if($olddocstatus['status'] != $newdocstatus['status']) {
$params = array(); $params = array();
$params['name'] = $document->getName(); $params['name'] = $document->getName();
$params['folder_path'] = $folder->getFolderPathPlain(); $params['folder_path'] = $folder->getFolderPathPlain();
$params['status'] = getOverallStatusText($status); $params['status'] = getOverallStatusText($olddocstatus['status']).' → '.getOverallStatusText($newdocstatus['status']);
$params['new_status_code'] = $status; $params['new_status_code'] = $newdocstatus['status'];
$params['old_status_code'] = $olddocstatus['status'];
$params['comment'] = $document->getComment(); $params['comment'] = $document->getComment();
$params['username'] = $user->getFullName(); $params['username'] = $user->getFullName();
$params['sitename'] = $settings->_siteName; $params['sitename'] = $settings->_siteName;

2
op/op.OverrideContentStatus.php
View File

@ -94,7 +94,7 @@ if ($overrideStatus != $overallStatus["status"]) {
$params = array(); $params = array();
$params['name'] = $document->getName(); $params['name'] = $document->getName();
$params['folder_path'] = $folder->getFolderPathPlain(); $params['folder_path'] = $folder->getFolderPathPlain();
$params['status'] = getOverallStatusText($overrideStatus); $params['status'] = getOverallStatusText($overallStatus['status']).' → '.getOverallStatusText($overrideStatus);
$params['new_status_code'] = $overrideStatus; $params['new_status_code'] = $overrideStatus;
$params['old_status_code'] = $overallStatus["status"]; $params['old_status_code'] = $overallStatus["status"];
$params['username'] = $user->getFullName(); $params['username'] = $user->getFullName();

5
op/op.ReviewDocument.php
View File

@ -142,8 +142,9 @@ if($olddocstatus['status'] != $newdocstatus['status']) {
$params = array(); $params = array();
$params['name'] = $document->getName(); $params['name'] = $document->getName();
$params['folder_path'] = $folder->getFolderPathPlain(); $params['folder_path'] = $folder->getFolderPathPlain();
$params['status'] = getReviewStatusText(S_REJECTED); $params['status'] = getOverallStatusText($olddocstatus['status']).' → '.getReviewStatusText($newdocstatus['status']);
$params['new_status_code'] = S_REJECTED; $params['new_status_code'] = $newdocstatus['status'];
$params['old_status_code'] = $olddocstatus['status'];
$params['username'] = $user->getFullName(); $params['username'] = $user->getFullName();
$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
$params['sitename'] = $settings->_siteName; $params['sitename'] = $settings->_siteName;

7
op/op.ReviseDocument.php
View File

@ -82,7 +82,7 @@ if (!isset($_POST["revisionStatus"]) || !is_numeric($_POST["revisionStatus"]) ||
} }
$controller->setParam('document', $document); $controller->setParam('document', $document);
$controller->setParam('content', $latestContent); $controller->setParam('content', $content);
$controller->setParam('revisionstatus', $_POST["revisionStatus"]); $controller->setParam('revisionstatus', $_POST["revisionStatus"]);
$controller->setParam('revisiontype', $_POST["revisionType"]); $controller->setParam('revisiontype', $_POST["revisionType"]);
if ($_POST["revisionType"] == "grp") { if ($_POST["revisionType"] == "grp") {
@ -97,7 +97,6 @@ if(!$controller->run()) {
UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText($controller->getErrorMsg())); UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText($controller->getErrorMsg()));
} }
$newdocstatus = $content->getStatus();
if ($_POST["revisionType"] == "ind" || $_POST["revisionType"] == "grp") { if ($_POST["revisionType"] == "ind" || $_POST["revisionType"] == "grp") {
if($notifier) { if($notifier) {
$nl=$document->getNotifyList(); $nl=$document->getNotifyList();
@ -122,6 +121,7 @@ if ($_POST["revisionType"] == "ind" || $_POST["revisionType"] == "grp") {
} }
/* Send notification about status change only if status has actually changed */ /* Send notification about status change only if status has actually changed */
$newdocstatus = $content->getStatus();
if($olddocstatus['status'] != $newdocstatus['status']) { if($olddocstatus['status'] != $newdocstatus['status']) {
// Send notification to subscribers. // Send notification to subscribers.
if($notifier) { if($notifier) {
@ -131,8 +131,9 @@ if($olddocstatus['status'] != $newdocstatus['status']) {
$params = array(); $params = array();
$params['name'] = $document->getName(); $params['name'] = $document->getName();
$params['folder_path'] = $folder->getFolderPathPlain(); $params['folder_path'] = $folder->getFolderPathPlain();
$params['status'] = getOverallStatusText($newdocstatus['status']); $params['status'] = getOverallStatusText($olddocstatus['status']).' → '.getOverallStatusText($newdocstatus['status']);
$params['new_status_code'] = $newdocstatus['status']; $params['new_status_code'] = $newdocstatus['status'];
$params['old_status_code'] = $olddocstatus['status'];
$params['username'] = $user->getFullName(); $params['username'] = $user->getFullName();
$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
$params['sitename'] = $settings->_siteName; $params['sitename'] = $settings->_siteName;