X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_conn_join.cpp;h=6b13ab1aab8da7556d193cd8249b4e394c9ef391;hb=402a1bb010522a35600325c1a3084e092b40ca22;hp=b78cc85bee78d1e16ecde69eeaf5a001775ca613;hpb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_conn_join.cpp b/src/modules/m_conn_join.cpp
index b78cc85be..6b13ab1aa 100644
--- a/src/modules/m_conn_join.cpp
+++ b/src/modules/m_conn_join.cpp
@@ -1,52 +1,36 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
 /* $ModDesc: Forces users to join the specified channel(s) on connect */
 
 class ModuleConnJoin : public Module
 {
-	private:
-		std::string JoinChan;
-		std::vector<std::string> Joinchans;
-
-
-		int tokenize(const std::string &str, std::vector<std::string> &tokens)
-		{
-			// skip delimiters at beginning.
-			std::string::size_type lastPos = str.find_first_not_of(",", 0);
-			// find first "non-delimiter".
-			std::string::size_type pos = str.find_first_of(",", 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));
-				// skip delimiters. Note the "not_of"
-				lastPos = str.find_first_not_of(",", pos);
-				// find next "non-delimiter"
-				pos = str.find_first_of(",", lastPos);
-			}
-			return tokens.size();
-		}
-
 	public:
-		ModuleConnJoin()
-					{
-			OnRehash(NULL);
-			Implementation eventlist[] = { I_OnPostConnect, I_OnRehash };
-			ServerInstance->Modules->Attach(eventlist, this, 2);
+		void init()
+		{
+			Implementation eventlist[] = { I_OnPostConnect };
+			ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 		}
 
 		void Prioritize()
@@ -54,36 +38,28 @@ class ModuleConnJoin : public Module
 			ServerInstance->Modules->SetPriority(this, I_OnPostConnect, PRIORITY_LAST);
 		}
 
-
-		virtual void OnRehash(User* user)
+		Version GetVersion()
 		{
-			ConfigReader* conf = new ConfigReader;
-			JoinChan = conf->ReadValue("autojoin", "channel", 0);
-			Joinchans.clear();
-			if (!JoinChan.empty())
-				tokenize(JoinChan,Joinchans);
-			delete conf;
+			return Version("Forces users to join the specified channel(s) on connect", VF_VENDOR);
 		}
 
-		virtual ~ModuleConnJoin()
-		{
-		}
-
-		virtual Version GetVersion()
-		{
-			return Version("Forces users to join the specified channel(s) on connect", VF_VENDOR,API_VERSION);
-		}
-
-		virtual void OnPostConnect(User* user)
+		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(), ServerInstance->Config->Limits.ChanMax))
-					Channel::JoinUser(user, it->c_str(), false, "", false, ServerInstance->Time());
-		}
+			std::string chanlist = ServerInstance->Config->ConfValue("autojoin")->getString("channel");
+			chanlist = user->GetClass()->config->getString("autojoin", chanlist);
+
+			irc::commasepstream chans(chanlist);
+			std::string chan;
 
+			while (chans.GetToken(chan))
+			{
+				if (ServerInstance->IsChannel(chan.c_str(), ServerInstance->Config->Limits.ChanMax))
+					Channel::JoinUser(user, chan.c_str(), false, "", false, ServerInstance->Time());
+			}
+		}
 };