X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operjoin.cpp;h=d12bc193225bbade732b1dc028bc40cf77ceb86b;hb=78fa4165c90088523e623ab2b64ca0db0d19def0;hp=d1d9ef3b066d87c491c32e493d77160738367ba5;hpb=3e7adbfe4c337eb19321cd565a13b18e6bb9f0ca;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index d1d9ef3b0..d12bc1932 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -1,71 +1,90 @@
-// 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 "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
 
-/* $ModDesc: Forces opers to join a specified channel on oper-up */
-
-Server *Srv;
+/* $ModDesc: Forces opers to join the specified channel(s) on oper-up */
 
 class ModuleOperjoin : public Module
 {
 	private:
 		std::string operChan;
-		ConfigReader* conf;
+		std::vector<std::string> operChans;		
+
+		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()
+		ModuleOperjoin(InspIRCd* Me) : Module(Me)
+		{
+			OnRehash(NULL, "");
+		}
+
+		void Implements(char* List)
 		{
-			Srv = new Server;
-			conf = new ConfigReader;
+			List[I_OnPostOper] = List[I_OnRehash] = 1;
+		}
+
+		virtual void OnRehash(userrec* user, const std::string &parameter)
+		{
+			ConfigReader* conf = new ConfigReader(ServerInstance);
+
 			operChan = conf->ReadValue("operjoin", "channel", 0);
+			operChans.clear();
+			if (!operChan.empty())
+				tokenize(operChan,operChans);
+
+			DELETE(conf);
 		}
 
 		virtual ~ModuleOperjoin()
 		{
-			delete Srv;
-			delete conf;
 		}
 
 		virtual Version GetVersion()
 		{
-			return Version(1,0,0,1,VF_VENDOR);
+			return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 		}
 
-		virtual void OnOper(userrec* user, std::string opertype)
+		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, "", ServerInstance->Time(true));
 		}
 
 };
 
-class ModuleOperjoinFactory : public ModuleFactory
-{
-	public:
-	        ModuleOperjoinFactory()
-        	{
-	        }
-
-	        ~ModuleOperjoinFactory()
-        	{
-	        }
-
-	        virtual Module * CreateModule()
-        	{
-                	return new ModuleOperjoin;
-	        }
-};
-
-extern "C" void * init_module( void )
-{
-        return new ModuleOperjoinFactory;
-}
-
+MODULE_INIT(ModuleOperjoin)