From ac2be17814e296dbc34740d7f284f689c1e7c98b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 20 Apr 2016 20:01:59 +0200 Subject: [PATCH 1/4] set url for approval request email (Closes: #259) --- op/op.ReviewDocument.php | 1 + 1 file changed, 1 insertion(+) diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php index fe3ea55af..259e5d298 100644 --- a/op/op.ReviewDocument.php +++ b/op/op.ReviewDocument.php @@ -341,6 +341,7 @@ if ($_POST["reviewStatus"]==-1){ $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(); foreach ($docApprovalStatus as $dastat) { if ($dastat["status"] == 0) { From 54ac2db57bf15c99e280fb72b3aec2a96db25ac6 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 20 Apr 2016 20:03:21 +0200 Subject: [PATCH 2/4] add entry for 4.3.26 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 687568daa..f64b32310 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,7 @@ header to be send to early (Closes: #252, #254) - regular users with sufficient access rights may remove documents via webdav - fix error in utils/indexer.php when new documents were indexed +- set url in approval request email after reviewing a document (Closes #259) -------------------------------------------------------------------------------- Changes in version 4.3.25 From a6cdb2015a994c5a6858e01a7d0d36e7a9dd40cc Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 21 Apr 2016 13:34:13 +0200 Subject: [PATCH 3/4] notify groups and users of new document as well --- op/op.AddDocument.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php index 375494c75..86e4fe18c 100644 --- a/op/op.AddDocument.php +++ b/op/op.AddDocument.php @@ -333,7 +333,8 @@ for ($file_num=0;$file_numgetNotifyList(); + $notifyList1 = $folder->getNotifyList(); + $notifyList2 = $document->getNotifyList(); $subject = "new_document_email_subject"; $message = "new_document_email_body"; @@ -347,8 +348,12 @@ for ($file_num=0;$file_num_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $notifier->toList($user, $notifyList["users"], $subject, $message, $params); - foreach ($notifyList["groups"] as $grp) { + $notifier->toList($user, $notifyList1["users"], $subject, $message, $params); + foreach ($notifyList1["groups"] as $grp) { + $notifier->toGroup($user, $grp, $subject, $message, $params); + } + $notifier->toList($user, $notifyList2["users"], $subject, $message, $params); + foreach ($notifyList2["groups"] as $grp) { $notifier->toGroup($user, $grp, $subject, $message, $params); } From 083f0bb192464d99fdf90ddfb06c36a7f1f32fe9 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 21 Apr 2016 13:46:11 +0200 Subject: [PATCH 4/4] add entry for 4.3.26 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index f64b32310..8f163fb21 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,7 @@ - regular users with sufficient access rights may remove documents via webdav - fix error in utils/indexer.php when new documents were indexed - set url in approval request email after reviewing a document (Closes #259) +- inform groups and users watching a new document too (Closes #260) -------------------------------------------------------------------------------- Changes in version 4.3.25