pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-05 01:13:12 +02:00
Code Activity

Removed the AUTODEOP level, it is unnecessary now because of cs_mode

Browse Source
This commit is contained in:
Adam
2010-11-21 16:56:18 -05:00
parent 7790a7f98c
commit c5eb349d41
7 changed files with 8 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/chanserv.cpp
+3 -29
View File
@@ -19,7 +19,6 @@ registered_channel_map RegisteredChannelList;
static int def_levels[][2] = {
{ CA_AUTOOP, 5 },
{ CA_AUTOVOICE, 3 },
{ CA_AUTODEOP, -1 },
{ CA_NOJOIN, -2 },
{ CA_INVITE, 5 },
{ CA_AKICK, 10 },
@@ -61,7 +60,6 @@ static int def_levels[][2] = {
};
LevelInfo levelinfo[] = {
{ CA_AUTODEOP, "AUTODEOP", CHAN_LEVEL_AUTODEOP },
{ CA_AUTOHALFOP, "AUTOHALFOP", CHAN_LEVEL_AUTOHALFOP },
{ CA_AUTOOP, "AUTOOP", CHAN_LEVEL_AUTOOP },
{ CA_AUTOPROTECT, "AUTOPROTECT", CHAN_LEVEL_AUTOPROTECT },
@@ -310,12 +308,6 @@ int check_valid_admin(User *user, Channel *chan, int servermode)
return 0;
}
if (check_access(user, chan->ci, CA_AUTODEOP))
{
chan->RemoveMode(NULL, CMODE_PROTECT, user->nick);
return 0;
}
return 1;
}
@@ -354,20 +346,6 @@ int check_valid_op(User *user, Channel *chan, int servermode)
return 0;
}
if (check_access(user, chan->ci, CA_AUTODEOP))
{
chan->RemoveMode(NULL, CMODE_OP, user->nick);
if (owner)
chan->RemoveMode(NULL, CMODE_OWNER, user->nick);
if (protect)
chan->RemoveMode(NULL, CMODE_PROTECT, user->nick);
if (halfop)
chan->RemoveMode(NULL, CMODE_HALFOP, user->nick);
return 0;
}
return 1;
}
@@ -508,19 +486,15 @@ int check_access(User *user, ChannelInfo *ci, int what)
/* Superadmin always wins. Always. */
if (user->isSuperAdmin)
return what == CA_AUTODEOP || what == CA_NOJOIN ? 0 : 1;
return what == CA_NOJOIN ? 0 : 1;
/* If the access of the level we are checking is disabled, they *always* get denied */
if (limit == ACCESS_INVALID)
return 0;
/* If the level of the user is >= the level for "founder" of this channel and "founder" isn't disabled, they can do anything */
if (ci->levels[CA_FOUNDER] != ACCESS_INVALID && level >= ci->levels[CA_FOUNDER])
return what == CA_AUTODEOP || what == CA_NOJOIN ? 0 : 1;
return what == CA_NOJOIN ? 0 : 1;
/* Hacks to make flags work */
if (what == CA_AUTODEOP && ci->HasFlag(CI_SECUREOPS) && !level)
return 1;
if (what == CA_AUTODEOP || what == CA_NOJOIN)
if (what == CA_NOJOIN)
return level <= ci->levels[what];
else
return level >= ci->levels[what];