bbs/magicka
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve www message editing

Browse Source
This commit is contained in:
Andrew Pamment 2018-02-05 15:07:50 +10:00
parent f5cd8ddb03
commit 5a7cfb7c65
1 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/www_msgs.c
View File

@ -13,6 +13,8 @@
extern char * aha(char *input); extern char * aha(char *input);
extern struct bbs_config conf; extern struct bbs_config conf;
static char *www_wordwrap(char *content, int cutoff);
static char *www_sanitize(char *inp) { static char *www_sanitize(char *inp) {
int i; int i;
char *result; char *result;
@ -268,6 +270,7 @@ char *www_msgs_messageview(struct user_record *user, int conference, int area, i
char *msgid = NULL; char *msgid = NULL;
char *replyid = NULL; char *replyid = NULL;
char *body = NULL; char *body = NULL;
char *body2 = NULL;
int z; int z;
struct tm msg_date; struct tm msg_date;
time_t date; time_t date;
@ -594,15 +597,7 @@ char *www_msgs_messageview(struct user_record *user, int conference, int area, i
strcat(page, buffer); strcat(page, buffer);
len += strlen(buffer); len += strlen(buffer);
sprintf(buffer, "%s said....\n\n", from); sprintf(buffer, " %c> ", from[0]);
if (len + strlen(buffer) > max_len - 1) {
max_len += 4096;
page = (char *)realloc(page, max_len);
}
strcat(page, buffer);
len += strlen(buffer);
sprintf(buffer, "> ");
if (len + strlen(buffer) > max_len - 1) { if (len + strlen(buffer) > max_len - 1) {
max_len += 4096; max_len += 4096;
page = (char *)realloc(page, max_len); page = (char *)realloc(page, max_len);
@ -611,16 +606,23 @@ char *www_msgs_messageview(struct user_record *user, int conference, int area, i
len += strlen(buffer); len += strlen(buffer);
chars = 0; chars = 0;
body2 = www_wordwrap(body, 69);
for (i=0;i<jmh.TxtLen;i++) {
if (body[i] == '\r') { if (body2 == NULL) {
sprintf(buffer, "\n> "); body2 = body;
} else {
free(body);
}
for (i=0;i<strlen(body2);i++) {
if (body2[i] == '\r') {
sprintf(buffer, "\n %c> ", from[0]);
chars = 0; chars = 0;
} else if (chars == 78) { } else if (chars == 73) {
sprintf(buffer, "\n> %c", body[i]); sprintf(buffer, "\n %c> %c", from[0], body2[i]);
chars = 1; chars = 1;
} else { } else {
sprintf(buffer, "%c", body[i]); sprintf(buffer, "%c", body2[i]);
chars ++; chars ++;
} }
if (len + strlen(buffer) > max_len - 1) { if (len + strlen(buffer) > max_len - 1) {
@ -630,7 +632,7 @@ char *www_msgs_messageview(struct user_record *user, int conference, int area, i
strcat(page, buffer); strcat(page, buffer);
len += strlen(buffer); len += strlen(buffer);
} }
free(body); free(body2);
sprintf(buffer, "</textarea>\n<br />"); sprintf(buffer, "</textarea>\n<br />");
if (len + strlen(buffer) > max_len - 1) { if (len + strlen(buffer) > max_len - 1) {
max_len += 4096; max_len += 4096;
@ -692,7 +694,7 @@ char *www_msgs_messageview(struct user_record *user, int conference, int area, i
} }
} }
static char *www_wordwrap(char *content) { static char *www_wordwrap(char *content, int cutoff) {
int len = strlen(content); int len = strlen(content);
int i; int i;
int line_count; int line_count;
@ -721,11 +723,19 @@ static char *www_wordwrap(char *content) {
if (content[i] == '\r') { if (content[i] == '\r') {
line_count = 0; line_count = 0;
last_space = NULL; last_space = NULL;
} else if (line_count == 75) { } else if (line_count == cutoff) {
// wrap // wrap
if (last_space != NULL) { if (last_space != NULL) {
*last_space = '\r'; *last_space = '\r';
last_space = NULL; last_space = NULL;
} else {
ret = (char *)realloc(ret, strlen(ret) + 2);
if (ret == NULL) {
return NULL;
}
ret[at++] = '\r';
ret[at] = '\0';
last_space = NULL;
} }
line_count = 0; line_count = 0;
} else { } else {
@ -884,7 +894,7 @@ int www_send_msg(struct user_record *user, char *to, char *subj, int conference,
} else { } else {
snprintf(buffer, 256, "\r\r--- MagickaBBS v%d.%d%s (%s/%s)\r * Origin: %s \r", VERSION_MAJOR, VERSION_MINOR, VERSION_STR, name.sysname, name.machine, tagline); snprintf(buffer, 256, "\r\r--- MagickaBBS v%d.%d%s (%s/%s)\r * Origin: %s \r", VERSION_MAJOR, VERSION_MINOR, VERSION_STR, name.sysname, name.machine, tagline);
} }
body2 = www_wordwrap(body); body2 = www_wordwrap(body, 73);
if (body2 == NULL) { if (body2 == NULL) {
JAM_UnlockMB(jb); JAM_UnlockMB(jb);
JAM_DelSubPacket(jsp); JAM_DelSubPacket(jsp);