From fcb8c4169baa629eb3c1a4979c7c8c32f1560389 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Thu, 30 Dec 2010 15:52:29 -0500 Subject: [PATCH] Performed a bunch of markup fixes suggested by validator.w3.org --- webcit/auth.c | 8 +-- webcit/calendar.c | 2 +- webcit/calendar_view.c | 54 +++++++++---------- webcit/event.c | 20 +++---- webcit/feed_generator.c | 4 +- webcit/graphics.c | 2 +- webcit/groupdav_main.c | 2 +- webcit/groupdav_options.c | 2 +- webcit/groupdav_propfind.c | 2 +- webcit/groupdav_put.c | 2 +- webcit/html2html.c | 8 +-- webcit/listsub.c | 16 +++--- webcit/locate_host.c | 2 +- webcit/messages.c | 10 ++-- webcit/msg_renderers.c | 8 +-- webcit/openid.c | 2 +- webcit/paging.c | 8 +-- webcit/paramhandling.c | 8 +-- webcit/roomchat.c | 2 +- webcit/roomops.c | 2 +- webcit/serv_func.c | 6 +-- webcit/sieve.c | 22 ++++---- webcit/sitemap.c | 2 +- webcit/smtpqueue.c | 14 ++--- webcit/static/instant_messenger.html | 8 +-- webcit/static/mobile.js | 2 +- webcit/static/nocookies.html | 4 +- webcit/static/t/aide/display_generic_cmd.html | 12 ++--- .../static/t/aide/display_generic_result.html | 4 +- webcit/static/t/aide/display_ignetconf.html | 2 +- webcit/static/t/aide/display_inetconf.html | 14 ++--- webcit/static/t/files/section_onefile.html | 2 +- webcit/static/t/iconbar/edit.html | 52 +++++++++--------- webcit/static/t/iconbar/save.html | 2 +- webcit/static/t/important_msg.html | 2 +- webcit/static/t/knrooms_rooms.html | 2 +- webcit/static/t/menubar.html | 8 +-- webcit/static/t/newstartpage.html | 4 +- webcit/static/t/openid_manual_create.html | 6 +-- webcit/static/t/room/view_picture.html | 18 +++---- webcit/static/t/room/zap_entry.html | 2 +- webcit/static/t/room/zapped_list.html | 2 +- webcit/static/t/section_mailsummary_m.html | 2 +- webcit/static/t/view_message.html | 6 +-- .../static/t/view_message/inline_attach.html | 4 +- webcit/static/t/view_message/list_attach.html | 4 +- webcit/static/t/view_message/print.html | 2 +- webcit/static/t/who/section.html | 4 +- webcit/static/t/who/summary_section.html | 2 +- webcit/static/unittest.js | 4 +- webcit/static/wclib.js | 4 +- webcit/subst.c | 2 +- webcit/summary.c | 4 +- webcit/sysdep.c | 2 +- webcit/sysmsgs.c | 2 +- webcit/tcp_sockets.c | 2 +- webcit/userlist.c | 4 +- webcit/vcard_edit.c | 16 +++--- webcit/webcit.c | 4 +- webcit/webcit.h | 2 +- webcit/who.c | 2 +- webcit/wiki.c | 2 +- 62 files changed, 214 insertions(+), 214 deletions(-) diff --git a/webcit/auth.c b/webcit/auth.c index 0303f292b..9373d19a4 100644 --- a/webcit/auth.c +++ b/webcit/auth.c @@ -734,19 +734,19 @@ void validate(void) atoi(buf), axdefs[atoi(buf)]); } while (strcmp(buf, "000")); } else { - wc_printf("

%s

%s
\n", user, &cmd[4]); + wc_printf("

%s

%s
\n", user, &cmd[4]); } wc_printf("
"); wc_printf(_("Select access level for this user:")); - wc_printf("
\n"); + wc_printf("
\n"); for (a = 0; a <= 6; ++a) { wc_printf("nonce); urlescputs(user); wc_printf("&axlevel=%d\">%s   \n", a, axdefs[a]); } - wc_printf("
\n"); + wc_printf("
\n"); wc_printf("\n"); wc_printf("\n"); @@ -835,7 +835,7 @@ void display_changepw(void) if (!IsEmptyStr(WC->ImportantMessage)) { wc_printf("" - "%s
\n", WC->ImportantMessage); + "%s
\n", WC->ImportantMessage); safestrncpy(WC->ImportantMessage, "", sizeof WC->ImportantMessage); } diff --git a/webcit/calendar.c b/webcit/calendar.c index 0a08cb819..d4832070b 100644 --- a/webcit/calendar.c +++ b/webcit/calendar.c @@ -298,7 +298,7 @@ void cal_process_attachment(wc_mime_attachment *Mime) FlushStrBuf(Mime->Data); if (cal == NULL) { StrBufAppendPrintf(Mime->Data, _("There was an error parsing this calendar item.")); - StrBufAppendPrintf(Mime->Data, "
\n"); + StrBufAppendPrintf(Mime->Data, "
\n"); return; } diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c index 05ed56d58..89f15392c 100644 --- a/webcit/calendar_view.c +++ b/webcit/calendar_view.c @@ -188,7 +188,7 @@ void calendar_month_view_display_events(int year, int month, int day) time_t tt; if (GetCount(WCC->disp_cal_items) == 0) { - wc_printf("


\n"); + wc_printf("


\n"); return; } @@ -286,10 +286,10 @@ void calendar_month_view_display_events(int year, int month, int day) wc_printf(""); - wc_printf("%s: %s
", _("From"), Cal->from); + wc_printf("%s: %s
", _("From"), Cal->from); wc_printf("%s ", _("Summary:")); escputs((char *)icalproperty_get_comment(p)); - wc_printf("
"); + wc_printf("
"); q = icalcomponent_get_first_property( Cal->cal, @@ -297,7 +297,7 @@ void calendar_month_view_display_events(int year, int month, int day) if (q) { wc_printf("%s ", _("Location:")); escputs((char *)icalproperty_get_comment(q)); - wc_printf("
"); + wc_printf("
"); } /* @@ -377,11 +377,11 @@ void calendar_month_view_display_events(int year, int month, int day) if (q) { wc_printf("%s ", _("Notes:")); escputs((char *)icalproperty_get_comment(q)); - wc_printf("
"); + wc_printf("
"); } wc_printf(""); - wc_printf("
\n"); + wc_printf("
\n"); if (all_day_event) { wc_printf(""); @@ -791,7 +791,7 @@ void calendar_brief_month_view(int year, int month, int day) { * Calendar week view -- not implemented yet, this is a stub function */ void calendar_week_view(int year, int month, int day) { - wc_printf("
week view FIXME

\n"); + wc_printf("
week view FIXME

\n"); } @@ -950,16 +950,16 @@ void calendar_day_view_display_events(time_t thetime, ); escputs((char *) icalproperty_get_comment(p)); wc_printf(""); - wc_printf("%s
", _("All day event")); - wc_printf("%s: %s
", _("From"), Cal->from); + wc_printf("%s
", _("All day event")); + wc_printf("%s: %s
", _("From"), Cal->from); wc_printf("%s ", _("Summary:")); escputs((char *) icalproperty_get_comment(p)); - wc_printf("
"); + wc_printf("
"); q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY); if (q) { wc_printf("%s ", _("Location:")); escputs((char *)icalproperty_get_comment(q)); - wc_printf("
"); + wc_printf("
"); } if (!icaltime_compare(t, end_t)) { /* one day only */ webcit_fmt_date(buf, 256, event_tt, DATEFMT_LOCALEDATE); @@ -975,7 +975,7 @@ void calendar_day_view_display_events(time_t thetime, if (q) { wc_printf("%s ", _("Notes:")); escputs((char *)icalproperty_get_comment(q)); - wc_printf("
"); + wc_printf("
"); } wc_printf(""); wc_printf(" ("); @@ -994,16 +994,16 @@ void calendar_day_view_display_events(time_t thetime, ); escputs((char *) icalproperty_get_comment(p)); wc_printf(""); - wc_printf("%s
", _("Ongoing event")); - wc_printf("%s: %s
", _("From"), Cal->from); + wc_printf("%s
", _("Ongoing event")); + wc_printf("%s: %s
", _("From"), Cal->from); wc_printf("%s ", _("Summary:")); escputs((char *) icalproperty_get_comment(p)); - wc_printf("
"); + wc_printf("
"); q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY); if (q) { wc_printf("%s ", _("Location:")); escputs((char *)icalproperty_get_comment(q)); - wc_printf("
"); + wc_printf("
"); } webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF); wc_printf("%s %s
", _("Starting date/time:"), buf); @@ -1013,7 +1013,7 @@ void calendar_day_view_display_events(time_t thetime, if (q) { wc_printf("%s ", _("Notes:")); escputs((char *)icalproperty_get_comment(q)); - wc_printf("
"); + wc_printf("
"); } wc_printf(""); wc_printf(" ("); @@ -1076,15 +1076,15 @@ void calendar_day_view_display_events(time_t thetime, ); escputs((char *) icalproperty_get_comment(p)); wc_printf(""); - wc_printf("%s: %s
", _("From"), Cal->from); + wc_printf("%s: %s
", _("From"), Cal->from); wc_printf("%s ", _("Summary:")); escputs((char *) icalproperty_get_comment(p)); - wc_printf("
"); + wc_printf("
"); q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY); if (q) { wc_printf("%s ", _("Location:")); escputs((char *)icalproperty_get_comment(q)); - wc_printf("
"); + wc_printf("
"); } if (!icaltime_compare(t, end_t)) { /* one day only */ webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF); @@ -1100,7 +1100,7 @@ void calendar_day_view_display_events(time_t thetime, if (q) { wc_printf("%s ", _("Notes:")); escputs((char *)icalproperty_get_comment(q)); - wc_printf("
"); + wc_printf("
"); } wc_printf(""); wc_printf("\n"); @@ -1299,10 +1299,10 @@ void calendar_day_view(int year, int month, int day) { wc_strftime(d_str, sizeof d_str, "" - "%A
" - "%B
" - "%d
" - "%Y
" + "%A
" + "%B
" + "%d
" + "%Y
" "", &d_tm ); @@ -1320,7 +1320,7 @@ void calendar_day_view(int year, int month, int day) { /* End todays-date-with-left-and-right-arrows */ /* Embed a mini month calendar in this space */ - wc_printf("
\n"); + wc_printf("
\n"); embeddable_mini_calendar(year, month); wc_printf(""); /* end stuff-on-the-right */ @@ -1419,7 +1419,7 @@ int calendar_summary_view(void) { if (!all_day_event) { wc_printf(" (%s)", timestring); } - wc_printf("
\n"); + wc_printf("
\n"); ++num_displayed; } } diff --git a/webcit/event.c b/webcit/event.c index f7b6b30e0..a5f996ffc 100644 --- a/webcit/event.c +++ b/webcit/event.c @@ -178,8 +178,8 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum, if (p != NULL) { escputs((char *)icalproperty_get_comment(p)); } - wc_printf("
\n"); - wc_printf("SEQUENCE == %d
\n", sequence); + wc_printf("
\n"); + wc_printf("SEQUENCE == %d
\n", sequence); *************************************************************/ wc_printf("
\n"); @@ -436,7 +436,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum, wc_printf("\n"); /* same table style as the event tab */ wc_printf("\n"); diff --git a/webcit/feed_generator.c b/webcit/feed_generator.c index acc84621c..368083979 100644 --- a/webcit/feed_generator.c +++ b/webcit/feed_generator.c @@ -200,8 +200,8 @@ void tmplput_rssbutton(StrBuf *Target, WCTemplputParams *TP) urlesc(&feed_link[20], sizeof(feed_link) - 20, (char *)ChrPtr(WCC->CurRoom.name) ); CtdlEncodeBase64(encoded_link, feed_link, strlen(feed_link), 0); - StrBufAppendPrintf(Target, "", encoded_link); - StrBufAppendPrintf(Target, ""); + StrBufAppendPrintf(Target, "", encoded_link); + StrBufAppendPrintf(Target, "\"RSS\""); StrBufAppendPrintf(Target, ""); } diff --git a/webcit/graphics.c b/webcit/graphics.c index 1949c24a5..a79cb0f3b 100644 --- a/webcit/graphics.c +++ b/webcit/graphics.c @@ -56,7 +56,7 @@ void display_graphics_upload(char *description, char *filename, char *uplurl) wc_printf("\">\n"); wc_printf(_("You can upload an image directly from your computer")); - wc_printf("

\n"); + wc_printf("

\n"); wc_printf(_("Please select a file to upload:")); wc_printf("\n"); diff --git a/webcit/groupdav_main.c b/webcit/groupdav_main.c index 3fc38fb30..90de73b99 100644 --- a/webcit/groupdav_main.c +++ b/webcit/groupdav_main.c @@ -3,7 +3,7 @@ * * Copyright (c) 2005-2010 by the citadel.org team * - * This program is free software; you can redistribute it and/or modify + * 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. diff --git a/webcit/groupdav_options.c b/webcit/groupdav_options.c index c6cde79e3..a24dcec51 100644 --- a/webcit/groupdav_options.c +++ b/webcit/groupdav_options.c @@ -3,7 +3,7 @@ * * Copyright (c) 2005-2010 by the citadel.org team * - * This program is free software; you can redistribute it and/or modify + * 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. diff --git a/webcit/groupdav_propfind.c b/webcit/groupdav_propfind.c index ab1b2e807..ceb78fdac 100644 --- a/webcit/groupdav_propfind.c +++ b/webcit/groupdav_propfind.c @@ -12,7 +12,7 @@ * * Copyright (c) 2005-2010 by the citadel.org team * - * This program is free software; you can redistribute it and/or modify + * 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. diff --git a/webcit/groupdav_put.c b/webcit/groupdav_put.c index b63b61935..2f4503bca 100644 --- a/webcit/groupdav_put.c +++ b/webcit/groupdav_put.c @@ -3,7 +3,7 @@ * * Copyright (c) 2005-2010 by the citadel.org team * - * This program is free software; you can redistribute it and/or modify + * 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. diff --git a/webcit/html2html.c b/webcit/html2html.c index a7bb2eb5a..33eeedf01 100644 --- a/webcit/html2html.c +++ b/webcit/html2html.c @@ -4,7 +4,7 @@ * * Copyright (c) 2005-2010 by the citadel.org team * - * This program is free software; you can redistribute it and/or modify + * 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. @@ -136,7 +136,7 @@ void output_html(const char *supplied_charset, int treat_as_wiki, int msgnum, St StrBufAppendPrintf(Target, _("realloc() error! couldn't get %d bytes: %s"), buffer_length + 1, strerror(errno)); - StrBufAppendPrintf(Target, "

\n"); + StrBufAppendPrintf(Target, "

\n"); while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { /** flush */ } @@ -344,7 +344,7 @@ void output_html(const char *supplied_charset, int treat_as_wiki, int msgnum, St */ if (converted_msg == NULL) { - StrBufAppendPrintf(Target, "Error %d: %s
%s:%d", errno, strerror(errno), __FILE__, __LINE__); + StrBufAppendPrintf(Target, "Error %d: %s
%s:%d", errno, strerror(errno), __FILE__, __LINE__); goto BAIL; } @@ -554,7 +554,7 @@ void output_html(const char *supplied_charset, int treat_as_wiki, int msgnum, St StrBufAppendBuf(Target, converted_msg, 0); BAIL: /** A little trailing vertical whitespace... */ - StrBufAppendPrintf(Target, "

\n"); + StrBufAppendPrintf(Target, "

\n"); /** Now give back the memory */ FreeStrBuf(&converted_msg); diff --git a/webcit/listsub.c b/webcit/listsub.c index c59cae348..05038e277 100644 --- a/webcit/listsub.c +++ b/webcit/listsub.c @@ -77,16 +77,16 @@ void do_listsub(void) "your subscription. This extra step is for " "your protection, as it prevents others from " "being able to subscribe you to lists " - "without your consent.

" + "without your consent.

" "Please click on the link which is being " "e-mailed to you and your subscription will " - "be confirmed.
\n"), + "be confirmed.
\n"), escaped_email, escaped_room); wc_printf("%s\n", _("Go back...")); } else { wc_printf("ERROR: %s" - "

\n", + "

\n", &buf[4]); goto FORM; } @@ -114,16 +114,16 @@ void do_listsub(void) "your unsubscription. This extra step is for " "your protection, as it prevents others from " "being able to unsubscribe you from " - "lists without your consent.

" + "lists without your consent.

" "Please click on the link which is being " "e-mailed to you and your unsubscription will " - "be confirmed.
\n" + "be confirmed.
\n" "Back...\n" ); } else { wc_printf("ERROR: %s" - "

\n", + "

\n", &buf[4]); goto FORM; } @@ -154,7 +154,7 @@ void do_listsub(void) "The error returned by the server was: " ); } - wc_printf("%s
\n", &buf[4]); + wc_printf("%s
\n", &buf[4]); } /* @@ -208,7 +208,7 @@ FORM: wc_printf("\n"); " one additional web link to click on for final " "confirmation. This extra step is for your " "protection, as it prevents others from being able to " - "subscribe or unsubscribe you to lists.
\n" + "subscribe or unsubscribe you to lists.
\n" ); } diff --git a/webcit/locate_host.c b/webcit/locate_host.c index b3346e4c7..f0ca6c1fb 100644 --- a/webcit/locate_host.c +++ b/webcit/locate_host.c @@ -3,7 +3,7 @@ * * Copyright (c) 1996-2010 by the citadel.org team * - * This program is free software; you can redistribute it and/or modify + * 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. diff --git a/webcit/messages.c b/webcit/messages.c index 6e30c98d3..f64667b87 100644 --- a/webcit/messages.c +++ b/webcit/messages.c @@ -52,7 +52,7 @@ int load_message(message_summary *Msg, *Error = NewStrBuf(); StrBufAppendPrintf(*Error, ""); StrBufAppendPrintf(*Error, _("ERROR:")); - StrBufAppendPrintf(*Error, " %s
\n", &buf[4]); + StrBufAppendPrintf(*Error, " %s
\n", &buf[4]); FreeStrBuf(&Buf); return 0; } @@ -70,7 +70,7 @@ int load_message(message_summary *Msg, Msg->MsgBody->ContentType = NewStrBufPlain(HKEY("text/html")); StrBufAppendPrintf(Msg->MsgBody->Data, "
"); StrBufAppendPrintf(Msg->MsgBody->Data, _("Empty message")); - StrBufAppendPrintf(Msg->MsgBody->Data, "

\n"); + StrBufAppendPrintf(Msg->MsgBody->Data, "

\n"); StrBufAppendPrintf(Msg->MsgBody->Data, "
\n"); } break; @@ -1422,7 +1422,7 @@ void display_enter(void) } } else if (buf[0] != '2') { /* Any other error means that we cannot continue */ - wc_printf("%s
\n", &buf[4]); /* TODO -> important message */ + wc_printf("%s
\n", &buf[4]); /* TODO -> important message */ return; } } @@ -1509,7 +1509,7 @@ void confirm_move_msg(void) wc_printf("
"); wc_printf(_("Move this message to:")); - wc_printf("
\n"); + wc_printf("
\n"); wc_printf("\n"); wc_printf("\n", WC->nonce); @@ -1527,7 +1527,7 @@ void confirm_move_msg(void) } } wc_printf("\n"); - wc_printf("
\n"); + wc_printf("
\n"); wc_printf("", _("Move")); wc_printf(" "); diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c index 2be17adfd..87931500e 100644 --- a/webcit/msg_renderers.c +++ b/webcit/msg_renderers.c @@ -1032,7 +1032,7 @@ void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F if (i > 0) StrBufCutLeft(Line, i); if (StrLength(Line) == 0) { - StrBufAppendBufPlain(Target, HKEY("
\n"), 0); + StrBufAppendBufPlain(Target, HKEY("
\n"), 0); continue; } @@ -1049,7 +1049,7 @@ void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F UrlizeText(Line1, Line, Line2); StrEscAppend(Target, Line1, NULL, 0, 0); - StrBufAppendBufPlain(Target, HKEY("
\n"), 0); + StrBufAppendBufPlain(Target, HKEY("
\n"), 0); bn = bq; } while ((BufPtr != StrBufNOTNULL) && @@ -1058,7 +1058,7 @@ void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F for (i = 0; i < bn; i++) StrBufAppendBufPlain(Target, HKEY(""), 0); - StrBufAppendBufPlain(Target, HKEY("
"), 0); + StrBufAppendBufPlain(Target, HKEY("
"), 0); #ifdef HAVE_ICONV if (ic != (iconv_t)(-1) ) { iconv_close(ic); @@ -1100,7 +1100,7 @@ void render_MAIL_UNKNOWN(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *Foun FlushStrBuf(Mime->Data); StrBufAppendBufPlain(Mime->Data, _("I don't know how to display "), -1, 0); StrBufAppendBuf(Mime->Data, Mime->ContentType, 0); - StrBufAppendBufPlain(Mime->Data, HKEY("
\n"), 0); + StrBufAppendBufPlain(Mime->Data, HKEY("
\n"), 0); } diff --git a/webcit/openid.c b/webcit/openid.c index ff358e347..8ab2cb4ce 100644 --- a/webcit/openid.c +++ b/webcit/openid.c @@ -37,7 +37,7 @@ void display_openids(void) wc_printf("\n"); } - wc_printf("
"); wc_printf(_("Attendees")); - wc_printf("
" + wc_printf("
" ""); wc_printf(_("(One per line)")); wc_printf("\n"); @@ -592,7 +592,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum, } wc_printf(_("on day %s%d%s of the month"), "", rrmday, ""); - wc_printf("
\n"); + wc_printf("
\n"); wc_printf(""); - wc_printf(" %s
\n", _("of the month")); + wc_printf(" %s
\n", _("of the month")); wc_printf("\n"); /* end 'monthday_selector' div */ @@ -654,7 +654,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum, ((which_rryeartype_is_preselected == 0) ? "checked='checked'" : "") ); wc_printf(_("every ")); - wc_printf("%s
", _("year on this date")); + wc_printf("%s
", _("year on this date")); wc_printf(""); - wc_printf("
\n"); + wc_printf("
\n"); wc_printf("\n"); /* end 'yearday_selector' div */ @@ -718,7 +718,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum, "%s onChange=\"RecurrenceShowHide();\">", ((which_rrend_is_preselected == 0) ? "checked='checked'" : "") ); - wc_printf("%s
\n", _("No ending date")); + wc_printf("%s
\n", _("No ending date")); wc_printf(" ", recur.count); wc_printf(_("times")); - wc_printf("
\n"); + wc_printf("
\n"); wc_printf("\n"); + wc_printf("
\n"); wc_printf("

\n"); + wc_printf("
\n"); wc_printf("\n"); wc_printf("\n", WCC->nonce); diff --git a/webcit/paging.c b/webcit/paging.c index 7c632fb9f..190aa58c6 100644 --- a/webcit/paging.c +++ b/webcit/paging.c @@ -3,7 +3,7 @@ * * Copyright (c) 1996-2010 by the citadel.org team * - * This program is free software; you can redistribute it and/or modify + * 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. @@ -55,15 +55,15 @@ void display_page(void) wc_printf("\">\n"); wc_printf(_("Enter message text:")); - wc_printf("
"); + wc_printf("
"); wc_printf("\n"); - wc_printf("
\n"); + wc_printf("
\n"); wc_printf("", _("Send message")); - wc_printf("
\n", _("Cancel")); + wc_printf("
\n", _("Cancel")); wc_printf("\n"); wc_printf("\n"); diff --git a/webcit/paramhandling.c b/webcit/paramhandling.c index 8b36c277e..3d12c376c 100644 --- a/webcit/paramhandling.c +++ b/webcit/paramhandling.c @@ -419,16 +419,16 @@ void diagnostics(void) { output_headers(1, 1, 1, 0, 0, 0); wc_printf("Session: %d
\n", WC->wc_session); - wc_printf("Command: 
\n");
+	wc_printf("Command: 
\n");
 /*	
 StrEscPuts(WC->UrlFragment1);
-	wc_printf("
\n");
+	wc_printf("
\n");
 	StrEscPuts(WC->UrlFragment2);
-	wc_printf("
\n");
+	wc_printf("
\n");
 	StrEscPuts(WC->UrlFragment3);
 */
 	wc_printf("
\n");
-	wc_printf("Variables: 
\n");
+	wc_printf("Variables: 
\n");
 	dump_vars();
 	wc_printf("
\n");
 	wDumpContent(1);
diff --git a/webcit/roomchat.c b/webcit/roomchat.c
index 2278333ea..4fcc714dc 100644
--- a/webcit/roomchat.c
+++ b/webcit/roomchat.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1996-2010 by the citadel.org team
  *
- * This program is free software; you can redistribute it and/or modify
+ * 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.
diff --git a/webcit/roomops.c b/webcit/roomops.c
index ace255962..982c7139e 100644
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -978,7 +978,7 @@ void set_room_policy(void) {
 	strcpy(WC->ImportantMessage, &buf[4]);
 
 	if (WC->axlevel >= 6) {
-		strcat(WC->ImportantMessage, "
\n");
+		strcat(WC->ImportantMessage, "
\n");
 		serv_printf("SPEX floorpolicy|%d|%d", ibstr("floorpolicy"), ibstr("floorvalue"));
 		serv_getln(buf, sizeof buf);
 		strcat(WC->ImportantMessage, &buf[4]);
diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index e812de381..8585744af 100644
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -270,7 +270,7 @@ void _fmout(StrBuf *Target, char *align)
 	while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
 
 		if ((intext == 1) && (isspace(buf[0]))) {
-			wc_printf("
");
+			wc_printf("
");
 		}
 		intext = 1;
 
@@ -298,7 +298,7 @@ void _fmout(StrBuf *Target, char *align)
 	if (bq == 1) {
 		wc_printf("");
 	}
-	wc_printf("
\n");
+	wc_printf("
\n");
 }
 
 void FmOut(StrBuf *Target, char *align, StrBuf *Source)
@@ -390,7 +390,7 @@ void pullquote_fmout(void) {
 	while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
 
 		if ((intext == 1) && (isspace(buf[0]))) {
-			wc_printf("
");
+			wc_printf("
");
 		}
 		intext = 1;
 
diff --git a/webcit/sieve.c b/webcit/sieve.c
index 40af7f54d..99bc5aa5a 100644
--- a/webcit/sieve.c
+++ b/webcit/sieve.c
@@ -135,9 +135,9 @@ void display_sieve(void)
 	/* The "no filtering" div */
 
 	wc_printf("
\n");
-	wc_printf("


");
+	wc_printf("


");
 	wc_printf(_("Your incoming mail will not be filtered through any scripts."));
-	wc_printf("

\n");
+	wc_printf("

\n");
 	wc_printf("
\n");
 
 	/* The "webcit managed scripts" div */
@@ -168,7 +168,7 @@ void display_sieve(void)
 	wc_printf("   ");
 	wc_printf("%s\n", _("Add or delete scripts"));
 
-	wc_printf("
\n");
+	wc_printf("
\n");
 
 	if (num_scripts > 0) {
 		for (i=0; i
");
+	wc_printf("

");
 
         wc_printf("
\n");
 	wc_printf("\n", WC->nonce);
         wc_printf(_("Script name: "));
-        wc_printf("
\n"
+        wc_printf("
\n"
         	""
 		"
\n", _("Create"));
 
@@ -671,7 +671,7 @@ void display_add_remove_scripts(char *message)
 	do_template("beginbox_1", NULL);
 	StrBufAppendBufPlain(WC->WBuf, _("Edit scripts"), -1, 0);
 	do_template("beginbox_2", NULL);
-	wc_printf("
%s

\n",
+	wc_printf("
%s

\n",
 		_("Return to the script editing screen")
 	);
 	do_template("endbox", NULL);
@@ -684,7 +684,7 @@ void display_add_remove_scripts(char *message)
 
 	wc_printf(_("To delete an existing script, select the script "
 		"name from the list and click 'Delete'."));
-	wc_printf("

");
+	wc_printf("

");
 	
         wc_printf("
"
 		"
\n");
@@ -703,7 +703,7 @@ void display_add_remove_scripts(char *message)
 			}
                 }
         }
-        wc_printf("
\n");
+        wc_printf("
\n");
 
         wc_printf("", _("Delete script"), _("Delete this script?"));
@@ -931,7 +931,7 @@ void display_rules_editor_inner_div(void) {
 	);
 
 
-	wc_printf("
");
+	wc_printf("
");
 
 	wc_printf("");
 
@@ -1119,7 +1119,7 @@ void display_rules_editor_inner_div(void) {
 
 		wc_printf("
", i);
 		wc_printf(_("Message:"));
-		wc_printf("
");
+		wc_printf("
");
 		wc_printf("");
@@ -1152,7 +1152,7 @@ void display_rules_editor_inner_div(void) {
 	}
 
 	wc_printf("
");
-	wc_printf("\n",
+	wc_printf("\n",
 		_("Add rule")
 	);
 
diff --git a/webcit/sitemap.c b/webcit/sitemap.c
index c49c001a6..dd4f570a9 100644
--- a/webcit/sitemap.c
+++ b/webcit/sitemap.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2010 by the citadel.org team
  *
- * This program is free software; you can redistribute it and/or modify
+ * 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.
diff --git a/webcit/smtpqueue.c b/webcit/smtpqueue.c
index b120ee17a..6ee2db9ef 100644
--- a/webcit/smtpqueue.c
+++ b/webcit/smtpqueue.c
@@ -104,7 +104,7 @@ void display_queue_msg(long msgnum)
 				if (!IsEmptyStr(thisrecp)) {
 					stresc(thismsg, sizeof thismsg, thisrecp, 1, 1);
 					if (!IsEmptyStr(thisdsn)) {
-						strcat(thismsg, "
  ");
+						strcat(thismsg, "
  ");
 						stresc(&thismsg[strlen(thismsg)], sizeof thismsg,
 							thisdsn, 1, 1);
 						strcat(thismsg, "");
@@ -113,7 +113,7 @@ void display_queue_msg(long msgnum)
 
 					if ((recipients_len + thismsg_len + 100) < sizeof recipients) {
 						if (!IsEmptyStr(recipients)) {
-							strcpy(&recipients[recipients_len], "
");
+							strcpy(&recipients[recipients_len], "
");
 							recipients_len += 6;
 						}
 						strcpy(&recipients[recipients_len], thismsg);
@@ -128,7 +128,7 @@ void display_queue_msg(long msgnum)
 	}
 
 	wc_printf("");
-	wc_printf("%ld
", msgnum);
+	wc_printf("%ld
", msgnum);
 	wc_printf(" %s", 
 		msgnum, msgid, _("(Delete)")
 	);
@@ -210,15 +210,15 @@ void display_smtpqueue_inner_div(void) {
 
 		}
 		else {
-			wc_printf("

");
+			wc_printf("

");
 			wc_printf(_("The queue is empty."));
-			wc_printf("


");
+			wc_printf("


");
 		}
 	}
 	else {
-		wc_printf("

");
+		wc_printf("

");
 		wc_printf(_("You do not have permission to view this resource."));
-		wc_printf("


");
+		wc_printf("


");
 	}
 	output_headers(0, 0, 0, 0, 0, 0);
 	end_burst();
diff --git a/webcit/static/instant_messenger.html b/webcit/static/instant_messenger.html
index 549e6a294..dc2e3cd5c 100644
--- a/webcit/static/instant_messenger.html
+++ b/webcit/static/instant_messenger.html
@@ -48,7 +48,7 @@ function SendSomething(which_div, sendform, recipient) {
 				+ ''
 				+ ': '
 				+ thetext
-				+ '
\n';
+				+ '
\n';
 
 	// Scroll to the bottom of the tab
 	$('main').scrollTop = 999999;
@@ -123,8 +123,8 @@ function ShowNewMsg(gexp_xmlresponse) {
 			  $('main').innerHTML
 			+ '
'
 			+ '
'
-			+ '









'
-			+ '









'
+			+ '









'
+			+ '









'
 			+ '
'
 			+ '
'
@@ -157,7 +157,7 @@ function ShowNewMsg(gexp_xmlresponse) {
 				+ ''
 				+ ': '
 				+ the_message
-				+ '
\n';
+				+ '
\n';
 
 	// Scroll to the bottom of the tab
 	$('main').scrollTop = 999999;
diff --git a/webcit/static/mobile.js b/webcit/static/mobile.js
index 275481a8f..dc1485728 100644
--- a/webcit/static/mobile.js
+++ b/webcit/static/mobile.js
@@ -18,7 +18,7 @@ req.open('GET', '/msg/'+msgnum, true);
 req.onreadystatechange = function (aEvt) {
   if (req.readyState == 4) {
      if(req.status == 200)
-      currentMsgDisplay.innerHTML = "
"+req.responseText;
+      currentMsgDisplay.innerHTML = "
"+req.responseText;
      else
       currentMsgDisplay.innerHTML = "Error loading message";
   }
diff --git a/webcit/static/nocookies.html b/webcit/static/nocookies.html
index 1e2d4d555..d3ba1356c 100644
--- a/webcit/static/nocookies.html
+++ b/webcit/static/nocookies.html
@@ -6,8 +6,8 @@
 
 

 
Sorry!

-

-This site requires both Cookies and JavaScript to be enabled in your browser.

+

+This site requires both Cookies and JavaScript to be enabled in your browser.

 Please enable these features and log in again.  We are sorry for the inconvenience.
 

 
diff --git a/webcit/static/t/aide/display_generic_cmd.html b/webcit/static/t/aide/display_generic_cmd.html
index 5b3761743..261972cf0 100644
--- a/webcit/static/t/aide/display_generic_cmd.html
+++ b/webcit/static/t/aide/display_generic_cmd.html
@@ -9,18 +9,18 @@
     
     
diff --git a/webcit/static/t/aide/display_generic_result.html b/webcit/static/t/aide/display_generic_result.html
index 809d5d7bd..2a2fae16b 100644
--- a/webcit/static/t/aide/display_generic_result.html
+++ b/webcit/static/t/aide/display_generic_result.html
@@ -13,9 +13,9 @@
 

-

 
-	  


+	  


 	    
 	      
-	      

-	      

-	      

-	      

+	      

+	      

+	      

+	      

 	      
 		
 	      
 	      "> 
-	      ">

+	      ">

 	    
 	  

 	

 	
 


+

 

-

+

 
 
 

diff --git a/webcit/static/t/aide/display_ignetconf.html b/webcit/static/t/aide/display_ignetconf.html
index c89c86ae6..928765899 100644
--- a/webcit/static/t/aide/display_ignetconf.html
+++ b/webcit/static/t/aide/display_ignetconf.html
@@ -7,7 +7,7 @@
 

 
 

-

+

 

 
 

diff --git a/webcit/static/t/aide/display_inetconf.html b/webcit/static/t/aide/display_inetconf.html
index ef71040db..c818f00d8 100644
--- a/webcit/static/t/aide/display_inetconf.html
+++ b/webcit/static/t/aide/display_inetconf.html
@@ -10,18 +10,18 @@
 
diff --git a/webcit/static/t/iconbar/edit.html b/webcit/static/t/iconbar/edit.html
index 990919655..860060019 100644
--- a/webcit/static/t/iconbar/edit.html
+++ b/webcit/static/t/iconbar/edit.html
@@ -13,84 +13,84 @@
 >>>
-

+

+
+
+
+
+
+
+
+
+
+
+
+
 
-
 

 
 
-

-

-

-

+

+

+

+

 
 
 		
 
 
-

-

-

+

+

+

 
 
 
diff --git a/webcit/static/t/files/section_onefile.html b/webcit/static/t/files/section_onefile.html
index 91aa36374..3678d7a9e 100644
--- a/webcit/static/t/files/section_onefile.html
+++ b/webcit/static/t/files/section_onefile.html
@@ -5,7 +5,7 @@
 

 
  ">
-  
+  
   
 
 
 
 
 
 

 
 

 >     
->  

+>  

 		 
-


 
 

 >     
->  

+>  

 		 
-


 
 

 >     
->  

+>  

 		 
-


 
 

 >     
->  

+>  

 		 
-


 
 

 >     
->  

+>  

 		 
-


 
 

 >     
->  

+>  

 		 
-


 
 

 >     
->  

+>  

 		 
-


 
 

 >     
->  

+>  

 		 
-


 
 

 >     
->  

+>  

 > 		
  
-


 
 

 >     
->  

+>  

 		 
-


 
 

 >     
->  

+>  

 		 
-


 
 

 >     
->  

+>  

 		 
-



+


 
 
"> ">

 
diff --git a/webcit/static/t/iconbar/save.html b/webcit/static/t/iconbar/save.html
index f2def34d6..031bf5b58 100644
--- a/webcit/static/t/iconbar/save.html
+++ b/webcit/static/t/iconbar/save.html
@@ -8,6 +8,6 @@
 

 
  
-(
 in order for changes to take effect")>)
+(
 in order for changes to take effect")>)
 

 
diff --git a/webcit/static/t/important_msg.html b/webcit/static/t/important_msg.html
index cf11c7ed9..61cddadf3 100644
--- a/webcit/static/t/important_msg.html
+++ b/webcit/static/t/important_msg.html
@@ -2,7 +2,7 @@
 

 
 
-

+

 

 
 
 

-


+


 
 
@@ -75,17 +75,17 @@
 

 

 	
 		
-		Log off

+		Log off

 			
 

 

 
-


+


 
 
-POWERED BY

+POWERED BY

 CITADEL
 
 

diff --git a/webcit/static/t/newstartpage.html b/webcit/static/t/newstartpage.html
index 3c7c082a6..d895d1c50 100644
--- a/webcit/static/t/newstartpage.html
+++ b/webcit/static/t/newstartpage.html
@@ -7,10 +7,10 @@
 

 

  

-


+


 

  ).
-


+


 
 Back...
 

diff --git a/webcit/static/t/openid_manual_create.html b/webcit/static/t/openid_manual_create.html
index 06d1608ec..78fb7bac1 100644
--- a/webcit/static/t/openid_manual_create.html
+++ b/webcit/static/t/openid_manual_create.html
@@ -5,10 +5,10 @@
 
 
 
 

 	">
diff --git a/webcit/static/t/room/view_picture.html b/webcit/static/t/room/view_picture.html
index 943e84728..f3152dd44 100644
--- a/webcit/static/t/room/view_picture.html
+++ b/webcit/static/t/room/view_picture.html
@@ -2,30 +2,30 @@
 <?_(" src="image?name=_roompic_?room=">
 
 	
-		
+		
 	
 	
-		
+		
         
 	
-		
+		
 	
 	
-		
+		
 	
 	
-		
+		
         
 	
-		
+		
         
 	
-                
+                
         
 	
-                
+                
         
 	
-                
+                
         
 
diff --git a/webcit/static/t/room/zap_entry.html b/webcit/static/t/room/zap_entry.html
index c21bacf3b..d9c7bb999 100644
--- a/webcit/static/t/room/zap_entry.html
+++ b/webcit/static/t/room/zap_entry.html
@@ -3,4 +3,4 @@
 <?_(">
 <?_(">
 
-

+

diff --git a/webcit/static/t/room/zapped_list.html b/webcit/static/t/room/zapped_list.html
index e9f79fd72..567f17180 100644
--- a/webcit/static/t/room/zapped_list.html
+++ b/webcit/static/t/room/zapped_list.html
@@ -6,7 +6,7 @@
 
 
 
-


+


 
 
 

diff --git a/webcit/static/t/section_mailsummary_m.html b/webcit/static/t/section_mailsummary_m.html
index 350954e97..c9bef994d 100644
--- a/webcit/static/t/section_mailsummary_m.html
+++ b/webcit/static/t/section_mailsummary_m.html
@@ -1,5 +1,5 @@
 
;" onClick="CtdlLoadMsgMouseDown(event,)">
 
-

+

 
 

diff --git a/webcit/static/t/view_message.html b/webcit/static/t/view_message.html
index aeeee683d..fb3296e88 100644
--- a/webcit/static/t/view_message.html
+++ b/webcit/static/t/view_message.html
@@ -9,14 +9,14 @@
        @ 
  
  ****
-  

+  

 
 
 

  

- &cc=&subject=&force_room=_MAIL_">[] 
+ ?cc=?subject=?force_room=_MAIL_">[] 
 
    %7C?subject=">[] 
-   %7C?replyquote=&recp=%22%22%3C%3E?subject=">[] 
+   %7C?replyquote=?recp=%22%22%3C%3E?subject=">[] 
 
 
 	
diff --git a/webcit/static/t/view_message/inline_attach.html b/webcit/static/t/view_message/inline_attach.html
index 5bad20f6a..3243bced2 100644
--- a/webcit/static/t/view_message/inline_attach.html
+++ b/webcit/static/t/view_message/inline_attach.html
@@ -1,7 +1,7 @@
 

-" border=0 align=middle>
+" border="0" align="middle" alt="">
   (,  bytes) 
-">

+">

 

 
 

diff --git a/webcit/static/t/view_message/list_attach.html b/webcit/static/t/view_message/list_attach.html
index e15d40d1c..d8f59378b 100644
--- a/webcit/static/t/view_message/list_attach.html
+++ b/webcit/static/t/view_message/list_attach.html
@@ -1,4 +1,4 @@
-" border=0 align=middle>
+" border="0" align="middle" alt="">
   (,  bytes) 
 [ " target="wc.."> | 
- "> ]

+ "> ]

diff --git a/webcit/static/t/view_message/print.html b/webcit/static/t/view_message/print.html
index 43b64524f..1078cbc02 100644
--- a/webcit/static/t/view_message/print.html
+++ b/webcit/static/t/view_message/print.html
@@ -11,7 +11,7 @@
  @ 
 
  ***
-  

+  

 
 
 

 

diff --git a/webcit/static/t/who/section.html b/webcit/static/t/who/section.html
index e5896bf09..c160afeb0 100644
--- a/webcit/static/t/who/section.html
+++ b/webcit/static/t/who/section.html
@@ -21,11 +21,11 @@
 
 
 
- 
      
+ 
      
 
    
 
 
- 
 
+ 
 
 
 
diff --git a/webcit/static/t/who/summary_section.html b/webcit/static/t/who/summary_section.html
index 540da8ec8..b9a256bfb 100644
--- a/webcit/static/t/who/summary_section.html
+++ b/webcit/static/t/who/summary_section.html
@@ -15,6 +15,6 @@
 
 
 
- 
      
+ 
      
 
 
diff --git a/webcit/static/unittest.js b/webcit/static/unittest.js
index 9555c22cc..6c938a74b 100644
--- a/webcit/static/unittest.js
+++ b/webcit/static/unittest.js
@@ -121,7 +121,7 @@ Test.Unit.Logger.prototype = {
     this.loglines = $('loglines');
   },
   _toHTML: function(txt) {
-    return txt.escapeHTML().replace(/\n/g,"
");
+    return txt.escapeHTML().replace(/\n/g,"
");
   },
   addLinksToResults: function(){ 
     $$("tr.failed .nameCell").each( function(td){ // todo: limit to children of this.log
@@ -565,4 +565,4 @@ Test.context = function(name, spec, log){
     }
   }
   new Test.Unit.Runner(compiledSpec, { titles: titles, testLog: log || 'testlog', context: name });
-};
\ No newline at end of file
+};
diff --git a/webcit/static/wclib.js b/webcit/static/wclib.js
index 7a85697ec..2c3a8fdf0 100644
--- a/webcit/static/wclib.js
+++ b/webcit/static/wclib.js
@@ -594,7 +594,7 @@ function ctdl_ts_getInnerText(el) {
 // Place a gradient loadscreen on an element, e.g to use before Ajax.updater
 function CtdlLoadScreen(elementid) {
 var elem = document.getElementById(elementid);
-elem.innerHTML = "

  Loading....

";
+elem.innerHTML = "

  Loading....

";
 }
 
 
@@ -616,7 +616,7 @@ function PopOpenAddressBook(target_input) {
 }
 
 function PopulateAddressBookInnerDiv(which_addr_book, target_input) {
-	$('address_book_inner_div').innerHTML = "

  Loading....

";
+	$('address_book_inner_div').innerHTML = "

  Loading....

";
 	p = 'which_addr_book=' + which_addr_book
 	  + '&target_input=' + target_input
 	  + '&r=' + CtdlRandomString();
diff --git a/webcit/subst.c b/webcit/subst.c
index ad3b9081a..8bc65275f 100644
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -1225,7 +1225,7 @@ void *load_template(WCTemplate *NewTemplate)
 	NewTemplate->Data = NewStrBufPlain(NULL, statbuf.st_size + 1);
 	if (StrBufReadBLOB(NewTemplate->Data, &fd, 1, statbuf.st_size, &Err) < 0) {
 		close(fd);
-		lprintf(1, "ERROR: reading template '%s' - %s
\n",
+		lprintf(1, "ERROR: reading template '%s' - %s
\n",
 			ChrPtr(NewTemplate->FileName), strerror(errno));
 		//FreeWCTemplate(NewTemplate);/////tODO
 		return NULL;
diff --git a/webcit/summary.c b/webcit/summary.c
index 3ae86f835..0df287f3f 100644
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -99,7 +99,7 @@ void tasks_section(void) {
 	if (calendar_summary_view() < 1) {
 		wc_printf("");
 		wc_printf(_("(None)"));
-		wc_printf("
\n");
+		wc_printf("
\n");
 	}
 }
 
@@ -151,7 +151,7 @@ void calendar_section(void) {
 	if (calendar_summary_view() < 1) {
 		wc_printf("");
 		wc_printf(_("(Nothing)"));
-		wc_printf("
\n");
+		wc_printf("
\n");
 	}
 	__calendar_Cleanup(&v);
 }
diff --git a/webcit/sysdep.c b/webcit/sysdep.c
index 47487177e..3630125b0 100644
--- a/webcit/sysdep.c
+++ b/webcit/sysdep.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1996-2011 by the citadel.org team
  *
- * This program is free software; you can redistribute it and/or modify
+ * 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.
diff --git a/webcit/sysmsgs.c b/webcit/sysmsgs.c
index 930b793f9..dbe446a3f 100644
--- a/webcit/sysmsgs.c
+++ b/webcit/sysmsgs.c
@@ -47,7 +47,7 @@ void display_edit(char *description, char *check_cmd,
 	wc_printf("
\n");
 	wc_printf("", _("Save changes"));
 	wc_printf(" ");
-	wc_printf("
\n", _("Cancel"));
+	wc_printf("
\n", _("Cancel"));
 	wc_printf("
\n");
 
 	do_template("endbox", NULL);
diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c
index b9849f339..440178396 100644
--- a/webcit/tcp_sockets.c
+++ b/webcit/tcp_sockets.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1987-2011 by the citadel.org team
  *
- * This program is free software; you can redistribute it and/or modify
+ * 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.
diff --git a/webcit/userlist.c b/webcit/userlist.c
index 2f605adcc..845978a74 100644
--- a/webcit/userlist.c
+++ b/webcit/userlist.c
@@ -46,7 +46,7 @@ void userlist(void)
 	serv_puts("LIST");
 	serv_getln(buf, sizeof buf);
 	if (buf[0] != '1') {
-		wc_printf("%s
\n", &buf[4]);
+		wc_printf("%s
\n", &buf[4]);
 		goto DONE;
 	}
 
@@ -147,7 +147,7 @@ void showuser(void)
 	if (buf[0] == '1') {
 		fmout("JUSTIFY");
 	}
-	wc_printf("
"
 		"");
+				if (!IsEmptyStr(mailto)) strcat(mailto, "
");
 				strcat(mailto,
 					"");
 			}
 			else if (!strcasecmp(firsttoken, "tel")) {
-				if (!IsEmptyStr(phone)) strcat(phone, "
");
+				if (!IsEmptyStr(phone)) strcat(phone, "
");
 				strcat(phone, thisvalue);
 				for (j=0; j");
+							if (j<3) StrBufAppendPrintf(Target, "
");
 							else StrBufAppendPrintf(Target, " ");
 						}
 					}
@@ -763,7 +763,7 @@ void do_addrbook_view(addrbookent *addrbook, int num_ab) {
 	char **tablabels;
 
 	if (num_ab == 0) {
-		wc_printf("


");
+		wc_printf("


");
 		wc_printf(_("This address book is empty."));
 		wc_printf("
\n");
 		return;
@@ -777,7 +777,7 @@ void do_addrbook_view(addrbookent *addrbook, int num_ab) {
 
 	tablabels = malloc(num_pages * sizeof (char *));
 	if (tablabels == NULL) {
-		wc_printf("


");
+		wc_printf("


");
 		wc_printf(_("An internal error has occurred."));
 		wc_printf("
\n");
 		return;
@@ -1173,14 +1173,14 @@ void do_edit_vcard(long msgnum, char *partnum,
 	wc_printf(""
 		"
");
 	wc_printf(_("Primary Internet e-mail address"));
-	wc_printf("
"
+	wc_printf("
"
 		"
"
+	wc_printf("\">
"
 		"		");
 	wc_printf(_("Internet e-mail aliases"));
-	wc_printf("
"
+	wc_printf("
"
 		"
\n");
diff --git a/webcit/webcit.c b/webcit/webcit.c
index b02368388..da57d4723 100644
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -186,7 +186,7 @@ void output_headers(	int do_httpheaders,	/* 1 = output HTTP headers			  */
 			wc_printf("
\n"
 				"");
 			StrEscAppend(WCC->WBuf, NULL, WCC->ImportantMessage, 0, 0);
-			wc_printf("
\n"
+			wc_printf("
\n"
 				"
\n"
 			);
 			StrBufAppendBufPlain(WCC->trailing_javascript,
@@ -199,7 +199,7 @@ void output_headers(	int do_httpheaders,	/* 1 = output HTTP headers			  */
 			wc_printf("
\n"
 				"");
 			StrEscAppend(WCC->WBuf, WCC->ImportantMsg, NULL, 0, 0);
-			wc_printf("
\n"
+			wc_printf("
\n"
 				"
\n"
 			);
 			StrBufAppendBufPlain(WCC->trailing_javascript,
diff --git a/webcit/webcit.h b/webcit/webcit.h
index 59d2dec1a..9900ddb02 100644
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1987-2010 by the citadel.org team
  *
- * This program is free software; you can redistribute it and/or modify
+ * 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.
diff --git a/webcit/who.c b/webcit/who.c
index db86d609d..c3df2556d 100644
--- a/webcit/who.c
+++ b/webcit/who.c
@@ -157,7 +157,7 @@ void edit_me(void)
 			"To turn off any 'fake' name you've previously "
 			"set, simply click the appropriate 'change' button "
 			"without typing anything in the corresponding box. "));
-		wc_printf("
\n");
+		wc_printf("
\n");
 
 		wc_printf("
\n");
 		wc_printf("\n", WC->nonce);
diff --git a/webcit/wiki.c b/webcit/wiki.c
index 152954e22..ff4a45a27 100644
--- a/webcit/wiki.c
+++ b/webcit/wiki.c
@@ -85,7 +85,7 @@ void display_wiki_page_backend(const StrBuf *roomname, char *pagename, char *rev
 		return;
 	}
 
-	wc_printf("

"
+	wc_printf("

"
 		"
"
 		""
 		"
"
-- 
2.30.2