X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operjoin.cpp;h=d764c76d784c37cd0a27cc8ff58bfb319ee48237;hb=ccd95e668a3bcbd26c4cd2984cdd8809347f9815;hp=b9adb890ca8e80d7af41a7cb3313d71561481615;hpb=2d821f2980825be73e3f90b47ffff365b0ec5ecb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index b9adb890c..d764c76d7 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -1,70 +1,85 @@
-// operjoin module by typobox43
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2008 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.
+ *
+ * ---------------------------------------------------
+ */
 
-using namespace std;
+#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 */
+/* $ModDesc: Forces opers to join the specified channel(s) on oper-up */
 
 class ModuleOperjoin : public Module
 {
 	private:
 		std::string operChan;
-		ConfigReader* conf;
-		Server* Srv;
+		std::vector<std::string> operChans;		
+
+		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:
-		ModuleOperjoin(Server* Me)
-			: Module::Module(Me)
+		ModuleOperjoin(InspIRCd* Me) : Module(Me)
+		{
+			OnRehash(NULL, "");
+		Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
+		}
+
+
+		virtual void OnRehash(User* user, const std::string &parameter)
 		{
-			Srv = Me;
-			conf = new ConfigReader;
+			ConfigReader* conf = new ConfigReader(ServerInstance);
+
 			operChan = conf->ReadValue("operjoin", "channel", 0);
+			operChans.clear();
+			if (!operChan.empty())
+				tokenize(operChan,operChans);
+
+			delete conf;
 		}
 
 		virtual ~ModuleOperjoin()
 		{
-			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(User* user, const std::string &opertype, const std::string &opername)
 		{
-			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()))
+					Channel::JoinUser(ServerInstance, user, it->c_str(), false, "", false, ServerInstance->Time());
 		}
 
 };
 
-class ModuleOperjoinFactory : public ModuleFactory
-{
-	public:
-	        ModuleOperjoinFactory()
-        	{
-	        }
-
-	        ~ModuleOperjoinFactory()
-        	{
-	        }
-
-	        virtual Module * CreateModule(Server* Me)
-        	{
-                	return new ModuleOperjoin(Me);
-	        }
-};
-
-extern "C" void * init_module( void )
-{
-        return new ModuleOperjoinFactory;
-}
-
+MODULE_INIT(ModuleOperjoin)