Remove InspIRCd* parameters and fields

[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 2d639f310fd39cda8a243d3aff296c5ac0bd3b0d..b78cc85bee78d1e16ecde69eeaf5a001775ca613 100644 (file)
--- a/src/modules/m_conn_join.cpp
+++ b/src/modules/m_conn_join.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Forces users to join the specified channel(s) on connect */
 
@@ -23,16 +20,16 @@ class ModuleConnJoin : public Module
        private:
                std::string JoinChan;
                std::vector<std::string> Joinchans;
-               
 
-               int tokenize(const string &str, std::vector<std::string> &tokens)
+
+               int tokenize(const std::string &str, std::vector<std::string> &tokens)
                {
                        // skip delimiters at beginning.
-                       string::size_type lastPos = str.find_first_not_of(",", 0);
+                       std::string::size_type lastPos = str.find_first_not_of(",", 0);
                        // find first "non-delimiter".
-                       string::size_type pos = str.find_first_of(",", lastPos);
+                       std::string::size_type pos = str.find_first_of(",", lastPos);
 
-                       while (string::npos != pos || string::npos != lastPos)
+                       while (std::string::npos != pos || std::string::npos != lastPos)
                        {
                                // found a token, add it to the vector.
                                tokens.push_back(str.substr(lastPos, pos - lastPos));
@@ -45,30 +42,27 @@ class ModuleConnJoin : public Module
                }
 
        public:
-               ModuleConnJoin(InspIRCd* Me)
-                       : Module(Me)
-               {
-                       OnRehash(NULL, "");
+               ModuleConnJoin()
+                                       {
+                       OnRehash(NULL);
+                       Implementation eventlist[] = { I_OnPostConnect, I_OnRehash };
+                       ServerInstance->Modules->Attach(eventlist, this, 2);
                }
 
-               Priority Prioritize()
+               void Prioritize()
                {
-                       return PRIORITY_LAST;
+                       ServerInstance->Modules->SetPriority(this, I_OnPostConnect, PRIORITY_LAST);
                }
 
-               void Implements(char* List)
-               {
-                       List[I_OnPostConnect] = List[I_OnRehash] = 1;
-               }
 
-               virtual void OnRehash(userrec* user, const std::string &parameter)
+               virtual void OnRehash(User* user)
                {
-                       ConfigReader* conf = new ConfigReader(ServerInstance);
+                       ConfigReader* conf = new ConfigReader;
                        JoinChan = conf->ReadValue("autojoin", "channel", 0);
                        Joinchans.clear();
                        if (!JoinChan.empty())
                                tokenize(JoinChan,Joinchans);
-                       DELETE(conf);
+                       delete conf;
                }
 
                virtual ~ModuleConnJoin()
@@ -77,17 +71,17 @@ class ModuleConnJoin : public Module
 
                virtual Version GetVersion()
                {
-                       return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+                       return Version("Forces users to join the specified channel(s) on connect", VF_VENDOR,API_VERSION);
                }
 
-               virtual void OnPostConnect(userrec* user)
+               virtual void OnPostConnect(User* user)
                {
                        if (!IS_LOCAL(user))
                                return;
 
                        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, "", ServerInstance->Time(true));
+                               if (ServerInstance->IsChannel(it->c_str(), ServerInstance->Config->Limits.ChanMax))
+                                       Channel::JoinUser(user, it->c_str(), false, "", false, ServerInstance->Time());
                }
 
 };