Peter M. Groen / knowledgetree

Commit bd7fa8def0f85b034a8c0cf3159182553180e530

Authored by Jalaloedien Abrahams
1 parent 5245540b

KTS-1887 

"CLONE -Email ignores Sub-Groups (SUP-197). "
Fixed.

Reviewed By: Conrad

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@6554 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 12 additions and 1 deletions
plugins/ktstandard/KTEmail.php
  View file @bd7fa8d
@@ -43,9 +43,19 @@ function sendGroupEmails($aGroupIDs, $oDocument, $sComment = "", $bAttachDocumen @@ -43,9 +43,19 @@ function sendGroupEmails($aGroupIDs, $oDocument, $sComment = "", $bAttachDocumen
43 // validate the group id 43 // validate the group id
44 if ($aGroupIDs[$i] > 0) { 44 if ($aGroupIDs[$i] > 0) {
45 $oDestGroup = Group::get($aGroupIDs[$i]); 45 $oDestGroup = Group::get($aGroupIDs[$i]);
  46 +
  47 + $aMemberGroups = $oDestGroup->getMemberGroups();
  48 + foreach ($aMemberGroups as $member){
  49 + $aDestinationGroups[] = $member;
  50 + }
  51 + $aDestinationGroups[] = $oDestGroup;
  52 +
46 $default->log->info("sendingEmail to group " . $oDestGroup->getName()); 53 $default->log->info("sendingEmail to group " . $oDestGroup->getName());
47 // for each group, retrieve all the users 54 // for each group, retrieve all the users
48 - $aUsers = $oDestGroup->getUsers(); 55 + foreach($aDestinationGroups as $oGroup){
  56 + $aUsers = array_merge($aUsers, $oGroup->getUsers());
  57 + }
  58 +
49 // FIXME: this should send one email with multiple To: users 59 // FIXME: this should send one email with multiple To: users
50 for ($j=0; $j<count($aUsers); $j++) { 60 for ($j=0; $j<count($aUsers); $j++) {
51 $default->log->info("sendingEmail to group-member " . $aUsers[$j]->getName() . " with email " . $aUsers[$j]->getEmail()); 61 $default->log->info("sendingEmail to group-member " . $aUsers[$j]->getName() . " with email " . $aUsers[$j]->getEmail());
@@ -378,6 +388,7 @@ class KTDocumentEmailAction extends KTDocumentAction { @@ -378,6 +388,7 @@ class KTDocumentEmailAction extends KTDocumentAction {
378 388
379 function do_email() { 389 function do_email() {
380 $groupNewRight = trim($_REQUEST['groups_items_added'], chr(160)); 390 $groupNewRight = trim($_REQUEST['groups_items_added'], chr(160));
  391 +
381 $userNewRight = trim($_REQUEST['users_items_added'], chr(160)); 392 $userNewRight = trim($_REQUEST['users_items_added'], chr(160));
382 393
383 $fEmailAddresses = trim($_REQUEST['fEmailAddresses']); 394 $fEmailAddresses = trim($_REQUEST['fEmailAddresses']);