Index: apps/app_userevent.c
===================================================================
--- apps/app_userevent.c	(revision 8077)
+++ apps/app_userevent.c	(working copy)
@@ -38,7 +38,12 @@
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/manager.h"
+#include "asterisk/app.h"
 
+#define MAX_ARGS 16
+#define MAX_SIZE_EVENTNAME 512
+#define MAX_SIZE_EVENTBODY 1024
+
 static char *tdesc = "Custom User Event Application";
 
 static char *app = "UserEvent";
@@ -63,9 +68,14 @@
 static int userevent_exec(struct ast_channel *chan, void *data)
 {
 	struct localuser *u;
-	char *info;
-	char eventname[512];
-	char *eventbody;
+	char *parse;
+	char eventname[MAX_SIZE_EVENTNAME];
+	char eventbody[MAX_SIZE_EVENTBODY];
+	size_t eventbody_size;
+	int i, j;
+	int pos;
+	unsigned int argc;
+	char *argv[MAX_ARGS];
 
 	if (ast_strlen_zero(data)) {
 		ast_log(LOG_WARNING, "UserEvent requires an argument (eventname|optional event body)\n");
@@ -74,30 +84,30 @@
 
 	LOCAL_USER_ADD(u);
 
-	info = ast_strdupa(data);
-	if (!info) {
+	parse = ast_strdupa(data);
+	if (!parse) {
 		ast_log(LOG_ERROR, "Out of memory\n");
 		LOCAL_USER_REMOVE(u);
 		return -1;
 	}
 
-	snprintf(eventname, sizeof(eventname), "UserEvent%s", info);
-	eventbody = strchr(eventname, '|');
-	if (eventbody) {
-		*eventbody = '\0';
-		eventbody++;
+	argc = ast_app_separate_args(parse, '|', argv, MAX_ARGS);
+
+	snprintf(eventname, sizeof(eventname), "UserEvent%s", argv[0]);
+
+	for (i=1,pos=0; i<argc; i++) {
+		for (j=0; argv[i][j]!=0 && pos<=MAX_SIZE_EVENTBODY-2; j++,pos++) {
+			eventbody[pos] = argv[i][j];
+		}
+		eventbody[pos++] = '\r';
+		eventbody[pos++] = '\n';
 	}
+	eventbody[pos] = 0;
 	
-	if(eventbody) {
-            ast_log(LOG_DEBUG, "Sending user event: %s, %s\n", eventname, eventbody);
-            manager_event(EVENT_FLAG_USER, eventname, 
-			"Channel: %s\r\nUniqueid: %s\r\n%s\r\n",
-			chan->name, chan->uniqueid, eventbody);
-	} else {
-            ast_log(LOG_DEBUG, "Sending user event: %s\n", eventname);
-            manager_event(EVENT_FLAG_USER, eventname, 
-			"Channel: %s\r\nUniqueid: %s\r\n", chan->name, chan->uniqueid);
-	}
+	ast_log(LOG_DEBUG, "Sending user event: %s, %s\n", eventname, eventbody);
+	manager_event(EVENT_FLAG_USER, eventname, 
+		"Channel: %s\r\nUniqueid: %s\r\n%s",
+		chan->name, chan->uniqueid, eventbody);
 
 	LOCAL_USER_REMOVE(u);
 	return 0;