From c85b6ca17876adf9f1e9cf16b47d98e4430555dc Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Mon, 30 Mar 2009 18:05:52 +0200
Subject: [PATCH] MFB: Make sure that email lists are correctly encoded. We
 don't support them at the moment, but this at least prevents errors (Bug
 #7834).

---
 kronolith/docs/CHANGES                    | 1 +
 kronolith/templates/contacts/contacts.inc | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/kronolith/docs/CHANGES b/kronolith/docs/CHANGES
index 6484ad4ea..88b677dd3 100644
--- a/kronolith/docs/CHANGES
+++ b/kronolith/docs/CHANGES
@@ -17,6 +17,7 @@ v3.0-git
 v2.3.1-cvs
 ----------
 
+[jan] Prevent warnings if trying to add address lists as attendees (Bug #7834).
 [jan] Fix start and end time calculation of multi-day events (Bug #7788).
 [jan] Wrap URL in calendar information in IE7 (almarin@um.es, Bug #8043).
 [jan] Fix "Date-string has wrong format" error with holidays (Bug #7961).
diff --git a/kronolith/templates/contacts/contacts.inc b/kronolith/templates/contacts/contacts.inc
index 689d5da8d..aa722ce3b 100644
--- a/kronolith/templates/contacts/contacts.inc
+++ b/kronolith/templates/contacts/contacts.inc
@@ -160,7 +160,7 @@ window.onload = function() {
     <label for="search_results" class="hidden"><?php echo _("Search results") ?></label>
     <select id="search_results" name="search_results" multiple="multiple" size="10" style="width:250px" onchange="document.contacts.search_results[0].selected=false" ondblclick="addAddress()">
       <option value=""><?php echo _("* Please select address(es) *") ?></option>
-      <?php foreach ($addresses as $addr): if ($display == 'email'): ?>
+      <?php foreach ($addresses as $addr): if (strpos($addr['email'], ',') !== false && strpos($addr['email'], ':') === false) $addr['email'] = $addr['name'] . ': ' . $addr['email']; if ($display == 'email'): ?>
       <option value="<?php echo rawurlencode($addr['name']) ?>"><?php echo htmlspecialchars($addr['email']) ?></option>
       <?php else: ?>
       <option value="<?php echo rawurlencode($addr['email']) ?>"><?php echo htmlspecialchars($addr['name']) ?></option>
-- 
2.11.0