templatize the summary (half baked)

[citadel.git] / webcit / serv_func.c

diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index e812de3817b25f70feaa70afe0eadebef03d8364..6e2bdb98929bd237f03c655119ce242cad9cf6ff 100644 (file)
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -50,6 +50,7 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
        ServInfo *info;
        StrBuf *Buf;
        int a;
+       int rc;
 
        Buf = NewStrBuf();
 
@@ -63,7 +64,7 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
        );
        StrBuf_ServGetln(Buf);
        if (GetServerStatus(Buf, NULL) != 2) {
-               lprintf(0, "get_serv_info(IDEN): unexpected answer [%s]\n",
+               syslog(0, "get_serv_info(IDEN): unexpected answer [%s]\n",
                        ChrPtr(Buf));
                FreeStrBuf(&Buf);
                return NULL;
@@ -77,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) {
-               lprintf(0, "get_serv_info(ICAL sgi|1): unexpected answer [%s]\n",
+               syslog(0, "get_serv_info(ICAL sgi|1): unexpected answer [%s]\n",
                        ChrPtr(Buf));
                FreeStrBuf(&Buf);
                return NULL;
@@ -87,7 +88,7 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
        serv_puts("INFO");
        StrBuf_ServGetln(Buf);
        if (GetServerStatus(Buf, NULL) != 1) {
-               lprintf(0, "get_serv_info(INFO sgi|1): unexpected answer [%s]\n",
+               syslog(0, "get_serv_info(INFO sgi|1): unexpected answer [%s]\n",
                        ChrPtr(Buf));
                FreeStrBuf(&Buf);
                return NULL;
@@ -96,7 +97,11 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
        info = (ServInfo*)malloc(sizeof(ServInfo));
        memset(info, 0, sizeof(ServInfo));
        a = 0;
-       while (StrBuf_ServGetln(Buf), (strcmp(ChrPtr(Buf), "000")!= 0)) {
+       while (rc = StrBuf_ServGetln(Buf),
+              (rc >= 0) &&
+              ((rc != 3) || 
+               strcmp(ChrPtr(Buf), "000")))
+       {
                switch (a) {
                case 0:
                        info->serv_pid = StrToi(Buf);
@@ -167,7 +172,6 @@ int GetConnected (void)
                WCC->serv_sock = tcp_connectsock(ctdlhost, ctdlport);
        
        if (WCC->serv_sock < 0) {
-               do_logout();
                FreeStrBuf(&WCC->ReadBuf);
                return 1;
        }
@@ -200,8 +204,6 @@ int GetConnected (void)
                        return 1;
                }
 
-               /* 2010jun03: every now and then the connection to Citadel dies before this point.  why? */
-
                /*
                 * From what host is our user connecting?  Go with
                 * the host at the other end of the HTTP socket,
@@ -270,7 +272,7 @@ void _fmout(StrBuf *Target, char *align)
        while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
 
                if ((intext == 1) && (isspace(buf[0]))) {
-                       wc_printf("<br />");
+                       wc_printf("<br>");
                }
                intext = 1;
 
@@ -298,7 +300,7 @@ void _fmout(StrBuf *Target, char *align)
        if (bq == 1) {
                wc_printf("</I>");
        }
-       wc_printf("</div><br />\n");
+       wc_printf("</div><br>\n");
 }
 
 void FmOut(StrBuf *Target, char *align, StrBuf *Source)
@@ -390,7 +392,7 @@ void pullquote_fmout(void) {
        while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
 
                if ((intext == 1) && (isspace(buf[0]))) {
-                       wc_printf("<br />");
+                       wc_printf("<br>");
                }
                intext = 1;
 
@@ -597,6 +599,14 @@ void tmplput_serv_ip(StrBuf *Target, WCTemplputParams *TP)
        StrBufAppendPrintf(Target, "%d", WC->ctdl_pid);
 }
 
+void tmplput_serv_admin(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       if (WCC->serv_info == NULL)
+               return;
+       StrBufAppendTemplate(Target, TP, WCC->serv_info->serv_sysadm, 0);
+}
+
 void tmplput_serv_nodename(StrBuf *Target, WCTemplputParams *TP)
 {
        wcsession *WCC = WC;
@@ -776,6 +786,7 @@ InitModule_SERVFUNC
        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);
+       RegisterNamespace("SERV:ADMIN", 1, 2, tmplput_serv_admin, NULL, CTX_NONE);
 }