From 5bcebc469ec05ce24bf9d0c56894e857e395642e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wilfried=20G=C3=B6esgens?= Date: Mon, 14 Jul 2008 20:35:00 +0000 Subject: [PATCH] * removed handlers from webcit.h if possible * added file local forward declarations where needed. --- webcit/auth.c | 3 ++ webcit/iconbar.c | 3 ++ webcit/messages.c | 2 + webcit/netconf.c | 2 + webcit/roomops.c | 3 ++ webcit/useredit.c | 1 - webcit/webcit.h | 107 ---------------------------------------------- 7 files changed, 13 insertions(+), 108 deletions(-) diff --git a/webcit/auth.c b/webcit/auth.c index c431c0055..8912b92a9 100644 --- a/webcit/auth.c +++ b/webcit/auth.c @@ -8,6 +8,9 @@ #include "webserver.h" #include + +void display_reg(int during_login); + /* * Access level definitions. This is initialized from a function rather than a * static array so that the strings may be localized. diff --git a/webcit/iconbar.c b/webcit/iconbar.c index 4b76d6bbf..cfc351393 100644 --- a/webcit/iconbar.c +++ b/webcit/iconbar.c @@ -13,6 +13,9 @@ #define IB_TEXTONLY 2 /**< just text */ +void do_iconbar(void); +void do_iconbar_roomlist(void); + /** * \brief draw the icon bar????? */ diff --git a/webcit/messages.c b/webcit/messages.c index 7676c9dd8..06ca707ca 100644 --- a/webcit/messages.c +++ b/webcit/messages.c @@ -13,6 +13,8 @@ #define SENDER_COL_WIDTH_PCT 30 /**< Mailbox view column width */ #define DATE_PLUS_BUTTONS_WIDTH_PCT 20 /**< Mailbox view column width */ +void display_enter(void); + /* * Address book entry (keep it short and sweet, it's just a quickie lookup * which we can use to get to the real meat and bones later) diff --git a/webcit/netconf.c b/webcit/netconf.c index beb7e095f..8b76a86b9 100644 --- a/webcit/netconf.c +++ b/webcit/netconf.c @@ -9,6 +9,8 @@ /*@{*/ #include "webcit.h" +void display_netconf(void); + /** * \brief edit a network node */ diff --git a/webcit/roomops.c b/webcit/roomops.c index 05a7feef4..7be6ff4f0 100644 --- a/webcit/roomops.c +++ b/webcit/roomops.c @@ -10,6 +10,8 @@ char floorlist[MAX_FLOORS][SIZ]; /**< list of our floor names */ char *viewdefs[9]; /**< the different kinds of available views */ +void display_whok(void); + /* * Initialize the viewdefs with localized strings */ @@ -3681,6 +3683,7 @@ InitModule_ROOMOPS WebcitAddUrlHandler(HKEY("delete_room"), delete_room, 0); WebcitAddUrlHandler(HKEY("set_room_policy"), set_room_policy, 0); WebcitAddUrlHandler(HKEY("set_floordiv_expanded"), set_floordiv_expanded, NEED_URL|AJAX); + WebcitAddUrlHandler(HKEY("changeview"), change_view, 0); } /*@}*/ diff --git a/webcit/useredit.c b/webcit/useredit.c index d5b9f44e0..ed4db3ea9 100644 --- a/webcit/useredit.c +++ b/webcit/useredit.c @@ -540,6 +540,5 @@ InitModule_USEREDIT WebcitAddUrlHandler(HKEY("display_edituser"), _display_edituser, 0); WebcitAddUrlHandler(HKEY("edituser"), edituser, 0); WebcitAddUrlHandler(HKEY("create_user"), create_user, 0); - WebcitAddUrlHandler(HKEY("changeview"), change_view, 0); } /*@}*/ diff --git a/webcit/webcit.h b/webcit/webcit.h index 1a8cd774f..b8353a90b 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -471,8 +471,6 @@ extern char wizard_filename[]; extern time_t if_modified_since; extern int follow_xff; extern HashList *HandlerHash; -void do_setup_wizard(void); - void InitialiseSemaphores(void); void begin_critical_section(int which_one); @@ -487,24 +485,15 @@ void cookie_to_stuff(char *cookie, int *session, char *room, size_t room_len); void locate_host(char *, int); void become_logged_in(char *, char *, char *); -void do_login(void); -void do_openid_login(void); -void finalize_openid_login(void); void openid_manual_create(void); void display_login(char *mesg); -void display_openid_login(char *mesg); void display_openids(void); -void openid_attach(void); -void openid_detach(void); void do_welcome(void); void do_logout(void); void display_main_menu(void); void display_aide_menu(void); -void display_shutdown(void); void display_advanced_menu(void); void slrp_highest(void); -void gotonext(void); -void ungoto(void); void get_serv_info(char *, char *); int uds_connectsock(char *); int tcp_connectsock(char *, char *); @@ -513,11 +502,7 @@ int StrBuf_ServGetln(StrBuf *buf); void serv_puts(char *string); void who(void); void who_inner_div(void); -void wholist_section(void); -void tasks_section(void); -void calendar_section(void); void ajax_mini_calendar(void); -void new_messages_section(void); void fmout(char *align); void pullquote_fmout(void); void wDumpContent(int); @@ -574,43 +559,17 @@ void embed_main_menu(void); void serv_read(char *buf, int bytes); void readloop(char *oper); void read_message(long msgnum, int printable_view, char *section); -void embed_message(void); -void print_message(void); -void display_headers(void); void text_to_server(char *ptr); void text_to_server_qp(char *ptr); -void display_enter(void); -void post_message(void); void confirm_delete_msg(void); -void delete_msg(void); -void confirm_move_msg(void); -void move_msg(void); -void userlist(void); -void showuser(void); -void display_page(void); -void page_user(void); -void do_chat(void); -void display_private(char *rname, int req_pass); -void goto_private(void); -void zapped_list(void); -void display_zap(void); -void zap(void); void display_success(char *); void authorization_required(const char *message); -void display_entroom(void); -void entroom(void); -void display_editroom(void); -void netedit(void); -void editroom(void); -void display_whok(void); -void do_invt_kick(void); void server_to_text(void); void save_edit(char *description, char *enter_cmd, int regoto); void display_edit(char *description, char *check_cmd, char *read_cmd, char *save_cmd, int with_room_banner); int gotoroom(char *gname); void confirm_delete_room(void); -void delete_room(void); void validate(void); void display_graphics_upload(char *, char *, char *); void do_graphics_upload(char *upl_cmd); @@ -620,25 +579,8 @@ void serv_write(char *buf, int nbytes); void serv_puts(char *string); void serv_printf(const char *format,...)__attribute__((__format__(__printf__,1,2))); void load_floorlist(void); -void display_reg(int); -void display_changepw(void); -void changepw(void); -void display_edit_node(void); -void edit_node(void); -void display_netconf(void); -void display_confirm_delete_node(void); -void delete_node(void); -void display_add_node(void); -void terminate_session(void); void shutdown_sessions(void); void do_housekeeping(void); -void edit_me(void); -void display_siteconfig(void); -void siteconfig(void); -void display_generic(void); -void do_generic(void); -void ajax_servcmd(void); -void display_menubar(int); void smart_goto(char *); void worker_entry(void); void session_loop(struct httprequest *); @@ -648,8 +590,6 @@ void httpdate(char *buf, time_t thetime); time_t httpdate_to_timestamp(char *buf); void end_webcit_session(void); void page_popup(void); -void chat_recv(void); -void chat_send(void); void http_redirect(const char *); void clear_substs(struct wcsession *wc); void clear_local_substs(void); @@ -677,17 +617,11 @@ void remove_token(char *source, int parmnum, char separator); char *load_mimepart(long msgnum, char *partnum); int pattern2(char *search, char *patn); void do_edit_vcard(long, char *, char *, char *); -void edit_vcard(void); -void submit_vcard(void); void striplt(char *); void stripltlen(char *, int *); void select_user_to_edit(char *message, char *preselect); void delete_user(char *); -void display_edituser(char *who, int is_new); -void create_user(void); -void edituser(void); void do_change_view(int); -void change_view(void); void folders(void); @@ -712,80 +646,45 @@ void set_PREF_YESNO(const char *key, size_t keylen, int value, int save_to_serve -void knrooms(void); int is_msg_in_mset(char *mset, long msgnum); void display_addressbook(long msgnum, char alpha); void offer_start_page(void); void convenience_page(char *titlebarcolor, char *titlebarmsg, char *messagetext); -void change_start_page(void); void output_html(char *, int); -void display_floorconfig(char *); -void delete_floor(void); -void create_floor(void); -void rename_floor(void); void do_listsub(void); void toggle_self_service(void); -void summary(void); -void summary_inner_div(void); ssize_t write(int fd, const void *buf, size_t count); void cal_process_attachment(char *part_source, long msgnum, char *cal_partnum); void display_calendar(long msgnum, int unread); void display_task(long msgnum, int unread); void display_note(long msgnum, int unread); -void add_new_note(void); void updatenote(void); -void ajax_update_note(void); void do_calendar_view(void); void do_tasks_view(void); void calendar_summary_view(void); int load_msg_ptrs(char *servcmd, int with_headers); void free_attachments(struct wcsession *sess); void free_march_list(struct wcsession *wcf); -void set_room_policy(void); -void display_inetconf(void); -void save_inetconf(void); -void display_smtpqueue(void); -void display_smtpqueue_inner_div(void); -void display_sieve(void); void display_rules_editor_inner_div(void); -void save_sieve(void); -void display_pushemail(void); -void save_pushemail(void); -void display_add_remove_scripts(char *); -void create_script(void); -void delete_script(void); void generate_uuid(char *); 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); void end_ajax_response(void); void initialize_viewdefs(void); void initialize_axdefs(void); void burn_folder_cache(time_t age); void list_all_rooms_by_floor(const char *viewpref); -void display_room_directory(void); -void display_picture(void); void display_pictureview(void); -void download_file(void); -void upload_file(void); void display_edit_task(void); -void save_task(void); void display_edit_event(void); -void save_event(void); icaltimezone *get_default_icaltimezone(void); void display_icaltimetype_as_webform(struct icaltimetype *, char *); void icaltime_from_webform(struct icaltimetype *result, char *prefix); void icaltime_from_webform_dateonly(struct icaltimetype *result, char *prefix); void display_edit_individual_event(icalcomponent *supplied_vtodo, long msgnum, char *from, int unread); void save_individual_event(icalcomponent *supplied_vtodo, long msgnum, char *from, int unread); -void respond_to_request(void); -void handle_rsvp(void); void ical_dezonify(icalcomponent *cal); void partstat_as_string(char *buf, icalproperty *attendee); icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp); @@ -812,15 +711,10 @@ void sleeeeeeeeeep(int); void http_transmit_thing(char *thing, size_t length, const char *content_type, int is_static); long unescape_input(char *buf); -void do_iconbar(void); -void do_iconbar_roomlist(void); void do_selected_iconbar(void); -void display_customize_iconbar(void); -void commit_iconbar(void); int CtdlDecodeQuotedPrintable(char *decoded, char *encoded, int sourcelen); void spawn_another_worker_thread(void); void display_rss(char *roomname, char *request_method); -void set_floordiv_expanded(void); void offer_languages(void); void set_selected_language(char *); void go_selected_language(void); @@ -831,7 +725,6 @@ void tabbed_dialog(int num_tabs, char *tabnames[]); void begin_tab(int tabnum, int num_tabs); void end_tab(int tabnum, int num_tabs); void str_wiki_index(char *s); -void display_wiki_page(void); int get_time_format_cached (void); int xtoi(char *in, size_t len); void webcit_fmt_date(char *buf, time_t thetime, int brief); -- 2.30.2