diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/cs_modes.c | 49 | ||||
| -rw-r--r-- | src/core/cs_xop.c | 11 |
2 files changed, 22 insertions, 38 deletions
diff --git a/src/core/cs_modes.c b/src/core/cs_modes.c index b65434ba7..1c0b2c507 100644 --- a/src/core/cs_modes.c +++ b/src/core/cs_modes.c @@ -52,38 +52,23 @@ int AnopeInit(int argc, char **argv) c = createCommand("DEVOICE", do_devoice, NULL, CHAN_HELP_DEVOICE, -1, -1, -1, -1); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); - if (ircd->halfop) { - c = createCommand("HALFOP", do_halfop, NULL, CHAN_HELP_HALFOP, -1, - -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); - c = createCommand("DEHALFOP", do_dehalfop, NULL, - CHAN_HELP_DEHALFOP, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); - } - if (ircd->protect) { - c = createCommand("PROTECT", do_protect, NULL, CHAN_HELP_PROTECT, - -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); - c = createCommand("DEPROTECT", do_deprotect, NULL, - CHAN_HELP_DEPROTECT, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); - } - if (ircd->owner) { - c = createCommand("OWNER", do_owner, NULL, CHAN_HELP_OWNER, -1, -1, - -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); - c = createCommand("DEOWNER", do_deowner, NULL, CHAN_HELP_DEOWNER, - -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); - } - if (ircd->admin) { - c = createCommand("ADMIN", do_protect, NULL, CHAN_HELP_PROTECT, -1, - -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); - c = createCommand("DEADMIN", do_deprotect, NULL, - CHAN_HELP_DEPROTECT, -1, -1, -1, -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); - } + c = createCommand("HALFOP", do_halfop, NULL, CHAN_HELP_HALFOP, -1, + -1, -1, -1); + moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + c = createCommand("DEHALFOP", do_dehalfop, NULL, CHAN_HELP_DEHALFOP, -1, -1, -1, -1); + moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + c = createCommand("PROTECT", do_protect, NULL, CHAN_HELP_PROTECT, -1, -1, -1, -1); + moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + c = createCommand("DEPROTECT", do_deprotect, NULL, CHAN_HELP_DEPROTECT, -1, -1, -1, -1); + moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + c = createCommand("OWNER", do_owner, NULL, CHAN_HELP_OWNER, -1, -1, -1, -1); + moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + c = createCommand("DEOWNER", do_deowner, NULL, CHAN_HELP_DEOWNER, -1, -1, -1, -1); + moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + c = createCommand("ADMIN", do_protect, NULL, CHAN_HELP_PROTECT, -1, -1, -1, -1); + moduleAddCommand(CHANSERV, c, MOD_UNIQUE); + c = createCommand("DEADMIN", do_deprotect, NULL, CHAN_HELP_DEPROTECT, -1, -1, -1, -1); + moduleAddCommand(CHANSERV, c, MOD_UNIQUE); moduleSetChanHelp(myChanServHelp); diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c index 3183cec93..cc8a02625 100644 --- a/src/core/cs_xop.c +++ b/src/core/cs_xop.c @@ -97,11 +97,8 @@ int AnopeInit(int argc, char **argv) c = createCommand("AOP", do_aop, NULL, CHAN_HELP_AOP, -1, -1, -1, -1); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); - if (ircd->halfop) { - c = createCommand("HOP", do_hop, NULL, CHAN_HELP_HOP, -1, -1, -1, - -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); - } + c = createCommand("HOP", do_hop, NULL, CHAN_HELP_HOP, -1, -1, -1, -1); + moduleAddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("SOP", do_sop, NULL, CHAN_HELP_SOP, -1, -1, -1, -1); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("VOP", do_vop, NULL, CHAN_HELP_VOP, -1, -1, -1, -1); @@ -150,7 +147,9 @@ int do_aop(User * u) int do_hop(User * u) { - return do_xop(u, "HOP", ACCESS_HOP, xop_msgs[3]); + if (ircd->halfop) + return do_xop(u, "HOP", ACCESS_HOP, xop_msgs[3]); + return MOD_CONT; } /*************************************************************************/ |