\n", align);
- while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-
- if ((intext == 1) && (isspace(buf[0]))) {
- wprintf("
");
+ StrBuf *Buf;
+ wcsession *WCC = WC;
+
+ if (WCC->ReadBuf == NULL)
+ WCC->ReadBuf = NewStrBufPlain(NULL, SIZ * 4);
+ if (is_uds) /* unix domain socket */
+ WCC->serv_sock = uds_connectsock(serv_sock_name);
+ else /* tcp socket */
+ WCC->serv_sock = tcp_connectsock(ctdlhost, ctdlport);
+
+ if (WCC->serv_sock < 0) {
+ WCC->connected = 0;
+ FreeStrBuf(&WCC->ReadBuf);
+ return 1;
+ }
+ else {
+ long Status;
+ int short_status;
+ Buf = NewStrBuf();
+ WCC->connected = 1;
+ StrBuf_ServGetln(Buf); /* get the server greeting */
+ short_status = GetServerStatus(Buf, &Status);
+ FreeStrBuf(&Buf);
+
+ /* Server isn't ready for us? */
+ if (short_status != 2) {
+ if (Status == 551) {
+ hprintf("HTTP/1.1 503 Service Unavailable\r\n");
+ hprintf("Content-type: text/plain; charset=utf-8\r\n");
+ 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."));
+ }
+ else {
+ wc_printf("%ld %s\n",
+ Status,
+ _("Received unexpected answer from Citadel server; bailing out.")
+ );
+ hprintf("HTTP/1.1 502 Bad Gateway\r\n");
+ hprintf("Content-type: text/plain; charset=utf-8\r\n");
+ }
+ end_burst();
+ end_webcit_session();
+ return 1;
}
- intext = 1;
- /**
- * Quoted text should be displayed in italics and in a
- * different colour. This code understands Citadel-style
- * " >" quotes and will convert to
tags.
+ /*
+ * From what host is our user connecting? Go with
+ * the host at the other end of the HTTP socket,
+ * unless we are following X-Forwarded-For: headers
+ * and such a header has already turned up something.
*/
- if ((bq == 0) && (!strncmp(buf, " >", 2))) {
- wprintf("");
- bq = 1;
- } else if ((bq == 1) && (strncmp(buf, " >", 2))) {
- wprintf("
");
- bq = 0;
+ if ( (!follow_xff) || (StrLength(WCC->Hdr->HR.browser_host) == 0) ) {
+ if (WCC->Hdr->HR.browser_host == NULL) {
+ WCC->Hdr->HR.browser_host = NewStrBuf();
+ Put(WCC->Hdr->HTTPHeaders, HKEY("FreeMeWithTheOtherHeaders"),
+ WCC->Hdr->HR.browser_host, HFreeStrBuf);
+ }
+ locate_host(WCC->Hdr->HR.browser_host, WCC->Hdr->http_sock);
}
- if ((bq == 1) && (!strncmp(buf, " >", 2))) {
- strcpy(buf, &buf[2]);
+ if (WCC->serv_info == NULL) {
+ WCC->serv_info = get_serv_info(WCC->Hdr->HR.browser_host, WCC->Hdr->HR.user_agent);
}
- /** Activate embedded URL's */
- url(buf);
-
- escputs(buf);
- wprintf("\n");
- }
- if (bq == 1) {
- wprintf("");
+ if (WCC->serv_info == NULL){
+ begin_burst();
+ wc_printf(_("Received unexpected answer from Citadel server; bailing out."));
+ hprintf("HTTP/1.1 502 Bad Gateway\r\n");
+ hprintf("Content-type: text/plain; charset=utf-8\r\n");
+ end_burst();
+ end_webcit_session();
+ return 1;
+ }
+ if (WCC->serv_info->serv_rev_level < MINIMUM_CIT_VERSION) {
+ begin_burst();
+ 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"
+ " newer.\n\n\n"),
+ WCC->serv_info->serv_rev_level / 100,
+ WCC->serv_info->serv_rev_level % 100,
+ MINIMUM_CIT_VERSION / 100,
+ MINIMUM_CIT_VERSION % 100
+ );
+ hprintf("HTTP/1.1 200 OK\r\n");
+ hprintf("Content-type: text/plain; charset=utf-8\r\n");
+ end_burst();
+ end_webcit_session();
+ return 1;
+ }
+ SetInlinMimeRenderers();
}
- wprintf("
\n", align);
-/**
- * \brief 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];
+ if (StrLength(Source) > 0)
+ do
+ {
+ StrBufSipLine(Line, Source, &BufPtr);
+ bq = 0;
+ i = 0;
+ ptr = ChrPtr(Line);
+ len = StrLength(Line);
+ pte = ptr + len;
- while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+ if ((intext == 1) && (isspace(*ptr))) {
+ StrBufAppendBufPlain(Target, HKEY("
"), 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
tags.
+ */
+ if (i > 0) StrBufCutLeft(Line, i);
+
- if ((intext == 1) && (isspace(buf[0]))) {
- wprintf("
");
- }
- intext = 1;
+ for (i = bn; i < bq; i++)
+ StrBufAppendBufPlain(Target, HKEY(""), 0);
+ for (i = bq; i < bn; i++)
+ StrBufAppendBufPlain(Target, HKEY("
"), 0);
+ bn = bq;
- /**
- * Quoted text should be displayed in italics and in a
- * different colour. This code understands Citadel-style
- * " >" quotes and will convert to tags.
- */
- if ((bq == 0) && (!strncmp(buf, " >", 2))) {
- wprintf("");
- bq = 1;
- } else if ((bq == 1) && (strncmp(buf, " >", 2))) {
- wprintf("
");
- bq = 0;
- }
- if ((bq == 1) && (!strncmp(buf, " >", 2))) {
- strcpy(buf, &buf[2]);
+ if (StrLength(Line) == 0)
+ continue;
+
+ /* Activate embedded URL's */
+ UrlizeText(Line1, Line, Line2);
+
+ StrEscAppend(Target, Line1, NULL, 0, 0);
+
+ StrBufAppendBufPlain(Target, HKEY("\n"), 0);
}
+ while ((BufPtr != StrBufNOTNULL) &&
+ (BufPtr != NULL));
- msgescputs(buf);
- }
- if (bq == 1) {
- wprintf("");
+ for (i = 0; i < bn; i++) {
+ StrBufAppendBufPlain(Target, HKEY("
"), 0);
}
+ StrBufAppendBufPlain(Target, HKEY("