m_callerid Route ACCEPT to the server of the target user only, do not send METADATA...

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

diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index 864515e0c9aab36ac43af78390bb8b1e053be4f7..e890c3afb709ad36d627165a6d35c8ee0aa19e09 100644 (file)
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -52,7 +52,7 @@ class ModuleOperjoin : public Module
                }
 
        public:
-               void init()
+               void init() CXX11_OVERRIDE
                {
                        OnRehash(NULL);
                        Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
@@ -60,7 +60,7 @@ class ModuleOperjoin : public Module
                }
 
 
-               virtual void OnRehash(User* user)
+               void OnRehash(User* user) CXX11_OVERRIDE
                {
                        ConfigTag* tag = ServerInstance->Config->ConfValue("operjoin");
 
@@ -71,19 +71,19 @@ class ModuleOperjoin : public Module
                                tokenize(operChan,operChans);
                }
 
-               virtual Version GetVersion()
+               Version GetVersion() CXX11_OVERRIDE
                {
                        return Version("Forces opers to join the specified channel(s) on oper-up", VF_VENDOR);
                }
 
-               virtual void OnPostOper(User* user, const std::string &opertype, const std::string &opername)
+               void OnPostOper(User* user, const std::string &opertype, const std::string &opername) CXX11_OVERRIDE
                {
                        LocalUser* localuser = IS_LOCAL(user);
                        if (!localuser)
                                return;
 
                        for (std::vector<std::string>::const_iterator i = operChans.begin(); i != operChans.end(); ++i)
-                               if (ServerInstance->IsChannel(*i, ServerInstance->Config->Limits.ChanMax))
+                               if (ServerInstance->IsChannel(*i))
                                        Channel::JoinUser(localuser, *i, override);
 
                        std::string chanList = localuser->oper->getConfig("autojoin");
@@ -93,7 +93,7 @@ class ModuleOperjoin : public Module
                                tokenize(chanList, typechans);
                                for (std::vector<std::string>::const_iterator it = typechans.begin(); it != typechans.end(); ++it)
                                {
-                                       if (ServerInstance->IsChannel(*it, ServerInstance->Config->Limits.ChanMax))
+                                       if (ServerInstance->IsChannel(*it))
                                        {
                                                Channel::JoinUser(localuser, *it, override);
                                        }