X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_restrictchans.cpp;h=43573883409e7fd26f77e5240aade4b082e0274c;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=a2f117616085237a198335859ae4c81b5e723496;hpb=fcacc8e0306382bc3f938073092c3729d77e2b41;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_restrictchans.cpp b/src/modules/m_restrictchans.cpp
index a2f117616..435738834 100644
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.cpp
@@ -41,11 +41,11 @@ class ModuleRestrictChans : public Module
 	}
 
  public:
-	ModuleRestrictChans()
+	void init()
 	{
 		ReadConfig();
 		Implementation eventlist[] = { I_OnUserPreJoin, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	virtual void OnRehash(User* user)
@@ -53,10 +53,9 @@ class ModuleRestrictChans : public Module
 		ReadConfig();
 	}
 
-
-	virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+	ModResult OnUserPreJoin(User* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven)
 	{
-		irc::string x = cname;
+		irc::string x(cname.c_str());
 		if (!IS_LOCAL(user))
 			return MOD_RES_PASSTHRU;
 
@@ -64,19 +63,15 @@ class ModuleRestrictChans : public Module
 		if (!chan)
 		{
 			// user is not an oper and its not in the allow list
-			if ((!IS_OPER(user)) && (allowchans.find(x) == allowchans.end()))
+			if ((!user->IsOper()) && (allowchans.find(x) == allowchans.end()))
 			{
-				user->WriteNumeric(ERR_BANNEDFROMCHAN, "%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.c_str());
 				return MOD_RES_DENY;
 			}
 		}
 		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ~ModuleRestrictChans()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Only opers may create new channels if this module is loaded",VF_VENDOR);