X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_restrictchans.cpp;h=02d7d6a3ab31739f844c2ef93b04e2ca45d8e936;hb=a23a840749db9646884907ae28588b1962dc2449;hp=e61e8ac0d6c44769448354c8166a4822137467dd;hpb=b57c7f4e466f72fdd2ac3deca42caa1ea7748338;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_restrictchans.cpp b/src/modules/m_restrictchans.cpp
index e61e8ac0d..02d7d6a3a 100644
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -17,7 +17,7 @@
 
 class ModuleRestrictChans : public Module
 {
-	
+
 
 	std::map<irc::string,int> allowchans;
 
@@ -32,15 +32,17 @@ class ModuleRestrictChans : public Module
 			irc::string channel = txt.c_str();
 			allowchans[channel] = 1;
 		}
-		DELETE(MyConf);
+		delete MyConf;
 	}
 
  public:
 	ModuleRestrictChans(InspIRCd* Me)
 		: Module(Me)
 	{
-		
+
 		ReadConfig();
+		Implementation eventlist[] = { I_OnUserPreJoin, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
 	virtual void OnRehash(User* user, const std::string &parameter)
@@ -48,34 +50,33 @@ class ModuleRestrictChans : public Module
 		ReadConfig();
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnUserPreJoin] = List[I_OnRehash] = 1;
-	}
-	
-	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
+
+	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->WriteServ("530 %s %s :Only IRC operators may create new channels",user->nick,cname,cname);
+				user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Only IRC operators may create new channels",user->nick.c_str(),cname);
 				return 1;
 			}
 		}
 		return 0;
 	}
-	
+
 	virtual ~ModuleRestrictChans()
 	{
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version("$Id$",VF_VENDOR,API_VERSION);
 	}
 };