From 2f170b199ecc5f646c995c729935d87daa554ca3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wilfried=20G=C3=B6esgens?= Date: Mon, 13 Feb 2006 18:42:55 +0000 Subject: [PATCH] tolowered the embedded html. --- webcit/calendar_view.c | 207 +++++++++++++++++++------------------- webcit/siteconfig.c | 218 ++++++++++++++++++++--------------------- webcit/summary.c | 30 +++--- webcit/useredit.c | 136 ++++++++++++------------- webcit/userlist.c | 44 +++++---- webcit/vcard_edit.c | 124 +++++++++++------------ webcit/webcit.c | 14 +-- webcit/who.c | 50 +++++----- 8 files changed, 415 insertions(+), 408 deletions(-) diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c index edb16d3b3..690565c0c 100644 --- a/webcit/calendar_view.c +++ b/webcit/calendar_view.c @@ -13,16 +13,16 @@ /**\brief stub for non-libical builds */ void do_calendar_view(void) { - wprintf("
"); + wprintf("
"); wprintf(_("The calendar view is not available.")); - wprintf("

\n"); + wprintf("

\n"); } /**\brief stub for non-libical builds */ void do_tasks_view(void) { - wprintf("
"); + wprintf("
"); wprintf(_("The tasks view is not available.")); - wprintf("

\n"); + wprintf("

\n"); } #else /* WEBCIT_WITH_CALENDAR_SERVICE */ @@ -80,12 +80,12 @@ void calendar_month_view_display_events(time_t thetime) { if (p != NULL) { if (all_day_event) { - wprintf("" - "
" + wprintf("" + "
" ); } - wprintf("" + wprintf("" "", WC->disp_cal[i].cal_msgnum, bstr("calview"), @@ -95,10 +95,10 @@ void calendar_month_view_display_events(time_t thetime) { ); escputs((char *) icalproperty_get_comment(p)); - wprintf("
\n"); + wprintf("
\n"); if (all_day_event) { - wprintf("
"); + wprintf("
"); } } @@ -261,44 +261,45 @@ void calendar_month_view(int year, int month, int day) { /** Outer table (to get the background color) */ wprintf("
" - "
\n"); - wprintf("\n"); + wprintf("
\n"); - wprintf("
"); + wprintf(""); localtime_r(&previous_month, &tm); wprintf("", (int)(tm.tm_year)+1900, tm.tm_mon + 1); - wprintf("\n"); + wprintf("\n"); wc_strftime(colheader_label, sizeof colheader_label, "%B", &starting_tm); wprintf("  " - "" + "" "%s %d" - "" + "" "  ", colheader_label, year); localtime_r(&next_month, &tm); wprintf("", (int)(tm.tm_year)+1900, tm.tm_mon + 1); - wprintf("\n"); + wprintf("\n"); - wprintf("
\n"); + wprintf("
\n"); /** Inner table (the real one) */ - wprintf(""); + wprintf("
"); colheader_time = thetime; for (i=0; i<7; ++i) { colheader_time = thetime + (i * 86400) ; localtime_r(&colheader_time, &colheader_tm); wc_strftime(colheader_label, sizeof colheader_label, "%A", &colheader_tm); - wprintf("\n"); + wprintf("\n"); /** Now do 35 days */ for (i = 0; i < 35; ++i) { @@ -306,10 +307,10 @@ void calendar_month_view(int year, int month, int day) { /** Before displaying Sunday, start a new row */ if ((i % 7) == 0) { - wprintf(""); + wprintf(""); } - wprintf(""); + wprintf(""); /** After displaying Saturday, end the row */ if ((i % 7) == 6) { - wprintf("\n"); + wprintf("\n"); } thetime += (time_t)86400; /** ahead 24 hours */ } - wprintf("
" - "%s", colheader_label); + wprintf("" + "%s", colheader_label); + } - wprintf("
", + wprintf("", ((tm.tm_mon != month-1) ? "DDDDDD" : ((tm.tm_wday==0 || tm.tm_wday==6) ? "EEEECC" : "FFFFFF")) @@ -319,7 +320,7 @@ void calendar_month_view(int year, int month, int day) { wprintf("%s ", colheader_label); } wprintf("" - "%d
", + "%d
", tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, @@ -328,18 +329,18 @@ void calendar_month_view(int year, int month, int day) { /** put the data here, stupid */ calendar_month_view_display_events(thetime); - wprintf("
" /** end of inner table */ - "" /** end of outer table */ + wprintf("" /** end of inner table */ + "" /** end of outer table */ "
\n"); } @@ -386,37 +387,37 @@ void calendar_brief_month_view(int year, int month, int day) { /** Outer table (to get the background color) */ wprintf("
" - "
\n"); - wprintf("\n"); + wprintf("
\n"); - wprintf("
"); + wprintf(""); localtime_r(&previous_month, &tm); wprintf("", (int)(tm.tm_year)+1900, tm.tm_mon + 1); - wprintf("\n"); + wprintf("\n"); wc_strftime(month_label, sizeof month_label, "%B", &tm); wprintf("  " - "" + "" "%s %d" - "" + "" "  ", month_label, year); localtime_r(&next_month, &tm); wprintf("", (int)(tm.tm_year)+1900, tm.tm_mon + 1); - wprintf("\n"); + wprintf("\n"); - wprintf("
\n"); + wprintf("
\n"); /** Inner table (the real one) */ - wprintf(""); - wprintf("\n"); - wprintf("\n"); + wprintf("
\n"); + wprintf("
\n"); /** Now do 35 days */ for (i = 0; i < 35; ++i) { @@ -429,7 +430,7 @@ void calendar_brief_month_view(int year, int month, int day) { /** Before displaying Sunday, start a new CELL */ if ((i % 7) == 0) { wc_strftime(&weeknumber[0], sizeof(weeknumber), "%U", &tm); - wprintf("" + wprintf("
%s %s
" " \n", _("Week"), weeknumber, @@ -446,11 +447,11 @@ void calendar_brief_month_view(int year, int month, int day) { /** Day Header */ wc_strftime(weekday_name, sizeof weekday_name, "%A", &tm); - wprintf("\n", - daycolor, - weekday_name, - daycolor); + wprintf("\n", + daycolor, + weekday_name, + daycolor); /** put the data of one day here, stupid */ calendar_month_view_brief_events(thetime, daycolor); @@ -464,8 +465,8 @@ void calendar_brief_month_view(int year, int month, int day) { thetime += (time_t)86400; /** ahead 24 hours */ } - wprintf("
%s %s
%s%s%s%s
%s" - "
%s" + "
" /** end of inner table */ - "
" /** end of outer table */ + wprintf("" /** end of inner table */ + "" /** end of outer table */ "
\n"); } @@ -478,7 +479,7 @@ void calendar_brief_month_view(int year, int month, int day) { * \param day the day which we want to see the week around */ void calendar_week_view(int year, int month, int day) { - wprintf("
week view FIXME

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

\n"); } @@ -538,22 +539,22 @@ void calendar_day_view_display_events(int year, int month, if (p != NULL) { if (all_day_event) { - wprintf("" - "
" + wprintf("" + "
" ); } - wprintf("" + wprintf("" "", WC->disp_cal[i].cal_msgnum, year, month, day ); escputs((char *) icalproperty_get_comment(p)); - wprintf("
\n"); + wprintf("
\n"); if (all_day_event) { - wprintf("
"); + wprintf("
"); } } @@ -607,82 +608,82 @@ void calendar_day_view(int year, int month, int day) { /** Outer table (to get the background color) */ wprintf("
" - ""); /** end stuff-on-the-right */ + wprintf(""); /** end stuff-on-the-right */ - wprintf("
\n"); + "" ); - wprintf("
\n"); /** Inner table (the real one) */ - wprintf("\n"); + wprintf("
\n"); /** Innermost table (contains hours etc.) */ - wprintf("" + wprintf("
" - "" + "
\n"); /** Display events before 8:00 (hour=-1 is all-day events) */ - wprintf("" - "" - "" + "" + "\n"); + wprintf("\n"); /** Now the middle of the day... */ for (hour = daystart; hour <= dayend; ++hour) { /* could do HEIGHT=xx */ - wprintf("\n"); + wprintf("\n"); } /** Display events after 5:00... */ - wprintf("" - "" - "" + "" + "\n"); + wprintf("\n"); - wprintf("
"); + wprintf("
"); for (hour = (-1); hour <= (daystart-1); ++hour) { calendar_day_view_display_events(year, month, day, hour); } - wprintf("
"); + wprintf("
"); wprintf("", year, month, day, hour ); if (!strcasecmp(calhourformat, "24")) { - wprintf("%2d:00 ", hour); + wprintf("%2d:00 ", hour); } else { - wprintf("%d:00%s ", + wprintf("%d:00%s ", (hour <= 12 ? hour : hour-12), (hour < 12 ? "am" : "pm") ); } - wprintf(""); + wprintf(""); /* put the data here, stupid */ calendar_day_view_display_events(year, month, day, hour); - wprintf("
"); + wprintf("
"); for (hour = (dayend+1); hour <= 23; ++hour) { calendar_day_view_display_events(year, month, day, hour); } - wprintf("
" /* end of innermost table */ - "
" /* end of innermost table */ + "		"); /* begin stuff-on-the-right */ + wprintf(""); /* begin stuff-on-the-right */ /** Begin todays-date-with-left-and-right-arrows */ - wprintf("\n"); - wprintf(""); + wprintf("
\n"); + wprintf(""); /** Left arrow */ - wprintf(""); + wprintf(""); + wprintf(""); /** Today's date */ memset(&d_tm, 0, sizeof d_tm); @@ -700,26 +701,26 @@ void calendar_day_view(int year, int month, int day) { wprintf("%s", d_str); /** Right arrow */ - wprintf(""); + wprintf("\n"); + wprintf(""); - wprintf("
"); + wprintf(""); wprintf("", yesterday.year, yesterday.month, yesterday.day); - wprintf(""); - wprintf(""); + wprintf(""); wprintf("", tomorrow.year, tomorrow.month, tomorrow.day); - wprintf("\n"); - wprintf("
\n"); + wprintf("
\n"); /** End todays-date-with-left-and-right-arrows */ /** \todo In the future we might want to put a month-o-matic here */ - wprintf("\n"); + wprintf("\n"); - wprintf("
" /** end of inner table */ - "
" /** end of outer table */ + wprintf("" /** end of inner table */ + "" /** end of outer table */ ); @@ -925,11 +926,11 @@ void do_tasks_view(void) { wprintf("
" "\n\n" - "\n" + wprintf("\n" ); /** Sort them if necessary */ @@ -944,7 +945,7 @@ void do_tasks_view(void) { if (WC->num_cal) for (i=0; i<(WC->num_cal); ++i) { bg = 1 - bg; - wprintf("\n"); + wprintf("\n"); + wprintf("\n"); due = get_task_due_date(WC->disp_cal[i].cal); fmt_date(buf, due, 0); - wprintf("\n", buf); + wprintf(">%s\n", buf); } wprintf("
"); + ""); wprintf(_("Name of task")); - wprintf(""); + wprintf(""); wprintf(_("Date due")); - wprintf("
", + wprintf("
", (bg ? "DDDDDD" : "FFFFFF") ); @@ -954,21 +955,21 @@ void do_tasks_view(void) { WC->disp_cal[i].cal_msgnum ); urlescputs(WC->wc_roomname); wprintf("\">"); - wprintf(" "); + wprintf(" "); if (p != NULL) { escputs((char *)icalproperty_get_comment(p)); } - wprintf("\n"); - wprintf("%s
\n"); diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c index e458a5074..17a7c3cd4 100644 --- a/webcit/siteconfig.c +++ b/webcit/siteconfig.c @@ -33,22 +33,22 @@ void display_siteconfig(void) output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n" - "
" - ""); + "
" + ""); wprintf(_("Site configuration")); - wprintf("" - "
\n" + wprintf("" + "
\n" "
\n
\n" ); serv_printf("CONF get"); serv_getln(buf, sizeof buf); if (buf[0] != '1') { - wprintf("
"); - wprintf(""); + wprintf("
"); + wprintf(""); wprintf(_("Error")); - wprintf("\n"); - wprintf("

\n"); + wprintf("\n"); + wprintf("

\n"); wprintf("%s
\n", &buf[4]); wDumpContent(1); return; @@ -108,182 +108,182 @@ void display_siteconfig(void) while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { switch (i++) { case 0: - sprintf(&general[strlen(general)], ""); + sprintf(&general[strlen(general)], ""); sprintf(&general[strlen(general)], _("Node name")); - sprintf(&general[strlen(general)], ""); - sprintf(&general[strlen(general)], "", buf); - sprintf(&general[strlen(general)], "\n"); + sprintf(&general[strlen(general)], ""); + sprintf(&general[strlen(general)], "", buf); + sprintf(&general[strlen(general)], "\n"); break; case 1: - sprintf(&general[strlen(general)], ""); + sprintf(&general[strlen(general)], ""); sprintf(&general[strlen(general)], _("Fully qualified domain name")); - sprintf(&general[strlen(general)], ""); - sprintf(&general[strlen(general)], "", buf); - sprintf(&general[strlen(general)], "\n"); + sprintf(&general[strlen(general)], ""); + sprintf(&general[strlen(general)], "", buf); + sprintf(&general[strlen(general)], "\n"); break; case 2: - sprintf(&general[strlen(general)], ""); + sprintf(&general[strlen(general)], ""); sprintf(&general[strlen(general)], _("Human-readable node name")); - sprintf(&general[strlen(general)], ""); - sprintf(&general[strlen(general)], "", buf); - sprintf(&general[strlen(general)], "\n"); + sprintf(&general[strlen(general)], ""); + sprintf(&general[strlen(general)], "", buf); + sprintf(&general[strlen(general)], "\n"); break; case 3: - sprintf(&general[strlen(general)], ""); + sprintf(&general[strlen(general)], ""); sprintf(&general[strlen(general)], _("Telephone number")); - sprintf(&general[strlen(general)], ""); - sprintf(&general[strlen(general)], "", buf); - sprintf(&general[strlen(general)], "\n"); + sprintf(&general[strlen(general)], ""); + sprintf(&general[strlen(general)], "", buf); + sprintf(&general[strlen(general)], "\n"); break; case 4: - sprintf(&access[strlen(access)], ""); + sprintf(&access[strlen(access)], ""); sprintf(&access[strlen(access)], _("Automatically grant room-aide status to users who create private rooms")); - sprintf(&access[strlen(access)], ""); - sprintf(&access[strlen(access)], "", - ((atoi(buf) != 0) ? "CHECKED" : "")); - sprintf(&access[strlen(access)], "\n"); + sprintf(&access[strlen(access)], ""); + sprintf(&access[strlen(access)], "", + ((atoi(buf) != 0) ? "checked" : "")); + sprintf(&access[strlen(access)], "\n"); break; case 5: - sprintf(&tuning[strlen(tuning)], ""); + sprintf(&tuning[strlen(tuning)], ""); sprintf(&tuning[strlen(tuning)], _("Server connection idle timeout (in seconds)")); - sprintf(&tuning[strlen(tuning)], ""); - sprintf(&tuning[strlen(tuning)], "", buf); - sprintf(&tuning[strlen(tuning)], "\n"); + sprintf(&tuning[strlen(tuning)], ""); + sprintf(&tuning[strlen(tuning)], "", buf); + sprintf(&tuning[strlen(tuning)], "\n"); break; case 6: - sprintf(&access[strlen(access)], ""); + sprintf(&access[strlen(access)], ""); sprintf(&access[strlen(access)], _("Initial access level for new users")); - sprintf(&access[strlen(access)], ""); - sprintf(&access[strlen(access)], "\n"); for (j=0; j<=6; ++j) { - sprintf(&access[strlen(access)], "\n", - ((atoi(buf) == j) ? "SELECTED" : ""), + sprintf(&access[strlen(access)], "\n", + ((atoi(buf) == j) ? "selected" : ""), j, j, axdefs[j] ); } - sprintf(&access[strlen(access)], ""); - sprintf(&access[strlen(access)], "\n"); + sprintf(&access[strlen(access)], ""); + sprintf(&access[strlen(access)], "\n"); break; case 7: - sprintf(&access[strlen(access)], ""); + sprintf(&access[strlen(access)], ""); sprintf(&access[strlen(access)], _("Require registration for new users")); - sprintf(&access[strlen(access)], ""); - sprintf(&access[strlen(access)], "", - ((atoi(buf) != 0) ? "CHECKED" : "")); - sprintf(&access[strlen(access)], "\n"); + sprintf(&access[strlen(access)], ""); + sprintf(&access[strlen(access)], "", + ((atoi(buf) != 0) ? "checked" : "")); + sprintf(&access[strlen(access)], "\n"); break; case 8: - sprintf(&access[strlen(access)], ""); + sprintf(&access[strlen(access)], ""); sprintf(&access[strlen(access)], _("Quarantine messages from problem users")); - sprintf(&access[strlen(access)], ""); - sprintf(&access[strlen(access)], "", - ((atoi(buf) != 0) ? "CHECKED" : "")); - sprintf(&access[strlen(access)], "\n"); + sprintf(&access[strlen(access)], ""); + sprintf(&access[strlen(access)], "", + ((atoi(buf) != 0) ? "checked" : "")); + sprintf(&access[strlen(access)], "\n"); break; case 9: - sprintf(&access[strlen(access)], ""); + sprintf(&access[strlen(access)], ""); sprintf(&access[strlen(access)], _("Name of quarantine room")); - sprintf(&access[strlen(access)], ""); - sprintf(&access[strlen(access)], "", buf); - sprintf(&access[strlen(access)], "\n"); + sprintf(&access[strlen(access)], ""); + sprintf(&access[strlen(access)], "", buf); + sprintf(&access[strlen(access)], "\n"); break; case 10: - sprintf(&general[strlen(general)], ""); + sprintf(&general[strlen(general)], ""); sprintf(&general[strlen(general)], _("Paginator prompt (for text mode clients)")); - sprintf(&general[strlen(general)], ""); - sprintf(&general[strlen(general)], "", buf); - sprintf(&general[strlen(general)], "\n"); + sprintf(&general[strlen(general)], ""); + sprintf(&general[strlen(general)], "", buf); + sprintf(&general[strlen(general)], "\n"); break; case 11: - sprintf(&access[strlen(access)], ""); + sprintf(&access[strlen(access)], ""); sprintf(&access[strlen(access)], _("Restrict access to Internet mail")); - sprintf(&access[strlen(access)], ""); - sprintf(&access[strlen(access)], "", - ((atoi(buf) != 0) ? "CHECKED" : "")); - sprintf(&access[strlen(access)], "\n"); + sprintf(&access[strlen(access)], ""); + sprintf(&access[strlen(access)], "", + ((atoi(buf) != 0) ? "checked" : "")); + sprintf(&access[strlen(access)], "\n"); break; case 12: - sprintf(&general[strlen(general)], ""); + sprintf(&general[strlen(general)], ""); sprintf(&general[strlen(general)], _("Geographic location of this system")); - sprintf(&general[strlen(general)], ""); - sprintf(&general[strlen(general)], "", buf); - sprintf(&general[strlen(general)], "\n"); + sprintf(&general[strlen(general)], ""); + sprintf(&general[strlen(general)], "", buf); + sprintf(&general[strlen(general)], "\n"); break; case 13: - sprintf(&general[strlen(general)], ""); + sprintf(&general[strlen(general)], ""); sprintf(&general[strlen(general)], _("Name of system administrator")); - sprintf(&general[strlen(general)], ""); - sprintf(&general[strlen(general)], "", buf); - sprintf(&general[strlen(general)], "\n"); + sprintf(&general[strlen(general)], ""); + sprintf(&general[strlen(general)], "", buf); + sprintf(&general[strlen(general)], "\n"); break; case 14: - sprintf(&tuning[strlen(tuning)], ""); + sprintf(&tuning[strlen(tuning)], ""); sprintf(&tuning[strlen(tuning)], _("Maximum concurrent sessions (0 = no limit)")); - sprintf(&tuning[strlen(tuning)], ""); - sprintf(&tuning[strlen(tuning)], "", buf); - sprintf(&tuning[strlen(tuning)], "\n"); + sprintf(&tuning[strlen(tuning)], ""); + sprintf(&tuning[strlen(tuning)], "", buf); + sprintf(&tuning[strlen(tuning)], "\n"); break; case 16: - sprintf(&tuning[strlen(tuning)], ""); + sprintf(&tuning[strlen(tuning)], ""); sprintf(&tuning[strlen(tuning)], _("Default user purge time (days)")); - sprintf(&tuning[strlen(tuning)], ""); - sprintf(&tuning[strlen(tuning)], "", buf); - sprintf(&tuning[strlen(tuning)], "\n"); + sprintf(&tuning[strlen(tuning)], ""); + sprintf(&tuning[strlen(tuning)], "", buf); + sprintf(&tuning[strlen(tuning)], "\n"); break; case 17: - sprintf(&tuning[strlen(tuning)], ""); + sprintf(&tuning[strlen(tuning)], ""); sprintf(&tuning[strlen(tuning)], _("Default room purge time (days)")); - sprintf(&tuning[strlen(tuning)], ""); - sprintf(&tuning[strlen(tuning)], "", buf); - sprintf(&tuning[strlen(tuning)], "\n"); + sprintf(&tuning[strlen(tuning)], ""); + sprintf(&tuning[strlen(tuning)], "", buf); + sprintf(&tuning[strlen(tuning)], "\n"); break; case 18: - sprintf(&access[strlen(access)], ""); + sprintf(&access[strlen(access)], ""); sprintf(&access[strlen(access)], _("Name of room to log pages")); - sprintf(&access[strlen(access)], ""); - sprintf(&access[strlen(access)], "", buf); - sprintf(&access[strlen(access)], "\n"); + sprintf(&access[strlen(access)], ""); + sprintf(&access[strlen(access)], "", buf); + sprintf(&access[strlen(access)], "\n"); break; case 19: - sprintf(&access[strlen(access)], ""); + sprintf(&access[strlen(access)], ""); sprintf(&access[strlen(access)], _("Access level required to create rooms")); - sprintf(&access[strlen(access)], ""); - sprintf(&access[strlen(access)], "\n"); for (j=0; j<=6; ++j) { - sprintf(&access[strlen(access)], "\n", - ((atoi(buf) == j) ? "SELECTED" : ""), + sprintf(&access[strlen(access)], "\n", + ((atoi(buf) == j) ? "selected" : ""), j, j, axdefs[j] ); } - sprintf(&access[strlen(access)], ""); - sprintf(&access[strlen(access)], "\n"); + sprintf(&access[strlen(access)], ""); + sprintf(&access[strlen(access)], "\n"); break; case 20: - sprintf(&tuning[strlen(tuning)], ""); + sprintf(&tuning[strlen(tuning)], ""); sprintf(&tuning[strlen(tuning)], _("Maximum message length")); - sprintf(&tuning[strlen(tuning)], ""); - sprintf(&tuning[strlen(tuning)], "", buf); - sprintf(&tuning[strlen(tuning)], "\n"); + sprintf(&tuning[strlen(tuning)], ""); + sprintf(&tuning[strlen(tuning)], "", buf); + sprintf(&tuning[strlen(tuning)], "\n"); break; case 21: - sprintf(&tuning[strlen(tuning)], ""); + sprintf(&tuning[strlen(tuning)], ""); sprintf(&tuning[strlen(tuning)], _("Minimum number of worker threads")); - sprintf(&tuning[strlen(tuning)], ""); - sprintf(&tuning[strlen(tuning)], "", buf); - sprintf(&tuning[strlen(tuning)], "\n"); + sprintf(&tuning[strlen(tuning)], ""); + sprintf(&tuning[strlen(tuning)], "", buf); + sprintf(&tuning[strlen(tuning)], "\n"); break; case 22: - sprintf(&tuning[strlen(tuning)], ""); + sprintf(&tuning[strlen(tuning)], ""); sprintf(&tuning[strlen(tuning)], _("Maximum number of worker threads")); - sprintf(&tuning[strlen(tuning)], ""); - sprintf(&tuning[strlen(tuning)], "", buf); - sprintf(&tuning[strlen(tuning)], "\n"); + sprintf(&tuning[strlen(tuning)], ""); + sprintf(&tuning[strlen(tuning)], "", buf); + sprintf(&tuning[strlen(tuning)], "\n"); break; case 23: - sprintf(&network[strlen(network)], ""); + sprintf(&network[strlen(network)], ""); sprintf(&network[strlen(network)], _("POP3 listener port (-1 to disable)")); - sprintf(&network[strlen(network)], ""); - sprintf(&network[strlen(network)], "", buf); + sprintf(&network[strlen(network)], ""); + sprintf(&network[strlen(network)], "", buf); sprintf(&network[strlen(network)], "\n"); break; case 24: diff --git a/webcit/summary.c b/webcit/summary.c index b7b9084b5..3d9940389 100644 --- a/webcit/summary.c +++ b/webcit/summary.c @@ -53,7 +53,7 @@ void new_messages_section(void) { number_of_rooms_to_check = num_tokens(rooms_to_check, '|'); if (number_of_rooms_to_check == 0) return; - wprintf("\n"); + wprintf("
\n"); for (i=0; i\n", + wprintf("\n", extract_int(&buf[4], 1), extract_int(&buf[4], 2) ); } } - wprintf("
"); escputs(room); - wprintf("%d/%d
%d/%d
\n"); + wprintf("\n"); do_template("endbox"); } @@ -131,9 +131,9 @@ void tasks_section(void) { calendar_summary_view(); #else /* WEBCIT_WITH_CALENDAR_SERVICE */ - wprintf(""); + wprintf(""); wprintf(_("(This server does not support task lists)")); - wprintf("\n"); + wprintf("\n"); #endif /* WEBCIT_WITH_CALENDAR_SERVICE */ do_template("endbox"); } @@ -172,9 +172,9 @@ void calendar_section(void) { } #else /* WEBCIT_WITH_CALENDAR_SERVICE */ - wprintf(""); + wprintf(""); wprintf(_("(This server does not support calendars)")); - wprintf("\n"); + wprintf("\n"); #endif /* WEBCIT_WITH_CALENDAR_SERVICE */ do_template("endbox"); } @@ -251,19 +251,19 @@ void summary(void) { output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n"); - wprintf("" - "
" - "" + wprintf("" + "
" + "" ); snprintf(title, sizeof title, _("Summary page for %s"), WC->wc_fullname); escputs(title); - wprintf("\n"); - wprintf(""); + wprintf("\n"); + wprintf(""); output_date(); - wprintf("
"); + wprintf("
"); offer_start_page(); - wprintf("
\n"); + wprintf("
\n"); /** * You guessed it ... we're going to refresh using ajax. diff --git a/webcit/useredit.c b/webcit/useredit.c index f8a685513..265f91587 100644 --- a/webcit/useredit.c +++ b/webcit/useredit.c @@ -35,7 +35,7 @@ void select_user_to_edit(char *message, char *preselect) if (message != NULL) wprintf(message); - wprintf("
\n"); + wprintf("
\n"); svprintf("BOXTITLE", WCS_STRING, _("Add users")); do_template("beginbox"); @@ -44,15 +44,15 @@ void select_user_to_edit(char *message, char *preselect) "user name in the box below and click 'Create'.")); wprintf("

"); - wprintf("
\n"); + wprintf("
\n"); wprintf(_("New user: ")); wprintf("
\n" "" - "
\n", _("Create")); + "
\n", _("Create")); do_template("endbox"); - wprintf("		"); + wprintf(""); svprintf("BOXTITLE", WCS_STRING, _("Edit or Delete users")); do_template("beginbox"); @@ -61,33 +61,33 @@ void select_user_to_edit(char *message, char *preselect) "name from the list and click 'Edit'.")); wprintf("

"); - wprintf("
" - "
\n"); - wprintf("\n"); serv_puts("LIST"); serv_getln(buf, sizeof buf); if (buf[0] == '1') { while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { extract_token(username, buf, 0, '|', sizeof username); - wprintf(""); escputs(username); wprintf("\n"); } } - wprintf("
\n"); + wprintf("
\n"); wprintf("", _("Edit configuration")); wprintf("", _("Edit address book entry")); wprintf("", _("Delete user"), _("Delete this user?")); - wprintf("
\n"); + wprintf("\n"); do_template("endbox"); - wprintf("
\n"); + wprintf("
\n"); wDumpContent(1); } @@ -189,7 +189,7 @@ void display_edit_address_book_entry(char *username, long usernum) { serv_getln(buf, sizeof buf); if (buf[0] != '2') { sprintf(error_message, - "" + "" "%s

\n", &buf[4]); select_user_to_edit(error_message, username); return; @@ -200,7 +200,7 @@ void display_edit_address_book_entry(char *username, long usernum) { if (vcard_msgnum < 0) { sprintf(error_message, - "%s

\n", + "%s

\n", _("An error occurred while trying to create or edit this address book entry.") ); select_user_to_edit(error_message, username); @@ -250,7 +250,7 @@ void display_edituser(char *supplied_username, int is_new) { serv_getln(buf, sizeof buf); if (buf[0] != '2') { sprintf(error_message, - "" + "" "%s

\n", &buf[4]); select_user_to_edit(error_message, username); return; @@ -278,109 +278,109 @@ void display_edituser(char *supplied_username, int is_new) { output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n"); - wprintf("
"); - wprintf(""); + wprintf("
"); + wprintf(""); wprintf(_("Edit user account: ")); escputs(username); - wprintf("
\n"); + wprintf("
\n"); wprintf("
\n
\n"); wprintf("
" "
\n"); - wprintf("
\n" - "\n" + "\n"); - wprintf("\n" - "\n", + wprintf("\n" + "\n", is_new, usernum); - wprintf("\n", flags); + wprintf("\n", flags); - wprintf("
"); + wprintf("
"); - wprintf("\n"); + wprintf("\" maxlength=\"20\">\n"); wprintf("\n"); - wprintf("\n"); + wprintf("\" maxlength=\"6\">\n"); - wprintf("\n"); + wprintf("\" maxlength=\"6\">\n"); - wprintf("\n"); + wprintf("\n"); - wprintf("\n"); + wprintf("\" maxlength=\"7\">\n"); now = time(NULL); - wprintf(""); + wprintf(""); - wprintf("\n"); + wprintf("\" maxlength=\"5\">\n"); - wprintf("
"); + wprintf("
"); wprintf(_("Password")); - wprintf("" - "" + "
"); wprintf(_("Permission to send Internet mail")); wprintf(""); wprintf("
"); + wprintf("
"); wprintf(_("Number of logins")); - wprintf("" - "" + "
"); + wprintf("
"); wprintf(_("Messages submitted")); - wprintf("" - "" + "
"); + wprintf("
"); wprintf(_("Access level")); - wprintf("" - "" + "
"); + wprintf("
"); wprintf(_("User ID number")); - wprintf("" - "" + "
"); + wprintf("
"); wprintf(_("Date and time of last login")); - wprintf("" - "" + "
"); + wprintf("
"); wprintf(_("Auto-purge after this many days")); - wprintf("" - "" + "
\n"); + wprintf("
\n"); - wprintf("\n" + wprintf("\n" " " - "\n" - "

\n", _("Save changes"), _("Cancel")); + "\n" + "

\n", _("Save changes"), _("Cancel")); - wprintf("\n"); + wprintf("\n"); wprintf("
\n"); wDumpContent(1); @@ -424,7 +424,7 @@ void edituser(void) { serv_getln(buf, sizeof buf); if (buf[0] != '2') { sprintf(message, - "" + "" "%s

\n", &buf[4]); } else { @@ -456,7 +456,7 @@ void delete_user(char *username) { serv_getln(buf, sizeof buf); if (buf[0] != '2') { sprintf(message, - "" + "" "%s

\n", &buf[4]); } else { @@ -488,7 +488,7 @@ void create_user(void) { } else { sprintf(error_message, - "" + "" "%s

\n", &buf[4]); select_user_to_edit(error_message, NULL); } diff --git a/webcit/userlist.c b/webcit/userlist.c index a5a59103d..cbd6c669a 100644 --- a/webcit/userlist.c +++ b/webcit/userlist.c @@ -43,26 +43,32 @@ void userlist(void) } output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n" - "
" - ""); + "
" + ""); snprintf(title, sizeof title, _("User list for %s"), serv_info.serv_humannode); escputs(title); - wprintf("" - "
\n" + wprintf("" + "
\n" "
\n
\n" ); serv_puts("LIST"); serv_getln(buf, sizeof buf); if (buf[0] != '1') { - wprintf("%s
\n", &buf[4]); + wprintf("%s
\n", &buf[4]); goto DONE; } wprintf("
" "" - "")); + wprintf("" + "", + _("User Name"), + _("Number"), + _("Access Level"), + _("Last Login"), + _("Total Logins"), + _("Total Posts")); while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { extract_token(fl, buf, 0, '|', sizeof fl); @@ -72,7 +78,7 @@ void userlist(void) has_bio = 1; } bg = 1 - bg; - wprintf("\n", + wprintf("\n", extract_long(buf, 4), extract_long(buf, 5)); } @@ -117,12 +123,12 @@ void showuser(void) output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n" - "
\n"); - wprintf(_("
User NameNumberAccess LevelLast LoginTotal LoginsTotal Posts
%s%s%s%s%s%s
", + wprintf("
", (bg ? "DDDDDD" : "FFFFFF") ); if (has_bio) { @@ -84,7 +90,7 @@ void userlist(void) } else { escputs(fl); } - wprintf("%ld%d", + wprintf("%ld%d", extract_long(buf, 2), extract_int(buf, 1)); lc = extract_long(buf, 3); @@ -95,7 +101,7 @@ void userlist(void) (tmbuf.tm_year + 1900)); - wprintf("%ld%5ld
%ld%5ld
" - "" - "
"); + "" + "" + "
"); wprintf(_("User profile")); - wprintf("" - "
\n" + wprintf("" + "
\n" "
\n
\n" ); @@ -139,13 +145,13 @@ void showuser(void) have_pic = 0; } - wprintf("
"); + wprintf("
"); if (have_pic == 1) { wprintf(""); } - wprintf("

%s

\n", who); + wprintf("

%s

\n", who); serv_printf("RBIO %s", who); serv_getln(buf, sizeof buf); if (buf[0] == '1') { @@ -155,10 +161,10 @@ void showuser(void) urlescputs(who); wprintf("\">" "  "); + "align=middle border=0>  "); snprintf(buf, sizeof buf, _("Click here to send an instant message to %s"), who); escputs(buf); - wprintf("\n"); + wprintf("\n"); wprintf("
\n"); wDumpContent(1); diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c index b35374776..dae082e8e 100644 --- a/webcit/vcard_edit.c +++ b/webcit/vcard_edit.c @@ -178,41 +178,41 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) { /** Display the form */ output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n" - "
" - "" + "
" + "" ""); wprintf(_("Edit contact information")); - wprintf("" - "
\n" + wprintf("" + "
\n" "
\n
\n" ); - wprintf("
\n"); + wprintf("\n"); wprintf("
" "
\n"); - wprintf("" - "" - "" - "" - "" - "\n", + wprintf("
%s%s%s%s%s
" + "" + "" + "" + "" + "\n", _("Prefix"), _("First"), _("Middle"), _("Last"), _("Suffix") ); - wprintf("", + wprintf("", prefix); - wprintf("", + wprintf("", firstname); - wprintf("", + wprintf("", middlename); - wprintf("", + wprintf("", lastname); - wprintf("
%s%s%s%s%s
\n", + wprintf("
\n", suffix); wprintf(""); @@ -220,22 +220,22 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) { wprintf(_("Display name:")); wprintf("
" - "

\n", + "

\n", fullname ); wprintf(_("Title:")); wprintf("
" - "

\n", + "

\n", title ); wprintf(_("Organization:")); wprintf("
" - "

\n", + "

\n", org ); @@ -245,93 +245,93 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) { wprintf("\n", + "\n", pobox); wprintf("\n", + "\n", extadr); wprintf("\n", + "\n", street); wprintf("\n", + "\n", city); wprintf("\n", + "\n", state); wprintf("\n", + "\n", zipcode); wprintf("\n", + "\n", country); wprintf("
"); wprintf(_("PO box:")); wprintf("" - "
"); wprintf(_("Address:")); wprintf("" - "
" - "
"); wprintf(_("City:")); wprintf("" - "
"); wprintf(_("State:")); wprintf("" - "
"); wprintf(_("ZIP code:")); wprintf("" - "
"); wprintf(_("Country:")); wprintf("" - "
\n"); wprintf("\n"); - wprintf("" + "
"); + wprintf("" - "\n", + wprintf("" + "\n", hometel); - wprintf("" - "
"); wprintf(_("Home telephone:")); - wprintf(""); + wprintf(""); wprintf(_("Work telephone:")); - wprintf("
\n", + wprintf("
\n", worktel); wprintf(""); wprintf("
"); - wprintf("" - "
"); + wprintf("" + "
"); wprintf(_("Primary Internet e-mail address")); wprintf("
" - "
" - "		"); + ""); wprintf(_("Internet e-mail aliases")); wprintf("
" - "
\n"); + wprintf("
\n"); wprintf("
\n"); - wprintf("\n"); - wprintf("\n"); - wprintf("
\n" - "" + wprintf("
\n" + "" " " - "" - "
\n", + "" + "
\n", _("Save changes"), _("Cancel") ); diff --git a/webcit/webcit.c b/webcit/webcit.c index 91b3096a5..f278f50b3 100644 --- a/webcit/webcit.c +++ b/webcit/webcit.c @@ -445,8 +445,8 @@ void output_headers( int do_httpheaders, /**< 1 = output HTTP headers /** check for ImportantMessages (these display in a div overlaying the main screen) */ if (strlen(WC->ImportantMessage) > 0) { wprintf("
\n"); - wprintf("" - "%s
\n", WC->ImportantMessage); + wprintf("" + "%s
\n", WC->ImportantMessage); wprintf("
\n"); wprintf("