X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operjoin.cpp;h=549194ef7a9afd118081459eeb9e888ac74ed130;hb=2df56b811b362dbf5a05a0bc7b0eee5ee4d77a40;hp=42415faa2f757e471fd88baab5e021d6b7959f22;hpb=a15f95e58613619100cc1a6093fab3d0149a1e96;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index 42415faa2..549194ef7 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -54,7 +54,7 @@ class ModuleOperjoin : public Module
 		virtual void OnRehash(User* user, const std::string &parameter)
 		{
 			ConfigReader* conf = new ConfigReader(ServerInstance);
-    
+
 			operChan = conf->ReadValue("operjoin", "channel", 0);
 			override = conf->ReadFlag("operjoin", "override", "0", 0);
 			operChans.clear();
@@ -82,7 +82,7 @@ class ModuleOperjoin : public Module
 
 		virtual Version GetVersion()
 		{
-			return Version(1,2,0,1,VF_VENDOR,API_VERSION);
+			return Version("$Id$", VF_VENDOR, API_VERSION);
 		}
 
 		virtual void OnPostOper(User* user, const std::string &opertype, const std::string &opername)
@@ -91,7 +91,7 @@ class ModuleOperjoin : public Module
 				return;
 
 			for(std::vector<std::string>::iterator it = operChans.begin(); it != operChans.end(); it++)
-				if (ServerInstance->IsChannel(it->c_str()))
+				if (ServerInstance->IsChannel(it->c_str(), ServerInstance->Config->Limits.ChanMax))
 					Channel::JoinUser(ServerInstance, user, it->c_str(), override, "", false, ServerInstance->Time());
 
 			std::map<std::string, std::vector<std::string> >::iterator i = operTypeChans.find(user->oper);
@@ -101,7 +101,7 @@ class ModuleOperjoin : public Module
 				const std::vector<std::string>& list = i->second;
 				for (std::vector<std::string>::const_iterator it = list.begin(); it != list.end(); ++it)
 				{
-					if (ServerInstance->IsChannel(it->c_str()))
+					if (ServerInstance->IsChannel(it->c_str(), ServerInstance->Config->Limits.ChanMax))
 					{
 						Channel::JoinUser(ServerInstance, user, it->c_str(), override, "", false, ServerInstance->Time());
 					}