1 files changed, 15 insertions, 55 deletions

diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index bd77384a6..dd80d99ba 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -24,84 +24,44 @@
 
 #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;
 
-		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:
-		void init()
-		{
-			OnRehash(NULL);
-			Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
-			ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-		}
-
-
-		virtual void OnRehash(User* user)
+		void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 		{
 			ConfigTag* tag = ServerInstance->Config->ConfValue("operjoin");
 
-			operChan = tag->getString("channel");
 			override = tag->getBool("override", false);
+			irc::commasepstream ss(tag->getString("channel"));
 			operChans.clear();
-			if (!operChan.empty())
-				tokenize(operChan,operChans);
-		}
 
-		virtual ~ModuleOperjoin()
-		{
+			for (std::string channame; ss.GetToken(channame); )
+				operChans.push_back(channame);
 		}
 
-		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");
-			if (!chanList.empty())
+			irc::commasepstream ss(localuser->oper->getConfig("autojoin"));
+			for (std::string channame; ss.GetToken(channame); )
 			{
-				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))
-					{
-						Channel::JoinUser(user, it->c_str(), override, "", false, ServerInstance->Time());
-					}
-				}
+				if (ServerInstance->IsChannel(channame))
+					Channel::JoinUser(localuser, channame, override);
 			}
 		}
 };