From: Art Cancro <ajc@citadel.org>
Date: Mon, 23 Apr 2007 13:40:22 +0000 (+0000)
Subject: Allow multiple addresses to be selected.
X-Git-Tag: v7.86~3421
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=ede7209c71f09e45de1075bdd1ddbf668a13383e

Allow multiple addresses to be selected.
---

diff --git a/webcit/addressbook_popup.c b/webcit/addressbook_popup.c
index 41753f33e..43f12032a 100644
--- a/webcit/addressbook_popup.c
+++ b/webcit/addressbook_popup.c
@@ -9,6 +9,20 @@
 #include "webcit.h"
 
 
+/**
+ * \brief Call this right before wDumpContent() on any page which requires the address book popup
+ */
+void address_book_popup(void) {
+	/* Open a new div, hidden initially, for address book popups. */
+	wprintf("</div>\n");	/* End of 'content' div */
+	wprintf("<div id=\"address_book_popup\" style=\"display:none;\">");
+	wprintf("<div id=\"address_book_popup_container_div\">");
+	wprintf("<div id=\"address_book_popup_middle_div\"></div>");
+	wprintf("<div id=\"address_book_inner_div\"></div>");
+	wprintf("</div>");
+	/* The 'address_book_popup' div will be closed by wDumpContent() */
+}
+
 /**
  * \brief Address book popup window
  */
@@ -73,7 +87,7 @@ void display_address_book_inner_div() {
 	begin_ajax_response();
 
 	wprintf("<div align=center><form onSubmit=\"return false;\">"
-		"<select name=\"whichaddr\" id=\"whichaddr\" size=\"15\">\n");
+		"<select multiple name=\"whichaddr\" id=\"whichaddr\" size=\"15\">\n");
 
 	if (!strcasecmp(bstr("which_addr_book"), "__LOCAL_USERS__")) {
 		serv_puts("LIST");
@@ -105,13 +119,7 @@ void display_address_book_inner_div() {
 	wprintf("</select>\n");
 
 	wprintf("<INPUT TYPE=\"submit\" NAME=\"select_button\" VALUE=\"%s\" ", _("Select"));
-	wprintf("onClick=\"if ($('%s').value.length > 0) { $('%s').value = $('%s').value + ', '; } $('%s').value=$('%s').value + $('whichaddr').value;\">",
-		bstr("target_input"),
-		bstr("target_input"),
-		bstr("target_input"),
-		bstr("target_input"),
-		bstr("target_input")
-	);
+	wprintf("onClick=\"AddContactsToTarget($('%s'),$('whichaddr'));\">", bstr("target_input"));
 	wprintf("<INPUT TYPE=\"submit\" NAME=\"close_button\" VALUE=\"%s\" ", _("Close window"));
 	wprintf("onclick=\"javascript:$('address_book_popup').style.display='none';\">");
 
diff --git a/webcit/event.c b/webcit/event.c
index 9c283c6e4..3ac9e4748 100644
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -348,7 +348,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
 		"<FONT SIZE=-2>");
 	wprintf(_("(One per line)"));
 	wprintf("</FONT></TD><TD>"
-		"<TEXTAREA %s NAME=\"attendees\" wrap=soft "
+		"<TEXTAREA %s NAME=\"attendees\" id=\"attendees_box\" wrap=soft "
 		"ROWS=3 COLS=80 WIDTH=80>\n",
 		(organizer_is_me ? "" : "DISABLED ")
 	);
diff --git a/webcit/messages.c b/webcit/messages.c
index 9e686029f..db930c723 100644
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -3225,19 +3225,8 @@ void display_enter(void)
 	wprintf("</form>\n");
 	wprintf("</td></tr></table></div>\n");
 
-	wprintf("</div>\n");	/* End of 'content' div */
-
-	/* Open a new div, hidden initially, for address book popups.
-	 * FIXME put this in its own function so we can use it from the
-	 * calendar too.
-	 */
-	wprintf("<div id=\"address_book_popup\" style=\"display:none;\">");
-	wprintf("<div id=\"address_book_popup_container_div\">");
-	wprintf("<div id=\"address_book_popup_middle_div\"></div>");
-	wprintf("<div id=\"address_book_inner_div\"></div>");
-	wprintf("</div>");
-	/* The 'address_book_popup' div will be closed by wDumpContent() */
-DONE:	wDumpContent(1);
+DONE:	address_book_popup();
+	wDumpContent(1);
 }
 
 
diff --git a/webcit/static/wclib.js b/webcit/static/wclib.js
index 7063f6e24..ac8c4284b 100644
--- a/webcit/static/wclib.js
+++ b/webcit/static/wclib.js
@@ -694,3 +694,16 @@ function PopulateAddressBookInnerDiv(which_addr_book, target_input) {
 		}
 	);
 }
+
+// What happens when a contact is selected from the address book popup
+// (populate the specified target)
+
+function AddContactsToTarget(target, whichaddr) {
+	while (whichaddr.selectedIndex != -1) {
+		if (target.value.length > 0) {
+			target.value = target.value + ', ';
+		}
+		target.value = target.value + whichaddr.value;
+		whichaddr.options[whichaddr.selectedIndex].selected = false;
+	}
+}
diff --git a/webcit/webcit.h b/webcit/webcit.h
index 40a5f7c98..da0a6c450 100644
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -638,6 +638,7 @@ void CtdlMakeTempFileName(char *, int);
 void display_preferences(void);
 void set_preferences(void);
 void recp_autocomplete(char *);
+void address_book_popup(void);
 void display_address_book_middle_div(void);
 void display_address_book_inner_div(void);
 void begin_ajax_response(void);