X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=textclient%2Fmessages.c;h=31ca9011f6d6a6b39310df58402286eaf1eb33fc;hb=633eabfc5820a6cc3b3c45793243928d0fa9c099;hp=67d656dbaef2a37e2284342abbe7a6855b911401;hpb=2ab397b00a1b34613748e3cf23503d4a9f7ada67;p=citadel.git diff --git a/textclient/messages.c b/textclient/messages.c index 67d656dba..31ca9011f 100644 --- a/textclient/messages.c +++ b/textclient/messages.c @@ -1,16 +1,14 @@ -/* - * Text client functions for reading and writing of messages - * - * Copyright (c) 1987-2019 by the citadel.org team - * - * This program is open source software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ +// Text client functions for reading and writing of messages +// +// Copyright (c) 1987-2020 by the citadel.org team +// +// This program is open source software. Use, duplication, and/or +// disclosure are subject to the GNU General Purpose License version 3. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. #include "textclient.h" @@ -340,60 +338,71 @@ void free_parts(struct parts *p) /* * This is a mini RFC2047 decoder. * It only handles strings encoded from UTF-8 as Quoted-printable. + * We can do this "in place" because the converted string will always be smaller than the source string. */ void mini_2047_decode(char *s) { - if (!s) + if (!s) { // no null strings allowed! return; + } - char *qstart = strstr(s, "=?UTF-8?Q?"); - if (!qstart) + char *qstart = strstr(s, "=?UTF-8?Q?"); // Must start with this string + if (!qstart) { return; + } - char *qend = strstr(s, "?="); - if (!qend) + char *qend = strstr(qstart+10, "?="); // Must end with this string + if (!qend) { return; + } - if (qend <= qstart) + if (qend <= qstart) { // And there must be something in between them. return; + } - strcpy(qstart, &qstart[10]); - qend -= 10; + // The string has qualified for conversion. - char *p = qstart; - while (p < qend) { + strcpy(qend, ""); // Strip the trailer + strcpy(qstart, &qstart[10]); // Strip the header - if (p[0] == '=') { + char *r = qstart; // Pointer to where in the string we're reading + char *w = s; // Pointer to where in the string we're writing + while(*r) { // Loop through the source string + if (r[0] == '=') { // "=" means read a hex character char ch[3]; - ch[0] = p[1]; - ch[1] = p[2]; - ch[2] = p[3]; + ch[0] = r[1]; + ch[1] = r[2]; + ch[2] = r[3]; int c; sscanf(ch, "%02x", &c); - p[0] = c; - strcpy(&p[1], &p[3]); - qend -= 2; + w[0] = c; + r += 3; + ++w; } - - if (p[0] == '_') { - p[0] = ' '; + else if (r[0] == '_') { // "_" is a space + w[0] = ' '; + ++r; + ++w; + } + else { // anything else pass through literally + w[0] = r[0]; + ++r; + ++w; } - - ++p; } - - strcpy(qend, &qend[2]); + w[0] = 0; // null terminate } /* * Read a message from the server */ -int read_message(CtdlIPC * ipc, long num, /* message number */ - int pagin, /* 0 = normal read, 1 = read with pagination, 2 = header */ - FILE * dest) -{ /* Destination file, NULL for screen */ +int read_message(CtdlIPC *ipc, + long num, /* message number */ + int pagin, /* 0 = normal read, 1 = read with pagination, 2 = header */ + FILE *dest /* Destination file, NULL for screen */ +) { char buf[SIZ]; char now[256]; int format_type = 0; @@ -409,7 +418,6 @@ int read_message(CtdlIPC * ipc, long num, /* message number */ char ch; int linelen; int final_line_is_blank = 0; - has_images = 0; sigcaught = 0; @@ -432,7 +440,8 @@ int read_message(CtdlIPC * ipc, long num, /* message number */ if (dest) { fprintf(dest, "\n "); - } else { + } + else { scr_printf("\n"); if (pagin != 2) { scr_printf(" "); @@ -452,8 +461,7 @@ int read_message(CtdlIPC * ipc, long num, /* message number */ if (!IsEmptyStr(message->email)) { scr_printf("rfca=%s\n", message->email); } - scr_printf("room=%s\ntime=%s", message->room, asctime(localtime(&message->time)) - ); + scr_printf("room=%s\ntime=%s", message->room, asctime(localtime(&message->time))); if (!IsEmptyStr(message->recipient)) { scr_printf("rcpt=%s\n", message->recipient); } @@ -488,26 +496,29 @@ int read_message(CtdlIPC * ipc, long num, /* message number */ if (nhdr == 1 && !is_room_aide) { if (dest) { fprintf(dest, " ****"); - } else { + } + else { scr_printf(" ****"); } - } else { + } + else { struct tm thetime; localtime_r(&message->time, &thetime); strftime(now, sizeof now, "%F %R", &thetime); if (dest) { fprintf(dest, "%s from %s ", now, message->author); - if (!IsEmptyStr(message->email)) { + if (!message->is_local) { fprintf(dest, "<%s> ", message->email); } - } else { + } + else { color(BRIGHT_CYAN); scr_printf("%s ", now); color(DIM_WHITE); scr_printf("from "); color(BRIGHT_CYAN); scr_printf("%s ", message->author); - if (!IsEmptyStr(message->email)) { + if (!message->is_local) { color(DIM_WHITE); scr_printf("<"); color(BRIGHT_BLUE); @@ -580,6 +591,7 @@ int read_message(CtdlIPC * ipc, long num, /* message number */ color(BRIGHT_CYAN); mini_2047_decode(message->subject); scr_printf("%s\n", message->subject); + } } } @@ -1050,7 +1062,21 @@ int entmsg(CtdlIPC * ipc, int is_reply, /* nonzero if this was a eply command int r; /* IPC response code */ int subject_required = 0; - if (!entmsg_ok) { + if (entmsg_ok == ENTMSG_OK_YES) { + /* no problem, go right ahead */ + } + else if (entmsg_ok == ENTMSG_OK_BLOG) { + if (!is_reply) { + scr_printf("WARNING: this is a BLOG room.\n"); + scr_printf("The 'nter Message' command will create a BLOG POST.\n"); + scr_printf("If you want to leave a comment or reply to a comment, use the 'eply' command.\n"); + scr_printf("Do you really want to create a new blog post? "); + if (!yesno()) { + return(1); + } + } + } + else { scr_printf("You may not enter messages in this type of room.\n"); return (1); }