From 92cf1e74b829dc0d8a5ed35e9241d0871fb9daac Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 15 Mar 2013 18:34:20 +0100 Subject: [PATCH] send notification mail --- op/op.ReturnFromSubWorkflow.php | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/op/op.ReturnFromSubWorkflow.php b/op/op.ReturnFromSubWorkflow.php index 1d243ce52..d97e42089 100644 --- a/op/op.ReturnFromSubWorkflow.php +++ b/op/op.ReturnFromSubWorkflow.php @@ -72,7 +72,9 @@ if(isset($_POST["transition"]) && $_POST["transition"]) { if($version->returnFromSubWorkflow($user, $transition, $_POST["comment"])) { if ($notifier) { $nl = $document->getNotifyList(); + $folder = $document->getFolder(); +/* $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("return_from_subworkflow_email"); $message = getMLText("return_from_subwork_email")."\r\n"; $message .= @@ -81,11 +83,24 @@ if($version->returnFromSubWorkflow($user, $transition, $_POST["comment"])) { getMLText("workflow").": ".$parentworkflow->getName()."\r\n". getMLText("current_state").": ".$version->getWorkflowState()->getName()."\r\n". getMLText("user").": ".$user->getFullName()." <". $user->getEmail() ."> "; +*/ + $subject = "return_from_subworkflow_email_subject"; + $message = "return_from_subworkflow_email_body"; + $params = array(); + $params['name'] = $document->getName(); + $params['version'] = $version->getVersion(); + $params['workflow'] = $parentworkflow->getName(); + $params['subworkflow'] = $workflow->getName(); + $params['folder_path'] = $folder->getFolderPathPlain(); + $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); } } }