Change channel name parameter of Module::OnUserPreJoin() and Channel::JoinUser()...

[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 2e6fad79f05b6a7e234c1dd426a172cd367e34f7..e0423886fbaf4ab068450b2014f50b8cf27cbc7a 100644 (file)
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -40,13 +40,16 @@ class ModuleOperChans : public Module
  public:
        ModuleOperChans() : oc(this)
        {
-               if (!ServerInstance->Modes->AddMode(&oc))
-                       throw ModuleException("Could not add new modes!");
+       }
+
+       void init()
+       {
+               ServerInstance->Modules->AddService(oc);
                Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric, I_OnUserPreJoin };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
-       ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+       ModResult OnUserPreJoin(User* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven)
        {
                if (chan && chan->IsModeSet('O') && !IS_OPER(user))
                {
@@ -59,7 +62,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;