Update all wiki links to point to the new wiki. This was done automatically with...

[user/henk/code/inspircd.git] / src / modules / m_operjoin.cpp

diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index 42415faa2f757e471fd88baab5e021d6b7959f22..22482faace9bed22f18925c1f6695de6cce1bdb0 100644 (file)
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -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());
                                        }