X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_conn_join.cpp;h=21c03922eb10f3d3742413601a89ac0e6691f705;hb=d185decae97752368d5cf62311cbc0d1a52aa22c;hp=f9c9423756c75ee239416ab4aead1516cf1406db;hpb=cadc11999ee28545e9beb92de116c151832af5c4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_conn_join.cpp b/src/modules/m_conn_join.cpp
index f9c942375..21c03922e 100644
--- a/src/modules/m_conn_join.cpp
+++ b/src/modules/m_conn_join.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -20,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));
@@ -46,8 +46,8 @@ class ModuleConnJoin : public Module
 			: Module(Me)
 		{
 			OnRehash(NULL, "");
-		Implementation eventlist[] = { I_OnPostConnect, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+			Implementation eventlist[] = { I_OnPostConnect, I_OnRehash };
+			ServerInstance->Modules->Attach(eventlist, this, 2);
 		}
 
 		void Prioritize()
@@ -55,10 +55,6 @@ class ModuleConnJoin : public Module
 			ServerInstance->Modules->SetPriority(this, I_OnPostConnect, PRIO_LAST);
 		}
 
-		void Implements(char* List)
-		{
-			List[I_OnPostConnect] = List[I_OnRehash] = 1;
-		}
 
 		virtual void OnRehash(User* user, const std::string &parameter)
 		{
@@ -67,7 +63,7 @@ class ModuleConnJoin : public Module
 			Joinchans.clear();
 			if (!JoinChan.empty())
 				tokenize(JoinChan,Joinchans);
-			DELETE(conf);
+			delete conf;
 		}
 
 		virtual ~ModuleConnJoin()
@@ -76,7 +72,7 @@ class ModuleConnJoin : public Module
 
 		virtual Version GetVersion()
 		{
-			return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+			return Version(1,2,0,1,VF_VENDOR,API_VERSION);
 		}
 
 		virtual void OnPostConnect(User* user)
@@ -85,8 +81,8 @@ class ModuleConnJoin : public Module
 				return;
 
 			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));
+				if (ServerInstance->IsChannel(it->c_str(), ServerInstance->Config->Limits.ChanMax))
+					Channel::JoinUser(ServerInstance, user, it->c_str(), false, "", false, ServerInstance->Time());
 		}
 
 };