X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operjoin.cpp;h=bf30880533c358056b51358a7eb8b2fed2bda539;hb=fea1a27cb96a114f698eedcf90401b78406108fb;hp=c334009544c103e00256fa3f8aa097caae68fdbe;hpb=5d407fb44c759524881712a80febb86b4506ddbf;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index c33400954..bf3088053 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -7,7 +7,7 @@ using namespace std;
 #include "modules.h"
 #include "helperfuncs.h"
 
-/* $ModDesc: Forces opers to join a specified channel on oper-up */
+/* $ModDesc: Forces opers to join the specified channel(s) on oper-up */
 
 class ModuleOperjoin : public Module
 {
@@ -16,6 +16,25 @@ class ModuleOperjoin : public Module
 		ConfigReader* conf;
 		Server* Srv;
 
+		int tokenize(const string &str, std::vector<std::string> &tokens)
+		{
+			// skip delimiters at beginning.
+			string::size_type lastPos = str.find_first_not_of(",", 0);
+			// find first "non-delimiter".
+			string::size_type pos = str.find_first_of(",", lastPos);
+
+			while (string::npos != pos || 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:
 		ModuleOperjoin(Server* Me)
 			: Module::Module(Me)
@@ -50,7 +69,10 @@ class ModuleOperjoin : public Module
 		{
 			if(operChan != "")
 			{
-				Srv->JoinUserToChannel(user,operChan,"");
+				std::vector<std::string> operChans;
+				tokenize(operChan,operChans);
+				for(std::vector<std::string>::iterator it = operChans.begin(); it != operChans.end(); it++)
+					chanrec::JoinUser(user, it->c_str(), false);
 			}
 
 		}
@@ -78,4 +100,3 @@ extern "C" void * init_module( void )
 {
 	return new ModuleOperjoinFactory;
 }
-