SYSLOG: more places to correct the loglevel parameters.

[citadel.git] / webcit / serv_func.c

diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index 873a3ffde67114687c9492af222b5273a31a1e0a..f03ff442a6005bad75639b5352800558432624f8 100644 (file)
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -64,7 +64,7 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
        );
        StrBuf_ServGetln(Buf);
        if (GetServerStatus(Buf, NULL) != 2) {
-               syslog(0, "get_serv_info(IDEN): unexpected answer [%s]\n",
+               syslog(LOG_WARNING, "get_serv_info(IDEN): unexpected answer [%s]\n",
                        ChrPtr(Buf));
                FreeStrBuf(&Buf);
                return NULL;
@@ -78,7 +78,7 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
        serv_puts("ICAL sgi|1");
        StrBuf_ServGetln(Buf);
        if (GetServerStatus(Buf, NULL) != 2) {
-               syslog(0, "get_serv_info(ICAL sgi|1): unexpected answer [%s]\n",
+               syslog(LOG_WARNING, "get_serv_info(ICAL sgi|1): unexpected answer [%s]\n",
                        ChrPtr(Buf));
                FreeStrBuf(&Buf);
                return NULL;
@@ -88,7 +88,7 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
        serv_puts("INFO");
        StrBuf_ServGetln(Buf);
        if (GetServerStatus(Buf, NULL) != 1) {
-               syslog(0, "get_serv_info(INFO sgi|1): unexpected answer [%s]\n",
+               syslog(LOG_WARNING, "get_serv_info(INFO sgi|1): unexpected answer [%s]\n",
                        ChrPtr(Buf));
                FreeStrBuf(&Buf);
                return NULL;
@@ -254,55 +254,6 @@ int GetConnected (void)
        return 0;
 }
 
-/*
- *  Read Citadel variformat text and spit it out as HTML.
- *  align html align string
- */
-inline void fmout(const char *align)
-{
-       _fmout(WC->WBuf, align);
-}
-
-void _fmout(StrBuf *Target, const char *align)
-{
-       int intext = 0;
-       int bq = 0;
-       char buf[SIZ];
-
-       StrBufAppendPrintf(Target, "<div align=%s>\n", align);
-       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-
-               if ((intext == 1) && (isspace(buf[0]))) {
-                       wc_printf("<br>");
-               }
-               intext = 1;
-
-               /*
-                * 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 ((bq == 0) && (!strncmp(buf, " >", 2))) {
-                       StrBufAppendBufPlain(Target, HKEY("<BLOCKQUOTE>"), 0);
-                       bq = 1;
-               } else if ((bq == 1) && (strncmp(buf, " >", 2))) {
-                       StrBufAppendBufPlain(Target, HKEY("</BLOCKQUOTE>"), 0);
-                       bq = 0;
-               }
-               if ((bq == 1) && (!strncmp(buf, " >", 2))) {
-                       strcpy(buf, &buf[2]);
-               }
-               /* Activate embedded URL's */
-               url(buf, sizeof(buf));
-
-               escputs(buf);
-               StrBufAppendBufPlain(Target, HKEY("\n"), 0);
-       }
-       if (bq == 1) {
-               wc_printf("</I>");
-       }
-       wc_printf("</div><br>\n");
-}
 
 void FmOut(StrBuf *Target, const char *align, const StrBuf *Source)
 {
@@ -524,22 +475,23 @@ void server_to_text()
 int read_server_text(StrBuf *Buf, long *nLines)
 {
        wcsession *WCC = WC;
+       StrBuf *ReadBuf;
        long nRead;
        long nTotal = 0;
        long nlines;
        
        nlines = 0;
+       ReadBuf = NewStrBuf();
        while ((WCC->serv_sock!=-1) &&
-              (nRead = StrBuf_ServGetln(Buf), (nRead >= 0) ))
+              (nRead = StrBuf_ServGetln(ReadBuf), (nRead >= 0) &&
+               ((nRead != 3)||(strcmp(ChrPtr(ReadBuf), "000") != 0))))
        {
-               if (strcmp(ChrPtr(Buf) + nTotal, "000") != 0) {
-                       StrBufCutRight(Buf, nRead);
-                       break;
-               }
+               StrBufAppendBuf(Buf, ReadBuf, 0);
+               StrBufAppendBufPlain(Buf, HKEY("\n"), 0);
                nTotal += nRead;
                nlines ++;
        }
-
+       FreeStrBuf(&ReadBuf);
        *nLines = nlines;
        return nTotal;
 }
@@ -623,6 +575,14 @@ int conditional_serv_newuser_disabled(StrBuf *Target, WCTemplputParams *TP)
        return WCC->serv_info->serv_newuser_disabled != 0;
 }
 
+int conditional_serv_supports_guest(StrBuf *Target, WCTemplputParams *TP)                                                                                                                                       
+{
+       wcsession *WCC = WC;
+        if (WCC->serv_info == NULL)
+               return 0;
+        return WCC->serv_info->serv_supports_guest != 0;
+}
+
 int conditional_serv_supports_openid(StrBuf *Target, WCTemplputParams *TP)
 {
        wcsession *WCC = WC;
@@ -741,10 +701,11 @@ InitModule_SERVFUNC
        if (is_uds)
                snprintf(serv_sock_name, PATH_MAX, "%s/citadel.socket", ctdlport);
 
-       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:FULLTEXT_ENABLED"), 2, conditional_serv_fulltext_enabled, CTX_NONE);
-       RegisterConditional(HKEY("COND:SERV:LDAP_ENABLED"), 2, conditional_serv_ldap_enabled, CTX_NONE);
+       RegisterConditional("COND:SERV:OPENID", 2, conditional_serv_supports_openid, CTX_NONE);
+       RegisterConditional("COND:SERV:NEWU", 2, conditional_serv_newuser_disabled, CTX_NONE);
+       RegisterConditional("COND:SERV:FULLTEXT_ENABLED", 2, conditional_serv_fulltext_enabled, CTX_NONE);
+       RegisterConditional("COND:SERV:LDAP_ENABLED", 2, conditional_serv_ldap_enabled, CTX_NONE);
+        RegisterConditional("COND:SERV:SUPPORTS_GUEST", 2, conditional_serv_supports_guest, 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);