m_remove, m_services_account Don't check whether nicks are u-lined, checking the...

[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 074c644e13d0130a631b861bd7c25204aa8a9567..8db2a4041b4bc99a121b0ff2deb3ef6b2bca91ff 100644 (file)
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -24,32 +24,13 @@
 
 /* $ModDesc: Provides support for oper-only chans via the +O channel mode */
 
-class OperChans : public ModeHandler
+class OperChans : public SimpleChannelModeHandler
 {
  public:
        /* This is an oper-only mode */
-       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)
+       OperChans(Module* Creator) : SimpleChannelModeHandler(Creator, "operonly", 'O')
        {
-               if (adding)
-               {
-                       if (!channel->IsModeSet('O'))
-                       {
-                               channel->SetMode('O',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (channel->IsModeSet('O'))
-                       {
-                               channel->SetMode('O',false);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-
-               return MODEACTION_DENY;
+               oper = true;
        }
 };
 
@@ -78,7 +59,7 @@ class ModuleOperChans : public Module
 
        ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
        {
-               if (mask[0] == 'O' && mask[1] == ':')
+               if ((mask.length() > 2) && (mask[0] == 'O') && (mask[1] == ':'))
                {
                        if (IS_OPER(user) && InspIRCd::Match(user->oper->name, mask.substr(2)))
                                return MOD_RES_DENY;