From 19eed36f8b27d5317c72a4058e3cc67da7a4cee7 Mon Sep 17 00:00:00 2001 From: Andrew Pamment Date: Fri, 28 Apr 2017 18:27:01 +1000 Subject: [PATCH] Attempt to fix www message display --- www_msgs.c | 96 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 79 insertions(+), 17 deletions(-) diff --git a/www_msgs.c b/www_msgs.c index 9c95315..e305fb4 100644 --- a/www_msgs.c +++ b/www_msgs.c @@ -67,6 +67,48 @@ static int new_messages(struct user_record *user, int conference, int area) { return count; } +static char *www_sanitize(char *inp) { + int i; + char *result; + int len = 0; + for (i=0;i')) { + len += 4; + } else if (inp[i] == '&') { + len += 5; + } else { + len++; + } + } + + result = (char *)malloc(len + 1); + memset(result, 0, len); + len = 0; + for (i=0;i') { + result[len++] = '&'; + result[len++] = 'g'; + result[len++] = 't'; + result[len++] = ';'; + } else if (inp[i] == '&') { + result[len++] = '&'; + result[len++] = 'a'; + result[len++] = 'm'; + result[len++] = 'p'; + result[len++] = ';'; + } else { + result[len++] = inp[i]; + } + } + + return result; +} + char *www_msgs_arealist(struct user_record *user) { char *page; int max_len; @@ -131,6 +173,10 @@ char *www_msgs_messagelist(struct user_record *user, int conference, int area, i s_JamLastRead jlr; int skip_f; int skip_t; + char *to; + char *from; + char *subject; + if (conference < 0 || conference >= conf.mail_conference_count || area < 0 || area >= conf.mail_conferences[conference]->mail_area_count) { return NULL; } @@ -197,11 +243,19 @@ char *www_msgs_messagelist(struct user_record *user, int conference, int area, i for (i=skip_f -1; i>=skip_t;i--) { date = (time_t)mhrs->msgs[i]->msg_h->DateWritten; gmtime_r(&date, &msg_date); + to = www_sanitize(mhrs->msgs[i]->to); + from = www_sanitize(mhrs->msgs[i]->from); + subject = www_sanitize(mhrs->msgs[i]->subject); if (mhrs->msgs[i]->msg_h->MsgNum > jlr.HighReadMsg) { - sprintf(buffer, "
%d
%s
%s
%s
%.2d:%.2d %.2d-%.2d-%.2d
\n", mhrs->msgs[i]->msg_no + 1, conference, area, mhrs->msgs[i]->msg_h->MsgNum, mhrs->msgs[i]->subject, mhrs->msgs[i]->from, mhrs->msgs[i]->to, msg_date.tm_hour, msg_date.tm_min, msg_date.tm_mday, msg_date.tm_mon + 1, msg_date.tm_year - 100); + sprintf(buffer, "
%d
%s
%s
%s
%.2d:%.2d %.2d-%.2d-%.2d
\n", mhrs->msgs[i]->msg_no + 1, conference, area, mhrs->msgs[i]->msg_h->MsgNum, subject, from, to, msg_date.tm_hour, msg_date.tm_min, msg_date.tm_mday, msg_date.tm_mon + 1, msg_date.tm_year - 100); } else { - sprintf(buffer, "
%d
%s
%s
%s
%.2d:%.2d %.2d-%.2d-%.2d
\n", mhrs->msgs[i]->msg_no + 1, conference, area, mhrs->msgs[i]->msg_h->MsgNum, mhrs->msgs[i]->subject, mhrs->msgs[i]->from, mhrs->msgs[i]->to, msg_date.tm_hour, msg_date.tm_min, msg_date.tm_mday, msg_date.tm_mon + 1, msg_date.tm_year - 100); + sprintf(buffer, "
%d
%s
%s
%s
%.2d:%.2d %.2d-%.2d-%.2d
\n", mhrs->msgs[i]->msg_no + 1, conference, area, mhrs->msgs[i]->msg_h->MsgNum, subject, from, to, msg_date.tm_hour, msg_date.tm_min, msg_date.tm_mday, msg_date.tm_mon + 1, msg_date.tm_year - 100); } + + free(to); + free(from); + free(subject); + if (len + strlen(buffer) > max_len - 1) { max_len += 4096; page = (char *)realloc(page, max_len); @@ -269,6 +323,9 @@ char *www_msgs_messageview(struct user_record *user, int conference, int area, i char buffer[4096]; int chars; int i; + char *from_s; + char *subject_s; + char *to_s; char *aha_text; char *aha_out; @@ -411,34 +468,39 @@ char *www_msgs_messageview(struct user_record *user, int conference, int area, i } strcat(page, buffer); len += strlen(buffer); - - sprintf(buffer, "
%s
\n", subject); - if (len + strlen(buffer) > max_len - 1) { - max_len += 4096; - page = (char *)realloc(page, max_len); - } - strcat(page, buffer); - len += strlen(buffer); - - if (conf.mail_conferences[conference]->mail_areas[area]->type != TYPE_LOCAL_AREA) { - sprintf(buffer, "
From: %s (%s)
\n", from, oaddress); - } else { - sprintf(buffer, "
From: %s
\n", from); - } + subject_s = www_sanitize(subject); + sprintf(buffer, "
%s
\n", subject_s); if (len + strlen(buffer) > max_len - 1) { max_len += 4096; page = (char *)realloc(page, max_len); } + free(subject_s); strcat(page, buffer); len += strlen(buffer); - sprintf(buffer, "
To: %s
\n", to); + from_s = www_sanitize(from); + if (conf.mail_conferences[conference]->mail_areas[area]->type != TYPE_LOCAL_AREA) { + sprintf(buffer, "
From: %s (%s)
\n", from_s, oaddress); + } else { + sprintf(buffer, "
From: %s
\n", from_s); + } + free(from_s); + if (len + strlen(buffer) > max_len - 1) { max_len += 4096; page = (char *)realloc(page, max_len); } strcat(page, buffer); len += strlen(buffer); + to_s = www_sanitize(to); + sprintf(buffer, "
To: %s
\n", to_s); + if (len + strlen(buffer) > max_len - 1) { + max_len += 4096; + page = (char *)realloc(page, max_len); + } + free(to_s); + strcat(page, buffer); + len += strlen(buffer); date = (time_t)jmh.DateWritten; gmtime_r(&date, &msg_date);