From: Art Cancro Date: Mon, 30 Jan 2006 04:21:45 +0000 (+0000) Subject: * Removed the "convert_to_html" option from text_to_server() because we no X-Git-Tag: v7.86~4253 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=1cccb1b244f4798c7cbd09cfe2be7c0fc722c0cc * Removed the "convert_to_html" option from text_to_server() because we no longer have any callers which require it. --- diff --git a/webcit/ChangeLog b/webcit/ChangeLog index ee2855d39..3014c39dd 100644 --- a/webcit/ChangeLog +++ b/webcit/ChangeLog @@ -1,5 +1,9 @@ $Id$ +Sun Jan 29 23:20:48 EST 2006 ajc +* Removed the "convert_to_html" option from text_to_server() because we no + longer have any callers which require it. + Sun Jan 29 13:08:59 EST 2006 ajc * Removed all references to "font-family" style. We will now go with whatever font the user has chosen as his favorite. diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c index cde747a20..3f66e6d58 100644 --- a/webcit/mainmenu.c +++ b/webcit/mainmenu.c @@ -344,7 +344,7 @@ void do_generic(void) wprintf("000"); } if (buf[0] == '4') { - text_to_server(bstr("g_input"), 0); + text_to_server(bstr("g_input")); serv_puts("000"); } if (buf[0] == '6') { diff --git a/webcit/messages.c b/webcit/messages.c index 454e5420f..37aeb321f 100644 --- a/webcit/messages.c +++ b/webcit/messages.c @@ -2445,7 +2445,7 @@ void post_mime_to_server(void) { serv_puts("Content-type: text/html; charset=utf-8"); serv_puts(""); serv_puts("\n"); /** Future templates go here */ - text_to_server(bstr("msgtext"), 0); + text_to_server(bstr("msgtext")); serv_puts("\n"); diff --git a/webcit/notes.c b/webcit/notes.c index b1f49f558..137480a52 100644 --- a/webcit/notes.c +++ b/webcit/notes.c @@ -91,7 +91,7 @@ void updatenote(void) serv_printf("ENT0 1||0|0||||||%s", bstr("eid")); serv_getln(buf, sizeof buf); if (buf[0] == '4') { - text_to_server(bstr("value"), 0); + text_to_server(bstr("value")); serv_puts("000"); } diff --git a/webcit/paging.c b/webcit/paging.c index 6a17bfe90..bde07115e 100644 --- a/webcit/paging.c +++ b/webcit/paging.c @@ -93,7 +93,7 @@ void page_user(void) serv_getln(buf, sizeof buf); if (buf[0] == '4') { - text_to_server(bstr("msgtext"), 0); + text_to_server(bstr("msgtext")); serv_puts("000"); wprintf(""); wprintf(_("Message has been sent to ")); diff --git a/webcit/serv_func.c b/webcit/serv_func.c index b1c82badb..2325d8dbf 100644 --- a/webcit/serv_func.c +++ b/webcit/serv_func.c @@ -186,14 +186,12 @@ void pullquote_fmout(void) { /** * \brief Transmit message text (in memory) to the server. - * \param ptr the output buffer - * \param convert_to_html if set to 1, the message is converted into something - * which kind of resembles HTML. + * + * \param ptr Pointer to the message being transmitted */ -void text_to_server(char *ptr, int convert_to_html) +void text_to_server(char *ptr) { - char buf[SIZ]; - char conv[4]; + char buf[256]; int ch, a, pos; pos = 0; @@ -207,15 +205,7 @@ void text_to_server(char *ptr, int convert_to_html) buf[strlen(buf) - 1] = 0; serv_puts(buf); buf[0] = 0; - if (convert_to_html) { - strcat(buf, "
"); - } - else { - if (ptr[pos] != 0) strcat(buf, " "); - } - } else if ((convert_to_html)&&(strchr("#&;`'|*?-~<>^()[]{}$\\", ch) != NULL)) { - sprintf(conv, "%c", ch); - stresc(&buf[strlen(buf)], conv, 0, 0); + if (ptr[pos] != 0) strcat(buf, " "); } else { a = strlen(buf); buf[a + 1] = 0; @@ -232,7 +222,6 @@ void text_to_server(char *ptr, int convert_to_html) } } serv_puts(buf); - } diff --git a/webcit/sysmsgs.c b/webcit/sysmsgs.c index 15dee9006..7de399879 100644 --- a/webcit/sysmsgs.c +++ b/webcit/sysmsgs.c @@ -88,7 +88,7 @@ void save_edit(char *description, char *enter_cmd, int regoto) display_main_menu(); return; } - text_to_server(bstr("msgtext"), 0); + text_to_server(bstr("msgtext")); serv_puts("000"); if (regoto) { diff --git a/webcit/webcit.c b/webcit/webcit.c index 8a1ed925d..1d9610c41 100644 --- a/webcit/webcit.c +++ b/webcit/webcit.c @@ -925,7 +925,7 @@ void ajax_servcmd(void) wprintf("000"); } if (buf[0] == '4') { - text_to_server(bstr("g_input"), 0); + text_to_server(bstr("g_input")); serv_puts("000"); } if (buf[0] == '6') { diff --git a/webcit/webcit.h b/webcit/webcit.h index c2592974b..953b798fb 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -481,7 +481,7 @@ void read_message(long msgnum, int printable_view, char *section); void embed_message(char *msgnum_as_string); void print_message(char *msgnum_as_string); void display_headers(char *msgnum_as_string); -void text_to_server(char *ptr, int convert_to_html); +void text_to_server(char *ptr); void display_enter(void); void post_message(void); void confirm_delete_msg(void);