Fix access checks on chanprotect preventing use of SAMODE

[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 f714e00f6f8bcbeec310fe12b301a86255e3d427..32d54bce7a2a72ce495f7812b1b0519b0585142f 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(InspIRCd* Instance, Module* Creator) : ModeHandler(Creator, 'O', PARAM_NONE, MODETYPE_CHANNEL) { oper = true; }
 
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
@@ -46,7 +46,6 @@ class OperChans : public ModeHandler
 
 class ModuleOperChans : public Module
 {
-
        OperChans oc;
  public:
        ModuleOperChans(InspIRCd* Me)
@@ -54,35 +53,26 @@ class ModuleOperChans : public Module
        {
                if (!ServerInstance->Modes->AddMode(&oc))
                        throw ModuleException("Could not add new modes!");
-               Implementation eventlist[] = { I_OnCheckBan, I_OnUserPreJoin };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               ServerInstance->Modules->Attach(I_OnUserPreJoin, this);
        }
 
-       virtual int 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))
                {
                        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());
-                       return 1;
+                       return MOD_RES_DENY;
                }
-               return 0;
-       }
-
-       virtual int OnCheckBan(User* user, Channel* chan)
-       {
-               if (IS_OPER(user))
-                       return chan->GetExtBanStatus(user->oper, 'O');
-
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual ~ModuleOperChans()
+       ~ModuleOperChans()
        {
                ServerInstance->Modes->DelMode(&oc);
        }
 
-       virtual Version GetVersion()
+       Version GetVersion()
        {
                return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
        }