From fd034bea666febed8eff22cf10f2b72b8b009665 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Tue, 24 May 2011 18:37:06 -0400 Subject: [PATCH] Removed the unused second argument from the do_template() macro --- webcit/auth.c | 20 +++++++-------- webcit/bbsview_renderer.c | 6 ++--- webcit/blogview_renderer.c | 6 +++++ webcit/graphics.c | 4 +-- webcit/groupdav_propfind.c | 4 +-- webcit/listsub.c | 22 +++++++++++++--- webcit/openid.c | 23 ++++++++++++++--- webcit/preferences.c | 19 +++++++++++++- webcit/roomchat.c | 6 ++--- webcit/roomops.c | 32 ++++++++++++------------ webcit/roomtokens.c | 6 ++--- webcit/sieve.c | 36 ++++++++++++++++++++------- webcit/static/t/blog_comment_box.html | 5 ++++ webcit/subst.h | 2 +- webcit/summary.c | 18 +++++++++++++- webcit/sysmsgs.c | 24 +++++++++++++++--- webcit/useredit.c | 19 +++++++++++++- webcit/vcard_edit.c | 23 ++++++++++++++--- webcit/webcit.c | 4 +-- webcit/wiki.c | 4 +-- 20 files changed, 215 insertions(+), 68 deletions(-) create mode 100644 webcit/static/t/blog_comment_box.html diff --git a/webcit/auth.c b/webcit/auth.c index 35c2063b3..132586f0e 100644 --- a/webcit/auth.c +++ b/webcit/auth.c @@ -64,7 +64,7 @@ void display_login(void) { begin_burst(); output_headers(1, 0, 0, 0, 1, 0); - do_template("login", NULL); + do_template("login"); end_burst(); } @@ -196,7 +196,7 @@ void openid_manual_create(void) if (havebstr("exit_action")) { begin_burst(); output_headers(1, 0, 0, 0, 1, 0); - do_template("authpopup_finished", NULL); + do_template("authpopup_finished"); end_burst(); return; } @@ -224,7 +224,7 @@ void openid_manual_create(void) if (WC->logged_in) { begin_burst(); output_headers(1, 0, 0, 0, 1, 0); - do_template("authpopup_finished", NULL); + do_template("authpopup_finished"); end_burst(); } } else { @@ -237,7 +237,7 @@ void openid_manual_create(void) begin_burst(); output_headers(1, 0, 0, 0, 1, 0); wc_printf(""); - do_template("openid_manual_create", NULL); + do_template("openid_manual_create"); wc_printf(""); end_burst(); } @@ -364,7 +364,7 @@ void finalize_openid_login(void) if (WC->logged_in) { begin_burst(); output_headers(1, 0, 0, 0, 1, 0); - do_template("authpopup_finished", NULL); + do_template("authpopup_finished"); end_burst(); } else { begin_burst(); @@ -389,7 +389,7 @@ void finalize_openid_login(void) begin_burst(); output_headers(1, 0, 0, 0, 1, 0); wc_printf(""); - do_template("openid_manual_create", NULL); + do_template("openid_manual_create"); wc_printf(""); end_burst(); } @@ -564,9 +564,9 @@ void validate(void) output_headers(1, 1, 1, 0, 0, 0); - do_template("beginbox_1", NULL); + do_template("beginbox_1"); StrBufAppendBufPlain(WC->WBuf, _("Validate new users"), -1, 0); - do_template("beginbox_2", NULL); + do_template("beginbox_2"); /* If the user just submitted a validation, process it... */ safestrncpy(buf, bstr("user"), sizeof buf); @@ -680,7 +680,7 @@ void validate(void) wc_printf("\n"); wc_printf("\n"); - do_template("endbox", NULL); + do_template("endbox"); wDumpContent(1); } @@ -792,7 +792,7 @@ void display_changepw(void) wc_printf("\n"); wc_printf("\n"); - do_template("endbox", NULL); + do_template("endbox"); wDumpContent(1); } diff --git a/webcit/bbsview_renderer.c b/webcit/bbsview_renderer.c index 16a76b241..4d3ef1be9 100644 --- a/webcit/bbsview_renderer.c +++ b/webcit/bbsview_renderer.c @@ -6,7 +6,7 @@ * with it, go get commit dcf99fe61379b78436c387ea3f89ebfd4ffaf635 of * bbsview_renderer.c and have fun. * - * Copyright (c) 1996-2010 by the citadel.org team + * Copyright (c) 1996-2011 by the citadel.org team * * This program is open source software. You can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -265,7 +265,7 @@ int bbsview_RenderView_or_Tail(SharedMessageStatus *Stat, && ( (i == 0) || (BBS->msgs[i-1] <= BBS->lastseen) ) ) { /* new messages start here */ - do_template("start_of_new_msgs", NULL); + do_template("start_of_new_msgs"); StrBufAppendPrintf(WC->trailing_javascript, "location.href=\"#newmsgs\";\n"); } if (BBS->msgs[i] > 0L) { @@ -276,7 +276,7 @@ int bbsview_RenderView_or_Tail(SharedMessageStatus *Stat, && (BBS->msgs[i] <= BBS->lastseen) ) { /* no new messages */ - do_template("no_new_msgs", NULL); + do_template("no_new_msgs"); StrBufAppendPrintf(WC->trailing_javascript, "location.href=\"#nonewmsgs\";\n"); } } diff --git a/webcit/blogview_renderer.c b/webcit/blogview_renderer.c index 3d40a798c..438e3d49e 100644 --- a/webcit/blogview_renderer.c +++ b/webcit/blogview_renderer.c @@ -102,6 +102,12 @@ void blogpost_render_and_destroy(struct blogpost *bp) { if (bp->alloc_msgs > 0) { free(bp->msgs); } + + /* offer the comment box */ + if (p == bp->top_level_id) { + do_template("blog_comment_box"); + } + free(bp); } diff --git a/webcit/graphics.c b/webcit/graphics.c index a79cb0f3b..b6bc9bd16 100644 --- a/webcit/graphics.c +++ b/webcit/graphics.c @@ -1,7 +1,7 @@ /* * Handles HTTP upload of graphics files into the system. * - * Copyright (c) 1996-2010 by the citadel.org team + * Copyright (c) 1996-2011 by the citadel.org team * * This program is open source software. You can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -72,7 +72,7 @@ void display_graphics_upload(char *description, char *filename, char *uplurl) wc_printf("\n"); wc_printf("\n"); - do_template("endbox", NULL); + do_template("endbox"); wDumpContent(1); } diff --git a/webcit/groupdav_propfind.c b/webcit/groupdav_propfind.c index f644bb740..1580d4946 100644 --- a/webcit/groupdav_propfind.c +++ b/webcit/groupdav_propfind.c @@ -10,7 +10,7 @@ * This makes it difficult to read, but we have discovered clients which * crash when you try to pretty it up. * - * Copyright (c) 2005-2010 by the citadel.org team + * Copyright (c) 2005-2011 by the citadel.org team * * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -494,7 +494,7 @@ void groupdav_propfind(void) /* * If the client is requesting the root, show a root node. */ - do_template("dav_propfind_top", NULL); + do_template("dav_propfind_top"); end_burst(); FreeStrBuf(&dav_roomname); FreeStrBuf(&dav_uid); diff --git a/webcit/listsub.c b/webcit/listsub.c index 05038e277..0560d5248 100644 --- a/webcit/listsub.c +++ b/webcit/listsub.c @@ -1,5 +1,21 @@ /* * Web forms for handling mailing list subscribe/unsubscribe requests. + * + * Copyright (c) 1996-2011 by the citadel.org team + * + * This program is open source software. You can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "webcit.h" @@ -46,9 +62,9 @@ void do_listsub(void) wc_printf("

"); wc_printf("

"); - do_template("beginbox_1", NULL); + do_template("beginbox_1"); StrBufAppendBufPlain(WC->WBuf, _("List subscribe/unsubscribe"), -1, 0); - do_template("beginbox_2", NULL); + do_template("beginbox_2"); wc_printf("

"); /* @@ -214,7 +230,7 @@ FORM: wc_printf("

"); - do_template("endbox", NULL); + do_template("endbox"); wc_printf("

"); wc_printf("\n"); diff --git a/webcit/openid.c b/webcit/openid.c index 28af72922..5a6c8e9f5 100644 --- a/webcit/openid.c +++ b/webcit/openid.c @@ -1,3 +1,20 @@ +/* + * Copyright (c) 1996-2011 by the citadel.org team + * + * This program is open source software. You can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ #include "webcit.h" #include "webserver.h" @@ -13,9 +30,9 @@ void display_openids(void) output_headers(1, 1, 1, 0, 0, 0); - do_template("beginbox_1", NULL); + do_template("beginbox_1"); StrBufAppendBufPlain(WCC->WBuf, _("Manage Account/OpenID Associations"), -1, 0); - do_template("beginbox_2", NULL); + do_template("beginbox_2"); if (WCC->serv_info->serv_supports_openid) { @@ -51,7 +68,7 @@ void display_openids(void) wc_printf(_("%s does not permit authentication via OpenID."), ChrPtr(WCC->serv_info->serv_humannode)); } - do_template("endbox", NULL); + do_template("endbox"); wDumpContent(2); } diff --git a/webcit/preferences.c b/webcit/preferences.c index 9ed1f830c..5f8022304 100644 --- a/webcit/preferences.c +++ b/webcit/preferences.c @@ -1,7 +1,24 @@ /* * Manage user preferences with a little help from the Citadel server. + * + * Copyright (c) 1996-2011 by the citadel.org team + * + * This program is open source software. You can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + #include "webcit.h" #include "webserver.h" #include "groupdav.h" @@ -1117,7 +1134,7 @@ void change_start_page(void) NULL); output_headers(1, 1, 0, 0, 0, 0); - do_template("newstartpage", NULL); + do_template("newstartpage"); wDumpContent(1); } diff --git a/webcit/roomchat.c b/webcit/roomchat.c index 4fcc714dc..90a9162b7 100644 --- a/webcit/roomchat.c +++ b/webcit/roomchat.c @@ -1,7 +1,7 @@ /* * This module handles multiuser chat. * - * Copyright (c) 1996-2010 by the citadel.org team + * Copyright (c) 1996-2011 by the citadel.org team * * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "webcit.h" @@ -32,7 +32,7 @@ void do_chat(void) WC->last_chat_user[0] = 0; output_headers(1, 1, 1, 0, 0, 0); - do_template("roomchat", NULL); + do_template("roomchat"); serv_puts("RCHT enter"); serv_getln(buf, sizeof buf); diff --git a/webcit/roomops.c b/webcit/roomops.c index 2052066dc..bcbbe24cb 100644 --- a/webcit/roomops.c +++ b/webcit/roomops.c @@ -668,7 +668,7 @@ void toggle_self_service(void) { SetCurrentRoomFlags (&WCC->CurRoom); - http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0); + http_transmit_thing(ChrPtr(do_template("room_edit")), 0); } @@ -691,7 +691,7 @@ void editroom(void) if (!havebstr("ok_button")) { strcpy(WC->ImportantMessage, _("Cancelled. Changes were not saved.")); - http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0); + http_transmit_thing(ChrPtr(do_template("room_edit")), 0); return; } if (GetCurrentRoomFlags (&WCC->CurRoom) == 0) @@ -819,7 +819,7 @@ void editroom(void) if (succ1 + succ2 == 0) AppendImportantMessage (_("Your changes have been saved."), -1); - http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0); + http_transmit_thing(ChrPtr(do_template("room_edit")), 0); return; } @@ -888,7 +888,7 @@ void do_invt_kick(void) } } - http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0); + http_transmit_thing(ChrPtr(do_template("room_edit")), 0); } @@ -950,7 +950,7 @@ void entroom(void) WCC->CurRoom.view = er_view; if ( (WCC != NULL) && ( (WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) ) { - http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0); + http_transmit_thing(ChrPtr(do_template("room_edit")), 0); } else { smart_goto(WCC->CurRoom.name); } @@ -986,7 +986,7 @@ void set_room_policy(void) { if (!havebstr("ok_button")) { strcpy(WC->ImportantMessage, _("Cancelled. Changes were not saved.")); - http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0); + http_transmit_thing(ChrPtr(do_template("room_edit")), 0); return; } @@ -1001,7 +1001,7 @@ void set_room_policy(void) { strcat(WC->ImportantMessage, &buf[4]); } ReloadCurrentRoom(); - http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0); + http_transmit_thing(ChrPtr(do_template("room_edit")), 0); } @@ -1041,14 +1041,14 @@ void netedit(void) { strcat(line, bstr("suffix")); } else { - http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0); + http_transmit_thing(ChrPtr(do_template("room_edit")), 0); return; } fp = tmpfile(); if (fp == NULL) { - http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0); + http_transmit_thing(ChrPtr(do_template("room_edit")), 0); return; } @@ -1059,7 +1059,7 @@ void netedit(void) { fclose(fp); AppendImportantMessage(SRV_STATUS_MSG(Line)); FreeStrBuf(&Line); - http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0); + http_transmit_thing(ChrPtr(do_template("room_edit")), 0); return; } @@ -1091,7 +1091,7 @@ void netedit(void) { if (GetServerStatus(Line, NULL) != 4) { fclose(fp); AppendImportantMessage(SRV_STATUS_MSG(Line)); - http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0); + http_transmit_thing(ChrPtr(do_template("room_edit")), 0); FreeStrBuf(&Line); return; } @@ -1125,7 +1125,7 @@ void netedit(void) { FlushIgnetCfgs(&WC->CurRoom); FreeStrBuf(&Line); - http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0); + http_transmit_thing(ChrPtr(do_template("room_edit")), 0); } /* @@ -1135,7 +1135,7 @@ void knrooms(void) { DeleteHash(&WC->Rooms); output_headers(1, 1, 1, 0, 0, 0); - do_template("knrooms", NULL); + do_template("knrooms"); wDumpContent(1); } @@ -1185,7 +1185,7 @@ void delete_floor(void) { AppendImportantMessage (SKEY(Buf)); FlushRoomlist(); - http_transmit_thing(ChrPtr(do_template("floors", NULL)), 0); + http_transmit_thing(ChrPtr(do_template("floors")), 0); FreeStrBuf(&Buf); } @@ -1208,7 +1208,7 @@ void create_floor(void) { } AppendImportantMessage (SKEY(Buf)); FlushRoomlist(); - http_transmit_thing(ChrPtr(do_template("floors", NULL)), 0); + http_transmit_thing(ChrPtr(do_template("floors")), 0); FreeStrBuf(&Buf); } @@ -1228,7 +1228,7 @@ void rename_floor(void) { StrBufCutLeft(Buf, 4); AppendImportantMessage (SKEY(Buf)); - http_transmit_thing(ChrPtr(do_template("floors", NULL)), 0); + http_transmit_thing(ChrPtr(do_template("floors")), 0); FreeStrBuf(&Buf); } diff --git a/webcit/roomtokens.c b/webcit/roomtokens.c index df6b1581a..21653af52 100644 --- a/webcit/roomtokens.c +++ b/webcit/roomtokens.c @@ -1,7 +1,7 @@ /* * Lots of different room-related operations. * - * Copyright (c) 1996-2010 by the citadel.org team + * Copyright (c) 1996-2011 by the citadel.org team * * This program is open source software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as published @@ -53,9 +53,9 @@ void tmplput_roombanner(StrBuf *Target, WCTemplputParams *TP) } StrBufPrintf(WCC->Hdr->this_page, "dotskip?room=%s", ChrPtr(WC->CurRoom.name)); - do_template("roombanner", NULL); + do_template("roombanner"); - do_template("navbar", NULL); + do_template("navbar"); wc_printf("\n"); } diff --git a/webcit/sieve.c b/webcit/sieve.c index 99bc5aa5a..0db8f5ae0 100644 --- a/webcit/sieve.c +++ b/webcit/sieve.c @@ -1,3 +1,21 @@ +/* + * Copyright (c) 1996-2011 by the citadel.org team + * + * This program is open source software. You can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #include "webcit.h" #define MAX_SCRIPTS 100 @@ -651,9 +669,9 @@ void display_add_remove_scripts(char *message) wc_printf("

\n"); - do_template("beginbox_1", NULL); + do_template("beginbox_1"); StrBufAppendBufPlain(WC->WBuf, _("Add a new script"), -1, 0); - do_template("beginbox_2", NULL); + do_template("beginbox_2"); wc_printf(_("To create a new script, enter the desired " "script name in the box below and click 'Create'.")); @@ -666,21 +684,21 @@ void display_add_remove_scripts(char *message) "" "\n", _("Create")); - do_template("endbox", NULL); + do_template("endbox"); - do_template("beginbox_1", NULL); + do_template("beginbox_1"); StrBufAppendBufPlain(WC->WBuf, _("Edit scripts"), -1, 0); - do_template("beginbox_2", NULL); + do_template("beginbox_2"); wc_printf("

%s

\n", _("Return to the script editing screen") ); - do_template("endbox", NULL); + do_template("endbox"); wc_printf("

"); - do_template("beginbox_1", NULL); + do_template("beginbox_1"); StrBufAppendBufPlain(WC->WBuf, _("Delete scripts"), -1, 0); - do_template("beginbox_2", NULL); + do_template("beginbox_2"); wc_printf(_("To delete an existing script, select the script " "name from the list and click 'Delete'.")); @@ -708,7 +726,7 @@ void display_add_remove_scripts(char *message) wc_printf("", _("Delete script"), _("Delete this script?")); wc_printf("\n"); - do_template("endbox", NULL); + do_template("endbox"); wc_printf("

\n"); diff --git a/webcit/static/t/blog_comment_box.html b/webcit/static/t/blog_comment_box.html new file mode 100644 index 000000000..a67ebd0b2 --- /dev/null +++ b/webcit/static/t/blog_comment_box.html @@ -0,0 +1,5 @@ +

+Be the first or the last to leave a comment here. First post! +
+ +

diff --git a/webcit/subst.h b/webcit/subst.h index 906768316..ed0d4500a 100644 --- a/webcit/subst.h +++ b/webcit/subst.h @@ -359,7 +359,7 @@ void RegisterSortFunc(const char *name, long len, void dbg_print_longvector(long *LongVector); -#define do_template(a, b) DoTemplate(a, sizeof(a) -1, NULL, &NoCtx) +#define do_template(a) DoTemplate(a, sizeof(a) -1, NULL, &NoCtx) const StrBuf *DoTemplate(const char *templatename, long len, StrBuf *Target, WCTemplputParams *TP); void url_do_template(void); diff --git a/webcit/summary.c b/webcit/summary.c index 0df287f3f..1e0d8e160 100644 --- a/webcit/summary.c +++ b/webcit/summary.c @@ -1,5 +1,21 @@ /* * Displays the "Summary Page" + * + * Copyright (c) 1996-2011 by the citadel.org team + * + * This program is open source software. You can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "webcit.h" @@ -236,7 +252,7 @@ void summary_inner_div(void) { wc_printf(_("Who's online now")); wc_printf("

"); wc_printf("

"); - do_template("who_summary", NULL); + do_template("who_summary"); wc_printf("

"); wc_printf(""); diff --git a/webcit/sysmsgs.c b/webcit/sysmsgs.c index dbe446a3f..6c0ce1d04 100644 --- a/webcit/sysmsgs.c +++ b/webcit/sysmsgs.c @@ -1,3 +1,21 @@ +/* + * Copyright (c) 1996-2011 by the citadel.org team + * + * This program is open source software. You can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #include "webcit.h" @@ -29,9 +47,9 @@ void display_edit(char *description, char *check_cmd, output_headers(1, 1, 0, 0, 0, 0); } - do_template("beginbox_1", NULL); + do_template("beginbox_1"); StrBufAppendPrintf (WC->WBuf, _("Edit %s"), description); - do_template("beginbox_2", NULL); + do_template("beginbox_2"); wc_printf(_("Enter %s below. Text is formatted to the reader's browser." " A newline is forced by preceding the next line by a blank."), description); @@ -50,7 +68,7 @@ void display_edit(char *description, char *check_cmd, wc_printf("
\n", _("Cancel")); wc_printf("\n"); - do_template("endbox", NULL); + do_template("endbox"); wDumpContent(1); } diff --git a/webcit/useredit.c b/webcit/useredit.c index 0f77cb2b5..56b6622f2 100644 --- a/webcit/useredit.c +++ b/webcit/useredit.c @@ -1,3 +1,20 @@ +/* + * Copyright (c) 1996-2011 by the citadel.org team + * + * This program is open source software. You can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ #include "webcit.h" #include "webserver.h" @@ -11,7 +28,7 @@ void select_user_to_edit(const char *preselect) { output_headers(1, 0, 0, 0, 1, 0); - do_template("aide_edituser_select", NULL); + do_template("aide_edituser_select"); end_burst(); } diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c index 44dde3f8d..3fbde0520 100644 --- a/webcit/vcard_edit.c +++ b/webcit/vcard_edit.c @@ -1,3 +1,20 @@ +/* + * Copyright (c) 1996-2011 by the citadel.org team + * + * This program is open source software. You can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ #include "webcit.h" #include "webserver.h" @@ -1032,9 +1049,9 @@ void do_edit_vcard(long msgnum, char *partnum, /* Display the form */ output_headers(1, 1, 1, 0, 0, 0); - do_template("beginbox_1", NULL); + do_template("beginbox_1"); StrBufAppendBufPlain(WC->WBuf, _("Edit contact information"), -1, 0); - do_template("beginbox_2", NULL); + do_template("beginbox_2"); wc_printf("

\n"); wc_printf("\n", WC->nonce); @@ -1205,7 +1222,7 @@ void do_edit_vcard(long msgnum, char *partnum, ); wc_printf("\n"); - do_template("endbox", NULL); + do_template("endbox"); wDumpContent(1); if (Msg != NULL) { DestroyMessageSummary(Msg); diff --git a/webcit/webcit.c b/webcit/webcit.c index e1e270c2f..6727f3878 100644 --- a/webcit/webcit.c +++ b/webcit/webcit.c @@ -123,7 +123,7 @@ void wDumpContent(int print_standard_html_footer) { if (print_standard_html_footer) { wc_printf(" \n"); - do_template("trailing", NULL); + do_template("trailing"); } /* If we've been saving it all up for one big output burst, @@ -195,7 +195,7 @@ void output_headers( int do_httpheaders, /* 1 = output HTTP headers */ if (do_htmlhead) { begin_burst(); - do_template("head", NULL); + do_template("head"); /* check for ImportantMessages (these display in a div overlaying the main screen) */ if (!IsEmptyStr(WCC->ImportantMessage)) { diff --git a/webcit/wiki.c b/webcit/wiki.c index b183fdbd4..6c8da5590 100644 --- a/webcit/wiki.c +++ b/webcit/wiki.c @@ -256,7 +256,7 @@ void tmplput_display_wiki_history(StrBuf *Target, WCTemplputParams *TP) void display_wiki_history(void) { output_headers(1, 1, 1, 0, 0, 0); - do_template("wiki_history", NULL); + do_template("wiki_history"); wDumpContent(1); } @@ -327,7 +327,7 @@ void tmplput_display_wiki_pagelist(StrBuf *Target, WCTemplputParams *TP) void display_wiki_pagelist(void) { output_headers(1, 1, 1, 0, 0, 0); - do_template("wiki_pagelist", NULL); + do_template("wiki_pagelist"); wDumpContent(1); } -- 2.30.2