Some more text fixes and improvements (#1618).

[user/henk/code/inspircd.git] / src / modules / m_operchans.cpp

diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index 8db2a4041b4bc99a121b0ff2deb3ef6b2bca91ff..8484d7dcc25cc658362d4d63768b5db0330a1b4e 100644 (file)
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -22,7 +22,11 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for oper-only chans via the +O channel mode */
+enum
+{
+       // From UnrealIRCd.
+       ERR_CANTJOINOPERSONLY = 520
+};
 
 class OperChans : public SimpleChannelModeHandler
 {
@@ -40,45 +44,36 @@ class ModuleOperChans : public Module
  public:
        ModuleOperChans() : oc(this)
        {
-               if (!ServerInstance->Modes->AddMode(&oc))
-                       throw ModuleException("Could not add new modes!");
-               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)
+       ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
        {
-               if (chan && chan->IsModeSet('O') && !IS_OPER(user))
+               if (chan && chan->IsModeSet(oc) && !user->IsOper())
                {
-                       user->WriteNumeric(ERR_CANTJOINOPERSONLY, "%s %s :Only IRC operators may join %s (+O is set)",
-                               user->nick.c_str(), chan->name.c_str(), chan->name.c_str());
+                       user->WriteNumeric(ERR_CANTJOINOPERSONLY, chan->name, InspIRCd::Format("Only server operators may join %s (+O is set)", chan->name.c_str()));
                        return MOD_RES_DENY;
                }
                return MOD_RES_PASSTHRU;
        }
 
-       ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
+       ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) CXX11_OVERRIDE
        {
                if ((mask.length() > 2) && (mask[0] == 'O') && (mask[1] == ':'))
                {
-                       if (IS_OPER(user) && InspIRCd::Match(user->oper->name, mask.substr(2)))
+                       if (user->IsOper() && InspIRCd::Match(user->oper->name, mask.substr(2)))
                                return MOD_RES_DENY;
                }
                return MOD_RES_PASSTHRU;
        }
 
-       void On005Numeric(std::string &output)
-       {
-               ServerInstance->AddExtBanChar('O');
-       }
-
-       ~ModuleOperChans()
+       void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
+               tokens["EXTBAN"].push_back('O');
        }
 
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides support for oper-only chans via the +O channel mode and 'O' extban", VF_VENDOR);
+               return Version("Provides support for oper-only channels via channel mode +O and extban 'O'", VF_VENDOR);
        }
 };