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

diff --git a/src/chanserv.h b/src/chanserv.h
index d151f9f..8fe372d 100644
--- a/src/chanserv.h
+++ b/src/chanserv.h
@@ -1,7 +1,7 @@
 /* chanserv.h - Channel service bot
  * Copyright 2000-2004 srvx Development Team
  *
- * This file is part of srvx.
+ * This file is part of x3.
  *
  * srvx is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,16 +35,17 @@ enum UL_ALIASES {
 };
 
 enum levelOption {
-    lvlGiveVoice,
-    lvlGiveHalfOps,
-    lvlGiveOps,
+                    /* TODO: Does removing values here mess up reading the db files? */
+//    lvlGiveVoice,   /* Depreciated */
+//    lvlGiveHalfOps, /* Depreciated */
+//    lvlGiveOps, /* Depreciated */
     lvlEnfOps,
     lvlEnfHalfOps,
     lvlEnfModes,
     lvlEnfTopic,
     lvlPubCmd,
     lvlSetters,
-    lvlCTCPUsers,
+//    lvlCTCPUsers,
     lvlUserInfo,
     lvlInviteMe,
     lvlTopicSnarf,
@@ -52,6 +53,7 @@ enum levelOption {
 };
 
 enum charOption {
+    chVoice,
     chProtect,
     chToys,
     chTopicRefresh,
@@ -70,14 +72,18 @@ 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)
+#define IsOffChannel(x)         (((x)->flags & CHANNEL_OFFCHANNEL) && (off_channel > 1))
 
 struct chanData
 {
@@ -112,12 +118,14 @@ struct chanData
     struct chanData	*next;
 };
 
-#define USER_AUTO_OP            0x00000001
+#define USER_NOAUTO_OP          0x00000001 /* OLD; Not used at all.. */
 #define USER_SUSPENDED          0x00000002
 #define USER_AUTO_INVITE        0x00000004
-#define USER_FLAGS_SIZE         7
+#define USER_AUTO_OP            0x00000008
+#define USER_FLAGS_SIZE         15
+#define USER_FLAGS_DEFAULT      USER_AUTO_OP
 
-#define IsUserAutoOp(USER)      (!((USER)->flags & USER_AUTO_OP))
+#define IsUserAutoOp(USER)      ((USER)->flags & USER_AUTO_OP)
 #define IsUserSuspended(USER)   ((USER)->flags & USER_SUSPENDED)
 #define IsUserAutoInvite(USER)  ((USER)->flags & USER_AUTO_INVITE)
 
@@ -140,6 +148,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];
@@ -181,5 +200,9 @@ struct do_not_register *chanserv_is_dnr(const char *chan_name, struct handle_inf
 int check_user_level(struct chanNode *channel, struct userNode *user, enum levelOption opt, int allow_override, int exempt_owner);
 
 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