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

use new notification mechanism

Browse Source
This commit is contained in:
Uwe Steinmann 2013-03-12 08:49:09 +01:00
parent 9328bebcbf
commit 20444bd714
2 changed files with 89 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
op/op.ApproveDocument.php
View File

@ -86,6 +86,7 @@ if ($_POST["approvalType"] == "ind") {
else {
// Send an email notification to the document updater.
if($notifier) {
/*
$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("approval_submit_email");
$message = getMLText("approval_submit_email")."\r\n";
$message .=
@ -95,17 +96,28 @@ if ($_POST["approvalType"] == "ind") {
getMLText("status").": ".getApprovalStatusText($_POST["approvalStatus"])."\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);
// $message=mydmsDecodeString($message);
$notifier->toIndividual($user, $content->getUser(), $subject, $message);
$subject = "approval_submit_email_subject";
$message = "approval_submit_email_body";
$params = array();
$params['name'] = $document->getName();
$params['version'] = $version;
$params['folder_path'] = $folder->getFolderPathPlain();
$params['status'] = getApprovalStatusText($_POST["approvalStatus"]);
$params['comment'] = $comment;
$params['username'] = $user->getFullName();
$params['sitename'] = $settings->_siteName;
$params['http_root'] = $settings->_httpRoot;
$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
// Send notification to subscribers.
$nl=$document->getNotifyList();
$notifier->toList($user, $nl["users"], $subject, $message);
$notifier->toList($user, $nl["users"], $subject, $message, $params);
foreach ($nl["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message);
$notifier->toGroup($user, $grp, $subject, $message, $params);
}
}
}
@ -119,6 +131,7 @@ else if ($_POST["approvalType"] == "grp") {
else {
// Send an email notification to the document updater.
if($notifier) {
/*
$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("approval_submit_email");
$message = getMLText("approval_submit_email")."\r\n";
$message .=
@ -128,17 +141,28 @@ else if ($_POST["approvalType"] == "grp") {
getMLText("status").": ".getApprovalStatusText($_POST["approvalStatus"])."\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);
// $message=mydmsDecodeString($message);
$notifier->toIndividual($user, $content->getUser(), $subject, $message);
$subject = "approval_submit_email_subject";
$message = "approval_submit_email_body";
$params = array();
$params['name'] = $document->getName();
$params['version'] = $version;
$params['folder_path'] = $folder->getFolderPathPlain();
$params['status'] = getApprovalStatusText($_POST["approvalStatus"]);
$params['comment'] = $comment;
$params['username'] = $user->getFullName();
$params['sitename'] = $settings->_siteName;
$params['http_root'] = $settings->_httpRoot;
$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
// Send notification to subscribers.
$nl=$document->getNotifyList();
$notifier->toList($user, $nl["users"], $subject, $message);
$notifier->toList($user, $nl["users"], $subject, $message, $params);
foreach ($nl["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message);
$notifier->toGroup($user, $grp, $subject, $message, $params);
}
}
}
@ -151,10 +175,11 @@ else if ($_POST["approvalType"] == "grp") {
if ($_POST["approvalStatus"]==-1){
if($content->setStatus(S_REJECTED,$comment,$user)) {
$nl=$document->getNotifyList();
// Send notification to subscribers.
if($notifier) {
$nl=$document->getNotifyList();
$folder = $document->getFolder();
/*
$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_status_changed_email");
$message = getMLText("document_status_changed_email")."\r\n";
$message .=
@ -163,13 +188,23 @@ if ($_POST["approvalStatus"]==-1){
getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n".
getMLText("comment").": ".$document->getComment()."\r\n".
"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$content->_version."\r\n";
*/
// $subject=mydmsDecodeString($subject);
// $message=mydmsDecodeString($message);
$notifier->toList($user, $nl["users"], $subject, $message);
$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($status);
$params['comment'] = $document->getComment();
$params['username'] = $user->getFullName();
$params['sitename'] = $settings->_siteName;
$params['http_root'] = $settings->_httpRoot;
$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
$notifier->toList($user, $nl["users"], $subject, $message, $params);
foreach ($nl["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message);
$notifier->toGroup($user, $grp, $subject, $message, $params);
}
}
@ -198,10 +233,11 @@ if ($_POST["approvalStatus"]==-1){
// Change the status to released.
$newStatus=2;
if($content->setStatus($newStatus, getMLText("automatic_status_update"), $user)) {
$nl=$document->getNotifyList();
// Send notification to subscribers.
if($notifier) {
$nl=$document->getNotifyList();
$folder = $document->getFolder();
/*
$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_status_changed_email");
$message = getMLText("document_status_changed_email")."\r\n";
$message .=
@ -211,12 +247,22 @@ if ($_POST["approvalStatus"]==-1){
getMLText("comment").": ".$document->getComment()."\r\n".
"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$content->_version."\r\n";
// $subject=mydmsDecodeString($subject);
// $message=mydmsDecodeString($message);
$notifier->toList($user, $nl["users"], $subject, $message);
*/
$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($newStatus);
$params['comment'] = $document->getComment();
$params['username'] = $user->getFullName();
$params['sitename'] = $settings->_siteName;
$params['http_root'] = $settings->_httpRoot;
$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
$notifier->toList($user, $nl["users"], $subject, $message, $params);
foreach ($nl["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message);
$notifier->toGroup($user, $grp, $subject, $message, $params);
}
}

21
op/op.TriggerWorkflow.php
View File

@ -70,6 +70,7 @@ if($version->triggerWorkflowTransition($user, $transition, $_POST["comment"])) {
if ($notifier) {
$nl = $document->getNotifyList();
/*
$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("transition_triggered_email");
$message = getMLText("transition_triggered_email")."\r\n";
$message .=
@ -80,11 +81,27 @@ if($version->triggerWorkflowTransition($user, $transition, $_POST["comment"])) {
getMLText("previous_state").": ".$transition->getState()->getName()."\r\n".
getMLText("current_state").": ".$transition->getNextState()->getName()."\r\n".
getMLText("user").": ".$user->getFullName()." <". $user->getEmail() ."> ";
*/
$subject = "transition_triggered_email_subject";
$message = "transition_triggered_email_body";
$params = array();
$params['name'] = $document->getName();
$params['version'] = $version->getVersion();
$params['workflow'] = $workflow->getName();
$params['action'] = $transition->getAction()->getName();
$params['folder_path'] = $folder->getFolderPathPlain();
$params['comment'] = $_POST["comment"];
$params['previous_state'] = $transition->getState()->getName();
$params['current_state'] = $transition->getNextState()->getName();
$params['username'] = $user->getFullName();
$params['sitename'] = $settings->_siteName;
$params['http_root'] = $settings->_httpRoot;
$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
// Send notification to subscribers.
$notifier->toList($user, $nl["users"], $subject, $message);
$notifier->toList($user, $nl["users"], $subject, $message, $params);
foreach ($nl["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message);
$notifier->toGroup($user, $grp, $subject, $message, $params);
}
}
}