int i;
int linklen;
char charset[128];
+ StrBuf *BodyArea = NULL;
#ifdef HAVE_ICONV
iconv_t ic = (iconv_t)(-1) ;
char *ibuf; /**< Buffer of characters to be converted */
if (ptr == NULL) {
StrBufAppendPrintf(Target, "<b>");
StrBufAppendPrintf(Target, _("realloc() error! couldn't get %d bytes: %s"),
- buffer_length + 1,
- strerror(errno));
+ buffer_length + 1,
+ strerror(errno));
StrBufAppendPrintf(Target, "</b><br /><br />\n");
while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
/** flush */
stripquotes(meta_http_equiv);
stripquotes(meta_content);
extract_charset_from_meta(charset,
- meta_http_equiv, meta_content);
+ meta_http_equiv, meta_content);
}
free(meta_content);
}
* the tag to be removed.
*/
if ( (!strncasecmp(ptr, "HTML", 4))
- ||(!strncasecmp(ptr, "HEAD", 4))
- ||(!strncasecmp(ptr, "/HEAD", 5))
- ||(!strncasecmp(ptr, "BODY", 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 ((pBody != NULL) && (ptr - pBody > 4)) {
+ char* src;
+ char *cid_start, *cid_end;
+
+ *ptr = '\0';
+ pBody += 4;
+ while ((isspace(*pBody)) && (pBody < ptr))
+ 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 ++;
+
+ /* 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/%d/",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, pBody, ptr - pBody, 0);
+ }
+ *ptr = '>';
+ }
++ptr;
if ((ptr == NULL) || (ptr >= msgend)) break;
msgstart = ptr;
* the tag to be removed.
*/
if ( (!strncasecmp(ptr, "/HTML", 5))
- ||(!strncasecmp(ptr, "/BODY", 5)) ) {
+ ||(!strncasecmp(ptr, "/BODY", 5)) ) {
--ptr;
msgend = ptr;
strcpy(ptr, "");
-
+
}
++ptr;
/** Convert foreign character sets to UTF-8 if necessary. */
#ifdef HAVE_ICONV
if ( (strcasecmp(charset, "us-ascii"))
- && (strcasecmp(charset, "UTF-8"))
- && (strcasecmp(charset, ""))
- ) {
+ && (strcasecmp(charset, "UTF-8"))
+ && (strcasecmp(charset, ""))
+ ) {
lprintf(9, "Converting %s to UTF-8\n", charset);
ctdl_iconv_open("UTF-8", charset, &ic);
if (ic == (iconv_t)(-1) ) {
lprintf(5, "%s:%d iconv_open() failed: %s\n",
- __FILE__, __LINE__, strerror(errno));
+ __FILE__, __LINE__, strerror(errno));
}
}
if (Source == NULL) {
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. */
}
}
-
+
#endif
/**
goto BAIL;
}
+ if (BodyArea != NULL) {
+ StrBufAppendBufPlain(converted_msg, HKEY("<table "), 0);
+ StrBufAppendBuf(converted_msg, BodyArea, 0);
+ StrBufAppendBufPlain(converted_msg, HKEY(" width=\"100%\"><tr><td>"), 0);
+ }
ptr = msg;
msgend = strchr(msg, 0);
while (ptr < msgend) {
if (!strncasecmp(ptr, "<a href=\"mailto:", 16)) {
content_length += 64;
StrBufAppendPrintf(converted_msg,
- "<a href=\"display_enter?force_room=_MAIL_&recp=");
+
"<a href=\"display_enter?force_room=_MAIL_&recp=");
ptr = &ptr[16];
++alevel;
++brak;
++alevel;
++brak;
if ( ((strchr(ptr, ':') < strchr(ptr, '/')))
- && ((strchr(ptr, '/') < strchr(ptr, '>')))
- ) {
+ && ((strchr(ptr, '/') < strchr(ptr, '>')))
+ ) {
/* open external links to new window */
StrBufAppendPrintf(converted_msg, new_window);
ptr = &ptr[8];
++brak;
if (src &&
- (cid_start=strchr(src,':')) &&
- (cid_end=strchr(cid_start,'"')) &&
- (cid_end < 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/
- trailing / stops dumb URL filters getting excited */
+ trailing / stops dumb URL filters getting excited */
StrBufAppendPrintf(converted_msg,
- "src=\"/webcit/mimepart/%d/",msgnum);
+ "src=\"/webcit/mimepart/%d/",msgnum);
StrBufAppendBufPlain(converted_msg, cid_start, cid_end - cid_start, 0);
StrBufAppendBufPlain(converted_msg, "/\"", -1, 0);
-
+
ptr = cid_end+1;
}
StrBufAppendBufPlain(converted_msg, ptr, tag_end - ptr, 0);
char *ltreviewptr;
char *nbspreviewptr;
char linkedchar;
- int len = linklen;
+ int len;
len = linklen;
linkedchar = ptr[len];
nbspreviewptr = strstr(ptr, " ");
if (nbspreviewptr != NULL) {
- ///*nbspreviewptr = '\0';
+ /* nbspreviewptr = '\0'; */
linklen = nbspreviewptr - ptr;
}
if (ltreviewptr != 0)
}
if (!strncasecmp(ptr, "</A>", 3)) --alevel;
}
+ if (BodyArea != NULL) {
+ StrBufAppendBufPlain(converted_msg, HKEY("</td></tr></table>"), 0);
+ FreeStrBuf(&BodyArea);
+ }
/** uncomment these two lines to override conversion */
/** memcpy(converted_msg, msg, content_length); */
LB, QU, ChrPtr(WrkBuf), QU, QU, TARGET,
QU, RB, ChrPtr(WrkBuf), LB, RB);
- TrailerLen = len - (end - start);
+ TrailerLen = StrLength(Source) - (end - ChrPtr(Source));
if (TrailerLen > 0)
StrBufAppendBufPlain(Target, end, TrailerLen, 0);
}
projects / citadel.git / blobdiff