From bc17ed696720ce8a4726f6aaa70171f061319763 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Fri, 4 Nov 2005 04:45:24 +0000 Subject: [PATCH] * Removed all of the absolute URL's. --- webcit/ChangeLog | 3 + webcit/auth.c | 4 +- webcit/calendar.c | 24 ++++---- webcit/calendar_view.c | 18 +++--- webcit/event.c | 2 +- webcit/floors.c | 8 +-- webcit/html2html.c | 2 +- webcit/iconbar.c | 80 +++++++++++++-------------- webcit/inetconf.c | 4 +- webcit/listsub.c | 6 +- webcit/mainmenu.c | 58 ++++++++++---------- webcit/messages.c | 60 ++++++++++---------- webcit/netconf.c | 16 +++--- webcit/notes.c | 2 +- webcit/paging.c | 8 +-- webcit/preferences.c | 2 +- webcit/roomops.c | 122 ++++++++++++++++++++--------------------- webcit/rss.c | 4 +- webcit/setup_wizard.c | 4 +- webcit/siteconfig.c | 38 ++++++------- webcit/summary.c | 4 +- webcit/useredit.c | 8 +-- webcit/userlist.c | 10 ++-- webcit/vcard_edit.c | 4 +- webcit/webcit.c | 6 +- webcit/who.c | 2 +- 26 files changed, 251 insertions(+), 248 deletions(-) diff --git a/webcit/ChangeLog b/webcit/ChangeLog index fa527c947..27a76647e 100644 --- a/webcit/ChangeLog +++ b/webcit/ChangeLog @@ -1,5 +1,8 @@ $Id$ +Thu Nov 3 23:44:55 EST 2005 ajc +* Removed all of the absolute URL's. + Thu Nov 3 11:11:37 EST 2005 ajc * Removed the 'mark message as seen' C code (in the mailbox view) because it was no longer getting called. Implemented this in JavaScript using an ajax diff --git a/webcit/auth.c b/webcit/auth.c index 92b0e813e..3c0058bf4 100644 --- a/webcit/auth.c +++ b/webcit/auth.c @@ -241,7 +241,7 @@ void do_logout(void) ); } - wprintf("
Log in again   " + wprintf("
Log in again   " ""); wprintf(_("Close window")); wprintf("\n"); @@ -326,7 +326,7 @@ void validate(void) wprintf(_("Select access level for this user:")); wprintf("
\n"); for (a = 0; a <= 6; ++a) { - wprintf("%s   \n", a, axdefs[a]); diff --git a/webcit/calendar.c b/webcit/calendar.c index 1836a2fea..e1453d4bf 100644 --- a/webcit/calendar.c +++ b/webcit/calendar.c @@ -84,7 +84,7 @@ void cal_process_object(icalcomponent *cal, case ICAL_METHOD_REQUEST: wprintf("\n" "" + "src=\"static/calarea_48x.gif\">" "  " ""); wprintf(_("Meeting invitation")); @@ -93,7 +93,7 @@ void cal_process_object(icalcomponent *cal, case ICAL_METHOD_REPLY: wprintf("\n" "" + "src=\"static/calarea_48x.gif\">" "  " ""); wprintf(_("Attendee's reply to your invitation")); @@ -102,7 +102,7 @@ void cal_process_object(icalcomponent *cal, case ICAL_METHOD_PUBLISH: wprintf("\n" "" + "src=\"static/calarea_48x.gif\">" "  " ""); wprintf(_("Published event")); @@ -249,11 +249,11 @@ void cal_process_object(icalcomponent *cal, /* Display the Accept/Decline buttons */ wprintf("How would you like to respond to this invitation?" "" - "%s" + "%s" " | " - "%s" + "%s" " | " - "%s" + "%s" "\n", msgnum, cal_partnum, _("Accept"), msgnum, cal_partnum, _("Tentative"), @@ -277,9 +277,9 @@ void cal_process_object(icalcomponent *cal, wprintf("" "%s" "" - "%s" + "%s" " | " - "%s" + "%s" "" "\n", _("Click Update to accept this reply and update your calendar."), @@ -372,7 +372,7 @@ void respond_to_request(void) { "%s\n", &buf[4]); } - wprintf("wc_roomname); wprintf("\">
"); wprintf(_("Return to messages")); @@ -426,7 +426,7 @@ void handle_rsvp(void) { "%s\n", &buf[4]); } - wprintf("wc_roomname); wprintf("\">
"); wprintf(_("Return to messages")); @@ -505,7 +505,7 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) { output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n" "" - "" + "" ""); /* Today's date */ @@ -425,7 +425,7 @@ void calendar_day_view(int year, int month, int day) { wprintf(""); @@ -653,12 +653,12 @@ void do_tasks_view(void) { p = icalcomponent_get_first_property(WC->disp_cal[i].cal, ICAL_SUMMARY_PROPERTY); - wprintf("disp_cal[i].cal_msgnum ); urlescputs(WC->wc_roomname); wprintf("\">"); wprintf(" "); + "src=\"static/taskmanag_16x.gif\" BORDER=0> "); if (p != NULL) { escputs((char *)icalproperty_get_comment(p)); } diff --git a/webcit/event.c b/webcit/event.c index ea1ef3994..39aa58ce0 100644 --- a/webcit/event.c +++ b/webcit/event.c @@ -118,7 +118,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum) wprintf("SEQUENCE == %d
\n", sequence); *************************************************************/ - wprintf("\n"); + wprintf("\n"); wprintf("\n", msgnum); diff --git a/webcit/floors.c b/webcit/floors.c index 0813efac6..b67e47001 100644 --- a/webcit/floors.c +++ b/webcit/floors.c @@ -71,20 +71,20 @@ void display_floorconfig(char *prepend_html) wprintf(""); wprintf("" - "
"); wprintf(_("Edit task")); wprintf("" @@ -516,7 +516,7 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) { wprintf("
" "
"); - wprintf("
\n"); + wprintf("\n"); wprintf("\n", msgnum); diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c index 4d05750e6..5276039f1 100644 --- a/webcit/calendar_view.c +++ b/webcit/calendar_view.c @@ -79,7 +79,7 @@ void calendar_month_view_display_events(time_t thetime) { } wprintf("" - "", + "", WC->disp_cal[i].cal_msgnum, bstr("calview"), bstr("year"), @@ -151,7 +151,7 @@ void calendar_month_view(int year, int month, int day) { localtime_r(&previous_month, &tm); wprintf("", (int)(tm.tm_year)+1900, tm.tm_mon + 1); - wprintf("\n"); + wprintf("\n"); wprintf("  " "" @@ -162,7 +162,7 @@ void calendar_month_view(int year, int month, int day) { localtime_r(&next_month, &tm); wprintf("", (int)(tm.tm_year)+1900, tm.tm_mon + 1); - wprintf("\n"); + wprintf("\n"); wprintf("
\n"); @@ -280,7 +280,7 @@ void calendar_day_view_display_events(int year, int month, } wprintf("" - "", + "", WC->disp_cal[i].cal_msgnum, year, month, day ); @@ -361,7 +361,7 @@ void calendar_day_view(int year, int month, int day) { for (hour = daystart; hour <= dayend; ++hour) { /* could do HEIGHT=xx */ wprintf("
"); - wprintf("", year, month, day, hour ); @@ -410,7 +410,7 @@ void calendar_day_view(int year, int month, int day) { wprintf(""); wprintf("", yesterday.year, yesterday.month, yesterday.day); - wprintf(""); + wprintf(""); wprintf(""); wprintf("", tomorrow.year, tomorrow.month, tomorrow.day); - wprintf("\n"); wprintf("
%d", floornum); if (refcount == 0) { wprintf("" - "" + "" "", floornum); wprintf(_("(delete floor)")); wprintf("
"); } wprintf("" - "", floornum); wprintf(_("(edit graphic)")); wprintf("
"); wprintf("		" - "" + "" "" " " + "" "\n" ""); if (ib_displayas != IB_TEXTONLY) { wprintf("\" \"\n" + "HEIGHT=\"32\" src=\"image&name=hello\" ALT=\" \">\n" ); } wprintf("\n"); @@ -79,7 +79,7 @@ void do_iconbar(void) { "" "\"%s\"" + "src=\"static/citadel-logo.gif\" ALT=\"%s\">" "\n", _("Find out more about Citadel"), _("CITADEL") @@ -87,13 +87,13 @@ void do_iconbar(void) { if (ib_summary) { - wprintf("
  • ", _("Your summary page") ); if (ib_displayas != IB_TEXTONLY) { wprintf(""); + "src=\"static/summscreen_32x.gif\">"); } if (ib_displayas != IB_PICONLY) { wprintf(_("Summary")); @@ -103,14 +103,14 @@ void do_iconbar(void) { if (ib_inbox) { wprintf("
  • " - "", _("Go to your email inbox") ); if (ib_displayas != IB_TEXTONLY) { wprintf(""); + "src=\"static/privatemess_32x.gif\">"); } if (ib_displayas != IB_PICONLY) { wprintf(_("Mail")); @@ -128,14 +128,14 @@ void do_iconbar(void) { if (ib_calendar) { wprintf("
  • " - "", _("Go to your personal calendar") ); if (ib_displayas != IB_TEXTONLY) { wprintf(""); + "src=\"static/calarea_32x.gif\">"); } if (ib_displayas != IB_PICONLY) { wprintf(_("Calendar")); @@ -145,14 +145,14 @@ void do_iconbar(void) { if (ib_contacts) { wprintf("
  • " - "", _("Go to your personal address book") ); if (ib_displayas != IB_TEXTONLY) { wprintf(""); + "src=\"static/viewcontacts_32x.gif\">"); } if (ib_displayas != IB_PICONLY) { wprintf(_("Contacts")); @@ -162,14 +162,14 @@ void do_iconbar(void) { if (ib_notes) { wprintf("
  • " - "", _("Go to your personal notes") ); if (ib_displayas != IB_TEXTONLY) { wprintf(""); + "src=\"static/storenotes_32x.gif\">"); } if (ib_displayas != IB_PICONLY) { wprintf(_("Notes")); @@ -179,14 +179,14 @@ void do_iconbar(void) { if (ib_tasks) { wprintf("
  • " - "", _("Go to your personal task list") ); if (ib_displayas != IB_TEXTONLY) { wprintf(""); + "src=\"static/taskmanag_32x.gif\">"); } if (ib_displayas != IB_PICONLY) { wprintf(_("Tasks")); @@ -196,12 +196,12 @@ void do_iconbar(void) { if (ib_rooms) { wprintf("
  • " - "", + "", _("List all of your accessible rooms") ); if (ib_displayas != IB_TEXTONLY) { wprintf(""); + "src=\"static/chatrooms_32x.gif\">"); } if (ib_displayas != IB_PICONLY) { wprintf(_("Rooms")); @@ -211,13 +211,13 @@ void do_iconbar(void) { if (ib_users) { wprintf("
  • " - "", _("See who is online right now") ); if (ib_displayas != IB_TEXTONLY) { wprintf(""); + "src=\"static/usermanag_32x.gif\">"); } if (ib_displayas != IB_PICONLY) { wprintf(_("Who is online?")); @@ -235,7 +235,7 @@ void do_iconbar(void) { ); if (ib_displayas != IB_TEXTONLY) { wprintf(""); + "src=\"static/citadelchat_32x.gif\">"); } if (ib_displayas != IB_PICONLY) { wprintf(_("Chat")); @@ -245,14 +245,14 @@ void do_iconbar(void) { if (ib_advanced) { wprintf("
  • " - "", _("Advanced Options Menu: Advanced Room commands, Account Info, and Chat") ); if (ib_displayas != IB_TEXTONLY) { wprintf(""); + "src=\"static/advanpage2_32x.gif\">"); } if (ib_displayas != IB_PICONLY) { wprintf(_("Advanced")); @@ -262,14 +262,14 @@ void do_iconbar(void) { if ((WC->axlevel >= 6) || (WC->is_room_aide)) { wprintf("
  • " - "", _("Room and system administration functions") ); if (ib_displayas != IB_TEXTONLY) { wprintf(""); + "src=\"static/advanpage2_32x.gif\">"); } if (ib_displayas != IB_PICONLY) { wprintf(_("Administration")); @@ -279,7 +279,7 @@ void do_iconbar(void) { if (1) { wprintf("
  • " - "", _("Log off"), _("Log off now?") @@ -287,7 +287,7 @@ void do_iconbar(void) { ); if (ib_displayas != IB_TEXTONLY) { wprintf(""); + "src=\"static/logoff_32x.gif\">"); } if (ib_displayas != IB_PICONLY) { wprintf(_("Log off")); @@ -297,7 +297,7 @@ void do_iconbar(void) { wprintf( "
    • \n", @@ -373,7 +373,7 @@ void display_customize_iconbar(void) { wprintf("
    " "
    "); - wprintf("\n"); + wprintf("\n"); wprintf("
    "); wprintf(_("Display icons as:")); @@ -400,7 +400,7 @@ void display_customize_iconbar(void) { "" "
    		" "\" \"" + "src=\"image&name=hello\" ALT=\" \">" "" "%s
    " "%s" @@ -415,7 +415,7 @@ void display_customize_iconbar(void) { "" "    		" "\" \"" + "src=\"static/summscreen_48x.gif\" ALT=\" \">" "" "%s
    " "%s" @@ -430,7 +430,7 @@ void display_customize_iconbar(void) { "" "    		" "\" \"" + "src=\"static/privatemess_48x.gif\" ALT=\" \">" "" "%s
    " "%s" @@ -446,7 +446,7 @@ void display_customize_iconbar(void) { "VALUE=\"yes\" %s>" "    		" "\" \"" + "src=\"static/viewcontacts_48x.gif\" ALT=\" \">" "" "%s
    " "%s" @@ -462,7 +462,7 @@ void display_customize_iconbar(void) { "VALUE=\"yes\" %s>" "    		" "\" \"" + "src=\"static/storenotes_48x.gif\" ALT=\" \">" "" "%s
    " "%s" @@ -479,7 +479,7 @@ void display_customize_iconbar(void) { "VALUE=\"yes\" %s>" "    		" "\" \"" + "src=\"static/calarea_48x.gif\" ALT=\" \">" "" "%s
    " "%s" @@ -494,7 +494,7 @@ void display_customize_iconbar(void) { "" "    		" "\" \"" + "src=\"static/taskmanag_48x.gif\" ALT=\" \">" "" "%s
    " "%s" @@ -510,7 +510,7 @@ void display_customize_iconbar(void) { "" "    		" "\" \"" + "src=\"static/chatrooms_48x.gif\" ALT=\" \">" "" "%s
    " "%s" @@ -526,7 +526,7 @@ void display_customize_iconbar(void) { "" "    		" "\" \"" + "src=\"static/usermanag_48x.gif\" ALT=\" \">" "" "%s
    " "%s" @@ -542,7 +542,7 @@ void display_customize_iconbar(void) { "" "    		" "\" \"" + "src=\"static/citadelchat_48x.gif\" ALT=\" \">" "" "%s
    " "%s" @@ -560,7 +560,7 @@ void display_customize_iconbar(void) { "VALUE=\"yes\" %s>" "    		" "\" \"" + "src=\"static/advanpage2_48x.gif\" ALT=\" \">" "" "%s
    " "%s" @@ -577,7 +577,7 @@ void display_customize_iconbar(void) { "VALUE=\"yes\" %s>" "    		" "\" \"" + "src=\"static/citadel-logo.gif\" ALT=\" \">" "" "%s
    " "%s" @@ -645,7 +645,7 @@ void commit_iconbar(void) { output_headers(1, 1, 0, 0, 0, 0); wprintf( "
    \n"); } } - wprintf("\n" + wprintf("\n" "
    " - "" + "" " "); wprintf(_("Your icon bar has been updated. Please select any of its " "choices to continue.")); diff --git a/webcit/inetconf.c b/webcit/inetconf.c index c96537232..3bfde9d7c 100644 --- a/webcit/inetconf.c +++ b/webcit/inetconf.c @@ -111,7 +111,7 @@ void display_inetconf(void) extract_token(buf, ic_spec[which], i, '\n', sizeof buf); escputs(buf); wprintf("" - "", @@ -121,7 +121,7 @@ void display_inetconf(void) wprintf("
    " "" "", ic_keyword[which]); diff --git a/webcit/listsub.c b/webcit/listsub.c index 135644b3e..66d03aac8 100644 --- a/webcit/listsub.c +++ b/webcit/listsub.c @@ -78,7 +78,7 @@ void do_listsub(void) "e-mailed to you and your subscription will " "be confirmed.
    \n"), escaped_email, escaped_room); - wprintf("%s\n", _("Go back...")); + wprintf("%s\n", _("Go back...")); } else { wprintf("ERROR: %s" @@ -115,7 +115,7 @@ void do_listsub(void) "Please click on the link which is being " "e-mailed to you and your unsubscription will " "be confirmed.
    \n" - "Back...\n" + "Back...\n" ); } else { @@ -158,7 +158,7 @@ void do_listsub(void) * Any other (invalid) command causes the form to be displayed */ else { -FORM: wprintf("\n" +FORM: wprintf("\n" "\n" ); diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c index f615df1d6..7412bb65c 100644 --- a/webcit/mainmenu.c +++ b/webcit/mainmenu.c @@ -26,13 +26,13 @@ void display_main_menu(void) "" "
    "); /* start of first column */ - wprintf(""); + wprintf(""); wprintf(_("List known rooms")); wprintf("
    "); wprintf(_("Where can I go from here?")); wprintf("
    \n"); - wprintf("" + wprintf("" ""); wprintf(_("Goto next room")); wprintf("
    " @@ -40,7 +40,7 @@ void display_main_menu(void) wprintf(_("...with unread messages")); wprintf("
    \n"); - wprintf("" + wprintf("" ""); wprintf(_("Skip to next room")); wprintf("
    " @@ -50,7 +50,7 @@ void display_main_menu(void) if ((strlen(WC->ugname) > 0) && (strcasecmp(WC->ugname, WC->wc_roomname))) { wprintf("
    " - "" + "" ""); wprintf(_("Ungoto")); wprintf("
    " @@ -61,7 +61,7 @@ void display_main_menu(void) wprintf("    		\n"); /* start of second column */ - wprintf("" + wprintf("" ""); wprintf(_("Read new messages")); wprintf("
    " @@ -69,7 +69,7 @@ void display_main_menu(void) wprintf(_("...in this room")); wprintf("
    \n"); - wprintf("" + wprintf("" ""); wprintf(_("Read all messages")); wprintf("
    " @@ -77,7 +77,7 @@ void display_main_menu(void) wprintf(_("...old and new")); wprintf("
    \n"); - wprintf("" + wprintf("" ""); wprintf(_("Enter a message")); wprintf("
    " @@ -87,7 +87,7 @@ void display_main_menu(void) wprintf("    		"); /* start of third column */ - wprintf("" + wprintf("" ""); wprintf(_("Summary page")); wprintf("
    " @@ -95,7 +95,7 @@ void display_main_menu(void) wprintf(_("Summary of my account")); wprintf("
    \n"); - wprintf("\n" + wprintf("\n" ""); wprintf(_("User list")); wprintf("
    " @@ -103,7 +103,7 @@ void display_main_menu(void) wprintf(_("(all registered users)")); wprintf("
    \n"); - wprintf("" + wprintf("" ""); wprintf(_("Log off")); wprintf("
    " @@ -120,27 +120,27 @@ void display_main_menu(void) svprintf("BOXTITLE", WCS_STRING, "Your info"); do_template("beginbox"); - wprintf("" + wprintf("" ""); wprintf(_("Change your preferences and settings")); wprintf("
    \n"); - wprintf("    " + wprintf("" ""); wprintf(_("Update your contact information")); wprintf("
    \n"); - wprintf("    " + wprintf("" ""); wprintf(_("Change your password")); wprintf("
    \n"); - wprintf("" + wprintf("" ""); wprintf(_("Enter your 'bio'")); wprintf("
    \n"); - wprintf("" + wprintf("" ""); wprintf(_("Edit your online photo")); wprintf("\n"); @@ -153,28 +153,28 @@ void display_main_menu(void) do_template("beginbox"); if ((WC->axlevel >= 6) || (WC->is_room_aide)) { - wprintf("" + wprintf("" ""); wprintf(_("Edit or delete this room")); wprintf("
    \n"); } - wprintf("" + wprintf("" ""); wprintf(_("Go to a 'hidden' room")); wprintf("
    \n"); - wprintf("" + wprintf("" ""); wprintf(_("Create a new room")); wprintf("
    \n"); - wprintf("" + wprintf("" ""); wprintf(_("Zap (forget) this room (%s)"), WC->wc_roomname); wprintf("
    \n"); - wprintf("" + wprintf("" ""); wprintf(_("List all forgotten rooms")); wprintf("\n"); @@ -207,17 +207,17 @@ void display_aide_menu(void) svprintf("BOXTITLE", WCS_STRING, _("Global Configuration")); do_template("beginbox"); - wprintf("" + wprintf("" ""); wprintf(_("Edit site-wide configuration")); wprintf("
    \n"); - wprintf("" + wprintf("" ""); wprintf(_("Domain names and Internet mail configuration")); wprintf("
    \n"); - wprintf("" + wprintf("" ""); wprintf(_("Configure replication with other Citadel servers")); wprintf("\n"); @@ -229,12 +229,12 @@ void display_aide_menu(void) svprintf("BOXTITLE", WCS_STRING, _("User account management")); do_template("beginbox"); - wprintf("" + wprintf("" ""); wprintf(_("Add, change, delete user accounts")); wprintf("
    \n"); - wprintf("" + wprintf("" ""); wprintf(_("Validate new users")); wprintf("
    \n"); @@ -244,7 +244,7 @@ void display_aide_menu(void) svprintf("BOXTITLE", WCS_STRING, _("Rooms and Floors")); do_template("beginbox"); - wprintf("" + wprintf("" ""); wprintf(_("Add, change, or delete floors")); wprintf("\n"); @@ -282,7 +282,7 @@ void display_generic(void) "then this screen will not be of much use to you.")); wprintf("
    \n"); - wprintf("\n"); + wprintf("\n"); wprintf(_("Enter command:")); wprintf("

    \n"); @@ -356,8 +356,8 @@ void do_generic(void) free(junk); } wprintf("
    "); - wprintf("Enter another command
    \n"); - wprintf("Return to menu\n"); + wprintf("Enter another command
    \n"); + wprintf("Return to menu\n"); do_template("endbox"); wDumpContent(1); } diff --git a/webcit/messages.c b/webcit/messages.c index db4115d07..190f6061e 100644 --- a/webcit/messages.c +++ b/webcit/messages.c @@ -342,7 +342,7 @@ void display_parsed_vcard(struct vCard *v, int full) { else if (!strcasecmp(firsttoken, "email")) { if (strlen(mailto) > 0) strcat(mailto, "
    "); strcat(mailto, - "" "    		" - "" + "" ""); escputs(displayname); wprintf(""); @@ -580,7 +580,7 @@ void read_message(long msgnum, int printable_view, char *section) { if (!strncasecmp(buf, "from=", 5)) { strcpy(from, &buf[5]); wprintf(_("from ")); - wprintf("", + "", msgnum, mime_partnum, mime_filename); } else if ( (!strcasecmp(mime_disposition, "attachment")) || (!strcasecmp(mime_disposition, "inline")) ) { snprintf(&mime_http[strlen(mime_http)], (sizeof(mime_http) - strlen(mime_http) - 1), - "" - "\n" "%s (%s, %d bytes)
    \n", msgnum, mime_partnum, mime_filename, @@ -742,7 +742,7 @@ void read_message(long msgnum, int printable_view, char *section) { /* Reply */ if ( (WC->wc_view == VIEW_MAILBOX) || (WC->wc_view == VIEW_BBS) ) { - wprintf("is_mailbox) { wprintf("?replyquote=%ld", msgnum); } @@ -757,7 +757,7 @@ void read_message(long msgnum, int printable_view, char *section) { /* ReplyQuoted */ if ( (WC->wc_view == VIEW_MAILBOX) || (WC->wc_view == VIEW_BBS) ) { if (!WC->is_mailbox) { - wprintf("[%s] ", _("Forward")); @@ -795,11 +795,11 @@ void read_message(long msgnum, int printable_view, char *section) { /* If this is one of my own rooms, or if I'm an Aide or Room Aide, I can move/delete */ if ( (WC->is_room_aide) || (WC->is_mailbox) ) { /* Move */ - wprintf("[%s] ", + wprintf("[%s] ", msgnum, _("Move")); /* Delete */ - wprintf("" "[%s] ", msgnum, _("Delete this message?"), _("Delete") ); @@ -944,7 +944,7 @@ void read_message(long msgnum, int printable_view, char *section) { || (!strcasecmp(&WC->wc_roomname[11], USERCONFIGROOM)) || (WC->wc_view == VIEW_ADDRESSBOOK) ) { - wprintf("", msgnum, vcard_partnum); wprintf("[%s]", _("edit")); @@ -1412,7 +1412,7 @@ void display_addressbook(long msgnum, char alpha) { || (!strcasecmp(&WC->wc_roomname[11], USERCONFIGROOM)) || (WC->wc_view == VIEW_ADDRESSBOOK) ) { - wprintf("", msgnum, vcard_partnum); wprintf("[%s]", _("edit")); @@ -1563,7 +1563,7 @@ void do_addrbook_view(struct addrbookent *addrbook, int num_ab) { wprintf("Page: "); for (i=0; i<=num_pages; ++i) { if (i != page) { - wprintf("", i); + wprintf("", i); } else { wprintf(""); @@ -1605,7 +1605,7 @@ void do_addrbook_view(struct addrbookent *addrbook, int num_ab) { wprintf("    		"); - wprintf("", bstr("alpha")); vcard_n_prettyize(addrbook[i].ab_name); @@ -1977,33 +1977,33 @@ void readloop(char *oper) } if (!strcasecmp(sortby, "subject")) { - subjsort_button = "" ; + subjsort_button = "" ; } else if (!strcasecmp(sortby, "rsubject")) { - subjsort_button = "" ; + subjsort_button = "" ; } else { - subjsort_button = "" ; + subjsort_button = "" ; } if (!strcasecmp(sortby, "sender")) { - sendsort_button = "" ; + sendsort_button = "" ; } else if (!strcasecmp(sortby, "rsender")) { - sendsort_button = "" ; + sendsort_button = "" ; } else { - sendsort_button = "" ; + sendsort_button = "" ; } if (!strcasecmp(sortby, "date")) { - datesort_button = "" ; + datesort_button = "" ; } else if (!strcasecmp(sortby, "rdate")) { - datesort_button = "" ; + datesort_button = "" ; } else { - datesort_button = "" ; + datesort_button = "" ; } if (is_summary) { @@ -2014,7 +2014,7 @@ void readloop(char *oper) "
    \n" "\n" + "method=\"POST\" action=\"do_stuff_to_msgs\">\n" "" "" @@ -2118,7 +2118,7 @@ void readloop(char *oper) && (!is_notes) && (!is_singlecard) && (!is_summary)) { wprintf("\n"); + "method=\"POST\" action=\"do_stuff_to_msgs\">\n"); wprintf(_("Reading #"), lowest_displayed, highest_displayed); @@ -2502,7 +2502,7 @@ void display_enter(void) /* begin message entry screen */ wprintf("\n"); wprintf("\n", now); @@ -2645,7 +2645,7 @@ void display_enter(void) ); /* Enumerate any attachments which are already in place... */ - wprintf(" Attachments: "); wprintf("\n", bstr("msgid")); wprintf("
    \n"); wprintf("
    \n
    \n"); - wprintf("\n"); + wprintf("\n"); wprintf("
    \n"); wprintf("", _("Node name")); wprintf("\n"); @@ -113,7 +113,7 @@ void display_edit_node(void) extract_token(cport, buf, 3, '|', sizeof cport); if (!strcasecmp(node, cnode)) { - wprintf("\n"); + wprintf("\n"); wprintf("
    %s
    \n"); wprintf(""); - wprintf(""); - wprintf("
    "); wprintf(_("Node name")); @@ -167,7 +167,7 @@ void display_netconf(void) wprintf("\n
    \n"); wprintf("
    "); - wprintf(""); + wprintf(""); wprintf(_("Add a new node")); wprintf("
    \n"); wprintf("
    "); @@ -186,12 +186,12 @@ void display_netconf(void) wprintf("
    "); escputs(node); wprintf(""); wprintf(_("(Edit)")); wprintf(""); wprintf(_("(Delete)")); @@ -223,12 +223,12 @@ void display_confirm_delete_node(void) wprintf(""); escputs(node); wprintf("?
    \n"); - wprintf("    "); wprintf(_("Yes")); wprintf("   "); - wprintf(""); + wprintf(""); wprintf(_("No")); wprintf("
    \n"); wDumpContent(1); @@ -287,7 +287,7 @@ void add_node(void) if (buf[0] == '1') { output_headers(1, 1, 0, 0, 0, 0); server_to_text(); - wprintf(""); + wprintf(""); wprintf(_("Back to menu")); wprintf("\n"); wDumpContent(1); diff --git a/webcit/notes.c b/webcit/notes.c index 24b25ab27..51cdc8960 100644 --- a/webcit/notes.c +++ b/webcit/notes.c @@ -15,7 +15,7 @@ void display_note(long msgnum) { int in_text = 0; int i; - wprintf("\n"); + wprintf("\n"); serv_printf("MSG0 %ld", msgnum); serv_getln(buf, sizeof buf); diff --git a/webcit/paging.c b/webcit/paging.c index 78fcdc127..89cd5b04e 100644 --- a/webcit/paging.c +++ b/webcit/paging.c @@ -32,7 +32,7 @@ void display_page(void) escputs(recp); wprintf("
    \n"); - wprintf("\n"); + wprintf("\n"); wprintf("
    \n"); @@ -317,7 +317,7 @@ void chat_recv(void) { if (end_chat_now) { close(WC->chat_sock); WC->chat_sock = (-1); - wprintf("\n"); + wprintf("\n"); } if (strlen(output_data) > 0) { @@ -327,7 +327,7 @@ void chat_recv(void) { } /* Output our fun to the other frame. */ - wprintf("serv_sock = WC->chat_sock; WC->chat_sock = i; - wprintf("\n"); + wprintf("\n"); wprintf("\n", SIZ-10); wprintf("
    "); diff --git a/webcit/preferences.c b/webcit/preferences.c index 02cd7416c..991a268ca 100644 --- a/webcit/preferences.c +++ b/webcit/preferences.c @@ -181,7 +181,7 @@ void display_preferences(void) wprintf("
    \n"); wprintf("\n", _("Ungoto") ); @@ -383,8 +383,8 @@ void embed_room_banner(char *got, int navbar_style) { if ( (navbar_style == navbar_default) && (WC->wc_view == VIEW_BBS) ) { wprintf( "\n", _("Read new messages") ); @@ -395,8 +395,8 @@ void embed_room_banner(char *got, int navbar_style) { case VIEW_ADDRESSBOOK: wprintf( "\n", _("Add new contact") @@ -483,8 +483,8 @@ void embed_room_banner(char *got, int navbar_style) { break; case VIEW_CALENDAR: wprintf( - "\n", _("Add new event") @@ -492,8 +492,8 @@ void embed_room_banner(char *got, int navbar_style) { break; case VIEW_TASKS: wprintf( - "\n", _("Add new task") @@ -501,8 +501,8 @@ void embed_room_banner(char *got, int navbar_style) { break; case VIEW_NOTES: wprintf( - "\n", _("Add new note") @@ -510,8 +510,8 @@ void embed_room_banner(char *got, int navbar_style) { break; default: wprintf( - "\n", _("Enter a message") @@ -522,9 +522,9 @@ void embed_room_banner(char *got, int navbar_style) { if (navbar_style == navbar_default) wprintf( "\n", _("Leave all messages marked as unread, go to next room with unread messages"), @@ -533,9 +533,9 @@ void embed_room_banner(char *got, int navbar_style) { if (navbar_style == navbar_default) wprintf( "\n", _("Mark all messages as read, go to next room with unread messages"), @@ -881,7 +881,7 @@ void display_editroom(void) wprintf("\n", node); wprintf("
    "); - wprintf("\""); + wprintf("\""); wprintf(" "); wprintf(_("Preferences and settings")); wprintf(""); diff --git a/webcit/roomops.c b/webcit/roomops.c index eaca14531..ca0e50ed7 100644 --- a/webcit/roomops.c +++ b/webcit/roomops.c @@ -96,7 +96,7 @@ void room_tree_list(struct roomlisting *rp) strcpy(rmname, rp->rlname); f = rp->rlflags; - wprintf(""); @@ -248,7 +248,7 @@ void embed_room_graphic(void) { serv_puts("OIMG _roompic_"); serv_getln(buf, sizeof buf); if (buf[0] == '2') { - wprintf("wc_roomname); wprintf("\">"); serv_puts("CLOS"); @@ -301,7 +301,7 @@ void embed_room_graphic(void) { void embed_view_o_matic(void) { int i; - wprintf("\n" + wprintf("\n" "View as: " "" - "" - "" + "" + "" "%s" "" - "" - "" + "" "" "%s" @@ -406,8 +406,8 @@ void embed_room_banner(char *got, int navbar_style) { case VIEW_CALENDAR: wprintf( "" - "" - "" + "" "" "%s" @@ -415,8 +415,8 @@ void embed_room_banner(char *got, int navbar_style) { ); wprintf( "" - "" - "" + "" "" "%s" @@ -426,8 +426,8 @@ void embed_room_banner(char *got, int navbar_style) { case VIEW_TASKS: wprintf( "" - "" - "" + "" "" "%s" @@ -437,8 +437,8 @@ void embed_room_banner(char *got, int navbar_style) { case VIEW_NOTES: wprintf( "" - "" - "" + "" "" "%s" @@ -448,8 +448,8 @@ void embed_room_banner(char *got, int navbar_style) { case VIEW_MAILBOX: wprintf( "" - "" - "" + "" "" "%s" @@ -459,8 +459,8 @@ void embed_room_banner(char *got, int navbar_style) { default: wprintf( "" - "" - "" + "" "" "%s" @@ -474,8 +474,8 @@ void embed_room_banner(char *got, int navbar_style) { switch(WC->wc_view) { case VIEW_ADDRESSBOOK: wprintf( - "" - "" + "" "%s" "" - "" + "" "%s" "" - "" + "" "%s" "" - "" + "" "%s" "" - "" + "" "%s" "" - "" - "" + "" "%s" "" - "" - "" + "" "%s" ""); } else { - wprintf(""); + wprintf(""); } wprintf(_("Administration")); if (!strcmp(tab, "admin")) { @@ -897,7 +897,7 @@ void display_editroom(void) wprintf(""); } else { - wprintf(""); + wprintf(""); } wprintf(_("Configuration")); if (!strcmp(tab, "config")) { @@ -913,7 +913,7 @@ void display_editroom(void) wprintf(""); } else { - wprintf(""); + wprintf(""); } wprintf(_("Message expire policy")); if (!strcmp(tab, "expire")) { @@ -929,7 +929,7 @@ void display_editroom(void) wprintf(""); } else { - wprintf(""); + wprintf(""); } wprintf(_("Access controls")); if (!strcmp(tab, "access")) { @@ -945,7 +945,7 @@ void display_editroom(void) wprintf(""); } else { - wprintf(""); + wprintf(""); } wprintf(_("Sharing")); if (!strcmp(tab, "sharing")) { @@ -961,7 +961,7 @@ void display_editroom(void) wprintf(""); } else { - wprintf(""); + wprintf(""); } wprintf(_("Mailing list service")); if (!strcmp(tab, "listserv")) { @@ -983,23 +983,23 @@ void display_editroom(void) if (!strcmp(tab, "admin")) { wprintf(""); } if (!strcmp(tab, "config")) { - wprintf("\n"); + wprintf("\n"); wprintf("
    • "); wprintf(_("Name of room: ")); @@ -1242,7 +1242,7 @@ void display_editroom(void) extract_token(remote_room, buf, 1, '|', sizeof remote_room); if (strlen(node) > 0) { wprintf("" + "action=\"netedit\">" "
    %s"); @@ -1285,7 +1285,7 @@ void display_editroom(void) extract_token(node, not_shared_with, i, '\n', sizeof node); if (strlen(node) > 0) { wprintf("" + "action=\"netedit\">" "
    "); escputs(node); wprintf("" @@ -1346,7 +1346,7 @@ void display_editroom(void) extract_token(recp, buf, 1, '|', sizeof recp); escputs(recp); - wprintf(" "); @@ -1354,7 +1354,7 @@ void display_editroom(void) wprintf("
    "); } } - wprintf("
    \n" + wprintf("
    \n" "\n" "\n"); wprintf("\n"); @@ -1376,7 +1376,7 @@ void display_editroom(void) extract_token(recp, buf, 1, '|', sizeof recp); escputs(recp); - wprintf(" "); @@ -1384,7 +1384,7 @@ void display_editroom(void) wprintf("
    "); } } - wprintf("
    \n" + wprintf("
    \n" "\n" "\n"); wprintf("\n"); @@ -1396,7 +1396,7 @@ void display_editroom(void) if (self_service(999) == 1) { wprintf(_("This room is configured to allow " "self-service subscribe/unsubscribe requests.")); - wprintf(""); + wprintf(""); wprintf(_("Click to disable.")); wprintf("
    \n"); wprintf(_("The URL for subscribe/unsubscribe is: ")); @@ -1407,7 +1407,7 @@ void display_editroom(void) else { wprintf(_("This room is not configured to allow " "self-service subscribe/unsubscribe requests.")); - wprintf(" "); wprintf(_("Click to enable.")); wprintf("
    \n"); @@ -1435,7 +1435,7 @@ void display_editroom(void) floorvalue = extract_int(&buf[4], 1); } - wprintf("
    \n"); + wprintf("
    \n"); wprintf("\n"); wprintf("
    "); wprintf(_("Message expire policy for this room")); @@ -1763,7 +1763,7 @@ void display_whok(void) "name from the list and click 'Kick'.")); wprintf("

    "); - wprintf("
    \n"); + wprintf("
    \n"); wprintf("\n"); wprintf("\n"); wprintf("Invite: "); wprintf("
    \n" @@ -1830,7 +1830,7 @@ void display_entroom(void) wprintf("
    " "
    \n"); - wprintf("\n"); + wprintf("\n"); wprintf("