From 2afae1c0e3d882249027d4fa4006abc0e06a01a0 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Thu, 3 Sep 2020 13:26:41 -0600
Subject: [PATCH] *Calendar: Owner / participant no longer have automatically
 created account group lists offered in mailing list results

---
 calendar/inc/class.calendar_bo.inc.php                   | 6 ++++++
 .../inc/class.calendar_owner_etemplate_widget.inc.php    | 9 +++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php
index 821720f023..e289685a1d 100644
--- a/calendar/inc/class.calendar_bo.inc.php
+++ b/calendar/inc/class.calendar_bo.inc.php
@@ -350,6 +350,12 @@ class calendar_bo
 		{
 			$list = $contacts_obj->read_list((int)$id);
 
+			if(!$list && $id < 0)
+			{
+				$list = array(
+						'list_name' => Link::title('api-accounts',$id) ?: Api\Accounts::username($id)
+				);
+			}
 			$data[] = array(
 				'res_id' => $id,
 				'rights' => self::ACL_READ_FOR_PARTICIPANTS,
diff --git a/calendar/inc/class.calendar_owner_etemplate_widget.inc.php b/calendar/inc/class.calendar_owner_etemplate_widget.inc.php
index 196ee1584e..8514d53c3a 100644
--- a/calendar/inc/class.calendar_owner_etemplate_widget.inc.php
+++ b/calendar/inc/class.calendar_owner_etemplate_widget.inc.php
@@ -207,12 +207,13 @@ class calendar_owner_etemplate_widget extends Etemplate\Widget\Taglist
 			switch ($type)
 			{
 				case 'l':
-					// Include mailing lists
+					// Include mailing lists, but not account groups
 					$lists = array_filter(
 						$contacts_obj->get_lists(Api\Acl::READ),
-						function($element) use($query) {
-							return (stripos($element, $query) !== false);
-						}
+						function($element, $index) use($query) {
+							return $index > 0 && (stripos($element, $query) !== false);
+						},
+				ARRAY_FILTER_USE_BOTH
 					);
 					foreach($lists as $list_id => $list)
 					{