projects / citadel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2dc3bd8)
* Removed the "convert_to_html" option from text_to_server() because we no
authorArt Cancro <ajc@citadel.org>
Mon, 30 Jan 2006 04:21:45 +0000 (04:21 +0000)
committerArt Cancro <ajc@citadel.org>
Mon, 30 Jan 2006 04:21:45 +0000 (04:21 +0000)
  longer have any callers which require it.

webcit/ChangeLog patch | blob | history
webcit/mainmenu.c patch | blob | history
webcit/messages.c patch | blob | history
webcit/notes.c patch | blob | history
webcit/paging.c patch | blob | history
webcit/serv_func.c patch | blob | history
webcit/sysmsgs.c patch | blob | history
webcit/webcit.c patch | blob | history
webcit/webcit.h patch | blob | history

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index ee2855d39b18aa2e5fea86428da35212696be781..3014c39dda5b256bb6e01d649e4227a96b4d72e0 100644 (file)
--- 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 cde747a20976ed145dc569f332b8038c3ec76687..3f66e6d588578f3257cb3411cbad338809d56c42 100644 (file)
--- 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 454e5420f65c611953e89ebce2f207eecfdd6811..37aeb321f6add845a808b88b8b04724824d5d6a4 100644 (file)
--- 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("<html><body>\n");            /** Future templates go here */
-       text_to_server(bstr("msgtext"), 0);
+       text_to_server(bstr("msgtext"));
        serv_puts("</body></html>\n");
        
 
diff --git a/webcit/notes.c b/webcit/notes.c
index b1f49f5580e64cf0b8834165349600d2cd1207e3..137480a52528121fd64bb4fbe7a6fe6a9487d229 100644 (file)
--- 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 6a17bfe9043bd8fb60a12aefb66091f80ca2791d..bde07115e4eeb3e508ee9125aeb6bdbaf0eb9d06 100644 (file)
--- 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("<EM>");
                        wprintf(_("Message has been sent to "));
diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index b1c82badbcc497700fb4afafb6fa282ad531a8d3..2325d8dbfcc5a9db27c8809d503e4bb6c30f24d8 100644 (file)
--- 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, "<br />");
-                       }
-                       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 15dee9006216236c77c76926eee075c85e82b583..7de39987929cbaebffca2f30d7e3075c9308f271 100644 (file)
--- 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 8a1ed925dadf2d2e6deae1a9deb674657fa03b60..1d9610c41c6aeb6f0c73dbeab96e2a3b5a383b45 100644 (file)
--- 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 c2592974bda834a75bc2d3ce53df87e1aaf18603..953b798fbca373e98e6782e9e403c8f983141f5a 100644 (file)
--- 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);
Citadel server, clients, utilities