X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitadel.h;h=e7eca47287f95f33fd834f5ff42b9f450b959284;hb=e296d020094c0c326fd00c1a3f420f2f6aafd019;hp=f45b0ea7751a9dd7da14666123843505427a651e;hpb=7c94d5bb68f1c448770d31205ec5ae12bd8a02ed;p=citadel.git diff --git a/citadel/citadel.h b/citadel/citadel.h index f45b0ea77..e7eca4728 100644 --- a/citadel/citadel.h +++ b/citadel/citadel.h @@ -1,7 +1,7 @@ /* * Main Citadel header file * - * Copyright (c) 1987-2015 by the citadel.org team + * Copyright (c) 1987-2017 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. @@ -45,13 +45,13 @@ extern "C" { * usually more strict because you're not really supposed to dump/load and * upgrade at the same time. */ -#define REV_LEVEL 901 /* This version */ -#define REV_MIN 591 /* Oldest compatible database */ -#define EXPORT_REV_MIN 760 /* Oldest compatible export files */ -#define LIBCITADEL_MIN 901 /* Minimum required version of libcitadel */ +#define REV_LEVEL 909 // This version +#define REV_MIN 591 // Oldest compatible database +#define EXPORT_REV_MIN 760 // Oldest compatible export files +#define LIBCITADEL_MIN 903 // Minimum required version of libcitadel -#define SERVER_TYPE 0 /* zero for stock Citadel; other developers please - obtain SERVER_TYPE codes for your implementations */ +#define SERVER_TYPE 0 // zero for stock Citadel; other developers please + // obtain SERVER_TYPE codes for your implementations #ifdef LIBCITADEL_VERSION_NUMBER #if LIBCITADEL_VERSION_NUMBER < LIBCITADEL_MIN @@ -113,6 +113,8 @@ struct ctdluser { /* User record */ time_t lastcall; /* Date/time of most recent login */ int USuserpurge; /* Purge time (in days) for user */ char fullname[64]; /* Display name (primary identifier) */ + long msgnum_bio; /* msgnum of user's profile (bio) */ + long msgnum_pic; /* msgnum of user's avatar (photo) */ }; @@ -132,7 +134,7 @@ struct ctdlroom { time_t QRgen; /* Generation number of room */ unsigned QRflags; /* See flag values below */ char QRdirname[15]; /* Directory name, if applicable */ - long QRinfo; /* Info file update relative to msgs*/ + long msgnum_info; /* msgnum of room banner (info file)*/ char QRfloor; /* Which floor this room is on */ time_t QRmtime; /* Date/time of last post */ struct ExpirePolicy QRep; /* Message expiration policy */ @@ -140,6 +142,7 @@ struct ctdlroom { char QRorder; /* Sort key for room listing order */ unsigned QRflags2; /* Additional flags */ int QRdefaultview; /* How to display the contents */ + long msgnum_pic; /* msgnum of room picture or icon */ }; /* Private rooms are always flagged with QR_PRIVATE. If neither QR_PASSWORDED @@ -186,7 +189,7 @@ struct floor { /* number of items which may be handled by the CONF command */ #define NUM_CONFIGS 71 -#define TRACE syslog(LOG_DEBUG, "Checkpoint: %s, %d\n", __FILE__, __LINE__) +#define TRACE syslog(LOG_DEBUG, "\033[31mCheckpoint: %s : %d\033[0m", __FILE__, __LINE__) #ifndef LONG_MAX #define LONG_MAX 2147483647L