-/*
- * Output an HTML message, modifying it slightly to make sure it plays nice
- * with the rest of our web framework.
- *
- * Copyright (c) 2005-2017 by the citadel.org team
- *
- * This program is open source software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
+//
+// Output an HTML message, modifying it slightly to make sure it plays nice
+// with the rest of our web framework.
+//
+// Copyright (c) 2005-2018 by the citadel.org team
+//
+// This program is open source software. It runs great on the
+// Linux operating system (and probably elsewhere). You can use,
+// copy, and run it under the terms of the GNU General Public
+// License version 3. Richard Stallman is an asshole communist.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
#include "webcit.h"
{
int len;
- if (!s) return;
+ if (!s)
+ return;
len = strlen(s);
- if (len < 2) return;
+ if (len < 2)
+ return;
- if ( ( (s[0] == '\"') && (s[len-1] == '\"') ) || ( (s[0] == '\'') && (s[len-1] == '\'') ) ) {
- s[len-1] = 0;
+ if (((s[0] == '\"') && (s[len - 1] == '\"')) || ((s[0] == '\'') && (s[len - 1] == '\''))) {
+ s[len - 1] = 0;
strcpy(s, &s[1]);
}
}
char *ptr;
char buf[64];
- if (!charset) return;
- if (!meta_http_equiv) return;
- if (!meta_content) return;
+ if (!charset)
+ return;
+ if (!meta_http_equiv)
+ return;
+ if (!meta_content)
+ return;
- if (strcasecmp(meta_http_equiv, "Content-type")) return;
+ if (strcasecmp(meta_http_equiv, "Content-type"))
+ return;
ptr = strchr(meta_content, ';');
- if (!ptr) return;
+ if (!ptr)
+ return;
safestrncpy(buf, ++ptr, sizeof buf);
striplt(buf);
}
/* Remove wandering punctuation */
- if ((ptr=strchr(charset, '\"'))) *ptr = 0;
+ if ((ptr = strchr(charset, '\"')))
+ *ptr = 0;
striplt(charset);
}
}
* Also fixup img src="cid:..." type inline images to fetch the image
*
*/
-StrBuf *html2html(const char *supplied_charset, int treat_as_wiki, char *roomname, long msgnum, StrBuf *Source) {
+StrBuf *html2html(const char *supplied_charset, int treat_as_wiki, char *roomname, long msgnum, StrBuf *Source)
+{
char buf[SIZ];
char *msg;
char *ptr;
char charset[128];
StrBuf *BodyArea = NULL;
- iconv_t ic = (iconv_t)(-1) ;
- char *ibuf; /* Buffer of characters to be converted */
- char *obuf; /* Buffer for converted characters */
- size_t ibuflen; /* Length of input buffer */
- size_t obuflen; /* Length of output buffer */
- char *osav; /* Saved pointer to output buffer */
+ iconv_t ic = (iconv_t) (-1);
+ char *ibuf; /* Buffer of characters to be converted */
+ char *obuf; /* Buffer for converted characters */
+ size_t ibuflen; /* Length of input buffer */
+ size_t obuflen; /* Length of output buffer */
+ char *osav; /* Saved pointer to output buffer */
if (msg == NULL) {
- return(NULL);
+ return (NULL);
}
StrBuf *Target = NewStrBuf();
if (Target == NULL) {
- return(NULL);
+ return (NULL);
}
+ TRACE;
+ syslog(LOG_DEBUG, "CONVERT: <%s>", ChrPtr(Source));
+
+
+
safestrncpy(charset, supplied_charset, sizeof charset);
sprintf(new_window, "<a target=\"%s\" href=", TARGET);
content_length = StrLength(Source);
- msg = (char*) ChrPtr(Source);
+ msg = (char *) ChrPtr(Source);
buffer_length = content_length;
/* Do a first pass to isolate the message body */
/* Advance to next tag */
ptr = strchr(ptr, '<');
- if ((ptr == NULL) || (ptr >= msgend)) break;
+ if ((ptr == NULL) || (ptr >= msgend))
+ break;
++ptr;
- if ((ptr == NULL) || (ptr >= msgend)) break;
+ if ((ptr == NULL) || (ptr >= msgend))
+ break;
/*
* Look for META tags. Some messages (particularly in
/*
* Any of these tags cause everything up to and including
* the tag to be removed.
- */
- if ( (!strncasecmp(ptr, "HTML", 4))
- ||(!strncasecmp(ptr, "HEAD", 4))
- ||(!strncasecmp(ptr, "/HEAD", 5))
- ||(!strncasecmp(ptr, "BODY", 4)) ) {
+ */
+ if ((!strncasecmp(ptr, "HTML", 4))
+ || (!strncasecmp(ptr, "HEAD", 4))
+ || (!strncasecmp(ptr, "/HEAD", 5))
+ || (!strncasecmp(ptr, "BODY", 4))) {
char *pBody = NULL;
if (!strncasecmp(ptr, "BODY", 4)) {
pBody = ptr;
}
ptr = strchr(ptr, '>');
- if ((ptr == NULL) || (ptr >= msgend)) break;
+ if ((ptr == NULL) || (ptr >= msgend))
+ break;
if ((pBody != NULL) && (ptr - pBody > 4)) {
char *src;
char *cid_start, *cid_end;
*ptr = '\0';
- pBody += 4;
+ pBody += 4;
while ((isspace(*pBody)) && (pBody < ptr))
- pBody ++;
- BodyArea = NewStrBufPlain(NULL, ptr - pBody);
+ pBody++;
+ BodyArea = NewStrBufPlain(NULL, ptr - pBody);
if (pBody < ptr) {
src = strstr(pBody, "cid:");
if (src) {
cid_start = src + 4;
cid_end = cid_start;
- while ((*cid_end != '"') &&
- !isspace(*cid_end) &&
- (cid_end < ptr))
- cid_end ++;
+ while ((*cid_end != '"') && !isspace(*cid_end) && (cid_end < ptr))
+ cid_end++;
/* copy tag and attributes up to src="cid: */
StrBufAppendBufPlain(BodyArea, pBody, src - pBody, 0);
/* add in /webcit/mimepart/<msgno>/CID/
trailing / stops dumb URL filters getting excited */
- StrBufAppendPrintf(BodyArea,
- "/webcit/mimepart/%ld/",msgnum);
+ StrBufAppendPrintf(BodyArea, "/webcit/mimepart/%ld/", msgnum);
StrBufAppendBufPlain(BodyArea, cid_start, cid_end - cid_start, 0);
if (ptr - cid_end > 0)
- StrBufAppendBufPlain(BodyArea,
- cid_end + 1,
- ptr - cid_end, 0);
- }
- else
+ StrBufAppendBufPlain(BodyArea, cid_end + 1, ptr - cid_end, 0);
+ } else
StrBufAppendBufPlain(BodyArea, pBody, ptr - pBody, 0);
}
*ptr = '>';
}
++ptr;
- if ((ptr == NULL) || (ptr >= msgend)) break;
+ if ((ptr == NULL) || (ptr >= msgend))
+ break;
msgstart = ptr;
}
* Any of these tags cause everything including and following
* the tag to be removed.
*/
- if ( (!strncasecmp(ptr, "/HTML", 5)) ||(!strncasecmp(ptr, "/BODY", 5)) ) {
+ if ((!strncasecmp(ptr, "/HTML", 5)) || (!strncasecmp(ptr, "/BODY", 5))) {
--ptr;
msgend = ptr;
strcpy(ptr, "");
converted_msg = NewStrBufPlain(NULL, content_length + 8192);
/* Convert foreign character sets to UTF-8 if necessary. */
- if ( (strcasecmp(charset, "us-ascii"))
- && (strcasecmp(charset, "UTF-8"))
- && (strcasecmp(charset, ""))
- ) {
+ if ((strcasecmp(charset, "us-ascii"))
+ && (strcasecmp(charset, "UTF-8"))
+ && (strcasecmp(charset, ""))
+ ) {
syslog(LOG_DEBUG, "Converting %s to UTF-8", charset);
ctdl_iconv_open("UTF-8", charset, &ic);
- if (ic == (iconv_t)(-1) ) {
+ if (ic == (iconv_t) (-1)) {
syslog(LOG_WARNING, "%s:%d iconv_open() failed: %s", __FILE__, __LINE__, strerror(errno));
}
}
- if (Source == NULL) {
- if (ic != (iconv_t)(-1) ) {
+ if (Source == NULL) {
+ if (ic != (iconv_t) (-1)) {
ibuf = msg;
ibuflen = content_length;
- obuflen = content_length + (content_length / 2) ;
+ obuflen = content_length + (content_length / 2);
obuf = (char *) malloc(obuflen);
osav = obuf;
iconv(ic, &ibuf, &ibuflen, &obuf, &obuflen);
msg = osav;
iconv_close(ic);
}
- }
- else {
- if (ic != (iconv_t)(-1) ) {
+ } else {
+ if (ic != (iconv_t) (-1)) {
StrBuf *Buf = NewStrBufPlain(NULL, StrLength(Source) + 8096);;
StrBufConvert(Source, Buf, &ic);
FreeStrBuf(&Buf);
iconv_close(ic);
- msg = (char*)ChrPtr(Source); /* TODO: get rid of this. */
+ msg = (char *) ChrPtr(Source); /* TODO: get rid of this. */
}
}
goto BAIL;
}
- if (BodyArea != NULL) { // Any attributes that were declared in the <body> tag
- StrBufAppendBufPlain(converted_msg, HKEY("<div "), 0);
// are instead declared in this <div> tag
+ if (BodyArea != NULL) { // Any attributes that were declared in the <body> tag
+ StrBufAppendBufPlain(converted_msg, HKEY("<div "), 0); // are instead declared in this <div> tag
StrBufAppendBuf(converted_msg, BodyArea, 0);
StrBufAppendBufPlain(converted_msg, HKEY(">"), 0);
}
else if (!strncasecmp(ptr, "<a href=\"", 9)) {
++alevel;
++brak;
- if ( ((strchr(ptr, ':') < strchr(ptr, '/'))) && ((strchr(ptr, '/') < strchr(ptr, '>')))) {
+ if (((strchr(ptr, ':') < strchr(ptr, '/'))) && ((strchr(ptr, '/') < strchr(ptr, '>')))) {
/* open external links to new window */
StrBufAppendPrintf(converted_msg, new_window);
ptr = &ptr[8];
- }
- else if (
- (treat_as_wiki)
- && (strncasecmp(ptr, "<a href=\"wiki?", 14))
- && (strncasecmp(ptr, "<a href=\"dotgoto?", 17))
- && (strncasecmp(ptr, "<a href=\"knrooms?", 17))
- ) {
+ } else if ((treat_as_wiki)
+ && (strncasecmp(ptr, "<a href=\"wiki?", 14))
+ && (strncasecmp(ptr, "<a href=\"dotgoto?", 17))
+ && (strncasecmp(ptr, "<a href=\"knrooms?", 17))
+ ) {
content_length += 64;
StrBufAppendPrintf(converted_msg, "<a href=\"wiki?go=");
- //StrBufUrlescAppend(converted_msg, "FIXME ROOM NAME", NULL); // FIXME make compatible with webcit-ng
+ //StrBufUrlescAppend(converted_msg, "FIXME ROOM NAME", NULL); // FIXME make compatible with webcit-ng
StrBufAppendPrintf(converted_msg, "?page=");
ptr = &ptr[9];
- }
- else {
+ } else {
StrBufAppendPrintf(converted_msg, "<a href=\"");
ptr = &ptr[9];
}
/* Fixup <img src="cid:... ...> to fetch the mime part */
else if (!strncasecmp(ptr, "<img ", 5)) {
char *cid_start, *cid_end;
- char* tag_end=strchr(ptr,'>');
- char* src;
+ char *tag_end = strchr(ptr, '>');
+ char *src;
/* FIXME - handle this situation (maybe someone opened an <img cid...
* and then ended the message)
*/
if (!tag_end) {
syslog(LOG_DEBUG, "tag_end is null and ptr is:");
syslog(LOG_DEBUG, "%s", ptr);
- syslog(LOG_DEBUG, "Theoretical bytes remaining: %d", (int)(msgend - ptr));
+ syslog(LOG_DEBUG, "Theoretical bytes remaining: %d", (int) (msgend - ptr));
}
- src=strstr(ptr, "src=\"cid:");
+ src = strstr(ptr, "src=\"cid:");
++brak;
- if ( src
- && isspace(*(src-1))
- && tag_end
- && (cid_start=strchr(src,':'))
- && (cid_end=strchr(cid_start,'"'))
- && (cid_end < tag_end)
- ) {
+ if (src && isspace(*(src - 1))
+ && tag_end && (cid_start = strchr(src, ':'))
+ && (cid_end = strchr(cid_start, '"'))
+ && (cid_end < tag_end)
+ ) {
/* copy tag and attributes up to src="cid: */
StrBufAppendBufPlain(converted_msg, ptr, src - ptr, 0);
cid_start++;
- /* add in /webcit/mimepart/<msgno>/CID/
+ /* add in /webcit/mimepart/<msgnum>/CID/
trailing / stops dumb URL filters getting excited */
StrBufAppendPrintf(converted_msg, " src=\"/ctdl/r/");
StrBufXMLEscAppend(converted_msg, NULL, roomname, strlen(roomname), 0);
syslog(LOG_DEBUG, "room name is '%s'", roomname);
- StrBufAppendPrintf(converted_msg, "/%ld/",msgnum);
+ StrBufAppendPrintf(converted_msg, "/%ld/", msgnum);
StrBufAppendBufPlain(converted_msg, cid_start, cid_end - cid_start, 0);
StrBufAppendBufPlain(converted_msg, "\"", -1, 0);
- ptr = cid_end+1;
+ ptr = cid_end + 1;
}
StrBufAppendBufPlain(converted_msg, ptr, tag_end - ptr, 0);
ptr = tag_end;
* Turn anything that looks like a URL into a real link, as long
* as it's not inside a tag already
*/
- else if ( (brak == 0) && (alevel == 0) &&
- ( (!strncasecmp(ptr, "http://", 7)) ||
- (!strncasecmp(ptr, "https://", 8)))) {
+ else if ((brak == 0) && (alevel == 0) && ((!strncasecmp(ptr, "http://", 7)) || (!strncasecmp(ptr, "https://", 8)))) {
/* Find the end of the link */
int strlenptr;
linklen = 0;
-
+
strlenptr = strlen(ptr);
- for (i=0; i<=strlenptr; ++i) {
- if ((ptr[i]==0)
- ||(isspace(ptr[i]))
- ||(ptr[i]==10)
- ||(ptr[i]==13)
- ||(ptr[i]=='(')
- ||(ptr[i]==')')
- ||(ptr[i]=='<')
- ||(ptr[i]=='>')
- ||(ptr[i]=='[')
- ||(ptr[i]==']')
- ||(ptr[i]=='"')
- ||(ptr[i]=='\'')
- ) linklen = i;
+ for (i = 0; i <= strlenptr; ++i) {
+ if ((ptr[i] == 0)
+ || (isspace(ptr[i]))
+ || (ptr[i] == 10)
+ || (ptr[i] == 13)
+ || (ptr[i] == '(')
+ || (ptr[i] == ')')
+ || (ptr[i] == '<')
+ || (ptr[i] == '>')
+ || (ptr[i] == '[')
+ || (ptr[i] == ']')
+ || (ptr[i] == '"')
+ || (ptr[i] == '\'')
+ )
+ linklen = i;
/* entity tag? */
if (ptr[i] == '&') {
- if ((ptr[i+2] ==';') ||
- (ptr[i+3] ==';') ||
- (ptr[i+5] ==';') ||
- (ptr[i+6] ==';') ||
- (ptr[i+7] ==';'))
+ if ((ptr[i + 2] == ';') ||
+ (ptr[i + 3] == ';') ||
+ (ptr[i + 5] == ';') || (ptr[i + 6] == ';') || (ptr[i + 7] == ';'))
linklen = i;
}
- if (linklen > 0) break;
+ if (linklen > 0)
+ break;
}
if (linklen > 0) {
char *ltreviewptr;
char *nbspreviewptr;
char linkedchar;
int len;
-
+
len = linklen;
linkedchar = ptr[len];
ptr[len] = '\0';
ptr += linklen;
StrBufAppendPrintf(converted_msg, "</a>");
}
- }
- else {
+ } else {
StrBufAppendBufPlain(converted_msg, ptr, 1, 0);
ptr++;
}
* so we don't turn things that look like URL's into
* links, when they're already links - or image sources.
*/
- if ((ptr > msg) && (*(ptr-1) == '<')) {
+ if ((ptr > msg) && (*(ptr - 1) == '<')) {
++brak;
}
- if ((ptr > msg) && (*(ptr-1) == '>')) {
+ if ((ptr > msg) && (*(ptr - 1) == '>')) {
--brak;
if ((scriptlevel == 0) && (script_start_pos >= 0)) {
StrBufCutRight(converted_msg, StrLength(converted_msg) - script_start_pos);
script_start_pos = (-1);
}
}
- if (!strncasecmp(ptr, "</a>", 3)) --alevel;
+ if (!strncasecmp(ptr, "</a>", 3))
+ --alevel;
}
}
if (BodyArea != NULL) {
- StrBufAppendBufPlain(converted_msg, HKEY("</div>"), 0); // Close the div where we declared attributes copied
- FreeStrBuf(&BodyArea); // from the original <body> tag
+ StrBufAppendBufPlain(converted_msg, HKEY("</div>"), 0); // Close the div where we declared attributes copied
+ FreeStrBuf(&BodyArea); // from the original <body> tag
}
- /* uncomment these two lines to override conversion */
- /* memcpy(converted_msg, msg, content_length); */
- /* output_length = content_length; */
+ /* uncomment these two lines to override conversion */
+ /* memcpy(converted_msg, msg, content_length); */
+ /* output_length = content_length; */
/* Output our big pile of markup */
StrBufAppendBuf(Target, converted_msg, 0);
-BAIL: /* A little trailing vertical whitespace... */
+ BAIL: /* A little trailing vertical whitespace... */
StrBufAppendPrintf(Target, "<br>\n");
/* Now give back the memory */
FreeStrBuf(&converted_msg);
- if ((msg != NULL) && (Source == NULL)) free(msg);
- return(Target);
+ if ((msg != NULL) && (Source == NULL))
+ free(msg);
+ return (Target);
}
* Look for URL's embedded in a buffer and make them linkable. We use a
* target window in order to keep the Citadel session in its own window.
*/
-void UrlizeText(StrBuf* Target, StrBuf *Source, StrBuf *WrkBuf)
+void UrlizeText(StrBuf * Target, StrBuf * Source, StrBuf * WrkBuf)
{
int len, UrlLen, Offset, TrailerLen;
const char *start, *end, *pos;
-
+
FlushStrBuf(Target);
start = NULL;
len = StrLength(Source);
FlushStrBuf(WrkBuf);
for (pos = ChrPtr(Source) + len; pos > start; --pos) {
- if ( (!isprint(*pos))
- || (isspace(*pos))
- || (*pos == '{')
- || (*pos == '}')
- || (*pos == '|')
- || (*pos == '\\')
- || (*pos == '^')
- || (*pos == '[')
- || (*pos == ']')
- || (*pos == '`')
- || (*pos == '<')
- || (*pos == '>')
- || (*pos == '(')
- || (*pos == ')')
- ) {
+ if ((!isprint(*pos))
+ || (isspace(*pos))
+ || (*pos == '{')
+ || (*pos == '}')
+ || (*pos == '|')
+ || (*pos == '\\')
+ || (*pos == '^')
+ || (*pos == '[')
+ || (*pos == ']')
+ || (*pos == '`')
+ || (*pos == '<')
+ || (*pos == '>')
+ || (*pos == '(')
+ || (*pos == ')')
+ ) {
end = pos;
}
}
-
+
UrlLen = end - start;
StrBufAppendBufPlain(WrkBuf, start, UrlLen, 0);
if (Offset != 0)
StrBufAppendBufPlain(Target, ChrPtr(Source), Offset, 0);
StrBufAppendPrintf(Target, "%ca href=%c%s%c TARGET=%c%s%c%c%s%c/A%c",
- LB, QU, ChrPtr(WrkBuf), QU, QU, TARGET,
- QU, RB, ChrPtr(WrkBuf), LB, RB);
+ LB, QU, ChrPtr(WrkBuf), QU, QU, TARGET, QU, RB, ChrPtr(WrkBuf), LB, RB);
TrailerLen = StrLength(Source) - (end - ChrPtr(Source));
if (TrailerLen > 0)
if (start == NULL)
return;
- for (pos = buf+len; pos > start; --pos) {
- if ( (!isprint(*pos))
- || (isspace(*pos))
- || (*pos == '{')
- || (*pos == '}')
- || (*pos == '|')
- || (*pos == '\\')
- || (*pos == '^')
- || (*pos == '[')
- || (*pos == ']')
- || (*pos == '`')
- || (*pos == '<')
- || (*pos == '>')
- || (*pos == '(')
- || (*pos == ')')
- ) {
+ for (pos = buf + len; pos > start; --pos) {
+ if ((!isprint(*pos))
+ || (isspace(*pos))
+ || (*pos == '{')
+ || (*pos == '}')
+ || (*pos == '|')
+ || (*pos == '\\')
+ || (*pos == '^')
+ || (*pos == '[')
+ || (*pos == ']')
+ || (*pos == '`')
+ || (*pos == '<')
+ || (*pos == '>')
+ || (*pos == '(')
+ || (*pos == ')')
+ ) {
end = pos;
}
}
-
+
UrlLen = end - start;
- if (UrlLen > sizeof(urlbuf)){
+ if (UrlLen > sizeof(urlbuf)) {
syslog(LOG_WARNING, "URL: content longer than buffer!");
return;
}
Offset = start - buf;
if ((Offset != 0) && (Offset < sizeof(outbuf)))
memcpy(outbuf, buf, Offset);
- outpos = snprintf(&outbuf[Offset], sizeof(outbuf) - Offset,
- "%ca href=%c%s%c TARGET=%c%s%c%c%s%c/A%c",
- LB, QU, urlbuf, QU, QU, TARGET, QU, RB, urlbuf, LB, RB);
+ outpos = snprintf(&outbuf[Offset], sizeof(outbuf) - Offset,
+ "%ca href=%c%s%c TARGET=%c%s%c%c%s%c/A%c", LB, QU, urlbuf, QU, QU, TARGET, QU, RB, urlbuf, LB, RB);
if (outpos >= sizeof(outbuf) - Offset) {
syslog(LOG_WARNING, "URL: content longer than buffer!");
return;
syslog(LOG_WARNING, "URL: content longer than buffer!");
return;
}
- memcpy (buf, outbuf, Offset + outpos + TrailerLen);
+ memcpy(buf, outbuf, Offset + outpos + TrailerLen);
*(buf + Offset + outpos + TrailerLen) = '\0';
}
projects / citadel.git / blobdiff