X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_restrictchans.cpp;h=abfb6f580ac80eacc2303f47ed6eb59a81ec54af;hb=6f4bf8ffd367f35b96265fea1ad01fb1acf2adcd;hp=b6d34bf259f1616a54c57bf8fb90116c94cd514a;hpb=e2e581f0d3d5d844dc4b5210f566e5a5571a0570;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_restrictchans.cpp b/src/modules/m_restrictchans.cpp
index b6d34bf25..abfb6f580 100644
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.cpp
@@ -21,19 +21,20 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
+#include "inspircd.h"
 
 /* $ModDesc: Only opers may create new channels if this module is loaded */
 
 class ModuleRestrictChans : public Module
 {
-	Server* Srv;
+	
 
 	std::map<irc::string,int> allowchans;
 
 	void ReadConfig()
 	{
-		ConfigReader* MyConf = new ConfigReader();
+		ConfigReader* MyConf = new ConfigReader(ServerInstance);
 		allowchans.clear();
 		for (int i = 0; i < MyConf->Enumerate("allowchannel"); i++)
 		{
@@ -42,18 +43,18 @@ class ModuleRestrictChans : public Module
 			irc::string channel = txt.c_str();
 			allowchans[channel] = 1;
 		}
-		delete MyConf;
+		DELETE(MyConf);
 	}
 
  public:
-	ModuleRestrictChans(Server* Me)
+	ModuleRestrictChans(InspIRCd* Me)
 		: Module::Module(Me)
 	{
-		Srv = Me;
+		
 		ReadConfig();
 	}
 
-	virtual void OnRehash(std::string parameter)
+	virtual void OnRehash(const std::string &parameter)
 	{
 		ReadConfig();
 	}
@@ -63,7 +64,7 @@ class ModuleRestrictChans : public Module
 		List[I_OnUserPreJoin] = List[I_OnRehash] = 1;
 	}
 	
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
 	{
 		irc::string x = cname;
 		// user is not an oper and its not in the allow list
@@ -72,7 +73,7 @@ class ModuleRestrictChans : public Module
 			// channel does not yet exist (record is null, about to be created IF we were to allow it)
 			if (!chan)
 			{
-				WriteServ(user->fd,"530 %s %s :Only IRC operators may create new channels",user->nick,cname,cname);
+				user->WriteServ("530 %s %s :Only IRC operators may create new channels",user->nick,cname,cname);
 				return 1;
 			}
 		}
@@ -85,7 +86,7 @@ class ModuleRestrictChans : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 	}
 };
 
@@ -101,7 +102,7 @@ class ModuleRestrictChansFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleRestrictChans(Me);
 	}