* add a Display name to our handlers; this will be used by DAV handlers.

diff --git a/webcit/addressbook_popup.c b/webcit/addressbook_popup.c
index 8e687f3debe1a26ebfbe01a0816b1e3baaea0220..7f35fa0d50a5db7319954b287f4081acd773acc3 100644 (file)
--- 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 d61d7c203002e8805e8b9c38864201b358615f98..9375c1f1e6907f3088cac3f9df3d50dd589533f5 100644 (file)
--- 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 4cf4ccd6f659ff139fe84df68da623d681c6282e..4d8b3799a81abc6f21f6685b7a2eb786aa9e9ac6 100644 (file)
--- 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 ad0cd435c6da5a655ab3431dc726d7559475bdaa..258d57b10a1c4ed4c743e7cf7566dabbfc876e2e 100644 (file)
--- 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 aa8a467a9287908a531f16b71de13799dadffc40..48fc3f8ae97e7ec9fcbc2b4e4d4a5fed454da704 100644 (file)
--- 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 d7b915c3c2d092842d6128ee11a0b8a31ecb748c..56134d0c8aad9622ceaaa901844b87f746182dcf 100644 (file)
--- 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 5397cd3195fe3a97b02d7135ff2b378210147c8c..5a0ed666ac69753ef3ab5a42a05a8c7a1a99455b 100644 (file)
--- 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 318ceea549be914af08e5202056d13d9ab142966..8ccd6b0e14ff28f398f59075155d5dd134477450 100644 (file)
--- 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 beb449882311fa4badba256efff9f87872b07760..b4708881e4b9210a7249983f35df34a64852fa91 100644 (file)
--- 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 c8e100d0a03af984a31888be70171f395c440530..d29594c1f2aa32d24751885595809625b1ac7ce5 100644 (file)
--- 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 260a8f4d5d1931f62e993096a6b6fd92a3936179..f6ed32f2d6ba4b12c52d48b4e6291a72a03b5f1a 100644 (file)
--- 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 3959e27a65624d4039e9e2e47be6be23e5361619..98e58f59c05d08d7270492e5598de824e1304187 100644 (file)
--- 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 ed124e84468e45a370ff55ac39fe97b0bc168558..d442f97c071be67eae8fbad0df2cf5873e7fdfe3 100644 (file)
--- 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 cf56d0f8d889bed8d39904a290c71e9c4473debf..7e0f8f047f90b3aa7f7590ecf54f72c295f2e5c8 100644 (file)
--- 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 9b369e79b48ac88f7139d0a6efda21fc515120a0..9e316f950695a39eec63133702d76ceb4bba5db6 100644 (file)
--- 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 2917122785ed673600d115c3c14504c1eb425db6..7ffd32c0c5fb19057422c5db0e059e96d0af6638 100644 (file)
--- 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 65247d975f9778209eaa3c036ca5485933affd06..e3881924fbd7a0ae7c73a250279e6c438d01640f 100644 (file)
--- 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 856ed018cc56a329fd8e918c8a28cf4ed3aab3f6..b4d5a3c0c981f83adf8154e7d3f536bbfc4135e7 100644 (file)
--- 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 f17fe08df9f07f01e4faf7bf915fe09cbb59e39b..3aefcc9ea01a7464eeac38142a26ee83f525716f 100644 (file)
--- 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 a8c1ce56c9462f1ce11f4c30e484256a0e49d67e..b8330c9fdd6ac975f803661eaf77e63a1f63bffb 100644 (file)
--- 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 b899db1f4c46d815bfeee480ec88c19b291f30d3..54dbf63b3575cd9cef8524e72975b3b7a51a13df 100644 (file)
--- 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 04cd48abbf963b6a4f5d18ce1c9b3d24a6dc4852..818b02d3a9ba2e3b02f34c768f382a0f67e2ab72 100644 (file)
--- 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 cd707622737b7e42e291f720391872e198079334..99806edb1cb30617801efac01f8616414f9cfd10 100644 (file)
--- 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 a22b8fc03a2c0191031fa54c6315f71f8012d40f..66deb8c1214b5640c80958c87ab06585b1286bf0 100644 (file)
--- 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 c418c74cadffaea413165fe7c69b8f2d53245605..54977f2f86a9899c3466f73ee716b97b0974ae1d 100644 (file)
--- 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 67c954a7118ea660cfadce1848c52b803356d975..82554e56ec7bb222c2e9783b2bb290ef423f72ce 100644 (file)
--- 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 b3c0983d140c266c8aeb014a46839c6928c99a8f..5a0ced4fdce5553981d3a282aae0872312143f10 100644 (file)
--- 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 257ca5ad370c3af1628ded76695e645b889a3002..461f3abbffff7efca0dcff3fc81bbb7767995a7c 100644 (file)
--- 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 2586d10fcb1aea8975d9fac22af05819db32788e..a5db298b030bf8cbec17e3f0b9cf31e9c54257b5 100644 (file)
--- 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 00b4181d246d12bf97eae784d812da38fb90f1ae..564645d48fbccfd76421c702bd529c264cb359d2 100644 (file)
--- 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 c2f4b827864e85038c7922b402aa753e20823268..2f9f16e05c1c0c2df708ca97d4f11576674d976f 100644 (file)
--- 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 f3f233a0dac8811f76247300cf12622637d497bd..09d10898743c82e5840e893d558252b5662868aa 100644 (file)
--- 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 e1c05c49cc00297863a7b64cd3e4a36922647f86..2d38610f184af01bfaf857a6645ad73a8ce68e6a 100644 (file)
--- 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 2897424b0723f6f7d1968040ebaca262328747a7..b296c0fe44cfd0bb294c1576f9678edbda42c1c7 100644 (file)
--- 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 013e38cd440fe5d206a6d2553564afd865e6cd74..480dcf70cb7dde5a319ca3ceb38298ec39bdc6dd 100644 (file)
--- 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 422ecb2027b707a30fec7f9094b0b10cf8b4fa32..4d01fb55802a6095e2b0158cb164a012b10139a5 100644 (file)
--- 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 dec178110e8b0041c6f64bb5351450de830bf40d..79ab3f43741599f124d9f6c6e55aa9ded4fc6e90 100644 (file)
--- 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 b60d66d5b8edfaffd3a1bdc3542f8f786031cdc4..e64e33cf9a6abc2e10b73658f093de504008e705 100644 (file)
--- 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);
 }