Improved and committed the Life4Christ folks aut-oper patch.

[irc/evilnet/x3.git] / src / chanserv.h

diff --git a/src/chanserv.h b/src/chanserv.h
index 657cf63d6eac5015fd317a3ab70abf8110fad454..40758a8fbcb6dde0c55f09ffae53ff84d5eb5f4c 100644 (file)
--- a/src/chanserv.h
+++ b/src/chanserv.h
@@ -35,17 +35,15 @@ enum UL_ALIASES {
 };
 
 enum levelOption {
-                    /* TODO: Does removing values here mess up reading the db files? */
-    lvlGiveVoice,   /* Depreciated */
-    lvlGiveHalfOps, /* Depreciated */
-    lvlGiveOps, /* Depreciated */
+//    lvlGiveVoice,   /* Depreciated */
+//    lvlGiveHalfOps, /* Depreciated */
+//    lvlGiveOps, /* Depreciated */
     lvlEnfOps,
     lvlEnfHalfOps,
     lvlEnfModes,
     lvlEnfTopic,
     lvlPubCmd,
     lvlSetters,
-    lvlCTCPUsers,
     lvlUserInfo,
     lvlInviteMe,
     lvlTopicSnarf,
@@ -58,6 +56,7 @@ enum charOption {
     chToys,
     chTopicRefresh,
     chCTCPReaction,
+    chBanTimeout,
     NUM_CHAR_OPTIONS
 };
 
@@ -72,11 +71,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,13 +104,13 @@ 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 chanData    *prev;
@@ -144,6 +147,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];
@@ -187,5 +201,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