X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operjoin.cpp;h=80bb73ad4989f785cf411c7d9f70240726a76a0a;hb=67de413cad88194972d55a8ff88464370890c5a9;hp=af787b815980ab35a454472cadc331accbe7b03a;hpb=46a39046196f55b52336e19662bb7bac85b731ac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index af787b815..80bb73ad4 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -24,11 +24,8 @@
 
 #include "inspircd.h"
 
-/* $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;
 		bool override;
@@ -53,53 +50,48 @@ class ModuleOperjoin : public Module
 		}
 
 	public:
-		ModuleOperjoin()
+		void init() CXX11_OVERRIDE
 		{
 			OnRehash(NULL);
-			Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
-			ServerInstance->Modules->Attach(eventlist, this, 2);
 		}
 
 
-		virtual void OnRehash(User* user)
+		void OnRehash(User* user) CXX11_OVERRIDE
 		{
-			ConfigReader conf;
+			ConfigTag* tag = ServerInstance->Config->ConfValue("operjoin");
 
-			operChan = conf.ReadValue("operjoin", "channel", 0);
-			override = conf.ReadFlag("operjoin", "override", "0", 0);
+			operChan = tag->getString("channel");
+			override = tag->getBool("override", false);
 			operChans.clear();
 			if (!operChan.empty())
 				tokenize(operChan,operChans);
 		}
 
-		virtual ~ModuleOperjoin()
-		{
-		}
-
-		virtual Version GetVersion()
+		Version GetVersion() CXX11_OVERRIDE
 		{
 			return Version("Forces opers to join the specified channel(s) on oper-up", VF_VENDOR);
 		}
 
-		virtual void OnPostOper(User* user, const std::string &opertype, const std::string &opername)
+		void OnPostOper(User* user, const std::string &opertype, const std::string &opername) CXX11_OVERRIDE
 		{
-			if (!IS_LOCAL(user))
+			LocalUser* localuser = IS_LOCAL(user);
+			if (!localuser)
 				return;
 
-			for(std::vector<std::string>::iterator it = operChans.begin(); it != operChans.end(); it++)
-				if (ServerInstance->IsChannel(it->c_str(), ServerInstance->Config->Limits.ChanMax))
-					Channel::JoinUser(user, it->c_str(), override, "", false, ServerInstance->Time());
+			for (std::vector<std::string>::const_iterator i = operChans.begin(); i != operChans.end(); ++i)
+				if (ServerInstance->IsChannel(*i))
+					Channel::JoinUser(localuser, *i, override);
 
-			std::string chanList = IS_OPER(user)->getConfig("autojoin");
+			std::string chanList = localuser->oper->getConfig("autojoin");
 			if (!chanList.empty())
 			{
 				std::vector<std::string> typechans;
 				tokenize(chanList, typechans);
 				for (std::vector<std::string>::const_iterator it = typechans.begin(); it != typechans.end(); ++it)
 				{
-					if (ServerInstance->IsChannel(it->c_str(), ServerInstance->Config->Limits.ChanMax))
+					if (ServerInstance->IsChannel(*it))
 					{
-						Channel::JoinUser(user, it->c_str(), override, "", false, ServerInstance->Time());
+						Channel::JoinUser(localuser, *it, override);
 					}
 				}
 			}