From 6d715e128f9cea6c25cc57dc23c1bccdbbfda475 Mon Sep 17 00:00:00 2001 From: danieldg Date: Thu, 1 Oct 2009 03:37:40 +0000 Subject: Change SWHOIS to OPTCOMMON, remove m_operinvex git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11789 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_operchans.cpp | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'src/modules/m_operchans.cpp') diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp index edafcd071..5fe891b50 100644 --- a/src/modules/m_operchans.cpp +++ b/src/modules/m_operchans.cpp @@ -48,12 +48,12 @@ class ModuleOperChans : public Module { OperChans oc; public: - ModuleOperChans() - : oc(this) + ModuleOperChans() : oc(this) { if (!ServerInstance->Modes->AddMode(&oc)) throw ModuleException("Could not add new modes!"); - ServerInstance->Modules->Attach(I_OnUserPreJoin, this); + Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric, I_OnUserPreJoin }; + ServerInstance->Modules->Attach(eventlist, this, 3); } ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven) @@ -67,6 +67,21 @@ class ModuleOperChans : public Module return MOD_RES_PASSTHRU; } + ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) + { + if (mask[0] == 'O' && mask[1] == ':') + { + if (IS_OPER(user) && InspIRCd::Match(user->oper, mask.substr(2))) + return MOD_RES_DENY; + } + return MOD_RES_PASSTHRU; + } + + void On005Numeric(std::string &output) + { + ServerInstance->AddExtBanChar('O'); + } + ~ModuleOperChans() { ServerInstance->Modes->DelMode(&oc); @@ -74,7 +89,7 @@ class ModuleOperChans : public Module Version GetVersion() { - return Version("Provides support for oper-only chans via the +O channel mode", VF_VENDOR | VF_COMMON, API_VERSION); + return Version("Provides support for oper-only chans via the +O channel mode and 'O' extban", VF_VENDOR | VF_COMMON, API_VERSION); } }; -- cgit v1.2.3