* move serv_func.c:read_server_binary() to tcp_sockets.c: serv_read_binary()
[citadel.git] / webcit / serv_func.c
index ddc94f9af91bc57f29be7da6fb17289590126c4b..654cb4f2dc0bad384290a9c36ab013eddefc02ec 100644 (file)
@@ -169,7 +169,7 @@ int GetConnected (void)
                FreeStrBuf(&Buf);
                /* Are there too many users already logged in? */
                if (Status == 571) {
-                       wprintf(_("This server is already serving its maximum number of users and cannot accept any additional logins at this time.  Please try again later or contact your system administrator."));
+                       wc_printf(_("This server is already serving its maximum number of users and cannot accept any additional logins at this time.  Please try again later or contact your system administrator."));
                        end_burst();
                        end_webcit_session();
                        return 1;
@@ -193,7 +193,7 @@ int GetConnected (void)
                        WCC->serv_info = get_serv_info(WCC->Hdr->HR.browser_host, WCC->Hdr->HR.user_agent);
                if (WCC->serv_info == NULL){
                        begin_burst();
-                       wprintf(_("Received unexpected answer from Citadel "
+                       wc_printf(_("Received unexpected answer from Citadel "
                                  "server; bailing out."));
                        hprintf("HTTP/1.1 200 OK\r\n");
                        hprintf("Content-type: text/plain; charset=utf-8\r\n");
@@ -203,7 +203,7 @@ int GetConnected (void)
                }
                if (WCC->serv_info->serv_rev_level < MINIMUM_CIT_VERSION) {
                        begin_burst();
-                       wprintf(_("You are connected to a Citadel "
+                       wc_printf(_("You are connected to a Citadel "
                                  "server running Citadel %d.%02d. \n"
                                  "In order to run this version of WebCit "
                                  "you must also have Citadel %d.%02d or"
@@ -243,7 +243,7 @@ void _fmout(StrBuf *Target, char *align)
        while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
 
                if ((intext == 1) && (isspace(buf[0]))) {
-                       wprintf("<br />");
+                       wc_printf("<br />");
                }
                intext = 1;
 
@@ -269,9 +269,9 @@ void _fmout(StrBuf *Target, char *align)
                StrBufAppendBufPlain(Target, HKEY("\n"), 0);
        }
        if (bq == 1) {
-               wprintf("</I>");
+               wc_printf("</I>");
        }
-       wprintf("</div><br />\n");
+       wc_printf("</div><br />\n");
 }
 
 void FmOut(StrBuf *Target, char *align, StrBuf *Source)
@@ -363,7 +363,7 @@ void pullquote_fmout(void) {
        while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
 
                if ((intext == 1) && (isspace(buf[0]))) {
-                       wprintf("<br />");
+                       wc_printf("<br />");
                }
                intext = 1;
 
@@ -373,10 +373,10 @@ void pullquote_fmout(void) {
                 * " >" quotes and will convert to <BLOCKQUOTE> tags.
                 */
                if ((bq == 0) && (!strncmp(buf, " >", 2))) {
-                       wprintf("<BLOCKQUOTE>");
+                       wc_printf("<BLOCKQUOTE>");
                        bq = 1;
                } else if ((bq == 1) && (strncmp(buf, " >", 2))) {
-                       wprintf("</BLOCKQUOTE>");
+                       wc_printf("</BLOCKQUOTE>");
                        bq = 0;
                }
                if ((bq == 1) && (!strncmp(buf, " >", 2))) {
@@ -386,7 +386,7 @@ void pullquote_fmout(void) {
                msgescputs(buf);
        }
        if (bq == 1) {
-               wprintf("</I>");
+               wc_printf("</I>");
        }
 }
 
@@ -524,64 +524,15 @@ void server_to_text()
 
        while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
                if ((buf[0] == 32) && (count > 0)) {
-                       wprintf("\n");
+                       wc_printf("\n");
                }
-               wprintf("%s", buf);
+               wc_printf("%s", buf);
                ++count;
        }
 }
 
 
 
-/**
- * Read binary data from server into memory using a series of
- * server READ commands.
- * \return the read content as StrBuf
- */
-int read_server_binary(StrBuf *Ret, size_t total_len, StrBuf *Buf) 
-{
-       char buf[SIZ];
-       size_t bytes = 0;
-       size_t thisblock = 0;
-       
-       if (Ret == NULL)
-           return -1;
-
-       while (bytes < total_len) {
-               thisblock = 4095;
-               if ((total_len - bytes) < thisblock) {
-                       thisblock = total_len - bytes;
-                       if (thisblock == 0) {
-                               FlushStrBuf(Ret); 
-                               FreeStrBuf(&Buf);
-                               return -1; 
-                       }
-               }
-               serv_printf("READ %d|%d", (int)bytes, (int)thisblock);
-               if (StrBuf_ServGetln(Buf) > 0)
-               {
-                       if (GetServerStatus(Buf, NULL) == 6)
-                       {
-                           StrBufCutLeft(Buf, 4);
-                           thisblock = StrTol(Buf);
-                           if (!WC->connected) {
-                                   FlushStrBuf(Ret); 
-                                   FreeStrBuf(&Buf); 
-                                   return -1; 
-                           }
-                           StrBuf_ServGetBLOBBuffered(Ret, thisblock);
-                           bytes += thisblock;
-                   }
-                   else {
-                           FreeStrBuf(&Buf);
-                           lprintf(3, "Error: %s\n", &buf[4]);
-                           return -1;
-                   }
-               }
-       }
-       return StrLength(Ret);
-}
-
 
 /**
  *  Read text from server, appending to a string buffer until the
@@ -741,7 +692,6 @@ void tmplput_mesg(StrBuf *Target, WCTemplputParams *TP)
 void RegisterEmbeddableMimeType(const char *MimeType, long MTLen, int Priority)
 {
        StrBuf *MT;
-       printf("%s - %ld\n", MimeType, Priority);
        MT = NewStrBufPlain(MimeType, MTLen);
        Put(EmbeddableMimes, IKEY(Priority), MT, HFreeStrBuf);
 }
@@ -756,14 +706,13 @@ void CreateMimeStr(void)
        it = GetNewHashPos(EmbeddableMimes, 0);
        while (GetNextHashPos(EmbeddableMimes, it, &len, &Key, &vMime) &&
                (vMime != NULL)) {
-               printf("%s - \n", ChrPtr((StrBuf*) vMime));
                if (StrLength(EmbeddableMimeStrs) > 0)
                        StrBufAppendBufPlain(EmbeddableMimeStrs, HKEY("|"), 0);
                else 
                        StrBufAppendBufPlain(EmbeddableMimeStrs, HKEY("MSGP "), 0);
                StrBufAppendBuf(EmbeddableMimeStrs, (StrBuf*) vMime, 0);
        }
-       printf("------%ld-------------%s------%s------------\n", len, ChrPtr(EmbeddableMimeStrs), ChrPtr((StrBuf*) vMime));
+       DeleteHashPos(&it);
 }
 
 void
@@ -794,14 +743,14 @@ InitModule_SERVFUNC
        RegisterConditional(HKEY("COND:SERV:OPENID"), 2, conditional_serv_supports_openid, CTX_NONE);
        RegisterConditional(HKEY("COND:SERV:NEWU"), 2, conditional_serv_newuser_disabled, CTX_NONE);
        RegisterConditional(HKEY("COND:SERV:HAVEFULLTEXT"), 2, conditional_serv_fulltext_enabled, CTX_NONE);
-       RegisterNamespace("SERV:PID", 0, 0, tmplput_serv_ip, CTX_NONE);
-       RegisterNamespace("SERV:NODENAME", 0, 1, tmplput_serv_nodename, CTX_NONE);
-       RegisterNamespace("SERV:HUMANNODE", 0, 1, tmplput_serv_humannode, CTX_NONE);
-       RegisterNamespace("SERV:FQDN", 0, 1, tmplput_serv_fqdn, CTX_NONE);
-       RegisterNamespace("SERV:SOFTWARE", 0, 1, tmplput_serv_software, CTX_NONE);
-       RegisterNamespace("SERV:REV_LEVEL", 0, 0, tmplput_serv_rev_level, CTX_NONE);
-       RegisterNamespace("SERV:BBS_CITY", 0, 1, tmplput_serv_bbs_city, CTX_NONE);
-       RegisterNamespace("SERV:MESG", 1, 2, tmplput_mesg, CTX_NONE);
+       RegisterNamespace("SERV:PID", 0, 0, tmplput_serv_ip, NULL, CTX_NONE);
+       RegisterNamespace("SERV:NODENAME", 0, 1, tmplput_serv_nodename, NULL, CTX_NONE);
+       RegisterNamespace("SERV:HUMANNODE", 0, 1, tmplput_serv_humannode, NULL, CTX_NONE);
+       RegisterNamespace("SERV:FQDN", 0, 1, tmplput_serv_fqdn, NULL, CTX_NONE);
+       RegisterNamespace("SERV:SOFTWARE", 0, 1, tmplput_serv_software, NULL, CTX_NONE);
+       RegisterNamespace("SERV:REV_LEVEL", 0, 0, tmplput_serv_rev_level, NULL, CTX_NONE);
+       RegisterNamespace("SERV:BBS_CITY", 0, 1, tmplput_serv_bbs_city, NULL, CTX_NONE);
+       RegisterNamespace("SERV:MESG", 1, 2, tmplput_mesg, NULL, CTX_NONE);
 /*TODO //      RegisterNamespace("SERV:LDAP_SUPP", 0, 0, tmplput_serv_ldap_enabled, 0); */
 }