cleanup webcit.h; utils.c, remove unneeded stuff

[citadel.git] / webcit / serv_func.c

diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index 0c89245516b225e459433d0ba970a0ef5863067a..14a4d655937151e456e1269cad7c6ea03d20fd22 100644 (file)
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -204,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,
@@ -381,48 +379,6 @@ void FmOut(StrBuf *Target, char *align, StrBuf *Source)
 }
 
 
-/*
- * 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!)
- */
-void pullquote_fmout(void) {
-       int intext = 0;
-       int bq = 0;
-       char buf[SIZ];
-
-       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))) {
-                       wc_printf("<BLOCKQUOTE>");
-                       bq = 1;
-               } else if ((bq == 1) && (strncmp(buf, " >", 2))) {
-                       wc_printf("</BLOCKQUOTE>");
-                       bq = 0;
-               }
-               if ((bq == 1) && (!strncmp(buf, " >", 2))) {
-                       strcpy(buf, &buf[2]);
-               }
-
-               msgescputs(buf);
-       }
-       if (bq == 1) {
-               wc_printf("</I>");
-       }
-}
-
-
-
 
 /*
  *  Transmit message text (in memory) to the server.
@@ -601,6 +557,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;
@@ -780,6 +744,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", 0, 1, tmplput_serv_admin, NULL, CTX_NONE);
 }