Fix new millisec /map to compile on windows, by ifndef gettimeofday out reverting...

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

diff --git a/src/modules/m_conn_join.cpp b/src/modules/m_conn_join.cpp
index 9a7fdca7a5ef044abfce5ea26cfe2558c41bde33..2d639f310fd39cda8a243d3aff296c5ac0bd3b0d 100644 (file)
--- a/src/modules/m_conn_join.cpp
+++ b/src/modules/m_conn_join.cpp
@@ -11,10 +11,10 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
 /* $ModDesc: Forces users to join the specified channel(s) on connect */
 
@@ -22,7 +22,6 @@ class ModuleConnJoin : public Module
 {
        private:
                std::string JoinChan;
-               ConfigReader* conf;
                std::vector<std::string> Joinchans;
                
 
@@ -47,13 +46,14 @@ class ModuleConnJoin : public Module
 
        public:
                ModuleConnJoin(InspIRCd* Me)
-                       : Module::Module(Me)
+                       : Module(Me)
                {
-                       conf = new ConfigReader(ServerInstance);
-                       JoinChan = conf->ReadValue("autojoin", "channel", 0);
-                       Joinchans.clear();
-                       if (!JoinChan.empty())
-                               tokenize(JoinChan,Joinchans);
+                       OnRehash(NULL, "");
+               }
+
+               Priority Prioritize()
+               {
+                       return PRIORITY_LAST;
                }
 
                void Implements(char* List)
@@ -63,17 +63,16 @@ class ModuleConnJoin : public Module
 
                virtual void OnRehash(userrec* user, const std::string &parameter)
                {
-                       DELETE(conf);
-                       conf = new ConfigReader(ServerInstance);
+                       ConfigReader* conf = new ConfigReader(ServerInstance);
                        JoinChan = conf->ReadValue("autojoin", "channel", 0);
                        Joinchans.clear();
                        if (!JoinChan.empty())
                                tokenize(JoinChan,Joinchans);
+                       DELETE(conf);
                }
 
                virtual ~ModuleConnJoin()
                {
-                       DELETE(conf);
                }
 
                virtual Version GetVersion()
@@ -88,29 +87,10 @@ class ModuleConnJoin : public Module
 
                        for(std::vector<std::string>::iterator it = Joinchans.begin(); it != Joinchans.end(); it++)
                                if (ServerInstance->IsChannel(it->c_str()))
-                                       chanrec::JoinUser(ServerInstance, user, it->c_str(), false);
+                                       chanrec::JoinUser(ServerInstance, user, it->c_str(), false, "", ServerInstance->Time(true));
                }
 
 };
 
-class ModuleConnJoinFactory : public ModuleFactory
-{
-       public:
-               ModuleConnJoinFactory()
-               {
-               }
-
-               ~ModuleConnJoinFactory()
-               {
-               }
-
-               virtual Module * CreateModule(InspIRCd* Me)
-               {
-                       return new ModuleConnJoin(Me);
-               }
-};
 
-extern "C" void * init_module( void )
-{
-       return new ModuleConnJoinFactory;
-}
+MODULE_INIT(ModuleConnJoin)