Performed a bunch of markup fixes suggested by validator.w3.org
authorArt Cancro <ajc@citadel.org>
Thu, 30 Dec 2010 20:52:29 +0000 (15:52 -0500)
committerWilfried Goesgens <dothebart@citadel.org>
Sun, 4 Sep 2011 13:32:33 +0000 (13:32 +0000)
62 files changed:
webcit/auth.c
webcit/calendar.c
webcit/calendar_view.c
webcit/event.c
webcit/feed_generator.c
webcit/graphics.c
webcit/groupdav_main.c
webcit/groupdav_options.c
webcit/groupdav_propfind.c
webcit/groupdav_put.c
webcit/html2html.c
webcit/listsub.c
webcit/locate_host.c
webcit/messages.c
webcit/msg_renderers.c
webcit/openid.c
webcit/paging.c
webcit/paramhandling.c
webcit/roomchat.c
webcit/roomops.c
webcit/serv_func.c
webcit/sieve.c
webcit/sitemap.c
webcit/smtpqueue.c
webcit/static/instant_messenger.html
webcit/static/mobile.js
webcit/static/nocookies.html
webcit/static/t/aide/display_generic_cmd.html
webcit/static/t/aide/display_generic_result.html
webcit/static/t/aide/display_ignetconf.html
webcit/static/t/aide/display_inetconf.html
webcit/static/t/files/section_onefile.html
webcit/static/t/iconbar/edit.html
webcit/static/t/iconbar/save.html
webcit/static/t/important_msg.html
webcit/static/t/knrooms_rooms.html
webcit/static/t/menubar.html
webcit/static/t/newstartpage.html
webcit/static/t/openid_manual_create.html
webcit/static/t/room/view_picture.html
webcit/static/t/room/zap_entry.html
webcit/static/t/room/zapped_list.html
webcit/static/t/section_mailsummary_m.html
webcit/static/t/view_message.html
webcit/static/t/view_message/inline_attach.html
webcit/static/t/view_message/list_attach.html
webcit/static/t/view_message/print.html
webcit/static/t/who/section.html
webcit/static/t/who/summary_section.html
webcit/static/unittest.js
webcit/static/wclib.js
webcit/subst.c
webcit/summary.c
webcit/sysdep.c
webcit/sysmsgs.c
webcit/tcp_sockets.c
webcit/userlist.c
webcit/vcard_edit.c
webcit/webcit.c
webcit/webcit.h
webcit/who.c
webcit/wiki.c

index 0303f292be8ef92f2cd05fb3b50d8a3453d01811..9373d19a4249e3c5c3dad3f4af90af711a104acf 100644 (file)
@@ -734,19 +734,19 @@ void validate(void)
                                        atoi(buf), axdefs[atoi(buf)]);
                } while (strcmp(buf, "000"));
        } else {
-               wc_printf("<H1>%s</H1>%s<br />\n", user, &cmd[4]);
+               wc_printf("<H1>%s</H1>%s<br>\n", user, &cmd[4]);
        }
 
        wc_printf("<hr />");
        wc_printf(_("Select access level for this user:"));
-       wc_printf("<br />\n");
+       wc_printf("<br>\n");
        for (a = 0; a <= 6; ++a) {
                wc_printf("<a href=\"validate?nonce=%d?user=", WC->nonce);
                urlescputs(user);
                wc_printf("&axlevel=%d\">%s</A>&nbsp;&nbsp;&nbsp;\n",
                        a, axdefs[a]);
        }
-       wc_printf("<br />\n");
+       wc_printf("<br>\n");
 
        wc_printf("</div>\n");
        wc_printf("</td></tr></table>\n");
@@ -835,7 +835,7 @@ void display_changepw(void)
 
        if (!IsEmptyStr(WC->ImportantMessage)) {
                wc_printf("<span class=\"errormsg\">"
-                       "%s</span><br />\n", WC->ImportantMessage);
+                       "%s</span><br>\n", WC->ImportantMessage);
                safestrncpy(WC->ImportantMessage, "", sizeof WC->ImportantMessage);
        }
 
index 0a08cb8195de081248e91d011ae48272605bed1c..d4832070bd0eaa8e34772ca18a66db27f807d248 100644 (file)
@@ -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, "<br />\n");
+               StrBufAppendPrintf(Mime->Data, "<br>\n");
                return;
        }
 
index 05ed56d5824440e5f116b0f994a0520c8ceca51a..89f15392cae8773a9d01cbe6efd99ee9e38630b5 100644 (file)
@@ -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("<br /><br /><br />\n");
+               wc_printf("<br><br><br>\n");
                return;
        }
 
@@ -286,10 +286,10 @@ void calendar_month_view_display_events(int year, int month, int day)
 
                                wc_printf("<span class=\"tooltip\"><span class=\"btttop\"></span><span class=\"bttmiddle\">");
 
-                               wc_printf("<i>%s: %s</i><br />", _("From"), Cal->from);
+                               wc_printf("<i>%s: %s</i><br>", _("From"), Cal->from);
                                wc_printf("<i>%s</i> ",          _("Summary:"));
                                escputs((char *)icalproperty_get_comment(p));
-                               wc_printf("<br />");
+                               wc_printf("<br>");
 
                                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("<i>%s</i> ", _("Location:"));
                                        escputs((char *)icalproperty_get_comment(q));
-                                       wc_printf("<br />");
+                                       wc_printf("<br>");
                                }
 
                                /*
@@ -377,11 +377,11 @@ void calendar_month_view_display_events(int year, int month, int day)
                                if (q) {
                                        wc_printf("<i>%s</i> ", _("Notes:"));
                                        escputs((char *)icalproperty_get_comment(q));
-                                       wc_printf("<br />");
+                                       wc_printf("<br>");
                                }
 
                                wc_printf("</span><span class=\"bttbottom\"></span></span>");
-                               wc_printf("</a></font><br />\n");
+                               wc_printf("</a></font><br>\n");
 
                                if (all_day_event) {
                                        wc_printf("</td></tr></table>");
@@ -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("<center><i>week view FIXME</i></center><br />\n");
+       wc_printf("<center><i>week view FIXME</i></center><br>\n");
 }
 
 
@@ -950,16 +950,16 @@ void calendar_day_view_display_events(time_t thetime,
                                );
                                 escputs((char *) icalproperty_get_comment(p));
                                wc_printf("<span class=\"tooltip\"><span class=\"btttop\"></span><span class=\"bttmiddle\">");
-                                wc_printf("<i>%s</i><br />",      _("All day event"));
-                               wc_printf("<i>%s: %s</i><br />",  _("From"), Cal->from);
+                                wc_printf("<i>%s</i><br>",      _("All day event"));
+                               wc_printf("<i>%s: %s</i><br>",  _("From"), Cal->from);
                                 wc_printf("<i>%s</i> ",           _("Summary:"));
                                 escputs((char *) icalproperty_get_comment(p));
-                                wc_printf("<br />");
+                                wc_printf("<br>");
                                q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY);
                                 if (q) {
                                         wc_printf("<i>%s</i> ", _("Location:"));
                                         escputs((char *)icalproperty_get_comment(q));
-                                        wc_printf("<br />");
+                                        wc_printf("<br>");
                                }
                                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("<i>%s</i> ", _("Notes:"));
                                         escputs((char *)icalproperty_get_comment(q));
-                                        wc_printf("<br />");
+                                        wc_printf("<br>");
                                 }
                                wc_printf("</span><span class=\"bttbottom\"></span></span>");
                                 wc_printf("</a> <span>(");
@@ -994,16 +994,16 @@ void calendar_day_view_display_events(time_t thetime,
                                );
                                escputs((char *) icalproperty_get_comment(p));
                                wc_printf("<span class=\"tooltip\"><span class=\"btttop\"></span><span class=\"bttmiddle\">");
-                                wc_printf("<i>%s</i><br />",     _("Ongoing event"));
-                               wc_printf("<i>%s: %s</i><br />", _("From"), Cal->from);
+                                wc_printf("<i>%s</i><br>",     _("Ongoing event"));
+                               wc_printf("<i>%s: %s</i><br>", _("From"), Cal->from);
                                 wc_printf("<i>%s</i> ",          _("Summary:"));
                                 escputs((char *) icalproperty_get_comment(p));
-                                wc_printf("<br />");
+                                wc_printf("<br>");
                                 q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY);
                                 if (q) {
                                         wc_printf("<i>%s</i> ", _("Location:"));
                                         escputs((char *)icalproperty_get_comment(q));
-                                        wc_printf("<br />");
+                                        wc_printf("<br>");
                                                                }
                                 webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF);
                                 wc_printf("<i>%s</i> %s<br>", _("Starting date/time:"), buf);
@@ -1013,7 +1013,7 @@ void calendar_day_view_display_events(time_t thetime,
                                 if (q) {
                                         wc_printf("<i>%s</i> ", _("Notes:"));
                                         escputs((char *)icalproperty_get_comment(q));
-                                        wc_printf("<br />");
+                                        wc_printf("<br>");
                                 }
                                 wc_printf("</span><span class=\"bttbottom\"></span></span>");
                                wc_printf("</a> <span>(");
@@ -1076,15 +1076,15 @@ void calendar_day_view_display_events(time_t thetime,
                                );
                                escputs((char *) icalproperty_get_comment(p));
                                wc_printf("<span class=\"tooltip\"><span class=\"btttop\"></span><span class=\"bttmiddle\">");
-                               wc_printf("<i>%s: %s</i><br />", _("From"), Cal->from);
+                               wc_printf("<i>%s: %s</i><br>", _("From"), Cal->from);
                                 wc_printf("<i>%s</i> ",          _("Summary:"));
                                 escputs((char *) icalproperty_get_comment(p));
-                                wc_printf("<br />");
+                                wc_printf("<br>");
                                 q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY);
                                 if (q) {
                                         wc_printf("<i>%s</i> ", _("Location:"));
                                         escputs((char *)icalproperty_get_comment(q));
-                                        wc_printf("<br />");
+                                        wc_printf("<br>");
                                                                }
                                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("<i>%s</i> ", _("Notes:"));
                                         escputs((char *)icalproperty_get_comment(q));
-                                        wc_printf("<br />");
+                                        wc_printf("<br>");
                                 }
                                wc_printf("</span><span class=\"bttbottom\"></span></span>");
                                wc_printf("</a></dd>\n");
@@ -1299,10 +1299,10 @@ void calendar_day_view(int year, int month, int day) {
 
        wc_strftime(d_str, sizeof d_str,
                "<td align=\"center\">"
-               "<font size='+2'>%A</font><br />"
-               "<font size='+2'>%B</font><br />"
-               "<font size='+3'>%d</font><br />"
-               "<font size='+2'>%Y</font><br />"
+               "<font size='+2'>%A</font><br>"
+               "<font size='+2'>%B</font><br>"
+               "<font size='+3'>%d</font><br>"
+               "<font size='+2'>%Y</font><br>"
                "</td>",
                &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("<br />\n");
+       wc_printf("<br>\n");
        embeddable_mini_calendar(year, month);
 
        wc_printf("</td></tr>");                        /* end stuff-on-the-right */
@@ -1419,7 +1419,7 @@ int calendar_summary_view(void) {
                                        if (!all_day_event) {
                                                wc_printf(" (%s)", timestring);
                                        }
-                                       wc_printf("</a><br />\n");
+                                       wc_printf("</a><br>\n");
                                        ++num_displayed;
                                }
                        }
index f7b6b30e0a733a8a507b60bc3bd5b4731fd19161..a5f996ffc41cb48a35426491c7b187ba7f26812c 100644 (file)
@@ -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("<br />\n");
-       wc_printf("SEQUENCE == %d<br />\n", sequence);
+       wc_printf("<br>\n");
+       wc_printf("SEQUENCE == %d<br>\n", sequence);
        *************************************************************/
 
        wc_printf("<form name=\"EventForm\" method=\"POST\" action=\"save_event\">\n");
@@ -436,7 +436,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
        wc_printf("<table border='0' width='100%%'>\n");        /* same table style as the event tab */
        wc_printf("<tr><td><b>");
        wc_printf(_("Attendees"));
-       wc_printf("</b><br />"
+       wc_printf("</b><br>"
                "<font size='-2'>");
        wc_printf(_("(One per line)"));
        wc_printf("</font>\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"), "<span id=\"rrmday\">", rrmday, "</span>");
-       wc_printf("<br />\n");
+       wc_printf("<br>\n");
 
        wc_printf("<input type=\"radio\" name=\"rrmonthtype\" id=\"rrmonthtype_wday\" "
                "value=\"rrmonthtype_wday\" "
@@ -624,7 +624,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
        }
        wc_printf("</select>");
 
-       wc_printf(" %s<br />\n", _("of the month"));
+       wc_printf(" %s<br>\n", _("of the month"));
 
        wc_printf("</div>\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("<span id=\"ymday\">%s</span><br />", _("year on this date"));
+       wc_printf("<span id=\"ymday\">%s</span><br>", _("year on this date"));
 
        wc_printf("<input type=\"radio\" name=\"rryeartype\" id=\"rryeartype_ywday\" "
                "value=\"rryeartype_ywday\" "
@@ -698,7 +698,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
                );
        }
        wc_printf("</select>");
-       wc_printf("<br />\n");
+       wc_printf("<br>\n");
 
        wc_printf("</div>\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<br />\n", _("No ending date"));
+       wc_printf("%s<br>\n", _("No ending date"));
 
        wc_printf("<input type=\"radio\" name=\"rrend\" id=\"rrend_count\" "
                "value=\"rrend_count\" "
@@ -729,7 +729,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
        wc_printf(" <input type=\"text\" name=\"rrcount\" id=\"rrcount\" maxlength=\"3\" size=\"3\" ");
        wc_printf("value=\"%d\"> ", recur.count);
        wc_printf(_("times"));
-       wc_printf("<br />\n");
+       wc_printf("<br>\n");
 
        wc_printf("<input type=\"radio\" name=\"rrend\" id=\"rrend_until\" "
                "value=\"rrend_until\" "
@@ -742,7 +742,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
                recur.until = icaltime_add(t_start, icaldurationtype_from_int(604800));
        }
        display_icaltimetype_as_webform(&recur.until, "rruntil", 1);
-       wc_printf("<br />\n");
+       wc_printf("<br>\n");
 
        wc_printf("</td></tr>\n");
 
index acc84621c7e8744c55c198ccc3770358d9e838bc..36808397983d8b0b3eb086b0c7e2867c7db8bac7 100644 (file)
@@ -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, "<a type-\"application/rss+xml\" href=\"/B64%s\">", encoded_link);
-       StrBufAppendPrintf(Target, "<img border=\"0\" src=\"static/rss_16x.png\">");
+       StrBufAppendPrintf(Target, "<a type=\"application/rss+xml\" href=\"/B64%s\">", encoded_link);
+       StrBufAppendPrintf(Target, "<img border=\"0\" src=\"static/rss_16x.png\" alt=\"RSS\">");
        StrBufAppendPrintf(Target, "</a>");
 }
 
index 1949c24a5a22a4637ef3f42bdb97c832f740292b..a79cb0f3b1aa045b7af69a7d94b62efbcba833a3 100644 (file)
@@ -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("<br /><br />\n");
+       wc_printf("<br><br>\n");
 
        wc_printf(_("Please select a file to upload:"));
        wc_printf("<input type=\"file\" name=\"filename\" size=\"35\">\n");
index 3fc38fb306d1b585f4ef26d8ba873eb97655ffd1..90de73b9937ab7c61c24cfac9b46250887bb8f79 100644 (file)
@@ -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.
index c6cde79e3e0ec3750468781c4c2c0166f129fe97..a24dcec51f5838bf3867b8979fe7b57cd34c838d 100644 (file)
@@ -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.
index ab1b2e807039283454484c5052fe484d906e25ba..ceb78fdac73a131b3a1b5c2dffe873ec7452e62d 100644 (file)
@@ -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.
index b63b61935f77bfc63b72e711331d1136b81f6f9a..2f4503bca301384608b6e35ac484af196d025fba 100644 (file)
@@ -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.
index a7bb2eb5af5e3c37e7058e5e8673a7a5dcdaefa9..33eeedf01b6172290493d68a51fcad20a5937f4d 100644 (file)
@@ -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, "</b><br /><br />\n");
+                       StrBufAppendPrintf(Target, "</b><br><br>\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<br />%s:%d", errno, strerror(errno), __FILE__, __LINE__);
+               StrBufAppendPrintf(Target, "Error %d: %s<br>%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, "<br /><br />\n");
+       StrBufAppendPrintf(Target, "<br><br>\n");
 
        /** Now give back the memory */
        FreeStrBuf(&converted_msg);
index c59cae348e29eec6582ae59a964b256ef76c3ec2..05038e277ec7af49b0e80f68eca80cd893c9ba4c 100644 (file)
@@ -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.<br /><br />"
+                               "without your consent.<br><br>"
                                "Please click on the link which is being "
                                "e-mailed to you and your subscription will "
-                               "be confirmed.<br />\n"),
+                               "be confirmed.<br>\n"),
                                escaped_email, escaped_room);
                        wc_printf("<a href=\"listsub\">%s</A></CENTER>\n", _("Go back..."));
                }
                else {
                        wc_printf("<FONT SIZE=+1><B>ERROR: %s</B>"
-                               "</FONT><br /><br />\n",
+                               "</FONT><br><br>\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.<br /><br />"
+                               "lists without your consent.<br><br>"
                                "Please click on the link which is being "
                                "e-mailed to you and your unsubscription will "
-                               "be confirmed.<br />\n"
+                               "be confirmed.<br>\n"
                                "<a href=\"listsub\">Back...</A></CENTER>\n"
                        );
                }
                else {
                        wc_printf("<FONT SIZE=+1><B>ERROR: %s</B>"
-                               "</FONT><br /><br />\n",
+                               "</FONT><br><br>\n",
                                &buf[4]);
                        goto FORM;
                }
@@ -154,7 +154,7 @@ void do_listsub(void)
                                "The error returned by the server was: "
                        );
                }
-               wc_printf("%s</CENTER><br />\n", &buf[4]);
+               wc_printf("%s</CENTER><br>\n", &buf[4]);
        }
 
        /*
@@ -208,7 +208,7 @@ FORM:               wc_printf("<form method=\"POST\" action=\"listsub\">\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.<br />\n"
+                       "subscribe or unsubscribe you to lists.<br>\n"
                );
 
        }
index b3346e4c7d6cf23835993e9e6ea0bce935d60adb..f0ca6c1fbb6c185c877da6f49bba2902eaa0fad0 100644 (file)
@@ -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.
index 6e30c98d30e2f3f176a2be4df1afdb5cff39ade3..f64667b87eb559e854a2c323ee4b2caa672a06a0 100644 (file)
@@ -52,7 +52,7 @@ int load_message(message_summary *Msg,
                *Error = NewStrBuf();
                StrBufAppendPrintf(*Error, "<strong>");
                StrBufAppendPrintf(*Error, _("ERROR:"));
-               StrBufAppendPrintf(*Error, "</strong> %s<br />\n", &buf[4]);
+               StrBufAppendPrintf(*Error, "</strong> %s<br>\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, "<div><i>");
                                StrBufAppendPrintf(Msg->MsgBody->Data, _("Empty message"));
-                               StrBufAppendPrintf(Msg->MsgBody->Data, "</i><br /><br />\n");
+                               StrBufAppendPrintf(Msg->MsgBody->Data, "</i><br><br>\n");
                                StrBufAppendPrintf(Msg->MsgBody->Data, "</div>\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("<em>%s</em><br />\n", &buf[4]);      /* TODO -> important message */
+                       wc_printf("<em>%s</em><br>\n", &buf[4]);        /* TODO -> important message */
                        return;
                }
        }
@@ -1509,7 +1509,7 @@ void confirm_move_msg(void)
        wc_printf("<CENTER>");
 
        wc_printf(_("Move this message to:"));
-       wc_printf("<br />\n");
+       wc_printf("<br>\n");
 
        wc_printf("<form METHOD=\"POST\" action=\"move_msg\">\n");
        wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
@@ -1527,7 +1527,7 @@ void confirm_move_msg(void)
                }
        }
        wc_printf("</SELECT>\n");
-       wc_printf("<br />\n");
+       wc_printf("<br>\n");
 
        wc_printf("<INPUT TYPE=\"submit\" NAME=\"move_button\" VALUE=\"%s\">", _("Move"));
        wc_printf("&nbsp;");
index 2be17adfda411f905633b8ed13a9f047647280c4..87931500e44ec54f403ebbbd763f8dbb56c82d70 100644 (file)
@@ -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("<tt></tt><br />\n"), 0);
+                               StrBufAppendBufPlain(Target, HKEY("<tt></tt><br>\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("</tt><br />\n"), 0);
+                       StrBufAppendBufPlain(Target, HKEY("</tt><br>\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("</blockquote>"), 0);
 
-       StrBufAppendBufPlain(Target, HKEY("</i><br />"), 0);
+       StrBufAppendBufPlain(Target, HKEY("</i><br>"), 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("<br />\n"), 0);
+       StrBufAppendBufPlain(Mime->Data, HKEY("<br>\n"), 0);
 }
 
 
index ff358e347f7e2c3dc0c7609efbb00cb23b530513..8ab2cb4ced73fe0f28d83569a228c47363e8e530 100644 (file)
@@ -37,7 +37,7 @@ void display_openids(void)
                        wc_printf("</td></tr>\n");
                }
        
-               wc_printf("</table><br />\n");
+               wc_printf("</table><br>\n");
        
                wc_printf("<form method=\"POST\" action=\"openid_attach\">\n");
                wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WCC->nonce);
index 7c632fb9f14b435534b19da9ba1b30f53157b786..190aa58c6f39cac52fcc715e56d74ae3b9f77852 100644 (file)
@@ -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("<br />");
+       wc_printf("<br>");
 
        wc_printf("<TEXTAREA NAME=\"msgtext\" wrap=soft ROWS=5 COLS=40 "
                "WIDTH=40></TEXTAREA>\n");
 
-       wc_printf("</TD></TR></TABLE><br />\n");
+       wc_printf("</TD></TR></TABLE><br>\n");
 
        wc_printf("<INPUT TYPE=\"submit\" NAME=\"send_button\" VALUE=\"%s\">", _("Send message"));
-       wc_printf("<br /><a href=\"javascript:window.close();\"%s</A>\n", _("Cancel"));
+       wc_printf("<br><a href=\"javascript:window.close();\"%s</A>\n", _("Cancel"));
 
        wc_printf("</FORM></CENTER>\n");
        wc_printf("</td></tr></table>\n");
index 8b36c277e39d2463049a6ddb35a276e19a7da85f..3d12c376c18f6921efbee630bd56d0f8a5a8a766 100644 (file)
@@ -419,16 +419,16 @@ void diagnostics(void)
 {
        output_headers(1, 1, 1, 0, 0, 0);
        wc_printf("Session: %d<hr />\n", WC->wc_session);
-       wc_printf("Command: <br /><PRE>\n");
+       wc_printf("Command: <br><PRE>\n");
 /*     
 StrEscPuts(WC->UrlFragment1);
-       wc_printf("<br />\n");
+       wc_printf("<br>\n");
        StrEscPuts(WC->UrlFragment2);
-       wc_printf("<br />\n");
+       wc_printf("<br>\n");
        StrEscPuts(WC->UrlFragment3);
 */
        wc_printf("</PRE><hr />\n");
-       wc_printf("Variables: <br /><PRE>\n");
+       wc_printf("Variables: <br><PRE>\n");
        dump_vars();
        wc_printf("</PRE><hr />\n");
        wDumpContent(1);
index 2278333ea913422a32ff6b286ad2ff6cdcdfaabb..4fcc714dcdd1c9ead8030f868e345278d3b34e7c 100644 (file)
@@ -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.
index ace2559624a4c346f1960ab00d8d395be7ff19bb..982c7139e23a1022738680c8a2e84c6cc3e7f3c5 100644 (file)
@@ -978,7 +978,7 @@ void set_room_policy(void) {
        strcpy(WC->ImportantMessage, &buf[4]);
 
        if (WC->axlevel >= 6) {
-               strcat(WC->ImportantMessage, "<br />\n");
+               strcat(WC->ImportantMessage, "<br>\n");
                serv_printf("SPEX floorpolicy|%d|%d", ibstr("floorpolicy"), ibstr("floorvalue"));
                serv_getln(buf, sizeof buf);
                strcat(WC->ImportantMessage, &buf[4]);
index e812de3817b25f70feaa70afe0eadebef03d8364..8585744af915c810dfe857cc6223457feac72127 100644 (file)
@@ -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("<br />");
+                       wc_printf("<br>");
                }
                intext = 1;
 
@@ -298,7 +298,7 @@ void _fmout(StrBuf *Target, char *align)
        if (bq == 1) {
                wc_printf("</I>");
        }
-       wc_printf("</div><br />\n");
+       wc_printf("</div><br>\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("<br />");
+                       wc_printf("<br>");
                }
                intext = 1;
 
index 40af7f54d8627271072237f7fdb537e3270adf7a..99bc5aa5a882b1935fe5cee7e15defed1695b43a 100644 (file)
@@ -135,9 +135,9 @@ void display_sieve(void)
        /* The "no filtering" div */
 
        wc_printf("<div id=\"sievediv0\" style=\"display:none\">\n");
-       wc_printf("<div align=\"center\"><br /><br />");
+       wc_printf("<div align=\"center\"><br><br>");
        wc_printf(_("Your incoming mail will not be filtered through any scripts."));
-       wc_printf("<br /><br /></div>\n");
+       wc_printf("<br><br></div>\n");
        wc_printf("</div>\n");
 
        /* The "webcit managed scripts" div */
@@ -168,7 +168,7 @@ void display_sieve(void)
        wc_printf("&nbsp;&nbsp;&nbsp;");
        wc_printf("<a href=\"display_add_remove_scripts\">%s</a>\n", _("Add or delete scripts"));
 
-       wc_printf("<br />\n");
+       wc_printf("<br>\n");
 
        if (num_scripts > 0) {
                for (i=0; i<num_scripts; ++i) {
@@ -657,12 +657,12 @@ void display_add_remove_scripts(char *message)
 
        wc_printf(_("To create a new script, enter the desired "
                "script name in the box below and click 'Create'."));
-       wc_printf("<br /><br />");
+       wc_printf("<br><br>");
 
         wc_printf("<center><form method=\"POST\" action=\"create_script\">\n");
        wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
         wc_printf(_("Script name: "));
-        wc_printf("<input type=\"text\" name=\"script_name\"><br />\n"
+        wc_printf("<input type=\"text\" name=\"script_name\"><br>\n"
                "<input type=\"submit\" name=\"create_button\" value=\"%s\">"
                "</form></center>\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("<br /><div align=center><a href=\"display_sieve\">%s</a><br /><br />\n",
+       wc_printf("<br><div align=center><a href=\"display_sieve\">%s</a><br><br>\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("<br /><br />");
+       wc_printf("<br><br>");
        
         wc_printf("<center>"
                "<form method=\"POST\" action=\"delete_script\">\n");
@@ -703,7 +703,7 @@ void display_add_remove_scripts(char *message)
                        }
                 }
         }
-        wc_printf("</select><br />\n");
+        wc_printf("</select><br>\n");
 
         wc_printf("<input type=\"submit\" name=\"delete_button\" value=\"%s\" "
                "onClick=\"return confirm('%s');\">", _("Delete script"), _("Delete this script?"));
@@ -931,7 +931,7 @@ void display_rules_editor_inner_div(void) {
        );
 
 
-       wc_printf("<br />");
+       wc_printf("<br>");
 
        wc_printf("<table cellpadding=2 width=100%%>");
 
@@ -1119,7 +1119,7 @@ void display_rules_editor_inner_div(void) {
 
                wc_printf("<div id=\"div_automsg%d\">", i);
                wc_printf(_("Message:"));
-               wc_printf("<br />");
+               wc_printf("<br>");
                wc_printf("<textarea name=\"automsg%d\" id=\"automsg%d\" wrap=soft rows=5>\n", i, i);
                escputs(automsg);
                wc_printf("</textarea>");
@@ -1152,7 +1152,7 @@ void display_rules_editor_inner_div(void) {
        }
 
        wc_printf("</table>");
-       wc_printf("<div id=\"div_addrule\"><a href=\"javascript:AddRule();\">%s</a><br /></div>\n",
+       wc_printf("<div id=\"div_addrule\"><a href=\"javascript:AddRule();\">%s</a><br></div>\n",
                _("Add rule")
        );
 
index c49c001a6929801503958505777007e520862b1d..dd4f570a91dc3509983c873723ddef90dbec206f 100644 (file)
@@ -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.
index b120ee17ae6e9fa6b8821632864c2088777bc1b8..6ee2db9ef98ebc7888ee4f9bb8ca574a0efeb393 100644 (file)
@@ -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, "<br />&nbsp;&nbsp;<i>");
+                                               strcat(thismsg, "<br>&nbsp;&nbsp;<i>");
                                                stresc(&thismsg[strlen(thismsg)], sizeof thismsg,
                                                        thisdsn, 1, 1);
                                                strcat(thismsg, "</i>");
@@ -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], "<br />");
+                                                       strcpy(&recipients[recipients_len], "<br>");
                                                        recipients_len += 6;
                                                }
                                                strcpy(&recipients[recipients_len], thismsg);
@@ -128,7 +128,7 @@ void display_queue_msg(long msgnum)
        }
 
        wc_printf("<tr><td>");
-       wc_printf("%ld<br />", msgnum);
+       wc_printf("%ld<br>", msgnum);
        wc_printf(" <a href=\"javascript:DeleteSMTPqueueMsg(%ld,%ld);\">%s</a>", 
                msgnum, msgid, _("(Delete)")
        );
@@ -210,15 +210,15 @@ void display_smtpqueue_inner_div(void) {
 
                }
                else {
-                       wc_printf("<br /><br /><div align=\"center\">");
+                       wc_printf("<br><br><div align=\"center\">");
                        wc_printf(_("The queue is empty."));
-                       wc_printf("</div><br /><br />");
+                       wc_printf("</div><br><br>");
                }
        }
        else {
-               wc_printf("<br /><br /><div align=\"center\">");
+               wc_printf("<br><br><div align=\"center\">");
                wc_printf(_("You do not have permission to view this resource."));
-               wc_printf("</div><br /><br />");
+               wc_printf("</div><br><br>");
        }
        output_headers(0, 0, 0, 0, 0, 0);
        end_burst();
index 549e6a29475ef37ece52c4accc2de23e0ad4c284..dc2e3cd5c0347d8905008b8d87f0b299f847c6a4 100644 (file)
@@ -48,7 +48,7 @@ function SendSomething(which_div, sendform, recipient) {
                                + '</font>'
                                + ':</b> '
                                + thetext
-                               + '<br />\n';
+                               + '<br>\n';
 
        // Scroll to the bottom of the tab
        $('main').scrollTop = 999999;
@@ -123,8 +123,8 @@ function ShowNewMsg(gexp_xmlresponse) {
                          $('main').innerHTML
                        + '<div id=\"tab_' + which_div + '\" style=\"display:none;cursor:pointer\">'
                        + '<div id=\"' + which_div + '\">'
-                       + '<br /><br /><br /><br /><br /><br /><br /><br /><br /><br />'
-                       + '<br /><br /><br /><br /><br /><br /><br /><br /><br /><br />'
+                       + '<br><br><br><br><br><br><br><br><br><br>'
+                       + '<br><br><br><br><br><br><br><br><br><br>'
                        + '</div>'
                        + '<div align=\"center\" id=\"response_'
                        + which_div + '\" style=\"background:#ddddee\">'
@@ -157,7 +157,7 @@ function ShowNewMsg(gexp_xmlresponse) {
                                + '</font>'
                                + ':</b> '
                                + the_message
-                               + '<br />\n';
+                               + '<br>\n';
 
        // Scroll to the bottom of the tab
        $('main').scrollTop = 999999;
index 275481a8f1a9d091f97b8036945cee2bf2970294..dc1485728e58ac1ba960ec5836eb3c37ee17ec47 100644 (file)
@@ -18,7 +18,7 @@ req.open('GET', '/msg/'+msgnum, true);
 req.onreadystatechange = function (aEvt) {
   if (req.readyState == 4) {
      if(req.status == 200)
-      currentMsgDisplay.innerHTML = "<button onMouseDown=\"CtdlHideMsg()\">(Hide message)</button><br/>"+req.responseText;
+      currentMsgDisplay.innerHTML = "<button onMouseDown=\"CtdlHideMsg()\">(Hide message)</button><br>"+req.responseText;
      else
       currentMsgDisplay.innerHTML = "Error loading message";
   }
index 1e2d4d555aba4dcda153d66c72186332c2230dab..d3ba1356cb6874e0b5e7f71293b5ff9bb4f1fd99 100644 (file)
@@ -6,8 +6,8 @@
 
 <div align="center">
 <h2>Sorry!</h2>
-<br />
-This site requires both Cookies and JavaScript to be enabled in your browser.<br />
+<br>
+This site requires both Cookies and JavaScript to be enabled in your browser.<br>
 Please enable these features and log in again.  We are sorry for the inconvenience.
 </div>
 
index 5b3761743456588d965ac6f03b296914ebb8dea6..261972cf080438188efd5f32844eecd7c9e2d148 100644 (file)
@@ -9,18 +9,18 @@
     <??("COND:AIDE", 1)>
     <table class="mainmenu_background"><tr><td>
 
-         <center><?_("This screen allows you to enter Citadel server commands which are not supported by WebCit.  If you do not know what that means, then this screen will not be of much use to you.")><br />
+         <center><?_("This screen allows you to enter Citadel server commands which are not supported by WebCit.  If you do not know what that means, then this screen will not be of much use to you.")><br>
            <form method="post" action="do_generic">
              <input type="hidden" name="nonce" value="<?NONCE>">
-             <?_("Enter command:")><br />
-             <input type="text" name="g_cmd" size=80 maxlength="250"><br />
-             <?_("Command input (if requesting SEND_LISTING transfer mode):")><br />
-             <textarea name="g_input" rows=10 cols=80 width=80></textarea><br />
+             <?_("Enter command:")><br>
+             <input type="text" name="g_cmd" size=80 maxlength="250"><br>
+             <?_("Command input (if requesting SEND_LISTING transfer mode):")><br>
+             <textarea name="g_input" rows=10 cols=80 width=80></textarea><br>
              <font size=-2>
                <?_("Detected host header is ")><?DAV:HOSTNAME>
              </font>
              <input type="submit" name="sc_button" value="<?_("Send command")>">&nbsp;
-             <input type="submit" name="cancel_button" value="<?_("Cancel")>"><br />
+             <input type="submit" name="cancel_button" value="<?_("Cancel")>"><br>
            </form>
          </center>
        </td>
index 809d5d7bd0f1677bcc99263eee8df08c98eae483..2a2fae16bd0b2b27d3a5fd1fe7f189067b792234 100644 (file)
@@ -13,9 +13,9 @@
 <?CONTEXTSTR("H")>
        
 <br>
-</tt></td></tr></table><br />
+</tt></td></tr></table><br>
 <hr />
-<a href="do_template?template=aide_display_generic_cmd"><?_("Enter another command")></a><br />
+<a href="do_template?template=aide_display_generic_cmd"><?_("Enter another command")></a><br>
 <a href="display_advanced"><?_("Return to menu")></a>
 
 <?=("endbox")><br>
index c89c86ae6ea212e477a50c591bb07cfd42d6dcc0..928765899eb32c9eac00205a9a7a213c958bd308 100644 (file)
@@ -7,7 +7,7 @@
 <div id="content" class="service">
 
 <center>
-<a href="do_template?template=aide_ignetconf_add"><?_("Add a new node")></a><br />
+<a href="do_template?template=aide_ignetconf_add"><?_("Add a new node")></a><br>
 </center>
 
 <table class="netconf_banner"><tr><td>
index ef71040db35159d508c258c459d85d7c59933f09..c818f00d8dc1648ab1eee748ac789527108e57e7 100644 (file)
 <table border=0 width=100% cellspacing="10" cellpadding="10"> <tr><td valign=top width="50%">
 
 
-<?DOBOXED("aide_inet_aliases", _("Local host aliases"))><br />
-<?DOBOXED("aide_inet_dirnames", _("Directory domains"))><br />
-<?DOBOXED("aide_inet_smarthosts", _("Smart hosts"))><br />
-<?DOBOXED("aide_inet_fallbackhosts", _("Fallback smart hosts"))><br />
+<?DOBOXED("aide_inet_aliases", _("Local host aliases"))><br>
+<?DOBOXED("aide_inet_dirnames", _("Directory domains"))><br>
+<?DOBOXED("aide_inet_smarthosts", _("Smart hosts"))><br>
+<?DOBOXED("aide_inet_fallbackhosts", _("Fallback smart hosts"))><br>
 <?DOBOXED("aide_inet_notify", _("Notification hosts"))>
 
 </td><td valign=top width="50%">
 
 
-<?DOBOXED("aide_inet_rbldns", _("RBL hosts"))><br />
-<?DOBOXED("aide_inet_spamass", _("SpamAssassin hosts"))><br />
-<?DOBOXED("aide_inet_clamav", _("ClamAV clamd hosts"))><br />
+<?DOBOXED("aide_inet_rbldns", _("RBL hosts"))><br>
+<?DOBOXED("aide_inet_spamass", _("SpamAssassin hosts"))><br>
+<?DOBOXED("aide_inet_clamav", _("ClamAV clamd hosts"))><br>
 <?DOBOXED("aide_inet_masqdomains", _("Masqueradable domains"))>
 
 
index 91aa36374f0c7246374817edf98fb2608f781f19..3678d7a9e8fd82043e67dc5236e092e08f611d1f 100644 (file)
@@ -5,7 +5,7 @@
 <tr class="<?ITERATE:ODDEVEN>">
 <td>
  <a href="download_file/<?FILE:NAME("U")>">
-  <img src="display_mime_icon?type=<?FILE:MIMETYPE>" border=0 align=middle>
+  <img src="display_mime_icon?type=<?FILE:MIMETYPE>" border="0" align="middle" alt="">
   <?FILE:NAME></a>
 </td>
 <td><?FILE:SIZE></td>
index 990919655c502d4b16f9890ac5da97c0c59ff14d..860060019f945cd35d3bc1ddf3244112976561ea 100644 (file)
 <input type="radio" name="ib_displayas" value="0" <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_displayas", "CHECKED", "")>><?_("pictures and text")></input>
 <input type="radio" name="ib_displayas" value="1" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_displayas", "CHECKED", "")>><?_("pictures only")></input>
 <input type="radio" name="ib_displayas" value="2" <?%("COND:ICONBAR:ACTIVE", 1, 2, #"ib_displayas", "CHECKED", "")>><?_("text only")></input>
-<br />
+<br>
 <?_("Select the icons you would like to see displayed in the 'icon bar' menu on the left side of the screen.")>
 </td></tr>
 
 <tr class="even"><td>
 <input type="radio" name="ib_logo" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_logo", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_logo" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_logo", "CHECKED", "")>> <?_("No")> <br />
+<input type="radio" name="ib_logo" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_logo", "CHECKED", "")>> <?_("No")> <br>
 </td><td><img src="image?name=hello" width="48" alt="&nbsp;">
-</td><td><b><?_("Site logo")></b><br /><?_("An icon describing this site")></td></tr>
+</td><td><b><?_("Site logo")></b><br><?_("An icon describing this site")></td></tr>
 
 <tr class="odd"><td>
 <input type="radio" name="ib_summary" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_summary", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_summary" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_summary", "CHECKED", "")>> <?_("No")> <br />
+<input type="radio" name="ib_summary" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_summary", "CHECKED", "")>> <?_("No")> <br>
 </td><td><img src="static/summscreen_48x.gif" alt="&nbsp;">
-</td><td><b><?_("Summary")></b><br /><?_("Your summary page")></td></tr>
+</td><td><b><?_("Summary")></b><br><?_("Your summary page")></td></tr>
 
 <tr class="even"><td>
 <input type="radio" name="ib_inbox" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_inbox", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_inbox" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_inbox", "CHECKED", "")>> <?_("No")> <br />
+<input type="radio" name="ib_inbox" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_inbox", "CHECKED", "")>> <?_("No")> <br>
 </td><td><img src="static/privatemess_48x.gif" alt="&nbsp;">
-</td><td><b><?_("Mail (inbox)")></b><br /><?_("A shortcut to your email Inbox")></td></tr>
+</td><td><b><?_("Mail (inbox)")></b><br><?_("A shortcut to your email Inbox")></td></tr>
 
 <tr class="odd"><td>
 <input type="radio" name="ib_contacts" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_contacts", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_contacts" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_contacts", "CHECKED", "")>> <?_("No")> <br />
+<input type="radio" name="ib_contacts" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_contacts", "CHECKED", "")>> <?_("No")> <br>
 </td><td><img src="static/viewcontacts_48x.gif" alt="&nbsp;">
-</td><td><b><?_("Contacts")></b><br /><?_("Your personal address book")></td></tr>
+</td><td><b><?_("Contacts")></b><br><?_("Your personal address book")></td></tr>
 
 <tr class="even"><td>
 <input type="radio" name="ib_notes" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_notes", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_notes" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_notes", "CHECKED", "")>> <?_("No")> <br />
+<input type="radio" name="ib_notes" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_notes", "CHECKED", "")>> <?_("No")> <br>
 </td><td><img src="static/storenotes_48x.gif" alt="&nbsp;">
-</td><td><b><?_("Notes")></b><br /><?_("Your personal notes")></td></tr>
+</td><td><b><?_("Notes")></b><br><?_("Your personal notes")></td></tr>
 
 <tr class="odd"><td>
 <input type="radio" name="ib_calendar" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_calendar", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_calendar" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_calendar", "CHECKED", "")>> <?_("No")> <br />
+<input type="radio" name="ib_calendar" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_calendar", "CHECKED", "")>> <?_("No")> <br>
 </td><td><img src="static/calarea_48x.gif" alt="&nbsp;">
-</td><td><b><?_("Calendar")></b><br /><?_("A shortcut to your personal calendar")></td></tr>
+</td><td><b><?_("Calendar")></b><br><?_("A shortcut to your personal calendar")></td></tr>
 
 <tr class="even"><td>
 <input type="radio" name="ib_tasks" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_tasks", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_tasks" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_tasks", "CHECKED", "")>> <?_("No")> <br />
+<input type="radio" name="ib_tasks" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_tasks", "CHECKED", "")>> <?_("No")> <br>
 </td><td><img src="static/taskmanag_48x.gif" alt="&nbsp;">
-</td><td><b><?_("Tasks")></b><br /><?_("A shortcut to your personal task list")></td></tr>
+</td><td><b><?_("Tasks")></b><br><?_("A shortcut to your personal task list")></td></tr>
 
 <tr class="odd"><td>
 <input type="radio" name="ib_rooms" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_rooms", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_rooms" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_rooms", "CHECKED", "")>> <?_("No")> <br />
+<input type="radio" name="ib_rooms" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_rooms", "CHECKED", "")>> <?_("No")> <br>
 </td><td><img src="static/chatrooms_48x.gif" alt="&nbsp;">
-</td><td><b><?_("Rooms")></b><br /><?_("Clicking this icon displays a list of all accessible rooms (or folders) available.")></td></tr>
+</td><td><b><?_("Rooms")></b><br><?_("Clicking this icon displays a list of all accessible rooms (or folders) available.")></td></tr>
 
 <tr class="even"><td>
 <input type="radio" name="ib_users" value="yes"     <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_users", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_users" value="no"      <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_users", "CHECKED", "")>> <?_("No")> <br />
+<input type="radio" name="ib_users" value="no"      <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_users", "CHECKED", "")>> <?_("No")> <br>
 <input type="radio" name="ib_users" value="yeslist" <?%("COND:ICONBAR:ACTIVE", 1, 2, #"ib_users", "CHECKED", "")>> <?_("Yes with users list")></td><td>
 <img src="static/usermanag_48x.gif" alt="&nbsp;">
-</td><td><b><?_("Who is online?")></b><br /><?_("Clicking this icon displays a list of all users currently logged in.")></td></tr>
+</td><td><b><?_("Who is online?")></b><br><?_("Clicking this icon displays a list of all users currently logged in.")></td></tr>
 
 <tr class="odd"><td>
 <input type="radio" name="ib_chat" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_chat", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_chat" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_chat", "CHECKED", "")>> <?_("No")> <br />
+<input type="radio" name="ib_chat" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_chat", "CHECKED", "")>> <?_("No")> <br>
 </td><td><img src="static/citadelchat_48x.gif" alt="&nbsp;">
-</td><td><b><?_("Chat")></b><br /><?_("Clicking this icon enters real-time chat mode with other users in the same room.")></td></tr>
+</td><td><b><?_("Chat")></b><br><?_("Clicking this icon enters real-time chat mode with other users in the same room.")></td></tr>
 
 <tr class="even"><td>
 <input type="radio" name="ib_advanced" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_advanced", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_advanced" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_advanced", "CHECKED", "")>> <?_("No")> <br />
+<input type="radio" name="ib_advanced" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_advanced", "CHECKED", "")>> <?_("No")> <br>
 </td><td><img src="static/advanpage2_48x.gif" alt="&nbsp;">
-</td><td><b><?_("Advanced options")></b><br /><?_("Access to the complete menu of Citadel functions.")></td></tr>
+</td><td><b><?_("Advanced options")></b><br><?_("Access to the complete menu of Citadel functions.")></td></tr>
 
 <tr class="odd"><td>
 <input type="radio" name="ib_citadel" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_citadel", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_citadel" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_citadel", "CHECKED", "")>> <?_("No")> <br />
+<input type="radio" name="ib_citadel" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_citadel", "CHECKED", "")>> <?_("No")> <br>
 </td><td><img border="0" width="48" height="48" src="static/citadel-logo.gif" alt="&nbsp;">
-</td><td><b><?_("Citadel logo")></b><br /><?_("Displays the 'Powered by Citadel' icon")></td></tr>
+</td><td><b><?_("Citadel logo")></b><br><?_("Displays the 'Powered by Citadel' icon")></td></tr>
 
-</table><br />
+</table><br>
 
 <center><input type="submit" name="ok_button" value="<?_("Save changes")>">&nbsp;<input type="submit" name="cancel_button" value="<?_("Cancel")>"></center>
 
index f2def34d6d6252db0b8eaff7dfb103965840238c..031bf5b5824d6c1543100a7881091602a877a874 100644 (file)
@@ -8,6 +8,6 @@
 <center><table border=1 bgcolor="#ffffff"><tr><td>
 <img src="static/advanpage2_48x.gif">
 &nbsp;
-<?_("Your icon bar has been updated. Please select any of its choices to continue.")>(<br/><span style="font-weight: bold;"><?_("You may need to force refresh (SHIFT-F5)> in order for changes to take effect")>)</span>
+<?_("Your icon bar has been updated. Please select any of its choices to continue.")>(<br><span style="font-weight: bold;"><?_("You may need to force refresh (SHIFT-F5)> in order for changes to take effect")>)</span>
 </td></tr></table>
 <?=("trailing")>
index cf11c7ed9648cc25c0d2127478d5d0cd20421280..61cddadf34c8625a40c793beedcde5ea13f72f8a 100644 (file)
@@ -2,7 +2,7 @@
 <div id="important_message">
 <span class="imsg">
 <?IMPORTANTMESSAGE>
-</span><br />
+</span><br>
 </div>
 <script type="text/javascript">
   setTimeout('hide_imsg_popup()', 5000);
index d7ecb512b44ea80a8edc067789f40438ee2fd8cf..ceb7486c11421c7a17400781fe10de658040e79b 100644 (file)
@@ -1,5 +1,5 @@
 <?!("COND:ITERATE:FIRSTN", 1)><tr><td valign=top><?=("beginbox_1")><?ROOM:INFO:FLOOR:NAME><?=("beginbox_2")><?!("X", 1)>
 <?!("COND:ITERATE:ISGROUPCHANGE", 2)><?=("endbox")><br><?!("COND:ITERATE:ISGROUPCHANGE", 3, 2)></td><td valign=top> <?!("X", 3)><?=("beginbox_1")><?ROOM:INFO:FLOOR:NAME><?=("beginbox_2")><?!("X", 2)>
 &nbsp;<a href="dotgoto?room=<?ROOM:INFO:NAME("U")>"><span class="<?%("COND:ROOM:FLAG:UA", 4, #"UA_HASNEWMSGS", 0, "roomlist_new", "roomlist_old")>">
-<?ROOM:INFO:LEVELNTIMES("&nbsp;&nbsp;&nbsp;")><?ROOM:INFO:BASENAME></span></a><?%("COND:ROOM:INFO:IS_INBOX", 5, 0, 0, _"(INBOX)", "")><br />
+<?ROOM:INFO:LEVELNTIMES("&nbsp;&nbsp;&nbsp;")><?ROOM:INFO:BASENAME></span></a><?%("COND:ROOM:INFO:IS_INBOX", 5, 0, 0, _"(INBOX)", "")><br>
 <?!("COND:ITERATE:LASTN", 2)><?=("endbox")></td></tr><??("X", 3)>
index 0e71fa8f469abc352208340282692108190a8cfe..6db9f8669d06fefc58a6b47ec0717b11d8376f2c 100644 (file)
@@ -8,7 +8,7 @@
 </script>
 
 <center>
-<img src="image?name=hello"><br /><br />
+<img src="image?name=hello"><br><br>
 
 <table border="0" cellspacing="0" cellpadding="2">
 <tr>
 </tr><tr>
        <td bgcolor="#CC0000">
                <span class="menubar_link">
-               <a href="termquit" target="_top" onClick="return confirm('Do you really want to log off?');"><font color="#FFFFFF">Log&nbsp;off</span></a><br />
+               <a href="termquit" target="_top" onClick="return confirm('Do you really want to log off?');"><font color="#FFFFFF">Log&nbsp;off</span></a><br>
        </td>
 </tr>
 </table>
 
-<br /><br />
+<br><br>
 
 <a href="http://www.citadel.org"
        onMouseOver="window.status='Find out more about Citadel'; return true;"><font 
 size=-1 color="#000000">
-POWERED BY<br /></font>
+POWERED BY<br></font>
 <img src="static/citadel-logo.gif" width=75 height=76 border=0 ALT="CITADEL"></a>
 
 </center>
index 3c7c082a68afe0e9365688da7f209e1facd17c19..d895d1c5010c583264354dc2236c9b3630ce998d 100644 (file)
@@ -7,10 +7,10 @@
 <div id="content">
 <div align=center>
 <font size=+2><?_("Your start page has been changed.")></font> </div>
-<br /><br />
+<br><br>
 <div align=center>
 <i><?_("(Note: this does not change your browser's home page. It changes the page you begin on when you log on to")> <?SERV:HUMANNODE>).</i>
-<br /><br />
+<br><br>
 
 <a href="javascript:history.back()">Back...</a>
 </div>
index 06d1608ec6625bfb8861fb433a91fa6a4a09bc90..78fb7bac197d27e559ba55c3808feba2c42a7997 100644 (file)
@@ -5,10 +5,10 @@
 <?=("beginbox_2")>
 <?HELLO>
 <div class="login_infos">
-       <img src="static/openid-small.gif"><?_("Your OpenID")> <tt><?BSTR("__claimed_id", "X")></tt> <?_("was successfully verified.")><br />
+       <img src="static/openid-small.gif"><?_("Your OpenID")> <tt><?BSTR("__claimed_id", "X")></tt> <?_("was successfully verified.")><br>
 <??("COND:BSTR", 1, "__username")><?_("However, the user name")>  '<?BSTR("__claimed_id", "X")>' <?_("conflicts with an existing user.")><??("X", 1)>
-<br />
-       <?_("Please specify the user name you would like to use.")><br />
+<br>
+       <?_("Please specify the user name you would like to use.")><br>
 </div>
 <form action="openid_manual_create" method="POST"  class="box" id="login_form">
        <input type="hidden" NAME="openid_url" VALUE="<?BSTR("__claimed_id", "U")>">
index 943e84728a802c0541c4ccc133ca9ff94ee76be3..f3152dd4441d7d3d61aeb5f0fb1a4ea2118544ce 100644 (file)
@@ -2,30 +2,30 @@
 <img height="64px" alt="<?_("Room Logo")>" src="image?name=_roompic_?room=<?ROOMNAME("U")>">
 <?!("X", 1)><??("COND:THISROOM:HAVE_PIC", 2)>
        <?!("COND:ROOM:TYPE_IS", 3, #"VIEW_ADDRESSBOOK")>
-               <img class="roompic" alt="" src="static/viewcontacts_48x.gif" />
+               <img class="roompic" alt="" src="static/viewcontacts_48x.gif">
        <?!("X", 3)>
        <?!("COND:ROOM:TYPE_IS", 4, #"VIEW_CALENDAR")>
-               <img class="roompic" alt="" src="static/calarea_48x.gif" width="48" height="48" />
+               <img class="roompic" alt="" src="static/calarea_48x.gif" width="48" height="48">
         <?!("X", 4)>
        <?!("COND:ROOM:TYPE_IS", 5, #"VIEW_CALBRIEF")>
-               <img class="roompic" alt="" src="static/calarea_48x.gif" width="48" height="48" />
+               <img class="roompic" alt="" src="static/calarea_48x.gif" width="48" height="48">
        <?!("X", 5)>
        <?!("COND:ROOM:TYPE_IS", 6, #"VIEW_TASKS")>
-               <img class="roompic" alt="" src="static/taskmanag_48x.gif" width="48" height="48" />
+               <img class="roompic" alt="" src="static/taskmanag_48x.gif" width="48" height="48">
        <?!("X", 6)>
        <?!("COND:ROOM:TYPE_IS", 7, #"VIEW_NOTES")>
-               <img class="roompic" alt="" src="static/storenotes_48x.gif" width="48" height="48" />
+               <img class="roompic" alt="" src="static/storenotes_48x.gif" width="48" height="48">
         <?!("X", 7)>
        <?!("COND:ROOM:TYPE_IS", 8, #"VIEW_MAILBOX")>
-               <img class="roompic" alt="" src="static/privatemess_48x.gif" width="48" height="48" />
+               <img class="roompic" alt="" src="static/privatemess_48x.gif" width="48" height="48">
         <?!("X", 8)>
        <?!("COND:ROOM:TYPE_IS", 9, #"VIEW_BBS")>
-                <img class="roompic" alt="" src="static/chatrooms_48x.gif" width="48" height="48" />
+                <img class="roompic" alt="" src="static/chatrooms_48x.gif" width="48" height="48">
         <?!("X", 9)>
        <?!("COND:ROOM:TYPE_IS", 9, #"VIEW_JOURNAL")>
-                <img class="roompic" alt="" src="static/chatrooms_48x.gif" width="48" height="48" />
+                <img class="roompic" alt="" src="static/chatrooms_48x.gif" width="48" height="48">
         <?!("X", 9)>
        <?!("COND:ROOM:TYPE_IS", 9, #"VIEW_BLOG")>
-                <img class="roompic" alt="" src="static/chatrooms_48x.gif" width="48" height="48" />
+                <img class="roompic" alt="" src="static/chatrooms_48x.gif" width="48" height="48">
         <?!("X", 9)>
 <??("X", 2)>
index c21bacf3bd0980203593ba884ae48c38d915a89f..d9c7bb9990fa083eb5e3f58fda1242ecfa5c9b51 100644 (file)
@@ -3,4 +3,4 @@
 <??("COND:THISROOM:FLAG:QR", 1, #"QR_DIRECTORY")><img src="/static/diskette_24x.gif" alt="<?_("Has Files")>"><??("X", 1)>
 <??("COND:THISROOM:FLAG:QR", 2, #"QR_NETWORK")><img src="/static/rss_16x.png" alt="<?_("Networked Room")>"><??("X", 2)>
 </span>
-</a><br />
+</a><br>
index e9f79fd723a0976213063fcef177fccd67d95da4..567f17180e25864e5d480c8dda3200c3e95ade2c 100644 (file)
@@ -6,7 +6,7 @@
 
 <?=("beginbox_1")><?_("Zapped (forgotten) rooms")><?=("beginbox_2")>
 <?ITERATE("LZRM", ="room_zap_entry")>
-<br /><br />
+<br><br>
 <?_("Click on any room to un-zap it and goto that room.")>
 <?=("endbox")>
 </div>
index 350954e979ab0a2ebf31ae1788c20a1a0d1cbb04..c9bef994dd387ac1a751a80f6bb519ebaaab00b8 100644 (file)
@@ -1,5 +1,5 @@
 <div><div id="m<?MAIL:SUMM:N>" style="font-weight:<?%("COND:MAIL:SUMM:UNREAD", 1, 0, 0, "bold", "normal")>;" onClick="CtdlLoadMsgMouseDown(event,<?MAIL:SUMM:N>)">
 <span class="from"><?MAIL:SUMM:FROM("X")></span>
-<span style="float: right;"><?MAIL:SUMM:DATEBRIEF></span><br/>
+<span style="float: right;"><?MAIL:SUMM:DATEBRIEF></span><br>
 <span class="subject"><?MAIL:SUMM:SUBJECT("X")></span>
 </div><div id="m_<?MAIL:SUMM:N>" class="msgview" onMouseDown=""></div></div>
index aeeee683dca886ed9d89edf43e551174d6f3560b..fb3296e88c99fb570b4a1e1d86e0548413f6aef6 100644 (file)
@@ -9,14 +9,14 @@
       <??("X", 3)><?!("COND:MAIL:SUMM:OTHERNODE",4)> @ <?MAIL:SUMM:H_NODE><??("X",4)>
  <??("X", 1)>
  <?!("COND:MAIL:ANON", 4)>****<??("X", 4)>
- <?!("COND:MAIL:TO", 5)><?_("to")> <?MAIL:SUMM:TO("X")><?!("X", 5)><br/>
+ <?!("COND:MAIL:TO", 5)><?_("to")> <?MAIL:SUMM:TO("X")><?!("X", 5)><br>
 <?!("COND:MAIL:SUMM:CCCC", 6)><?_("CC:")><?MAIL:SUMM:CCCC("X")><??("X", 6)>
 <?!("COND:MAIL:SUBJ", 7)><p class="message_subject"><?_("Subject:")> <?MAIL:SUMM:SUBJECT("X")></p><??("X", 7)>
  <p id="msg<?MAIL:SUMM:N>" class="msgbuttons">
- <a href="display_enter?edit=<?MAIL:SUMM:N>&recp=<?MAIL:SUMM:TO("U")>&cc=<?MAIL:SUMM:CCCC("U")>&subject=<?MAIL:SUMM:SUBJECT("U", 0, "", "")>&force_room=_MAIL_"><span>[</span><?_("Edit")><span>]</span></a> 
+ <a href="display_enter?edit=<?MAIL:SUMM:N>?recp=<?MAIL:SUMM:TO("U")>?cc=<?MAIL:SUMM:CCCC("U")>?subject=<?MAIL:SUMM:SUBJECT("U", 0, "", "")>?force_room=_MAIL_"><span>[</span><?_("Edit")><span>]</span></a> 
 <?!("COND:ROOM:TYPE_IS", 8, #"VIEW_BBS")>
    <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re: ", "Re:")>"><span>[</span><?_("Reply")><span>]</span></a> 
-   <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?replyquote=<?MAIL:SUMM:N>&recp=%22<?MAIL:SUMM:FROM("U")>%22%3C<?MAIL:SUMM:RFCA("U")>%3E?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re: ", "Re:")>"><span>[</span><?_("ReplyQuoted")><span>]</span></a> 
+   <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?replyquote=<?MAIL:SUMM:N>?recp=%22<?MAIL:SUMM:FROM("U")>%22%3C<?MAIL:SUMM:RFCA("U")>%3E?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re: ", "Re:")>"><span>[</span><?_("ReplyQuoted")><span>]</span></a> 
 <?!("X", 8)>
 <??("COND:ROOM:TYPE_IS", 9, #"VIEW_BBS")>
        <?!("COND:MAIL:SUMM:RFCA", 10)>
index 5bad20f6adcfcd67e4d4b3e3ae149c8332f914ba..3243bced2780a26190084453c20f7c9be455cc8a 100644 (file)
@@ -1,7 +1,7 @@
 <div class="display_inline_attachment">
-<img src="display_mime_icon?type=<?MAIL:MIME:CONTENTTYPE("U")>" border=0 align=middle>
+<img src="display_mime_icon?type=<?MAIL:MIME:CONTENTTYPE("U")>" border="0" align="middle" alt="">
 <?MAIL:MIME:FILENAME("X")>  (<?MAIL:MIME:CONTENTTYPE>, <?MAIL:MIME:LENGTH> bytes) 
-<a href="mimepart_download/<?MAIL:MIME:MSGNUM>/<?MAIL:MIME:PARTNUM>/<?MAIL:MIME:FILENAME("U")>"><?_("Download")></a><br />
+<a href="mimepart_download/<?MAIL:MIME:MSGNUM>/<?MAIL:MIME:PARTNUM>/<?MAIL:MIME:FILENAME("U")>"><?_("Download")></a><br>
 <div class="display_inline_attachment_body">
 <?MAIL:MIME:DATA>
 </div>
index e15d40d1c1d20cef39668579af6ae2aa1197ae8b..d8f59378bb572b9c7f9861d4127e5c5b4d59a266 100644 (file)
@@ -1,4 +1,4 @@
-<img src="display_mime_icon?type=<?MAIL:MIME:CONTENTTYPE("U")>" border=0 align=middle>
+<img src="display_mime_icon?type=<?MAIL:MIME:CONTENTTYPE("U")>" border="0" align="middle" alt="">
 <?MAIL:MIME:FILENAME("X")>  (<?MAIL:MIME:CONTENTTYPE>, <?MAIL:MIME:LENGTH> bytes) 
 [ <a href="mimepart/<?MAIL:MIME:MSGNUM>/<?MAIL:MIME:PARTNUM>/<?MAIL:MIME:FILENAME("U")>" target="wc.<?MAIL:MIME:MSGNUM>.<?MAIL:MIME:PARTNUM>"><?_("View")></a> | 
- <a href="mimepart_download/<?MAIL:MIME:MSGNUM>/<?MAIL:MIME:PARTNUM>/<?MAIL:MIME:FILENAME("U")>"><?_("Download")></a> ]<br />
+ <a href="mimepart_download/<?MAIL:MIME:MSGNUM>/<?MAIL:MIME:PARTNUM>/<?MAIL:MIME:FILENAME("U")>"><?_("Download")></a> ]<br>
index 43b64524ff1cc7ebb5336cd8753d486e7e062a49..1078cbc0284570f44f59d202932af27f077d3c97 100644 (file)
@@ -11,7 +11,7 @@
 <??("COND:MAIL:SUMM:RFCA", 3)><??("X", 3)><?!("COND:MAIL:SUMM:OTHERNODE",3)> @ <?MAIL:SUMM:H_NODE><??("X",3)>
 <??("X", 1)>
  <?!("COND:MAIL:ANON", 4)>***<??("X", 4)>
- <?!("COND:MAIL:TO", 5)><?_("to")> <?MAIL:SUMM:TO("X")><?!("X", 5)><br/>
+ <?!("COND:MAIL:TO", 5)><?_("to")> <?MAIL:SUMM:TO("X")><?!("X", 5)><br>
 <?!("COND:MAIL:SUMM:CCCC", 6)><?_("CC:")><?MAIL:SUMM:CCCC("X")><??("X", 6)>
 <?!("COND:MAIL:SUBJ", 7)><p class="message_subject"><?_("Subject:")> <?MAIL:SUMM:SUBJECT></p><??("X", 7)>
 </div>
index e5896bf0912df736f2d9a7e77d3d464929136b3b..c160afeb064646e3c6b270ae74093a532e67097a 100644 (file)
 <!-- room -->
 </td><td>
 <?WHO:ROOM>
-<?!("WHO:REALROOM", 7)> <br /><i>  <?WHO:REALROOM("X")>  </i>  <?!("X", 7)>
+<?!("WHO:REALROOM", 7)> <br><i>  <?WHO:REALROOM("X")>  </i>  <?!("X", 7)>
 </td>
    <td class="host_col">
 <!-- hostname -->
 <?WHO:HOST("X")>
-<?!("WHO:REALHOST", 8)> <br /><i> <?WHO:REALHOST("X")></i><?!("X", 8)>
+<?!("WHO:REALHOST", 8)> <br><i> <?WHO:REALHOST("X")></i><?!("X", 8)>
 </td>
 </tr>
index 540da8ec8442939acea1b8c7b0935f699c6fd4b1..b9a256bfbb95ca7cd236dd6626f121acdf586a1e 100644 (file)
@@ -15,6 +15,6 @@
 <!-- room -->
 </td><td>
 <?WHO:ROOM>
-<?!("WHO:REALROOM", 7)> <br /><i>  <?WHO:REALROOM("X")>  </i>  <?!("X", 7)>
+<?!("WHO:REALROOM", 7)> <br><i>  <?WHO:REALROOM("X")>  </i>  <?!("X", 7)>
 </td>
 </tr>
index 9555c22cc3e2cf7c03bbccab4e7245220f46f2ad..6c938a74b3a4008d6905c76bcaffe0f32e351f24 100644 (file)
@@ -121,7 +121,7 @@ Test.Unit.Logger.prototype = {
     this.loglines = $('loglines');
   },
   _toHTML: function(txt) {
-    return txt.escapeHTML().replace(/\n/g,"<br/>");
+    return txt.escapeHTML().replace(/\n/g,"<br>");
   },
   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
+};
index 7a85697ecaad8823adb72c62b049d2a84b09d563..2c3a8fdf0bb77b3a994da3a1cdf2ea8fef07c170 100644 (file)
@@ -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 = "<div align=center><br><table border=0 cellpadding=10 bgcolor=\"#ffffff\"><tr><td><img src=\"static/throbber.gif\" /><font color=\"#AAAAAA\">&nbsp;&nbsp;Loading....</font></td></tr></table><br /></div>";
+elem.innerHTML = "<div align=center><br><table border=0 cellpadding=10 bgcolor=\"#ffffff\"><tr><td><img src=\"static/throbber.gif\" /><font color=\"#AAAAAA\">&nbsp;&nbsp;Loading....</font></td></tr></table><br></div>";
 }
 
 
@@ -616,7 +616,7 @@ function PopOpenAddressBook(target_input) {
 }
 
 function PopulateAddressBookInnerDiv(which_addr_book, target_input) {
-       $('address_book_inner_div').innerHTML = "<div align=center><br><table border=0 cellpadding=10 bgcolor=\"#ffffff\"><tr><td><img src=\"static/throbber.gif\" /><font color=\"#AAAAAA\">&nbsp;&nbsp;Loading....</font></td></tr></table><br /></div>";
+       $('address_book_inner_div').innerHTML = "<div align=center><br><table border=0 cellpadding=10 bgcolor=\"#ffffff\"><tr><td><img src=\"static/throbber.gif\" /><font color=\"#AAAAAA\">&nbsp;&nbsp;Loading....</font></td></tr></table><br></div>";
        p = 'which_addr_book=' + which_addr_book
          + '&target_input=' + target_input
          + '&r=' + CtdlRandomString();
index ad3b9081a1b0bb6a239d2a96f06963d2b7ba6b1c..8bc65275fd066bab4513bfadf56136bba748d664 100644 (file)
@@ -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<br />\n",
+               lprintf(1, "ERROR: reading template '%s' - %s<br>\n",
                        ChrPtr(NewTemplate->FileName), strerror(errno));
                //FreeWCTemplate(NewTemplate);/////tODO
                return NULL;
index 3ae86f83560f9cac50d1ed57f518b841aa458ca5..0df287f3f79effc55d5a00a7af7861d636570e0e 100644 (file)
@@ -99,7 +99,7 @@ void tasks_section(void) {
        if (calendar_summary_view() < 1) {
                wc_printf("<i>");
                wc_printf(_("(None)"));
-               wc_printf("</i><br />\n");
+               wc_printf("</i><br>\n");
        }
 }
 
@@ -151,7 +151,7 @@ void calendar_section(void) {
        if (calendar_summary_view() < 1) {
                wc_printf("<i>");
                wc_printf(_("(Nothing)"));
-               wc_printf("</i><br />\n");
+               wc_printf("</i><br>\n");
        }
        __calendar_Cleanup(&v);
 }
index 47487177eb229a369e57f9b1d2a2b396c6d74ee5..3630125b0ce3ddfec876fc3b674485de4f512aa3 100644 (file)
@@ -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.
index 930b793f9f152e804dde09dd5a5ba2fb8be475e3..dbe446a3f24df1926da67f829f35fd0d2d8a7dc7 100644 (file)
@@ -47,7 +47,7 @@ void display_edit(char *description, char *check_cmd,
        wc_printf("</textarea><div class=\"buttons\" >\n");
        wc_printf("<input type=\"submit\" name=\"save_button\" value=\"%s\">", _("Save changes"));
        wc_printf("&nbsp;");
-       wc_printf("<input type=\"submit\" name=\"cancel_button\" value=\"%s\"><br />\n", _("Cancel"));
+       wc_printf("<input type=\"submit\" name=\"cancel_button\" value=\"%s\"><br>\n", _("Cancel"));
        wc_printf("</div></form>\n");
 
        do_template("endbox", NULL);
index b9849f3391309f9791fb0c43bbece5fbdd7af6e7..440178396e7eb67dabb0ebdb19f44d4fdc205928 100644 (file)
@@ -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.
index 2f605adccf23a0b7fe504de4ad2fd7666dd6a0a3..845978a7471dc7c356dc2e2aea5b9aa3c1a10e89 100644 (file)
@@ -46,7 +46,7 @@ void userlist(void)
        serv_puts("LIST");
        serv_getln(buf, sizeof buf);
        if (buf[0] != '1') {
-               wc_printf("<em>%s</em><br />\n", &buf[4]);
+               wc_printf("<em>%s</em><br>\n", &buf[4]);
                goto DONE;
        }
 
@@ -147,7 +147,7 @@ void showuser(void)
        if (buf[0] == '1') {
                fmout("JUSTIFY");
        }
-       wc_printf("<br /><a href=\"display_page?recp=");
+       wc_printf("<br><a href=\"display_page?recp=");
        urlescputs(who);
        wc_printf("\">"
                "<img src=\"static/citadelchat_24x.gif\" "
index e17eba14b6c9350e1ab5de6aacf16f17a8c6ca8e..f5c6ebb20acc31327bd803f6b374be910b5cc9d5 100644 (file)
@@ -394,7 +394,7 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, wc_mime_att
        
                        else if (!strcasecmp(firsttoken, "email")) {
                                size_t len;
-                               if (!IsEmptyStr(mailto)) strcat(mailto, "<br />");
+                               if (!IsEmptyStr(mailto)) strcat(mailto, "<br>");
                                strcat(mailto,
                                        "<a href=\"display_enter"
                                        "?force_room=_MAIL_?recp=");
@@ -416,7 +416,7 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, wc_mime_att
                                strcat(mailto, "</A>");
                        }
                        else if (!strcasecmp(firsttoken, "tel")) {
-                               if (!IsEmptyStr(phone)) strcat(phone, "<br />");
+                               if (!IsEmptyStr(phone)) strcat(phone, "<br>");
                                strcat(phone, thisvalue);
                                for (j=0; j<num_tokens(thisname, ';'); ++j) {
                                        extract_token(buf, thisname, j, ';', sizeof buf);
@@ -444,7 +444,7 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, wc_mime_att
                                                extract_token(buf, thisvalue, j, ';', sizeof buf);
                                                if (!IsEmptyStr(buf)) {
                                                        StrEscAppend(Target, NULL, buf, 0, 0);
-                                                       if (j<3) StrBufAppendPrintf(Target, "<br />");
+                                                       if (j<3) StrBufAppendPrintf(Target, "<br>");
                                                        else StrBufAppendPrintf(Target, " ");
                                                }
                                        }
@@ -763,7 +763,7 @@ void do_addrbook_view(addrbookent *addrbook, int num_ab) {
        char **tablabels;
 
        if (num_ab == 0) {
-               wc_printf("<br /><br /><br /><div align=\"center\"><i>");
+               wc_printf("<br><br><br><div align=\"center\"><i>");
                wc_printf(_("This address book is empty."));
                wc_printf("</i></div>\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("<br /><br /><br /><div align=\"center\"><i>");
+               wc_printf("<br><br><br><div align=\"center\"><i>");
                wc_printf(_("An internal error has occurred."));
                wc_printf("</i></div>\n");
                return;
@@ -1173,14 +1173,14 @@ void do_edit_vcard(long msgnum, char *partnum,
        wc_printf("<table border=0><TR>"
                "<td valign=top>");
        wc_printf(_("Primary Internet e-mail address"));
-       wc_printf("<br />"
+       wc_printf("<br>"
                "<input type=\"text\" name=\"primary_inetemail\" "
                "size=40 maxlength=60 value=\"");
        escputs(primary_inetemail);
-       wc_printf("\"><br />"
+       wc_printf("\"><br>"
                "</td><td valign=top>");
        wc_printf(_("Internet e-mail aliases"));
-       wc_printf("<br />"
+       wc_printf("<br>"
                "<textarea name=\"other_inetemail\" rows=5 cols=40 width=40>");
        escputs(other_inetemail);
        wc_printf("</textarea></td></tr></table>\n");
index b0236838823e0f618e7056a75baa77d1ddebd7a1..da57d4723a717f8e00315d11a1e3ce1860279bd0 100644 (file)
@@ -186,7 +186,7 @@ void output_headers(        int do_httpheaders,     /* 1 = output HTTP headers                        */
                        wc_printf("<div id=\"important_message\">\n"
                                "<span class=\"imsg\">");
                        StrEscAppend(WCC->WBuf, NULL, WCC->ImportantMessage, 0, 0);
-                       wc_printf("</span><br />\n"
+                       wc_printf("</span><br>\n"
                                "</div>\n"
                        );
                        StrBufAppendBufPlain(WCC->trailing_javascript,
@@ -199,7 +199,7 @@ void output_headers(        int do_httpheaders,     /* 1 = output HTTP headers                        */
                        wc_printf("<div id=\"important_message\">\n"
                                "<span class=\"imsg\">");
                        StrEscAppend(WCC->WBuf, WCC->ImportantMsg, NULL, 0, 0);
-                       wc_printf("</span><br />\n"
+                       wc_printf("</span><br>\n"
                                "</div>\n"
                        );
                        StrBufAppendBufPlain(WCC->trailing_javascript,
index 59d2dec1a450fa6f3d24c5787a222cef03de6c2a..9900ddb02d37f6a0fd9faafdc93843cf00ecbf55 100644 (file)
@@ -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.
index db86d609d4e134e0a39c690deff0615d6f2edce6..c3df2556dfef80c3fa6824165d09b788c5112531 100644 (file)
@@ -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("<br />\n");
+               wc_printf("<br>\n");
 
                wc_printf("<form method=\"POST\" action=\"edit_me\">\n");
                wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
index 152954e22cbbd00dc236536fce606eb9fe6857e9..ff4a45a27f522d28096e3b1175d498e1f46d9c8c 100644 (file)
@@ -85,7 +85,7 @@ void display_wiki_page_backend(const StrBuf *roomname, char *pagename, char *rev
                return;
        }
 
-       wc_printf("<br /><br />"
+       wc_printf("<br><br>"
                "<div align=\"center\">"
                "<table border=\"0\" bgcolor=\"#ffffff\" cellpadding=\"10\">"
                "<tr><td align=\"center\">"