projects / citadel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 04f6eb1)
* hacks to text_to_server() to transmit messages as HTML
authorArt Cancro <ajc@citadel.org>
Thu, 11 Jul 2002 03:17:03 +0000 (03:17 +0000)
committerArt Cancro <ajc@citadel.org>
Thu, 11 Jul 2002 03:17:03 +0000 (03:17 +0000)
webcit/ChangeLog patch | blob | history
webcit/mainmenu.c patch | blob | history
webcit/messages.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.h patch | blob | history

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 86c3d9744144a6c876c913246a30d0e44f1a589f..951e991f9b5afb9dc87dba1d4594a1cc81de994f 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 323.45  2002/07/11 03:17:03  ajc
+* hacks to text_to_server() to transmit messages as HTML
+
 Revision 323.44  2002/07/09 04:21:12  ajc
 * 'idle' icon
 
@@ -856,3 +859,5 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
 
+
+
diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index fb903dbe0b6235a98c26593b7a52c23e3e1b0a5d..c9855d6132b4e5b926da77f51ee8ddd7b4453eba 100644 (file)
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -264,7 +264,7 @@ void do_generic(void)
                wprintf("000");
        }
        if (buf[0] == '4') {
-               text_to_server(bstr("g_input"));
+               text_to_server(bstr("g_input"), 0);
                serv_puts("000");
        }
        if (buf[0] == '6') {
diff --git a/webcit/messages.c b/webcit/messages.c
index 6f1dfacbf5785bec3266ac33af398e51bbc684d7..079c9c741d3924e88f03dd9c7fa8d33fd8673799 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -904,13 +904,15 @@ void post_message(void)
                wprintf("Automatically cancelled because you have already "
                        "saved this message.<BR>\n");
        } else {
-               sprintf(buf, "ENT0 1|%s|0|0|%s",
+               sprintf(buf, "ENT0 1|%s|0|4|%s",
                        bstr("recp"),
                        bstr("subject") );
                serv_puts(buf);
                serv_gets(buf);
                if (buf[0] == '4') {
-                       text_to_server(bstr("msgtext"));
+                       serv_puts("Content-type: text/html");
+                       serv_puts("");
+                       text_to_server(bstr("msgtext"), 1);
                        serv_puts("000");
                        wprintf("Message has been posted.<BR>\n");
                        dont_post = atol(bstr("postseq"));
diff --git a/webcit/paging.c b/webcit/paging.c
index 0a88274b6ad1bd6a0e93e75322637fa6594dde7e..a3987058e13493f1e8563f78c9b28bab669bcc57 100644 (file)
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -91,7 +91,7 @@ void page_user(void)
                serv_gets(buf);
 
                if (buf[0] == '4') {
-                       text_to_server(bstr("msgtext"));
+                       text_to_server(bstr("msgtext"), 0);
                        serv_puts("000");
                        wprintf("<EM>Message has been sent to ");
                        escputs(recp);
diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index be9e41323e8f132ff8e61afece156853c488c498..fd51936941e127b88f1640ae9942e08cde86b3e6 100644 (file)
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -149,16 +149,22 @@ void fmout(FILE * fp)
 
 
 /*
- * transmit message text (in memory) to the server
+ * Transmit message text (in memory) to the server.
+ * If convert_to_html is set to 1, the message is converted into something
+ * which kind of resembles HTML.
  */
-void text_to_server(char *ptr)
+void text_to_server(char *ptr, int convert_to_html)
 {
        char buf[SIZ];
        int ch, a, pos;
 
-       pos = 0;
+       if (convert_to_html) {
+               serv_puts("<HTML><BODY>");
+       }
 
+       pos = 0;
        strcpy(buf, "");
+
        while (ptr[pos] != 0) {
                ch = ptr[pos++];
                if (ch == 10) {
@@ -167,7 +173,12 @@ void text_to_server(char *ptr)
                                buf[strlen(buf) - 1] = 0;
                        serv_puts(buf);
                        strcpy(buf, "");
-                       if (ptr[pos] != 0) strcat(buf, " ");
+                       if (convert_to_html) {
+                               strcat(buf, "<BR>");
+                       }
+                       else {
+                               if (ptr[pos] != 0) strcat(buf, " ");
+                       }
                } else {
                        a = strlen(buf);
                        buf[a + 1] = 0;
@@ -184,6 +195,11 @@ void text_to_server(char *ptr)
                }
        }
        serv_puts(buf);
+
+       if (convert_to_html) {
+               serv_puts("</BODY></HTML>\n");
+       }
+
 }
 
 
diff --git a/webcit/sysmsgs.c b/webcit/sysmsgs.c
index 87604bdd3562ceb777beb80513d1d36c2ec40264..536da8c3d41f9688b080404fd4fc804a3a46436c 100644 (file)
--- a/webcit/sysmsgs.c
+++ b/webcit/sysmsgs.c
@@ -90,7 +90,7 @@ void save_edit(char *description, char *enter_cmd, int regoto)
                display_error(&buf[4]);
                return;
        }
-       text_to_server(bstr("msgtext"));
+       text_to_server(bstr("msgtext"), 0);
        serv_puts("000");
 
        if (regoto) {
diff --git a/webcit/webcit.h b/webcit/webcit.h
index 38b079edfcf0430bad8547e497b1c9640c509dcb..b6ac6a3765e1c9ca2a3c75dec5e872b5fda08119 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -212,7 +212,7 @@ void embed_main_menu(void);
 void serv_read(char *buf, int bytes);
 int haschar(char *, char);
 void readloop(char *oper);
-void text_to_server(char *ptr);
+void text_to_server(char *ptr, int convert_to_html);
 void display_enter(void);
 void post_message(void);
 void confirm_delete_msg(void);
Citadel server, clients, utilities