Remove debug stuff

[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 1736ffa375e20370d9784efbfb3e073ef6870fc9..5abee8303077cac79a08a09ea29fecf99562f7f6 100644 (file)
--- a/src/modules/m_conn_join.cpp
+++ b/src/modules/m_conn_join.cpp
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#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 +19,7 @@ class ModuleConnJoin : public Module
 {
        private:
                std::string JoinChan;
-               ConfigReader* conf;
+               std::vector<std::string> Joinchans;
                
 
                int tokenize(const string &str, std::vector<std::string> &tokens)
@@ -46,10 +43,14 @@ class ModuleConnJoin : public Module
 
        public:
                ModuleConnJoin(InspIRCd* Me)
-                       : Module::Module(Me)
+                       : Module(Me)
                {
-                       conf = new ConfigReader(ServerInstance);
-                       JoinChan = conf->ReadValue("autojoin", "channel", 0);
+                       OnRehash(NULL, "");
+               }
+
+               Priority Prioritize()
+               {
+                       return PRIORITY_LAST;
                }
 
                void Implements(char* List)
@@ -57,15 +58,18 @@ class ModuleConnJoin : public Module
                        List[I_OnPostConnect] = List[I_OnRehash] = 1;
                }
 
-               virtual void OnRehash(userrec* user, const std::string &parameter)
+               virtual void OnRehash(User* user, const std::string &parameter)
                {
+                       ConfigReader* conf = new ConfigReader(ServerInstance);
+                       JoinChan = conf->ReadValue("autojoin", "channel", 0);
+                       Joinchans.clear();
+                       if (!JoinChan.empty())
+                               tokenize(JoinChan,Joinchans);
                        DELETE(conf);
-                       conf = new ConfigReader(ServerInstance);
                }
 
                virtual ~ModuleConnJoin()
                {
-                       DELETE(conf);
                }
 
                virtual Version GetVersion()
@@ -73,41 +77,17 @@ class ModuleConnJoin : public Module
                        return Version(1,1,0,1,VF_VENDOR,API_VERSION);
                }
 
-               virtual void OnPostConnect(userrec* user)
+               virtual void OnPostConnect(User* user)
                {
                        if (!IS_LOCAL(user))
                                return;
 
-                       if (!JoinChan.empty())
-                       {
-                               std::vector<std::string> Joinchans;
-                               tokenize(JoinChan,Joinchans);
-                               for(std::vector<std::string>::iterator it = Joinchans.begin(); it != Joinchans.end(); it++)
-                                       chanrec::JoinUser(ServerInstance, user, it->c_str(), false);
-                       }
-
+                       for(std::vector<std::string>::iterator it = Joinchans.begin(); it != Joinchans.end(); it++)
+                               if (ServerInstance->IsChannel(it->c_str()))
+                                       Channel::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)