diff options
Diffstat (limited to 'modules/core')
| -rw-r--r-- | modules/core/cs_access.cpp | 7 | ||||
| -rw-r--r-- | modules/core/db_plain.cpp | 1 |
2 files changed, 2 insertions, 6 deletions
diff --git a/modules/core/cs_access.cpp b/modules/core/cs_access.cpp index 3ca0e59f6..77f63ac09 100644 --- a/modules/core/cs_access.cpp +++ b/modules/core/cs_access.cpp @@ -270,7 +270,7 @@ class CommandCSAccess : public Command if (i == end) u->SendMessage(ChanServ, CHAN_ACCESS_NOT_FOUND, nick.c_str(), ci->name.c_str()); - else if (nc != u->Account() && check_access(u, ci, CA_NOJOIN) && check_access(u, ci, CA_AUTODEOP) && get_access(u, ci) <= access->level && !u->Account()->HasPriv("chanserv/access/modify")) + else if (nc != u->Account() && check_access(u, ci, CA_NOJOIN) && get_access(u, ci) <= access->level && !u->Account()->HasPriv("chanserv/access/modify")) u->SendMessage(ChanServ, ACCESS_DENIED); else { @@ -556,10 +556,7 @@ class CommandCSLevels : public Command { j = levelinfo[i].what; - if (j == CA_AUTOOP || j == CA_AUTODEOP || j == CA_AUTOVOICE || j == CA_NOJOIN) - u->SendMessage(ChanServ, CHAN_LEVELS_LIST_DISABLED, levelinfo_maxwidth, levelinfo[i].name.c_str()); - else - u->SendMessage(ChanServ, CHAN_LEVELS_LIST_DISABLED, levelinfo_maxwidth, levelinfo[i].name.c_str()); + u->SendMessage(ChanServ, CHAN_LEVELS_LIST_DISABLED, levelinfo_maxwidth, levelinfo[i].name.c_str()); } else if (j == ACCESS_FOUNDER) u->SendMessage(ChanServ, CHAN_LEVELS_LIST_FOUNDER, levelinfo_maxwidth, levelinfo[i].name.c_str()); diff --git a/modules/core/db_plain.cpp b/modules/core/db_plain.cpp index 78db1aba7..3fa235710 100644 --- a/modules/core/db_plain.cpp +++ b/modules/core/db_plain.cpp @@ -254,7 +254,6 @@ ChannelLevel ChannelLevels[] = { {"SET", CA_SET}, {"UNBAN", CA_UNBAN}, {"AUTOOP", CA_AUTOOP}, - {"AUTODEOP", CA_AUTODEOP}, {"AUTOVOICE", CA_AUTOVOICE}, {"OPDEOP", CA_OPDEOP}, {"ACCESS_LIST", CA_ACCESS_LIST}, |