From 3dab6262856c54b325e5a4f9e8b46d9e9a380a24 Mon Sep 17 00:00:00 2001
From: Andrew Pamment <apamment@yandex.com>
Date: Mon, 22 Oct 2018 16:14:13 +1000
Subject: [PATCH] Finished work converting www pages

---
 deps/aha/aha.c  |    1 -
 src/www_email.c |  462 +++++++++++++++-----
 src/www_msgs.c  |  469 ++++++++++++++++-----
 src/www_tree.c  | 1077 ++++++++++++++++++++++++-----------------------
 4 files changed, 1257 insertions(+), 752 deletions(-)

diff --git a/deps/aha/aha.c b/deps/aha/aha.c
index c7d2edf..194fd23 100644
--- a/deps/aha/aha.c
+++ b/deps/aha/aha.c
@@ -402,7 +402,6 @@ struct www_tag * aha(char *input, struct www_tag *parent)
 						}
 					}
                     break;
- 
 				default:	{
                     stralloc_append1(&data, c);
                     break;
diff --git a/src/www_email.c b/src/www_email.c
index 17b1159..5de77ce 100644
--- a/src/www_email.c
+++ b/src/www_email.c
@@ -5,9 +5,11 @@
 #include <time.h>
 #include <stdlib.h>
 #include <sys/utsname.h>
+#include "www_tree.h"
 #include "bbs.h"
 
 extern struct bbs_config conf;
+extern struct www_tag * aha(char *input, struct www_tag *parent);
 
 int www_email_delete(struct user_record *user, int id) {
 	char buffer[PATH_MAX];
@@ -88,23 +90,14 @@ int www_send_email(struct user_record *user, char *recipient, char *subject, cha
 
 	uname(&name);
 
-	for (char *p = ibody; *p != '\0'; ++p)
-		if (*p != '\n')
+	for (char *p = ibody; *p != '\0'; ++p) {
+		if (*p == 0xc2 && *(p+1) == 0xa0) {
+			stralloc_append1(&sa, ' ');
+			p++;
+		} else if (*p != '\n') {
 			stralloc_append1(&sa, *p);
-
-	stralloc_cats(&sa, "\r--- MagickaBBS v");
-	stralloc_cat_long(&sa, VERSION_MAJOR);
-	stralloc_append1(&sa, '.');
-	stralloc_cat_long(&sa, VERSION_MINOR);
-	stralloc_cats(&sa, VERSION_STR);
-	stralloc_cats(&sa, " (");
-	stralloc_cats(&sa, name.sysname);
-	stralloc_append1(&sa, '/');
-	stralloc_cats(&sa, name.machine);
-	stralloc_cats(&sa, ")\r");
-	stralloc_cats(&sa, " * Origin: ");
-	stralloc_cats(&sa, conf.default_tagline);
-	stralloc_cats(&sa, " \r");
+		}
+	}
 	stralloc_0(&sa);
 	body = sa.s;
 
@@ -147,24 +140,94 @@ int www_send_email(struct user_record *user, char *recipient, char *subject, cha
 }
 
 char *www_new_email() {
-	stralloc page = EMPTY_STRALLOC;
+	struct www_tag *page = www_tag_new(NULL, "");
+	struct www_tag *cur_tag;
+	struct www_tag *child_tag;
+	struct www_tag *child_child_tag;
+	
+	cur_tag = www_tag_new("div", NULL);
+	www_tag_add_attrib(cur_tag, "class", "content-header");
+	www_tag_add_child(page, cur_tag);
+	
+	child_tag = www_tag_new("h2", NULL);
+	www_tag_add_child(cur_tag, child_tag);
+	
+	child_child_tag = www_tag_new(NULL, "New Email");
+	www_tag_add_child(child_tag, child_child_tag);
 
-	stralloc_copys(&page, "<div class=\"content-header\"><h2>New Email</h2></div>\n");
-	stralloc_cats(&page, "<form action=\"");
-	stralloc_cats(&page, conf.www_url);
-	stralloc_cats(&page, "email/\" method=\"POST\" onsubmit=\"return validate()\" enctype=\"application/x-www-form-urlencoded\">\n");
-	stralloc_cats(&page, "To : <input type=\"text\" name=\"recipient\" id=\"recipient\" /><br />\n");
-	stralloc_cats(&page, "Subject : <input type=\"text\" name=\"subject\" id=\"subject\" /><br />\n");
-	stralloc_cats(&page, "<textarea name=\"body\" wrap=\"hard\" rows=\"25\" cols=\"79\" id=\"body\"></textarea>\n<br />");
-	stralloc_cats(&page, "<input type=\"submit\" name=\"submit\" value=\"Send\" />\n<br />");
-	stralloc_cats(&page, "</form>\n");
-	stralloc_0(&page);
+	cur_tag = www_tag_new("form", NULL);
+	
+	stralloc url = EMPTY_STRALLOC;
 
-	return page.s;
+	stralloc_cats(&url, conf.www_url);
+	stralloc_cats(&url, "email/");
+	stralloc_0(&url);
+	
+	www_tag_add_attrib(cur_tag, "action", url.s);
+	free(url.s);
+	
+	www_tag_add_attrib(cur_tag, "method", "POST");
+	www_tag_add_attrib(cur_tag, "onsubmit", "return validate()");
+	www_tag_add_attrib(cur_tag, "enctype", "application/x-www-form-urlencoded");
+	www_tag_add_child(page, cur_tag);
+
+	child_tag = www_tag_new(NULL, "To : ");
+	www_tag_add_child(cur_tag, child_tag);
+	
+	child_tag = www_tag_new("input", NULL);
+	www_tag_add_attrib(child_tag, "type", "text");
+	www_tag_add_attrib(child_tag, "name", "recipient");
+	www_tag_add_attrib(child_tag, "id", "recipient");
+	www_tag_add_child(cur_tag, child_tag);
+	
+	child_tag = www_tag_new("br", NULL);
+	www_tag_add_child(cur_tag, child_tag);
+	
+
+	child_tag = www_tag_new(NULL, "Subject : ");
+	www_tag_add_child(cur_tag, child_tag);
+	
+	child_tag = www_tag_new("input", NULL);
+	www_tag_add_attrib(child_tag, "type", "text");
+	www_tag_add_attrib(child_tag, "name", "subject");
+	www_tag_add_attrib(child_tag, "id", "subject");
+	www_tag_add_child(cur_tag, child_tag);
+	
+	child_tag = www_tag_new("br", NULL);
+	www_tag_add_child(cur_tag, child_tag);
+
+	child_tag = www_tag_new("textarea", NULL);
+	www_tag_add_attrib(child_tag, "name", "body");
+	www_tag_add_attrib(child_tag, "wrap", "hard");
+	www_tag_add_attrib(child_tag, "rows", "25");
+	www_tag_add_attrib(child_tag, "cols", "79");
+	www_tag_add_attrib(child_tag, "id", "body");
+	www_tag_add_child(cur_tag, child_tag);
+	
+	child_child_tag = www_tag_new(NULL, "");
+	www_tag_add_child(child_tag, child_child_tag);
+	
+	child_tag = www_tag_new("br", NULL);
+	www_tag_add_child(cur_tag, child_tag);
+	
+	child_tag = www_tag_new("input", NULL);
+	www_tag_add_attrib(child_tag, "type", "submit");
+	www_tag_add_attrib(child_tag, "name", "submit");
+	www_tag_add_attrib(child_tag, "value", "Send");
+	www_tag_add_child(cur_tag, child_tag);
+
+	child_tag = www_tag_new("br", NULL);
+	www_tag_add_child(cur_tag, child_tag);
+	
+	return www_tag_unwravel(page);
 }
 
 char *www_email_display(struct user_record *user, int email) {
-	stralloc page = EMPTY_STRALLOC;
+	struct www_tag *page;
+	struct www_tag *cur_tag;
+	struct www_tag *child_tag;
+	struct www_tag *child_child_tag;
+	struct www_tag *child_child_child_tag;
 	char pathbuf[PATH_MAX];
 	char datebuf[32];
 	sqlite3 *db;
@@ -216,7 +279,19 @@ char *www_email_display(struct user_record *user, int email) {
 	sqlite3_bind_int(res, 2, email - 1);
 
 	if (sqlite3_step(res) != SQLITE_ROW) {
-		return strdup("<div class=\"content-header\"><h2>No Such Email</h2></div>\n");
+		page = www_tag_new(NULL, "");
+		
+		cur_tag = www_tag_new("div", NULL);
+		www_tag_add_attrib(cur_tag, "class", "content-header");
+		www_tag_add_child(page, cur_tag);
+		
+		child_tag = www_tag_new("h2", NULL);
+		www_tag_add_child(cur_tag, child_tag);
+		
+		child_child_tag = www_tag_new(NULL, "No such email!");
+		www_tag_add_child(child_tag, child_child_tag);
+		
+		return www_tag_unwravel(page);
 	}
 	id = sqlite3_column_int(res, 0);
 	from = (char *)sqlite3_column_text(res, 1);
@@ -225,74 +300,161 @@ char *www_email_display(struct user_record *user, int email) {
 	date = (time_t)sqlite3_column_int(res, 4);
 	localtime_r(&date, &msg_date);
 
-	stralloc_copys(&page, "<div class=\"content-header\"><h2>Your Email</h2></div>\n");
-	stralloc_cats(&page, "<div class=\"email-view-header\">\n");
-	stralloc_cats(&page, "<div class=\"email-view-subject\">");
-	stralloc_cats(&page, subject);
-	stralloc_cats(&page, "</div>\n");
-	stralloc_cats(&page, "<div class=\"email-view-from\">From: ");
-	stralloc_cats(&page, from);
-	stralloc_cats(&page, "</div>\n");
-	stralloc_cats(&page, "<div class=\"email-view-date\">Date: ");
+	page = www_tag_new(NULL, "");
+		
+	cur_tag = www_tag_new("div", NULL);
+	www_tag_add_attrib(cur_tag, "class", "content-header");
+	www_tag_add_child(page, cur_tag);
+		
+	child_tag = www_tag_new("h2", NULL);
+	www_tag_add_child(cur_tag, child_tag);
+		
+	child_child_tag = www_tag_new(NULL, "Your Email");
+	www_tag_add_child(child_tag, child_child_tag);
+
+	cur_tag = www_tag_new("div", NULL);
+	www_tag_add_attrib(cur_tag, "class", "email-view-header");
+	www_tag_add_child(page, cur_tag);
+
+	child_tag = www_tag_new("div", NULL);
+	www_tag_add_attrib(child_tag, "class", "email-view-subject");
+	www_tag_add_child(cur_tag, child_tag);
+	
+	child_child_tag = www_tag_new(NULL, subject);
+	www_tag_add_child(child_tag, child_child_tag);
+
+	child_tag = www_tag_new("div", NULL);
+	www_tag_add_attrib(child_tag, "class", "email-view-from");
+	www_tag_add_child(cur_tag, child_tag);
+	
+	child_child_tag = www_tag_new(NULL, from);
+	www_tag_add_child(child_tag, child_child_tag);
+
+	child_tag = www_tag_new("div", NULL);
+	www_tag_add_attrib(child_tag, "class", "email-view-date");
+	www_tag_add_child(cur_tag, child_tag);
+	
+	child_child_tag = www_tag_new(NULL, "Date: ");
+	www_tag_add_child(child_tag, child_child_tag);
+		
 	if (conf.date_style == 1)
 		strftime(datebuf, sizeof datebuf, "%H:%M %m-%d-%y", &msg_date);
 	else
 		strftime(datebuf, sizeof datebuf, "%H:%M %d-%m-%y", &msg_date);
-	stralloc_cats(&page, datebuf);
-	stralloc_cats(&page, "</div>\n");
-	stralloc_cats(&page, "</div>\n");
-	stralloc_cats(&page, "<div id=\"msgbody\">\n");
-	for (char *p = body; *p != '\0'; ++p) {
-		switch (*p) {
-			case '\r': stralloc_cats(&page, "<br />"); break;
-			case '<': stralloc_cats(&page, "&lt;"); break;
-			case '>': stralloc_cats(&page, "&gt;"); break;
-			default: stralloc_append1(&page, *p); break;
-		}
-	}
-	stralloc_cats(&page, "</div>\n");
-	stralloc_cats(&page, "<div class=\"email-reply-form\">\n");
-	stralloc_cats(&page, "<h3>Reply</h3>\n");
-	stralloc_cats(&page, "<form action=\"");
-	stralloc_cats(&page, conf.www_url);
-	stralloc_cats(&page, "email/\" method=\"POST\" enctype=\"application/x-www-form-urlencoded\">\n");
-	stralloc_cats(&page, "<input type=\"hidden\" name=\"recipient\" value=\"");
-	stralloc_cats(&page, from);
-	stralloc_cats(&page, "\" />\n");
-	stralloc_cats(&page, "Subject : <input type=\"text\" name=\"subject\" value=\"");
+		
+	child_child_tag = www_tag_new(NULL, datebuf);
+	www_tag_add_child(child_tag, child_child_tag);
+		
+	cur_tag = www_tag_new("div", NULL);
+	www_tag_add_attrib(cur_tag, "id", "msgbody");
+	www_tag_add_child(page, cur_tag);
+	
+	aha(body, cur_tag);
+
+	cur_tag = www_tag_new("div", NULL);
+	www_tag_add_attrib(cur_tag, "class", "email-reply-form");
+	www_tag_add_child(page, cur_tag);
+	
+	child_tag = www_tag_new("h3", NULL);
+	www_tag_add_child(cur_tag, child_tag);
+
+	child_child_tag = www_tag_new(NULL, "Reply");
+	www_tag_add_child(child_tag, child_child_tag);
+
+	child_tag = www_tag_new("form", NULL);
+	
+	stralloc url = EMPTY_STRALLOC;
+	
+	stralloc_cats(&url, conf.www_url);
+	stralloc_cats(&url, "email/");
+	stralloc_0(&url);
+	
+	www_tag_add_attrib(child_tag, "action", url.s);
+	free(url.s);
+	
+	www_tag_add_attrib(child_tag, "method", "POST");
+	www_tag_add_attrib(child_tag, "enctype", "application/x-www-form-urlencoded");
+	www_tag_add_child(cur_tag, child_tag);
+	
+	child_child_tag = www_tag_new("input", NULL);
+	www_tag_add_attrib(child_child_tag, "type", "hidden");
+	www_tag_add_attrib(child_child_tag, "name", "recipient");
+	www_tag_add_attrib(child_child_tag, "value", from);
+	www_tag_add_child(child_tag, child_child_tag);
+
+	child_child_tag = www_tag_new(NULL, "Subject : ");
+	www_tag_add_child(child_tag, child_child_tag);	
+	
+	child_child_tag = www_tag_new("input", NULL);
+	www_tag_add_attrib(child_child_tag, "type", "text");
+	www_tag_add_attrib(child_child_tag, "name", "subject");
+
+	stralloc subj = EMPTY_STRALLOC;
+	
 	if (strncasecmp(subject, "re:", 3) != 0)
-		stralloc_cats(&page, "RE: ");
-	stralloc_cats(&page, subject);
-	stralloc_cats(&page, "\" /><br />\n");
-	stralloc_cats(&page, "<textarea name=\"body\" wrap=\"hard\" rows=\"25\" cols=\"79\" id=\"replybody\">");
-	stralloc_cats(&page, from);
-	stralloc_cats(&page, " said....\n\n");
-	stralloc_cats(&page, "> ");
+		stralloc_cats(&subj, "RE: ");
+	stralloc_cats(&subj, subject);
+	stralloc_0(&subj);
+	www_tag_add_attrib(child_child_tag, "value", subj.s);
+	free(subj.s);
+	
+	www_tag_add_child(child_tag, child_child_tag);
+
+	child_child_tag = www_tag_new("br", NULL);
+	www_tag_add_child(child_tag, child_child_tag);
+
+	child_child_tag = www_tag_new("textarea", NULL);
+	www_tag_add_attrib(child_child_tag, "name", "body");
+	www_tag_add_attrib(child_child_tag, "wrap", "hard");
+	www_tag_add_attrib(child_child_tag, "rows", "25");
+	www_tag_add_attrib(child_child_tag, "cols", "79");
+	www_tag_add_attrib(child_child_tag, "id", "replybody");
+	www_tag_add_child(child_tag, child_child_tag);
+	
+	stralloc content = EMPTY_STRALLOC;
+
+	stralloc_cats(&content, from);
+	stralloc_cats(&content, " said....\n\n");
+	stralloc_cats(&content, "> ");
 	size_t column = 0;
 	for (char *p = body; *p != '\0'; ++p) {
 		if (*p == '\r') {
-			stralloc_cats(&page, "\n> ");
+			stralloc_cats(&content, "\n> ");
 			column = 0;
 			continue;
 		} else if (column >= 78) {
-			stralloc_cats(&page, "\n> ");
+			stralloc_cats(&content, "\n> ");
 			column = 0;
 		}
-		stralloc_append1(&page, *p);
+		stralloc_append1(&content, *p);
 		++column;
 	}
-	stralloc_cats(&page, "</textarea>\n<br />");
-	stralloc_cats(&page, "<input type=\"submit\" name=\"submit\" value=\"Reply\" />\n<br />");
-	stralloc_cats(&page, "</form>\n");
-	stralloc_cats(&page, "</div>\n");
-	stralloc_0(&page);
+	
+	stralloc_0(&content);
+	
+	child_child_child_tag = www_tag_new(NULL, content.s);
+	free(content.s);
+	
+	www_tag_add_child(child_child_tag, child_child_child_tag);
+
+	child_child_tag = www_tag_new("br", NULL);
+	www_tag_add_child(child_tag, child_child_tag);
+
+	child_child_tag = www_tag_new("input", NULL);
+	www_tag_add_attrib(child_child_tag, "type", "submit");
+	www_tag_add_attrib(child_child_tag, "name", "submit");
+	www_tag_add_attrib(child_child_tag, "value", "reply");
+	www_tag_add_child(child_tag, child_child_tag);
+
+	child_child_tag = www_tag_new("br", NULL);
+	www_tag_add_child(child_tag, child_child_tag);
 
 	sqlite3_finalize(res);
 	rc = sqlite3_prepare_v2(db, update_seen_sql, -1, &res, 0);
 	if (rc != SQLITE_OK) {
 		sqlite3_finalize(res);
 		sqlite3_close(db);
-		free(page.s);
+		www_tag_destroy(page);
 		return NULL;
 	}
 	sqlite3_bind_int(res, 1, id);
@@ -300,11 +462,16 @@ char *www_email_display(struct user_record *user, int email) {
 	sqlite3_finalize(res);
 	sqlite3_close(db);
 
-	return page.s;
+	return www_tag_unwravel(page);
 }
 
 char *www_email_summary(struct user_record *user) {
-	stralloc page = EMPTY_STRALLOC;
+	struct www_tag *page;
+	struct www_tag *cur_tag;
+	struct www_tag *child_tag;
+	struct www_tag *child_child_tag;
+	struct www_tag *child_child_child_tag;
+	struct www_tag *child_child_child_child_tag;
 	char pathbuf[PATH_MAX];
 	sqlite3 *db;
 	sqlite3_stmt *res;
@@ -343,11 +510,40 @@ char *www_email_summary(struct user_record *user) {
 	}
 	sqlite3_bind_text(res, 1, user->loginname, -1, 0);
 
-	stralloc_copys(&page, "<div class=\"content-header\"><h2>Your Email</h2></div>\n");
-	stralloc_cats(&page, "<div class=\"button\"><a href=\"");
-	stralloc_cats(&page, conf.www_url);
-	stralloc_cats(&page, "email/new\">New Email</a></div>\n");
-	stralloc_cats(&page, "<div class=\"div-table\">\n");
+	page = www_tag_new(NULL, "");
+	
+	cur_tag = www_tag_new("div", NULL);
+	www_tag_add_attrib(cur_tag, "class", "content-header");
+	www_tag_add_child(page, cur_tag);
+	
+	child_tag = www_tag_new("h2", NULL);
+	www_tag_add_child(cur_tag, child_tag);
+	
+	child_child_tag = www_tag_new(NULL, "Your Email");
+	www_tag_add_child(child_tag, child_child_tag);
+
+	cur_tag = www_tag_new("div", NULL);
+	www_tag_add_attrib(cur_tag, "class", "button");
+	www_tag_add_child(page, cur_tag);
+
+	child_tag = www_tag_new("a", NULL);
+	stralloc url = EMPTY_STRALLOC;
+	
+	stralloc_cats(&url, conf.www_url);
+	stralloc_cats(&url, "email/new");
+	stralloc_0(&url);
+
+	www_tag_add_attrib(child_tag, "href", url.s);
+	free(url.s);
+	www_tag_add_child(cur_tag, child_tag);
+
+	child_child_tag = www_tag_new(NULL, "New Email");
+	www_tag_add_child(child_tag, child_child_tag);
+
+	cur_tag = www_tag_new("div", NULL);
+	www_tag_add_attrib(cur_tag, "class", "div-table");
+	www_tag_add_child(page, cur_tag);
+	
 
 	while (sqlite3_step(res) == SQLITE_ROW) {
 		char datebuf[32];
@@ -360,39 +556,93 @@ char *www_email_summary(struct user_record *user) {
 
 		time_t date = (time_t)sqlite3_column_int(res, 4);
 		localtime_r(&date, &msg_date);
-		stralloc_cats(&page, "<div class=\"email-summary");
+		
+		child_tag = www_tag_new("div", NULL);
+
 		if (seen != 0) {
-			stralloc_cats(&page, "-seen");
+			www_tag_add_attrib(child_tag, "class", "email-summary-seen");
+		} else {
+			www_tag_add_attrib(child_tag, "class", "email-summary");
 		}
-		stralloc_cats(&page, "\"><div class=\"email-id\">");
-		stralloc_cat_long(&page, msgid);
-		stralloc_cats(&page, "</div><div class=\"email-subject\"><a href=\"");
-		stralloc_cats(&page, conf.www_url);
-		stralloc_cats(&page, "email/");
-		stralloc_cat_long(&page, msgid);
-		stralloc_cats(&page, "\">");
-		stralloc_cats(&page, subject);
-		stralloc_cats(&page, "</a></div><div class=\"email-from\">");
-		stralloc_cats(&page, from);
-		stralloc_cats(&page, "</div><div class=\"email-date\">");
+
+		www_tag_add_child(cur_tag, child_tag);
+		
+		child_child_tag = www_tag_new("div", NULL);
+		www_tag_add_attrib(child_child_tag, "class", "email-id");
+		www_tag_add_child(child_tag, child_child_tag);
+
+		url = EMPTY_STRALLOC;
+		stralloc_cat_long(&url, msgid);
+		stralloc_0(&url);
+		
+		child_child_child_tag = www_tag_new(NULL, url.s);
+		free(url.s);
+		
+		www_tag_add_child(child_child_tag, child_child_child_tag);
+	
+		child_child_tag = www_tag_new("div", NULL);
+		www_tag_add_attrib(child_child_tag, "class", "email-subject");
+		www_tag_add_child(child_tag, child_child_tag);
+	
+		child_child_child_tag = www_tag_new("a", NULL);
+		url = EMPTY_STRALLOC;
+		stralloc_cats(&url, conf.www_url);
+		stralloc_cats(&url, "email/");
+		stralloc_cat_long(&url, msgid);
+		stralloc_0(&url);
+		
+		www_tag_add_attrib(child_child_child_tag, "href", url.s);
+		free(url.s);
+		www_tag_add_child(child_child_tag, child_child_child_tag);
+		
+		child_child_child_child_tag = www_tag_new(NULL, subject);
+		www_tag_add_child(child_child_child_tag, child_child_child_child_tag);
+		
+		child_child_tag = www_tag_new("div", NULL);
+		www_tag_add_attrib(child_child_tag, "class", "email-from");
+		www_tag_add_child(child_tag, child_child_tag);
+
+		child_child_child_tag = www_tag_new(NULL, from);
+		www_tag_add_child(child_child_tag, child_child_child_tag);
+
+
+		child_child_tag = www_tag_new("div", NULL);
+		www_tag_add_attrib(child_child_tag, "class", "email-date");
+		www_tag_add_child(child_tag, child_child_tag);
+		
 		if (conf.date_style == 1)
 			strftime(datebuf, sizeof datebuf, "%H:%M %m-%d-%y", &msg_date);
 		else
 			strftime(datebuf, sizeof datebuf, "%H:%M %d-%m-%y", &msg_date);
-		stralloc_cats(&page, datebuf);
-		stralloc_cats(&page, "</div><a href=\"");
-		stralloc_cats(&page, conf.www_url);
-		stralloc_cats(&page, "email/delete/");
-		stralloc_cat_long(&page, id);
-		stralloc_cats(&page, "\"><div class=\"email-delete\"></div></a></div>\n");
+			
+		child_child_child_tag = www_tag_new(NULL, datebuf);
+		www_tag_add_child(child_child_tag, child_child_child_tag);	
+		
+		child_child_tag = www_tag_new("a", NULL);
+		url = EMPTY_STRALLOC;
+		stralloc_cats(&url, conf.www_url);
+		stralloc_cats(&url, "email/delete/");
+		stralloc_cat_long(&url, id);
+		stralloc_0(&url);		
+		www_tag_add_attrib(child_child_tag, "href", url.s);
+		free(url.s);
+		
+		www_tag_add_child(child_tag, child_child_tag);		
+		
+		child_child_child_tag = www_tag_new("div", NULL);
+		www_tag_add_attrib(child_child_child_tag, "class", "email-delete");
+		www_tag_add_child(child_child_tag, child_child_child_tag);		
+		
+
+		child_child_child_child_tag = www_tag_new(NULL, "");
+		www_tag_add_child(child_child_child_tag, child_child_child_child_tag);		
+
 	}
-	stralloc_cats(&page, "</div>\n");
-	stralloc_0(&page);
 
 	sqlite3_finalize(res);
 	sqlite3_close(db);
 
-	return page.s;
+	return www_tag_unwravel(page);
 }
 
 #endif
diff --git a/src/www_msgs.c b/src/www_msgs.c
index 476d509..341edd8 100644
--- a/src/www_msgs.c
+++ b/src/www_msgs.c
@@ -10,6 +10,8 @@
 #include "jamlib/jam.h"
 #include "libuuid/uuid.h"
 
+#include "www_tree.h"
+
 #include "bbs.h"
 #include "mail_utils.h"
 
@@ -231,7 +233,6 @@ char *www_msgs_messageview(struct user_record *user, int conference, int area, i
 	int z;
 	struct tm msg_date;
 	time_t date;
-	stralloc page = EMPTY_STRALLOC;
 	char buffer[4096];
 	int chars;
 	int i;
@@ -243,6 +244,12 @@ char *www_msgs_messageview(struct user_record *user, int conference, int area, i
 	char *nodename;
 	struct fido_addr *nodeno;
 
+	struct www_tag *page = www_tag_new(NULL, "");
+	struct www_tag *cur_tag;
+	struct www_tag *child_tag;
+	struct www_tag *child_child_tag;
+	struct www_tag *child_child_child_tag;
+	
 	if (conference < 0 || conference >= ptr_vector_len(&conf.mail_conferences))
 		return NULL;
 	struct mail_conference *mc = get_conf(conference);
@@ -338,137 +345,261 @@ char *www_msgs_messageview(struct user_record *user, int conference, int area, i
 	JAM_CloseMB(jb);
 	free(jb);
 
-	stralloc_copys(&page, "<div class=\"content-header\"><a href=\"");
-	stralloc_cats(&page, conf.www_url);
-	stralloc_cats(&page, "msgs/");
-	stralloc_cat_long(&page, conference);
-	stralloc_append1(&page, '/');
-	stralloc_cat_long(&page, area);
-	stralloc_cats(&page, "\"><h2>");
-	stralloc_cats(&page, mc->name);
-	stralloc_cats(&page, " - ");
-	stralloc_cats(&page, ma->name);
-	stralloc_cats(&page, "</h2></a></div>\n");
+	cur_tag = www_tag_new("div", NULL);
+	www_tag_add_attrib(cur_tag, "class", "content-header");
+	www_tag_add_child(page, cur_tag);
+	
+	child_tag = www_tag_new("a", NULL);
+	
+	stralloc url = EMPTY_STRALLOC;
+	
+	stralloc_cats(&url, conf.www_url);
+	stralloc_cats(&url, "msgs/");
+	stralloc_cat_long(&url, conference);
+	stralloc_append1(&url, '/');
+	stralloc_cat_long(&url, area);
+	stralloc_0(&url);
+	
+	www_tag_add_attrib(child_tag, "href", url.s);
+	free(url.s);
+	www_tag_add_child(cur_tag, child_tag);
 
+	child_child_tag = www_tag_new("h2", NULL);
+	www_tag_add_child(child_tag, child_child_tag);
+
+	child_child_child_tag = www_tag_new(NULL, mc->name);
+	www_tag_add_child(child_child_tag, child_child_child_tag);
+
+	child_child_child_tag = www_tag_new(NULL, " - ");
+	www_tag_add_child(child_child_tag, child_child_child_tag);
+
+	child_child_child_tag = www_tag_new(NULL, ma->name);
+	www_tag_add_child(child_child_tag, child_child_child_tag);
+	
+	cur_tag = www_tag_new("div", NULL);
+	
 	if (msgbase_is_flagged(user, conference, area, msg)) {
-		stralloc_cats(&page, "<div class=\"msg-view-header-flagged\">\n");
+		www_tag_add_attrib(cur_tag, "class", "msg-view-header-flagged");
 	} else {
-		stralloc_cats(&page, "<div class=\"msg-view-header\">\n");
+		www_tag_add_attrib(cur_tag, "class", "msg-view-header");
 	}
+	
+	www_tag_add_child(page, cur_tag);
+	
+	child_tag = www_tag_new("div", NULL);
+	www_tag_add_attrib(child_tag, "class", "msg-view-subject");
+	www_tag_add_child(cur_tag, child_tag);
 
-	subject_s = www_sanitize(subject);
-	stralloc_cats(&page, "<div class=\"msg-view-subject\">");
-	stralloc_cats(&page, subject_s);
-	stralloc_cats(&page, "</div>\n");
-	free(subject_s);
+	child_child_tag = www_tag_new(NULL, subject);
+	www_tag_add_child(child_tag, child_child_tag);
+
+	child_tag = www_tag_new("div", NULL);
+	www_tag_add_attrib(child_tag, "class", "msg-view-from");
+	www_tag_add_child(cur_tag, child_tag);
 
-	from_s = www_sanitize(from);
 	if (ma->type != TYPE_LOCAL_AREA && oaddress != NULL) {
 		if (mc->nettype == NETWORK_MAGI) {
-			snprintf(buffer, sizeof buffer, "<div class=\"msg-view-from\">From: %s (@%s)</div>\n", from_s, oaddress);
+			snprintf(buffer, sizeof buffer, "From: %s (@%s)", from, oaddress);
+			child_child_tag = www_tag_new(NULL, buffer);
+			www_tag_add_child(child_tag, child_child_tag);
 		} else if (mc->nettype == NETWORK_FIDO) {
 			nodeno = parse_fido_addr(oaddress);
 			if (nodeno != NULL) {
 				nodename = nl_get_bbsname(nodeno, mc->domain);
 				if (strcmp(nodename, "Unknown") == 0) {
-					snprintf(buffer, sizeof buffer, "<div class=\"msg-view-from\">From: %s (%s)</div>\n", from_s, oaddress);
+					snprintf(buffer, sizeof buffer, "From: %s (%s)", from, oaddress);
+					child_child_tag = www_tag_new(NULL, buffer);
+					www_tag_add_child(child_tag, child_child_tag);
 				} else {
-					snprintf(buffer, sizeof buffer,
-					         "<div class=\"msg-view-from\">From: %s (<span class=\"bbsname\">%s</span> - %s)</div>\n",
-					         from_s, nodename, oaddress);
+					snprintf(buffer, sizeof buffer, "From: %s (", from);
+					child_child_tag = www_tag_new(NULL, buffer);
+					www_tag_add_child(child_tag, child_child_tag);
+
+					child_child_tag = www_tag_new("span", NULL);
+					www_tag_add_attrib(child_child_tag, "class", "bbsname");
+					www_tag_add_child(child_tag, child_child_tag);
+					
+					child_child_child_tag = www_tag_new(NULL, nodename);
+					www_tag_add_child(child_child_tag, child_child_child_tag);
+
+					snprintf(buffer, sizeof buffer, " - %s)", oaddress);
+					child_child_tag = www_tag_new(NULL, buffer);
+					www_tag_add_child(child_tag, child_child_tag);
 				}
 				free(nodename);
 				free(nodeno);
 			} else {
-				snprintf(buffer, sizeof buffer, "<div class=\"msg-view-from\">From: %s (%s)</div>\n", from_s, oaddress);
+				snprintf(buffer, sizeof buffer, "From: %s (%s)", from, oaddress);
+				child_child_tag = www_tag_new(NULL, buffer);
+				www_tag_add_child(child_tag, child_child_tag);
 			}
 		} else {
-			snprintf(buffer, sizeof buffer, "<div class=\"msg-view-from\">From: %s (%s)</div>\n", from_s, oaddress);
+			snprintf(buffer, sizeof buffer, "From: %s (%s)", from, oaddress);
+			child_child_tag = www_tag_new(NULL, buffer);
+			www_tag_add_child(child_tag, child_child_tag);
 		}
 	} else {
-		snprintf(buffer, sizeof buffer, "<div class=\"msg-view-from\">From: %s</div>\n", from_s);
+		snprintf(buffer, sizeof buffer, "From: %s", from);
+		child_child_tag = www_tag_new(NULL, buffer);
+		www_tag_add_child(child_tag, child_child_tag);		
 	}
-	free(from_s);
 
-	stralloc_cats(&page, buffer);
+	child_tag = www_tag_new("div", NULL);
+	www_tag_add_attrib(child_tag, "class", "msg-view-to");
+	www_tag_add_child(cur_tag, child_tag);
+	
+	child_child_tag = www_tag_new(NULL, to);
+	www_tag_add_child(child_tag, child_child_tag);
 
-	to_s = www_sanitize(to);
-	stralloc_cats(&page, "<div class=\"msg-view-to\">To: ");
-	stralloc_cats(&page, to_s);
-	stralloc_cats(&page, "</div>\n");
-	free(to_s);
+	child_tag = www_tag_new("div", NULL);
+	www_tag_add_attrib(child_tag, "class", "msg-view-date");
+	www_tag_add_child(cur_tag, child_tag);
 
 	date = (time_t)jmh.DateWritten;
 	gmtime_r(&date, &msg_date);
 	if (conf.date_style == 1) {
-		snprintf(buffer, sizeof buffer, "<div class=\"msg-view-date\">Date: %.2d:%.2d %.2d-%.2d-%.2d</div>\n",
+		snprintf(buffer, sizeof buffer, "Date: %.2d:%.2d %.2d-%.2d-%.2d",
 		         msg_date.tm_hour, msg_date.tm_min, msg_date.tm_mon + 1, msg_date.tm_mday, msg_date.tm_year - 100);
 	} else {
-		snprintf(buffer, sizeof buffer, "<div class=\"msg-view-date\">Date: %.2d:%.2d %.2d-%.2d-%.2d</div>\n",
+		snprintf(buffer, sizeof buffer, "Date: %.2d:%.2d %.2d-%.2d-%.2d",
 		         msg_date.tm_hour, msg_date.tm_min, msg_date.tm_mday, msg_date.tm_mon + 1, msg_date.tm_year - 100);
 	}
 
-	stralloc_cats(&page, buffer);
+	child_child_tag = www_tag_new(NULL, buffer);
+	www_tag_add_child(child_tag, child_child_tag);
 
-	snprintf(buffer, sizeof buffer,
-	         "<div class=\"msg-view-options\"><a href=\"%smsgs/flag/%d/%d/%d\"><img src=\"%sstatic/flag.png\" /></a></div>",
-	         conf.www_url, conference, area, msg, conf.www_url);
-	stralloc_cats(&page, buffer);
+	child_tag = www_tag_new("div", NULL);
+	www_tag_add_attrib(child_tag, "class", "msg-view-options");
+	www_tag_add_child(cur_tag, child_tag);
 
-	stralloc_cats(&page, "</div>\n");
-	stralloc_cats(&page, "<div id=\"msgbody\">\n");
+	child_child_tag = www_tag_new("a", NULL);
+	
+	url = EMPTY_STRALLOC;
+	
+	stralloc_cats(&url, conf.www_url);
+	stralloc_cats(&url, "msgs/flag/");
+	stralloc_cat_long(&url, conference);
+	stralloc_append1(&url, '/');
+	stralloc_cat_long(&url, area);
+	stralloc_append1(&url, '/');
+	stralloc_cat_long(&url, msg);
+	stralloc_0(&url);
+	
+	www_tag_add_attrib(child_child_tag, "href", url.s);
+	free(url.s);
+	www_tag_add_child(child_tag, child_child_tag);
+
+	child_child_child_tag = www_tag_new("img", NULL);
+	
+	url = EMPTY_STRALLOC;
+	
+	stralloc_cats(&url, conf.www_url);
+	stralloc_cats(&url, "static/flag.png");
+	stralloc_0(&url);
+	www_tag_add_attrib(child_child_child_tag, "src", url.s);
+	free(url.s);
+	www_tag_add_child(child_child_tag, child_child_child_tag);
+	
+	cur_tag = www_tag_new("div", NULL);
+	
+	www_tag_add_attrib(cur_tag, "id", "msgbody");
+	www_tag_add_child(page, cur_tag);
 
 	aha_text = strndup(body, jmh.TxtLen);
-	struct www_tag *aha_out = www_tag_new(NULL, "");
-	aha(aha_text, aha_out);
-		
-	char *aha_data = www_tag_unwravel(aha_out);
-		
-	stralloc_cats(&page, aha_data);
-	free(aha_data);
+	aha(aha_text, cur_tag);
 	free(aha_text);
 
-	stralloc_cats(&page, "</div>\n");
 
-	stralloc_cats(&page, "<div class=\"msg-reply-form\">\n");
 	if (ma->write_sec_level <= user->sec_level && ma->type != TYPE_NETMAIL_AREA) {
-		stralloc_cats(&page, "<h3>Reply</h3>\n");
-		stralloc_cats(&page, "<form action=\"");
-		stralloc_cats(&page, conf.www_url);
-		stralloc_cats(&page, "msgs/\" method=\"POST\" enctype=\"application/x-www-form-urlencoded;charset=UTF-8\">\n");
+		cur_tag = www_tag_new("div", NULL);
+		www_tag_add_attrib(cur_tag, "class", "msg-reply-form");
+		www_tag_add_child(page, cur_tag);
+		
+		child_tag = www_tag_new("h3", NULL);
+		www_tag_add_child(cur_tag, child_tag);
+		
+		child_child_tag = www_tag_new(NULL, "Reply");
+		www_tag_add_child(child_tag, child_child_tag);
+		
 
-		stralloc_cats(&page, "<input type=\"hidden\" name=\"conference\" value=\"");
-		stralloc_cat_long(&page, conference);
-		stralloc_cats(&page, "\" />\n");
+		child_tag = www_tag_new("form", NULL);
+		url = EMPTY_STRALLOC;
+		stralloc_cats(&url, conf.www_url);
+		stralloc_cats(&url, "msgs/");
+		stralloc_0(&url);
+		
+		www_tag_add_attrib(child_tag, "action", url.s);
+		free(url.s);
+		
+		www_tag_add_attrib(child_tag, "method", "POST");
+		www_tag_add_attrib(child_tag, "enctype", "application/x-www-form-urlencoded;charset=UTF-8");
+		www_tag_add_child(cur_tag, child_tag);
 
-		stralloc_cats(&page, "<input type=\"hidden\" name=\"area\" value=\"");
-		stralloc_cat_long(&page, area);
-		stralloc_cats(&page, "\" />\n");
+		child_child_tag = www_tag_new("input", NULL);
+		www_tag_add_attrib(child_child_tag, "type", "hidden");
+		www_tag_add_attrib(child_child_tag, "name", "conference");
+		snprintf(buffer, sizeof buffer, "%d", conference);
+		www_tag_add_attrib(child_child_tag, "value", buffer);
+		www_tag_add_child(child_tag, child_child_tag);
 
-		stralloc_cats(&page, "<input type=\"hidden\" name=\"replyid\" value=\"");
+		child_child_tag = www_tag_new("input", NULL);
+		www_tag_add_attrib(child_child_tag, "type", "hidden");
+		www_tag_add_attrib(child_child_tag, "name", "area");
+		snprintf(buffer, sizeof buffer, "%d", area);
+		www_tag_add_attrib(child_child_tag, "value", buffer);
+		www_tag_add_child(child_tag, child_child_tag);
+
+		child_child_tag = www_tag_new("input", NULL);
+		www_tag_add_attrib(child_child_tag, "type", "hidden");
+		www_tag_add_attrib(child_child_tag, "name", "replyid");
 		if (msgid == NULL) {
-			stralloc_cats(&page, "NULL");
+			www_tag_add_attrib(child_child_tag, "value", "NULL");
 		} else {
-			stralloc_cats(&page, msgid);
+			www_tag_add_attrib(child_child_tag, "value", msgid);
 		}
-		stralloc_cats(&page, "\" />\n");
+		www_tag_add_child(child_tag, child_child_tag);
 
-		stralloc_cats(&page, "To : <input type=\"text\" name=\"recipient\" value=\"");
-		stralloc_cats(&page, from);
-		stralloc_cats(&page, "\" /><br />\n");
-
-		stralloc_cats(&page, "Subject : <input type=\"text\" name=\"subject\" value=\"");
+		child_child_tag = www_tag_new(NULL, "To : ");
+		www_tag_add_child(child_tag, child_child_tag);
+	
+		child_child_tag = www_tag_new("input", NULL);
+		www_tag_add_attrib(child_child_tag, "type", "text");
+		www_tag_add_attrib(child_child_tag, "name", "recipient");
+		www_tag_add_attrib(child_child_tag, "value", from);
+		www_tag_add_child(child_tag, child_child_tag);
+		
+		child_child_tag = www_tag_new("br", NULL);
+		www_tag_add_child(child_tag, child_child_tag);
+		
+		child_child_tag = www_tag_new("input", NULL);
+		www_tag_add_attrib(child_child_tag, "type", "text");
+		www_tag_add_attrib(child_child_tag, "name", "subject");
+		
 		if (strncasecmp(subject, "re:", 3) != 0) {
-			stralloc_cats(&page, "RE: ");
+			snprintf(buffer, sizeof buffer, "RE: %s", subject);
+			www_tag_add_attrib(child_child_tag, "value", buffer);
+		} else {
+			www_tag_add_attrib(child_child_tag, "value", subject);
 		}
-		stralloc_cats(&page, subject);
-		stralloc_cats(&page, "\" /><br />\n");
+		
+		www_tag_add_child(child_tag, child_child_tag);
+		
+		child_child_tag = www_tag_new("br", NULL);
+		www_tag_add_child(child_tag, child_child_tag);
 
-		stralloc_cats(&page, "<textarea name=\"body\" rows=\"25\" cols=\"79\" wrap=\"soft\" id=\"replybody\">");
-
-		stralloc_append1(&page, ' ');
-		stralloc_append1(&page, from[0]);
-		stralloc_cats(&page, "> ");
+		child_child_tag = www_tag_new("textarea", NULL);
+		www_tag_add_attrib(child_child_tag, "name", "body");
+		www_tag_add_attrib(child_child_tag, "rows", "25");
+		www_tag_add_attrib(child_child_tag, "cols", "79");
+		www_tag_add_attrib(child_child_tag, "wrap", "soft");
+		www_tag_add_attrib(child_child_tag, "id", "replybody");
+		www_tag_add_child(child_tag, child_child_tag);
+		
+		stralloc text = EMPTY_STRALLOC;
+		
+		stralloc_append1(&text, ' ');
+		stralloc_append1(&text, from[0]);
+		stralloc_cats(&text, "> ");
 
 		replybody = (char *)malloz(strlen(body) + 1);
 
@@ -501,18 +632,33 @@ char *www_msgs_messageview(struct user_record *user, int conference, int area, i
 				snprintf(buffer, sizeof buffer, "\n %c> %c", from[0], body2[i]);
 				chars = 1;
 			} else {
-				snprintf(buffer, sizeof buffer, "%c", body2[i]);
+				if (isalnum(body2[i]) || isspace(body2[i]) || ispunct(body2[i])) {
+					snprintf(buffer, sizeof buffer, "%c", body2[i]);
+				} else {
+					snprintf(buffer, sizeof buffer, "?");
+				}
 				chars++;
 			}
-			stralloc_cats(&page, buffer);
+			stralloc_cats(&text, buffer);
 		}
 		free(body2);
-		stralloc_cats(&page, "</textarea>\n<br />");
-		stralloc_cats(&page, "<input type=\"submit\" name=\"submit\" value=\"Reply\" />\n<br />");
-		stralloc_cats(&page, "</form>\n");
-		stralloc_cats(&page, "</div>\n");
+		
+		stralloc_0(&text);
+		
+		child_child_child_tag = www_tag_new(NULL, text.s);
+		www_tag_add_child(child_child_tag, child_child_child_tag);
+		
+		child_child_tag = www_tag_new("br", NULL);
+		www_tag_add_child(child_tag, child_child_tag);
+		
+		child_child_tag = www_tag_new("input", NULL);
+		www_tag_add_attrib(child_child_tag, "type", "submit");
+		www_tag_add_attrib(child_child_tag, "name", "submit");
+		www_tag_add_attrib(child_child_tag, "value", "Reply");
+		www_tag_add_child(child_tag, child_child_tag);		
+		child_child_tag = www_tag_new("br", NULL);
+		www_tag_add_child(child_tag, child_child_tag);
 	}
-	stralloc_0(&page);
 
 	free(subject);
 	free(from);
@@ -522,7 +668,7 @@ char *www_msgs_messageview(struct user_record *user, int conference, int area, i
 	free(msgid);
 	free(replyid);
 
-	return page.s;
+	return www_tag_unwravel(page);
 }
 
 static char *www_wordwrap(char *content, int cutoff) {
@@ -832,7 +978,27 @@ int www_send_msg(struct user_record *user, char *to, char *subj, int conference,
 		} else {
 			snprintf(buffer, sizeof buffer, "\r");
 		}
-		body2 = www_wordwrap(body, 73);
+		
+		char *p = body;
+		stralloc unhtmlized = EMPTY_STRALLOC;
+		
+	
+		// remove nbsp
+		while (*p != '\0') {
+			if (*p == 0xc2 && *(p + 1) == 0xa0) {
+				stralloc_append1(&unhtmlized, ' ');
+				p++;
+			} else {
+				stralloc_append1(&unhtmlized, *p);
+			}
+			
+			p++;
+		}
+	
+		stralloc_0(&unhtmlized);
+		
+		body2 = www_wordwrap(unhtmlized.s, 73);
+		free(unhtmlized.s);
 		if (body2 == NULL) {
 			JAM_UnlockMB(jb);
 			JAM_DelSubPacket(jsp);
@@ -840,6 +1006,9 @@ int www_send_msg(struct user_record *user, char *to, char *subj, int conference,
 			free(jb);
 			return 0;
 		}
+		
+		
+		
 		body3 = str2dup(body2, buffer);
 		if (body3 == NULL) {
 			free(body2);
@@ -894,28 +1063,110 @@ int www_send_msg(struct user_record *user, char *to, char *subj, int conference,
 }
 
 char *www_new_msg(struct user_record *user, int conference, int area) {
-	stralloc page = EMPTY_STRALLOC;
+	struct www_tag *page = www_tag_new(NULL, "");
+	struct www_tag *cur_tag;
+	struct www_tag *child_tag;
+	struct www_tag *child_child_tag;
+	
+	char buffer[10];
+	
+	cur_tag = www_tag_new("div", NULL);
+	www_tag_add_attrib(cur_tag, "class", "content-header");
+	www_tag_add_child(page, cur_tag);
+	
+	child_tag = www_tag_new("h2", NULL);
+	www_tag_add_child(cur_tag, child_tag);
+	
+	child_child_tag = www_tag_new(NULL, "New Message");
+	www_tag_add_child(child_tag, child_child_tag);
+	
 
-	stralloc_copys(&page, "<div class=\"content-header\"><h2>New Message</h2></div>\n");
-	stralloc_cats(&page, "<form action=\"");
-	stralloc_cats(&page, conf.www_url);
-	stralloc_cats(&page, "msgs/\" method=\"POST\" onsubmit=\"return validate()\" "
-	                     "enctype=\"application/x-www-form-urlencoded;charset=UTF-8\">\n");
-	stralloc_cats(&page, "<input type=\"hidden\" name=\"conference\" value=\"");
-	stralloc_cat_long(&page, conference);
-	stralloc_cats(&page, "\" />\n");
-	stralloc_cats(&page, "<input type=\"hidden\" name=\"area\" value=\"");
-	stralloc_cat_long(&page, area);
-	stralloc_cats(&page, "\" />\n");
-	stralloc_cats(&page, "<input type=\"hidden\" name=\"replyid\" value=\"NULL\" />\n");
-	stralloc_cats(&page, "To : <input type=\"text\" name=\"recipient\" value=\"All\" id=\"recipient\"/><br />\n");
-	stralloc_cats(&page, "Subject : <input type=\"text\" name=\"subject\" id=\"subject\" /><br />\n");
-	stralloc_cats(&page, "<textarea name=\"body\" id=\"body\" rows=\"25\" cols=\"79\" wrap=\"soft\"></textarea>\n<br />");
-	stralloc_cats(&page, "<input type=\"submit\" name=\"submit\" value=\"Send\" />\n<br />");
-	stralloc_cats(&page, "</form>\n");
-	stralloc_0(&page);
+	cur_tag = www_tag_new("form", NULL);
+	
+	stralloc url = EMPTY_STRALLOC;
+	
+	stralloc_cats(&url, conf.www_url);
+	stralloc_cats(&url, "msgs/");
+	stralloc_0(&url);
+	
+	www_tag_add_attrib(cur_tag, "action", url.s);
+	free(url.s);
 
-	return page.s;
+	www_tag_add_attrib(cur_tag, "method", "POST");
+	www_tag_add_attrib(cur_tag, "onsubmit", "return validate()");
+	www_tag_add_attrib(cur_tag, "enctype", "application/x-www-form-urlencoded;charset=UTF-8");
+	www_tag_add_child(page, cur_tag);
+
+	child_tag = www_tag_new("input", NULL);
+	www_tag_add_attrib(child_tag, "type", "hidden");
+	www_tag_add_attrib(child_tag, "name", "conference");
+	snprintf(buffer, sizeof buffer, "%d", conference);
+	www_tag_add_attrib(child_tag, "value", buffer);
+	www_tag_add_child(cur_tag, child_tag);
+	
+	child_tag = www_tag_new("input", NULL);
+	www_tag_add_attrib(child_tag, "type", "hidden");
+	www_tag_add_attrib(child_tag, "name", "area");
+	snprintf(buffer, sizeof buffer, "%d", area);
+	www_tag_add_attrib(child_tag, "value", buffer);
+	www_tag_add_child(cur_tag, child_tag);
+
+	child_tag = www_tag_new("input", NULL);
+	www_tag_add_attrib(child_tag, "type", "hidden");
+	www_tag_add_attrib(child_tag, "name", "replyid");
+	www_tag_add_attrib(child_tag, "value", "NULL");
+	www_tag_add_child(cur_tag, child_tag);
+
+	child_tag = www_tag_new(NULL, "To : ");
+	www_tag_add_child(cur_tag, child_tag);
+
+	child_tag = www_tag_new("input", NULL);
+	www_tag_add_attrib(child_tag, "type", "text");
+	www_tag_add_attrib(child_tag, "name", "recipient");
+	www_tag_add_attrib(child_tag, "value", "All");
+	www_tag_add_attrib(child_tag, "id", "recipient");
+	www_tag_add_child(cur_tag, child_tag);
+
+	child_tag = www_tag_new("br", NULL);
+	www_tag_add_child(cur_tag, child_tag);
+
+	child_tag = www_tag_new(NULL, "Subject : ");
+	www_tag_add_child(cur_tag, child_tag);
+
+	child_tag = www_tag_new("input", NULL);
+	www_tag_add_attrib(child_tag, "type", "text");
+	www_tag_add_attrib(child_tag, "name", "subject");
+	www_tag_add_attrib(child_tag, "id", "subject");
+	www_tag_add_child(cur_tag, child_tag);
+
+	child_tag = www_tag_new("br", NULL);
+	www_tag_add_child(cur_tag, child_tag);
+
+	child_tag = www_tag_new("textarea", NULL);
+	www_tag_add_attrib(child_tag, "name", "body");
+	www_tag_add_attrib(child_tag, "id", "body");
+	www_tag_add_attrib(child_tag, "rows", "25");
+	www_tag_add_attrib(child_tag, "cols", "79");
+	www_tag_add_attrib(child_tag, "wrap", "soft");
+	www_tag_add_child(cur_tag, child_tag);
+
+	child_child_tag = www_tag_new(NULL, "");
+	www_tag_add_child(child_tag, child_child_tag);
+
+
+	child_tag = www_tag_new("br", NULL);
+	www_tag_add_child(cur_tag, child_tag);
+
+	child_tag = www_tag_new("input", NULL);
+	www_tag_add_attrib(child_tag, "type", "submit");
+	www_tag_add_attrib(child_tag, "name", "submit");
+	www_tag_add_attrib(child_tag, "value", "Send");
+	www_tag_add_child(cur_tag, child_tag);
+	
+	child_tag = www_tag_new("br", NULL);
+	www_tag_add_child(cur_tag, child_tag);
+
+	return www_tag_unwravel(page);
 }
 
 #endif
diff --git a/src/www_tree.c b/src/www_tree.c
index 93a89c5..f829707 100644
--- a/src/www_tree.c
+++ b/src/www_tree.c
@@ -4,6 +4,545 @@
 #include "www_tree.h"
 #include "bbs.h"
 
+static char *www_tag_sanatize(char *data) {
+	stralloc str = EMPTY_STRALLOC;
+	for (char *p = data; *p != '\0'; ++p) {
+		switch (*p) {
+			case '&':
+				stralloc_cats(&str, "&amp;");
+				break;
+			case '<':
+				stralloc_cats(&str, "&lt;");
+				break;
+			case '>':
+				stralloc_cats(&str, "&gt;");
+				break;
+            case '\x01': 
+				stralloc_cats(&str, "&#x263A;");
+				break;
+            case '\x02': 
+				stralloc_cats(&str, "&#x263B;");
+				break;
+            case '\x03': 
+				stralloc_cats(&str, "&#x2665;");
+				break;
+            case '\x04': 
+				stralloc_cats(&str, "&#x2666;");
+				break;
+            case '\x05': 
+				stralloc_cats(&str, "&#x2663;");
+				break;
+            case '\x06': 
+				stralloc_cats(&str, "&#x2660;");
+				break;
+            case '\x07': 
+				stralloc_cats(&str, "&#x2022;");
+				break;
+            case '\x08': 
+				stralloc_cats(&str, "&#x25D8;");
+				break;
+            case '\x09': 
+				stralloc_cats(&str, "&#x25CB;");
+				break;
+            case '\x0b': 
+				stralloc_cats(&str, "&#x2642;");
+				break;
+            case '\x0c': 
+				stralloc_cats(&str, "&#x2640;");
+				break;
+            case '\x0e': 
+				stralloc_cats(&str, "&#x266B;");
+				break;
+            case '\x0f':
+				stralloc_cats(&str, "&#x263C;");
+				break;
+            case '\x10': 
+				stralloc_cats(&str, "&#x25B8;");
+				break;
+            case '\x11': 
+				stralloc_cats(&str, "&#x25C2;");
+				break;
+            case '\x12': 
+				stralloc_cats(&str, "&#x2195;");
+				break;
+            case '\x13': 
+				stralloc_cats(&str, "&#x203C;");
+				break;
+            case '\x14': 
+				stralloc_cats(&str, "&#x00B6;");
+				break;
+            case '\x15': 
+				stralloc_cats(&str, "&#x00A7;");
+				break;
+            case '\x16': 
+				stralloc_cats(&str, "&#x25AC;");
+				break;
+            case '\x17': 
+				stralloc_cats(&str, "&#x21A8;");
+				break;
+            case '\x18': 
+				stralloc_cats(&str, "&#x2191;");
+				break;
+            case '\x19': 
+				stralloc_cats(&str, "&#x2193;");
+				break;
+            case '\x1a': 
+				stralloc_cats(&str, "&#x2192;");
+				break;
+            case '\x1b': 
+				stralloc_cats(&str, "&#x2190;");
+				break;
+            case '\x1c': 
+				stralloc_cats(&str, "&#x221F;");
+				break;
+            case '\x1d': 
+				stralloc_cats(&str, "&#x2194;");
+				break;
+            case '\x1e': 
+				stralloc_cats(&str, "&#x25B4;");
+				break;
+            case '\x1f': 
+				stralloc_cats(&str, "&#x25BE;");
+				break;
+/*
+            case '\x21': 
+				stralloc_cats(&str, "&#x0021;");
+				break;
+            case '\x22':
+				stralloc_cats(&str, "&#x0022;");
+				break;
+            case '\x24':
+				stralloc_cats(&str, "&#x0024;");
+				break;
+            case '\x25':
+				stralloc_cats(&str, "&#x0025;");
+				break;
+            case '\x27':
+				stralloc_cats(&str, "&#x0027;");
+				break;
+            case '\x28':
+				stralloc_cats(&str, "&#x0028;");
+				break;
+            case '\x29':
+				stralloc_cats(&str, "&#x0029;");
+				break;
+            case '\x2a':
+				stralloc_cats(&str, "&#x002A;");
+				break;
+            case '\x2b':
+				stralloc_cats(&str, "&#x002B;");
+				break;
+            case '\x2c':
+				stralloc_cats(&str, "&#x002C;");
+				break;
+*/
+            case '\x7f':
+				stralloc_cats(&str, "&#x2302;");
+				break;
+            case '\x80':
+				stralloc_cats(&str, "&#x00C7;");
+				break;
+            case '\x81':
+				stralloc_cats(&str, "&#x00FC;");
+				break;
+            case '\x82':
+				stralloc_cats(&str, "&#x00E9;");
+				break;
+            case '\x83':
+				stralloc_cats(&str, "&#x00E2;");
+				break;
+            case '\x84':
+				stralloc_cats(&str, "&#x00E4;");
+				break;
+            case '\x85':
+				stralloc_cats(&str, "&#x00E0;");
+				break;
+            case '\x86':
+				stralloc_cats(&str, "&#x00E5;");
+				break;
+            case '\x87':
+				stralloc_cats(&str, "&#x00E7;");
+				break;
+            case '\x88':
+				stralloc_cats(&str, "&#x00EA;");
+				break;
+            case '\x89': 
+				stralloc_cats(&str, "&#x00EB;");
+				break;
+            case '\x8a': 
+				stralloc_cats(&str, "&#x00E8;");
+				break;
+            case '\x8b': 
+				stralloc_cats(&str, "&#x00EF;");
+				break;
+            case '\x8c': 
+				stralloc_cats(&str, "&#x00EE;");
+				break;
+            case '\x8d': 
+				stralloc_cats(&str, "&#x00EC;");
+				break;
+            case '\x8e': 
+				stralloc_cats(&str, "&#x00C4;");
+				break;
+            case '\x8f': 
+				stralloc_cats(&str, "&#x00C5;");
+				break;
+            case '\x90': 
+				stralloc_cats(&str, "&#x00C9;");
+				break;
+            case '\x91': 
+				stralloc_cats(&str, "&#x00E6;");
+				break;
+            case '\x92': 
+				stralloc_cats(&str, "&#x00C6;");
+				break;
+            case '\x93': 
+				stralloc_cats(&str, "&#x00F4;");
+				break;
+            case '\x94': 
+				stralloc_cats(&str, "&#x00F6;");
+				break;
+            case '\x95': 
+				stralloc_cats(&str, "&#x00F2;");
+				break;
+            case '\x96': 
+				stralloc_cats(&str, "&#x00FB;");
+				break;
+            case '\x97': 
+				stralloc_cats(&str, "&#x00F9;");
+				break;
+            case '\x98': 
+				stralloc_cats(&str, "&#x00FF;");
+				break;
+            case '\x99': 
+				stralloc_cats(&str, "&#x00D6;");
+				break;
+            case '\x9a': 
+				stralloc_cats(&str, "&#x00DC;");
+				break;
+            case '\x9b': 
+				stralloc_cats(&str, "&#x00A2;");
+				break;
+            case '\x9c': 
+				stralloc_cats(&str, "&#x00A3;");
+				break;
+            case '\x9d': 
+				stralloc_cats(&str, "&#x00A5;");
+				break;
+            case '\x9e': 
+				stralloc_cats(&str, "&#x20A7;");
+				break;
+            case '\x9f': 
+				stralloc_cats(&str, "&#x0192;");
+				break;
+            case '\xa0': 
+				stralloc_cats(&str, "&#x00E1;");
+				break;
+            case '\xa1': 
+				stralloc_cats(&str, "&#x00ED;");
+				break;
+            case '\xa2': 
+				stralloc_cats(&str, "&#x00F3;");
+				break;
+            case '\xa3': 
+				stralloc_cats(&str, "&#x00FA;");
+				break;
+            case '\xa4': 
+				stralloc_cats(&str, "&#x00F1;");
+				break;
+            case '\xa5': 
+				stralloc_cats(&str, "&#x00D1;");
+				break;
+            case '\xa6': 
+				stralloc_cats(&str, "&#x00AA;");
+				break;
+            case '\xa7': 
+				stralloc_cats(&str, "&#x00BA;");
+				break;
+            case '\xa8': 
+				stralloc_cats(&str, "&#x00BF;");
+				break;
+            case '\xa9': 
+				stralloc_cats(&str, "&#x2310;");
+				break;
+            case '\xaa': 
+				stralloc_cats(&str, "&#x00AC;");
+				break;
+            case '\xab': 
+				stralloc_cats(&str, "&#x00BD;");
+				break;
+            case '\xac': 
+				stralloc_cats(&str, "&#x00BC;");
+				break;
+            case '\xad': 
+				stralloc_cats(&str, "&#x00A1;");
+				break;
+            case '\xae': 
+				stralloc_cats(&str, "&#x00AB;");
+				break;
+            case '\xaf': 
+				stralloc_cats(&str, "&#x00BB;");
+				break;
+            case '\xb0': 
+				stralloc_cats(&str, "&#x2591;");
+				break;
+            case '\xb1': 
+				stralloc_cats(&str, "&#x2592;");
+				break;
+            case '\xb2': 
+				stralloc_cats(&str, "&#x2593;");
+				break;
+            case '\xb3': 
+				stralloc_cats(&str, "&#x2502;");
+				break;
+            case '\xb4': 
+				stralloc_cats(&str, "&#x2524;");
+				break;
+            case '\xb5': 
+				stralloc_cats(&str, "&#x2561;");
+				break;
+            case '\xb6': 
+				stralloc_cats(&str, "&#x2562;");
+				break;
+            case '\xb7': 
+				stralloc_cats(&str, "&#x2556;");
+				break;
+            case '\xb8': 
+				stralloc_cats(&str, "&#x2555;");
+				break;
+            case '\xb9': 
+				stralloc_cats(&str, "&#x2563;");
+				break;
+            case '\xba': 
+				stralloc_cats(&str, "&#x2551;");
+				break;
+            case '\xbb': 
+				stralloc_cats(&str, "&#x2557;");
+				break;
+            case '\xbc': 
+				stralloc_cats(&str, "&#x255D;");
+				break;
+            case '\xbd': 
+				stralloc_cats(&str, "&#x255C;");
+				break;
+            case '\xbe': 
+				stralloc_cats(&str, "&#x255B;");
+				break;
+            case '\xbf': 
+				stralloc_cats(&str, "&#x2510;");
+				break;
+            case '\xc0': 
+				stralloc_cats(&str, "&#x2514;");
+				break;
+            case '\xc1': 
+				stralloc_cats(&str, "&#x2534;");
+				break;
+            case '\xc2': 
+				stralloc_cats(&str, "&#x252C;");
+				break;
+            case '\xc3': 
+				stralloc_cats(&str, "&#x251C;");
+				break;
+            case '\xc4': 
+				stralloc_cats(&str, "&#x2500;");
+				break;
+            case '\xc5': 
+				stralloc_cats(&str, "&#x253C;");
+				break;
+            case '\xc6': 
+				stralloc_cats(&str, "&#x255E;");
+				break;
+            case '\xc7': 
+				stralloc_cats(&str, "&#x255F;");
+				break;
+            case '\xc8': 
+				stralloc_cats(&str, "&#x255A;");
+				break;
+            case '\xc9': 
+				stralloc_cats(&str, "&#x2554;");
+				break;
+            case '\xca': 
+				stralloc_cats(&str, "&#x2569;");
+				break;
+            case '\xcb': 
+				stralloc_cats(&str, "&#x2566;");
+				break;
+            case '\xcc': 
+				stralloc_cats(&str, "&#x2560;");
+				break;
+            case '\xcd': 
+				stralloc_cats(&str, "&#x2550;");
+				break;
+            case '\xce': 
+				stralloc_cats(&str, "&#x256C;");
+				break;
+            case '\xcf': 
+				stralloc_cats(&str, "&#x2567;");
+				break;
+            case '\xd0': 
+				stralloc_cats(&str, "&#x2568;");
+				break;
+            case '\xd1': 
+				stralloc_cats(&str, "&#x2564;");
+				break;
+            case '\xd2': 
+				stralloc_cats(&str, "&#x2565;");
+				break;
+            case '\xd3': 
+				stralloc_cats(&str, "&#x2559;");
+				break;
+            case '\xd4': 
+				stralloc_cats(&str, "&#x255B;");
+				break;
+            case '\xd5': 
+				stralloc_cats(&str, "&#x2552;");
+				break;
+            case '\xd6': 
+				stralloc_cats(&str, "&#x2553;");
+				break;
+            case '\xd7': 
+				stralloc_cats(&str, "&#x256B;");
+				break;
+            case '\xd8': 
+				stralloc_cats(&str, "&#x256A;");
+				break;
+            case '\xd9': 
+				stralloc_cats(&str, "&#x2518;");
+				break;
+            case '\xda': 
+				stralloc_cats(&str, "&#x250C;");
+				break;
+            case '\xdb': 
+				stralloc_cats(&str, "&#x2588;");
+				break;
+            case '\xdc': 
+				stralloc_cats(&str, "&#x2584;");
+				break;
+            case '\xdd': 
+				stralloc_cats(&str, "&#x258C;");
+				break;
+            case '\xde': 
+				stralloc_cats(&str, "&#x2590;");
+				break;
+            case '\xdf': 
+				stralloc_cats(&str, "&#x2580;");
+				break;
+            case '\xe0': 
+				stralloc_cats(&str, "&#x03B1;");
+				break;
+            case '\xe1': 
+				stralloc_cats(&str, "&#x03B2;");
+				break;
+            case '\xe2': 
+				stralloc_cats(&str, "&#x0393;");
+				break;
+            case '\xe3': 
+				stralloc_cats(&str, "&#x03C0;");
+				break;
+            case '\xe4': 
+				stralloc_cats(&str, "&#x03A3;");
+				break;
+            case '\xe5': 
+				stralloc_cats(&str, "&#x03C3;");
+				break;
+            case '\xe6': 
+				stralloc_cats(&str, "&#x00B5;");
+				break;
+            case '\xe7': 
+				stralloc_cats(&str, "&#x03C4;");
+				break;
+            case '\xe8': 
+				stralloc_cats(&str, "&#x03A6;");
+				break;
+            case '\xe9': 
+				stralloc_cats(&str, "&#x0398;");
+				break;
+            case '\xea': 
+				stralloc_cats(&str, "&#x03A9;");
+				break;
+            case '\xeb': 
+				stralloc_cats(&str, "&#x03B4;");
+				break;
+            case '\xec': 
+				stralloc_cats(&str, "&#x221E;");
+				break;
+            case '\xed': 
+				stralloc_cats(&str, "&#x2205;");
+				break;
+            case '\xee': 
+				stralloc_cats(&str, "&#x2208;");
+				break;
+            case '\xef': 
+				stralloc_cats(&str, "&#x2229;");
+				break;
+            case '\xf0': 
+				stralloc_cats(&str, "&#x2261;");
+				break;
+            case '\xf1': 
+				stralloc_cats(&str, "&#x00B1;");
+				break;
+            case '\xf2': 
+				stralloc_cats(&str, "&#x2265;");
+				break;
+            case '\xf3': 
+				stralloc_cats(&str, "&#x2264;");
+				break;
+            case '\xf4': 
+				stralloc_cats(&str, "&#x2320;");
+				break;
+            case '\xf5': 
+				stralloc_cats(&str, "&#x2321;");
+				break;
+            case '\xf6': 
+				stralloc_cats(&str, "&#x00F7;");
+				break;
+            case '\xf7': 
+				stralloc_cats(&str, "&#x2248;");
+				break;
+            case '\xf8': 
+				stralloc_cats(&str, "&#x00B0;");
+				break;
+            case '\xf9': 
+				stralloc_cats(&str, "&#x2219;");
+				break;
+            case '\xfa': 
+				stralloc_cats(&str, "&#x00B7;");
+				break;
+            case '\xfb': 
+				stralloc_cats(&str, "&#x221A;");
+				break;
+            case '\xfc': 
+				stralloc_cats(&str, "&#x207F;");
+				break;
+            case '\xfd': 
+				stralloc_cats(&str, "&#x00B2;");
+				break;
+            case '\xfe': 
+				stralloc_cats(&str, "&#x25AA;");					
+				break;
+			case ' ':
+				if (*(p+1) == ' ') {
+					stralloc_cats(&str, "&nbsp;");					
+				} else {
+					if (p > data && (*(p-1) == ' ' || *(p-1) == '\n')) {
+						stralloc_cats(&str, "&nbsp;");
+					} else if (data == p) {
+						stralloc_cats(&str, "&nbsp;");
+					} else {
+						stralloc_append1(&str, ' ');
+					}
+				}
+				break;
+
+			default:
+				stralloc_append1(&str, *p);
+				break;
+		} 
+	}
+	stralloc_0(&str);
+	return str.s;
+}
+
 struct www_tag *www_tag_new(char *tag, char *data) {
 	struct www_tag *new_tag = malloz(sizeof(struct www_tag));
 	
@@ -16,541 +555,7 @@ struct www_tag *www_tag_new(char *tag, char *data) {
 		new_tag->tag = NULL;
 		
 		/* SANATIZE DATA HERE */
-		stralloc str = EMPTY_STRALLOC;
-		for (char *p = data; *p != '\0'; ++p) {
-			switch (*p) {
-				case '&':
-					stralloc_cats(&str, "&amp;");
-					break;
-				case '<':
-					stralloc_cats(&str, "&lt;");
-					break;
-				case '>':
-					stralloc_cats(&str, "&gt;");
-					break;
-                case '\x01': 
-					stralloc_cats(&str, "&#x263A;");
-					break;
-                case '\x02': 
-					stralloc_cats(&str, "&#x263B;");
-					break;
-                case '\x03': 
-					stralloc_cats(&str, "&#x2665;");
-					break;
-                case '\x04': 
-					stralloc_cats(&str, "&#x2666;");
-					break;
-                case '\x05': 
-					stralloc_cats(&str, "&#x2663;");
-					break;
-                case '\x06': 
-					stralloc_cats(&str, "&#x2660;");
-					break;
-                case '\x07': 
-					stralloc_cats(&str, "&#x2022;");
-					break;
-                case '\x08': 
-					stralloc_cats(&str, "&#x25D8;");
-					break;
-                case '\x09': 
-					stralloc_cats(&str, "&#x25CB;");
-					break;
-                case '\x0b': 
-					stralloc_cats(&str, "&#x2642;");
-					break;
-                case '\x0c': 
-					stralloc_cats(&str, "&#x2640;");
-					break;
-                case '\x0e': 
-					stralloc_cats(&str, "&#x266B;");
-					break;
-                case '\x0f':
-					stralloc_cats(&str, "&#x263C;");
-					break;
-                case '\x10': 
-					stralloc_cats(&str, "&#x25B8;");
-					break;
-                case '\x11': 
-					stralloc_cats(&str, "&#x25C2;");
-					break;
-                case '\x12': 
-					stralloc_cats(&str, "&#x2195;");
-					break;
-                case '\x13': 
-					stralloc_cats(&str, "&#x203C;");
-					break;
-                case '\x14': 
-					stralloc_cats(&str, "&#x00B6;");
-					break;
-                case '\x15': 
-					stralloc_cats(&str, "&#x00A7;");
-					break;
-                case '\x16': 
-					stralloc_cats(&str, "&#x25AC;");
-					break;
-                case '\x17': 
-					stralloc_cats(&str, "&#x21A8;");
-					break;
-                case '\x18': 
-					stralloc_cats(&str, "&#x2191;");
-					break;
-                case '\x19': 
-					stralloc_cats(&str, "&#x2193;");
-					break;
-                case '\x1a': 
-					stralloc_cats(&str, "&#x2192;");
-					break;
-                case '\x1b': 
-					stralloc_cats(&str, "&#x2190;");
-					break;
-                case '\x1c': 
-					stralloc_cats(&str, "&#x221F;");
-					break;
-                case '\x1d': 
-					stralloc_cats(&str, "&#x2194;");
-					break;
-                case '\x1e': 
-					stralloc_cats(&str, "&#x25B4;");
-					break;
-                case '\x1f': 
-					stralloc_cats(&str, "&#x25BE;");
-					break;
-                case '\x21': 
-					stralloc_cats(&str, "&#x0021;");
-					break;
-                case '\x22':
-					stralloc_cats(&str, "&#x0022;");
-					break;
-                case '\x23':
-					stralloc_cats(&str, "&#x0023;");
-					break;
-                case '\x24':
-					stralloc_cats(&str, "&#x0024;");
-					break;
-                case '\x25':
-					stralloc_cats(&str, "&#x0025;");
-					break;
-                case '\x27':
-					stralloc_cats(&str, "&#x0027;");
-					break;
-                case '\x28':
-					stralloc_cats(&str, "&#x0028;");
-					break;
-                case '\x29':
-					stralloc_cats(&str, "&#x0029;");
-					break;
-                case '\x2a':
-					stralloc_cats(&str, "&#x002A;");
-					break;
-                case '\x2b':
-					stralloc_cats(&str, "&#x002B;");
-					break;
-                case '\x2c':
-					stralloc_cats(&str, "&#x002C;");
-					break;
-                case '\x2d':
-					stralloc_cats(&str, "&#x002D;");
-					break;
-                case '\x2e':
-					stralloc_cats(&str, "&#x002E;");
-					break;
-                case '\x2f':
-					stralloc_cats(&str, "&#x002F;");
-					break;
-                case '\x7f':
-					stralloc_cats(&str, "&#x2302;");
-					break;
-                case '\x80':
-					stralloc_cats(&str, "&#x00C7;");
-					break;
-                case '\x81':
-					stralloc_cats(&str, "&#x00FC;");
-					break;
-                case '\x82':
-					stralloc_cats(&str, "&#x00E9;");
-					break;
-                case '\x83':
-					stralloc_cats(&str, "&#x00E2;");
-					break;
-                case '\x84':
-					stralloc_cats(&str, "&#x00E4;");
-					break;
-                case '\x85':
-					stralloc_cats(&str, "&#x00E0;");
-					break;
-                case '\x86':
-					stralloc_cats(&str, "&#x00E5;");
-					break;
-                case '\x87':
-					stralloc_cats(&str, "&#x00E7;");
-					break;
-                case '\x88':
-					stralloc_cats(&str, "&#x00EA;");
-					break;
-                case '\x89': 
-					stralloc_cats(&str, "&#x00EB;");
-					break;
-                case '\x8a': 
-					stralloc_cats(&str, "&#x00E8;");
-					break;
-                case '\x8b': 
-					stralloc_cats(&str, "&#x00EF;");
-					break;
-                case '\x8c': 
-					stralloc_cats(&str, "&#x00EE;");
-					break;
-                case '\x8d': 
-					stralloc_cats(&str, "&#x00EC;");
-					break;
-                case '\x8e': 
-					stralloc_cats(&str, "&#x00C4;");
-					break;
-                case '\x8f': 
-					stralloc_cats(&str, "&#x00C5;");
-					break;
-                case '\x90': 
-					stralloc_cats(&str, "&#x00C9;");
-					break;
-                case '\x91': 
-					stralloc_cats(&str, "&#x00E6;");
-					break;
-                case '\x92': 
-					stralloc_cats(&str, "&#x00C6;");
-					break;
-                case '\x93': 
-					stralloc_cats(&str, "&#x00F4;");
-					break;
-                case '\x94': 
-					stralloc_cats(&str, "&#x00F6;");
-					break;
-                case '\x95': 
-					stralloc_cats(&str, "&#x00F2;");
-					break;
-                case '\x96': 
-					stralloc_cats(&str, "&#x00FB;");
-					break;
-                case '\x97': 
-					stralloc_cats(&str, "&#x00F9;");
-					break;
-                case '\x98': 
-					stralloc_cats(&str, "&#x00FF;");
-					break;
-                case '\x99': 
-					stralloc_cats(&str, "&#x00D6;");
-					break;
-                case '\x9a': 
-					stralloc_cats(&str, "&#x00DC;");
-					break;
-                case '\x9b': 
-					stralloc_cats(&str, "&#x00A2;");
-					break;
-                case '\x9c': 
-					stralloc_cats(&str, "&#x00A3;");
-					break;
-                case '\x9d': 
-					stralloc_cats(&str, "&#x00A5;");
-					break;
-                case '\x9e': 
-					stralloc_cats(&str, "&#x20A7;");
-					break;
-                case '\x9f': 
-					stralloc_cats(&str, "&#x0192;");
-					break;
-                case '\xa0': 
-					stralloc_cats(&str, "&#x00E1;");
-					break;
-                case '\xa1': 
-					stralloc_cats(&str, "&#x00ED;");
-					break;
-                case '\xa2': 
-					stralloc_cats(&str, "&#x00F3;");
-					break;
-                case '\xa3': 
-					stralloc_cats(&str, "&#x00FA;");
-					break;
-                case '\xa4': 
-					stralloc_cats(&str, "&#x00F1;");
-					break;
-                case '\xa5': 
-					stralloc_cats(&str, "&#x00D1;");
-					break;
-                case '\xa6': 
-					stralloc_cats(&str, "&#x00AA;");
-					break;
-                case '\xa7': 
-					stralloc_cats(&str, "&#x00BA;");
-					break;
-                case '\xa8': 
-					stralloc_cats(&str, "&#x00BF;");
-					break;
-                case '\xa9': 
-					stralloc_cats(&str, "&#x2310;");
-					break;
-                case '\xaa': 
-					stralloc_cats(&str, "&#x00AC;");
-					break;
-                case '\xab': 
-					stralloc_cats(&str, "&#x00BD;");
-					break;
-                case '\xac': 
-					stralloc_cats(&str, "&#x00BC;");
-					break;
-                case '\xad': 
-					stralloc_cats(&str, "&#x00A1;");
-					break;
-                case '\xae': 
-					stralloc_cats(&str, "&#x00AB;");
-					break;
-                case '\xaf': 
-					stralloc_cats(&str, "&#x00BB;");
-					break;
-                case '\xb0': 
-					stralloc_cats(&str, "&#x2591;");
-					break;
-                case '\xb1': 
-					stralloc_cats(&str, "&#x2592;");
-					break;
-                case '\xb2': 
-					stralloc_cats(&str, "&#x2593;");
-					break;
-                case '\xb3': 
-					stralloc_cats(&str, "&#x2502;");
-					break;
-                case '\xb4': 
-					stralloc_cats(&str, "&#x2524;");
-					break;
-                case '\xb5': 
-					stralloc_cats(&str, "&#x2561;");
-					break;
-                case '\xb6': 
-					stralloc_cats(&str, "&#x2562;");
-					break;
-                case '\xb7': 
-					stralloc_cats(&str, "&#x2556;");
-					break;
-                case '\xb8': 
-					stralloc_cats(&str, "&#x2555;");
-					break;
-                case '\xb9': 
-					stralloc_cats(&str, "&#x2563;");
-					break;
-                case '\xba': 
-					stralloc_cats(&str, "&#x2551;");
-					break;
-                case '\xbb': 
-					stralloc_cats(&str, "&#x2557;");
-					break;
-                case '\xbc': 
-					stralloc_cats(&str, "&#x255D;");
-					break;
-                case '\xbd': 
-					stralloc_cats(&str, "&#x255C;");
-					break;
-                case '\xbe': 
-					stralloc_cats(&str, "&#x255B;");
-					break;
-                case '\xbf': 
-					stralloc_cats(&str, "&#x2510;");
-					break;
-                case '\xc0': 
-					stralloc_cats(&str, "&#x2514;");
-					break;
-                case '\xc1': 
-					stralloc_cats(&str, "&#x2534;");
-					break;
-                case '\xc2': 
-					stralloc_cats(&str, "&#x252C;");
-					break;
-                case '\xc3': 
-					stralloc_cats(&str, "&#x251C;");
-					break;
-                case '\xc4': 
-					stralloc_cats(&str, "&#x2500;");
-					break;
-                case '\xc5': 
-					stralloc_cats(&str, "&#x253C;");
-					break;
-                case '\xc6': 
-					stralloc_cats(&str, "&#x255E;");
-					break;
-                case '\xc7': 
-					stralloc_cats(&str, "&#x255F;");
-					break;
-                case '\xc8': 
-					stralloc_cats(&str, "&#x255A;");
-					break;
-                case '\xc9': 
-					stralloc_cats(&str, "&#x2554;");
-					break;
-                case '\xca': 
-					stralloc_cats(&str, "&#x2569;");
-					break;
-                case '\xcb': 
-					stralloc_cats(&str, "&#x2566;");
-					break;
-                case '\xcc': 
-					stralloc_cats(&str, "&#x2560;");
-					break;
-                case '\xcd': 
-					stralloc_cats(&str, "&#x2550;");
-					break;
-                case '\xce': 
-					stralloc_cats(&str, "&#x256C;");
-					break;
-                case '\xcf': 
-					stralloc_cats(&str, "&#x2567;");
-					break;
-                case '\xd0': 
-					stralloc_cats(&str, "&#x2568;");
-					break;
-                case '\xd1': 
-					stralloc_cats(&str, "&#x2564;");
-					break;
-                case '\xd2': 
-					stralloc_cats(&str, "&#x2565;");
-					break;
-                case '\xd3': 
-					stralloc_cats(&str, "&#x2559;");
-					break;
-                case '\xd4': 
-					stralloc_cats(&str, "&#x255B;");
-					break;
-                case '\xd5': 
-					stralloc_cats(&str, "&#x2552;");
-					break;
-                case '\xd6': 
-					stralloc_cats(&str, "&#x2553;");
-					break;
-                case '\xd7': 
-					stralloc_cats(&str, "&#x256B;");
-					break;
-                case '\xd8': 
-					stralloc_cats(&str, "&#x256A;");
-					break;
-                case '\xd9': 
-					stralloc_cats(&str, "&#x2518;");
-					break;
-                case '\xda': 
-					stralloc_cats(&str, "&#x250C;");
-					break;
-                case '\xdb': 
-					stralloc_cats(&str, "&#x2588;");
-					break;
-                case '\xdc': 
-					stralloc_cats(&str, "&#x2584;");
-					break;
-                case '\xdd': 
-					stralloc_cats(&str, "&#x258C;");
-					break;
-                case '\xde': 
-					stralloc_cats(&str, "&#x2590;");
-					break;
-                case '\xdf': 
-					stralloc_cats(&str, "&#x2580;");
-					break;
-                case '\xe0': 
-					stralloc_cats(&str, "&#x03B1;");
-					break;
-                case '\xe1': 
-					stralloc_cats(&str, "&#x03B2;");
-					break;
-                case '\xe2': 
-					stralloc_cats(&str, "&#x0393;");
-					break;
-                case '\xe3': 
-					stralloc_cats(&str, "&#x03C0;");
-					break;
-                case '\xe4': 
-					stralloc_cats(&str, "&#x03A3;");
-					break;
-                case '\xe5': 
-					stralloc_cats(&str, "&#x03C3;");
-					break;
-                case '\xe6': 
-					stralloc_cats(&str, "&#x00B5;");
-					break;
-                case '\xe7': 
-					stralloc_cats(&str, "&#x03C4;");
-					break;
-                case '\xe8': 
-					stralloc_cats(&str, "&#x03A6;");
-					break;
-                case '\xe9': 
-					stralloc_cats(&str, "&#x0398;");
-					break;
-                case '\xea': 
-					stralloc_cats(&str, "&#x03A9;");
-					break;
-                case '\xeb': 
-					stralloc_cats(&str, "&#x03B4;");
-					break;
-                case '\xec': 
-					stralloc_cats(&str, "&#x221E;");
-					break;
-                case '\xed': 
-					stralloc_cats(&str, "&#x2205;");
-					break;
-                case '\xee': 
-					stralloc_cats(&str, "&#x2208;");
-					break;
-                case '\xef': 
-					stralloc_cats(&str, "&#x2229;");
-					break;
-                case '\xf0': 
-					stralloc_cats(&str, "&#x2261;");
-					break;
-                case '\xf1': 
-					stralloc_cats(&str, "&#x00B1;");
-					break;
-                case '\xf2': 
-					stralloc_cats(&str, "&#x2265;");
-					break;
-                case '\xf3': 
-					stralloc_cats(&str, "&#x2264;");
-					break;
-                case '\xf4': 
-					stralloc_cats(&str, "&#x2320;");
-					break;
-                case '\xf5': 
-					stralloc_cats(&str, "&#x2321;");
-					break;
-                case '\xf6': 
-					stralloc_cats(&str, "&#x00F7;");
-					break;
-                case '\xf7': 
-					stralloc_cats(&str, "&#x2248;");
-					break;
-                case '\xf8': 
-					stralloc_cats(&str, "&#x00B0;");
-					break;
-                case '\xf9': 
-					stralloc_cats(&str, "&#x2219;");
-					break;
-                case '\xfa': 
-					stralloc_cats(&str, "&#x00B7;");
-					break;
-                case '\xfb': 
-					stralloc_cats(&str, "&#x221A;");
-					break;
-                case '\xfc': 
-					stralloc_cats(&str, "&#x207F;");
-					break;
-                case '\xfd': 
-					stralloc_cats(&str, "&#x00B2;");
-					break;
-                case '\xfe': 
-					stralloc_cats(&str, "&#x25AA;");					
-					break;
-				case ' ':
-					stralloc_cats(&str, "&nbsp;");					
-					break;
-				default:
-					stralloc_append1(&str, *p);
-					break;
-			} 
-		}
-		stralloc_0(&str);
-		new_tag->data = str.s;
+		new_tag->data = www_tag_sanatize(data);
 	} else {
 		new_tag->tag = strdup(tag);
 		new_tag->data = NULL;
@@ -574,7 +579,7 @@ struct www_tag *www_tag_duplicate(struct www_tag *oldtag) {
 
 void www_tag_add_attrib(struct www_tag *tag, char *attrib, char *value) {
 	ptr_vector_append(&tag->attribs, strdup(attrib));
-	ptr_vector_append(&tag->values, strdup(value));
+	ptr_vector_append(&tag->values, www_tag_sanatize(value));
 }
 
 void www_tag_add_child(struct www_tag *tag, struct www_tag *child) {