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 76ba00ef21d90c12edb0810f49cd5a3bce102241..4308068e3e83aaa57b2a36744282d183fbfc9bc4 100644 (file)
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -14,17 +14,15 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-
 #include "inspircd.h"
 
 /* $ModDesc: Forces opers to join the specified channel(s) on oper-up */
 
-
-
 class ModuleOperjoin : public Module
 {
        private:
                std::string operChan;
+               std::vector<std::string> operChans;
                ConfigReader* conf;
                
 
@@ -54,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)
@@ -61,10 +62,14 @@ class ModuleOperjoin : public Module
                        List[I_OnPostOper] = List[I_OnRehash] = 1;
                }
 
-               virtual void OnRehash(const std::string &parameter)
+               virtual void OnRehash(userrec* user, const std::string &parameter)
                {
                        DELETE(conf);
                        conf = new ConfigReader(ServerInstance);
+                       operChan = conf->ReadValue("operjoin", "channel", 0);
+                       operChans.clear();
+                       if (!operChan.empty())
+                               tokenize(operChan,operChans);
                }
 
                virtual ~ModuleOperjoin()
@@ -79,14 +84,12 @@ class ModuleOperjoin : public Module
 
                virtual void OnPostOper(userrec* user, const std::string &opertype)
                {
-                       if(operChan != "")
-                       {
-                               std::vector<std::string> operChans;
-                               tokenize(operChan,operChans);
-                               for(std::vector<std::string>::iterator it = operChans.begin(); it != operChans.end(); it++)
-                                       chanrec::JoinUser(ServerInstance, user, it->c_str(), false);
-                       }
+                       if (!IS_LOCAL(user))
+                               return;
 
+                       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, "");
                }
 
 };