Add config <options:disablehmac> to support disabling of HMAC, and tidy up to detect...

[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 87e3aa38074aa0897407aaaf805491b6cb7a4047..4308068e3e83aaa57b2a36744282d183fbfc9bc4 100644 (file)
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -22,6 +22,7 @@ class ModuleOperjoin : public Module
 {
        private:
                std::string operChan;
+               std::vector<std::string> operChans;
                ConfigReader* conf;
                
 
@@ -51,6 +52,9 @@ class ModuleOperjoin : public Module
                        
                        conf = new ConfigReader(ServerInstance);
                        operChan = conf->ReadValue("operjoin", "channel", 0);
+                       operChans.clear();
+                       if (!operChan.empty())
+                               tokenize(operChan,operChans);
                }
 
                void Implements(char* List)
@@ -62,6 +66,10 @@ class ModuleOperjoin : public Module
                {
                        DELETE(conf);
                        conf = new ConfigReader(ServerInstance);
+                       operChan = conf->ReadValue("operjoin", "channel", 0);
+                       operChans.clear();
+                       if (!operChan.empty())
+                               tokenize(operChan,operChans);
                }
 
                virtual ~ModuleOperjoin()
@@ -79,15 +87,9 @@ class ModuleOperjoin : public Module
                        if (!IS_LOCAL(user))
                                return;
 
-                       if (!operChan.empty())
-                       {
-                               std::vector<std::string> operChans;
-                               tokenize(operChan,operChans);
-                               for(std::vector<std::string>::iterator it = operChans.begin(); it != operChans.end(); it++)
-                                       if (ServerInstance->IsChannel(it->c_str()))
-                                               chanrec::JoinUser(ServerInstance, user, it->c_str(), false);
-                       }
-
+                       for(std::vector<std::string>::iterator it = operChans.begin(); it != operChans.end(); it++)
+                               if (ServerInstance->IsChannel(it->c_str()))
+                                       chanrec::JoinUser(ServerInstance, user, it->c_str(), false, "");
                }
 
 };