From 6ec73d6906542ea2f8cca2e62f7625ee2e17ae03 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Tue, 20 Oct 2009 12:52:58 +0000
Subject: [PATCH] * add a Display name to our handlers; this will be used by
 DAV handlers.

---
 webcit/addressbook_popup.c |  4 ++--
 webcit/auth.c              | 26 +++++++++++-----------
 webcit/autocompletion.c    |  6 +++---
 webcit/calendar.c          | 12 +++++------
 webcit/context_loop.c      | 14 ++++++------
 webcit/downloads.c         | 10 ++++-----
 webcit/floors.c            |  8 +++----
 webcit/graphics.c          | 20 ++++++++---------
 webcit/iconbar.c           |  4 ++--
 webcit/inetconf.c          |  2 +-
 webcit/listsub.c           |  2 +-
 webcit/mainmenu.c          | 12 +++++------
 webcit/marchlist.c         |  6 +++---
 webcit/messages.c          | 44 +++++++++++++++++++-------------------
 webcit/netconf.c           | 10 ++++-----
 webcit/notes.c             |  4 ++--
 webcit/openid.c            |  6 +++---
 webcit/paging.c            | 12 +++++------
 webcit/paramhandling.c     |  2 +-
 webcit/preferences.c       |  4 ++--
 webcit/pushemail.c         |  4 ++--
 webcit/roomlist.c          |  2 +-
 webcit/roomops.c           | 38 ++++++++++++++++----------------
 webcit/setup_wizard.c      |  2 +-
 webcit/sieve.c             | 10 ++++-----
 webcit/siteconfig.c        |  2 +-
 webcit/smtpqueue.c         |  4 ++--
 webcit/static.c            | 12 +++++------
 webcit/summary.c           | 12 +++++------
 webcit/sysmsgs.c           |  8 +++----
 webcit/tasks.c             |  2 +-
 webcit/useredit.c          |  8 +++----
 webcit/userlist.c          |  4 ++--
 webcit/vcard_edit.c        |  6 +++---
 webcit/webcit.c            | 18 +++++++++-------
 webcit/webcit.h            |  5 ++++-
 webcit/who.c               |  4 ++--
 webcit/wiki.c              |  2 +-
 38 files changed, 178 insertions(+), 173 deletions(-)

diff --git a/webcit/addressbook_popup.c b/webcit/addressbook_popup.c
index 8e687f3de..7f35fa0d5 100644
--- a/webcit/addressbook_popup.c
+++ b/webcit/addressbook_popup.c
@@ -204,6 +204,6 @@ void
 InitModule_ADDRBOOK_POPUP
 (void)
 {
-	WebcitAddUrlHandler(HKEY("display_address_book_middle_div"), display_address_book_middle_div, 0);
-	WebcitAddUrlHandler(HKEY("display_address_book_inner_div"), display_address_book_inner_div, 0);
+	WebcitAddUrlHandler(HKEY("display_address_book_middle_div"), "", 0, display_address_book_middle_div, 0);
+	WebcitAddUrlHandler(HKEY("display_address_book_inner_div"), "", 0, display_address_book_inner_div, 0);
 }
diff --git a/webcit/auth.c b/webcit/auth.c
index d61d7c203..9375c1f1e 100644
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -1036,19 +1036,19 @@ InitModule_AUTH
 	RegisterHeaderHandler(HKEY("COOKIE"), Header_HandleCookie);
 	RegisterHeaderHandler(HKEY("AUTHORIZATION"), Header_HandleAuth);
 
-	WebcitAddUrlHandler(HKEY(""), do_welcome, ANONYMOUS|COOKIEUNNEEDED); /* no url pattern at all? Show login. */
-	WebcitAddUrlHandler(HKEY("do_welcome"), do_welcome, ANONYMOUS|COOKIEUNNEEDED);
-	WebcitAddUrlHandler(HKEY("login"), do_login, ANONYMOUS|COOKIEUNNEEDED);
-	WebcitAddUrlHandler(HKEY("display_openid_login"), _display_openid_login, ANONYMOUS);
-	WebcitAddUrlHandler(HKEY("openid_login"), do_openid_login, ANONYMOUS);
-	WebcitAddUrlHandler(HKEY("finalize_openid_login"), finalize_openid_login, ANONYMOUS);
-	WebcitAddUrlHandler(HKEY("openid_manual_create"), openid_manual_create, ANONYMOUS);
-	WebcitAddUrlHandler(HKEY("do_logout"), do_logout, ANONYMOUS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE);
-	WebcitAddUrlHandler(HKEY("validate"), validate, 0);
-	WebcitAddUrlHandler(HKEY("display_reg"), _display_reg, 0);
-	WebcitAddUrlHandler(HKEY("display_changepw"), display_changepw, 0);
-	WebcitAddUrlHandler(HKEY("changepw"), changepw, 0);
-	WebcitAddUrlHandler(HKEY("termquit"), do_logout, 0);
+	WebcitAddUrlHandler(HKEY(""), "", 0, do_welcome, ANONYMOUS|COOKIEUNNEEDED); /* no url pattern at all? Show login. */
+	WebcitAddUrlHandler(HKEY("do_welcome"), "", 0, do_welcome, ANONYMOUS|COOKIEUNNEEDED);
+	WebcitAddUrlHandler(HKEY("login"), "", 0, do_login, ANONYMOUS|COOKIEUNNEEDED);
+	WebcitAddUrlHandler(HKEY("display_openid_login"), "", 0, _display_openid_login, ANONYMOUS);
+	WebcitAddUrlHandler(HKEY("openid_login"), "", 0, do_openid_login, ANONYMOUS);
+	WebcitAddUrlHandler(HKEY("finalize_openid_login"), "", 0, finalize_openid_login, ANONYMOUS);
+	WebcitAddUrlHandler(HKEY("openid_manual_create"), "", 0, openid_manual_create, ANONYMOUS);
+	WebcitAddUrlHandler(HKEY("do_logout"), "", 0, do_logout, ANONYMOUS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE);
+	WebcitAddUrlHandler(HKEY("validate"), "", 0, validate, 0);
+	WebcitAddUrlHandler(HKEY("display_reg"), "", 0, _display_reg, 0);
+	WebcitAddUrlHandler(HKEY("display_changepw"), "", 0, display_changepw, 0);
+	WebcitAddUrlHandler(HKEY("changepw"), "", 0, changepw, 0);
+	WebcitAddUrlHandler(HKEY("termquit"), "", 0, do_logout, 0);
 
 	RegisterConditional(HKEY("COND:AIDE"), 2, ConditionalAide, CTX_NONE);
 	RegisterConditional(HKEY("COND:ROOMAIDE"), 2, ConditionalRoomAide, CTX_NONE);
diff --git a/webcit/autocompletion.c b/webcit/autocompletion.c
index 4cf4ccd6f..4d8b3799a 100644
--- a/webcit/autocompletion.c
+++ b/webcit/autocompletion.c
@@ -54,7 +54,7 @@ void
 InitModule_AUTO_COMPLETE
 (void)
 {
-	WebcitAddUrlHandler(HKEY("recp_autocomplete"), _recp_autocomplete, 0);
-	WebcitAddUrlHandler(HKEY("cc_autocomplete"),   _cc_autocomplete, 0);
-	WebcitAddUrlHandler(HKEY("bcc_autocomplete"),  _bcc_autocomplete, 0);
+	WebcitAddUrlHandler(HKEY("recp_autocomplete"), "", 0, _recp_autocomplete, 0);
+	WebcitAddUrlHandler(HKEY("cc_autocomplete"),   "", 0, _cc_autocomplete, 0);
+	WebcitAddUrlHandler(HKEY("bcc_autocomplete"),  "", 0, _bcc_autocomplete, 0);
 }
diff --git a/webcit/calendar.c b/webcit/calendar.c
index ad0cd435c..258d57b10 100644
--- a/webcit/calendar.c
+++ b/webcit/calendar.c
@@ -903,10 +903,10 @@ InitModule_CALENDAR
 	RegisterPreference("dayend", _("Calendar day view ends at:"), PRF_INT, NULL);
 	RegisterPreference("weekstart", _("Week starts on:"), PRF_INT, NULL);
 
-	WebcitAddUrlHandler(HKEY("freebusy"), do_freebusy, COOKIEUNNEEDED|ANONYMOUS|FORCE_SESSIONCLOSE);
-	WebcitAddUrlHandler(HKEY("display_edit_task"), display_edit_task, 0);
-	WebcitAddUrlHandler(HKEY("display_edit_event"), display_edit_event, 0);
-	WebcitAddUrlHandler(HKEY("save_event"), save_event, 0);
-	WebcitAddUrlHandler(HKEY("respond_to_request"), respond_to_request, 0);
-	WebcitAddUrlHandler(HKEY("handle_rsvp"), handle_rsvp, 0);
+	WebcitAddUrlHandler(HKEY("freebusy"), "", 0, do_freebusy, COOKIEUNNEEDED|ANONYMOUS|FORCE_SESSIONCLOSE);
+	WebcitAddUrlHandler(HKEY("display_edit_task"), "", 0, display_edit_task, 0);
+	WebcitAddUrlHandler(HKEY("display_edit_event"), "", 0, display_edit_event, 0);
+	WebcitAddUrlHandler(HKEY("save_event"), "", 0, save_event, 0);
+	WebcitAddUrlHandler(HKEY("respond_to_request"), "", 0, respond_to_request, 0);
+	WebcitAddUrlHandler(HKEY("handle_rsvp"), "", 0, handle_rsvp, 0);
 }
diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index aa8a467a9..48fc3f8ae 100644
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -776,17 +776,17 @@ InitModule_CONTEXT
 	RegisterNamespace("CURRENT_ROOM", 0, 1, tmplput_current_room, NULL, CTX_NONE);
 	RegisterNamespace("NONCE", 0, 0, tmplput_nonce, NULL, 0);
 
-	WebcitAddUrlHandler(HKEY("404"), do_404, ANONYMOUS|COOKIEUNNEEDED);
+	WebcitAddUrlHandler(HKEY("404"), "", 0, do_404, ANONYMOUS|COOKIEUNNEEDED);
 /*
  * Look for commonly-found probes of malware such as worms, viruses, trojans, and Microsoft Office.
  * Short-circuit these requests so we don't have to send them through the full processing loop.
  */
-	WebcitAddUrlHandler(HKEY("scripts"), do_404, ANONYMOUS|BOGUS);		/* /root.exe - Worms and trojans and viruses, oh my! */
-	WebcitAddUrlHandler(HKEY("c"), do_404, ANONYMOUS|BOGUS);		/* /winnt */
-	WebcitAddUrlHandler(HKEY("MSADC"), do_404, ANONYMOUS|BOGUS);
-	WebcitAddUrlHandler(HKEY("_vti"), do_404, ANONYMOUS|BOGUS);		/* Broken Microsoft DAV implementation */
-	WebcitAddUrlHandler(HKEY("MSOffice"), do_404, ANONYMOUS|BOGUS);		/* Stoopid MSOffice thinks everyone is IIS */
-	WebcitAddUrlHandler(HKEY("nonexistenshit"), do_404, ANONYMOUS|BOGUS);	/* Exploit found in the wild January 2009 */
+	WebcitAddUrlHandler(HKEY("scripts"), "", 0, do_404, ANONYMOUS|BOGUS);		/* /root.exe - Worms and trojans and viruses, oh my! */
+	WebcitAddUrlHandler(HKEY("c"), "", 0, do_404, ANONYMOUS|BOGUS);		/* /winnt */
+	WebcitAddUrlHandler(HKEY("MSADC"), "", 0, do_404, ANONYMOUS|BOGUS);
+	WebcitAddUrlHandler(HKEY("_vti"), "", 0, do_404, ANONYMOUS|BOGUS);		/* Broken Microsoft DAV implementation */
+	WebcitAddUrlHandler(HKEY("MSOffice"), "", 0, do_404, ANONYMOUS|BOGUS);		/* Stoopid MSOffice thinks everyone is IIS */
+	WebcitAddUrlHandler(HKEY("nonexistenshit"), "", 0, do_404, ANONYMOUS|BOGUS);	/* Exploit found in the wild January 2009 */
 }
 	
 
diff --git a/webcit/downloads.c b/webcit/downloads.c
index d7b915c3c..56134d0c8 100644
--- a/webcit/downloads.c
+++ b/webcit/downloads.c
@@ -438,9 +438,9 @@ InitModule_DOWNLOAD
 
 	RegisterConditional(HKEY("COND:FILE:ISPIC"), 0, Conditional_FILE_ISPIC, CTX_FILELIST);
 
-	WebcitAddUrlHandler(HKEY("image"), output_image, ANONYMOUS);
-	WebcitAddUrlHandler(HKEY("display_mime_icon"), display_mime_icon , ANONYMOUS);
-	WebcitAddUrlHandler(HKEY("download_file"), download_file, NEED_URL);
-	WebcitAddUrlHandler(HKEY("delete_file"), delete_file, NEED_URL);
-	WebcitAddUrlHandler(HKEY("upload_file"), upload_file, 0);
+	WebcitAddUrlHandler(HKEY("image"), "", 0, output_image, ANONYMOUS);
+	WebcitAddUrlHandler(HKEY("display_mime_icon"), "", 0, display_mime_icon , ANONYMOUS);
+	WebcitAddUrlHandler(HKEY("download_file"), "", 0, download_file, NEED_URL);
+	WebcitAddUrlHandler(HKEY("delete_file"), "", 0, delete_file, NEED_URL);
+	WebcitAddUrlHandler(HKEY("upload_file"), "", 0, upload_file, 0);
 }
diff --git a/webcit/floors.c b/webcit/floors.c
index 5397cd319..5a0ed666a 100644
--- a/webcit/floors.c
+++ b/webcit/floors.c
@@ -204,9 +204,9 @@ void
 InitModule_FLOORS
 (void)
 {
-	WebcitAddUrlHandler(HKEY("delete_floor"), delete_floor, 0);
-	WebcitAddUrlHandler(HKEY("rename_floor"), rename_floor, 0);
-	WebcitAddUrlHandler(HKEY("create_floor"), create_floor, 0);
-	WebcitAddUrlHandler(HKEY("display_floorconfig"), _display_floorconfig, 0);
+	WebcitAddUrlHandler(HKEY("delete_floor"), "", 0, delete_floor, 0);
+	WebcitAddUrlHandler(HKEY("rename_floor"), "", 0, rename_floor, 0);
+	WebcitAddUrlHandler(HKEY("create_floor"), "", 0, create_floor, 0);
+	WebcitAddUrlHandler(HKEY("display_floorconfig"), "", 0, _display_floorconfig, 0);
 }
 /*@}*/
diff --git a/webcit/graphics.c b/webcit/graphics.c
index 318ceea54..8ccd6b0e1 100644
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -182,14 +182,14 @@ void
 InitModule_GRAPHICS
 (void)
 {
-	WebcitAddUrlHandler(HKEY("display_editpic"), display_editpic, 0);
-	WebcitAddUrlHandler(HKEY("editpic"), editpic, 0);
-	WebcitAddUrlHandler(HKEY("display_editroompic"), display_editroompic, 0);
-	WebcitAddUrlHandler(HKEY("editroompic"), editroompic, 0);
-	WebcitAddUrlHandler(HKEY("display_edithello"), display_edithello, 0);
-	WebcitAddUrlHandler(HKEY("edithellopic"), edithellopic, 0);
-	WebcitAddUrlHandler(HKEY("display_editgoodbuye"), display_editgoodbyepic, 0);
-	WebcitAddUrlHandler(HKEY("editgoodbuyepic"), editgoodbuyepic, 0);
-	WebcitAddUrlHandler(HKEY("display_editfloorpic"), display_editfloorpic, 0);
-	WebcitAddUrlHandler(HKEY("editfloorpic"), editfloorpic, 0);
+	WebcitAddUrlHandler(HKEY("display_editpic"), "", 0, display_editpic, 0);
+	WebcitAddUrlHandler(HKEY("editpic"), "", 0, editpic, 0);
+	WebcitAddUrlHandler(HKEY("display_editroompic"), "", 0, display_editroompic, 0);
+	WebcitAddUrlHandler(HKEY("editroompic"), "", 0, editroompic, 0);
+	WebcitAddUrlHandler(HKEY("display_edithello"), "", 0, display_edithello, 0);
+	WebcitAddUrlHandler(HKEY("edithellopic"), "", 0, edithellopic, 0);
+	WebcitAddUrlHandler(HKEY("display_editgoodbuye"), "", 0, display_editgoodbyepic, 0);
+	WebcitAddUrlHandler(HKEY("editgoodbuyepic"), "", 0, editgoodbuyepic, 0);
+	WebcitAddUrlHandler(HKEY("display_editfloorpic"), "", 0, display_editfloorpic, 0);
+	WebcitAddUrlHandler(HKEY("editfloorpic"), "", 0, editfloorpic, 0);
 }
diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index beb449882..b4708881e 100644
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -248,8 +248,8 @@ void
 InitModule_ICONBAR
 (void)
 {
-	WebcitAddUrlHandler(HKEY("user_iconbar"), doUserIconStylesheet, 0);
-	WebcitAddUrlHandler(HKEY("commit_iconbar"), commit_iconbar, 0);
+	WebcitAddUrlHandler(HKEY("user_iconbar"), "", 0, doUserIconStylesheet, 0);
+	WebcitAddUrlHandler(HKEY("commit_iconbar"), "", 0, commit_iconbar, 0);
 	RegisterConditional(HKEY("COND:ICONBAR:ACTIVE"), 3, ConditionalIsActiveStylesheet, CTX_NONE);
 	RegisterNamespace("ICONBAR", 0, 0, tmplput_iconbar, NULL, CTX_NONE);
 
diff --git a/webcit/inetconf.c b/webcit/inetconf.c
index c8e100d0a..d29594c1f 100644
--- a/webcit/inetconf.c
+++ b/webcit/inetconf.c
@@ -212,7 +212,7 @@ void
 InitModule_INETCONF
 (void)
 {
-	WebcitAddUrlHandler(HKEY("save_inetconf"), new_save_inetconf, 0);
+	WebcitAddUrlHandler(HKEY("save_inetconf"), "", 0, new_save_inetconf, 0);
 	RegisterIterator("SERVCFG:INET", 1, NULL, GetInetConfHash, InetCfgSubst, NULL, CTX_INETCFG, CTX_NONE, IT_NOFLAG);
 	RegisterNamespace("SERVCFG:FLUSHINETCFG",0, 0, DeleteInetConfHash, NULL, CTX_NONE);
 }
diff --git a/webcit/listsub.c b/webcit/listsub.c
index 260a8f4d5..f6ed32f2d 100644
--- a/webcit/listsub.c
+++ b/webcit/listsub.c
@@ -231,7 +231,7 @@ void
 InitModule_LISTSUB
 (void)
 {
-	WebcitAddUrlHandler(HKEY("listsub"), do_listsub, ANONYMOUS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE);
+	WebcitAddUrlHandler(HKEY("listsub"), "", 0, do_listsub, ANONYMOUS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE);
 
 
 }
diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index 3959e27a6..98e58f59c 100644
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -250,10 +250,10 @@ void
 InitModule_MAINMENU
 (void)
 {
-	WebcitAddUrlHandler(HKEY("display_aide_menu"), display_aide_menu, 0);
-	WebcitAddUrlHandler(HKEY("server_shutdown"), display_shutdown, 0);
-	WebcitAddUrlHandler(HKEY("display_main_menu"), display_main_menu, 0);
-	WebcitAddUrlHandler(HKEY("display_generic"), display_generic, 0);
-	WebcitAddUrlHandler(HKEY("do_generic"), do_generic, 0);
-	WebcitAddUrlHandler(HKEY("display_menubar"), _display_menubar, 0);
+	WebcitAddUrlHandler(HKEY("display_aide_menu"), "", 0, display_aide_menu, 0);
+	WebcitAddUrlHandler(HKEY("server_shutdown"), "", 0, display_shutdown, 0);
+	WebcitAddUrlHandler(HKEY("display_main_menu"), "", 0, display_main_menu, 0);
+	WebcitAddUrlHandler(HKEY("display_generic"), "", 0, display_generic, 0);
+	WebcitAddUrlHandler(HKEY("do_generic"), "", 0, do_generic, 0);
+	WebcitAddUrlHandler(HKEY("display_menubar"), "", 0, _display_menubar, 0);
 }
diff --git a/webcit/marchlist.c b/webcit/marchlist.c
index ed124e844..d442f97c0 100644
--- a/webcit/marchlist.c
+++ b/webcit/marchlist.c
@@ -234,7 +234,7 @@ InitModule_MARCHLIST
 (void)
 {
 
-	WebcitAddUrlHandler(HKEY("gotonext"), _gotonext, NEED_URL);
-	WebcitAddUrlHandler(HKEY("skip"), gotonext, NEED_URL);
-	WebcitAddUrlHandler(HKEY("ungoto"), ungoto, NEED_URL);
+	WebcitAddUrlHandler(HKEY("gotonext"), "", 0, _gotonext, NEED_URL);
+	WebcitAddUrlHandler(HKEY("skip"), "", 0, gotonext, NEED_URL);
+	WebcitAddUrlHandler(HKEY("ungoto"), "", 0, ungoto, NEED_URL);
 }
diff --git a/webcit/messages.c b/webcit/messages.c
index cf56d0f8d..7e0f8f047 100644
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -1731,30 +1731,30 @@ InitModule_MSG
 			   NULL);
 	RegisterPreference("mailbox",_("Mailbox view mode"), PRF_STRING, NULL);
 
-	WebcitAddUrlHandler(HKEY("readnew"), h_readnew, NEED_URL);
-	WebcitAddUrlHandler(HKEY("readold"), h_readold, NEED_URL);
-	WebcitAddUrlHandler(HKEY("readfwd"), h_readfwd, NEED_URL);
-	WebcitAddUrlHandler(HKEY("headers"), h_headers, NEED_URL);
-	WebcitAddUrlHandler(HKEY("readgt"), h_readgt, NEED_URL);
-	WebcitAddUrlHandler(HKEY("do_search"), h_do_search, 0);
-	WebcitAddUrlHandler(HKEY("display_enter"), display_enter, 0);
-	WebcitAddUrlHandler(HKEY("post"), post_message, 0);
-	WebcitAddUrlHandler(HKEY("move_msg"), move_msg, 0);
-	WebcitAddUrlHandler(HKEY("delete_msg"), delete_msg, 0);
-	WebcitAddUrlHandler(HKEY("confirm_move_msg"), confirm_move_msg, 0);
-	WebcitAddUrlHandler(HKEY("msg"), embed_message, NEED_URL);
-	WebcitAddUrlHandler(HKEY("message"), handle_one_message, NEED_URL|XHTTP_COMMANDS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE);
-	WebcitAddUrlHandler(HKEY("printmsg"), print_message, NEED_URL);
-	WebcitAddUrlHandler(HKEY("mobilemsg"), mobile_message_view, NEED_URL);
-	WebcitAddUrlHandler(HKEY("msgheaders"), display_headers, NEED_URL);
-
-	WebcitAddUrlHandler(HKEY("mimepart"), view_mimepart, NEED_URL);
-	WebcitAddUrlHandler(HKEY("mimepart_download"), download_mimepart, NEED_URL);
-	WebcitAddUrlHandler(HKEY("postpart"), view_postpart, NEED_URL);
-	WebcitAddUrlHandler(HKEY("postpart_download"), download_postpart, NEED_URL);
+	WebcitAddUrlHandler(HKEY("readnew"), "", 0, h_readnew, NEED_URL);
+	WebcitAddUrlHandler(HKEY("readold"), "", 0, h_readold, NEED_URL);
+	WebcitAddUrlHandler(HKEY("readfwd"), "", 0, h_readfwd, NEED_URL);
+	WebcitAddUrlHandler(HKEY("headers"), "", 0, h_headers, NEED_URL);
+	WebcitAddUrlHandler(HKEY("readgt"), "", 0, h_readgt, NEED_URL);
+	WebcitAddUrlHandler(HKEY("do_search"), "", 0, h_do_search, 0);
+	WebcitAddUrlHandler(HKEY("display_enter"), "", 0, display_enter, 0);
+	WebcitAddUrlHandler(HKEY("post"), "", 0, post_message, 0);
+	WebcitAddUrlHandler(HKEY("move_msg"), "", 0, move_msg, 0);
+	WebcitAddUrlHandler(HKEY("delete_msg"), "", 0, delete_msg, 0);
+	WebcitAddUrlHandler(HKEY("confirm_move_msg"), "", 0, confirm_move_msg, 0);
+	WebcitAddUrlHandler(HKEY("msg"), "", 0, embed_message, NEED_URL);
+	WebcitAddUrlHandler(HKEY("message"), "", 0, handle_one_message, NEED_URL|XHTTP_COMMANDS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE);
+	WebcitAddUrlHandler(HKEY("printmsg"), "", 0, print_message, NEED_URL);
+	WebcitAddUrlHandler(HKEY("mobilemsg"), "", 0, mobile_message_view, NEED_URL);
+	WebcitAddUrlHandler(HKEY("msgheaders"), "", 0, display_headers, NEED_URL);
+
+	WebcitAddUrlHandler(HKEY("mimepart"), "", 0, view_mimepart, NEED_URL);
+	WebcitAddUrlHandler(HKEY("mimepart_download"), "", 0, download_mimepart, NEED_URL);
+	WebcitAddUrlHandler(HKEY("postpart"), "", 0, view_postpart, NEED_URL);
+	WebcitAddUrlHandler(HKEY("postpart_download"), "", 0, download_postpart, NEED_URL);
 
 	/* json */
-	WebcitAddUrlHandler(HKEY("roommsgs"), jsonMessageList,0);
+	WebcitAddUrlHandler(HKEY("roommsgs"), "", 0, jsonMessageList,0);
 	return ;
 }
 
diff --git a/webcit/netconf.c b/webcit/netconf.c
index 9b369e79b..9e316f950 100644
--- a/webcit/netconf.c
+++ b/webcit/netconf.c
@@ -298,12 +298,12 @@ void
 InitModule_NETCONF
 (void)
 {
-	WebcitAddUrlHandler(HKEY("display_edit_node"), display_edit_node, 0);
+	WebcitAddUrlHandler(HKEY("display_edit_node"), "", 0, display_edit_node, 0);
 
-	WebcitAddUrlHandler(HKEY("edit_node"), edit_node, 0);
-	WebcitAddUrlHandler(HKEY("display_netconf"), display_netconf, 0);
-	WebcitAddUrlHandler(HKEY("display_confirm_delete_node"), display_confirm_delete_node, 0);
-	WebcitAddUrlHandler(HKEY("delete_node"), delete_node, 0);
+	WebcitAddUrlHandler(HKEY("edit_node"), "", 0, edit_node, 0);
+	WebcitAddUrlHandler(HKEY("display_netconf"), "", 0, display_netconf, 0);
+	WebcitAddUrlHandler(HKEY("display_confirm_delete_node"), "", 0, display_confirm_delete_node, 0);
+	WebcitAddUrlHandler(HKEY("delete_node"), "", 0, delete_node, 0);
 
                                                                                           
         RegisterNamespace("CFG:IGNET:NODE", 0, 1, tmplput_NodeName, NULL, CTX_NODECONF);
diff --git a/webcit/notes.c b/webcit/notes.c
index 291712278..7ffd32c0c 100644
--- a/webcit/notes.c
+++ b/webcit/notes.c
@@ -450,8 +450,8 @@ InitModule_NOTES
 		NULL,
 		notes_Cleanup);
 
-	WebcitAddUrlHandler(HKEY("add_new_note"), add_new_note, 0);
-	WebcitAddUrlHandler(HKEY("ajax_update_note"), ajax_update_note, 0);
+	WebcitAddUrlHandler(HKEY("add_new_note"), "", 0, add_new_note, 0);
+	WebcitAddUrlHandler(HKEY("ajax_update_note"), "", 0, ajax_update_note, 0);
 
 	RegisterNamespace("VNOTE:POS:LEFT", 0, 0, tmpl_vcard_put_posleft, NULL, CTX_VNOTE);
 	RegisterNamespace("VNOTE:POS:TOP", 0, 0, tmpl_vcard_put_postop, NULL, CTX_VNOTE);
diff --git a/webcit/openid.c b/webcit/openid.c
index 65247d975..e3881924f 100644
--- a/webcit/openid.c
+++ b/webcit/openid.c
@@ -117,7 +117,7 @@ void
 InitModule_OPENID
 (void)
 {
-	WebcitAddUrlHandler(HKEY("display_openids"), display_openids, 0);
-	WebcitAddUrlHandler(HKEY("openid_attach"), openid_attach, 0);
-	WebcitAddUrlHandler(HKEY("openid_detach"), openid_detach, 0);
+	WebcitAddUrlHandler(HKEY("display_openids"), "", 0, display_openids, 0);
+	WebcitAddUrlHandler(HKEY("openid_attach"), "", 0, openid_attach, 0);
+	WebcitAddUrlHandler(HKEY("openid_detach"), "", 0, openid_detach, 0);
 }
diff --git a/webcit/paging.c b/webcit/paging.c
index 856ed018c..b4d5a3c0c 100644
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -486,12 +486,12 @@ void
 InitModule_PAGING
 (void)
 {
-	WebcitAddUrlHandler(HKEY("display_page"), display_page, 0);
-	WebcitAddUrlHandler(HKEY("page_user"), page_user, 0);
-	WebcitAddUrlHandler(HKEY("chat"), do_chat, 0);
-	WebcitAddUrlHandler(HKEY("chat_recv"), chat_recv, 0);
-	WebcitAddUrlHandler(HKEY("chat_send"), chat_send, 0);
-	WebcitAddUrlHandler(HKEY("ajax_send_instant_message"), ajax_send_instant_message, AJAX);
+	WebcitAddUrlHandler(HKEY("display_page"), "", 0, display_page, 0);
+	WebcitAddUrlHandler(HKEY("page_user"), "", 0, page_user, 0);
+	WebcitAddUrlHandler(HKEY("chat"), "", 0, do_chat, 0);
+	WebcitAddUrlHandler(HKEY("chat_recv"), "", 0, chat_recv, 0);
+	WebcitAddUrlHandler(HKEY("chat_send"), "", 0, chat_send, 0);
+	WebcitAddUrlHandler(HKEY("ajax_send_instant_message"), "", 0, ajax_send_instant_message, AJAX);
 	RegisterConditional(HKEY("COND:PAGE:WAITING"), 0, Conditional_PAGE_WAITING, CTX_NONE);
 }
 
diff --git a/webcit/paramhandling.c b/webcit/paramhandling.c
index f17fe08df..3aefcc9ea 100644
--- a/webcit/paramhandling.c
+++ b/webcit/paramhandling.c
@@ -421,7 +421,7 @@ void
 InitModule_PARAMHANDLING
 (void)
 {
-	WebcitAddUrlHandler(HKEY("diagnostics"), diagnostics, NEED_URL);
+	WebcitAddUrlHandler(HKEY("diagnostics"), "", 0, diagnostics, NEED_URL);
 
 	RegisterConditional(HKEY("COND:BSTR"), 1, ConditionalBstr, CTX_NONE);
 	RegisterNamespace("BSTR", 1, 2, tmplput_bstr, NULL, CTX_NONE);
diff --git a/webcit/preferences.c b/webcit/preferences.c
index a8c1ce56c..b8330c9fd 100644
--- a/webcit/preferences.c
+++ b/webcit/preferences.c
@@ -1002,8 +1002,8 @@ void
 InitModule_PREFERENCES
 (void)
 {
-	WebcitAddUrlHandler(HKEY("set_preferences"), set_preferences, 0);
-	WebcitAddUrlHandler(HKEY("change_start_page"), change_start_page, 0);
+	WebcitAddUrlHandler(HKEY("set_preferences"), "", 0, set_preferences, 0);
+	WebcitAddUrlHandler(HKEY("change_start_page"), "", 0, change_start_page, 0);
 
 	RegisterPreference("startpage", _("Prefered startpage"), PRF_STRING, LoadStartpage);
 
diff --git a/webcit/pushemail.c b/webcit/pushemail.c
index b899db1f4..54dbf63b3 100644
--- a/webcit/pushemail.c
+++ b/webcit/pushemail.c
@@ -157,6 +157,6 @@ void
 InitModule_PUSHMAIL
 (void)
 {
-	WebcitAddUrlHandler(HKEY("display_pushemail"), display_pushemail, 0);
-	WebcitAddUrlHandler(HKEY("save_pushemail"), save_pushemail, 0);
+	WebcitAddUrlHandler(HKEY("display_pushemail"), "", 0, display_pushemail, 0);
+	WebcitAddUrlHandler(HKEY("save_pushemail"), "", 0, save_pushemail, 0);
 }
diff --git a/webcit/roomlist.c b/webcit/roomlist.c
index 04cd48abb..818b02d3a 100644
--- a/webcit/roomlist.c
+++ b/webcit/roomlist.c
@@ -699,7 +699,7 @@ void
 InitModule_ROOMLIST
 (void)
 {
-	WebcitAddUrlHandler(HKEY("json_roomflr"), jsonRoomFlr, 0);
+	WebcitAddUrlHandler(HKEY("json_roomflr"), "", 0, jsonRoomFlr, 0);
 
 
 	RegisterNamespace("FLOOR:ID", 0, 0, tmplput_FLOOR_ID, NULL, CTX_FLOORS);
diff --git a/webcit/roomops.c b/webcit/roomops.c
index cd7076227..99806edb1 100644
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -3173,25 +3173,25 @@ InitModule_ROOMOPS
 
 	RegisterNamespace("ROOMNAME", 0, 1, tmplput_RoomName, NULL, CTX_NONE);
 
-	WebcitAddUrlHandler(HKEY("knrooms"), knrooms, 0);
-	WebcitAddUrlHandler(HKEY("dotgoto"), dotgoto, NEED_URL);
-	WebcitAddUrlHandler(HKEY("dotskip"), dotskip, NEED_URL);
-	WebcitAddUrlHandler(HKEY("display_private"), _display_private, 0);
-	WebcitAddUrlHandler(HKEY("goto_private"), goto_private, NEED_URL);
-	WebcitAddUrlHandler(HKEY("zapped_list"), zapped_list, 0);
-	WebcitAddUrlHandler(HKEY("display_zap"), display_zap, 0);
-	WebcitAddUrlHandler(HKEY("zap"), zap, 0);
-	WebcitAddUrlHandler(HKEY("display_entroom"), display_entroom, 0);
-	WebcitAddUrlHandler(HKEY("entroom"), entroom, 0);
-	WebcitAddUrlHandler(HKEY("display_whok"), display_whok, 0);
-	WebcitAddUrlHandler(HKEY("do_invt_kick"), do_invt_kick, 0);
-	WebcitAddUrlHandler(HKEY("display_editroom"), display_editroom, 0);
-	WebcitAddUrlHandler(HKEY("netedit"), netedit, 0);
-	WebcitAddUrlHandler(HKEY("editroom"), editroom, 0);
-	WebcitAddUrlHandler(HKEY("delete_room"), delete_room, 0);
-	WebcitAddUrlHandler(HKEY("set_room_policy"), set_room_policy, 0);
-	WebcitAddUrlHandler(HKEY("changeview"), change_view, 0);
-	WebcitAddUrlHandler(HKEY("toggle_self_service"), toggle_self_service, 0);
+	WebcitAddUrlHandler(HKEY("knrooms"), "", 0, knrooms, 0);
+	WebcitAddUrlHandler(HKEY("dotgoto"), "", 0, dotgoto, NEED_URL);
+	WebcitAddUrlHandler(HKEY("dotskip"), "", 0, dotskip, NEED_URL);
+	WebcitAddUrlHandler(HKEY("display_private"), "", 0, _display_private, 0);
+	WebcitAddUrlHandler(HKEY("goto_private"), "", 0, goto_private, NEED_URL);
+	WebcitAddUrlHandler(HKEY("zapped_list"), "", 0, zapped_list, 0);
+	WebcitAddUrlHandler(HKEY("display_zap"), "", 0, display_zap, 0);
+	WebcitAddUrlHandler(HKEY("zap"), "", 0, zap, 0);
+	WebcitAddUrlHandler(HKEY("display_entroom"), "", 0, display_entroom, 0);
+	WebcitAddUrlHandler(HKEY("entroom"), "", 0, entroom, 0);
+	WebcitAddUrlHandler(HKEY("display_whok"), "", 0, display_whok, 0);
+	WebcitAddUrlHandler(HKEY("do_invt_kick"), "", 0, do_invt_kick, 0);
+	WebcitAddUrlHandler(HKEY("display_editroom"), "", 0, display_editroom, 0);
+	WebcitAddUrlHandler(HKEY("netedit"), "", 0, netedit, 0);
+	WebcitAddUrlHandler(HKEY("editroom"), "", 0, editroom, 0);
+	WebcitAddUrlHandler(HKEY("delete_room"), "", 0, delete_room, 0);
+	WebcitAddUrlHandler(HKEY("set_room_policy"), "", 0, set_room_policy, 0);
+	WebcitAddUrlHandler(HKEY("changeview"), "", 0, change_view, 0);
+	WebcitAddUrlHandler(HKEY("toggle_self_service"), "", 0, toggle_self_service, 0);
 	RegisterNamespace("ROOMBANNER", 0, 1, tmplput_roombanner, NULL, CTX_NONE);
 
 	RegisterConditional(HKEY("COND:ROOM:TYPE_IS"), 0, ConditionalIsRoomtype, CTX_NONE);
diff --git a/webcit/setup_wizard.c b/webcit/setup_wizard.c
index a22b8fc03..66deb8c12 100644
--- a/webcit/setup_wizard.c
+++ b/webcit/setup_wizard.c
@@ -56,5 +56,5 @@ void
 InitModule_SETUP_WIZARD
 (void)
 {
-	WebcitAddUrlHandler(HKEY("setup_wizard"), do_setup_wizard, 0);
+	WebcitAddUrlHandler(HKEY("setup_wizard"), "", 0, do_setup_wizard, 0);
 }
diff --git a/webcit/sieve.c b/webcit/sieve.c
index c418c74ca..54977f2f8 100644
--- a/webcit/sieve.c
+++ b/webcit/sieve.c
@@ -1172,9 +1172,9 @@ void
 InitModule_SIEVE
 (void)
 {
-	WebcitAddUrlHandler(HKEY("display_sieve"), display_sieve, 0);
-	WebcitAddUrlHandler(HKEY("save_sieve"), save_sieve, 0);
-	WebcitAddUrlHandler(HKEY("display_add_remove_scripts"), _display_add_remove_scripts, 0);
-	WebcitAddUrlHandler(HKEY("create_script"), create_script, 0);
-	WebcitAddUrlHandler(HKEY("delete_script"), delete_script, 0);
+	WebcitAddUrlHandler(HKEY("display_sieve"), "", 0, display_sieve, 0);
+	WebcitAddUrlHandler(HKEY("save_sieve"), "", 0, save_sieve, 0);
+	WebcitAddUrlHandler(HKEY("display_add_remove_scripts"), "", 0, _display_add_remove_scripts, 0);
+	WebcitAddUrlHandler(HKEY("create_script"), "", 0, create_script, 0);
+	WebcitAddUrlHandler(HKEY("delete_script"), "", 0, delete_script, 0);
 }
diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index 67c954a71..82554e56e 100644
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -312,7 +312,7 @@ void
 InitModule_SITECONFIG
 (void)
 {
-	WebcitAddUrlHandler(HKEY("siteconfig"), siteconfig, CTX_NONE);
+	WebcitAddUrlHandler(HKEY("siteconfig"), "", 0, siteconfig, CTX_NONE);
 
 	RegisterNamespace("SERV:CFG", 1, 2, tmplput_servcfg, NULL, CTX_NONE);
 	RegisterConditional(HKEY("COND:SERVCFG"), 3, ConditionalServCfg, CTX_NONE);
diff --git a/webcit/smtpqueue.c b/webcit/smtpqueue.c
index b3c0983d1..5a0ced4fd 100644
--- a/webcit/smtpqueue.c
+++ b/webcit/smtpqueue.c
@@ -264,6 +264,6 @@ void
 InitModule_SMTP_QUEUE
 (void)
 {
-	WebcitAddUrlHandler(HKEY("display_smtpqueue"), display_smtpqueue, 0);
-	WebcitAddUrlHandler(HKEY("display_smtpqueue_inner_div"), display_smtpqueue_inner_div, 0);
+	WebcitAddUrlHandler(HKEY("display_smtpqueue"), "", 0, display_smtpqueue, 0);
+	WebcitAddUrlHandler(HKEY("display_smtpqueue_inner_div"), "", 0, display_smtpqueue_inner_div, 0);
 }
diff --git a/webcit/static.c b/webcit/static.c
index 257ca5ad3..461f3abbf 100644
--- a/webcit/static.c
+++ b/webcit/static.c
@@ -300,10 +300,10 @@ InitModule_STATIC
 	LoadStaticDir(static_dirs[2], StaticFilemappings[2], "");
 	LoadStaticDir(static_dirs[3], StaticFilemappings[3], "");
 
-	WebcitAddUrlHandler(HKEY("robots.txt"), output_flat_static, ANONYMOUS|COOKIEUNNEEDED|ISSTATIC|LOGCHATTY);
-	WebcitAddUrlHandler(HKEY("favicon.ico"), output_flat_static, ANONYMOUS|COOKIEUNNEEDED|ISSTATIC|LOGCHATTY);
-	WebcitAddUrlHandler(HKEY("static"), output_static_0, ANONYMOUS|COOKIEUNNEEDED|ISSTATIC|LOGCHATTY);
-	WebcitAddUrlHandler(HKEY("static.local"), output_static_1, ANONYMOUS|COOKIEUNNEEDED|ISSTATIC|LOGCHATTY);
-	WebcitAddUrlHandler(HKEY("tinymce"), output_static_2, ANONYMOUS|COOKIEUNNEEDED|ISSTATIC|LOGCHATTY);
-	WebcitAddUrlHandler(HKEY("tiny_mce"), output_static_2, ANONYMOUS|COOKIEUNNEEDED|ISSTATIC|LOGCHATTY);
+	WebcitAddUrlHandler(HKEY("robots.txt"), "", 0, output_flat_static, ANONYMOUS|COOKIEUNNEEDED|ISSTATIC|LOGCHATTY);
+	WebcitAddUrlHandler(HKEY("favicon.ico"), "", 0, output_flat_static, ANONYMOUS|COOKIEUNNEEDED|ISSTATIC|LOGCHATTY);
+	WebcitAddUrlHandler(HKEY("static"), "", 0, output_static_0, ANONYMOUS|COOKIEUNNEEDED|ISSTATIC|LOGCHATTY);
+	WebcitAddUrlHandler(HKEY("static.local"), "", 0, output_static_1, ANONYMOUS|COOKIEUNNEEDED|ISSTATIC|LOGCHATTY);
+	WebcitAddUrlHandler(HKEY("tinymce"), "", 0, output_static_2, ANONYMOUS|COOKIEUNNEEDED|ISSTATIC|LOGCHATTY);
+	WebcitAddUrlHandler(HKEY("tiny_mce"), "", 0, output_static_2, ANONYMOUS|COOKIEUNNEEDED|ISSTATIC|LOGCHATTY);
 }
diff --git a/webcit/summary.c b/webcit/summary.c
index 2586d10fc..a5db298b0 100644
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -329,11 +329,11 @@ void
 InitModule_SUMMARY
 (void)
 {
-	WebcitAddUrlHandler(HKEY("new_messages_html"), new_messages_section, AJAX);
-	WebcitAddUrlHandler(HKEY("tasks_inner_html"), tasks_section, AJAX);
-	WebcitAddUrlHandler(HKEY("calendar_inner_html"), calendar_section, AJAX);
-	WebcitAddUrlHandler(HKEY("mini_calendar"), ajax_mini_calendar, AJAX);
-	WebcitAddUrlHandler(HKEY("summary"), summary, 0);
-	WebcitAddUrlHandler(HKEY("summary_inner_div"), summary_inner_div, AJAX);
+	WebcitAddUrlHandler(HKEY("new_messages_html"), "", 0, new_messages_section, AJAX);
+	WebcitAddUrlHandler(HKEY("tasks_inner_html"), "", 0, tasks_section, AJAX);
+	WebcitAddUrlHandler(HKEY("calendar_inner_html"), "", 0, calendar_section, AJAX);
+	WebcitAddUrlHandler(HKEY("mini_calendar"), "", 0, ajax_mini_calendar, AJAX);
+	WebcitAddUrlHandler(HKEY("summary"), "", 0, summary, 0);
+	WebcitAddUrlHandler(HKEY("summary_inner_div"), "", 0, summary_inner_div, AJAX);
 }
 
diff --git a/webcit/sysmsgs.c b/webcit/sysmsgs.c
index 00b4181d2..564645d48 100644
--- a/webcit/sysmsgs.c
+++ b/webcit/sysmsgs.c
@@ -110,8 +110,8 @@ void
 InitModule_SYSMSG
 (void)
 {
-	WebcitAddUrlHandler(HKEY("display_editinfo"), display_editinfo, 0);
-	WebcitAddUrlHandler(HKEY("editinfo"), editinfo, 0);
-	WebcitAddUrlHandler(HKEY("display_editbio"), display_editbio, 0);
-	WebcitAddUrlHandler(HKEY("editbio"), editbio, 0);
+	WebcitAddUrlHandler(HKEY("display_editinfo"), "", 0, display_editinfo, 0);
+	WebcitAddUrlHandler(HKEY("editinfo"), "", 0, editinfo, 0);
+	WebcitAddUrlHandler(HKEY("display_editbio"), "", 0, display_editbio, 0);
+	WebcitAddUrlHandler(HKEY("editbio"), "", 0, editbio, 0);
 }
diff --git a/webcit/tasks.c b/webcit/tasks.c
index c2f4b8278..2f9f16e05 100644
--- a/webcit/tasks.c
+++ b/webcit/tasks.c
@@ -672,5 +672,5 @@ InitModule_TASKS
 		tasks_LoadMsgFromServer,
 		tasks_RenderView_or_Tail,
 		tasks_Cleanup);
-	WebcitAddUrlHandler(HKEY("save_task"), save_task, 0);
+	WebcitAddUrlHandler(HKEY("save_task"), "", 0, save_task, 0);
 }
diff --git a/webcit/useredit.c b/webcit/useredit.c
index f3f233a0d..09d108987 100644
--- a/webcit/useredit.c
+++ b/webcit/useredit.c
@@ -725,10 +725,10 @@ void
 InitModule_USEREDIT
 (void)
 {
-	WebcitAddUrlHandler(HKEY("select_user_to_edit"), _select_user_to_edit, 0);
-	WebcitAddUrlHandler(HKEY("display_edituser"), _display_edituser, 0);
-	WebcitAddUrlHandler(HKEY("edituser"), edituser, 0);
-	WebcitAddUrlHandler(HKEY("create_user"), create_user, 0);
+	WebcitAddUrlHandler(HKEY("select_user_to_edit"), "", 0, _select_user_to_edit, 0);
+	WebcitAddUrlHandler(HKEY("display_edituser"), "", 0, _display_edituser, 0);
+	WebcitAddUrlHandler(HKEY("edituser"), "", 0, edituser, 0);
+	WebcitAddUrlHandler(HKEY("create_user"), "", 0, create_user, 0);
 
 	RegisterNamespace("USERLIST:USERNAME",      0, 1, tmplput_USERLIST_UserName, NULL, CTX_USERLIST);
 	RegisterNamespace("USERLIST:PASSWD",        0, 1, tmplput_USERLIST_Password, NULL, CTX_USERLIST);
diff --git a/webcit/userlist.c b/webcit/userlist.c
index e1c05c49c..2d38610f1 100644
--- a/webcit/userlist.c
+++ b/webcit/userlist.c
@@ -169,6 +169,6 @@ void
 InitModule_USERLIST
 (void)
 {
-	WebcitAddUrlHandler(HKEY("userlist"), userlist, 0);
-	WebcitAddUrlHandler(HKEY("showuser"), showuser, 0);
+	WebcitAddUrlHandler(HKEY("userlist"), "", 0, userlist, 0);
+	WebcitAddUrlHandler(HKEY("showuser"), "", 0, showuser, 0);
 }
diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index 2897424b0..b296c0fe4 100644
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -1338,8 +1338,8 @@ InitModule_VCARD
 		vcard_LoadMsgFromServer,
 		vcard_RenderView_or_Tail,
 		vcard_Cleanup);
-	WebcitAddUrlHandler(HKEY("edit_vcard"), edit_vcard, 0);
-	WebcitAddUrlHandler(HKEY("submit_vcard"), submit_vcard, 0);
-	WebcitAddUrlHandler(HKEY("vcardphoto"), display_vcard_photo_img, NEED_URL);
+	WebcitAddUrlHandler(HKEY("edit_vcard"), "", 0, edit_vcard, 0);
+	WebcitAddUrlHandler(HKEY("submit_vcard"), "", 0, submit_vcard, 0);
+	WebcitAddUrlHandler(HKEY("vcardphoto"), "", 0, display_vcard_photo_img, NEED_URL);
 }
 
diff --git a/webcit/webcit.c b/webcit/webcit.c
index 013e38cd4..480dcf70c 100644
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -31,8 +31,8 @@ void DeleteWebcitHandler(void *vHandler)
 
 }
 
-void WebcitAddUrlHandler(const char * UrlString, 
-			 long UrlSLen, 
+void WebcitAddUrlHandler(const char * UrlString, long UrlSLen, 
+			 const char *DisplayName, long dslen,
 			 WebcitHandlerFunc F, 
 			 long Flags)
 {
@@ -42,6 +42,8 @@ void WebcitAddUrlHandler(const char * UrlString,
 	NewHandler->Flags = Flags;
 	NewHandler->Name = NewStrBufPlain(UrlString, UrlSLen);
 	StrBufShrinkToFit(NewHandler->Name, 1);
+	NewHandler->DisplayName = NewStrBufPlain(DisplayName, dslen);
+	StrBufShrinkToFit(NewHandler->DisplayName, 1);
 	Put(HandlerHash, UrlString, UrlSLen, NewHandler, DeleteWebcitHandler);
 }
 
@@ -796,13 +798,13 @@ InitModule_WEBCIT
 (void)
 {
 	char dir[SIZ];
-	WebcitAddUrlHandler(HKEY("blank"), blank_page, ANONYMOUS|COOKIEUNNEEDED|ISSTATIC);
-	WebcitAddUrlHandler(HKEY("do_template"), url_do_template, ANONYMOUS);
-	WebcitAddUrlHandler(HKEY("sslg"), seconds_since_last_gexp, AJAX|LOGCHATTY);
-	WebcitAddUrlHandler(HKEY("ajax_servcmd"), ajax_servcmd, 0);
-	WebcitAddUrlHandler(HKEY("webcit"), blank_page, URLNAMESPACE);
+	WebcitAddUrlHandler(HKEY("blank"), "", 0, blank_page, ANONYMOUS|COOKIEUNNEEDED|ISSTATIC);
+	WebcitAddUrlHandler(HKEY("do_template"), "", 0, url_do_template, ANONYMOUS);
+	WebcitAddUrlHandler(HKEY("sslg"), "", 0, seconds_since_last_gexp, AJAX|LOGCHATTY);
+	WebcitAddUrlHandler(HKEY("ajax_servcmd"), "", 0, ajax_servcmd, 0);
+	WebcitAddUrlHandler(HKEY("webcit"), "", 0, blank_page, URLNAMESPACE);
 
-	WebcitAddUrlHandler(HKEY("401"), authorization_required, ANONYMOUS|COOKIEUNNEEDED);
+	WebcitAddUrlHandler(HKEY("401"), "", 0, authorization_required, ANONYMOUS|COOKIEUNNEEDED);
 	RegisterConditional(HKEY("COND:IMPMSG"), 0, ConditionalImportantMesage, CTX_NONE);
 	RegisterNamespace("CSSLOCAL", 0, 0, tmplput_csslocal, NULL, CTX_NONE);
 	RegisterNamespace("IMPORTANTMESSAGE", 0, 0, tmplput_importantmessage, NULL, CTX_NONE);
diff --git a/webcit/webcit.h b/webcit/webcit.h
index 422ecb202..4d01fb558 100644
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -323,8 +323,11 @@ typedef struct  _WebcitHandler{
 	WebcitHandlerFunc F;
 	long Flags;
 	StrBuf *Name;
+	StrBuf *DisplayName;
 } WebcitHandler;
-void WebcitAddUrlHandler(const char * UrlString, long UrlSLen, WebcitHandlerFunc F, long Flags);
+
+
+void WebcitAddUrlHandler(const char * UrlString, long UrlSLen, const char *DisplayName, long dslen, WebcitHandlerFunc F, long Flags);
 
 typedef struct _headereval {
 	ExamineMsgHeaderFunc evaluator;
diff --git a/webcit/who.c b/webcit/who.c
index dec178110..79ab3f437 100644
--- a/webcit/who.c
+++ b/webcit/who.c
@@ -323,8 +323,8 @@ InitModule_WHO
 {
 	
 
-	WebcitAddUrlHandler(HKEY("terminate_session"), _terminate_session, 0);
-	WebcitAddUrlHandler(HKEY("edit_me"), edit_me, 0);
+	WebcitAddUrlHandler(HKEY("terminate_session"), "", 0, _terminate_session, 0);
+	WebcitAddUrlHandler(HKEY("edit_me"), "", 0, edit_me, 0);
 
 	RegisterIterator("WHOLIST", 0, NULL, GetWholistHash, NULL, DeleteWholistHash, CTX_WHO, CTX_NONE, IT_NOFLAG);
 
diff --git a/webcit/wiki.c b/webcit/wiki.c
index b60d66d5b..e64e33cf9 100644
--- a/webcit/wiki.c
+++ b/webcit/wiki.c
@@ -123,7 +123,7 @@ InitModule_WIKI
 		wiki_Cleanup
 	);
 
-	WebcitAddUrlHandler(HKEY("wiki"), display_wiki_page, 0);
+	WebcitAddUrlHandler(HKEY("wiki"), "", 0, display_wiki_page, 0);
 }
 
 
-- 
2.30.2