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

- fixed sending of notification mails

Browse Source
This commit is contained in:
steinm 2010-12-14 14:14:29 +00:00
parent 2a09c0d15c
commit aaf2f1715d
3 changed files with 115 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
op/op.ApproveDocument.php
View File

@ -101,6 +101,7 @@ if ($_POST["approvalType"] == "ind") {
} }
else { else {
// Send an email notification to the document updater. // Send an email notification to the document updater.
if($notifier) {
$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("approval_submit_email"); $subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("approval_submit_email");
$message = getMLText("approval_submit_email")."\r\n"; $message = getMLText("approval_submit_email")."\r\n";
$message .= $message .=
@ -114,13 +115,14 @@ if ($_POST["approvalType"] == "ind") {
$subject=mydmsDecodeString($subject); $subject=mydmsDecodeString($subject);
$message=mydmsDecodeString($message); $message=mydmsDecodeString($message);
LetoDMS_Email::toIndividual($user, $content->getUser(), $subject, $message); $notifier->toIndividual($user, $content->getUser(), $subject, $message);
// Send notification to subscribers. // Send notification to subscribers.
$nl=$document->getNotifyList(); $nl=$document->getNotifyList();
LetoDMS_Email::toList($user, $nl["users"], $subject, $message); $notifier->toList($user, $nl["users"], $subject, $message);
foreach ($nl["groups"] as $grp) { foreach ($nl["groups"] as $grp) {
LetoDMS_Email::toGroup($user, $grp, $subject, $message); $notifier->toGroup($user, $grp, $subject, $message);
}
} }
} }
} }
@ -154,7 +156,7 @@ else if ($_POST["approvalType"] == "grp") {
else { else {
// Send an email notification to the document updater. // Send an email notification to the document updater.
$grp = $dms->getGroup($grpStatus["required"]); $grp = $dms->getGroup($grpStatus["required"]);
if($notifier) {
$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("approval_submit_email"); $subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("approval_submit_email");
$message = getMLText("approval_submit_email")."\r\n"; $message = getMLText("approval_submit_email")."\r\n";
$message .= $message .=
@ -168,13 +170,14 @@ else if ($_POST["approvalType"] == "grp") {
$subject=mydmsDecodeString($subject); $subject=mydmsDecodeString($subject);
$message=mydmsDecodeString($message); $message=mydmsDecodeString($message);
LetoDMS_Email::toIndividual($user, $content->getUser(), $subject, $message); $notifier->toIndividual($user, $content->getUser(), $subject, $message);
// Send notification to subscribers. // Send notification to subscribers.
$nl=$document->getNotifyList(); $nl=$document->getNotifyList();
LetoDMS_Email::toList($user, $nl["users"], $subject, $message); $notifier->toList($user, $nl["users"], $subject, $message);
foreach ($nl["groups"] as $grp) { foreach ($nl["groups"] as $grp) {
LetoDMS_Email::toGroup($user, $grp, $subject, $message); $notifier->toGroup($user, $grp, $subject, $message);
}
} }
} }
} }

4
op/op.RemoveVersion.php
View File

@ -130,9 +130,9 @@ else {
// Send notification to subscribers. // Send notification to subscribers.
$nl=$document->getNotifyList(); $nl=$document->getNotifyList();
LetoDMS_Email::toList($user, $nl["users"], $subject, $message); $notifier->toList($user, $nl["users"], $subject, $message);
foreach ($nl["groups"] as $grp) { foreach ($nl["groups"] as $grp) {
LetoDMS_Email::toGroup($user, $grp, $subject, $message); $notifier->toGroup($user, $grp, $subject, $message);
} }
} }
} }

22
op/op.ReviewDocument.php
View File

@ -96,6 +96,7 @@ if ($_POST["reviewType"] == "ind") {
} }
else { else {
// Send an email notification to the document updater. // Send an email notification to the document updater.
if($notifier) {
$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("review_submit_email"); $subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("review_submit_email");
$message = getMLText("review_submit_email")."\r\n"; $message = getMLText("review_submit_email")."\r\n";
$message .= $message .=
@ -109,13 +110,14 @@ if ($_POST["reviewType"] == "ind") {
$subject=mydmsDecodeString($subject); $subject=mydmsDecodeString($subject);
$message=mydmsDecodeString($message); $message=mydmsDecodeString($message);
LetoDMS_Email::toIndividual($user, $content->getUser(), $subject, $message); $notifier->toIndividual($user, $content->getUser(), $subject, $message);
// Send notification to subscribers. // Send notification to subscribers.
$nl=$document->getNotifyList(); $nl=$document->getNotifyList();
LetoDMS_Email::toList($user, $nl["users"], $subject, $message); $notifier->toList($user, $nl["users"], $subject, $message);
foreach ($nl["groups"] as $grp) { foreach ($nl["groups"] as $grp) {
LetoDMS_Email::toGroup($user, $grp, $subject, $message); $notifier->toGroup($user, $grp, $subject, $message);
}
} }
} }
} }
@ -149,6 +151,7 @@ else if ($_POST["reviewType"] == "grp") {
// Send an email notification to the document updater. // Send an email notification to the document updater.
$grp = $dms->getGroup($grpStatus["required"]); $grp = $dms->getGroup($grpStatus["required"]);
if($notifier) {
$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("review_submit_email"); $subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("review_submit_email");
$message = getMLText("review_submit_email")."\r\n"; $message = getMLText("review_submit_email")."\r\n";
$message .= $message .=
@ -162,13 +165,14 @@ else if ($_POST["reviewType"] == "grp") {
$subject=mydmsDecodeString($subject); $subject=mydmsDecodeString($subject);
$message=mydmsDecodeString($message); $message=mydmsDecodeString($message);
LetoDMS_Email::toIndividual($user, $content->getUser(), $subject, $message); $notifier->toIndividual($user, $content->getUser(), $subject, $message);
// Send notification to subscribers. // Send notification to subscribers.
$nl=$document->getNotifyList(); $nl=$document->getNotifyList();
LetoDMS_Email::toList($user, $nl["users"], $subject, $message); $notifier->toList($user, $nl["users"], $subject, $message);
foreach ($nl["groups"] as $grp) { foreach ($nl["groups"] as $grp) {
LetoDMS_Email::toGroup($user, $grp, $subject, $message); $notifier->toGroup($user, $grp, $subject, $message);
}
} }
} }
} }
@ -277,6 +281,7 @@ if ($_POST["reviewStatus"]==-1){
if ($newStatus == S_DRAFT_APP) { if ($newStatus == S_DRAFT_APP) {
$requestUser = $document->getOwner(); $requestUser = $document->getOwner();
if($notifier) {
$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("approval_request_email"); $subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("approval_request_email");
$message = getMLText("approval_request_email")."\r\n"; $message = getMLText("approval_request_email")."\r\n";
$message .= $message .=
@ -294,12 +299,13 @@ if ($_POST["reviewStatus"]==-1){
if ($dastat["type"] == 0) { if ($dastat["type"] == 0) {
$approver = $dms->getUser($dastat["required"]); $approver = $dms->getUser($dastat["required"]);
LetoDMS_Email::toIndividual($document->getOwner(), $approver, $subject, $message); $notifier->toIndividual($document->getOwner(), $approver, $subject, $message);
} }
else if ($dastat["type"] == 1) { else if ($dastat["type"] == 1) {
$group = $dms->getGroup($dastat["required"]); $group = $dms->getGroup($dastat["required"]);
LetoDMS_Email::toGroup($document->getOwner(), $group, $subject, $message); $notifier->toGroup($document->getOwner(), $group, $subject, $message);
}
} }
} }
} }