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

81
op/op.ApproveDocument.php
View File

@ -101,27 +101,29 @@ if ($_POST["approvalType"] == "ind") {
} }
else { else {
// Send an email notification to the document updater. // Send an email notification to the document updater.
$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("approval_submit_email"); if($notifier) {
$message = getMLText("approval_submit_email")."\r\n"; $subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("approval_submit_email");
$message .= $message = getMLText("approval_submit_email")."\r\n";
getMLText("name").": ".$document->getName()."\r\n". $message .=
getMLText("version").": ".$version."\r\n". getMLText("name").": ".$document->getName()."\r\n".
getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n". getMLText("version").": ".$version."\r\n".
getMLText("status").": ".getApprovalStatusText($_POST["approvalStatus"])."\r\n". getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n".
getMLText("comment").": ".$comment."\r\n". getMLText("status").": ".getApprovalStatusText($_POST["approvalStatus"])."\r\n".
"URL: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$documentid."\r\n"; getMLText("comment").": ".$comment."\r\n".
"URL: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$documentid."\r\n";
$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);
} }
}
} }
} }
else if ($_POST["approvalType"] == "grp") { else if ($_POST["approvalType"] == "grp") {
@ -154,28 +156,29 @@ 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 .=
getMLText("name").": ".$document->getName()."\r\n". getMLText("name").": ".$document->getName()."\r\n".
getMLText("version").": ".$version."\r\n". getMLText("version").": ".$version."\r\n".
getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n". getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n".
getMLText("status").": ".getApprovalStatusText($_POST["approvalStatus"])."\r\n". getMLText("status").": ".getApprovalStatusText($_POST["approvalStatus"])."\r\n".
getMLText("comment").": ".$comment."\r\n". getMLText("comment").": ".$comment."\r\n".
"URL: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$documentid."\r\n"; "URL: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$documentid."\r\n";
$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);
} }
} }
} }

136
op/op.ReviewDocument.php
View File

@ -96,27 +96,29 @@ if ($_POST["reviewType"] == "ind") {
} }
else { else {
// Send an email notification to the document updater. // Send an email notification to the document updater.
$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("review_submit_email"); if($notifier) {
$message = getMLText("review_submit_email")."\r\n"; $subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("review_submit_email");
$message .= $message = getMLText("review_submit_email")."\r\n";
getMLText("name").": ".$document->getName()."\r\n". $message .=
getMLText("version").": ".$version."\r\n". getMLText("name").": ".$document->getName()."\r\n".
getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n". getMLText("version").": ".$version."\r\n".
getMLText("status").": ".getReviewStatusText($_POST["reviewStatus"])."\r\n". getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n".
getMLText("comment").": ".$comment."\r\n". getMLText("status").": ".getReviewStatusText($_POST["reviewStatus"])."\r\n".
"URL: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$documentid."\r\n"; getMLText("comment").": ".$comment."\r\n".
"URL: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$documentid."\r\n";
$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);
} }
}
} }
} }
else if ($_POST["reviewType"] == "grp") { else if ($_POST["reviewType"] == "grp") {
@ -148,28 +150,30 @@ else if ($_POST["reviewType"] == "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"]);
$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("review_submit_email");
$message = getMLText("review_submit_email")."\r\n";
$message .=
getMLText("name").": ".$document->getName()."\r\n".
getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n".
getMLText("version").": ".$version."\r\n".
getMLText("status").": ".getReviewStatusText($_POST["reviewStatus"])."\r\n".
getMLText("comment").": ".$comment."\r\n".
"URL: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$documentid."\r\n";
$subject=mydmsDecodeString($subject); if($notifier) {
$message=mydmsDecodeString($message); $subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("review_submit_email");
$message = getMLText("review_submit_email")."\r\n";
LetoDMS_Email::toIndividual($user, $content->getUser(), $subject, $message); $message .=
getMLText("name").": ".$document->getName()."\r\n".
// Send notification to subscribers. getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n".
$nl=$document->getNotifyList(); getMLText("version").": ".$version."\r\n".
LetoDMS_Email::toList($user, $nl["users"], $subject, $message); getMLText("status").": ".getReviewStatusText($_POST["reviewStatus"])."\r\n".
foreach ($nl["groups"] as $grp) { getMLText("comment").": ".$comment."\r\n".
LetoDMS_Email::toGroup($user, $grp, $subject, $message); "URL: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$documentid."\r\n";
}
$subject=mydmsDecodeString($subject);
$message=mydmsDecodeString($message);
$notifier->toIndividual($user, $content->getUser(), $subject, $message);
// Send notification to subscribers.
$nl=$document->getNotifyList();
$notifier->toList($user, $nl["users"], $subject, $message);
foreach ($nl["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message);
}
}
} }
} }
@ -276,33 +280,35 @@ if ($_POST["reviewStatus"]==-1){
// Notify approvers, if necessary. // Notify approvers, if necessary.
if ($newStatus == S_DRAFT_APP) { if ($newStatus == S_DRAFT_APP) {
$requestUser = $document->getOwner(); $requestUser = $document->getOwner();
$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("approval_request_email");
$message = getMLText("approval_request_email")."\r\n";
$message .=
getMLText("name").": ".$content->getOriginalFileName()."\r\n".
getMLText("version").": ".$version."\r\n".
getMLText("comment").": ".$content->getComment()."\r\n".
"URL: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$documentid."&version=".$version."\r\n";
$subject=mydmsDecodeString($subject); if($notifier) {
$message=mydmsDecodeString($message); $subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("approval_request_email");
$message = getMLText("approval_request_email")."\r\n";
foreach ($docApprovalStatus as $dastat) { $message .=
getMLText("name").": ".$content->getOriginalFileName()."\r\n".
if ($dastat["status"] == 0) { getMLText("version").": ".$version."\r\n".
if ($dastat["type"] == 0) { getMLText("comment").": ".$content->getComment()."\r\n".
"URL: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$documentid."&version=".$version."\r\n";
$approver = $dms->getUser($dastat["required"]);
LetoDMS_Email::toIndividual($document->getOwner(), $approver, $subject, $message); $subject=mydmsDecodeString($subject);
} $message=mydmsDecodeString($message);
else if ($dastat["type"] == 1) {
foreach ($docApprovalStatus as $dastat) {
$group = $dms->getGroup($dastat["required"]);
LetoDMS_Email::toGroup($document->getOwner(), $group, $subject, $message); if ($dastat["status"] == 0) {
if ($dastat["type"] == 0) {
$approver = $dms->getUser($dastat["required"]);
$notifier->toIndividual($document->getOwner(), $approver, $subject, $message);
}
else if ($dastat["type"] == 1) {
$group = $dms->getGroup($dastat["required"]);
$notifier->toGroup($document->getOwner(), $group, $subject, $message);
}
} }
} }
} }
} }
} }
} }