there were two.. yes, you're right Special

[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 ae6abce0bee2c536f470eda508e80c5c479d0611..d12bc193225bbade732b1dc028bc40cf77ceb86b 100644 (file)
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -11,10 +11,10 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
 /* $ModDesc: Forces opers to join the specified channel(s) on oper-up */
 
@@ -22,8 +22,7 @@ class ModuleOperjoin : public Module
 {
        private:
                std::string operChan;
-               ConfigReader* conf;
-               
+               std::vector<std::string> operChans;             
 
                int tokenize(const string &str, std::vector<std::string> &tokens)
                {
@@ -45,12 +44,9 @@ class ModuleOperjoin : public Module
                }
 
        public:
-               ModuleOperjoin(InspIRCd* Me)
-                       : Module::Module(Me)
+               ModuleOperjoin(InspIRCd* Me) : Module(Me)
                {
-                       
-                       conf = new ConfigReader(ServerInstance);
-                       operChan = conf->ReadValue("operjoin", "channel", 0);
+                       OnRehash(NULL, "");
                }
 
                void Implements(char* List)
@@ -60,13 +56,18 @@ class ModuleOperjoin : public Module
 
                virtual void OnRehash(userrec* user, const std::string &parameter)
                {
+                       ConfigReader* conf = new ConfigReader(ServerInstance);
+
+                       operChan = conf->ReadValue("operjoin", "channel", 0);
+                       operChans.clear();
+                       if (!operChan.empty())
+                               tokenize(operChan,operChans);
+
                        DELETE(conf);
-                       conf = new ConfigReader(ServerInstance);
                }
 
                virtual ~ModuleOperjoin()
                {
-                       DELETE(conf);
                }
 
                virtual Version GetVersion()
@@ -76,36 +77,14 @@ class ModuleOperjoin : public Module
 
                virtual void OnPostOper(userrec* user, const std::string &opertype)
                {
-                       if (!operChan.empty())
-                       {
-                               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);
-                       }
-
-               }
-
-};
-
-class ModuleOperjoinFactory : public ModuleFactory
-{
-       public:
-               ModuleOperjoinFactory()
-               {
-               }
+                       if (!IS_LOCAL(user))
+                               return;
 
-               ~ModuleOperjoinFactory()
-               {
+                       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, "", ServerInstance->Time(true));
                }
 
-               virtual Module * CreateModule(InspIRCd* Me)
-               {
-                       return new ModuleOperjoin(Me);
-               }
 };
 
-extern "C" void * init_module( void )
-{
-       return new ModuleOperjoinFactory;
-}
+MODULE_INIT(ModuleOperjoin)