*
*/
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
#include "webcit.h"
#include "vcard.h"
#include "webserver.h"
/*
+ * Sanitize and enhance an HTML message for display.
+ * Also convert weird character sets to UTF-8 if necessary.
*/
-void output_html(void) {
+void output_html(char *charset) {
char buf[SIZ];
char *msg;
char *ptr;
int output_length = 0;
char new_window[SIZ];
int brak = 0;
+ int alevel = 0;
int i;
int linklen;
+#ifdef HAVE_ICONV
+ 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 */
+#endif
msg = strdup("");
- sprintf(new_window, "<A TARGET=\"%s\" HREF=", TARGET);
+ sprintf(new_window, "<a target=\"%s\" href=", TARGET);
- while (serv_gets(buf), strcmp(buf, "000")) {
+ while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
line_length = strlen(buf);
buffer_length = content_length + line_length + 2;
msg = realloc(msg, buffer_length);
if (msg == NULL) {
- wprintf("<B>realloc() error! "
- "couldn't get %d bytes: %s</B><BR><BR>\n",
+ wprintf("<b>");
+ wprintf(_("realloc() error! couldn't get %d bytes: %s"),
buffer_length + 1,
strerror(errno));
+ wprintf("</b><br /><br />\n");
return;
}
strcpy(&msg[content_length], buf);
content_length += 1;
}
+#ifdef HAVE_ICONV
+ if ( (strcasecmp(charset, "us-ascii"))
+ && (strcasecmp(charset, "UTF-8"))
+ && (strcasecmp(charset, ""))
+ ) {
+ ic = iconv_open("UTF-8", charset);
+ if (ic == (iconv_t)(-1) ) {
+ lprintf(5, "%s:%d iconv_open() failed: %s\n",
+ __FILE__, __LINE__, strerror(errno));
+ }
+ }
+ if (ic != (iconv_t)(-1) ) {
+ ibuf = msg;
+ ibuflen = content_length;
+ obuflen = content_length + (content_length / 2) ;
+ obuf = (char *) malloc(obuflen);
+ osav = obuf;
+ iconv(ic, &ibuf, &ibuflen, &obuf, &obuflen);
+ content_length = content_length + (content_length / 2) - obuflen;
+ osav[content_length] = 0;
+ free(msg);
+ msg = osav;
+ iconv_close(ic);
+ }
+#endif
+
ptr = msg;
msgstart = msg;
msgend = &msg[content_length];
* the way we parse URL's, it'll even handle mailto: links
* that have "?subject=" in them.
*/
- if (!strncasecmp(ptr, "<A HREF=\"mailto:", 16)) {
+ if (!strncasecmp(ptr, "<a href=\"mailto:", 16)) {
content_length += 64;
converted_msg = realloc(converted_msg, content_length);
sprintf(&converted_msg[output_length],
- "<A HREF=\"/display_enter"
+ "<a href=\"display_enter"
"?force_room=_MAIL_&recp=");
output_length += 47;
ptr = &ptr[16];
- ++brak;
+ ++alevel;
}
/* Make links open in a separate window */
- else if (!strncasecmp(ptr, "<A HREF=", 8)) {
+ else if (!strncasecmp(ptr, "<a href=", 8)) {
content_length += 64;
converted_msg = realloc(converted_msg, content_length);
sprintf(&converted_msg[output_length], new_window);
output_length += strlen(new_window);
ptr = &ptr[8];
- ++brak;
+ ++alevel;
}
/* 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)
+ else if ( (brak == 0) && (alevel == 0)
&& (!strncasecmp(ptr, "http://", 7))) {
linklen = 0;
/* Find the end of the link */
||(isspace(ptr[i]))
||(ptr[i]==10)
||(ptr[i]==13)
+ ||(ptr[i]=='(')
||(ptr[i]==')')
+ ||(ptr[i]=='<')
||(ptr[i]=='>')
+ ||(ptr[i]=='[')
||(ptr[i]==']')
) linklen = i;
if (linklen > 0) break;
*/
if (*ptr == '<') ++brak;
if (*ptr == '>') --brak;
+ if (!strncasecmp(ptr, "</A>", 3)) --alevel;
converted_msg[output_length] = *ptr++;
converted_msg[++output_length] = 0;
}
client_write(converted_msg, output_length);
/* A little trailing vertical whitespace... */
- wprintf("<BR><BR>\n");
+ wprintf("<br /><br />\n");
/* Now give back the memory */
free(converted_msg);