X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/c8ca69a02e41114aa1303505df301df5f4fd686c..ec311f39148004a0a43ce45371bd02c61f19f886:/src/chanserv.h

diff --git a/src/chanserv.h b/src/chanserv.h
index 657cf63..932236d 100644
--- a/src/chanserv.h
+++ b/src/chanserv.h
@@ -35,17 +35,12 @@ enum UL_ALIASES {
 };
 
 enum levelOption {
-                    /* TODO: Does removing values here mess up reading the db files? */
-    lvlGiveVoice,   /* Depreciated */
-    lvlGiveHalfOps, /* Depreciated */
-    lvlGiveOps, /* Depreciated */
     lvlEnfOps,
     lvlEnfHalfOps,
     lvlEnfModes,
     lvlEnfTopic,
     lvlPubCmd,
     lvlSetters,
-    lvlCTCPUsers,
     lvlUserInfo,
     lvlInviteMe,
     lvlTopicSnarf,
@@ -53,11 +48,12 @@ enum levelOption {
 };
 
 enum charOption {
-    chVoice,
+    chAutomode,
     chProtect,
     chToys,
     chTopicRefresh,
     chCTCPReaction,
+    chBanTimeout,
     NUM_CHAR_OPTIONS
 };
 
@@ -72,11 +68,15 @@ enum charOption {
 #define CHANNEL_PEON_INVITE     0x00000080 /* (1 << 7) - DEPRECATED */
 #define CHANNEL_OFFCHANNEL      0x00000100 /* (1 << 8) */
 #define CHANNEL_HOP_ALL         0x00000200 /* (1 << 9) */
-
 /* Flags with values over 0x20000000 or (1 << 29) will not work
  * because chanData.flags is a 30-bit field.
  */
 
+/* how many seconds a pending adduser will wait for a user
+ * to get auth or register 
+ */
+#define ADDUSER_PENDING_EXPIRE 7200  /* 2 hours */
+
 #define IsProtected(x)		((x)->flags & CHANNEL_NODELETE)
 #define IsSuspended(x)		((x)->flags & CHANNEL_SUSPENDED)
 #define IsOffChannel(x)         (((x)->flags & CHANNEL_OFFCHANNEL) && (off_channel > 1))
@@ -101,15 +101,16 @@ struct chanData
     unsigned int        may_opchan : 1;
     unsigned int        max;
     unsigned int        last_refresh;
-    unsigned short      banCount;
+    unsigned short      banCount; /* Lamers, really */
     unsigned short      userCount;
     unsigned short      lvlOpts[NUM_LEVEL_OPTIONS];
     unsigned char       chOpts[NUM_CHAR_OPTIONS];
 
     struct userData	*users;
-    struct banData	*bans;
+    struct banData	*bans; /* Lamers, really */
     struct dict         *notes;
     struct suspended	*suspended;
+    struct giveownership *giveownership;
     struct chanData	*prev;
     struct chanData	*next;
 };
@@ -132,6 +133,7 @@ struct userData
 
     char		*info;
     time_t 		seen;
+    time_t              expires;
     unsigned short      access;
     unsigned int	present : 1;
     unsigned int        flags : USER_FLAGS_SIZE;
@@ -144,6 +146,17 @@ struct userData
     struct userData     *u_next;
 };
 
+struct adduserPending
+{
+    struct chanNode *channel;
+    struct userNode *user;
+    int level;
+    time_t created;
+
+    struct adduserPending *prev;
+    struct adduserPending *next;
+};
+
 struct banData
 {
     char		mask[NICKLEN + USERLEN + HOSTLEN + 3];
@@ -169,6 +182,17 @@ struct suspended
     struct suspended    *previous;
 };
 
+struct giveownership
+{
+    char                 *staff_issuer;
+    char                  *old_owner;
+    char                  *target;
+    unsigned short        target_access;
+    time_t                issued;
+    char                  *reason;
+    struct giveownership  *previous;
+};
+
 struct do_not_register
 {
     char   chan_name[CHANNELLEN+1];
@@ -187,5 +211,7 @@ int check_user_level(struct chanNode *channel, struct userNode *user, enum level
 void do_math(char *Buffer, char *Math);
 char* user_level_name_from_level(int level);
 
+void process_adduser_pending(struct userNode *user);
+void wipe_adduser_pending(struct chanNode *channel, struct userNode *user);
 
 #endif