X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_restrictchans.cpp;h=f84d9abb2a2cc71b2feb721b37397012ee22ff56;hb=f25c4b7a2263f5f3ce9bb41ba56b43c0d3a6d124;hp=35665fad9041126587e7e14b547448f9d13a1f35;hpb=fce32c7b5baa50aa4d2d414e0361009489eccd1c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_restrictchans.cpp b/src/modules/m_restrictchans.cpp
index 35665fad9..f84d9abb2 100644
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.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.
@@ -45,7 +45,7 @@ class ModuleRestrictChans : public Module
 		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
-	virtual void OnRehash(User* user, const std::string &parameter)
+	virtual void OnRehash(User* user)
 	{
 		ReadConfig();
 	}
@@ -54,13 +54,16 @@ class ModuleRestrictChans : public Module
 	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
 	{
 		irc::string x = cname;
-		// user is not an oper and its not in the allow list
-		if ((!IS_OPER(user)) && (allowchans.find(x) == allowchans.end()))
+		if (!IS_LOCAL(user))
+			return 0;
+
+		// channel does not yet exist (record is null, about to be created IF we were to allow it)
+		if (!chan)
 		{
-			// channel does not yet exist (record is null, about to be created IF we were to allow it)
-			if (!chan)
+			// user is not an oper and its not in the allow list
+			if ((!IS_OPER(user)) && (allowchans.find(x) == allowchans.end()))
 			{
-				user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s %s :Only IRC operators may create new channels",user->nick.c_str(),cname);
+				user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Only IRC operators may create new channels",user->nick.c_str(),cname);
 				return 1;
 			}
 		}
@@ -73,7 +76,7 @@ class ModuleRestrictChans : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,2,0,1,VF_VENDOR,API_VERSION);
+		return Version("$Id$",VF_VENDOR,API_VERSION);
 	}
 };