#include "parsedate.h"
#include "database.h"
#include "ctdl_module.h"
-#ifdef HAVE_ICONV
-#include <iconv.h>
-// This is the non-define version in case it is needed for debugging
-#if 0
-inline void FindNextEnd (char *bptr, char *end)
-{
- /* Find the next ?Q? */
- end = strchr(bptr + 2, '?');
- if (end == NULL) return NULL;
- if (((*(end + 1) == 'B') || (*(end + 1) == 'Q')) &&
- (*(end + 2) == '?')) {
- /* skip on to the end of the cluster, the next ?= */
- end = strstr(end + 3, "?=");
- }
- else
- /* sort of half valid encoding, try to find an end. */
- end = strstr(bptr, "?=");
-}
-#endif
-
-#define FindNextEnd(bptr, end) { \
- end = strchr(bptr + 2, '?'); \
- if (end != NULL) { \
- if (((*(end + 1) == 'B') || (*(end + 1) == 'Q')) && (*(end + 2) == '?')) { \
- end = strstr(end + 3, "?="); \
- } else end = strstr(bptr, "?="); \
- } \
-}
-
-// Handle subjects with RFC2047 encoding such as:
-// =?koi8-r?B?78bP0s3Mxc7JxSDXz9rE1dvO2c3JINvB0sHNySDP?=
-void utf8ify_rfc822_string(char *buf) {
- char *start, *end, *next, *nextend, *ptr;
- char newbuf[1024];
- char charset[128];
- char encoding[16];
- char istr[1024];
- 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 *isav; // Saved pointer to input buffer
- char *osav; // Saved pointer to output buffer
- int passes = 0;
- int i, len, delta;
- int illegal_non_rfc2047_encoding = 0;
-
- // Sometimes, badly formed messages contain strings which were simply
- // written out directly in some foreign character set instead of
- // using RFC2047 encoding. This is illegal but we will attempt to
- // handle it anyway by converting from a user-specified default
- // charset to UTF-8 if we see any nonprintable characters.
- len = strlen(buf);
- for (i=0; i<len; ++i) {
- if ((buf[i] < 32) || (buf[i] > 126)) {
- illegal_non_rfc2047_encoding = 1;
- i = len; // take a shortcut, it won't be more than one.
- }
- }
- if (illegal_non_rfc2047_encoding) {
- const char *default_header_charset = "iso-8859-1";
- if ( (strcasecmp(default_header_charset, "UTF-8")) && (strcasecmp(default_header_charset, "us-ascii")) ) {
- ctdl_iconv_open("UTF-8", default_header_charset, &ic);
- if (ic != (iconv_t)(-1) ) {
- ibuf = malloc(1024);
- isav = ibuf;
- safestrncpy(ibuf, buf, 1024);
- ibuflen = strlen(ibuf);
- obuflen = 1024;
- obuf = (char *) malloc(obuflen);
- osav = obuf;
- iconv(ic, &ibuf, &ibuflen, &obuf, &obuflen);
- osav[1024-obuflen] = 0;
- strcpy(buf, osav);
- free(osav);
- iconv_close(ic);
- free(isav);
- }
- }
- }
-
- // pre evaluate the first pair
- nextend = end = NULL;
- len = strlen(buf);
- start = strstr(buf, "=?");
- if (start != NULL)
- FindNextEnd (start, end);
-
- while ((start != NULL) && (end != NULL)) {
- next = strstr(end, "=?");
- if (next != NULL)
- FindNextEnd(next, nextend);
- if (nextend == NULL)
- next = NULL;
-
- // did we find two partitions
- if ((next != NULL) && ((next - end) > 2)) {
- ptr = end + 2;
- while ((ptr < next) &&
- (isspace(*ptr) ||
- (*ptr == '\r') ||
- (*ptr == '\n') ||
- (*ptr == '\t')))
- ptr ++;
- // did we find a gab just filled with blanks?
- if (ptr == next) {
- memmove(end + 2, next, len - (next - start));
-
- // now terminate the gab at the end
- delta = (next - end) - 2;
- len -= delta;
- buf[len] = '\0';
-
- // move next to its new location.
- next -= delta;
- nextend -= delta;
- }
- }
- // our next-pair is our new first pair now.
- start = next;
- end = nextend;
- }
-
- // Now we handle foreign character sets properly encoded in RFC2047 format.
- start = strstr(buf, "=?");
- FindNextEnd((start != NULL)? start : buf, end);
- while (start != NULL && end != NULL && end > start) {
- extract_token(charset, start, 1, '?', sizeof charset);
- extract_token(encoding, start, 2, '?', sizeof encoding);
- extract_token(istr, start, 3, '?', sizeof istr);
-
- ibuf = malloc(1024);
- isav = ibuf;
- if (!strcasecmp(encoding, "B")) { // base64
- ibuflen = CtdlDecodeBase64(ibuf, istr, strlen(istr));
- }
- else if (!strcasecmp(encoding, "Q")) { // quoted-printable
- size_t len;
- unsigned long pos;
-
- len = strlen(istr);
- pos = 0;
- while (pos < len) {
- if (istr[pos] == '_') istr[pos] = ' ';
- pos++;
- }
- ibuflen = CtdlDecodeQuotedPrintable(ibuf, istr, len);
- }
- else {
- strcpy(ibuf, istr); // unknown encoding
- ibuflen = strlen(istr);
- }
-
- ctdl_iconv_open("UTF-8", charset, &ic);
- if (ic != (iconv_t)(-1) ) {
- obuflen = 1024;
- obuf = (char *) malloc(obuflen);
- osav = obuf;
- iconv(ic, &ibuf, &ibuflen, &obuf, &obuflen);
- osav[1024-obuflen] = 0;
-
- end = start;
- end++;
- strcpy(start, "");
- remove_token(end, 0, '?');
- remove_token(end, 0, '?');
- remove_token(end, 0, '?');
- remove_token(end, 0, '?');
- strcpy(end, &end[1]);
-
- snprintf(newbuf, sizeof newbuf, "%s%s%s", buf, osav, end);
- strcpy(buf, newbuf);
- free(osav);
- iconv_close(ic);
- }
- else {
- end = start;
- end++;
- strcpy(start, "");
- remove_token(end, 0, '?');
- remove_token(end, 0, '?');
- remove_token(end, 0, '?');
- remove_token(end, 0, '?');
- strcpy(end, &end[1]);
-
- snprintf(newbuf, sizeof newbuf, "%s(unreadable)%s", buf, end);
- strcpy(buf, newbuf);
- }
-
- free(isav);
-
- // Since spammers will go to all sorts of absurd lengths to get their
- // messages through, there are LOTS of corrupt headers out there.
- // So, prevent a really badly formed RFC2047 header from throwing
- // this function into an infinite loop.
- ++passes;
- if (passes > 20) return;
-
- start = strstr(buf, "=?");
- FindNextEnd((start != NULL)? start : buf, end);
- }
-
-}
-#else
-inline void utf8ify_rfc822_string(char *a){};
-
-#endif
char *inetcfg = NULL;
while (RoomPurgeList != NULL) {
if (CtdlGetRoom(&qrbuf, RoomPurgeList->name) == 0) {
transcript=realloc(transcript, strlen(transcript)+SIZ);
- snprintf(&transcript[strlen(transcript)], SIZ, " %s\n",
- qrbuf.QRname);
+ snprintf(&transcript[strlen(transcript)], SIZ, " %s\n", qrbuf.QRname);
CtdlDeleteRoom(&qrbuf);
+ ++num_rooms_purged;
}
pptr = RoomPurgeList->next;
free(RoomPurgeList);
RoomPurgeList = pptr;
- ++num_rooms_purged;
}
if (num_rooms_purged > 0) CtdlAideMessage(transcript, "Room Autopurger Message");
strcpy(transcript, "The following users have been auto-purged:\n");
while (UserPurgeList != NULL) {
transcript=realloc(transcript, strlen(transcript)+SIZ);
- snprintf(&transcript[strlen(transcript)], SIZ, " %s\n",
- UserPurgeList->name);
+ snprintf(&transcript[strlen(transcript)], SIZ, " %s\n", UserPurgeList->name);
purge_user(UserPurgeList->name);
pptr = UserPurgeList->next;
free(UserPurgeList);
// traverse the visit file, checking each record against those two lists and
// purging the ones that do not have a match on _both_ lists. (Remember, if
// either the room or user being referred to is no longer on the system, the
-// record is completely useless.)
+// record is useless and should be removed.)
//
int PurgeVisits(void) {
struct cdbdata *cdbvisit;
LIB_OBJS = lib/libcitadel.lo \
lib/mime_parser.lo \
lib/tools.lo \
+ lib/decode.lo \
lib/base64.lo \
lib/vcard.lo \
lib/vnote.lo \
lib/libcitadel.lo: lib/libcitadel.c lib/libcitadel.h
lib/mime_parser.lo: lib/mime_parser.c lib/libcitadel.h
lib/tools.lo: lib/tools.c lib/libcitadel.h
+lib/decode.lo: lib/decode.c lib/libcitadel.h
lib/base64.lo: lib/base64.c lib/libcitadel.h
lib/vcard.lo: lib/vcard.c lib/libcitadel.h
lib/vnote.lo: lib/vnote.c lib/libcitadel.h
lib/xdgmime/xdgmimecache.lo: lib/xdgmime/xdgmimecache.c
lib/html_to_ascii.lo: lib/html_to_ascii.c
lib/tools.lo: lib/tools.c
+lib/decode.lo: lib/decode.c
lib/base64.lo: lib/base64.c
.SUFFIXES: .c .cpp .lo .o
*
* Copyright (c) 2021 by Art Cancro
*
- * This program is open source software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is open source software. Use, duplication, or disclosure
+ * is subject to the terms of the GNU General Public License, version 3.
*/
//
// Copyright (c) 1987-2022 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 as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// 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.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// This program is open source software. Use, duplication, or disclosure
+// is subject to the terms of the GNU General Public License, version 3.
+
#define _GNU_SOURCE
#include "sysdep.h"
// convert base64 alphabet characters to 6-bit decimal values
-char unalphabet(char ch) {
+char b64unalphabet(char ch) {
if (isupper(ch)) {
return(ch - 'A');
}
while (bytes_read < source_len) {
- char ch = unalphabet(source[bytes_read++]);
+ char ch = b64unalphabet(source[bytes_read++]);
if (ch < 65) {
decodebuf[decodepos++] = ch;
}
--- /dev/null
+// Copyright (c) 1996-2022 by the citadel.org team
+//
+// This program is open source software. Use, duplication, or disclosure
+// are subject to the terms of the GNU General Public License v3.
+
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <signal.h>
+#include <sys/types.h>
+#include <ctype.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <errno.h>
+#include <limits.h>
+#include <iconv.h>
+#include "libcitadel.h"
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#endif
+
+
+// This is the non-define version in case it is needed for debugging
+#if 0
+inline void FindNextEnd (char *bptr, char *end) {
+ /* Find the next ?Q? */
+ end = strchr(bptr + 2, '?');
+ if (end == NULL) return NULL;
+ if (((*(end + 1) == 'B') || (*(end + 1) == 'Q')) &&
+ (*(end + 2) == '?')) {
+ /* skip on to the end of the cluster, the next ?= */
+ end = strstr(end + 3, "?=");
+ }
+ else
+ /* sort of half valid encoding, try to find an end. */
+ end = strstr(bptr, "?=");
+}
+#endif
+
+#define FindNextEnd(bptr, end) { \
+ end = strchr(bptr + 2, '?'); \
+ if (end != NULL) { \
+ if (((*(end + 1) == 'B') || (*(end + 1) == 'Q')) && (*(end + 2) == '?')) { \
+ end = strstr(end + 3, "?="); \
+ } else end = strstr(bptr, "?="); \
+ } \
+}
+
+// Handle subjects with RFC2047 encoding such as:
+// =?koi8-r?B?78bP0s3Mxc7JxSDXz9rE1dvO2c3JINvB0sHNySDP?=
+void utf8ify_rfc822_string(char *buf) {
+ char *start, *end, *next, *nextend, *ptr;
+ char newbuf[1024];
+ char charset[128];
+ char encoding[16];
+ char istr[1024];
+ 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 *isav; // Saved pointer to input buffer
+ char *osav; // Saved pointer to output buffer
+ int passes = 0;
+ int i, len, delta;
+ int illegal_non_rfc2047_encoding = 0;
+
+ // Sometimes, badly formed messages contain strings which were simply
+ // written out directly in some foreign character set instead of
+ // using RFC2047 encoding. This is illegal but we will attempt to
+ // handle it anyway by converting from a user-specified default
+ // charset to UTF-8 if we see any nonprintable characters.
+ len = strlen(buf);
+ for (i=0; i<len; ++i) {
+ if ((buf[i] < 32) || (buf[i] > 126)) {
+ illegal_non_rfc2047_encoding = 1;
+ i = len; // take a shortcut, it won't be more than one.
+ }
+ }
+ if (illegal_non_rfc2047_encoding) {
+ const char *default_header_charset = "iso-8859-1";
+ if ( (strcasecmp(default_header_charset, "UTF-8")) && (strcasecmp(default_header_charset, "us-ascii")) ) {
+ ctdl_iconv_open("UTF-8", default_header_charset, &ic);
+ if (ic != (iconv_t)(-1) ) {
+ ibuf = malloc(1024);
+ isav = ibuf;
+ safestrncpy(ibuf, buf, 1024);
+ ibuflen = strlen(ibuf);
+ obuflen = 1024;
+ obuf = (char *) malloc(obuflen);
+ osav = obuf;
+ iconv(ic, &ibuf, &ibuflen, &obuf, &obuflen);
+ osav[1024-obuflen] = 0;
+ strcpy(buf, osav);
+ free(osav);
+ iconv_close(ic);
+ free(isav);
+ }
+ }
+ }
+
+ // pre evaluate the first pair
+ nextend = end = NULL;
+ len = strlen(buf);
+ start = strstr(buf, "=?");
+ if (start != NULL)
+ FindNextEnd (start, end);
+
+ while ((start != NULL) && (end != NULL)) {
+ next = strstr(end, "=?");
+ if (next != NULL)
+ FindNextEnd(next, nextend);
+ if (nextend == NULL)
+ next = NULL;
+
+ // did we find two partitions
+ if ((next != NULL) && ((next - end) > 2)) {
+ ptr = end + 2;
+ while ((ptr < next) &&
+ (isspace(*ptr) ||
+ (*ptr == '\r') ||
+ (*ptr == '\n') ||
+ (*ptr == '\t')))
+ ptr ++;
+ // did we find a gab just filled with blanks?
+ if (ptr == next) {
+ memmove(end + 2, next, len - (next - start));
+
+ // now terminate the gab at the end
+ delta = (next - end) - 2;
+ len -= delta;
+ buf[len] = '\0';
+
+ // move next to its new location.
+ next -= delta;
+ nextend -= delta;
+ }
+ }
+ // our next-pair is our new first pair now.
+ start = next;
+ end = nextend;
+ }
+
+ // Now we handle foreign character sets properly encoded in RFC2047 format.
+ start = strstr(buf, "=?");
+ FindNextEnd((start != NULL)? start : buf, end);
+ while (start != NULL && end != NULL && end > start) {
+ extract_token(charset, start, 1, '?', sizeof charset);
+ extract_token(encoding, start, 2, '?', sizeof encoding);
+ extract_token(istr, start, 3, '?', sizeof istr);
+
+ ibuf = malloc(1024);
+ isav = ibuf;
+ if (!strcasecmp(encoding, "B")) { // base64
+ ibuflen = CtdlDecodeBase64(ibuf, istr, strlen(istr));
+ }
+ else if (!strcasecmp(encoding, "Q")) { // quoted-printable
+ size_t len;
+ unsigned long pos;
+
+ len = strlen(istr);
+ pos = 0;
+ while (pos < len) {
+ if (istr[pos] == '_') istr[pos] = ' ';
+ pos++;
+ }
+ ibuflen = CtdlDecodeQuotedPrintable(ibuf, istr, len);
+ }
+ else {
+ strcpy(ibuf, istr); // unknown encoding
+ ibuflen = strlen(istr);
+ }
+
+ ctdl_iconv_open("UTF-8", charset, &ic);
+ if (ic != (iconv_t)(-1) ) {
+ obuflen = 1024;
+ obuf = (char *) malloc(obuflen);
+ osav = obuf;
+ iconv(ic, &ibuf, &ibuflen, &obuf, &obuflen);
+ osav[1024-obuflen] = 0;
+
+ end = start;
+ end++;
+ strcpy(start, "");
+ remove_token(end, 0, '?');
+ remove_token(end, 0, '?');
+ remove_token(end, 0, '?');
+ remove_token(end, 0, '?');
+ strcpy(end, &end[1]);
+
+ snprintf(newbuf, sizeof newbuf, "%s%s%s", buf, osav, end);
+ strcpy(buf, newbuf);
+ free(osav);
+ iconv_close(ic);
+ }
+ else {
+ end = start;
+ end++;
+ strcpy(start, "");
+ remove_token(end, 0, '?');
+ remove_token(end, 0, '?');
+ remove_token(end, 0, '?');
+ remove_token(end, 0, '?');
+ strcpy(end, &end[1]);
+
+ snprintf(newbuf, sizeof newbuf, "%s(unreadable)%s", buf, end);
+ strcpy(buf, newbuf);
+ }
+
+ free(isav);
+
+ // Since spammers will go to all sorts of absurd lengths to get their
+ // messages through, there are LOTS of corrupt headers out there.
+ // So, prevent a really badly formed RFC2047 header from throwing
+ // this function into an infinite loop.
+ ++passes;
+ if (passes > 20) return;
+
+ start = strstr(buf, "=?");
+ FindNextEnd((start != NULL)? start : buf, end);
+ }
+
+}
/*
* Copyright (c) 1987-2011 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 as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// This program is open source software. Use, duplication, or disclosure
+// is subject to the terms of the GNU General Public License, version 3.
*/
#include <stdint.h>
* Functions which handle translation between HTML and plain text
* Copyright (c) 2000-2018 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 as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// This program is open source software. Use, duplication, or disclosure
+// is subject to the terms of the GNU General Public License, version 3.
*/
#include <stdlib.h>
*
* Copyright (c) 1987-2018 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 as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// This program is open source software. Use, duplication, or disclosure
+// is subject to the terms of the GNU General Public License, version 3.
*/
#include "sysdep.h"
*
* Copyright (c) 1987-2013 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 as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// This program is open source software. Use, duplication, or disclosure
+// is subject to the terms of the GNU General Public License, version 3.
*/
#include <stdlib.h>
/*
* Header file for libcitadel
*
- * Copyright (c) 1987-2021 by the citadel.org team
+ * Copyright (c) 1987-2022 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.
+// This program is open source software. Use, duplication, or disclosure
+// is subject to the terms of the GNU General Public License, version 3.
*/
/* protect against double includes */
void stripltlen(char *, int *);
char *html_to_ascii(const char *inputmsg, int msglen, int screenwidth);
void LoadEntityList(char *FileName);
+void utf8ify_rfc822_string(char *buf);
typedef struct {
//
// Copyright (c) 1998-2022 by the citadel.org development team.
//
-// This program is open source software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// 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.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// This program is open source software. Use, duplication, or disclosure
+// is subject to the terms of the GNU General Public License, version 3.
#include <stdlib.h>
#include <unistd.h>
// Copyright (c) 1987-2022 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 as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// 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.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// This program is open source software. Use, duplication, or disclosure
+// is subject to the terms of the GNU General Public License, version 3.
#define _GNU_SOURCE
#include "sysdep.h"
//
// Copyright (c) 1987-2022 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 as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// 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.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
+// This program is open source software. Use, duplication, or disclosure
+// is subject to the terms of the GNU General Public License, version 3.
#include <stdlib.h>
#include <unistd.h>
+// This program is open source software. Use, duplication, or disclosure
+// is subject to the terms of the GNU General Public License, version 3.
#include "sysdep.h"
#include <ctype.h>
#include <errno.h>
*
* Copyright (C) 1999-2008 by the citadel.org development team.
*
- * This program is open source software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// This program is open source software. Use, duplication, or disclosure
+// is subject to the terms of the GNU General Public License, version 3.
*/
*
* Copyright (C) 1999-2007 by the citadel.org development team.
*
- * This program is open source software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// This program is open source software. Use, duplication, or disclosure
+// is subject to the terms of the GNU General Public License, version 3.
*/
.ctdl-roomlist-mtime {
}
+.ctdl-mailbox-heading {
+ position: sticky;
+ top: 0;
+ z-index: 6;
+}
+
.ctdl-mailbox-pane { /* list of messages when in mailbox view */
+ position: absolute;
+ height: 25%;
+ width: inherit;
+ overflow-x: hidden;
+ overflow-y: scroll;
}
.ctdl-reading-pane { /* message reading/composing pane when in mailbox view */
+ position: absolute;
+ top: 31%;
+ height: 70%;
+ left: inherit;
+ right: inherit;
+ overflow: scroll;
}
<body class="w3-light-grey">
<!-- Modal dialog (when needed) -->
-<div id="ctdl_big_modal" class="w3-modal" style="display:none; z-index:5">
+<div id="ctdl_big_modal" class="w3-modal" style="display:none; z-index:9">
LOADING
</div>
// Set up the mailbox view
function mail_display() {
- document.getElementById("ctdl-main").innerHTML =
- "<div id=\"ctdl-mailbox-pane\" class=\"ctdl-mailbox-pane\"></div>"
+ document.getElementById("ctdl-main").innerHTML
+ = "<div id=\"ctdl-mailbox-pane\" class=\"ctdl-mailbox-pane\"></div>"
+ "<div id=\"ctdl-reading-pane\" class=\"ctdl-reading-pane\"></div>";
+ ;
refresh_mail_display();
try { // if this was already set up, clear it so there aren't multiple
clearInterval(RefreshMailboxInterval);
if (response.ok) {
box = "<table class=\"w3-table-all w3-hoverable\" width=100%>"
- + "<tr class=\"w3-blue\">"
+ + "<tr class=\"ctdl-mailbox-heading w3-blue\">"
+ "<th>" + _("Subject") + "</th>"
+ "<th>" + _("Sender") + "</th>"
+ "<th>" + _("Date") + "</th>"
dav_options.o autocompletion.o gettext.o tabs.o sieve.o sitemap.o \
dav_delete.o dav_put.o http_datestring.o \
downloads.o addressbook_popup.o pushemail.o sysdep.o openid.o \
- decode.o modules_init.o paramhandling.o utils.o \
+ modules_init.o paramhandling.o utils.o \
ical_maps.o ical_subst.o static.o feed_generator.o \
$(LIBOBJS)
echo LD: webcit
dav_main.o dav_get.o dav_propfind.o dav_report.o dav_delete.o \
dav_options.o autocompletion.o tabs.o smtpqueue.o sieve.o sitemap.o \
dav_put.o http_datestring.o fmt_date.o modules_init.o \
- gettext.o downloads.o addressbook_popup.o pushemail.o sysdep.o decode.o \
+ gettext.o downloads.o addressbook_popup.o pushemail.o sysdep.o \
paramhandling.o utils.o ical_maps.o ical_subst.o static.o feed_generator.o \
$(LIBS)
+++ /dev/null
-/*
- * Copyright (c) 1996-2012 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.
- */
-
-#include "webcit.h"
-#ifdef HAVE_ICONV
-
-/*
- * Wrapper around iconv_open()
- * Our version adds aliases for non-standard Microsoft charsets
- * such as 'MS950', aliasing them to names like 'CP950'
- *
- * tocode Target encoding
- * fromcode Source encoding
- * /
-iconv_t ctdl_iconv_open(const char *tocode, const char *fromcode)
-{
- iconv_t ic = (iconv_t)(-1) ;
- ic = iconv_open(tocode, fromcode);
- if (ic == (iconv_t)(-1) ) {
- char alias_fromcode[64];
- if ( (strlen(fromcode) == 5) && (!strncasecmp(fromcode, "MS", 2)) ) {
- safestrncpy(alias_fromcode, fromcode, sizeof alias_fromcode);
- alias_fromcode[0] = 'C';
- alias_fromcode[1] = 'P';
- ic = iconv_open(tocode, alias_fromcode);
- }
- }
- return(ic);
-}
-*/
-
-
-static inline char *FindNextEnd (char *bptr)
-{
- char * end;
- /* Find the next ?Q? */
- end = strchr(bptr + 2, '?');
- if (end == NULL) return NULL;
- if (((*(end + 1) == 'B') || (*(end + 1) == 'Q')) &&
- (*(end + 2) == '?')) {
- /* skip on to the end of the cluster, the next ?= */
- end = strstr(end + 3, "?=");
- }
- else
- /* sort of half valid encoding, try to find an end. */
- end = strstr(bptr, "?=");
- return end;
-}
-
-/*
- * Handle subjects with RFC2047 encoding such as:
- * =?koi8-r?B?78bP0s3Mxc7JxSDXz9rE1dvO2c3JINvB0sHNySDP?=
- */
-void utf8ify_rfc822_string(char **buf) {
- char *start, *end, *next, *nextend, *ptr;
- char newbuf[1024];
- char charset[128];
- char encoding[16];
- char istr[1024];
- 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 *isav; /* Saved pointer to input buffer */
- char *osav; /* Saved pointer to output buffer */
- int passes = 0;
- int i, len, delta;
- int illegal_non_rfc2047_encoding = 0;
-
- /* Sometimes, badly formed messages contain strings which were simply
- * written out directly in some foreign character set instead of
- * using RFC2047 encoding. This is illegal but we will attempt to
- * handle it anyway by converting from a user-specified default
- * charset to UTF-8 if we see any nonprintable characters.
- */
- len = strlen(*buf);
- for (i=0; i<len; ++i) {
- if (((*buf)[i] < 32) || ((*buf)[i] > 126)) {
- illegal_non_rfc2047_encoding = 1;
- i = len; /*< take a shortcut, it won't be more than one. */
- }
- }
- if (illegal_non_rfc2047_encoding) {
- StrBuf *default_header_charset;
- get_preference("default_header_charset", &default_header_charset);
- if ( (strcasecmp(ChrPtr(default_header_charset), "UTF-8")) &&
- (strcasecmp(ChrPtr(default_header_charset), "us-ascii")) ) {
- ctdl_iconv_open("UTF-8", ChrPtr(default_header_charset), &ic);
- if (ic != (iconv_t)(-1) ) {
- ibuf = malloc(1024);
- isav = ibuf;
- safestrncpy(ibuf, *buf, 1023);
- ibuflen = strlen(ibuf);
- obuflen = 1024;
- obuf = (char *) malloc(obuflen);
- osav = obuf;
- iconv(ic, &ibuf, &ibuflen, &obuf, &obuflen);
- osav[1023-obuflen] = 0;
- free(*buf);
- *buf = osav;
- iconv_close(ic);
- free(isav);
- }
- }
- }
-
- /* pre evaluate the first pair */
- nextend = end = NULL;
- len = strlen(*buf);
- start = strstr(*buf, "=?");
- if (start != NULL)
- end = FindNextEnd (start);
-
- while ((start != NULL) && (end != NULL))
- {
- next = strstr(end, "=?");
- if (next != NULL)
- nextend = FindNextEnd(next);
- if (nextend == NULL)
- next = NULL;
-
- /* did we find two partitions */
- if ((next != NULL) &&
- ((next - end) > 2))
- {
- ptr = end + 2;
- while ((ptr < next) &&
- (isspace(*ptr) ||
- (*ptr == '\r') ||
- (*ptr == '\n') ||
- (*ptr == '\t')))
- ptr ++;
- /* did we find a gab just filled with blanks? */
- if (ptr == next)
- {
- memmove (end + 2,
- next,
- len - (next - start));
-
- /* now terminate the gab at the end */
- delta = (next - end) - 2;
- len -= delta;
- (*buf)[len] = '\0';
-
- /* move next to its new location. */
- next -= delta;
- nextend -= delta;
- }
- }
- /* our next-pair is our new first pair now. */
- start = next;
- end = nextend;
- }
-
- /* Now we handle foreign character sets properly encoded
- * in RFC2047 format.
- */
- while (start=strstr((*buf), "=?"), end=FindNextEnd((start != NULL)? start : (*buf)),
- ((start != NULL) && (end != NULL) && (end > start)) )
- {
- extract_token(charset, start, 1, '?', sizeof charset);
- extract_token(encoding, start, 2, '?', sizeof encoding);
- extract_token(istr, start, 3, '?', sizeof istr);
-
- ibuf = malloc(1024);
- isav = ibuf;
- if (!strcasecmp(encoding, "B")) { /* base64 */
- ibuflen = CtdlDecodeBase64(ibuf, istr, strlen(istr));
- }
- else if (!strcasecmp(encoding, "Q")) { /* quoted-printable */
- size_t len;
- long pos;
-
- len = strlen(istr);
- pos = 0;
- while (pos < len)
- {
- if (istr[pos] == '_') istr[pos] = ' ';
- pos++;
- }
-
- ibuflen = CtdlDecodeQuotedPrintable(ibuf, istr, len);
- }
- else {
- strcpy(ibuf, istr); /* unknown encoding */
- ibuflen = strlen(istr);
- }
-
- ctdl_iconv_open("UTF-8", charset, &ic);
- if (ic != (iconv_t)(-1) ) {
- obuflen = 1024;
- obuf = (char *) malloc(obuflen);
- osav = obuf;
- iconv(ic, &ibuf, &ibuflen, &obuf, &obuflen);
- osav[1024-obuflen] = 0;
-
- end = start;
- end++;
- strcpy(start, "");
- remove_token(end, 0, '?');
- remove_token(end, 0, '?');
- remove_token(end, 0, '?');
- remove_token(end, 0, '?');
- strcpy(end, &end[1]);
-
- snprintf(newbuf, sizeof newbuf, "%s%s%s", *buf, osav, end);
- strcpy(*buf, newbuf);
-
- free(osav);
- iconv_close(ic);
- }
- else {
- end = start;
- end++;
- strcpy(start, "");
- remove_token(end, 0, '?');
- remove_token(end, 0, '?');
- remove_token(end, 0, '?');
- remove_token(end, 0, '?');
- strcpy(end, &end[1]);
-
- snprintf(newbuf, sizeof newbuf, "%s(unreadable)%s", *buf, end);
- strcpy(*buf, newbuf);
- }
-
- free(isav);
-
- /*
- * Since spammers will go to all sorts of absurd lengths to get their
- * messages through, there are LOTS of corrupt headers out there.
- * So, prevent a really badly formed RFC2047 header from throwing
- * this function into an infinite loop.
- */
- ++passes;
- if (passes > 20) return;
- }
-
-}
-#else
-inline void utf8ify_rfc822_string(char **a){};
-
-#endif
-
-
-
-
-/*
- * RFC2047-encode a header field if necessary.
- * If no non-ASCII characters are found, the string will be copied verbatim without encoding.
- * Returns encoded length; -1 if non success.
- *
- * target Target buffer.
- * maxlen Maximum size of target buffer.
- * source Source string to be encoded.
- * SourceLen Length of the source string
- */
-int webcit_rfc2047encode(char *target, int maxlen, char *source, long SourceLen)
-{
- const char headerStr[] = "=?UTF-8?Q?";
- int need_to_encode = 0;
- int i = 0;
- int len;
- unsigned char ch;
-
- if ((source == NULL) ||
- (target == NULL) ||
- (SourceLen > maxlen)) return -1;
-
- while ((!IsEmptyStr (&source[i])) &&
- (need_to_encode == 0) &&
- (i < SourceLen) ) {
- if (((unsigned char) source[i] < 32) ||
- ((unsigned char) source[i] > 126)) {
- need_to_encode = 1;
- }
- i++;
- }
-
- if (!need_to_encode) {
- memcpy (target, source, SourceLen);
- target[SourceLen] = '\0';
- return SourceLen;
- }
-
- if (sizeof (headerStr + SourceLen + 2) > maxlen)
- return -1;
- memcpy (target, headerStr, sizeof (headerStr));
- len = sizeof (headerStr) - 1;
- for (i=0; (i < SourceLen) && (len + 3< maxlen) ; ++i) {
- ch = (unsigned char) source[i];
- if ((ch < 32) || (ch > 126) || (ch == 61)) {
- sprintf(&target[len], "=%02X", ch);
- len += 3;
- }
- else {
- sprintf(&target[len], "%c", ch);
- len ++;
- }
- }
-
- if (len + 2 < maxlen) {
- strcat(&target[len], "?=");
- len +=2;
- return len;
- }
- else
- return -1;
-}
-
void set_selected_language(const char *);
void go_selected_language(void);
const char *get_selected_language(void);
-void utf8ify_rfc822_string(char **buf);
+// void utf8ify_rfc822_string(char **buf); this is in libcitadel now
void begin_burst(void);
long end_burst(void);
void AppendImportantMessage(const char *pch, long len);