X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operjoin.cpp;h=4308068e3e83aaa57b2a36744282d183fbfc9bc4;hb=7f00015727fab50e37de46aa90d218b31c852c87;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..4308068e3 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -1,28 +1,60 @@
-// operjoin module by typobox43
-
-using namespace std;
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
 
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+#include "inspircd.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
 {
 	private:
 		std::string operChan;
+		std::vector<std::string> operChans;
 		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)
+		ModuleOperjoin(InspIRCd* Me)
 			: Module::Module(Me)
 		{
-			Srv = Me;
-			conf = new ConfigReader;
+			
+			conf = new ConfigReader(ServerInstance);
 			operChan = conf->ReadValue("operjoin", "channel", 0);
+			operChans.clear();
+			if (!operChan.empty())
+				tokenize(operChan,operChans);
 		}
 
 		void Implements(char* List)
@@ -30,10 +62,14 @@ class ModuleOperjoin : public Module
 			List[I_OnPostOper] = List[I_OnRehash] = 1;
 		}
 
-		virtual void OnRehash(const std::string &parameter)
+		virtual void OnRehash(userrec* user, const std::string &parameter)
 		{
 			DELETE(conf);
-			conf = new ConfigReader;
+			conf = new ConfigReader(ServerInstance);
+			operChan = conf->ReadValue("operjoin", "channel", 0);
+			operChans.clear();
+			if (!operChan.empty())
+				tokenize(operChan,operChans);
 		}
 
 		virtual ~ModuleOperjoin()
@@ -43,16 +79,17 @@ class ModuleOperjoin : public Module
 
 		virtual Version GetVersion()
 		{
-			return Version(1,0,0,1,VF_VENDOR);
+			return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 		}
 
 		virtual void OnPostOper(userrec* user, const std::string &opertype)
 		{
-			if(operChan != "")
-			{
-				Srv->JoinUserToChannel(user,operChan,"");
-			}
+			if (!IS_LOCAL(user))
+				return;
 
+			for(std::vector<std::string>::iterator it = operChans.begin(); it != operChans.end(); it++)
+				if (ServerInstance->IsChannel(it->c_str()))
+					chanrec::JoinUser(ServerInstance, user, it->c_str(), false, "");
 		}
 
 };
@@ -68,7 +105,7 @@ class ModuleOperjoinFactory : public ModuleFactory
 		{
 		}
 
-		virtual Module * CreateModule(Server* Me)
+		virtual Module * CreateModule(InspIRCd* Me)
 		{
 			return new ModuleOperjoin(Me);
 		}
@@ -78,4 +115,3 @@ extern "C" void * init_module( void )
 {
 	return new ModuleOperjoinFactory;
 }
-