* remove duplicate function

[citadel.git] / webcit / serv_func.c

diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index 50a7ab8b46db6e2a2f1679214721bee48e33df94..fbaa088d8b583a98fbaeef989f85380eb9eee4da 100644 (file)
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -106,16 +106,21 @@ void get_serv_info(char *browser_host, char *user_agent)
 
 
 /**
- * \brief Read Citadel variformat text and spit it out as HTML.
- * \param align html align string
+ *  Read Citadel variformat text and spit it out as HTML.
+ *  align html align string
  */
-void fmout(char *align)
+inline void fmout(char *align)
+{
+       _fmout(WC->WBuf, align);
+}
+
+void _fmout(StrBuf *Target, char *align)
 {
        int intext = 0;
        int bq = 0;
        char buf[SIZ];
 
-       wprintf("<div align=%s>\n", align);
+       StrBufAppendPrintf(Target, "<div align=%s>\n", align);
        while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
 
                if ((intext == 1) && (isspace(buf[0]))) {
@@ -129,10 +134,10 @@ void fmout(char *align)
                 * " >" quotes and will convert to <BLOCKQUOTE> tags.
                 */
                if ((bq == 0) && (!strncmp(buf, " >", 2))) {
-                       wprintf("<BLOCKQUOTE>");
+                       StrBufAppendBufPlain(Target, HKEY("<BLOCKQUOTE>"), 0);
                        bq = 1;
                } else if ((bq == 1) && (strncmp(buf, " >", 2))) {
-                       wprintf("</BLOCKQUOTE>");
+                       StrBufAppendBufPlain(Target, HKEY("</BLOCKQUOTE>"), 0);
                        bq = 0;
                }
                if ((bq == 1) && (!strncmp(buf, " >", 2))) {
@@ -141,8 +146,8 @@ void fmout(char *align)
                /** Activate embedded URL's */
                url(buf, sizeof(buf));
 
-               escputs(buf);
-               wprintf("\n");
+               escputs(buf);//// TODO: Target
+               StrBufAppendBufPlain(Target, HKEY("\n"), 0);
        }
        if (bq == 1) {
                wprintf("</I>");
@@ -150,11 +155,79 @@ void fmout(char *align)
        wprintf("</div><br />\n");
 }
 
+void FmOut(StrBuf *Target, char *align, StrBuf *Source)
+{
+       const char *ptr, *pte;
+       const char *BufPtr = NULL;
+       StrBuf *Line = NewStrBuf();
+       StrBuf *Line1 = NewStrBuf();
+       StrBuf *Line2 = NewStrBuf();
+       int bn = 0;
+       int bq = 0;
+       int i, n, done = 0;
+       long len;
+       int intext = 0;
+
+       StrBufAppendPrintf(Target, "<div align=%s>\n", align);
+       while ((n = StrBufSipLine(Line, Source, &BufPtr), n >= 0) && !done)
+       {
+               done = n == 0;
+               bq = 0;
+               i = 0;
+               ptr = ChrPtr(Line);
+               len = StrLength(Line);
+               pte = ptr + len;
+
+               if ((intext == 1) && (isspace(*ptr))) {
+                       StrBufAppendBufPlain(Target, HKEY("<br />"), 0);
+               }
+               intext = 1;
+               if (isspace(*ptr)) while ((ptr < pte) &&
+                      ((*ptr == '>') ||
+                       isspace(*ptr)))
+               {
+                       if (*ptr == '>')
+                               bq++;
+                       ptr ++;
+                       i++;
+               }
+
+               /**
+                * Quoted text should be displayed in italics and in a
+                * different colour.  This code understands Citadel-style
+                * " >" quotes and will convert to <BLOCKQUOTE> tags.
+                */
+               if (i > 0) StrBufCutLeft(Line, i);
+               
+
+               for (i = bn; i < bq; i++)                               
+                       StrBufAppendBufPlain(Target, HKEY("<blockquote>"), 0);
+               for (i = bq; i < bn; i++)                               
+                       StrBufAppendBufPlain(Target, HKEY("</blockquote>"), 0);
+               bn = bq;
+
+               if (StrLength(Line) == 0)
+                       continue;
+               /** Activate embedded URL's */
+               UrlizeText(Line1, Line, Line2);
+
+               StrEscAppend(Target, Line1, NULL, 0, 0);
+
+               StrBufAppendBufPlain(Target, HKEY("\n"), 0);
+       }
+       for (i = 0; i < bn; i++)                                
+               StrBufAppendBufPlain(Target, HKEY("</blockquote>"), 0);
+       StrBufAppendBufPlain(Target, HKEY("</div><br />\n"), 0);
+       FreeStrBuf(&Line);
+       FreeStrBuf(&Line1);
+       FreeStrBuf(&Line2);
+}
+
 
 
 
 /**
- * \brief Read Citadel variformat text and spit it out as HTML in a form
+ *  Read Citadel variformat text and spit it out as HTML in a form
  * suitable for embedding in another message (forward/quote).
  * (NO LINEBREAKS ALLOWED HERE!)
  */
@@ -197,9 +270,9 @@ void pullquote_fmout(void) {
 
 
 /**
- * \brief Transmit message text (in memory) to the server.
+ *  Transmit message text (in memory) to the server.
  *
- * \param ptr Pointer to the message being transmitted
+ *  ptr Pointer to the message being transmitted
  */
 void text_to_server(char *ptr)
 {
@@ -240,10 +313,10 @@ void text_to_server(char *ptr)
 
 
 /**
- * \brief Transmit message text (in memory) to the server,
+ *  Transmit message text (in memory) to the server,
  *        converting to Quoted-Printable encoding as we go.
  *
- * \param ptr Pointer to the message being transmitted
+ *  ptr Pointer to the message being transmitted
  */
 void text_to_server_qp(char *ptr)
 {
@@ -316,7 +389,7 @@ void text_to_server_qp(char *ptr)
 
 
 /**
- * \brief translate server message output to text
+ *  translate server message output to text
  * (used for editing room info files and such)
  */
 void server_to_text()
@@ -384,12 +457,13 @@ int read_server_binary(StrBuf *Ret, size_t total_len)
                    }
                }
        }
+       FreeStrBuf(&Buf);
        return StrLength(Ret);
 }
 
 
 /**
- * \brief Read text from server, appending to a string buffer until the
+ *  Read text from server, appending to a string buffer until the
  * usual 000 terminator is found.  Caller is responsible for freeing
  * the returned pointer.
  */
@@ -417,5 +491,11 @@ int read_server_text(StrBuf *Buf, long *nLines)
 }
 
 
+int GetServerStatus(StrBuf *Line, long* FullState)
+{
+       if (FullState != NULL)
+               *FullState = StrTol(Line);
+       return ChrPtr(Line)[0] - 48;
+}
 
 /*@}*/