X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebcit.h;h=e80489f22421531fcc802da4f31ffd50c5ee214e;hb=efccdcf4db04e63bfa3512c80215357ee9ffd98f;hp=ad5aafc110a7f8fa32b93c557903364b9dad926f;hpb=97a1a0d3086fd9a7e52f05687eb039e6ef7a5c79;p=citadel.git diff --git a/webcit/webcit.h b/webcit/webcit.h index ad5aafc11..e80489f22 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -1,19 +1,13 @@ /* - * Copyright (c) 1987-2011 by the citadel.org team + * Copyright (c) 1987-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 as published - * by the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * 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. - * - * 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 */ #include "sysdep.h" @@ -52,6 +46,7 @@ #include #include #include +#include #include #ifdef HAVE_ICONV @@ -70,23 +65,12 @@ #endif #define IsEmptyStr(a) ((a)[0] == '\0') -/* - * Uncomment to dump an HTTP trace to stderr -#define HTTP_TRACING 1 - */ #define DO_DBG_QR 0 #define DBG_QR(x) if(DO_DBG_QR) _DBG_QR(x) #define DBG_QR2(x) if(DO_DBG_QR) _DBG_QR2(x) -#ifdef HTTP_TRACING -#undef HAVE_ZLIB_H -#undef HAVE_ZLIB -#endif - -#ifdef HAVE_ZLIB_H #include -#endif #include @@ -144,9 +128,9 @@ extern char *ssl_cipher_list; #define PORT_NUM 2000 /* port number to listen on */ #define DEVELOPER_ID 0 #define CLIENT_ID 4 -#define CLIENT_VERSION 801 /* This version of WebCit */ -#define MINIMUM_CIT_VERSION 801 /* min required Citadel ver */ -#define LIBCITADEL_MIN 801 /* min required libcitadel ver */ +#define CLIENT_VERSION 802 /* This version of WebCit */ +#define MINIMUM_CIT_VERSION 802 /* min required Citadel ver */ +#define LIBCITADEL_MIN 802 /* min required libcitadel ver */ #define DEFAULT_HOST "localhost" /* Default Citadel server */ #define DEFAULT_PORT "504" #define TARGET "webcit01" /* Target for inline URL's */ @@ -170,31 +154,31 @@ extern char *ssl_cipher_list; * * bucket one... */ -#define QR_PERMANENT 1 /* Room does not purge */ +#define QR_PERMANENT 1 /* Room does not purge */ #define QR_INUSE 2 /* Set if in use, clear if avail */ #define QR_PRIVATE 4 /* Set for any type of private room */ #define QR_PASSWORDED 8 /* Set if there's a password too */ -#define QR_GUESSNAME 16 /* Set if it's a guessname room */ +#define QR_GUESSNAME 16 /* Set if it's a guessname room */ #define QR_DIRECTORY 32 /* Directory room */ #define QR_UPLOAD 64 /* Allowed to upload */ -#define QR_DOWNLOAD 128 /* Allowed to download */ +#define QR_DOWNLOAD 128 /* Allowed to download */ #define QR_VISDIR 256 /* Visible directory */ -#define QR_ANONONLY 512 /* Anonymous-Only room */ +#define QR_ANONONLY 512 /* Anonymous-Only room */ #define QR_ANONOPT 1024 /* Anonymous-Option room */ -#define QR_NETWORK 2048 /* Shared network room */ +#define QR_NETWORK 2048 /* Shared network room */ #define QR_PREFONLY 4096 /* Preferred status needed to enter */ -#define QR_READONLY 8192 /* Aide status required to post */ +#define QR_READONLY 8192 /* Aide status required to post */ #define QR_MAILBOX 16384 /* Set if this is a private mailbox */ /* * bucket two... */ -#define QR2_SYSTEM 1 /* System room; hide by default */ +#define QR2_SYSTEM 1 /* System room; hide by default */ #define QR2_SELFLIST 2 /* Self-service mailing list mgmt */ -#define QR2_COLLABDEL 4 /* Anyone who can post can also delete*/ -#define QR2_SUBJECTREQ 8 /* Subject strongly recommended */ -#define QR2_SMTP_PUBLIC 16 /* smtp public postable room */ -#define QR2_MODERATED 32 /* Listservice aide has to permit posts */ +#define QR2_COLLABDEL 4 /* Anyone who can post can also delete */ +#define QR2_SUBJECTREQ 8 /* Subject strongly recommended */ +#define QR2_SMTP_PUBLIC 16 /* smtp public postable room */ +#define QR2_MODERATED 32 /* Listservice aide has to permit posts */ /* * user/room access @@ -420,6 +404,7 @@ enum { eHEAD, eMOVE, eCOPY, + eREPORT, eNONE }; extern const char *ReqStrs[eNONE]; @@ -490,7 +475,6 @@ struct wcsession { int killthis; /* Nonzero == purge this session */ int ctdl_pid; /* Session ID on the Citadel server */ int nonce; /* session nonce (to prevent session riding) */ - int SessionKey; int inuse; /* set to nonzero if bound to a running thread */ /* Session local Members */ @@ -511,9 +495,7 @@ struct wcsession { StrBuf *WBuf; /* Our output buffer */ StrBuf *HBuf; /* Our HeaderBuffer */ StrBuf *WFBuf; /* Wildfire error logging buffer */ - StrBuf *trailing_javascript; /* extra javascript to be appended to page */ -/* char ImportantMessage[SIZ];*/ StrBuf *ImportantMsg; HashList *Directory; /* Parts of the directory URL in snippets */ const Floor *CurrentFloor; /* when Parsing REST, which floor are we on? */