Change User::oper to an OperInfo reference

[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 52d5a28be16ee7d79aa3a319123930acdc4739a2..205d9a412b3427633d63d3e4ba0100762dec354e 100644 (file)
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -19,7 +19,7 @@ class OperChans : public ModeHandler
 {
  public:
        /* This is an oper-only mode */
-       OperChans(InspIRCd* Instance, Module* Creator) : ModeHandler(Instance, Creator, 'O', 0, 0, false, MODETYPE_CHANNEL, true) { }
+       OperChans(Module* Creator) : ModeHandler(Creator, "operonly", 'O', PARAM_NONE, MODETYPE_CHANNEL) { oper = true; }
 
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
@@ -46,19 +46,17 @@ class OperChans : public ModeHandler
 
 class ModuleOperChans : public Module
 {
-
        OperChans oc;
  public:
-       ModuleOperChans(InspIRCd* Me)
-               : Module(Me), oc(Me, this)
+       ModuleOperChans() : oc(this)
        {
                if (!ServerInstance->Modes->AddMode(&oc))
                        throw ModuleException("Could not add new modes!");
-               Implementation eventlist[] = { I_OnCheckBan, I_OnUserPreJoin };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric, I_OnUserPreJoin };
+               ServerInstance->Modules->Attach(eventlist, this, 3);
        }
 
-       virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+       ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
        {
                if (chan && chan->IsModeSet('O') && !IS_OPER(user))
                {
@@ -69,22 +67,28 @@ class ModuleOperChans : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       virtual ModResult OnCheckBan(User* user, Channel* chan)
+       ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
        {
-               if (IS_OPER(user))
-                       return chan->GetExtBanStatus(user->oper, 'O');
-
+               if (mask[0] == 'O' && mask[1] == ':')
+               {
+                       if (IS_OPER(user) && InspIRCd::Match(user->oper->name, mask.substr(2)))
+                               return MOD_RES_DENY;
+               }
                return MOD_RES_PASSTHRU;
        }
 
-       virtual ~ModuleOperChans()
+       void On005Numeric(std::string &output)
+       {
+               ServerInstance->AddExtBanChar('O');
+       }
+
+       ~ModuleOperChans()
        {
-               ServerInstance->Modes->DelMode(&oc);
        }
 
-       virtual Version GetVersion()
+       Version GetVersion()
        {
-               return Version("$Id$", 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);
        }
 };