Replace hardcoded mode letters passed to IsModeSet() and GetModeParameter() with...

[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 af787b815980ab35a454472cadc331accbe7b03a..e890c3afb709ad36d627165a6d35c8ee0aa19e09 100644 (file)
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -28,7 +28,6 @@
 
 class ModuleOperjoin : public Module
 {
-       private:
                std::string operChan;
                std::vector<std::string> operChans;
                bool override;
@@ -53,53 +52,50 @@ class ModuleOperjoin : public Module
                }
 
        public:
-               ModuleOperjoin()
+               void init() CXX11_OVERRIDE
                {
                        OnRehash(NULL);
                        Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
-                       ServerInstance->Modules->Attach(eventlist, this, 2);
+                       ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
                }
 
 
-               virtual void OnRehash(User* user)
+               void OnRehash(User* user) CXX11_OVERRIDE
                {
-                       ConfigReader conf;
+                       ConfigTag* tag = ServerInstance->Config->ConfValue("operjoin");
 
-                       operChan = conf.ReadValue("operjoin", "channel", 0);
-                       override = conf.ReadFlag("operjoin", "override", "0", 0);
+                       operChan = tag->getString("channel");
+                       override = tag->getBool("override", false);
                        operChans.clear();
                        if (!operChan.empty())
                                tokenize(operChan,operChans);
                }
 
-               virtual ~ModuleOperjoin()
-               {
-               }
-
-               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
                {
-                       if (!IS_LOCAL(user))
+                       LocalUser* localuser = IS_LOCAL(user);
+                       if (!localuser)
                                return;
 
-                       for(std::vector<std::string>::iterator it = operChans.begin(); it != operChans.end(); it++)
-                               if (ServerInstance->IsChannel(it->c_str(), ServerInstance->Config->Limits.ChanMax))
-                                       Channel::JoinUser(user, it->c_str(), override, "", false, ServerInstance->Time());
+                       for (std::vector<std::string>::const_iterator i = operChans.begin(); i != operChans.end(); ++i)
+                               if (ServerInstance->IsChannel(*i))
+                                       Channel::JoinUser(localuser, *i, override);
 
-                       std::string chanList = IS_OPER(user)->getConfig("autojoin");
+                       std::string chanList = localuser->oper->getConfig("autojoin");
                        if (!chanList.empty())
                        {
                                std::vector<std::string> typechans;
                                tokenize(chanList, typechans);
                                for (std::vector<std::string>::const_iterator it = typechans.begin(); it != typechans.end(); ++it)
                                {
-                                       if (ServerInstance->IsChannel(it->c_str(), ServerInstance->Config->Limits.ChanMax))
+                                       if (ServerInstance->IsChannel(*it))
                                        {
-                                               Channel::JoinUser(user, it->c_str(), override, "", false, ServerInstance->Time());
+                                               Channel::JoinUser(localuser, *it, override);
                                        }
                                }
                        }