* Replaced serv_gets() with serv_getln() - which now requires the caller

[citadel.git] / webcit / serv_func.c

diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index 652ab857940e3fb07cb9720f2457204daec0133c..dca9352bfbfdd70dc97721bbe2dffd7a07e2ebb7 100644 (file)
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -1,9 +1,8 @@
 /*
- * serv_func.c
+ * $Id$
  *
  * Handles various types of data transfer operations with the Citadel service.
  *
- * $Id$
  */
 
 #include <ctype.h>
@@ -46,23 +45,33 @@ void get_serv_info(char *browser_host, char *user_agent)
                user_agent,
                browser_host
        );
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
 
        /* Tell the server what kind of richtext we prefer */
        serv_puts("MSGP text/html|text/plain");
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
+
+#ifdef WEBCIT_WITH_CALENDAR_SERVICE
+       /* Tell the server that when we save a calendar event, we
+        * want invitations to be generated by the Citadel server
+        * instead of by the client.
+        */
+       serv_puts("ICAL sgi|1");
+       serv_getln(buf, sizeof buf);
+#endif
 
        /* Now ask the server to tell us a little bit about itself... */
        serv_puts("INFO");
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
        if (buf[0] != '1')
                return;
 
        a = 0;
-       while (serv_gets(buf), strcmp(buf, "000")) {
+       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
                switch (a) {
                case 0:
                        serv_info.serv_pid = atoi(buf);
+                       WC->ctdl_pid = serv_info.serv_pid;
                        break;
                case 1:
                        strcpy(serv_info.serv_nodename, buf);
@@ -88,6 +97,9 @@ void get_serv_info(char *browser_host, char *user_agent)
                case 9:
                        strcpy(serv_info.serv_moreprompt, buf);
                        break;
+               case 14:
+                       serv_info.serv_supports_ldap = atoi(buf);
+                       break;
                }
                ++a;
        }
@@ -100,17 +112,17 @@ void get_serv_info(char *browser_host, char *user_agent)
  * If fp is non-null, it is considered to be the file handle to read the
  * text from.  Otherwise, text is read from the server.
  */
-void fmout(FILE * fp)
+void fmout(FILE *fp, char *align)
 {
 
        int intext = 0;
        int bq = 0;
        char buf[SIZ];
 
-       wprintf("<DIV ALIGN=JUSTIFY>\n");
+       wprintf("<DIV ALIGN=%s>\n", align);
        while (1) {
                if (fp == NULL)
-                       serv_gets(buf);
+                       serv_getln(buf, sizeof buf);
                if (fp != NULL) {
                        if (fgets(buf, SIZ, fp) == NULL)
                                strcpy(buf, "000");
@@ -119,27 +131,28 @@ void fmout(FILE * fp)
                if (!strcmp(buf, "000")) {
                        if (bq == 1)
                                wprintf("</I>");
-                       wprintf("</DIV><BR>\n");
+                       wprintf("</DIV><br />\n");
                        return;
                }
                if ((intext == 1) && (isspace(buf[0]))) {
-                       wprintf("<BR>");
+                       wprintf("<br />");
                }
                intext = 1;
 
                /* Quoted text should be displayed in italics and in a
-                * different colour.  This code understands both Citadel/UX
-                * style " >" quotes and FordBoard-style " :-)" quotes.
+                * different colour.  This code understands Citadel-style
+                * " >" quotes and will convert to <BLOCKQUOTE> tags.
                 */
-               if ((bq == 0) &&
-                   ((!strncmp(buf, " >", 2)) || (!strncmp(buf, " :-)", 4)))) {
-                       wprintf("<SPAN CLASS=\"pull_quote\">");
+               if ((bq == 0) && (!strncmp(buf, " >", 2))) {
+                       wprintf("<BLOCKQUOTE>");
                        bq = 1;
-               } else if ((bq == 1) &&
-                 (strncmp(buf, " >", 2)) && (strncmp(buf, " :-)", 4))) {
-                       wprintf("</SPAN>");
+               } else if ((bq == 1) && (strncmp(buf, " >", 2))) {
+                       wprintf("</BLOCKQUOTE>");
                        bq = 0;
                }
+               if ((bq == 1) && (!strncmp(buf, " >", 2))) {
+                       strcpy(buf, &buf[2]);
+               }
                /* Activate embedded URL's */
                url(buf);
 
@@ -159,12 +172,9 @@ void fmout(FILE * fp)
 void text_to_server(char *ptr, int convert_to_html)
 {
        char buf[SIZ];
+       char conv[4];
        int ch, a, pos;
 
-       if (convert_to_html) {
-               serv_puts("<HTML><BODY>");
-       }
-
        pos = 0;
        strcpy(buf, "");
 
@@ -177,11 +187,14 @@ void text_to_server(char *ptr, int convert_to_html)
                        serv_puts(buf);
                        strcpy(buf, "");
                        if (convert_to_html) {
-                               strcat(buf, "<BR>");
+                               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);
                } else {
                        a = strlen(buf);
                        buf[a + 1] = 0;
@@ -199,10 +212,6 @@ void text_to_server(char *ptr, int convert_to_html)
        }
        serv_puts(buf);
 
-       if (convert_to_html) {
-               serv_puts("</BODY></HTML>\n");
-       }
-
 }
 
 
@@ -217,7 +226,7 @@ void server_to_text()
 
        int count = 0;
 
-       while (serv_gets(buf), strcmp(buf, "000")) {
+       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
                if ((buf[0] == 32) && (count > 0)) {
                        wprintf("\n");
                }
@@ -245,9 +254,10 @@ void read_server_binary(char *buffer, size_t total_len) {
                        if (thisblock == 0) return;
                }
                serv_printf("READ %d|%d", (int)bytes, (int)thisblock);
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
                if (buf[0] == '6') {
                        thisblock = (size_t)atoi(&buf[4]);
+                       if (!WC->connected) return;
                        serv_read(&buffer[bytes], thisblock);
                        bytes += thisblock;
                }
@@ -259,3 +269,39 @@ void read_server_binary(char *buffer, size_t total_len) {
 }
 
 
+/*
+ * Read text from server, appending to a string buffer until the
+ * usual 000 terminator is found.  Caller is responsible for freeing
+ * the returned pointer.
+ */
+char *read_server_text(void) {
+       char *text = NULL;
+       size_t bytes_allocated = 0;
+       size_t bytes_read = 0;
+       int linelen;
+       char buf[SIZ];
+
+       text = malloc(SIZ);
+       if (text == NULL) {
+               return(NULL);
+       }
+       strcpy(text, "");
+       bytes_allocated = SIZ;
+
+       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+               linelen = strlen(buf);
+               buf[linelen] = '\n';
+               buf[linelen+1] = 0;
+               ++linelen;
+
+               if ((bytes_read + linelen) >= (bytes_allocated - 2)) {
+                       bytes_allocated = 2 * bytes_allocated;
+                       text = realloc(text, bytes_allocated);
+               }
+
+               strcpy(&text[bytes_read], buf);
+               bytes_read += linelen;
+       }
+
+       return(text);
+}