gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-11-26 15:32:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move sending mails into inc.ClassNotificationService.php

Browse Source
This commit is contained in:
Uwe Steinmann 2024-04-04 13:58:36 +02:00
parent ad84609a49
commit aae9422e30
4 changed files with 26 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
op/op.ReceiptDocument.php
View File

@ -95,28 +95,8 @@ if(!$controller->run()) {
if ($_POST["receiptType"] == "ind" || $_POST["receiptType"] == "grp") { if ($_POST["receiptType"] == "ind" || $_POST["receiptType"] == "grp") {
if($notifier) { if($notifier) {
$nl=$document->getNotifyList(); $receiptlog = $latestContent->getReceiptLog();
$subject = "receipt_submit_email_subject"; $notifier->sendSubmittedReceiptMail($latestContent, $user, $receiptlog ? $receiptlog[0] : false);
$message = "receipt_submit_email_body";
$params = array();
$params['name'] = $document->getName();
$params['version'] = $version;
$params['folder_path'] = $folder->getFolderPathPlain();
$params['status'] = getReceiptStatusText($_POST["receiptStatus"]);
$params['comment'] = strip_tags($_POST['comment']);
$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->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
foreach ($nl["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
}
/* Send mail to owner only if the currently logged in user is not the
* owner and the owner is not already in the list of notifiers.
*/
// if($user->getID() != $document->getOwner()->getID() && false === SeedDMS_Core_DMS::inList($document->getOwner(), $nl['users']))
// $notifier->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
} }
} }

70
op/op.ReviseDocument.php
View File

@ -93,64 +93,26 @@ $controller->setParam('group', $group);
$controller->setParam('comment', $_POST["comment"]); $controller->setParam('comment', $_POST["comment"]);
$controller->setParam('onevotereject', $settings->_enableRevisionOneVoteReject); $controller->setParam('onevotereject', $settings->_enableRevisionOneVoteReject);
if(!$controller->run()) { if(!$controller->run()) {
UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText($controller->getErrorMsg())); $err = $controller->getErrorMsg();
if(is_string($err))
$errmsg = getMLText($err);
elseif(is_array($err)) {
$errmsg = getMLText($err[0], $err[1]);
} else {
$errmsg = $err;
}
UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText($errmsg));
} }
if ($_POST["revisionType"] == "ind" || $_POST["revisionType"] == "grp") { if($notifier) {
if($notifier) { if ($_POST["revisionType"] == "ind" || $_POST["revisionType"] == "grp") {
$nl=$document->getNotifyList(); $revisionlog = $latestContent->getRevisionLog();
$subject = "revision_submit_email_subject"; $notifier->sendSubmittedRevisionMail($latestContent, $user, $revisionlog ? $revisionlog[0] : false);
$message = "revision_submit_email_body";
$params = array();
$params['name'] = $document->getName();
$params['version'] = $version;
$params['folder_path'] = $folder->getFolderPathPlain();
$params['status'] = getRevisionStatusText($_POST["revisionStatus"]);
$params['comment'] = strip_tags($_POST['comment']);
$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->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
foreach ($nl["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
}
/* Send mail to owner only if the currently logged in user is not the
* owner and the owner is not already in the list of notifiers.
*/
// if($user->getID() != $document->getOwner()->getID() && false === SeedDMS_Core_DMS::inList($document->getOwner(), $nl['users']))
// $notifier->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
} }
}
/* 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($controller->oldstatus != $controller->newstatus)
if($olddocstatus['status'] != $newdocstatus['status']) { $notifier->sendChangedDocumentStatusMail($latestContent, $user, $controller->oldstatus);
// Send notification to subscribers.
if($notifier) {
$nl=$document->getNotifyList();
$subject = "document_status_changed_email_subject";
$message = "document_status_changed_email_body";
$params = array();
$params['name'] = $document->getName();
$params['folder_path'] = $folder->getFolderPathPlain();
$params['status'] = getOverallStatusText($olddocstatus['status']).' → '.getOverallStatusText($newdocstatus['status']);
$params['new_status_code'] = $newdocstatus['status'];
$params['old_status_code'] = $olddocstatus['status'];
$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->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
foreach ($nl["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
}
/* Send mail to owner only if the currently logged in user is not the
* owner and the owner is not already in the list of notifiers.
*/
// if($user->getID() != $document->getOwner()->getID() && false === SeedDMS_Core_DMS::inList($document->getOwner(), $nl['users']))
// $notifier->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
}
} }
header("Location:../out/out.ViewDocument.php?documentid=".$documentid."&currenttab=revision"); header("Location:../out/out.ViewDocument.php?documentid=".$documentid."&currenttab=revision");

60
op/op.SetRecipients.php
View File

@ -140,20 +140,7 @@ foreach ($pIndRev as $p) {
// Send an email notification to the new recipient. // Send an email notification to the new recipient.
if($settings->_enableNotificationAppRev) { if($settings->_enableNotificationAppRev) {
if ($notifier) { if ($notifier) {
$subject = "receipt_request_email_subject"; $notifier->sendAddReceiptMail($content, $user, $accessIndex["i"][$p]);
$message = "receipt_request_email_body";
$params = array();
$params['name'] = $document->getName();
$params['folder_path'] = $folder->getFolderPathPlain();
$params['version'] = $content->getVersion();
$params['comment'] = $content->getComment();
$params['recipient'] = $accessIndex["i"][$p]->getFullName();
$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, $accessIndex["i"][$p], $subject, $message, $params, SeedDMS_NotificationService::RECV_RECIPIENT);
} }
} }
break; break;
@ -187,20 +174,7 @@ if (count($receiptIndex["i"]) > 0) {
// Send an email notification to the recipients. // Send an email notification to the recipients.
if($settings->_enableNotificationAppRev) { if($settings->_enableNotificationAppRev) {
if ($notifier) { if ($notifier) {
$subject = "receipt_deletion_email_subject"; $notifier->sendDeleteReceiptMail($content, $user, $accessIndex["i"][$rx]);
$message = "receipt_deletion_email_body";
$params = array();
$params['name'] = $document->getName();
$params['folder_path'] = $folder->getFolderPathPlain();
$params['version'] = $content->getVersion();
$params['comment'] = $content->getComment();
$params['recipient'] = $accessIndex["i"][$rx]->getFullName();
$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, $accessIndex["i"][$rx], $subject, $message, $params, SeedDMS_NotificationService::RECV_RECIPIENT);
} }
} }
break; break;
@ -247,20 +221,7 @@ foreach ($pGrpRev as $p) {
// Send an email notification to the new recipient. // Send an email notification to the new recipient.
if($settings->_enableNotificationAppRev) { if($settings->_enableNotificationAppRev) {
if ($notifier) { if ($notifier) {
$subject = "receipt_request_email_subject"; $notifier->sendAddReceiptMail($content, $user, $accessIndex["g"][$p]);
$message = "receipt_request_email_body";
$params = array();
$params['name'] = $document->getName();
$params['folder_path'] = $folder->getFolderPathPlain();
$params['version'] = $content->getVersion();
$params['comment'] = $content->getComment();
$params['recipient'] = $accessIndex["g"][$p]->getName();
$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, $accessIndex["g"][$p], $subject, $message, $params, SeedDMS_NotificationService::RECV_RECIPIENT);
} }
} }
break; break;
@ -290,20 +251,7 @@ if (count($receiptIndex["g"]) > 0) {
// Send an email notification to the recipients group. // Send an email notification to the recipients group.
if($settings->_enableNotificationAppRev) { if($settings->_enableNotificationAppRev) {
if ($notifier) { if ($notifier) {
$subject = "receipt_deletion_email_subject"; $notifier->sendDeleteReceiptMail($content, $user, $accessIndex["g"][$rx]);
$message = "receipt_deletion_email_body";
$params = array();
$params['name'] = $document->getName();
$params['folder_path'] = $folder->getFolderPathPlain();
$params['version'] = $content->getVersion();
$params['comment'] = $content->getComment();
$params['recipient'] = $accessIndex["g"][$rx]->getName();
$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, $accessIndex["g"][$rx], $subject, $message, $params, SeedDMS_NotificationService::RECV_RECIPIENT);
} }
} }
break; break;

60
op/op.SetRevisors.php
View File

@ -127,20 +127,7 @@ foreach ($pIndRev as $p) {
// Send an email notification to the new recipient. // Send an email notification to the new recipient.
if($settings->_enableNotificationAppRev) { if($settings->_enableNotificationAppRev) {
if ($notifier) { if ($notifier) {
$subject = "revision_request_email_subject"; $notifier->sendAddRevisionMail($content, $user, $accessIndex["i"][$p]);
$message = "revision_request_email_body";
$params = array();
$params['name'] = $document->getName();
$params['folder_path'] = $folder->getFolderPathPlain();
$params['version'] = $content->getVersion();
$params['comment'] = $content->getComment();
$params['revisor'] = $accessIndex["i"][$p]->getFullName();
$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, $accessIndex["i"][$p], $subject, $message, $params, SeedDMS_NotificationService::RECV_REVISOR);
} }
} }
break; break;
@ -186,20 +173,7 @@ if (count($revisionIndex["i"]) > 0) {
// Send an email notification to the recipients. // Send an email notification to the recipients.
if($settings->_enableNotificationAppRev) { if($settings->_enableNotificationAppRev) {
if ($notifier) { if ($notifier) {
$subject = "revision_deletion_email_subject"; $notifier->sendDeleteRevisionMail($content, $user, $accessIndex["i"][$rx]);
$message = "revision_deletion_email_body";
$params = array();
$params['name'] = $document->getName();
$params['folder_path'] = $folder->getFolderPathPlain();
$params['version'] = $content->getVersion();
$params['comment'] = $content->getComment();
$params['revisor'] = $accessIndex["i"][$rx]->getFullName();
$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, $accessIndex["i"][$rx], $subject, $message, $params, SeedDMS_NotificationService::RECV_REVISOR);
} }
} }
break; break;
@ -234,20 +208,7 @@ foreach ($pGrpRev as $p) {
// Send an email notification to the new recipient. // Send an email notification to the new recipient.
if($settings->_enableNotificationAppRev) { if($settings->_enableNotificationAppRev) {
if ($notifier) { if ($notifier) {
$subject = "revision_request_email_subject"; $notifier->sendAddRevisionMail($content, $user, $accessIndex["g"][$p]);
$message = "revision_request_email_body";
$params = array();
$params['name'] = $document->getName();
$params['folder_path'] = $folder->getFolderPathPlain();
$params['version'] = $content->getVersion();
$params['comment'] = $content->getComment();
$params['revisor'] = $accessIndex["g"][$p]->getName();
$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, $accessIndex["g"][$p], $subject, $message, $params, SeedDMS_NotificationService::RECV_REVISOR);
} }
} }
break; break;
@ -289,20 +250,7 @@ if (count($revisionIndex["g"]) > 0) {
// Send an email notification to the recipients group. // Send an email notification to the recipients group.
if($settings->_enableNotificationAppRev) { if($settings->_enableNotificationAppRev) {
if ($notifier) { if ($notifier) {
$subject = "revision_deletion_email_subject"; $notifier->sendDeleteRevisionMail($content, $user, $accessIndex["g"][$rx]);
$message = "revision_deletion_email_body";
$params = array();
$params['name'] = $document->getName();
$params['folder_path'] = $folder->getFolderPathPlain();
$params['version'] = $content->getVersion();
$params['comment'] = $content->getComment();
$params['revisor'] = $accessIndex["g"][$rx]->getName();
$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, $accessIndex["g"][$rx], $subject, $message, $params, SeedDMS_NotificationService::RECV_REVISOR);
} }
} }
break; break;