X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operjoin.cpp;h=750f98c96afc45609aa1b5e138c714b5e3b6ab3f;hb=f9636a2eff46f6829bf9e01c711ab1ba45a7d50a;hp=3609350a2dbe159e65b9fdffdc1753efc3342d53;hpb=de6a9294e350a7339e280ab3e8a5f4c8d1343660;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index 3609350a2..750f98c96 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -6,48 +6,76 @@ using namespace std;
 #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 */
 
-Server *Srv;
-
-class ModuleOperjoin : public Module {
+extern InspIRCd* ServerInstance;
 
+class ModuleOperjoin : public Module
+{
 	private:
-
 		std::string operChan;
 		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() {
-
-			Srv = new Server;
+		ModuleOperjoin(Server* Me)
+			: Module::Module(Me)
+		{
+			Srv = Me;
 			conf = new ConfigReader;
-
 			operChan = conf->ReadValue("operjoin", "channel", 0);
-
 		}
 
-		virtual ~ModuleOperjoin() {
-
-			delete Srv;
-			delete conf;
+		void Implements(char* List)
+		{
+			List[I_OnPostOper] = List[I_OnRehash] = 1;
+		}
 
+		virtual void OnRehash(const std::string &parameter)
+		{
+			DELETE(conf);
+			conf = new ConfigReader;
 		}
 
-		virtual Version GetVersion() {
+		virtual ~ModuleOperjoin()
+		{
+			DELETE(conf);
+		}
 
+		virtual Version GetVersion()
+		{
 			return Version(1,0,0,1,VF_VENDOR);
-
 		}
 
-		virtual void OnOper(userrec* user, std::string opertype) {
-
-			if(operChan != "") {
-
-				Srv->JoinUserToChannel(user,operChan,"");
-
+		virtual void OnPostOper(userrec* user, const std::string &opertype)
+		{
+			if(operChan != "")
+			{
+				std::vector<std::string> operChans;
+				tokenize(operChan,operChans);
+				for(std::vector<std::string>::iterator it = operChans.begin(); it != operChans.end(); it++)
+					chanrec::JoinUser(ServerInstance, user, it->c_str(), false);
 			}
 
 		}
@@ -56,24 +84,22 @@ class ModuleOperjoin : public Module {
 
 class ModuleOperjoinFactory : public ModuleFactory
 {
- public:
-        ModuleOperjoinFactory()
-        {
-        }
-
-        ~ModuleOperjoinFactory()
-        {
-        }
+	public:
+		ModuleOperjoinFactory()
+		{
+		}
 
-        virtual Module * CreateModule()
-        {
-                return new ModuleOperjoin;
-        }
+		~ModuleOperjoinFactory()
+		{
+		}
 
+		virtual Module * CreateModule(Server* Me)
+		{
+			return new ModuleOperjoin(Me);
+		}
 };
 
 extern "C" void * init_module( void )
 {
-        return new ModuleOperjoinFactory;
+	return new ModuleOperjoinFactory;
 }
-