X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitadel.h;h=92c24fc6c8132ae66fb736226a4a1e02f3382cf5;hb=b2971ed49d2cfe5128190ec1d5d8c0fa239f0004;hp=f18b28f30201c27916402318afbbe6a095fca606;hpb=815368746268b7335c1d8525ad0f8a7ddc6dec02;p=citadel.git

diff --git a/citadel/citadel.h b/citadel/citadel.h
index f18b28f30..92c24fc6c 100644
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -1,8 +1,8 @@
 /*
  * $Id$
  *
- * main Citadel header file
- * see copyright.txt for copyright information
+ * Main Citadel header file
+ * See copyright.txt for copyright information.
  */
 
 /* system customizations are in sysconfig.h */
@@ -32,8 +32,10 @@ extern "C" {
 
 /*
  * Text description of this software
+ * (We used to define this ourselves, but why bother when
+ * the GNU build tools do it for us?)
  */
-#define CITADEL	"Citadel 6.62"
+#define CITADEL	PACKAGE_STRING
 
 /*
  * REV_LEVEL is the current version number (multiplied by 100 to avoid having
@@ -45,9 +47,9 @@ extern "C" {
  * usually more strict because you're not really supposed to dump/load and
  * upgrade at the same time.
  */
-#define REV_LEVEL	662		/* This version */
+#define REV_LEVEL	711		/* This version */
 #define REV_MIN		591		/* Oldest compatible database */
-#define EXPORT_REV_MIN	655		/* Oldest compatible export files */
+#define EXPORT_REV_MIN	706		/* Oldest compatible export files */
 
 #define SERVER_TYPE 0	/* zero for stock Citadel; other developers please
 			   obtain SERVER_TYPE codes for your implementations */
@@ -69,6 +71,11 @@ extern "C" {
  * Message expiration policy stuff
  */
 struct ExpirePolicy {
+/*
+#include "datadefinitions.h"
+#include "dtds/expirepolicy-defs.h"
+#include "undef_data.h"
+*/
 	int expire_mode;
 	int expire_value;
 };
@@ -85,6 +92,11 @@ struct ExpirePolicy {
  * relevant rooms without having to ask the server each time where to go next.
  */
 struct march {
+/*
+#include "datadefinitions.h"
+#include "dtds/march-defs.h"
+#include "undef_data.h"
+*/
 	struct march *next;
 	char march_name[ROOMNAMELEN];
 	unsigned int march_flags;
@@ -109,6 +121,11 @@ struct march {
  * User records.
  */
 struct ctdluser {			/* User record                      */
+/*
+#include "datadefinitions.h"
+#include "dtds/user-defs.h"
+#include "undef_data.h"
+*/
 	int version;			/* Cit vers. which created this rec */
 	uid_t uid;			/* Associate with a unix account?   */
 	char password[32];		/* password (for Citadel-only users)*/
@@ -135,21 +152,26 @@ struct ctdluser {			/* User record                      */
  * Room records.
  */
 struct ctdlroom {
-	char QRname[ROOMNAMELEN];	/* Name of room                     */
-	char QRpasswd[10];		/* Only valid if it's a private rm  */
-	long QRroomaide;		/* User number of room aide         */
-	long QRhighest;			/* Highest message NUMBER in room   */
-	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*/
-	char QRfloor;			/* Which floor this room is on      */
-	time_t QRmtime;			/* Date/time of last post           */
-	struct ExpirePolicy QRep;	/* Message expiration policy        */
-	long QRnumber;			/* Globally unique room number      */
-	char QRorder;			/* Sort key for room listing order  */
-	unsigned QRflags2;		/* Additional flags                 */
-	int QRdefaultview;		/* How to display the contents      */
+/*
+#include "datadefinitions.h"
+#include "dtds/room-defs.h"
+#include "undef_data.h"
+*/
+ 	char QRname[ROOMNAMELEN];	/* Name of room                     */
+ 	char QRpasswd[10];		/* Only valid if it's a private rm  */
+ 	long QRroomaide;		/* User number of room aide         */
+ 	long QRhighest;			/* Highest message NUMBER in room   */
+ 	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*/
+ 	char QRfloor;			/* Which floor this room is on      */
+ 	time_t QRmtime;			/* Date/time of last post           */
+ 	struct ExpirePolicy QRep;	/* Message expiration policy        */
+ 	long QRnumber;			/* Globally unique room number      */
+ 	char QRorder;			/* Sort key for room listing order  */
+ 	unsigned QRflags2;		/* Additional flags                 */
+ 	int QRdefaultview;		/* How to display the contents      */
 };
 
 /* Private rooms are always flagged with QR_PRIVATE.  If neither QR_PASSWORDED
@@ -176,6 +198,11 @@ struct ctdlroom {
  * Floor record.  The floor number is implicit in its location in the file.
  */
 struct floor {
+/*
+#include "datadefinitions.h"
+#include "dtds/floor-defs.h"
+#include "undef_data.h"
+*/
 	unsigned short f_flags;		/* flags */
 	char f_name[256];		/* name of floor */
 	int f_ref_count;		/* reference count */
@@ -235,6 +262,7 @@ enum {
 #define IGNETCFG	"application/x-citadel-ignet-config"
 #define IGNETMAP	"application/x-citadel-ignet-map"
 #define FILTERLIST	"application/x-citadel-filter-list"
+#define SIEVECONFIG	"application/x-citadel-sieve-config"
 
 #define TRACE	lprintf(CTDL_DEBUG, "Checkpoint: %s, %d\n", __FILE__, __LINE__)
 
@@ -252,6 +280,9 @@ enum {
 #define VIEW_CALENDAR		3	/* Calendar view */
 #define VIEW_TASKS		4	/* Tasks view */
 #define VIEW_NOTES		5	/* Notes view */
+#define	VIEW_WIKI		6	/* Wiki view */
+#define VIEW_CALBRIEF		7	/* Brief Calendar view */
+#define VIEW_SIEVE              8       /* Sieve manage rules store */
 
 #ifdef __cplusplus
 }