diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/extern.h | 8 | ||||
| -rw-r--r-- | include/regchannel.h | 3 | ||||
| -rw-r--r-- | include/services.h | 16 | ||||
| -rw-r--r-- | include/users.h | 6 |
4 files changed, 12 insertions, 21 deletions
diff --git a/include/extern.h b/include/extern.h index 09055b491..eda18ebc0 100644 --- a/include/extern.h +++ b/include/extern.h @@ -141,8 +141,6 @@ E void save_cs_dbase(); E void expire_chans(); E void cs_remove_nick(const NickCore * nc); -E int is_real_founder(User * user, ChannelInfo * ci); - E void check_modes(Channel * c); E int check_valid_admin(User * user, Channel * chan, int servermode); E int check_valid_op(User * user, Channel * chan, int servermode); @@ -158,8 +156,9 @@ E int check_topiclock(Channel * c, time_t topic_time); E ChannelInfo *cs_findchan(const char *chan); E int check_access(User * user, ChannelInfo * ci, int what); -E int is_founder(User * user, ChannelInfo * ci); -E int get_access(User * user, ChannelInfo * ci); +E bool IsFounder(User *user, ChannelInfo *ci); +E bool IsRealFounder(User *user, ChannelInfo *ci); +E int get_access(User *user, ChannelInfo *ci); E void update_cs_lastseen(User * user, ChannelInfo * ci); E int get_idealban(ChannelInfo * ci, User * u, char *ret, int retlen); E AutoKick *is_stuck(ChannelInfo * ci, const char *mask); @@ -168,7 +167,6 @@ E void stick_all(ChannelInfo * ci); E int levelinfo_maxwidth; E ChannelInfo *makechan(const char *chan); -E int is_identified(User * user, ChannelInfo * ci); E char *get_mlock_modes(ChannelInfo * ci, int complete); /**** compat.c ****/ diff --git a/include/regchannel.h b/include/regchannel.h index 5bb8599e4..708045733 100644 --- a/include/regchannel.h +++ b/include/regchannel.h @@ -18,7 +18,7 @@ class CoreExport ChannelInfo : public Extensible ChannelInfo() { next = prev = NULL; - founderpass[0] = name[0] = last_topic_setter[0] = '\0'; + name[0] = last_topic_setter[0] = '\0'; founder = successor = NULL; desc = url = email = last_topic = forbidby = forbidreason = NULL; time_registered = last_used = last_topic_time = 0; @@ -43,7 +43,6 @@ class CoreExport ChannelInfo : public Extensible NickCore *founder; NickCore *successor; /* Who gets the channel if the founder * nick is dropped or expires */ - char founderpass[PASSMAX]; char *desc; char *url; char *email; diff --git a/include/services.h b/include/services.h index d733aff55..874c53675 100644 --- a/include/services.h +++ b/include/services.h @@ -615,18 +615,19 @@ enum AccessLevel * than any valid access level, and ACCESS_INVALID may be assumed to be * strictly less than any valid access level. Also read below. */ - ACCESS_FOUNDER = 10000, /* Numeric level indicating founder access */ + ACCESS_FOUNDER = 10001, /* Numeric level indicating founder access */ ACCESS_INVALID = -10000, /* Used in levels[] for disabled settings */ /* There is one exception to the above access levels: SuperAdmins will have * access level 10001. This level is never stored, however; it is only used * in comparison and to let SuperAdmins win from founders where needed */ - ACCESS_SUPERADMIN = 10001, + ACCESS_SUPERADMIN = 10002, /* Levels for xOP */ ACCESS_VOP = 3, ACCESS_HOP = 4, ACCESS_AOP = 5, - ACCESS_SOP = 10 + ACCESS_SOP = 10, + ACCESS_QOP = 10000 }; /* Channel info structures. Stored similarly to the nicks, except that @@ -747,16 +748,15 @@ struct badword_ { #define CA_KICKME 29 #define CA_KICK 30 #define CA_SIGNKICK 31 -/* #define CA_AUTOADMIN 32 -#define CA_ADMINME 33 -#define CA_ADMIN 34 */ - /* Why are these commented out and not removed? -GD */ #define CA_BANME 32 #define CA_BAN 33 #define CA_TOPIC 34 #define CA_INFO 35 +#define CA_AUTOOWNER 36 +#define CA_OWNER 37 +#define CA_OWNERME 38 -#define CA_SIZE 36 +#define CA_SIZE 39 /* BotServ SET flags */ #define BS_DONTKICKOPS 0x00000001 diff --git a/include/users.h b/include/users.h index f54be8982..aced32c20 100644 --- a/include/users.h +++ b/include/users.h @@ -15,11 +15,6 @@ struct u_chanlist { int16 status; /* Associated flags; see CSTATUS_* below. */ }; -struct u_chaninfolist { - struct u_chaninfolist *next, *prev; - ChannelInfo *chan; -}; - /* Online user and channel data. */ class CoreExport User : public Extensible { @@ -49,7 +44,6 @@ class CoreExport User : public Extensible int isSuperAdmin; /* is SuperAdmin on or off? */ struct u_chanlist *chans; /* Channels user has joined */ - struct u_chaninfolist *founder_chans; /* Channels user has identified for */ unsigned short invalid_pw_count; /* # of invalid password attempts */ time_t invalid_pw_time; /* Time of last invalid password */ |